From ac7d8acb9d7b2d18335e5482304f837b1c499360 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 23 Jul 2019 15:24:05 +0000
Subject: Fix [38dc27bd1d]: Tk does not support <Button-6> nor <Button-7>
 events. Now handle all events up to Button 9. On Windows and Mac, Buttons 8
 and 9 are used for the mouse side buttons (as X11 already does). TIP needed
 for this.

---
 generic/tkBind.c            |  8 ++++++++
 generic/tkCanvas.c          | 26 +++-----------------------
 generic/tkEvent.c           | 35 ++++++++++++-----------------------
 generic/tkGrab.c            | 13 +------------
 generic/tkInt.h             | 37 +++++++++++++++++++++++++++++++++++++
 generic/tkPointer.c         | 14 +-------------
 generic/tkTextTag.c         | 35 ++++++-----------------------------
 macosx/tkMacOSXMouseEvent.c | 17 +++++++++++------
 win/tkWinPointer.c          |  6 ++++++
 win/tkWinTest.c             | 10 ++++++++++
 win/tkWinX.c                | 17 +++++++++++++++++
 11 files changed, 112 insertions(+), 106 deletions(-)

diff --git a/generic/tkBind.c b/generic/tkBind.c
index 953d936..15a66f1 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -388,6 +388,14 @@ static const ModInfo modArray[] = {
     {"Button4",		Button4Mask,	0},
     {"B5",		Button5Mask,	0},
     {"Button5",		Button5Mask,	0},
+    {"B6",		Button6Mask,	0},
+    {"Button6",		Button6Mask,	0},
+    {"B7",		Button7Mask,	0},
+    {"Button7",		Button7Mask,	0},
+    {"B8",		Button8Mask,	0},
+    {"Button8",		Button8Mask,	0},
+    {"B9",		Button9Mask,	0},
+    {"Button9",		Button9Mask,	0},
     {"Mod1",		Mod1Mask,	0},
     {"M1",		Mod1Mask,	0},
     {"Command",		Mod1Mask,	0},
diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c
index 10e2ce2..7124d51 100644
--- a/generic/tkCanvas.c
+++ b/generic/tkCanvas.c
@@ -5092,26 +5092,7 @@ CanvasBindProc(
     switch (eventPtr->type) {
     case ButtonPress:
     case ButtonRelease:
-	switch (eventPtr->xbutton.button) {
-	case Button1:
-	    mask = Button1Mask;
-	    break;
-	case Button2:
-	    mask = Button2Mask;
-	    break;
-	case Button3:
-	    mask = Button3Mask;
-	    break;
-	case Button4:
-	    mask = Button4Mask;
-	    break;
-	case Button5:
-	    mask = Button5Mask;
-	    break;
-	default:
-	    mask = 0;
-	    break;
-	}
+	mask = TkGetButtonMask(eventPtr->xbutton.button);
 
 	/*
 	 * For button press events, repick the current item using the button
@@ -5194,7 +5175,7 @@ PickCurrentItem(
 				 * ButtonRelease, or MotionNotify. */
 {
     double coords[2];
-    int buttonDown;
+    unsigned int buttonDown;
     Tk_Item *prevItemPtr;
     SearchUids *searchUids = GetStaticUids();
 
@@ -5205,8 +5186,7 @@ PickCurrentItem(
      * for windows.
      */
 
-    buttonDown = canvasPtr->state
-	    & (Button1Mask|Button2Mask|Button3Mask|Button4Mask|Button5Mask);
+    buttonDown = canvasPtr->state & ALL_BUTTONS;
 
     /*
      * Save information about this event in the canvas. The event in the
diff --git a/generic/tkEvent.c b/generic/tkEvent.c
index b36d5de..d8501c3 100644
--- a/generic/tkEvent.c
+++ b/generic/tkEvent.c
@@ -193,7 +193,6 @@ TCL_DECLARE_MUTEX(exitMutex)
 
 static void		CleanUpTkEvent(XEvent *eventPtr);
 static void		DelayedMotionProc(ClientData clientData);
-static int		GetButtonMask(unsigned int Button);
 static unsigned long    GetEventMaskFromXEvent(XEvent *eventPtr);
 static TkWindow *	GetTkWindowFromXEvent(XEvent *eventPtr);
 static void		InvokeClientMessageHandlers(ThreadSpecificData *tsdPtr,
@@ -524,7 +523,7 @@ RefreshKeyboardMappingIfNeeded(
 /*
  *----------------------------------------------------------------------
  *
- * GetButtonMask --
+ * TkGetButtonMask --
  *
  *	Return the proper Button${n}Mask for the button.
  *
@@ -537,23 +536,15 @@ RefreshKeyboardMappingIfNeeded(
  *----------------------------------------------------------------------
  */
 
-static int
-GetButtonMask(
+static const int buttonMasks[] = {
+    0, Button1Mask, Button2Mask, Button3Mask, Button4Mask, Button5Mask, Button6Mask, Button7Mask, Button8Mask, Button9Mask
+};
+
+int
+TkGetButtonMask(
     unsigned int button)
 {
-    switch (button) {
-    case 1:
-	return Button1Mask;
-    case 2:
-	return Button2Mask;
-    case 3:
-	return Button3Mask;
-    case 4:
-	return Button4Mask;
-    case 5:
-	return Button5Mask;
-    }
-    return 0;
+    return (button > Button9) ? 0 : buttonMasks[button];
 }
 
 /*
@@ -582,8 +573,6 @@ UpdateButtonEventState(
     XEvent *eventPtr)
 {
     TkDisplay *dispPtr;
-    int allButtonsMask = Button1Mask | Button2Mask | Button3Mask
-	    | Button4Mask | Button5Mask;
 
     switch (eventPtr->type) {
     case ButtonPress:
@@ -591,19 +580,19 @@ UpdateButtonEventState(
 	dispPtr->mouseButtonWindow = eventPtr->xbutton.window;
 	eventPtr->xbutton.state |= dispPtr->mouseButtonState;
 
-	dispPtr->mouseButtonState |= GetButtonMask(eventPtr->xbutton.button);
+	dispPtr->mouseButtonState |= TkGetButtonMask(eventPtr->xbutton.button);
 	break;
 
     case ButtonRelease:
 	dispPtr = TkGetDisplay(eventPtr->xbutton.display);
 	dispPtr->mouseButtonWindow = None;
-	dispPtr->mouseButtonState &= ~GetButtonMask(eventPtr->xbutton.button);
+	dispPtr->mouseButtonState &= ~TkGetButtonMask(eventPtr->xbutton.button);
 	eventPtr->xbutton.state |= dispPtr->mouseButtonState;
 	break;
 
     case MotionNotify:
 	dispPtr = TkGetDisplay(eventPtr->xmotion.display);
-	if (dispPtr->mouseButtonState & allButtonsMask) {
+	if (dispPtr->mouseButtonState & ALL_BUTTONS) {
 	    if (eventPtr->xbutton.window != dispPtr->mouseButtonWindow) {
 		/*
 		 * This motion event should not be interpreted as a button
@@ -611,7 +600,7 @@ UpdateButtonEventState(
 		 * button was pressed down in.
 		 */
 
-		dispPtr->mouseButtonState &= ~allButtonsMask;
+		dispPtr->mouseButtonState &= ~ALL_BUTTONS;
 		dispPtr->mouseButtonWindow = None;
 	    } else {
 		eventPtr->xmotion.state |= dispPtr->mouseButtonState;
diff --git a/generic/tkGrab.c b/generic/tkGrab.c
index 917ec69..50d2517 100644
--- a/generic/tkGrab.c
+++ b/generic/tkGrab.c
@@ -135,17 +135,6 @@ typedef struct NewGrabWinEvent {
 #define GENERATED_GRAB_EVENT_MAGIC ((Bool) 0x147321ac)
 
 /*
- * Mask that selects any of the state bits corresponding to buttons, plus
- * masks that select individual buttons' bits:
- */
-
-#define ALL_BUTTONS \
-	(Button1Mask|Button2Mask|Button3Mask|Button4Mask|Button5Mask)
-static const unsigned int buttonStates[] = {
-    Button1Mask, Button2Mask, Button3Mask, Button4Mask, Button5Mask
-};
-
-/*
  * Forward declarations for functions declared later in this file:
  */
 
@@ -883,7 +872,7 @@ TkPointerEvent(
 	} else {
 	    if (eventPtr->xbutton.button != AnyButton &&
 		    ((eventPtr->xbutton.state & ALL_BUTTONS)
-		    == buttonStates[eventPtr->xbutton.button - Button1])) {
+		    == (unsigned int)TkGetButtonMask(eventPtr->xbutton.button))) {
 		ReleaseButtonGrab(dispPtr);			/* Note 4. */
 	    }
 	}
diff --git a/generic/tkInt.h b/generic/tkInt.h
index 77b7725..10888f7 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -965,6 +965,43 @@ typedef struct TkpClipMask {
 #define ALT_MASK	(AnyModifier<<2)
 #define EXTENDED_MASK	(AnyModifier<<3)
 
+#ifndef Button6
+# define Button6 6
+#endif
+#ifndef Button7
+# define Button7 7
+#endif
+#ifndef Button8
+# define Button8 8
+#endif
+#ifndef Button9
+# define Button9 9
+#endif
+
+#ifndef Button6Mask
+# define Button6Mask		(AnyModifier<<4)
+#endif
+#ifndef Button7Mask
+# define Button7Mask		(AnyModifier<<5)
+#endif
+#ifndef Button8Mask
+# define Button8Mask		(AnyModifier<<6)
+#endif
+#ifndef Button9Mask
+# define Button9Mask		(AnyModifier<<7)
+#endif
+
+/*
+ * Mask that selects any of the state bits corresponding to buttons, plus
+ * masks that select individual buttons' bits:
+ */
+
+#define ALL_BUTTONS \
+	(Button1Mask|Button2Mask|Button3Mask|Button4Mask|Button5Mask|Button6Mask|Button7Mask|Button8Mask|Button9Mask)
+
+
+MODULE_SCOPE int TkGetButtonMask(unsigned int);
+
 /*
  * Object types not declared in tkObj.c need to be mentioned here so they can
  * be properly registered with Tcl:
diff --git a/generic/tkPointer.c b/generic/tkPointer.c
index 6e87638..de9d49d 100644
--- a/generic/tkPointer.c
+++ b/generic/tkPointer.c
@@ -23,18 +23,6 @@
 #define Cursor XCursor
 #endif
 
-/*
- * Mask that selects any of the state bits corresponding to buttons, plus
- * masks that select individual buttons' bits:
- */
-
-#define ALL_BUTTONS \
-	(Button1Mask|Button2Mask|Button3Mask|Button4Mask|Button5Mask)
-static const unsigned int buttonMasks[] = {
-    Button1Mask, Button2Mask, Button3Mask, Button4Mask, Button5Mask
-};
-#define ButtonMask(b) (buttonMasks[(b)-Button1])
-
 typedef struct {
     TkWindow *grabWinPtr;	/* Window that defines the top of the grab
 				 * tree in a global grab. */
@@ -267,7 +255,7 @@ Tk_UpdatePointer(
      */
 
     for (b = Button1; b <= Button5; b++) {
-	mask = ButtonMask(b);
+	mask = TkGetButtonMask(b);
 	if (changes & mask) {
 	    if (state & mask) {
 		type = ButtonPress;
diff --git a/generic/tkTextTag.c b/generic/tkTextTag.c
index cb0993b..bda315e 100644
--- a/generic/tkTextTag.c
+++ b/generic/tkTextTag.c
@@ -1446,9 +1446,6 @@ TkTextBindProc(
     TkText *textPtr = clientData;
     int repick = 0;
 
-# define AnyButtonMask \
-	(Button1Mask|Button2Mask|Button3Mask|Button4Mask|Button5Mask)
-
     textPtr->refCount++;
 
     /*
@@ -1460,35 +1457,16 @@ TkTextBindProc(
     if (eventPtr->type == ButtonPress) {
 	textPtr->flags |= BUTTON_DOWN;
     } else if (eventPtr->type == ButtonRelease) {
-	int mask;
+	unsigned int mask;
 
-	switch (eventPtr->xbutton.button) {
-	case Button1:
-	    mask = Button1Mask;
-	    break;
-	case Button2:
-	    mask = Button2Mask;
-	    break;
-	case Button3:
-	    mask = Button3Mask;
-	    break;
-	case Button4:
-	    mask = Button4Mask;
-	    break;
-	case Button5:
-	    mask = Button5Mask;
-	    break;
-	default:
-	    mask = 0;
-	    break;
-	}
-	if ((eventPtr->xbutton.state & AnyButtonMask) == (unsigned) mask) {
+	mask = TkGetButtonMask(eventPtr->xbutton.button);
+	if ((eventPtr->xbutton.state & ALL_BUTTONS) == mask) {
 	    textPtr->flags &= ~BUTTON_DOWN;
 	    repick = 1;
 	}
     } else if ((eventPtr->type == EnterNotify)
 	    || (eventPtr->type == LeaveNotify)) {
-	if (eventPtr->xcrossing.state & AnyButtonMask) {
+	if (eventPtr->xcrossing.state & ALL_BUTTONS) {
 	    textPtr->flags |= BUTTON_DOWN;
 	} else {
 	    textPtr->flags &= ~BUTTON_DOWN;
@@ -1496,7 +1474,7 @@ TkTextBindProc(
 	TkTextPickCurrent(textPtr, eventPtr);
 	goto done;
     } else if (eventPtr->type == MotionNotify) {
-	if (eventPtr->xmotion.state & AnyButtonMask) {
+	if (eventPtr->xmotion.state & ALL_BUTTONS) {
 	    textPtr->flags |= BUTTON_DOWN;
 	} else {
 	    textPtr->flags &= ~BUTTON_DOWN;
@@ -1513,8 +1491,7 @@ TkTextBindProc(
 	unsigned int oldState;
 
 	oldState = eventPtr->xbutton.state;
-	eventPtr->xbutton.state &= ~(Button1Mask|Button2Mask
-		|Button3Mask|Button4Mask|Button5Mask);
+	eventPtr->xbutton.state &= ~ALL_BUTTONS;
 	if (!(textPtr->flags & DESTROYED)) {
 	    TkTextPickCurrent(textPtr, eventPtr);
 	}
diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index 2517769..42fae98 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -178,22 +178,26 @@ enum {
      */
 
     unsigned int state = 0;
-    NSInteger button = [theEvent buttonNumber];
+    int button = [theEvent buttonNumber];
+    if (++button > 3) {
+	button += 4; /* Map buttons 4/5 to 8/9 */
+    }
     EventRef eventRef = (EventRef)[theEvent eventRef];
     UInt32 buttons;
     OSStatus err = GetEventParameter(eventRef, kEventParamMouseChord,
 	    typeUInt32, NULL, sizeof(UInt32), NULL, &buttons);
 
     if (err == noErr) {
-    	state |= (buttons & ((1<<5) - 1)) << 8;
-    } else if (button < 5) {
+    	state |= (buttons & 0x07) << 8;
+    	state |= (buttons & 0x18) << 12;
+    } else if (button <= 9) {
 	switch (eventType) {
 	case NSLeftMouseDown:
 	case NSRightMouseDown:
 	case NSLeftMouseDragged:
 	case NSRightMouseDragged:
 	case NSOtherMouseDown:
-	    state |= 1 << (button + 8);
+	    state |= TkGetButtonMask(button);
 	    break;
 	default:
 	    break;
@@ -361,10 +365,11 @@ ButtonModifiers2State(
     unsigned int state;
 
     /*
-     * Tk supports at most 5 buttons.
+     * Tk on OSX supports at most 5 buttons.
      */
 
-    state = (buttonState & ((1<<5) - 1)) << 8;
+    state = (buttonState & 0x07) * Button1Mask;
+    state |= (buttonState & 0x18) * (Button8Mask >> 3);
 
     if (keyModifiers & alphaLock) {
 	state |= LockMask;
diff --git a/win/tkWinPointer.c b/win/tkWinPointer.c
index 6f1f840..e3445c7 100644
--- a/win/tkWinPointer.c
+++ b/win/tkWinPointer.c
@@ -81,6 +81,12 @@ TkWinGetModifierState(void)
     if (GetKeyState(VK_RBUTTON) & 0x8000) {
 	state |= Button3Mask;
     }
+    if (GetKeyState(VK_XBUTTON1) & 0x8000) {
+	state |= Button8Mask;
+    }
+    if (GetKeyState(VK_XBUTTON2) & 0x8000) {
+	state |= Button9Mask;
+    }
     return state;
 }
 
diff --git a/win/tkWinTest.c b/win/tkWinTest.c
index e58ee7c..e386605 100644
--- a/win/tkWinTest.c
+++ b/win/tkWinTest.c
@@ -287,6 +287,16 @@ TestwineventObjCmd(
     static const TkStateMap messageMap[] = {
 	{WM_LBUTTONDOWN,	"WM_LBUTTONDOWN"},
 	{WM_LBUTTONUP,		"WM_LBUTTONUP"},
+	{WM_LBUTTONDBLCLK,		"WM_LBUTTONDBLCLK"},
+	{WM_MBUTTONDOWN,	"WM_MBUTTONDOWN"},
+	{WM_MBUTTONUP,		"WM_MBUTTONUP"},
+	{WM_MBUTTONDBLCLK,		"WM_MBUTTONDBLCLK"},
+	{WM_RBUTTONDOWN,	"WM_RBUTTONDOWN"},
+	{WM_RBUTTONUP,		"WM_RBUTTONUP"},
+	{WM_RBUTTONDBLCLK,		"WM_RBUTTONDBLCLK"},
+	{WM_XBUTTONDOWN,	"WM_XBUTTONDOWN"},
+	{WM_XBUTTONUP,		"WM_XBUTTONUP"},
+	{WM_XBUTTONDBLCLK,		"WM_XBUTTONDBLCLK"},
 	{WM_CHAR,		"WM_CHAR"},
 	{WM_GETTEXT,		"WM_GETTEXT"},
 	{WM_SETTEXT,		"WM_SETTEXT"},
diff --git a/win/tkWinX.c b/win/tkWinX.c
index db8bc4f..d724282 100644
--- a/win/tkWinX.c
+++ b/win/tkWinX.c
@@ -884,9 +884,12 @@ Tk_TranslateWinEvent(
     case WM_MBUTTONDBLCLK:
     case WM_RBUTTONDOWN:
     case WM_RBUTTONDBLCLK:
+    case WM_XBUTTONDOWN:
+    case WM_XBUTTONDBLCLK:
     case WM_LBUTTONUP:
     case WM_MBUTTONUP:
     case WM_RBUTTONUP:
+    case WM_XBUTTONUP:
     case WM_MOUSEMOVE:
 	Tk_PointerEvent(hwnd, (short) LOWORD(lParam), (short) HIWORD(lParam));
 	return 1;
@@ -1713,6 +1716,14 @@ TkWinResendEvent(
 	msg = WM_RBUTTONDOWN;
 	wparam = MK_RBUTTON;
 	break;
+    case Button8:
+	msg = WM_XBUTTONDOWN;
+	wparam = MAKEWPARAM(MK_XBUTTON1, XBUTTON1);
+	break;
+    case Button9:
+	msg = WM_XBUTTONDOWN;
+	wparam = MAKEWPARAM(MK_XBUTTON2, XBUTTON2);
+	break;
     default:
 	return 0;
     }
@@ -1726,6 +1737,12 @@ TkWinResendEvent(
     if (eventPtr->xbutton.state & Button3Mask) {
 	wparam |= MK_RBUTTON;
     }
+    if (eventPtr->xbutton.state & Button8Mask) {
+	wparam |= MK_XBUTTON1;
+    }
+    if (eventPtr->xbutton.state & Button9Mask) {
+	wparam |= MK_XBUTTON2;
+    }
     if (eventPtr->xbutton.state & ShiftMask) {
 	wparam |= MK_SHIFT;
     }
-- 
cgit v0.12


From 987d79373dc7dd75d2cc06cd55d34f3cb6624779 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 23 Jul 2019 15:36:38 +0000
Subject: mis-counted modifier bits

---
 macosx/tkMacOSXMouseEvent.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index 42fae98..94ebb75 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -188,8 +188,8 @@ enum {
 	    typeUInt32, NULL, sizeof(UInt32), NULL, &buttons);
 
     if (err == noErr) {
-    	state |= (buttons & 0x07) << 8;
-    	state |= (buttons & 0x18) << 12;
+	state |= (buttons & 0x07) * Button1Mask;
+	state |= (buttons & 0x18) * (Button8Mask >> 3);
     } else if (button <= 9) {
 	switch (eventType) {
 	case NSLeftMouseDown:
-- 
cgit v0.12


From 2c41264be7ab081b18b9a7dfb177e5835917c4bc Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 24 Jul 2019 13:31:43 +0000
Subject: (cherry-pick): Patch by Arjen sent to core 2018-09-21 Also, do some
 renumbering of mouse-buttons, such that at script level the XButtons appear
 to be at 4/5 while - internally - they are at 8/9.

---
 doc/bind.n        |  4 ----
 generic/tkBind.c  | 33 ++++++++++++++++++--------------
 generic/tkEvent.c | 17 ++++++++++++++++-
 tests/bind.test   | 56 -------------------------------------------------------
 4 files changed, 35 insertions(+), 75 deletions(-)

diff --git a/doc/bind.n b/doc/bind.n
index 7c39cfc..015bad5 100644
--- a/doc/bind.n
+++ b/doc/bind.n
@@ -114,10 +114,6 @@ Modifiers consist of any of the following values:
 \fBButton3\fR, \fBB3\fR	\fBTriple\fR
 \fBButton4\fR, \fBB4\fR	\fBQuadruple\fR
 \fBButton5\fR, \fBB5\fR
-\fBButton6\fR, \fBB6\fR
-\fBButton7\fR, \fBB7\fR
-\fBButton8\fR, \fBB8\fR
-\fBButton9\fR, \fBB9\fR
 .DE
 Where more than one value is listed, separated by commas, the values
 are equivalent.
diff --git a/generic/tkBind.c b/generic/tkBind.c
index 15a66f1..a6bd8ca 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -384,18 +384,10 @@ static const ModInfo modArray[] = {
     {"Button2",		Button2Mask,	0},
     {"B3",		Button3Mask,	0},
     {"Button3",		Button3Mask,	0},
-    {"B4",		Button4Mask,	0},
-    {"Button4",		Button4Mask,	0},
-    {"B5",		Button5Mask,	0},
-    {"Button5",		Button5Mask,	0},
-    {"B6",		Button6Mask,	0},
-    {"Button6",		Button6Mask,	0},
-    {"B7",		Button7Mask,	0},
-    {"Button7",		Button7Mask,	0},
-    {"B8",		Button8Mask,	0},
-    {"Button8",		Button8Mask,	0},
-    {"B9",		Button9Mask,	0},
-    {"Button9",		Button9Mask,	0},
+    {"B4",		Button8Mask,	0},
+    {"Button4",		Button8Mask,	0},
+    {"B5",		Button9Mask,	0},
+    {"Button5",		Button9Mask,	0},
     {"Mod1",		Mod1Mask,	0},
     {"M1",		Mod1Mask,	0},
     {"Command",		Mod1Mask,	0},
@@ -1995,6 +1987,9 @@ ExpandPercents(
 	case 'b':
 	    if (flags & BUTTON) {
 		number = eventPtr->xbutton.button;
+		if (eventPtr->xbutton.button >= Button8) {
+		    number += (Button4 - Button8);
+		}
 		goto doNumber;
 	    }
 	    goto doString;
@@ -3109,6 +3104,9 @@ HandleEventGenerate(
 		return TCL_ERROR;
 	    }
 	    if (flags & BUTTON) {
+		if (number >= Button4) {
+		    number += (Button8 - Button4);
+		}
 		event.general.xbutton.button = number;
 	    } else {
 		goto badopt;
@@ -3997,7 +3995,7 @@ ParseEventDescription(
 	p = GetField(p, field, FIELD_SIZE);
     }
     if (*field != '\0') {
-	if ((*field >= '1') && (*field <= '9') && (field[1] == '\0')) {
+	if ((*field >= '1') && (*field <= '5') && (field[1] == '\0')) {
 	    if (eventFlags == 0) {
 		patPtr->eventType = ButtonPress;
 		eventMask = ButtonPressMask;
@@ -4012,6 +4010,9 @@ ParseEventDescription(
 		goto done;
 	    }
 	    patPtr->detail.button = (*field - '0');
+	    if (patPtr->detail.button >= Button4) {
+		patPtr->detail.button += (Button8 - Button4);
+	    }
 	} else {
 
 	getKeysym:
@@ -4228,7 +4229,11 @@ GetPatternObj(
 		    Tcl_AppendToObj(patternObj, string, -1);
 		}
 	    } else {
-		Tcl_AppendPrintfToObj(patternObj, "%d", patPtr->detail.button);
+		int button =  patPtr->detail.button;
+		if (button >= Button8) {
+			button += (Button4 - Button8);
+		}
+		Tcl_AppendPrintfToObj(patternObj, "%d", button);
 	    }
 	}
 
diff --git a/generic/tkEvent.c b/generic/tkEvent.c
index d8501c3..02c7de8 100644
--- a/generic/tkEvent.c
+++ b/generic/tkEvent.c
@@ -580,7 +580,22 @@ UpdateButtonEventState(
 	dispPtr->mouseButtonWindow = eventPtr->xbutton.window;
 	eventPtr->xbutton.state |= dispPtr->mouseButtonState;
 
-	dispPtr->mouseButtonState |= TkGetButtonMask(eventPtr->xbutton.button);
+	if ((eventPtr->xbutton.button >= Button4) && (eventPtr->xbutton.button <= Button7)) {
+	    /*
+	     * Turn the event into a mouse wheel event and queue it
+	     * Note: modelled after the code in tkWinX.c
+	     */
+	    eventPtr->type = MouseWheelEvent;
+	    eventPtr->xany.send_event = -1;
+	    eventPtr->xkey.nbytes = 0;
+	    eventPtr->xkey.keycode = (eventPtr->xbutton.button & 1) ? 1 : -1;
+	    if (eventPtr->xkey.keycode >= Button6) {
+		eventPtr->xkey.state |= ShiftMask;
+	    }
+	    Tk_QueueWindowEvent(eventPtr, TCL_QUEUE_TAIL);
+	} else {
+	    dispPtr->mouseButtonState |= TkGetButtonMask(eventPtr->xbutton.button);
+	}
 	break;
 
     case ButtonRelease:
diff --git a/tests/bind.test b/tests/bind.test
index ebc39b7..87e8e03 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -5862,62 +5862,6 @@ test bind-27.7 {button names} -setup {
 } -cleanup {
     destroy .t.f
 } -result {<Button-5> {button 5}}
-test bind-27.8 {button names} -setup {
-    frame .t.f -class Test -width 150 -height 100
-    pack .t.f
-    focus -force .t.f
-    update
-} -body {
-    bind .t.f <Button-6> {lappend x "button 6"}
-    set x [bind .t.f]
-    event generate .t.f <Button-6>
-    event generate .t.f <ButtonRelease-6>
-    set x
-} -cleanup {
-    destroy .t.f
-} -result {<Button-6> {button 6}}
-test bind-27.9 {button names} -setup {
-    frame .t.f -class Test -width 150 -height 100
-    pack .t.f
-    focus -force .t.f
-    update
-} -body {
-    bind .t.f <Button-7> {lappend x "button 7"}
-    set x [bind .t.f]
-    event generate .t.f <Button-7>
-    event generate .t.f <ButtonRelease-7>
-    set x
-} -cleanup {
-    destroy .t.f
-} -result {<Button-7> {button 7}}
-test bind-27.10 {button names} -setup {
-    frame .t.f -class Test -width 150 -height 100
-    pack .t.f
-    focus -force .t.f
-    update
-} -body {
-    bind .t.f <Button-8> {lappend x "button 8"}
-    set x [bind .t.f]
-    event generate .t.f <Button-8>
-    event generate .t.f <ButtonRelease-8>
-    set x
-} -cleanup {
-    destroy .t.f
-} -result {<Button-8> {button 8}}
-test bind-27.11 {button names} -setup {
-    frame .t.f -class Test -width 150 -height 100
-    pack .t.f
-    focus -force .t.f
-    update
-} -body {
-    bind .t.f <Button-9> {lappend x "button 9"}
-    set x [bind .t.f]
-    event generate .t.f <Button-9>
-    event generate .t.f <ButtonRelease-9>
-    set x
-} -cleanup {
-    destroy .t.f
-} -result {<Button-9> {button 9}}
 
 test bind-28.1 {keysym names} -body {
     bind .t <Expose-a> foo
-- 
cgit v0.12


From 89d0c9df2c0159f34bdb8080abef85a21fe9c0bb Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 24 Jul 2019 14:38:37 +0000
Subject: Code simplification: Don't bother keeping track of the
 Button[n]Mask's for Buttons 4-7, since those are not actually buttons (they
 are mouse-wheels). This means that Button4Mask/Button5Mask can be used for
 Buttons 8/9.

---
 generic/tkBind.c            |  8 ++++----
 generic/tkEvent.c           | 11 +++++++----
 generic/tkInt.h             | 26 ++++++--------------------
 macosx/tkMacOSXMouseEvent.c |  6 ++----
 win/tkWinPointer.c          |  4 ++--
 win/tkWinX.c                |  4 ++--
 6 files changed, 23 insertions(+), 36 deletions(-)

diff --git a/generic/tkBind.c b/generic/tkBind.c
index 8c77d93..3d5bb3e 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -384,10 +384,10 @@ static const ModInfo modArray[] = {
     {"Button2",		Button2Mask,	0},
     {"B3",		Button3Mask,	0},
     {"Button3",		Button3Mask,	0},
-    {"B4",		Button8Mask,	0},
-    {"Button4",		Button8Mask,	0},
-    {"B5",		Button9Mask,	0},
-    {"Button5",		Button9Mask,	0},
+    {"B4",		Button4Mask,	0},
+    {"Button4",		Button4Mask,	0},
+    {"B5",		Button5Mask,	0},
+    {"Button5",		Button5Mask,	0},
     {"Mod1",		Mod1Mask,	0},
     {"M1",		Mod1Mask,	0},
     {"Command",		Mod1Mask,	0},
diff --git a/generic/tkEvent.c b/generic/tkEvent.c
index 02c7de8..a8eaec1 100644
--- a/generic/tkEvent.c
+++ b/generic/tkEvent.c
@@ -525,7 +525,10 @@ RefreshKeyboardMappingIfNeeded(
  *
  * TkGetButtonMask --
  *
- *	Return the proper Button${n}Mask for the button.
+ *	Return the proper Button${n}Mask for the button. Don't care about
+ *	Button4 - Button7, because those are not actually buttons: Those
+ *	are used for the horizontal or vertical mouse wheels. The
+ *	Button4Mask/Button5Mask's are actually used for Button 8 and 9.
  *
  * Results:
  *	A button mask.
@@ -537,7 +540,7 @@ RefreshKeyboardMappingIfNeeded(
  */
 
 static const int buttonMasks[] = {
-    0, Button1Mask, Button2Mask, Button3Mask, Button4Mask, Button5Mask, Button6Mask, Button7Mask, Button8Mask, Button9Mask
+    0, Button1Mask, Button2Mask, Button3Mask, 0, 0, 0, 0, Button4Mask, Button5Mask
 };
 
 int
@@ -580,7 +583,7 @@ UpdateButtonEventState(
 	dispPtr->mouseButtonWindow = eventPtr->xbutton.window;
 	eventPtr->xbutton.state |= dispPtr->mouseButtonState;
 
-	if ((eventPtr->xbutton.button >= Button4) && (eventPtr->xbutton.button <= Button7)) {
+	if ((eventPtr->xbutton.button >= Button4) && (eventPtr->xbutton.button < Button8)) {
 	    /*
 	     * Turn the event into a mouse wheel event and queue it
 	     * Note: modelled after the code in tkWinX.c
@@ -589,7 +592,7 @@ UpdateButtonEventState(
 	    eventPtr->xany.send_event = -1;
 	    eventPtr->xkey.nbytes = 0;
 	    eventPtr->xkey.keycode = (eventPtr->xbutton.button & 1) ? 1 : -1;
-	    if (eventPtr->xkey.keycode >= Button6) {
+	    if (eventPtr->xkey.keycode > Button5) {
 		eventPtr->xkey.state |= ShiftMask;
 	    }
 	    Tk_QueueWindowEvent(eventPtr, TCL_QUEUE_TAIL);
diff --git a/generic/tkInt.h b/generic/tkInt.h
index 10888f7..03ba420 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -965,12 +965,11 @@ typedef struct TkpClipMask {
 #define ALT_MASK	(AnyModifier<<2)
 #define EXTENDED_MASK	(AnyModifier<<3)
 
-#ifndef Button6
-# define Button6 6
-#endif
-#ifndef Button7
-# define Button7 7
-#endif
+/*
+ * Buttons 8 and 9 are the Xbuttons (left and right side-buttons). On Windows/Mac, those
+ * are known as Buttons 4 and 5. At script level, they also get the numbers 4 and 5.
+ */
+
 #ifndef Button8
 # define Button8 8
 #endif
@@ -978,26 +977,13 @@ typedef struct TkpClipMask {
 # define Button9 9
 #endif
 
-#ifndef Button6Mask
-# define Button6Mask		(AnyModifier<<4)
-#endif
-#ifndef Button7Mask
-# define Button7Mask		(AnyModifier<<5)
-#endif
-#ifndef Button8Mask
-# define Button8Mask		(AnyModifier<<6)
-#endif
-#ifndef Button9Mask
-# define Button9Mask		(AnyModifier<<7)
-#endif
-
 /*
  * Mask that selects any of the state bits corresponding to buttons, plus
  * masks that select individual buttons' bits:
  */
 
 #define ALL_BUTTONS \
-	(Button1Mask|Button2Mask|Button3Mask|Button4Mask|Button5Mask|Button6Mask|Button7Mask|Button8Mask|Button9Mask)
+	(Button1Mask|Button2Mask|Button3Mask|Button4Mask|Button5Mask)
 
 
 MODULE_SCOPE int TkGetButtonMask(unsigned int);
diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index fc4d1c2..78363d0 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -188,8 +188,7 @@ enum {
 	    typeUInt32, NULL, sizeof(UInt32), NULL, &buttons);
 
     if (err == noErr) {
-	state |= (buttons & 0x07) * Button1Mask;
-	state |= (buttons & 0x18) * (Button8Mask >> 3);
+	state |= (buttons & 0x1F) * Button1Mask;
     } else if (button <= 9) {
 	switch (eventType) {
 	case NSLeftMouseDown:
@@ -368,8 +367,7 @@ ButtonModifiers2State(
      * Tk on OSX supports at most 5 buttons.
      */
 
-    state = (buttonState & 0x07) * Button1Mask;
-    state |= (buttonState & 0x18) * (Button8Mask >> 3);
+    state = (buttonState & 0x1F) * Button1Mask;
 
     if (keyModifiers & alphaLock) {
 	state |= LockMask;
diff --git a/win/tkWinPointer.c b/win/tkWinPointer.c
index e3445c7..251b5b9 100644
--- a/win/tkWinPointer.c
+++ b/win/tkWinPointer.c
@@ -82,10 +82,10 @@ TkWinGetModifierState(void)
 	state |= Button3Mask;
     }
     if (GetKeyState(VK_XBUTTON1) & 0x8000) {
-	state |= Button8Mask;
+	state |= Button4Mask;
     }
     if (GetKeyState(VK_XBUTTON2) & 0x8000) {
-	state |= Button9Mask;
+	state |= Button5Mask;
     }
     return state;
 }
diff --git a/win/tkWinX.c b/win/tkWinX.c
index d724282..9d474ac 100644
--- a/win/tkWinX.c
+++ b/win/tkWinX.c
@@ -1737,10 +1737,10 @@ TkWinResendEvent(
     if (eventPtr->xbutton.state & Button3Mask) {
 	wparam |= MK_RBUTTON;
     }
-    if (eventPtr->xbutton.state & Button8Mask) {
+    if (eventPtr->xbutton.state & Button4Mask) {
 	wparam |= MK_XBUTTON1;
     }
-    if (eventPtr->xbutton.state & Button9Mask) {
+    if (eventPtr->xbutton.state & Button5Mask) {
 	wparam |= MK_XBUTTON2;
     }
     if (eventPtr->xbutton.state & ShiftMask) {
-- 
cgit v0.12


From 5c07a1409bb742e9fe41e7e523146ce75d71580a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 24 Jul 2019 14:55:51 +0000
Subject: A few more minor adaptations, and make it compile on X11 (XKeyEvent
 structure doesn't have a nbytes field).

---
 generic/tkBind.c            | 2 +-
 generic/tkEvent.c           | 2 ++
 macosx/tkMacOSXMouseEvent.c | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/generic/tkBind.c b/generic/tkBind.c
index 3d5bb3e..0208a7a 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -1987,7 +1987,7 @@ ExpandPercents(
 	case 'b':
 	    if (flags & BUTTON) {
 		number = eventPtr->xbutton.button;
-		if (eventPtr->xbutton.button >= Button8) {
+		if (number >= Button8) {
 		    number += (Button4 - Button8);
 		}
 		goto doNumber;
diff --git a/generic/tkEvent.c b/generic/tkEvent.c
index a8eaec1..e94cdd5 100644
--- a/generic/tkEvent.c
+++ b/generic/tkEvent.c
@@ -590,7 +590,9 @@ UpdateButtonEventState(
 	     */
 	    eventPtr->type = MouseWheelEvent;
 	    eventPtr->xany.send_event = -1;
+#if defined(_WIN32) || defined(MAC_OSX_TK)
 	    eventPtr->xkey.nbytes = 0;
+#endif
 	    eventPtr->xkey.keycode = (eventPtr->xbutton.button & 1) ? 1 : -1;
 	    if (eventPtr->xkey.keycode > Button5) {
 		eventPtr->xkey.state |= ShiftMask;
diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index 78363d0..37e3568 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -189,7 +189,7 @@ enum {
 
     if (err == noErr) {
 	state |= (buttons & 0x1F) * Button1Mask;
-    } else if (button <= 9) {
+    } else if (button <= Button9) {
 	switch (eventType) {
 	case NSLeftMouseDown:
 	case NSRightMouseDown:
-- 
cgit v0.12


From f97059c69925b78f7f7e291b86fa2089f58291a6 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 26 Jul 2019 09:06:10 +0000
Subject: Further experiment: Bring scalefactor back to 120 (as it was for
 win32)

---
 doc/event.n                 |  4 ++--
 generic/tkBind.c            |  4 ++--
 generic/tkEvent.c           |  2 +-
 generic/tkPointer.c         |  3 +--
 library/demos/cscroll.tcl   |  8 ++++----
 library/listbox.tcl         |  8 ++++----
 library/scrlbar.tcl         |  8 ++++----
 library/text.tcl            |  8 ++++----
 library/ttk/utils.tcl       | 35 ++++++++++-------------------------
 macosx/tkMacOSXMouseEvent.c | 14 ++++++++------
 tests/scrollbar.test        |  4 ++--
 win/tkWinX.c                |  4 ++--
 12 files changed, 44 insertions(+), 58 deletions(-)

diff --git a/doc/event.n b/doc/event.n
index be42fa5..5109794 100644
--- a/doc/event.n
+++ b/doc/event.n
@@ -119,8 +119,8 @@ for the event.  Only valid for virtual events.  Corresponds to the
 for the \fBMouseWheel\fR event.  The \fIdelta\fR refers to the
 direction and magnitude the mouse wheel was rotated.  Note the value
 is not a screen distance but are units of motion in the mouse wheel.
-Typically these values are multiples of 40.  For example, 40 should
-scroll the text widget up 4 lines and \-80 would scroll the text
+Typically these values are multiples of 120.  For example, 120 should
+scroll the text widget up 4 lines and \-240 would scroll the text
 widget down 8 lines.  Of course, other widgets may define different
 behaviors for mouse wheel motion.  This field corresponds to the
 \fB%D\fR substitution for binding scripts.
diff --git a/generic/tkBind.c b/generic/tkBind.c
index 03e4a2b..45e07be 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -1996,7 +1996,7 @@ ExpandPercents(
 	    if (flags & BUTTON) {
 		number = eventPtr->xbutton.button;
 		if (number >= Button8) {
-		    number += (Button4 - Button8);
+		    number -= (Button8 - Button4);
 		}
 		goto doNumber;
 	    }
@@ -4239,7 +4239,7 @@ GetPatternObj(
 	    } else {
 		int button =  patPtr->detail.button;
 		if (button >= Button8) {
-			button += (Button4 - Button8);
+			button -= (Button8 - Button4);
 		}
 		Tcl_AppendPrintfToObj(patternObj, "%d", button);
 	    }
diff --git a/generic/tkEvent.c b/generic/tkEvent.c
index dd77c2b..39d9d4b 100644
--- a/generic/tkEvent.c
+++ b/generic/tkEvent.c
@@ -594,7 +594,7 @@ UpdateButtonEventState(
 #if defined(_WIN32) || defined(MAC_OSX_TK)
 	    eventPtr->xkey.nbytes = 0;
 #endif
-	    eventPtr->xkey.keycode = (eventPtr->xbutton.button & 1) ? 40 : -40;
+	    eventPtr->xkey.keycode = (eventPtr->xbutton.button & 1) ? 120 : -120;
 	    if (eventPtr->xkey.keycode > Button5) {
 		eventPtr->xkey.state |= ShiftMask;
 	    }
diff --git a/generic/tkPointer.c b/generic/tkPointer.c
index af5e311..57680c3 100644
--- a/generic/tkPointer.c
+++ b/generic/tkPointer.c
@@ -226,8 +226,7 @@ Tk_UpdatePointer(
     XPoint pos;
     XEvent event;
     int changes = (state ^ tsdPtr->lastState) & ALL_BUTTONS;
-    int type, b;
-    int mask;
+    int type, b, mask;
 
     pos.x = x;
     pos.y = y;
diff --git a/library/demos/cscroll.tcl b/library/demos/cscroll.tcl
index 24d5f89..c709668 100644
--- a/library/demos/cscroll.tcl
+++ b/library/demos/cscroll.tcl
@@ -59,16 +59,16 @@ $c bind all <1> "scrollButton $c"
 bind $c <2> "$c scan mark %x %y"
 bind $c <B2-Motion> "$c scan dragto %x %y"
 bind $c <MouseWheel> {
-    %W yview scroll [expr {-(%D / 40)}] units
+    %W yview scroll [expr {-((%D+60) / 120)}] units
 }
 bind $c <Option-MouseWheel> {
-    %W yview scroll [expr {-(%D / 4)}] units
+    %W yview scroll [expr {-((%D+6) / 12)}] units
 }
 bind $c <Shift-MouseWheel> {
-    %W xview scroll [expr {-(%D / 40)}] units
+    %W xview scroll [expr {-((%D+60) / 120)}] units
 }
 bind $c <Shift-Option-MouseWheel> {
-    %W xview scroll [expr {-(%D / 4)}] units
+    %W xview scroll [expr {-((%D+6) / 12)}] units
 }
 
 proc scrollEnter canvas {
diff --git a/library/listbox.tcl b/library/listbox.tcl
index fd10fe4..ffd7def 100644
--- a/library/listbox.tcl
+++ b/library/listbox.tcl
@@ -177,16 +177,16 @@ bind Listbox <B2-Motion> {
 }
 
 bind Listbox <MouseWheel> {
-    %W yview scroll [expr {-(%D / 40)}] units
+    %W yview scroll [expr {-((%D+60) / 120)}] units
 }
 bind Listbox <Option-MouseWheel> {
-    %W yview scroll [expr {-(%D / 4)}] units
+    %W yview scroll [expr {-((%D+6) / 12)}] units
 }
 bind Listbox <Shift-MouseWheel> {
-    %W xview scroll [expr {-(%D / 40)}] units
+    %W xview scroll [expr {-((%D+60) / 120)}] units
 }
 bind Listbox <Shift-Option-MouseWheel> {
-    %W xview scroll [expr {-(%D / 4)}] units
+    %W xview scroll [expr {-((%D+6) / 12)}] units
 }
 
 
diff --git a/library/scrlbar.tcl b/library/scrlbar.tcl
index 93ded56..dae11ae 100644
--- a/library/scrlbar.tcl
+++ b/library/scrlbar.tcl
@@ -130,16 +130,16 @@ bind Scrollbar <<LineEnd>> {
 }
 
 bind Scrollbar <MouseWheel> {
-    tk::ScrollByUnits %W v [expr {-(%D / 40)}]
+    tk::ScrollByUnits %W v [expr {-((%D+60) / 120)}]
 }
 bind Scrollbar <Option-MouseWheel> {
-    tk::ScrollByUnits %W v [expr {-(%D / 4)}]
+    tk::ScrollByUnits %W v [expr {-((%D+6) / 12)}]
 }
 bind Scrollbar <Shift-MouseWheel> {
-    tk::ScrollByUnits %W h [expr {-(%D / 40)}]
+    tk::ScrollByUnits %W h [expr {-((%D+60) / 120)}]
 }
 bind Scrollbar <Shift-Option-MouseWheel> {
-    tk::ScrollByUnits %W h [expr {-(%D / 4)}]
+    tk::ScrollByUnits %W h [expr {-((%D+6) / 12)}]
 }
 
 # tk::ScrollButtonDown --
diff --git a/library/text.tcl b/library/text.tcl
index 9d635de..72da6ff 100644
--- a/library/text.tcl
+++ b/library/text.tcl
@@ -428,16 +428,16 @@ bind Text <B2-Motion> {
 set ::tk::Priv(prevPos) {}
 
 bind Text <MouseWheel> {
-    %W yview scroll [expr {-(%D)}] pixels
+    %W yview scroll [expr {-((%D+1)/3)}] pixels
 }
 bind Text <Option-MouseWheel> {
-    %W yview scroll [expr {-10 * (%D)}] pixels
+    %W yview scroll [expr {-4 * (%D)}] pixels
 }
 bind Text <Shift-MouseWheel> {
-    %W xview scroll [expr {-(%D)}] pixels
+    %W xview scroll [expr {-((%D+1)/3)}] pixels
 }
 bind Text <Shift-Option-MouseWheel> {
-    %W xview scroll [expr {-10 * (%D)}] pixels
+    %W xview scroll [expr {-4 * (%D)}] pixels
 }
 
 # ::tk::TextClosestGap --
diff --git a/library/ttk/utils.tcl b/library/ttk/utils.tcl
index 140e061..ad36927 100644
--- a/library/ttk/utils.tcl
+++ b/library/ttk/utils.tcl
@@ -285,7 +285,8 @@ proc ttk::copyBindings {from to} {
 #
 
 proc ttk::bindMouseWheel {bindtag callback} {
-    bind $bindtag <MouseWheel> [append callback { [expr {-(%D/40)}]}]
+    bind $bindtag <MouseWheel> [append callback { [expr {-((%D+60)/120)}]}]
+    bind $bindtag <Option-MouseWheel> [append callback { [expr {-((%D+6)/12)}]}]
 }
 
 ## Mousewheel bindings for standard scrollable widgets.
@@ -296,29 +297,13 @@ proc ttk::bindMouseWheel {bindtag callback} {
 # standard scrollbar protocol.
 #
 
-switch -- [tk windowingsystem] {
-    x11 {
-	bind TtkScrollable <ButtonPress-4>       { %W yview scroll -5 units }
-	bind TtkScrollable <ButtonPress-5>       { %W yview scroll  5 units }
-	bind TtkScrollable <Shift-ButtonPress-4> { %W xview scroll -5 units }
-	bind TtkScrollable <Shift-ButtonPress-5> { %W xview scroll  5 units }
-    }
-    win32 {
-	bind TtkScrollable <MouseWheel> \
-	    { %W yview scroll [expr {-(%D/120)}] units }
-	bind TtkScrollable <Shift-MouseWheel> \
-	    { %W xview scroll [expr {-(%D/120)}] units }
-    }
-    aqua {
-	bind TtkScrollable <MouseWheel> \
-	    { %W yview scroll [expr {-(%D)}] units }
-	bind TtkScrollable <Shift-MouseWheel> \
-	    { %W xview scroll [expr {-(%D)}] units }
-	bind TtkScrollable <Option-MouseWheel> \
-	    { %W yview scroll  [expr {-10*(%D)}] units }
-	bind TtkScrollable <Shift-Option-MouseWheel> \
-	    { %W xview scroll [expr {-10*(%D)}] units }
-    }
-}
+bind TtkScrollable <MouseWheel> \
+{ %W yview scroll [expr {-((%D+60)/120)}] units }
+bind TtkScrollable <Option-MouseWheel> \
+{ %W yview scroll [expr {-((%D+6)/12)}] units }
+bind TtkScrollable <Shift-MouseWheel> \
+{ %W xview scroll [expr {-((%D+60)/120)}] units }
+bind TtkScrollable <Shift-Option-MouseWheel> \
+{ %W xview scroll [expr {-((%D+6)/12)}] units }
 
 #*EOF*
diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index ed67bae..92d2daf 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -267,21 +267,23 @@ enum {
 	xEvent.xany.display = Tk_Display(tkwin);
 	xEvent.xany.window = Tk_WindowId(tkwin);
 
-	delta = [theEvent deltaY] * 40;
+	delta = [theEvent deltaY] * 120;
 	if (delta != 0.0) {
-	    coarseDelta = (delta > -40.0 && delta < 40.0) ?
-		    (signbit(delta) ? -40 : 40 : lround(delta);
+	    coarseDelta = (delta > -120.0 && delta < 120.0) ?
+		    (signbit(delta) ? -120 : 120 : lround(delta);
 	    xEvent.xbutton.state = state;
 	    xEvent.xkey.keycode = coarseDelta;
+	    xEvent.xkey.nbytes = 0;
 	    xEvent.xany.serial = LastKnownRequestProcessed(Tk_Display(tkwin));
 	    Tk_QueueWindowEvent(&xEvent, TCL_QUEUE_TAIL);
 	}
-	delta = [theEvent deltaX] * 40;
+	delta = [theEvent deltaX] * 120;
 	if (delta != 0.0) {
-	    coarseDelta = (delta > -40.0 && delta < 40.0) ?
-		    (signbit(delta) ? -40 : 40) : lround(delta);
+	    coarseDelta = (delta > -120.0 && delta < 120.0) ?
+		    (signbit(delta) ? -120 : 120) : lround(delta);
 	    xEvent.xbutton.state = state | ShiftMask;
 	    xEvent.xkey.keycode = coarseDelta;
+	    xEvent.xkey.nbytes = 0;
 	    xEvent.xany.serial = LastKnownRequestProcessed(Tk_Display(tkwin));
 	    Tk_QueueWindowEvent(&xEvent, TCL_QUEUE_TAIL);
 	}
diff --git a/tests/scrollbar.test b/tests/scrollbar.test
index d235656..e6e6bdd 100644
--- a/tests/scrollbar.test
+++ b/tests/scrollbar.test
@@ -693,7 +693,7 @@ test scrollbar-10.1 {<MouseWheel> event on scrollbar} -setup {
     pack [scrollbar .s -command {.t yview}] -fill y -expand 1 -side left
     update
     focus -force .s
-    event generate .s <MouseWheel> -delta -150
+    event generate .s <MouseWheel> -delta -120
     after 200 {set eventprocessed 1} ; vwait eventprocessed
     .t index @0,0
 } -cleanup {
@@ -708,7 +708,7 @@ test scrollbar-10.2 {<MouseWheel> event on scrollbar} -setup {
     pack [scrollbar .s -command {.t xview} -orient horizontal] -fill x -expand 1 -side top
     update
     focus -force .s
-    event generate .s <Shift-MouseWheel> -delta -150
+    event generate .s <Shift-MouseWheel> -delta -120
     after 200 {set eventprocessed 1} ; vwait eventprocessed
     .t index @0,0
 } -cleanup {
diff --git a/win/tkWinX.c b/win/tkWinX.c
index 8127eef..9d474ac 100644
--- a/win/tkWinX.c
+++ b/win/tkWinX.c
@@ -1142,7 +1142,7 @@ GenerateXEvent(
 	    event.type = MouseWheelEvent;
 	    event.xany.send_event = -1;
 	    event.xkey.nbytes = 0;
-	    event.xkey.keycode = tsdPtr->vWheelAcc / WHEEL_DELTA * WHEEL_DELTA / 3;
+	    event.xkey.keycode = tsdPtr->vWheelAcc / WHEEL_DELTA * WHEEL_DELTA;
 	    tsdPtr->vWheelAcc = tsdPtr->vWheelAcc % WHEEL_DELTA;
 	    break;
 	}
@@ -1175,7 +1175,7 @@ GenerateXEvent(
 	    event.xany.send_event = -1;
 	    event.xkey.nbytes = 0;
 	    event.xkey.state |= ShiftMask;
-	    event.xkey.keycode = tsdPtr->hWheelAcc / WHEEL_DELTA * WHEEL_DELTA / 3;
+	    event.xkey.keycode = tsdPtr->hWheelAcc / WHEEL_DELTA * WHEEL_DELTA;
 	    tsdPtr->hWheelAcc = tsdPtr->hWheelAcc % WHEEL_DELTA;
 	    break;
 	}
-- 
cgit v0.12


From 6162cfbddcf8e3a169053a09e42e89f5d7b56b28 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 26 Jul 2019 09:57:24 +0000
Subject: Fix MouseWheel bindings for listbox and scrollbar: This fixes
 test-failures on Win32. Still to be tested on MacOS and X11

---
 generic/tkInt.h     | 2 +-
 library/listbox.tcl | 8 ++++----
 library/scrlbar.tcl | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/generic/tkInt.h b/generic/tkInt.h
index a3aa36f..07591d1 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -981,7 +981,7 @@ typedef struct TkpClipMask {
 # define Button6Mask (1<<13)
 #endif
 #ifndef Button7Mask
-# define Button7Mask (1<<13)
+# define Button7Mask (1<<14)
 #endif
 #ifndef Button8Mask
 # define Button8Mask (AnyModifier<<4)
diff --git a/library/listbox.tcl b/library/listbox.tcl
index ffd7def..769fe25 100644
--- a/library/listbox.tcl
+++ b/library/listbox.tcl
@@ -177,16 +177,16 @@ bind Listbox <B2-Motion> {
 }
 
 bind Listbox <MouseWheel> {
-    %W yview scroll [expr {-((%D+60) / 120)}] units
+    %W yview scroll [expr {-((%D+15) / 30)}] units
 }
 bind Listbox <Option-MouseWheel> {
-    %W yview scroll [expr {-((%D+6) / 12)}] units
+    %W yview scroll [expr {-((%D+1) / 3)}] units
 }
 bind Listbox <Shift-MouseWheel> {
-    %W xview scroll [expr {-((%D+60) / 120)}] units
+    %W xview scroll [expr {-((%D+15) / 30)}] units
 }
 bind Listbox <Shift-Option-MouseWheel> {
-    %W xview scroll [expr {-((%D+6) / 12)}] units
+    %W xview scroll [expr {-((%D+1) / 3)}] units
 }
 
 
diff --git a/library/scrlbar.tcl b/library/scrlbar.tcl
index dae11ae..a20f1a0 100644
--- a/library/scrlbar.tcl
+++ b/library/scrlbar.tcl
@@ -130,16 +130,16 @@ bind Scrollbar <<LineEnd>> {
 }
 
 bind Scrollbar <MouseWheel> {
-    tk::ScrollByUnits %W v [expr {-((%D+60) / 120)}]
+    tk::ScrollByUnits %W v [expr {-((%D+15) / 30)}]
 }
 bind Scrollbar <Option-MouseWheel> {
-    tk::ScrollByUnits %W v [expr {-((%D+6) / 12)}]
+    tk::ScrollByUnits %W v [expr {-((%D+1) / 3)}]
 }
 bind Scrollbar <Shift-MouseWheel> {
-    tk::ScrollByUnits %W h [expr {-((%D+60) / 120)}]
+    tk::ScrollByUnits %W h [expr {-((%D+15) / 30)}]
 }
 bind Scrollbar <Shift-Option-MouseWheel> {
-    tk::ScrollByUnits %W h [expr {-((%D+6) / 12)}]
+    tk::ScrollByUnits %W h [expr {-((%D+1) / 3)}]
 }
 
 # tk::ScrollButtonDown --
-- 
cgit v0.12


From 9e83cbe850e17780f646217d932645e2105b605c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 29 Jul 2019 12:48:00 +0000
Subject: Add support for "(x|y)view scroll number mouseunits" for text widget,
 and use it in mouse bindings.

---
 generic/tkTextDisp.c | 20 +++++++++++++++++---
 generic/tkUtil.c     |  8 ++++----
 library/text.tcl     |  8 ++++----
 tests/entry.test     |  4 ++--
 tests/spinbox.test   |  4 ++--
 tests/textDisp.test  | 16 ++++++++--------
 tests/util.test      |  6 +++---
 7 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index d4f6b83..2aeec2e 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -631,6 +631,7 @@ static int              IsStartOfNotMergedLine(TkText *textPtr,
 #define TKTEXT_SCROLL_UNITS	3
 #define TKTEXT_SCROLL_ERROR	4
 #define TKTEXT_SCROLL_PIXELS	5
+#define TKTEXT_SCROLL_MOUSE	6
 
 /*
  *----------------------------------------------------------------------
@@ -5893,6 +5894,10 @@ TkTextXviewCmd(
     case TKTEXT_SCROLL_PIXELS:
 	dInfoPtr->newXPixelOffset += count;
 	break;
+    case TKTEXT_SCROLL_MOUSE:
+	if (count < 0) count -= 2;
+	dInfoPtr->newXPixelOffset += (-count)/3;
+	break;
     }
 
     dInfoPtr->flags |= DINFO_OUT_OF_DATE;
@@ -6297,6 +6302,10 @@ TkTextYviewCmd(
     case TKTEXT_SCROLL_PIXELS:
 	YScrollByPixels(textPtr, count);
 	break;
+    case TKTEXT_SCROLL_MOUSE:
+	if (count < 0) count -= 2;
+	YScrollByPixels(textPtr, (-count)/3);
+	break;
     case TKTEXT_SCROLL_UNITS:
 	YScrollByLines(textPtr, count);
 	break;
@@ -8770,10 +8779,10 @@ TextGetScrollInfoObj(
 	VIEW_MOVETO, VIEW_SCROLL
     };
     static const char *const units[] = {
-	"units", "pages", "pixels", NULL
+	"mouseunits", "pages", "pixels", "units", NULL
     };
     enum viewUnits {
-	VIEW_SCROLL_UNITS, VIEW_SCROLL_PAGES, VIEW_SCROLL_PIXELS
+	VIEW_SCROLL_MOUSE, VIEW_SCROLL_PAGES, VIEW_SCROLL_PIXELS, VIEW_SCROLL_UNITS
     };
     int index;
 
@@ -8794,7 +8803,7 @@ TextGetScrollInfoObj(
 	return TKTEXT_SCROLL_MOVETO;
     case VIEW_SCROLL:
 	if (objc != 5) {
-	    Tcl_WrongNumArgs(interp, 3, objv, "number units|pages|pixels");
+	    Tcl_WrongNumArgs(interp, 3, objv, "number mouseunits|pages|pixels|units");
 	    return TKTEXT_SCROLL_ERROR;
 	}
 	if (Tcl_GetIndexFromObjStruct(interp, objv[4], units,
@@ -8802,6 +8811,11 @@ TextGetScrollInfoObj(
 	    return TKTEXT_SCROLL_ERROR;
 	}
 	switch ((enum viewUnits) index) {
+	case VIEW_SCROLL_MOUSE:
+	    if (Tcl_GetIntFromObj(interp, objv[3], intPtr) != TCL_OK) {
+		return TKTEXT_SCROLL_ERROR;
+	    }
+	    return TKTEXT_SCROLL_MOUSE;
 	case VIEW_SCROLL_PAGES:
 	    if (Tcl_GetIntFromObj(interp, objv[3], intPtr) != TCL_OK) {
 		return TKTEXT_SCROLL_ERROR;
diff --git a/generic/tkUtil.c b/generic/tkUtil.c
index 2950fe0..4844bc2 100644
--- a/generic/tkUtil.c
+++ b/generic/tkUtil.c
@@ -668,7 +668,7 @@ Tk_GetScrollInfo(
 	if (argc != 5) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "wrong # args: should be \"%s %s %s\"",
-		    argv[0], argv[1], "scroll number units|pages"));
+		    argv[0], argv[1], "scroll number pages|units"));
 	    Tcl_SetErrorCode(interp, "TCL", "WRONGARGS", NULL);
 	    return TK_SCROLL_ERROR;
 	}
@@ -684,7 +684,7 @@ Tk_GetScrollInfo(
 	}
 
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		"bad argument \"%s\": must be units or pages", argv[4]));
+		"bad argument \"%s\": must be pages or units", argv[4]));
 	Tcl_SetErrorCode(interp, "TK", "VALUE", "SCROLL_UNITS", NULL);
 	return TK_SCROLL_ERROR;
     }
@@ -746,7 +746,7 @@ Tk_GetScrollInfoObj(
 	return TK_SCROLL_MOVETO;
     } else if (ArgPfxEq("scroll")) {
 	if (objc != 5) {
-	    Tcl_WrongNumArgs(interp, 2, objv, "scroll number units|pages");
+	    Tcl_WrongNumArgs(interp, 2, objv, "scroll number pages|units");
 	    return TK_SCROLL_ERROR;
 	}
 	if (Tcl_GetIntFromObj(interp, objv[3], intPtr) != TCL_OK) {
@@ -761,7 +761,7 @@ Tk_GetScrollInfoObj(
 	}
 
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		"bad argument \"%s\": must be units or pages", arg));
+		"bad argument \"%s\": must be pages or units", arg));
 	Tcl_SetErrorCode(interp, "TK", "VALUE", "SCROLL_UNITS", NULL);
 	return TK_SCROLL_ERROR;
     }
diff --git a/library/text.tcl b/library/text.tcl
index 72da6ff..98255e4 100644
--- a/library/text.tcl
+++ b/library/text.tcl
@@ -428,16 +428,16 @@ bind Text <B2-Motion> {
 set ::tk::Priv(prevPos) {}
 
 bind Text <MouseWheel> {
-    %W yview scroll [expr {-((%D+1)/3)}] pixels
+    %W yview scroll %D mouseunits
 }
 bind Text <Option-MouseWheel> {
-    %W yview scroll [expr {-4 * (%D)}] pixels
+    %W yview scroll [expr {10 * (%D)}] mouseunits
 }
 bind Text <Shift-MouseWheel> {
-    %W xview scroll [expr {-((%D+1)/3)}] pixels
+    %W xview scroll %D mouseunits
 }
 bind Text <Shift-Option-MouseWheel> {
-    %W xview scroll [expr {-4 * (%D)}] pixels
+    %W xview scroll [expr {10 * (%D)}] mouseunits
 }
 
 # ::tk::TextClosestGap --
diff --git a/tests/entry.test b/tests/entry.test
index 75a5da8..6207c69 100644
--- a/tests/entry.test
+++ b/tests/entry.test
@@ -1435,7 +1435,7 @@ test entry-3.71 {EntryWidgetCmd procedure, "xview" widget command} -setup {
     .e xview scroll 24
 } -cleanup {
     destroy .e
-} -returnCodes error -result {wrong # args: should be ".e xview scroll number units|pages"}
+} -returnCodes error -result {wrong # args: should be ".e xview scroll number pages|units"}
 test entry-3.72 {EntryWidgetCmd procedure, "xview" widget command} -setup {
     entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
@@ -1512,7 +1512,7 @@ test entry-3.77 {EntryWidgetCmd procedure, "xview" widget command} -setup {
     .e xview scroll 23 foobars
 } -cleanup {
     destroy .e
-} -returnCodes error -result {bad argument "foobars": must be units or pages}
+} -returnCodes error -result {bad argument "foobars": must be pages or units}
 test entry-3.78 {EntryWidgetCmd procedure, "xview" widget command} -setup {
     entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
diff --git a/tests/spinbox.test b/tests/spinbox.test
index 28ebe68..efd5b63 100644
--- a/tests/spinbox.test
+++ b/tests/spinbox.test
@@ -1773,7 +1773,7 @@ test spinbox-3.71 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     .e xview scroll 24
 } -cleanup {
     destroy .e
-} -returnCodes error -result {wrong # args: should be ".e xview scroll number units|pages"}
+} -returnCodes error -result {wrong # args: should be ".e xview scroll number pages|units"}
 test spinbox-3.72 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
@@ -1850,7 +1850,7 @@ test spinbox-3.77 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     .e xview scroll 23 foobars
 } -cleanup {
     destroy .e
-} -returnCodes error -result {bad argument "foobars": must be units or pages}
+} -returnCodes error -result {bad argument "foobars": must be pages or units}
 test spinbox-3.78 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
diff --git a/tests/textDisp.test b/tests/textDisp.test
index 5df5467..698f8a7 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -1867,10 +1867,10 @@ test textDisp-14.9 {TkTextXviewCmd procedure} {
 } [list [expr {9.0/14}] 1.0]
 test textDisp-14.10 {TkTextXviewCmd procedure} {
     list [catch {.t xview scroll a} msg] $msg
-} {1 {wrong # args: should be ".t xview scroll number units|pages|pixels"}}
+} {1 {wrong # args: should be ".t xview scroll number mouseunits|pages|pixels|units"}}
 test textDisp-14.11 {TkTextXviewCmd procedure} {
     list [catch {.t xview scroll a b c} msg] $msg
-} {1 {wrong # args: should be ".t xview scroll number units|pages|pixels"}}
+} {1 {wrong # args: should be ".t xview scroll number mouseunits|pages|pixels|units"}}
 test textDisp-14.12 {TkTextXviewCmd procedure} {
     list [catch {.t xview scroll gorp units} msg] $msg
 } {1 {expected integer but got "gorp"}}
@@ -1904,7 +1904,7 @@ test textDisp-14.14 {TkTextXviewCmd procedure} {
 } {2.21 2.20 2.99 2.84}
 test textDisp-14.15 {TkTextXviewCmd procedure} {
     list [catch {.t xview scroll 14 globs} msg] $msg
-} {1 {bad argument "globs": must be units, pages, or pixels}}
+} {1 {bad argument "globs": must be mouseunits, pages, pixels, or units}}
 test textDisp-14.16 {TkTextXviewCmd procedure} {
     list [catch {.t xview flounder} msg] $msg
 } {1 {bad option "flounder": must be moveto or scroll}}
@@ -2086,13 +2086,13 @@ test textDisp-16.18 {TkTextYviewCmd procedure, "moveto" roundoff} {textfonts} {
 } [list [expr {1.0/3}] [expr {5.0/6}]]
 test textDisp-16.19 {TkTextYviewCmd procedure, "scroll" option} {
     list [catch {.t yview scroll a} msg] $msg
-} {1 {wrong # args: should be ".t yview scroll number units|pages|pixels"}}
+} {1 {wrong # args: should be ".t yview scroll number mouseunits|pages|pixels|units"}}
 test textDisp-16.20 {TkTextYviewCmd procedure, "scroll" option} {
     list [catch {.t yview scroll a b c} msg] $msg
-} {1 {wrong # args: should be ".t yview scroll number units|pages|pixels"}}
+} {1 {wrong # args: should be ".t yview scroll number mouseunits|pages|pixels|units"}}
 test textDisp-16.21 {TkTextYviewCmd procedure, "scroll" option} {
     list [catch {.t yview scroll badInt bogus} msg] $msg
-} {1 {bad argument "bogus": must be units, pages, or pixels}}
+} {1 {bad argument "bogus": must be mouseunits, pages, pixels, or units}}
 test textDisp-16.21.2 {TkTextYviewCmd procedure, "scroll" option} {
     list [catch {.t yview scroll badInt units} msg] $msg
 } {1 {expected integer but got "badInt"}}
@@ -2104,7 +2104,7 @@ test textDisp-16.22 {TkTextYviewCmd procedure, "scroll" option, back pages} {
 } {42.0}
 test textDisp-16.22.1 {TkTextYviewCmd procedure, "scroll" option, back pages} {
     list [catch {.t yview scroll -3 p} res] $res
-} {1 {ambiguous argument "p": must be units, pages, or pixels}}
+} {1 {ambiguous argument "p": must be mouseunits, pages, pixels, or units}}
 test textDisp-16.23 {TkTextYviewCmd procedure, "scroll" option, back pages} {
     .t yview 50.0
     update
@@ -2175,7 +2175,7 @@ test textDisp-16.31 {TkTextYviewCmd procedure, "scroll units" option} {
 } {151.40}
 test textDisp-16.32 {TkTextYviewCmd procedure} {
     list [catch {.t yview scroll 12 bogoids} msg] $msg
-} {1 {bad argument "bogoids": must be units, pages, or pixels}}
+} {1 {bad argument "bogoids": must be mouseunits, pages, pixels, or units}}
 test textDisp-16.33 {TkTextYviewCmd procedure} {
     list [catch {.t yview bad_arg 1 2} msg] $msg
 } {1 {bad option "bad_arg": must be moveto or scroll}}
diff --git a/tests/util.test b/tests/util.test
index c1ec6a5..d457b50 100644
--- a/tests/util.test
+++ b/tests/util.test
@@ -28,10 +28,10 @@ test util-1.3 {Tk_GetScrollInfo procedure} -body {
 } -result {0.5 0.75}
 test util-1.4 {Tk_GetScrollInfo procedure} -body {
     .l yview scroll a
-} -returnCodes error -result {wrong # args: should be ".l yview scroll number units|pages"}
+} -returnCodes error -result {wrong # args: should be ".l yview scroll number pages|units"}
 test util-1.5 {Tk_GetScrollInfo procedure} -body {
     .l yview scroll a b c
-} -returnCodes error -result {wrong # args: should be ".l yview scroll number units|pages"}
+} -returnCodes error -result {wrong # args: should be ".l yview scroll number pages|units"}
 test util-1.6 {Tk_GetScrollInfo procedure} -body {
     .l yview scroll xyz units
 } -returnCodes error -result {expected integer but got "xyz"}
@@ -57,7 +57,7 @@ test util-1.10 {Tk_GetScrollInfo procedure} -body {
 } -result {13}
 test util-1.11 {Tk_GetScrollInfo procedure} -body {
     .l yview scroll 3 zips
-} -returnCodes error -result {bad argument "zips": must be units or pages}
+} -returnCodes error -result {bad argument "zips": must be pages or units}
 test util-1.12 {Tk_GetScrollInfo procedure} -body {
     .l yview dropdead 3 times
 } -returnCodes error -result {unknown option "dropdead": must be moveto or scroll}
-- 
cgit v0.12


From 099f9695819a7024079f79db648c326601bac8b4 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 30 Jul 2019 07:27:43 +0000
Subject: Put (x|y)view scroll options in alphabetical order

---
 doc/GetScroll.3     |  8 ++++----
 doc/canvas.n        | 16 ++++++++--------
 doc/entry.n         | 12 ++++++------
 doc/listbox.n       | 16 +++++++++-------
 doc/scrollbar.n     | 18 +++++++++---------
 doc/spinbox.n       | 10 +++++-----
 doc/text.n          | 32 ++++++++++++++++++--------------
 doc/ttk_scrollbar.n | 16 ++++++++--------
 doc/ttk_widget.n    | 14 ++++++++------
 9 files changed, 75 insertions(+), 67 deletions(-)

diff --git a/doc/GetScroll.3 b/doc/GetScroll.3
index c0b302d..dd12cca 100644
--- a/doc/GetScroll.3
+++ b/doc/GetScroll.3
@@ -50,18 +50,18 @@ and parses the words starting with \fIobjv\fR[2].
 The words starting with \fIobjv\fR[2] must have one of the following forms:
 .CS
 \fBmoveto \fIfraction\fR
-\fBscroll \fInumber\fB units\fR
 \fBscroll \fInumber\fB pages\fR
+\fBscroll \fInumber\fB units\fR
 .CE
 .LP
-Any of the \fBmoveto\fR, \fBscroll\fR, \fBunits\fR, and \fBpages\fR
+Any of the \fBmoveto\fR, \fBscroll\fR, \fBpages\fR, and \fBunits\fR
 keywords may be abbreviated.
 If \fIobjv\fR has the \fBmoveto\fR form, \fBTK_SCROLL_MOVETO\fR
 is returned as result and \fI*fractionPtr\fR is filled in with the
 \fIfraction\fR argument to the command, which must be a proper real
 value.
-If \fIobjv\fR has the \fBscroll\fR form, \fBTK_SCROLL_UNITS\fR
-or \fBTK_SCROLL_PAGES\fR is returned and \fI*stepsPtr\fR is filled
+If \fIobjv\fR has the \fBscroll\fR form, \fBTK_SCROLL_PAGES\fR
+or \fBTK_SCROLL_UNITS\fR is returned and \fI*stepsPtr\fR is filled
 in with the \fInumber\fR value, which must be a proper integer.
 If an error occurs in parsing the arguments, \fBTK_SCROLL_ERROR\fR
 is returned and an error message is left in interpreter
diff --git a/doc/canvas.n b/doc/canvas.n
index bad9113..ddaebcf 100644
--- a/doc/canvas.n
+++ b/doc/canvas.n
@@ -1147,16 +1147,16 @@ total width of the canvas is off-screen to the left.
 This command shifts the view in the window left or right according to
 \fInumber\fR and \fIwhat\fR.
 \fINumber\fR must be an integer.
-\fIWhat\fR must be either \fBunits\fR or \fBpages\fR or an abbreviation
+\fIWhat\fR must be either \fBpages\fR or \fBunits\fR or an abbreviation
 of one of these.
-If \fIwhat\fR is \fBunits\fR, the view adjusts left or right in units
-of the \fBxScrollIncrement\fR option, if it is greater than zero,
-or in units of one-tenth the window's width otherwise.
 If \fIwhat is \fBpages\fR then the view
 adjusts in units of nine-tenths the window's width.
 If \fInumber\fR is negative then information farther to the left
 becomes visible; if it is positive then information farther to the right
 becomes visible.
+If \fIwhat\fR is \fBunits\fR, the view adjusts left or right in units
+of the \fBxScrollIncrement\fR option, if it is greater than zero,
+or in units of one-tenth the window's width otherwise.
 .RE
 .TP
 \fIpathName \fByview \fI?args\fR?
@@ -1188,15 +1188,15 @@ area is off-screen to the top.
 This command adjusts the view in the window up or down according to
 \fInumber\fR and \fIwhat\fR.
 \fINumber\fR must be an integer.
-\fIWhat\fR must be either \fBunits\fR or \fBpages\fR.
-If \fIwhat\fR is \fBunits\fR, the view adjusts up or down in units
-of the \fByScrollIncrement\fR option, if it is greater than zero,
-or in units of one-tenth the window's height otherwise.
+\fIWhat\fR must be either \fBpages\fR or \fBunits\fR.
 If \fIwhat\fR is \fBpages\fR then
 the view adjusts in units of nine-tenths the window's height.
 If \fInumber\fR is negative then higher information becomes
 visible; if it is positive then lower information
 becomes visible.
+If \fIwhat\fR is \fBunits\fR, the view adjusts up or down in units
+of the \fByScrollIncrement\fR option, if it is greater than zero,
+or in units of one-tenth the window's height otherwise.
 .RE
 .SH "OVERVIEW OF ITEM TYPES"
 .PP
diff --git a/doc/entry.n b/doc/entry.n
index abbf53d..4589af0 100644
--- a/doc/entry.n
+++ b/doc/entry.n
@@ -404,14 +404,14 @@ way through the text appears at the left edge of the window.
 This command shifts the view in the window left or right according to
 \fInumber\fR and \fIwhat\fR.
 \fINumber\fR must be an integer.
-\fIWhat\fR must be either \fBunits\fR or \fBpages\fR or an abbreviation
+\fIWhat\fR must be either \fBpages\fR or \fBunits\fR or an abbreviation
 of one of these.
-If \fIwhat\fR is \fBunits\fR, the view adjusts left or right by
-\fInumber\fR average-width characters on the display;  if it is
-\fBpages\fR then the view adjusts by \fInumber\fR screenfuls.
-If \fInumber\fR is negative then characters farther to the left
-become visible;  if it is positive then characters farther to the right
+If \fIwhat\fR is \fBpages\fR then the view adjusts by \fInumber\fR screenfuls.
+If \fInumber\fR is negative then characters farther to the left become
+visible;  if it is positive then characters farther to the right
 become visible.
+If \fIwhat\fR is \fBunits\fR, the view adjusts left or right by
+\fInumber\fR average-width characters on the display.
 .RE
 .SH "DEFAULT BINDINGS"
 .PP
diff --git a/doc/listbox.n b/doc/listbox.n
index 66b75b9..ef3ae1c 100644
--- a/doc/listbox.n
+++ b/doc/listbox.n
@@ -384,15 +384,16 @@ total width of the listbox text is off-screen to the left.
 This command shifts the view in the window left or right according to
 \fInumber\fR and \fIwhat\fR.
 \fINumber\fR must be an integer.
-\fIWhat\fR must be either \fBunits\fR or \fBpages\fR or an abbreviation
+\fIWhat\fR must be either \fBpages\fR or \fBunits\fR or an abbreviation
 of one of these.
-If \fIwhat\fR is \fBunits\fR, the view adjusts left or right by
-\fInumber\fR character units (the width of the \fB0\fR character)
-on the display;  if it is \fBpages\fR then the view adjusts by
+If \fIwhat\fR is \fBpages\fR then the view adjusts by
 \fInumber\fR screenfuls.
 If \fInumber\fR is negative then characters farther to the left
 become visible;  if it is positive then characters farther to the right
 become visible.
+If \fIwhat\fR is \fBunits\fR, the view adjusts left or right by
+\fInumber\fR character units (the width of the \fB0\fR character)
+on the display.
 .RE
 .TP
 \fIpathName \fByview \fR?\fIargs\fR?
@@ -431,13 +432,14 @@ way through the listbox, and so on.
 This command adjusts the view in the window up or down according to
 \fInumber\fR and \fIwhat\fR.
 \fINumber\fR must be an integer.
-\fIWhat\fR must be either \fBunits\fR or \fBpages\fR.
-If \fIwhat\fR is \fBunits\fR, the view adjusts up or down by
-\fInumber\fR lines;  if it is \fBpages\fR then
+\fIWhat\fR must be either \fBpages\fR or \fBunits\fR.
+If \fIwhat\fR is \fBpages\fR then
 the view adjusts by \fInumber\fR screenfuls.
 If \fInumber\fR is negative then earlier elements
 become visible;  if it is positive then later elements
 become visible.
+If \fIwhat\fR is \fBunits\fR, the view adjusts up or down by
+\fInumber\fR lines.
 .RE
 .SH "DEFAULT BINDINGS"
 .PP
diff --git a/doc/scrollbar.n b/doc/scrollbar.n
index 4b1d4ba..5a062ce 100644
--- a/doc/scrollbar.n
+++ b/doc/scrollbar.n
@@ -215,15 +215,6 @@ document.  1.0 refers to the end of the document, 0.333
 refers to a point one-third of the way through the document,
 and so on.
 .TP
-\fIprefix \fBscroll \fInumber \fBunits\fR
-.
-The widget should adjust its view by \fInumber\fR units.
-The units are defined in whatever way makes sense for the widget,
-such as characters or lines in a text widget.
-\fINumber\fR is either 1, which means one unit should scroll off
-the top or left of the window, or \-1, which means that one unit
-should scroll off the bottom or right of the window.
-.TP
 \fIprefix \fBscroll \fInumber \fBpages\fR
 .
 The widget should adjust its view by \fInumber\fR pages.
@@ -233,6 +224,15 @@ is a slight overlap between the old and new views.
 \fINumber\fR is either 1, which means the next page should
 become visible, or \-1, which means that the previous page should
 become visible.
+.TP
+\fIprefix \fBscroll \fInumber \fBunits\fR
+.
+The widget should adjust its view by \fInumber\fR units.
+The units are defined in whatever way makes sense for the widget,
+such as characters or lines in a text widget.
+\fINumber\fR is either 1, which means one unit should scroll off
+the top or left of the window, or \-1, which means that one unit
+should scroll off the bottom or right of the window.
 .SH "OLD COMMAND SYNTAX"
 .PP
 In versions of Tk before 4.0, the \fBset\fR and \fBget\fR widget
diff --git a/doc/spinbox.n b/doc/spinbox.n
index f2b1ff2..6719ca3 100644
--- a/doc/spinbox.n
+++ b/doc/spinbox.n
@@ -471,14 +471,14 @@ way through the text appears at the left edge of the window.
 This command shifts the view in the window left or right according to
 \fInumber\fR and \fIwhat\fR.
 \fINumber\fR must be an integer.
-\fIWhat\fR must be either \fBunits\fR or \fBpages\fR or an abbreviation
+\fIWhat\fR must be either \fBpages\fR or \fBunits\fR or an abbreviation
 of one of these.
-If \fIwhat\fR is \fBunits\fR, the view adjusts left or right by
-\fInumber\fR average-width characters on the display;  if it is
-\fBpages\fR then the view adjusts by \fInumber\fR screenfuls.
-If \fInumber\fR is negative then characters farther to the left
+If \fIwhat\fR is \fBpages\fR then the view adjusts by \fInumber\fR
+screenfuls. If \fInumber\fR is negative then characters farther to the left
 become visible;  if it is positive then characters farther to the right
 become visible.
+If \fIwhat\fR is \fBunits\fR, the view adjusts left or right by
+\fInumber\fR average-width characters on the display.
 .RE
 .SH "DEFAULT BINDINGS"
 .PP
diff --git a/doc/text.n b/doc/text.n
index 250dff7..95a4272 100644
--- a/doc/text.n
+++ b/doc/text.n
@@ -1930,20 +1930,22 @@ and 1.
 \fIpathName \fBxview scroll \fInumber what\fR
 .
 This command shifts the view in the window left or right according to
-\fInumber\fR and \fIwhat\fR. \fIWhat\fR must be \fBunits\fR, \fBpages\fR or
-\fBpixels\fR. If \fIwhat\fR is \fBunits\fR or \fBpages\fR then \fInumber\fR
-must be an integer, otherwise number may be specified in any of the forms
-acceptable to \fBTk_GetPixels\fR, such as
+\fInumber\fR and \fIwhat\fR. \fIWhat\fR must be \fBmouseunits\fR, \fBpages\fR,
+\fBpixels\fR, or \fBunits\fR. If \fIwhat\fR is \fBmouseunits\fR, \fBpages\fR or
+\fBunits\fR then \fInumber\fR must be an integer, otherwise number may be
+specified in any of the forms acceptable to \fBTk_GetPixels\fR, such as
 .QW 2.0c
 or
 .QW 1i
 (the result is rounded to the nearest integer value. If no units are given,
-pixels are assumed). If \fIwhat\fR is \fBunits\fR, the view adjusts left or
-right by \fInumber\fR average-width characters on the display; if it is
-\fBpages\fR then the view adjusts by \fInumber\fR screenfuls; if it is
-\fBpixels\fR then the view adjusts by \fInumber\fR pixels. If \fInumber\fR is
+pixels are assumed). If \fIwhat\fR is \fBpages\fR then the view adjusts by
+\fInumber\fR screenfuls; if it is \fBpixels\fR then the view adjusts by
+\fInumber\fR pixels; if it is \fBunits\fR, the view adjusts left or
+right by \fInumber\fR average-width characters on the display. If \fInumber\fR is
 negative then characters farther to the left become visible; if it is positive
-then characters farther to the right become visible.
+then characters farther to the right become visible. If \fIwhat\fR is
+\fBmouseunits\fR then the view adjusts about -\fInumber\fR/3 pixels, since
+mouse units work in the other direction than pixels.
 .RE
 .TP
 \fIpathName \fByview \fR?\fIargs\fR?
@@ -1978,10 +1980,10 @@ the bottom of the window, and some other pixel is at the top.
 \fIpathName \fByview scroll \fInumber what\fR
 .
 This command adjust the view in the window up or down according to
-\fInumber\fR and \fIwhat\fR. \fIWhat\fR must be \fBunits\fR, \fBpages\fR or
-\fBpixels\fR. If \fIwhat\fR is \fBunits\fR or \fBpages\fR then \fInumber\fR
-must be an integer, otherwise number may be specified in any of the forms
-acceptable to \fBTk_GetPixels\fR, such as
+\fInumber\fR and \fIwhat\fR. \fIWhat\fR must be \fBmouseunits\fR, \fBpages\fR,
+\fBpixels\fR, or \fBunits\fR. If \fIwhat\fR is \fBunits\fR or \fBpages\fR then
+\fInumber\fR must be an integer, otherwise number may be specified in any of
+the forms acceptable to \fBTk_GetPixels\fR, such as
 .QW 2.0c
 or
 .QW 1i
@@ -1991,7 +1993,9 @@ by \fInumber\fR lines on the display; if it is \fBpages\fR then the view
 adjusts by \fInumber\fR screenfuls; if it is \fBpixels\fR then the view
 adjusts by \fInumber\fR pixels. If \fInumber\fR is negative then earlier
 positions in the text become visible; if it is positive then later positions
-in the text become visible.
+in the text become visible. If \fIwhat\fR is \fBmouseunits\fR then the view
+adjusts about -\fInumber\fR/3 pixels, since mouse units work in the other
+direction than pixels.
 .TP
 \fIpathName \fByview \fR?\fB\-pickplace\fR? \fIindex\fR
 .
diff --git a/doc/ttk_scrollbar.n b/doc/ttk_scrollbar.n
index bd80760..08c7f52 100644
--- a/doc/ttk_scrollbar.n
+++ b/doc/ttk_scrollbar.n
@@ -118,14 +118,6 @@ document.  1.0 refers to the end of the document, 0.333
 refers to a point one-third of the way through the document,
 and so on.
 .TP
-\fIprefix \fBscroll \fInumber \fBunits\fR
-The widget should adjust its view by \fInumber\fR units.
-The units are defined in whatever way makes sense for the widget,
-such as characters or lines in a text widget.
-\fINumber\fR is either 1, which means one unit should scroll off
-the top or left of the window, or \-1, which means that one unit
-should scroll off the bottom or right of the window.
-.TP
 \fIprefix \fBscroll \fInumber \fBpages\fR
 The widget should adjust its view by \fInumber\fR pages.
 It is up to the widget to define the meaning of a page;  typically
@@ -134,6 +126,14 @@ is a slight overlap between the old and new views.
 \fINumber\fR is either 1, which means the next page should
 become visible, or \-1, which means that the previous page should
 become visible.
+.TP
+\fIprefix \fBscroll \fInumber \fBunits\fR
+The widget should adjust its view by \fInumber\fR units.
+The units are defined in whatever way makes sense for the widget,
+such as characters or lines in a text widget.
+\fINumber\fR is either 1, which means one unit should scroll off
+the top or left of the window, or \-1, which means that one unit
+should scroll off the bottom or right of the window.
 .SH "WIDGET STATES"
 .PP
 The scrollbar automatically sets the \fBdisabled\fR state bit.
diff --git a/doc/ttk_widget.n b/doc/ttk_widget.n
index b1c280d..2dca269 100644
--- a/doc/ttk_widget.n
+++ b/doc/ttk_widget.n
@@ -254,14 +254,15 @@ way through the content appears at the left edge of the window.
 This command shifts the view in the window left or right according to
 \fInumber\fR and \fIwhat\fR.
 \fINumber\fR must be an integer.
-\fIWhat\fR must be either \fBunits\fR or \fBpages\fR.
+\fIWhat\fR must be either \fBpages\fR or \fBunits\fR.
 '\" or an abbreviation of one of these, but we don't document that.
-If \fIwhat\fR is \fBunits\fR, the view adjusts left or right by
-\fInumber\fR average-width characters on the display;  if it is
+If \fIwhat\fR is
 \fBpages\fR then the view adjusts by \fInumber\fR screenfuls.
 If \fInumber\fR is negative then characters farther to the left
 become visible;  if it is positive then characters farther to the right
 become visible.
+If \fIwhat\fR is \fBunits\fR, the view adjusts left or right by
+\fInumber\fR average-width characters on the display.
 .RE
 .TP
 \fIpathName \fByview \fIargs\fR
@@ -293,14 +294,15 @@ way through the content appears at the top edge of the window.
 This command shifts the view in the window up or down according to
 \fInumber\fR and \fIwhat\fR.
 \fINumber\fR must be an integer.
-\fIWhat\fR must be either \fBunits\fR or \fBpages\fR.
+\fIWhat\fR must be either \fBpages\fR or \fBunits\fR.
 '\" or an abbreviation of one of these, but we don't document that.
-If \fIwhat\fR is \fBunits\fR, the view adjusts up or down by
-\fInumber\fR average-width characters on the display;  if it is
+If \fIwhat\fR is
 \fBpages\fR then the view adjusts by \fInumber\fR screenfuls.
 If \fInumber\fR is negative then items farther to the top
 become visible;  if it is positive then items farther to the bottom
 become visible.
+If \fIwhat\fR is \fBunits\fR, the view adjusts up or down by
+\fInumber\fR average-width characters on the display.
 .RE
 .SH "WIDGET STATES"
 The widget state is a bitmap of independent state flags.
-- 
cgit v0.12


From 127c180c66bf291cae359b4c83fcfce3961af8be Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 22 Aug 2019 15:02:23 +0000
Subject: Allow using floating-point number in "scroll (x|y)view
 (units|pages)". They are rounded away from zero towards an integer.

---
 doc/GetScroll.3       |  3 ++-
 doc/canvas.n          |  3 ++-
 doc/entry.n           |  3 ++-
 doc/listbox.n         |  3 ++-
 doc/spinbox.n         |  3 ++-
 doc/text.n            | 14 +++++---------
 doc/ttk_widget.n      |  3 ++-
 generic/tkTextDisp.c  | 11 ++++++++++-
 library/listbox.tcl   |  8 ++++----
 library/scrlbar.tcl   |  8 ++++----
 library/ttk/utils.tcl | 12 ++++++------
 tests/entry.test      |  2 +-
 tests/spinbox.test    |  2 +-
 tests/textDisp.test   |  8 ++++----
 tests/util.test       |  2 +-
 15 files changed, 48 insertions(+), 37 deletions(-)

diff --git a/doc/GetScroll.3 b/doc/GetScroll.3
index dd12cca..d61e744 100644
--- a/doc/GetScroll.3
+++ b/doc/GetScroll.3
@@ -62,7 +62,8 @@ is returned as result and \fI*fractionPtr\fR is filled in with the
 value.
 If \fIobjv\fR has the \fBscroll\fR form, \fBTK_SCROLL_PAGES\fR
 or \fBTK_SCROLL_UNITS\fR is returned and \fI*stepsPtr\fR is filled
-in with the \fInumber\fR value, which must be a proper integer.
+in with the \fInumber\fR value, which must be a  integer or a float,
+but if it is a float then it is converted to an integer, rounded away from 0.
 If an error occurs in parsing the arguments, \fBTK_SCROLL_ERROR\fR
 is returned and an error message is left in interpreter
 \fIinterp\fR's result.
diff --git a/doc/canvas.n b/doc/canvas.n
index ddaebcf..95c732e 100644
--- a/doc/canvas.n
+++ b/doc/canvas.n
@@ -1146,7 +1146,8 @@ total width of the canvas is off-screen to the left.
 .
 This command shifts the view in the window left or right according to
 \fInumber\fR and \fIwhat\fR.
-\fINumber\fR must be an integer.
+\fINumber\fR must be an integer or a float, but if it is a float then
+it is converted to an integer, rounded away from 0.
 \fIWhat\fR must be either \fBpages\fR or \fBunits\fR or an abbreviation
 of one of these.
 If \fIwhat is \fBpages\fR then the view
diff --git a/doc/entry.n b/doc/entry.n
index 4589af0..dd198a7 100644
--- a/doc/entry.n
+++ b/doc/entry.n
@@ -403,7 +403,8 @@ way through the text appears at the left edge of the window.
 \fIpathName \fBxview scroll \fInumber what\fR
 This command shifts the view in the window left or right according to
 \fInumber\fR and \fIwhat\fR.
-\fINumber\fR must be an integer.
+\fINumber\fR must be an integer or a float, but if it is a float then
+it is converted to an integer, rounded away from 0.
 \fIWhat\fR must be either \fBpages\fR or \fBunits\fR or an abbreviation
 of one of these.
 If \fIwhat\fR is \fBpages\fR then the view adjusts by \fInumber\fR screenfuls.
diff --git a/doc/listbox.n b/doc/listbox.n
index ef3ae1c..c2ff09e 100644
--- a/doc/listbox.n
+++ b/doc/listbox.n
@@ -383,7 +383,8 @@ total width of the listbox text is off-screen to the left.
 .
 This command shifts the view in the window left or right according to
 \fInumber\fR and \fIwhat\fR.
-\fINumber\fR must be an integer.
+\fINumber\fR must be an integer or a float, but if it is a float then
+it is converted to an integer, rounded away from 0.
 \fIWhat\fR must be either \fBpages\fR or \fBunits\fR or an abbreviation
 of one of these.
 If \fIwhat\fR is \fBpages\fR then the view adjusts by
diff --git a/doc/spinbox.n b/doc/spinbox.n
index 6719ca3..6d0646b 100644
--- a/doc/spinbox.n
+++ b/doc/spinbox.n
@@ -470,7 +470,8 @@ way through the text appears at the left edge of the window.
 \fIpathName \fBxview scroll \fInumber what\fR
 This command shifts the view in the window left or right according to
 \fInumber\fR and \fIwhat\fR.
-\fINumber\fR must be an integer.
+\fINumber\fR must be an integer or a float, but if it is a float then
+it is converted to an integer, rounded away from 0.
 \fIWhat\fR must be either \fBpages\fR or \fBunits\fR or an abbreviation
 of one of these.
 If \fIwhat\fR is \fBpages\fR then the view adjusts by \fInumber\fR
diff --git a/doc/text.n b/doc/text.n
index 95a4272..c4128a1 100644
--- a/doc/text.n
+++ b/doc/text.n
@@ -1930,8 +1930,8 @@ and 1.
 \fIpathName \fBxview scroll \fInumber what\fR
 .
 This command shifts the view in the window left or right according to
-\fInumber\fR and \fIwhat\fR. \fIWhat\fR must be \fBmouseunits\fR, \fBpages\fR,
-\fBpixels\fR, or \fBunits\fR. If \fIwhat\fR is \fBmouseunits\fR, \fBpages\fR or
+\fInumber\fR and \fIwhat\fR. \fIWhat\fR must be \fBpages\fR,
+\fBpixels\fR, or \fBunits\fR. If \fIwhat\fR is \fBpages\fR or
 \fBunits\fR then \fInumber\fR must be an integer, otherwise number may be
 specified in any of the forms acceptable to \fBTk_GetPixels\fR, such as
 .QW 2.0c
@@ -1943,9 +1943,7 @@ pixels are assumed). If \fIwhat\fR is \fBpages\fR then the view adjusts by
 \fInumber\fR pixels; if it is \fBunits\fR, the view adjusts left or
 right by \fInumber\fR average-width characters on the display. If \fInumber\fR is
 negative then characters farther to the left become visible; if it is positive
-then characters farther to the right become visible. If \fIwhat\fR is
-\fBmouseunits\fR then the view adjusts about -\fInumber\fR/3 pixels, since
-mouse units work in the other direction than pixels.
+then characters farther to the right become visible.
 .RE
 .TP
 \fIpathName \fByview \fR?\fIargs\fR?
@@ -1980,7 +1978,7 @@ the bottom of the window, and some other pixel is at the top.
 \fIpathName \fByview scroll \fInumber what\fR
 .
 This command adjust the view in the window up or down according to
-\fInumber\fR and \fIwhat\fR. \fIWhat\fR must be \fBmouseunits\fR, \fBpages\fR,
+\fInumber\fR and \fIwhat\fR. \fIWhat\fR must be \fBpages\fR,
 \fBpixels\fR, or \fBunits\fR. If \fIwhat\fR is \fBunits\fR or \fBpages\fR then
 \fInumber\fR must be an integer, otherwise number may be specified in any of
 the forms acceptable to \fBTk_GetPixels\fR, such as
@@ -1993,9 +1991,7 @@ by \fInumber\fR lines on the display; if it is \fBpages\fR then the view
 adjusts by \fInumber\fR screenfuls; if it is \fBpixels\fR then the view
 adjusts by \fInumber\fR pixels. If \fInumber\fR is negative then earlier
 positions in the text become visible; if it is positive then later positions
-in the text become visible. If \fIwhat\fR is \fBmouseunits\fR then the view
-adjusts about -\fInumber\fR/3 pixels, since mouse units work in the other
-direction than pixels.
+in the text become visible.
 .TP
 \fIpathName \fByview \fR?\fB\-pickplace\fR? \fIindex\fR
 .
diff --git a/doc/ttk_widget.n b/doc/ttk_widget.n
index 2dca269..fdacfd0 100644
--- a/doc/ttk_widget.n
+++ b/doc/ttk_widget.n
@@ -253,7 +253,8 @@ way through the content appears at the left edge of the window.
 \fIpathName \fBxview scroll \fInumber what\fR
 This command shifts the view in the window left or right according to
 \fInumber\fR and \fIwhat\fR.
-\fINumber\fR must be an integer.
+\fINumber\fR must be an integer or a float, but if it is a float then
+it is converted to an integer, rounded away from 0.
 \fIWhat\fR must be either \fBpages\fR or \fBunits\fR.
 '\" or an abbreviation of one of these, but we don't document that.
 If \fIwhat\fR is
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 33b9720..e6dc988 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -8776,6 +8776,7 @@ TextGetScrollInfoObj(
 	VIEW_SCROLL_PAGES, VIEW_SCROLL_PIXELS, VIEW_SCROLL_UNITS
     };
     int index;
+    double d;
 
     if (Tcl_GetIndexFromObjStruct(interp, objv[2], subcommands,
 	    sizeof(char *), "option", 0, &index) != TCL_OK) {
@@ -8814,9 +8815,17 @@ TextGetScrollInfoObj(
 	    }
 	    return TKTEXT_SCROLL_PIXELS;
 	case VIEW_SCROLL_UNITS:
-	    if (Tcl_GetIntFromObj(interp, objv[3], intPtr) != TCL_OK) {
+	    if (Tcl_GetDoubleFromObj(interp, objv[3], &d) != TCL_OK) {
 		return TKTEXT_SCROLL_ERROR;
 	    }
+	    if (d > 0) {
+		*intPtr = ceil(d);
+	    } else {
+		*intPtr = floor(d);
+	    }
+	    if (dblPtr) {
+		*dblPtr = d;
+	    }
 	    return TKTEXT_SCROLL_UNITS;
 	}
     }
diff --git a/library/listbox.tcl b/library/listbox.tcl
index 4a76a18..7400494 100644
--- a/library/listbox.tcl
+++ b/library/listbox.tcl
@@ -177,16 +177,16 @@ bind Listbox <B2-Motion> {
 }
 
 bind Listbox <MouseWheel> {
-    %W yview scroll [expr {-(%D/30)}] units
+    %W yview scroll [expr {%D/-30}] units
 }
 bind Listbox <Option-MouseWheel> {
-    %W yview scroll [expr {-(%D/3)}] units
+    %W yview scroll [expr {%D/-3}] units
 }
 bind Listbox <Shift-MouseWheel> {
-    %W xview scroll [expr {-(%D/30)}] units
+    %W xview scroll [expr {%D/-30}] units
 }
 bind Listbox <Shift-Option-MouseWheel> {
-    %W xview scroll [expr {-(%D/3)}] units
+    %W xview scroll [expr {%D/-3}] units
 }
 
 # ::tk::ListboxBeginSelect --
diff --git a/library/scrlbar.tcl b/library/scrlbar.tcl
index d797b24..2b3503a 100644
--- a/library/scrlbar.tcl
+++ b/library/scrlbar.tcl
@@ -130,16 +130,16 @@ bind Scrollbar <<LineEnd>> {
 }
 
 bind Scrollbar <MouseWheel> {
-    tk::ScrollByUnits %W v [expr {-(%D / 30)}]
+    tk::ScrollByUnits %W v [expr {%D/-30.0}]
 }
 bind Scrollbar <Option-MouseWheel> {
-    tk::ScrollByUnits %W v [expr {-(%D / 3)}]
+    tk::ScrollByUnits %W v [expr {%D/-3.0}]
 }
 bind Scrollbar <Shift-MouseWheel> {
-    tk::ScrollByUnits %W h [expr {-(%D / 30)}]
+    tk::ScrollByUnits %W h [expr {%D/-30.0}]
 }
 bind Scrollbar <Shift-Option-MouseWheel> {
-    tk::ScrollByUnits %W h [expr {-(%D / 3)}]
+    tk::ScrollByUnits %W h [expr {%D/-3.0}]
 }
 
 # tk::ScrollButtonDown --
diff --git a/library/ttk/utils.tcl b/library/ttk/utils.tcl
index fc8b4e0..4827aa3 100644
--- a/library/ttk/utils.tcl
+++ b/library/ttk/utils.tcl
@@ -285,8 +285,8 @@ proc ttk::copyBindings {from to} {
 #
 
 proc ttk::bindMouseWheel {bindtag callback} {
-    bind $bindtag <MouseWheel> [append callback { [expr {-(%D / 120)}]}]
-    bind $bindtag <Option-MouseWheel> [append callback { [expr {-(%D / 12)}]}]
+    bind $bindtag <MouseWheel> [append callback { [expr {%D/-120.0}]}]
+    bind $bindtag <Option-MouseWheel> [append callback { [expr {%D/-12.0}]}]
 }
 
 ## Mousewheel bindings for standard scrollable widgets.
@@ -298,12 +298,12 @@ proc ttk::bindMouseWheel {bindtag callback} {
 #
 
 bind TtkScrollable <MouseWheel> \
-	{ %W yview scroll [expr {-(%D / 120)}] units }
+	{ %W yview scroll [expr {%D/-120}] units }
 bind TtkScrollable <Option-MouseWheel> \
-	{ %W yview scroll [expr {-(%D / 12)}] units }
+	{ %W yview scroll [expr {%D/-12}] units }
 bind TtkScrollable <Shift-MouseWheel> \
-	{ %W xview scroll [expr {-(%D / 120)}] units }
+	{ %W xview scroll [expr {%D/-120}] units }
 bind TtkScrollable <Shift-Option-MouseWheel> \
-	{ %W xview scroll [expr {-(%D / 12)}] units }
+	{ %W xview scroll [expr {%D/-12}] units }
 
 #*EOF*
diff --git a/tests/entry.test b/tests/entry.test
index 6207c69..47b459d 100644
--- a/tests/entry.test
+++ b/tests/entry.test
@@ -1446,7 +1446,7 @@ test entry-3.72 {EntryWidgetCmd procedure, "xview" widget command} -setup {
     .e xview scroll gorp units
 } -cleanup {
     destroy .e
-} -returnCodes error -result {expected integer but got "gorp"}
+} -returnCodes error -result {expected floating-point number but got "gorp"}
 test entry-3.73 {EntryWidgetCmd procedure, "xview" widget command} -setup {
     entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
diff --git a/tests/spinbox.test b/tests/spinbox.test
index efd5b63..65c5bd9 100644
--- a/tests/spinbox.test
+++ b/tests/spinbox.test
@@ -1784,7 +1784,7 @@ test spinbox-3.72 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     .e xview scroll gorp units
 } -cleanup {
     destroy .e
-} -returnCodes error -result {expected integer but got "gorp"}
+} -returnCodes error -result {expected floating-point number but got "gorp"}
 test spinbox-3.73 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
diff --git a/tests/textDisp.test b/tests/textDisp.test
index 1b6f4c5..c029a69 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -1873,7 +1873,7 @@ test textDisp-14.11 {TkTextXviewCmd procedure} {
 } {1 {wrong # args: should be ".t xview scroll number pages|pixels|units"}}
 test textDisp-14.12 {TkTextXviewCmd procedure} {
     list [catch {.t xview scroll gorp units} msg] $msg
-} {1 {expected integer but got "gorp"}}
+} {1 {expected floating-point number but got "gorp"}}
 test textDisp-14.13 {TkTextXviewCmd procedure} {
     .t delete 1.0 end
     .t insert end xxxxxxxxx\n
@@ -2091,11 +2091,11 @@ test textDisp-16.20 {TkTextYviewCmd procedure, "scroll" option} {
     list [catch {.t yview scroll a b c} msg] $msg
 } {1 {wrong # args: should be ".t yview scroll number pages|pixels|units"}}
 test textDisp-16.21 {TkTextYviewCmd procedure, "scroll" option} {
-    list [catch {.t yview scroll badInt bogus} msg] $msg
+    list [catch {.t yview scroll bogus bogus} msg] $msg
 } {1 {bad argument "bogus": must be pages, pixels, or units}}
 test textDisp-16.21.2 {TkTextYviewCmd procedure, "scroll" option} {
-    list [catch {.t yview scroll badInt units} msg] $msg
-} {1 {expected integer but got "badInt"}}
+    list [catch {.t yview scroll bogus units} msg] $msg
+} {1 {expected floating-point number but got "bogus"}}
 test textDisp-16.22 {TkTextYviewCmd procedure, "scroll" option, back pages} {
     .t yview 50.0
     update
diff --git a/tests/util.test b/tests/util.test
index d457b50..c2f4542 100644
--- a/tests/util.test
+++ b/tests/util.test
@@ -34,7 +34,7 @@ test util-1.5 {Tk_GetScrollInfo procedure} -body {
 } -returnCodes error -result {wrong # args: should be ".l yview scroll number pages|units"}
 test util-1.6 {Tk_GetScrollInfo procedure} -body {
     .l yview scroll xyz units
-} -returnCodes error -result {expected integer but got "xyz"}
+} -returnCodes error -result {expected floating-point number but got "xyz"}
 test util-1.7 {Tk_GetScrollInfo procedure} -body {
     .l yview 0
     .l yview scroll 2 pages
-- 
cgit v0.12


From 68fc0a0ef4781d53802b28f569935acedc875a92 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 22 Aug 2019 15:29:53 +0000
Subject: Use some more "(x|y)view scroll units" automatic rounding in
 bindings.

---
 library/demos/cscroll.tcl | 15 ++++++++++++++-
 library/iconlist.tcl      |  6 +-----
 library/listbox.tcl       |  8 ++++----
 library/ttk/utils.tcl     |  8 ++++----
 4 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/library/demos/cscroll.tcl b/library/demos/cscroll.tcl
index 7bbb91c..1740f94 100644
--- a/library/demos/cscroll.tcl
+++ b/library/demos/cscroll.tcl
@@ -58,7 +58,20 @@ $c bind all <Any-Leave> "scrollLeave $c"
 $c bind all <1> "scrollButton $c"
 bind $c <2> "$c scan mark %x %y"
 bind $c <B2-Motion> "$c scan dragto %x %y"
-if {[tk windowingsystem] eq "aqua" && ![package vsatisfies [package provide Tk] 8.7-]} {
+if {[package vsatisfies [package provide Tk] 8.7-]} {
+    bind $c <MouseWheel> {
+	%W yview scroll [expr {%D/-30.0}] units
+    }
+    bind $c <Option-MouseWheel> {
+	%W yview scroll [expr {%D/-3.0}] units
+    }
+    bind $c <Shift-MouseWheel> {
+	%W xview scroll [expr {%D/-30.0}] units
+    }
+    bind $c <Shift-Option-MouseWheel> {
+	%W xview scroll [expr {%D/-3.0}] units
+    }
+} elseif {[tk windowingsystem] eq "aqua"} {
     bind $c <MouseWheel> {
 	%W yview scroll [expr {-(%D)}] units
     }
diff --git a/library/iconlist.tcl b/library/iconlist.tcl
index 30352a1..65c66b1 100644
--- a/library/iconlist.tcl
+++ b/library/iconlist.tcl
@@ -509,11 +509,7 @@ package require Tk 8.6
 	if {$noScroll || $::tk_strictMotif} {
 	    return
 	}
-	if {$amount > 0} {
-	    $canvas xview scroll [expr {(-119-$amount) / 120}] units
-	} else {
-	    $canvas xview scroll [expr {-($amount / 120)}] units
-	}
+	$canvas xview scroll [expr {$amount/-120.0}] units
     }
     method Btn1 {x y} {
 	focus $canvas
diff --git a/library/listbox.tcl b/library/listbox.tcl
index 7400494..500c32e 100644
--- a/library/listbox.tcl
+++ b/library/listbox.tcl
@@ -177,16 +177,16 @@ bind Listbox <B2-Motion> {
 }
 
 bind Listbox <MouseWheel> {
-    %W yview scroll [expr {%D/-30}] units
+    %W yview scroll [expr {%D/-30.0}] units
 }
 bind Listbox <Option-MouseWheel> {
-    %W yview scroll [expr {%D/-3}] units
+    %W yview scroll [expr {%D/-3.0}] units
 }
 bind Listbox <Shift-MouseWheel> {
-    %W xview scroll [expr {%D/-30}] units
+    %W xview scroll [expr {%D/-30.0}] units
 }
 bind Listbox <Shift-Option-MouseWheel> {
-    %W xview scroll [expr {%D/-3}] units
+    %W xview scroll [expr {%D/-3.0}] units
 }
 
 # ::tk::ListboxBeginSelect --
diff --git a/library/ttk/utils.tcl b/library/ttk/utils.tcl
index 4827aa3..3729254 100644
--- a/library/ttk/utils.tcl
+++ b/library/ttk/utils.tcl
@@ -298,12 +298,12 @@ proc ttk::bindMouseWheel {bindtag callback} {
 #
 
 bind TtkScrollable <MouseWheel> \
-	{ %W yview scroll [expr {%D/-120}] units }
+	{ %W yview scroll [expr {%D/-120.0}] units }
 bind TtkScrollable <Option-MouseWheel> \
-	{ %W yview scroll [expr {%D/-12}] units }
+	{ %W yview scroll [expr {%D/-12.0}] units }
 bind TtkScrollable <Shift-MouseWheel> \
-	{ %W xview scroll [expr {%D/-120}] units }
+	{ %W xview scroll [expr {%D/-120.0}] units }
 bind TtkScrollable <Shift-Option-MouseWheel> \
-	{ %W xview scroll [expr {%D/-12}] units }
+	{ %W xview scroll [expr {%D/-12.0}] units }
 
 #*EOF*
-- 
cgit v0.12


From d79922ec294e185a5674469215bc4193c2bee0dc Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Mon, 6 Jan 2020 20:29:38 +0000
Subject: Reorder code snippet in HandleEventGenerate to make it easier to
 understand. This changes nothing in how things work.

---
 generic/tkBind.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/generic/tkBind.c b/generic/tkBind.c
index f65d2ee..c744975 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -4361,11 +4361,6 @@ HandleEventGenerate(
 
 	    Tk_Window warpWindow = Tk_IdToWindow(dispPtr->display, event.general.xmotion.window);
 
-	    if (!(dispPtr->flags & TK_DISPLAY_IN_WARP)) {
-		Tcl_DoWhenIdle(DoWarp, dispPtr);
-		dispPtr->flags |= TK_DISPLAY_IN_WARP;
-	    }
-
 	    if (warpWindow != dispPtr->warpWindow) {
 		if (warpWindow) {
 		    Tcl_Preserve(warpWindow);
@@ -4378,6 +4373,11 @@ HandleEventGenerate(
 	    dispPtr->warpMainwin = mainWin;
 	    dispPtr->warpX = event.general.xmotion.x;
 	    dispPtr->warpY = event.general.xmotion.y;
+
+	    if (!(dispPtr->flags & TK_DISPLAY_IN_WARP)) {
+		Tcl_DoWhenIdle(DoWarp, dispPtr);
+		dispPtr->flags |= TK_DISPLAY_IN_WARP;
+	    }
 	}
     }
 
-- 
cgit v0.12


From d199c8da2038c0b8253abfe20d282859f654f374 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Mon, 6 Jan 2020 21:29:41 +0000
Subject: Add test bind-35.1, currently failing, and demonstrating issue
 reported in [e3888d5820] (grab on master prevents mouse pointer warp into
 slave widget)

---
 tests/bind.test | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/tests/bind.test b/tests/bind.test
index 20582df..9d8e3d3 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -6689,6 +6689,39 @@ test bind-34.3 {-warp works with null or negative coordinates} -setup {
 } -cleanup {
 } -result {0 0 ok ok}
 
+test bind-35.1 {pointer warp with grab on master, bug [e3888d5820]} -setup {
+    proc twait {duration} {
+        set ::_twait 1; after $duration {unset ::_twait}
+        vwait ::_twait
+    }
+    toplevel .top
+    grab release .top
+    wm geometry .top 200x200+300+300
+    label .top.l -height 5 -width 20 -highlightthickness 2 \
+            -highlightbackground black -bg yellow -text "My label"
+    pack .top.l -side bottom
+    update
+    event generate {} <Motion> -warp 1 -x 0 -y 0
+    update idletasks ; # DoWarp is an idle callback
+    after 50         ; # Win specific - wait for SendInput to be executed
+} -body {
+    event generate .top.l <Motion> -warp 1 -x 10 -y 10
+    update idletasks ; after 50
+    foreach {x1 y1} [winfo pointerxy .top.l] {}
+    event generate {} <Motion> -warp 1 -x 0 -y 0
+    update idletasks ; after 50
+    grab .top
+    twait 1000
+    event generate .top.l <Motion> -warp 1 -x 10 -y 10
+    update idletasks ; after 50
+    foreach {x2 y2} [winfo pointerxy .top.l] {}
+    expr {$x1==$x2 && $y1==$y2}
+} -cleanup {
+    destroy .top
+    unset x1 y1 x2 y2
+    rename twait {}
+} -result {1}
+
 # cleanup
 cleanupTests
 return
-- 
cgit v0.12


From c58fce3de10d06cd39d87798779ef43a68f9954c Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sat, 11 Jan 2020 13:34:03 +0000
Subject: Attempt to make bind-35.1 more reliable on Windows.

---
 tests/bind.test | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/tests/bind.test b/tests/bind.test
index 9d8e3d3..9c69269 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -6690,10 +6690,6 @@ test bind-34.3 {-warp works with null or negative coordinates} -setup {
 } -result {0 0 ok ok}
 
 test bind-35.1 {pointer warp with grab on master, bug [e3888d5820]} -setup {
-    proc twait {duration} {
-        set ::_twait 1; after $duration {unset ::_twait}
-        vwait ::_twait
-    }
     toplevel .top
     grab release .top
     wm geometry .top 200x200+300+300
@@ -6710,8 +6706,9 @@ test bind-35.1 {pointer warp with grab on master, bug [e3888d5820]} -setup {
     foreach {x1 y1} [winfo pointerxy .top.l] {}
     event generate {} <Motion> -warp 1 -x 0 -y 0
     update idletasks ; after 50
-    grab .top
-    twait 1000
+    grab .top  ; # this will queue events
+    after 50
+    update
     event generate .top.l <Motion> -warp 1 -x 10 -y 10
     update idletasks ; after 50
     foreach {x2 y2} [winfo pointerxy .top.l] {}
@@ -6719,7 +6716,6 @@ test bind-35.1 {pointer warp with grab on master, bug [e3888d5820]} -setup {
 } -cleanup {
     destroy .top
     unset x1 y1 x2 y2
-    rename twait {}
 } -result {1}
 
 # cleanup
-- 
cgit v0.12


From 68c075d0e166a5a99400a0b336859ec2b0199d63 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sat, 11 Jan 2020 14:13:24 +0000
Subject: Make bind-35.1 fail on Linux, by swapping the order of the mouse
 pointer warps with respect to grabs. This prevents the warp prologue (see
 [e3888d5820]) from playing a role in that test.

---
 tests/bind.test | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/tests/bind.test b/tests/bind.test
index 9c69269..e19b4f1 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -6690,6 +6690,9 @@ test bind-34.3 {-warp works with null or negative coordinates} -setup {
 } -result {0 0 ok ok}
 
 test bind-35.1 {pointer warp with grab on master, bug [e3888d5820]} -setup {
+    event generate {} <Motion> -warp 1 -x 1 -y 1
+    update idletasks ; # DoWarp is an idle callback
+    after 50         ; # Win specific - wait for SendInput to be executed
     toplevel .top
     grab release .top
     wm geometry .top 200x200+300+300
@@ -6697,16 +6700,16 @@ test bind-35.1 {pointer warp with grab on master, bug [e3888d5820]} -setup {
             -highlightbackground black -bg yellow -text "My label"
     pack .top.l -side bottom
     update
-    event generate {} <Motion> -warp 1 -x 0 -y 0
-    update idletasks ; # DoWarp is an idle callback
-    after 50         ; # Win specific - wait for SendInput to be executed
 } -body {
+    grab .top  ; # this will queue events
+    after 50
+    update
     event generate .top.l <Motion> -warp 1 -x 10 -y 10
     update idletasks ; after 50
     foreach {x1 y1} [winfo pointerxy .top.l] {}
-    event generate {} <Motion> -warp 1 -x 0 -y 0
+    event generate {} <Motion> -warp 1 -x 1 -y 1
     update idletasks ; after 50
-    grab .top  ; # this will queue events
+    grab release .top  ; # this will queue events
     after 50
     update
     event generate .top.l <Motion> -warp 1 -x 10 -y 10
-- 
cgit v0.12


From 74e39d2280dc73803b1c36f2b19c5cae2c0e3c18 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 19 Jan 2020 14:41:28 +0000
Subject: Put more robustness in bind-35.1

---
 tests/bind.test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/bind.test b/tests/bind.test
index e19b4f1..7d5cea5 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -6702,6 +6702,7 @@ test bind-35.1 {pointer warp with grab on master, bug [e3888d5820]} -setup {
     update
 } -body {
     grab .top  ; # this will queue events
+    update
     after 50
     update
     event generate .top.l <Motion> -warp 1 -x 10 -y 10
-- 
cgit v0.12


From c451c122100cf567f7c174e3f5aef08d218bdf3a Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sat, 25 Jan 2020 13:06:51 +0000
Subject: Fix [e3888d5820] (Grab on master prevents mouse pointer warp into
 slave widget) for Linux and Windows. Test bind-35.1 now passes on these
 platforms.

---
 generic/tkBind.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/generic/tkBind.c b/generic/tkBind.c
index c744975..23b00f7 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -4342,17 +4342,6 @@ HandleEventGenerate(
 	}
 
 	/*
-	 * Now we have constructed the event, inject it into the event handling
-	 * code.
-	 */
-
-	if (synch) {
-	    Tk_HandleEvent(&event.general);
-	} else {
-	    Tk_QueueWindowEvent(&event.general, pos);
-	}
-
-	/*
 	 * We only allow warping if the window is mapped.
 	 */
 
@@ -4379,6 +4368,17 @@ HandleEventGenerate(
 		dispPtr->flags |= TK_DISPLAY_IN_WARP;
 	    }
 	}
+
+	/*
+	 * Now we have constructed the event, inject it into the event handling
+	 * code.
+	 */
+
+	if (synch) {
+	    Tk_HandleEvent(&event.general);
+	} else {
+	    Tk_QueueWindowEvent(&event.general, pos);
+	}
     }
 
     Tcl_ResetResult(interp);
-- 
cgit v0.12


From 10304fd48d8ea057e53ed46c983c4147efd1066b Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sat, 25 Jan 2020 13:16:36 +0000
Subject: Remove useless generation of NSMouseMoved event when warping the
 mouse pointer on the mac

---
 macosx/tkMacOSXMouseEvent.c | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index 0ad8492..9a4dc46 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -662,25 +662,7 @@ TkpWarpPointer(
 	loc.y = TkMacOSXZeroScreenHeight() - pt.y;
     }
 
-    /*
-     * Generate an NSEvent of type NSMouseMoved.
-     *
-     * It is not clear why this is necessary.  For example, calling
-     *     event generate $w <Motion> -warp 1 -x $X -y $Y
-     * will cause two <Motion> events to be added to the Tcl queue.
-     */
-
     CGWarpMouseCursorPosition(pt);
-    NSEvent *warpEvent = [NSEvent mouseEventWithType:NSMouseMoved
-	location:loc
-	modifierFlags:0
-	timestamp:GetCurrentEventTime()
-	windowNumber:wNum
-	context:nil
-	eventNumber:0
-	clickCount:1
-	pressure:0.0];
-    [NSApp postEvent:warpEvent atStart:NO];
 }
 
 /*
-- 
cgit v0.12


From f782ee2185ebf9d8e37f80913de0c56385178f82 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Mon, 27 Jan 2020 21:09:35 +0000
Subject: Avoid interference in bind-35.1 from the hot spots in the corners of
 the screen featured by some WM on Linux.

---
 tests/bind.test | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/bind.test b/tests/bind.test
index 7d5cea5..d17ff37 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -6690,7 +6690,7 @@ test bind-34.3 {-warp works with null or negative coordinates} -setup {
 } -result {0 0 ok ok}
 
 test bind-35.1 {pointer warp with grab on master, bug [e3888d5820]} -setup {
-    event generate {} <Motion> -warp 1 -x 1 -y 1
+    event generate {} <Motion> -warp 1 -x 50 -y 50
     update idletasks ; # DoWarp is an idle callback
     after 50         ; # Win specific - wait for SendInput to be executed
     toplevel .top
@@ -6708,7 +6708,7 @@ test bind-35.1 {pointer warp with grab on master, bug [e3888d5820]} -setup {
     event generate .top.l <Motion> -warp 1 -x 10 -y 10
     update idletasks ; after 50
     foreach {x1 y1} [winfo pointerxy .top.l] {}
-    event generate {} <Motion> -warp 1 -x 1 -y 1
+    event generate {} <Motion> -warp 1 -x 50 -y 50
     update idletasks ; after 50
     grab release .top  ; # this will queue events
     after 50
-- 
cgit v0.12


From 975d3e255028d91c59387c4d16297e98f3bb8f76 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 11 Feb 2020 09:12:45 +0000
Subject: Remove (almost all remaining) traces of DBGX for Windows build.

---
 win/Makefile.in    |  5 +----
 win/configure      | 51 +++++++++++++--------------------------------------
 win/configure.ac   | 16 ++--------------
 win/rules.vc       |  2 +-
 win/tcl.m4         | 34 +++++++++++-----------------------
 win/tkConfig.sh.in |  5 +++--
 6 files changed, 31 insertions(+), 82 deletions(-)

diff --git a/win/Makefile.in b/win/Makefile.in
index 82baeb2..463fff1 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -71,11 +71,8 @@ MAN3_INSTALL_DIR = $(MAN_INSTALL_DIR)/man3
 # Directory in which to install manual entries for the built-in Tk commands:
 MANN_INSTALL_DIR = $(MAN_INSTALL_DIR)/mann
 
-# Libraries built with optimization switches have this additional extension
-TK_DBGX = @TK_DBGX@
-
 # Directory in which to install the pkgIndex.tcl file for loadable Tk
-PKG_INSTALL_DIR		= $(LIB_INSTALL_DIR)/tk$(VERSION)$(TK_DBGX)
+PKG_INSTALL_DIR		= $(LIB_INSTALL_DIR)/tk$(VERSION)
 
 # Package index file for loadable Tk
 PKG_INDEX		= $(PKG_INSTALL_DIR)/pkgIndex.tcl
diff --git a/win/configure b/win/configure
index 89f5563..cf8ce5f 100755
--- a/win/configure
+++ b/win/configure
@@ -664,7 +664,6 @@ EXTRA_CFLAGS
 CFG_TK_EXPORT_FILE_SUFFIX
 CFG_TK_UNSHARED_LIB_SUFFIX
 CFG_TK_SHARED_LIB_SUFFIX
-TCL_DBGX
 TCL_PATCH_LEVEL
 TCL_MINOR_VERSION
 TCL_MAJOR_VERSION
@@ -675,7 +674,6 @@ TK_STUB_LIB_FLAG
 TK_STUB_LIB_FILE
 TK_DLL_FILE
 TK_LIB_FILE
-TK_DBGX
 TK_PATCH_LEVEL
 TK_MINOR_VERSION
 TK_MAJOR_VERSION
@@ -3821,15 +3819,6 @@ $as_echo "could not find ${TCL_BIN_DIR}/tclConfig.sh" >&6; }
         TCL_STUB_LIB_PATH=${TCL_BUILD_STUB_LIB_PATH}
     fi
 
-    #
-    # eval is required to do the TCL_DBGX substitution
-    #
-
-    eval "TCL_ZIP_FILE=\"${TCL_ZIP_FILE}\""
-    eval "TCL_LIB_FILE=\"${TCL_LIB_FILE}\""
-    eval "TCL_LIB_FLAG=\"${TCL_LIB_FLAG}\""
-    eval "TCL_LIB_SPEC=\"${TCL_LIB_SPEC}\""
-
     eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
     eval "TCL_STUB_LIB_FLAG=\"${TCL_STUB_LIB_FLAG}\""
     eval "TCL_STUB_LIB_SPEC=\"${TCL_STUB_LIB_SPEC}\""
@@ -4232,7 +4221,7 @@ $as_echo_n "checking compiler flags... " >&6; }
 $as_echo "using static flags" >&6; }
 	    runtime=
 	    LIBRARIES="\${STATIC_LIBRARIES}"
-	    EXESUFFIX="s\${DBGX}.exe"
+	    EXESUFFIX="s.exe"
 	else
 	    # dynamic
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: using shared flags" >&5
@@ -4247,7 +4236,7 @@ $as_echo "using shared flags" >&6; }
 	    runtime=
 	    # Add SHLIB_LD_LIBS to the Make rule, not here.
 
-	    EXESUFFIX="\${DBGX}.exe"
+	    EXESUFFIX=".exe"
 	    LIBRARIES="\${SHARED_LIBRARIES}"
 	fi
 	# Link with gcc since ld does not link to default libs like
@@ -4258,9 +4247,9 @@ $as_echo "using shared flags" >&6; }
 	    -Wl,--out-implib,\$(patsubst %.dll,lib%.a,\$@)"
 	# DLLSUFFIX is separate because it is the building block for
 	# users of tclConfig.sh that may build shared or static.
-	DLLSUFFIX="\${DBGX}.dll"
-	LIBSUFFIX="\${DBGX}.a"
-	LIBFLAGSUFFIX="\${DBGX}"
+	DLLSUFFIX=".dll"
+	LIBSUFFIX=".a"
+	LIBFLAGSUFFIX=""
 	SHLIB_SUFFIX=.dll
 
 	EXTRA_CFLAGS="${extra_cflags}"
@@ -4350,7 +4339,7 @@ $as_echo "   Using 64-bit $MACHINE mode" >&6; }
 $as_echo "using static flags" >&6; }
 	    runtime=-MT
 	    LIBRARIES="\${STATIC_LIBRARIES}"
-	    EXESUFFIX="s\${DBGX}.exe"
+	    EXESUFFIX="s.exe"
 	else
 	    # dynamic
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: using shared flags" >&5
@@ -4358,7 +4347,7 @@ $as_echo "using shared flags" >&6; }
 	    runtime=-MD
 	    # Add SHLIB_LD_LIBS to the Make rule, not here.
 	    LIBRARIES="\${SHARED_LIBRARIES}"
-	    EXESUFFIX="\${DBGX}.exe"
+	    EXESUFFIX=".exe"
 	    case "x`echo \${VisualStudioVersion}`" in
 		x1[4-9]*)
 		    lflags="${lflags} -nodefaultlib:libucrt.lib"
@@ -4370,9 +4359,9 @@ $as_echo "using shared flags" >&6; }
 	MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -out:\$@"
 	# DLLSUFFIX is separate because it is the building block for
 	# users of tclConfig.sh that may build shared or static.
-	DLLSUFFIX="\${DBGX}.dll"
-	LIBSUFFIX="\${DBGX}.lib"
-	LIBFLAGSUFFIX="\${DBGX}"
+	DLLSUFFIX=".dll"
+	LIBSUFFIX=".lib"
+	LIBFLAGSUFFIX=""
 
 	if test "$do64bit" != "no" ; then
 	    case "$do64bit" in
@@ -4751,7 +4740,6 @@ fi
     if test "$tcl_ok" = "no"; then
 	CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)'
 	LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)'
-	DBGX=""
 
 $as_echo "#define NDEBUG 1" >>confdefs.h
 
@@ -4763,7 +4751,6 @@ $as_echo "no" >&6; }
     else
 	CFLAGS_DEFAULT='$(CFLAGS_DEBUG)'
 	LDFLAGS_DEFAULT='$(LDFLAGS_DEBUG)'
-	DBGX=g
 	if test "$tcl_ok" = "yes"; then
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (standard debugging)" >&5
 $as_echo "yes (standard debugging)" >&6; }
@@ -4798,8 +4785,6 @@ $as_echo "enabled $tcl_ok debugging" >&6; }
     fi
 
 
-TK_DBGX=${DBGX}
-
 #--------------------------------------------------------------------
 # Embed the manifest if we can determine how
 #--------------------------------------------------------------------
@@ -4858,7 +4843,7 @@ $as_echo "$result" >&6; }
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclsh in Tcl build directory" >&5
 $as_echo_n "checking for tclsh in Tcl build directory... " >&6; }
-    BUILD_TCLSH=${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}${EXEEXT}
+    BUILD_TCLSH=${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${EXEEXT}
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_TCLSH" >&5
 $as_echo "$BUILD_TCLSH" >&6; }
 
@@ -4949,18 +4934,10 @@ CFG_TK_EXPORT_FILE_SUFFIX=${TK_EXPORT_FILE_SUFFIX}
 #--------------------------------------------------------------------
 
 if test ${SHARED_BUILD} = 0 -o "$TCL_NEEDS_EXP_FILE" = 0; then
-    if test "${DBGX}" = "d"; then
-        RC_DEFINES="${RC_DEFINE} STATIC_BUILD ${RC_DEFINE} DEBUG"
-    else
-        RC_DEFINES="${RC_DEFINE} STATIC_BUILD"
-    fi
+    RC_DEFINES="${RC_DEFINE} STATIC_BUILD"
     TK_RES=""
 else
-    if test "${DBGX}" = "d"; then
-        RC_DEFINES="${RC_DEFINE} DEBUG"
-    else
-        RC_DEFINES=""
-    fi
+    RC_DEFINES=""
     TK_RES='tk.$(RES)'
 fi
 
@@ -5007,8 +4984,6 @@ TK_WIN_VERSION="$TK_VERSION.$TK_RELEASE_LEVEL.`echo $TK_PATCH_LEVEL | tr -d ab.`
 
 
 
-
-
 # win/tcl.m4 doesn't set (LDFLAGS)
 
 
diff --git a/win/configure.ac b/win/configure.ac
index ca9263f..10728e0 100644
--- a/win/configure.ac
+++ b/win/configure.ac
@@ -134,8 +134,6 @@ AC_CHECK_HEADER([vssym32.h], [AC_DEFINE(HAVE_VSSYM32_H)], [],
 
 SC_ENABLE_SYMBOLS
 
-TK_DBGX=${DBGX}
-
 #--------------------------------------------------------------------
 # Embed the manifest if we can determine how
 #--------------------------------------------------------------------
@@ -194,18 +192,10 @@ CFG_TK_EXPORT_FILE_SUFFIX=${TK_EXPORT_FILE_SUFFIX}
 #--------------------------------------------------------------------
 
 if test ${SHARED_BUILD} = 0 -o "$TCL_NEEDS_EXP_FILE" = 0; then
-    if test "${DBGX}" = "d"; then
-        RC_DEFINES="${RC_DEFINE} STATIC_BUILD ${RC_DEFINE} DEBUG"
-    else
-        RC_DEFINES="${RC_DEFINE} STATIC_BUILD"
-    fi
+    RC_DEFINES="${RC_DEFINE} STATIC_BUILD"
     TK_RES=""
 else
-    if test "${DBGX}" = "d"; then
-        RC_DEFINES="${RC_DEFINE} DEBUG"
-    else
-        RC_DEFINES=""
-    fi
+    RC_DEFINES=""
     TK_RES='tk.$(RES)'
 fi
 
@@ -226,7 +216,6 @@ AC_SUBST(TK_VERSION)
 AC_SUBST(TK_MAJOR_VERSION)
 AC_SUBST(TK_MINOR_VERSION)
 AC_SUBST(TK_PATCH_LEVEL)
-AC_SUBST(TK_DBGX)
 AC_SUBST(TK_LIB_FILE)
 AC_SUBST(TK_DLL_FILE)
 AC_SUBST(TK_STUB_LIB_FILE)
@@ -242,7 +231,6 @@ AC_SUBST(TCL_PATCH_LEVEL)
 
 AC_SUBST(TCL_SRC_DIR)
 AC_SUBST(TCL_BIN_DIR)
-AC_SUBST(TCL_DBGX)
 AC_SUBST(CFG_TK_SHARED_LIB_SUFFIX)
 AC_SUBST(CFG_TK_UNSHARED_LIB_SUFFIX)
 AC_SUBST(CFG_TK_EXPORT_FILE_SUFFIX)
diff --git a/win/rules.vc b/win/rules.vc
index 872b3a0..c29ab0a 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -1048,7 +1048,7 @@ BUILDDIRTOP =$(BUILDDIRTOP)_$(MACHINE)
 BUILDDIRTOP =$(BUILDDIRTOP)_VC$(VCVER)
 !endif
 
-!if !$(DEBUG) || $(DEBUG) && $(UNCHECKED)
+!if !$(DEBUG) || $(TCL_VERSION) > 86 || $(DEBUG) && $(UNCHECKED)
 SUFX	    = $(SUFX:g=)
 !endif
 
diff --git a/win/tcl.m4 b/win/tcl.m4
index 225cfdc..8875f82 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -280,15 +280,6 @@ AC_DEFUN([SC_LOAD_TCLCONFIG], [
         TCL_STUB_LIB_PATH=${TCL_BUILD_STUB_LIB_PATH}
     fi
 
-    #
-    # eval is required to do the TCL_DBGX substitution
-    #
-
-    eval "TCL_ZIP_FILE=\"${TCL_ZIP_FILE}\""
-    eval "TCL_LIB_FILE=\"${TCL_LIB_FILE}\""
-    eval "TCL_LIB_FLAG=\"${TCL_LIB_FLAG}\""
-    eval "TCL_LIB_SPEC=\"${TCL_LIB_SPEC}\""
-
     eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
     eval "TCL_STUB_LIB_FLAG=\"${TCL_STUB_LIB_FLAG}\""
     eval "TCL_STUB_LIB_SPEC=\"${TCL_STUB_LIB_SPEC}\""
@@ -410,7 +401,6 @@ AC_DEFUN([SC_ENABLE_SHARED], [
 #				Sets to $(CFLAGS_OPTIMIZE) if false
 #		LDFLAGS_DEFAULT	Sets to $(LDFLAGS_DEBUG) if true
 #				Sets to $(LDFLAGS_OPTIMIZE) if false
-#		DBGX		Debug library extension
 #
 #------------------------------------------------------------------------
 
@@ -421,7 +411,6 @@ AC_DEFUN([SC_ENABLE_SYMBOLS], [
     if test "$tcl_ok" = "no"; then
 	CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)'
 	LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)'
-	DBGX=""
 	AC_DEFINE(NDEBUG, 1, [Is no debugging enabled?])
 	AC_MSG_RESULT([no])
 
@@ -429,7 +418,6 @@ AC_DEFUN([SC_ENABLE_SYMBOLS], [
     else
 	CFLAGS_DEFAULT='$(CFLAGS_DEBUG)'
 	LDFLAGS_DEFAULT='$(LDFLAGS_DEBUG)'
-	DBGX=g
 	if test "$tcl_ok" = "yes"; then
 	    AC_MSG_RESULT([yes (standard debugging)])
 	fi
@@ -651,7 +639,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
             AC_MSG_RESULT([using static flags])
 	    runtime=
 	    LIBRARIES="\${STATIC_LIBRARIES}"
-	    EXESUFFIX="s\${DBGX}.exe"
+	    EXESUFFIX="s.exe"
 	else
 	    # dynamic
             AC_MSG_RESULT([using shared flags])
@@ -665,7 +653,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 	    runtime=
 	    # Add SHLIB_LD_LIBS to the Make rule, not here.
 
-	    EXESUFFIX="\${DBGX}.exe"
+	    EXESUFFIX=".exe"
 	    LIBRARIES="\${SHARED_LIBRARIES}"
 	fi
 	# Link with gcc since ld does not link to default libs like
@@ -676,9 +664,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 	    -Wl,--out-implib,\$(patsubst %.dll,lib%.a,\[$]@)"
 	# DLLSUFFIX is separate because it is the building block for
 	# users of tclConfig.sh that may build shared or static.
-	DLLSUFFIX="\${DBGX}.dll"
-	LIBSUFFIX="\${DBGX}.a"
-	LIBFLAGSUFFIX="\${DBGX}"
+	DLLSUFFIX=".dll"
+	LIBSUFFIX=".a"
+	LIBFLAGSUFFIX=""
 	SHLIB_SUFFIX=.dll
 
 	EXTRA_CFLAGS="${extra_cflags}"
@@ -750,14 +738,14 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
             AC_MSG_RESULT([using static flags])
 	    runtime=-MT
 	    LIBRARIES="\${STATIC_LIBRARIES}"
-	    EXESUFFIX="s\${DBGX}.exe"
+	    EXESUFFIX="s.exe"
 	else
 	    # dynamic
             AC_MSG_RESULT([using shared flags])
 	    runtime=-MD
 	    # Add SHLIB_LD_LIBS to the Make rule, not here.
 	    LIBRARIES="\${SHARED_LIBRARIES}"
-	    EXESUFFIX="\${DBGX}.exe"
+	    EXESUFFIX=".exe"
 	    case "x`echo \${VisualStudioVersion}`" in
 		x1[[4-9]]*)
 		    lflags="${lflags} -nodefaultlib:libucrt.lib"
@@ -769,9 +757,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 	MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -out:\[$]@"
 	# DLLSUFFIX is separate because it is the building block for
 	# users of tclConfig.sh that may build shared or static.
-	DLLSUFFIX="\${DBGX}.dll"
-	LIBSUFFIX="\${DBGX}.lib"
-	LIBFLAGSUFFIX="\${DBGX}"
+	DLLSUFFIX=".dll"
+	LIBSUFFIX=".lib"
+	LIBFLAGSUFFIX=""
 
 	if test "$do64bit" != "no" ; then
 	    case "$do64bit" in
@@ -1069,7 +1057,7 @@ AC_DEFUN([SC_PROG_TCLSH], [
 
 AC_DEFUN([SC_BUILD_TCLSH], [
     AC_MSG_CHECKING([for tclsh in Tcl build directory])
-    BUILD_TCLSH=${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}${EXEEXT}
+    BUILD_TCLSH=${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${EXEEXT}
     AC_MSG_RESULT($BUILD_TCLSH)
     AC_SUBST(BUILD_TCLSH)
 ])
diff --git a/win/tkConfig.sh.in b/win/tkConfig.sh.in
index c511312..d93e649 100644
--- a/win/tkConfig.sh.in
+++ b/win/tkConfig.sh.in
@@ -25,8 +25,9 @@ TK_DEFS='@DEFS@'
 # Flag, 1: we built a shared lib, 0 we didn't
 TK_SHARED_BUILD=@TK_SHARED_BUILD@
 
-# This indicates if Tk was build with debugging symbols
-TK_DBGX=@TK_DBGX@
+# TK_DBGX used to be used to distinguish debug vs. non-debug builds.
+# This was a righteous pain so the core doesn't do that any more.
+TK_DBGX=
 
 # The name of the Tk library (may be either a .a file or a shared library):
 TK_LIB_FILE='@TK_LIB_FILE@'
-- 
cgit v0.12


From 6cb4bec9e847887f703dd319cbb7118e39d05655 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 16 Feb 2020 20:14:43 +0000
Subject: Attempt to make test bind-35.1 more reliable, by waiting for the
 expected [grab current] value.

---
 tests/bind.test | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/tests/bind.test b/tests/bind.test
index d17ff37..efedae9 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -6690,6 +6690,16 @@ test bind-34.3 {-warp works with null or negative coordinates} -setup {
 } -result {0 0 ok ok}
 
 test bind-35.1 {pointer warp with grab on master, bug [e3888d5820]} -setup {
+    proc waitForGrab {grabWin in_ni} {
+    # process events while $grabWin is not in (ni) the current grab window list,
+    # or while it is (in), but don't spend more than 5 seconds doing this
+        set i 0
+        while {[expr {$grabWin} $in_ni {[grab current]}] && $i < 500} {
+            after 1
+            update
+            incr i
+        }
+    }
     event generate {} <Motion> -warp 1 -x 50 -y 50
     update idletasks ; # DoWarp is an idle callback
     after 50         ; # Win specific - wait for SendInput to be executed
@@ -6702,17 +6712,14 @@ test bind-35.1 {pointer warp with grab on master, bug [e3888d5820]} -setup {
     update
 } -body {
     grab .top  ; # this will queue events
-    update
-    after 50
-    update
+    waitForGrab .top ni
     event generate .top.l <Motion> -warp 1 -x 10 -y 10
     update idletasks ; after 50
     foreach {x1 y1} [winfo pointerxy .top.l] {}
     event generate {} <Motion> -warp 1 -x 50 -y 50
     update idletasks ; after 50
     grab release .top  ; # this will queue events
-    after 50
-    update
+    waitForGrab .top in
     event generate .top.l <Motion> -warp 1 -x 10 -y 10
     update idletasks ; after 50
     foreach {x2 y2} [winfo pointerxy .top.l] {}
@@ -6720,6 +6727,7 @@ test bind-35.1 {pointer warp with grab on master, bug [e3888d5820]} -setup {
 } -cleanup {
     destroy .top
     unset x1 y1 x2 y2
+    rename waitForGrab {}
 } -result {1}
 
 # cleanup
-- 
cgit v0.12


From c0f14624f3cdc85d8331b9890f1e4272911f25dc Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 16 Feb 2020 20:26:54 +0000
Subject: Don't stress the CPU too much.

---
 tests/bind.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/bind.test b/tests/bind.test
index efedae9..e655fbf 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -6695,7 +6695,7 @@ test bind-35.1 {pointer warp with grab on master, bug [e3888d5820]} -setup {
     # or while it is (in), but don't spend more than 5 seconds doing this
         set i 0
         while {[expr {$grabWin} $in_ni {[grab current]}] && $i < 500} {
-            after 1
+            after 10
             update
             incr i
         }
-- 
cgit v0.12


From 2eba29238e00ddad8847d54417625dd5dcf4e781 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Mon, 17 Feb 2020 22:06:26 +0000
Subject: Refine test bind-35.1 once more since [grab current] returns the
 eventualGrabWin while we're interested in the grabWin instead.

---
 generic/tkTest.c      | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/bind.test       | 18 +++++++-----
 tests/constraints.tcl |  1 +
 3 files changed, 91 insertions(+), 7 deletions(-)

diff --git a/generic/tkTest.c b/generic/tkTest.c
index a8929b9..e3bfd4d 100644
--- a/generic/tkTest.c
+++ b/generic/tkTest.c
@@ -206,6 +206,9 @@ static int		TrivialConfigObjCmd(ClientData dummy,
 			    Tcl_Obj * const objv[]);
 static void		TrivialEventProc(ClientData clientData,
 			    XEvent *eventPtr);
+static int		TestgrabObjCmd(ClientData clientData,
+			    Tcl_Interp *interp, int objc,
+			    Tcl_Obj *const objv[]);
 
 /*
  *----------------------------------------------------------------------
@@ -281,6 +284,9 @@ Tktest_Init(
 	    (ClientData) Tk_MainWindow(interp), NULL);
 #endif /* _WIN32 */
 
+    Tcl_CreateObjCommand(interp, "testgrab", TestgrabObjCmd,
+	    (ClientData) Tk_MainWindow(interp), NULL);
+
     /*
      * Create test image type.
      */
@@ -2078,6 +2084,79 @@ CustomOptionFree(
 }
 
 /*
+ *----------------------------------------------------------------------
+ *
+ * TestgrabObjCmd --
+ *
+ *	This function implements the "testgrab" command, which is used to test
+ *	grabbing of windows.
+ *
+ *	testgrab grabbed  $win: returns true if $win is currently grabbed
+ *	testgrab released $win: returns true if $win is currently not grabbed
+ *
+ *	This function is useful when one wants to test for a grabbing window
+ *	at the moment it is called. [grab current] cannot be used for that
+ *	purpose because it returns the window dereferenced by eventualGrabWinPtr
+ *
+ * Results:
+ *	A standard Tcl result.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int
+TestgrabObjCmd(
+    ClientData clientData,	/* Main window for application. */
+    Tcl_Interp *interp,		/* Current interpreter. */
+    int objc,			/* Number of arguments. */
+    Tcl_Obj *const objv[])	/* Argument objects. */
+{
+    static const char *const options[] = {"grabbed", "released", NULL};
+    enum option {GRABBED, RELEASED};
+    int index, res = 0;
+    Tk_Window mainWin, tkwin;
+    TkDisplay *dispPtr;
+
+    mainWin = (Tk_Window) clientData;
+
+    if (objc < 3) {
+	Tcl_WrongNumArgs(interp, 1, objv, "option window");
+	return TCL_ERROR;
+    }
+
+    if (Tcl_GetIndexFromObjStruct(interp, objv[1], options,
+	    sizeof(char *), "command", 0, &index)!= TCL_OK) {
+	return TCL_ERROR;
+    }
+
+    tkwin = Tk_NameToWindow(interp, Tcl_GetString(objv[2]), mainWin);
+    if (tkwin == NULL) {
+        return TCL_ERROR;
+    }
+    dispPtr = ((TkWindow *) tkwin)->dispPtr;
+    /*printf("TestgrabObjCmd %s, grabWinPtr = %p , tkwin = %p\n", options[index], dispPtr->grabWinPtr, tkwin);fflush(stdout);*/
+
+    switch ((enum option) index) {
+    case GRABBED:
+        if (dispPtr->grabWinPtr == (TkWindow *) tkwin) {
+            res = 1;
+        }
+	break;
+    case RELEASED:
+        if (dispPtr->grabWinPtr != (TkWindow *) tkwin) {
+            res = 1;
+        }
+	break;
+    }
+
+    Tcl_SetObjResult(interp, Tcl_NewBooleanObj(res));
+    return TCL_OK;
+}
+
+/*
  * Local Variables:
  * mode: c
  * c-basic-offset: 4
diff --git a/tests/bind.test b/tests/bind.test
index dfb046c..a001580 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -6707,12 +6707,15 @@ test bind-34.3 {-warp works with null or negative coordinates} -setup {
 } -cleanup {
 } -result {ok ok ok ok}
 
-test bind-35.1 {pointer warp with grab on master, bug [e3888d5820]} -setup {
-    proc waitForGrab {grabWin in_ni} {
-    # process events while $grabWin is not in (ni) the current grab window list,
-    # or while it is (in), but don't spend more than 5 seconds doing this
+test bind-35.1 {pointer warp with grab on master, bug [e3888d5820]} -constraints {
+    testgrab
+} -setup {
+    proc waitForGrab {type grabWin} {
+    # process events while $grabWin is not grabbed ($type == "grabbed"),
+    # or while $grabWin is not released ($type == "released"), but don't
+    # spend more than 5 seconds doing this
         set i 0
-        while {[expr {$grabWin} $in_ni {[grab current]}] && $i < 500} {
+        while {![testgrab $type $grabWin] && $i < 500} {
             after 10
             update
             incr i
@@ -6723,6 +6726,7 @@ test bind-35.1 {pointer warp with grab on master, bug [e3888d5820]} -setup {
     after 50         ; # Win specific - wait for SendInput to be executed
     toplevel .top
     grab release .top
+    waitForGrab released .top
     wm geometry .top 200x200+300+300
     label .top.l -height 5 -width 20 -highlightthickness 2 \
             -highlightbackground black -bg yellow -text "My label"
@@ -6730,14 +6734,14 @@ test bind-35.1 {pointer warp with grab on master, bug [e3888d5820]} -setup {
     update
 } -body {
     grab .top  ; # this will queue events
-    waitForGrab .top ni
+    waitForGrab grabbed .top
     event generate .top.l <Motion> -warp 1 -x 10 -y 10
     update idletasks ; after 50
     foreach {x1 y1} [winfo pointerxy .top.l] {}
     event generate {} <Motion> -warp 1 -x 50 -y 50
     update idletasks ; after 50
     grab release .top  ; # this will queue events
-    waitForGrab .top in
+    waitForGrab released .top
     event generate .top.l <Motion> -warp 1 -x 10 -y 10
     update idletasks ; after 50
     foreach {x2 y2} [winfo pointerxy .top.l] {}
diff --git a/tests/constraints.tcl b/tests/constraints.tcl
index c77fb00..49da142 100644
--- a/tests/constraints.tcl
+++ b/tests/constraints.tcl
@@ -207,6 +207,7 @@ testConstraint testcolor     [llength [info commands testcolor]]
 testConstraint testcursor    [llength [info commands testcursor]]
 testConstraint testembed     [llength [info commands testembed]]
 testConstraint testfont      [llength [info commands testfont]]
+testConstraint testgrab      [llength [info commands testgrab]]
 testConstraint testmakeexist [llength [info commands testmakeexist]]
 testConstraint testmenubar   [llength [info commands testmenubar]]
 testConstraint testmetrics   [llength [info commands testmetrics]]
-- 
cgit v0.12


From f85275ba623ef4e7bbd74cee04017c8ed6d5c9a5 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Tue, 18 Feb 2020 21:19:57 +0000
Subject: Use TkGrabState() in function TestgrabObjCmd() instead of
 dispPtr->grabWinPtr to make the code clearer and the interface cleaner.

---
 generic/tkTest.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/generic/tkTest.c b/generic/tkTest.c
index e3bfd4d..1f373ad 100644
--- a/generic/tkTest.c
+++ b/generic/tkTest.c
@@ -2118,7 +2118,6 @@ TestgrabObjCmd(
     enum option {GRABBED, RELEASED};
     int index, res = 0;
     Tk_Window mainWin, tkwin;
-    TkDisplay *dispPtr;
 
     mainWin = (Tk_Window) clientData;
 
@@ -2136,17 +2135,17 @@ TestgrabObjCmd(
     if (tkwin == NULL) {
         return TCL_ERROR;
     }
-    dispPtr = ((TkWindow *) tkwin)->dispPtr;
-    /*printf("TestgrabObjCmd %s, grabWinPtr = %p , tkwin = %p\n", options[index], dispPtr->grabWinPtr, tkwin);fflush(stdout);*/
+    /*printf("TestgrabObjCmd %s, grabWinPtr = %p , tkwin = %p\n", options[index],
+            ((TkWindow *) tkwin)->dispPtr->grabWinPtr, tkwin);fflush(stdout);*/
 
     switch ((enum option) index) {
     case GRABBED:
-        if (dispPtr->grabWinPtr == (TkWindow *) tkwin) {
+        if (TkGrabState((TkWindow *) tkwin) != TK_GRAB_NONE) {
             res = 1;
         }
 	break;
     case RELEASED:
-        if (dispPtr->grabWinPtr != (TkWindow *) tkwin) {
+        if (TkGrabState((TkWindow *) tkwin) == TK_GRAB_NONE) {
             res = 1;
         }
 	break;
-- 
cgit v0.12


From 43fb1795b95fb9b238c5058d11dc7b4a415b6942 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 12 Apr 2020 21:30:29 +0000
Subject: Use of IsSubsetOf function is clearer (no functional change).

---
 generic/tkBind.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tkBind.c b/generic/tkBind.c
index 1443270..c1fdc0c 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -2808,7 +2808,7 @@ MatchPatterns(
 
 		    psEntry->expired = 1; /* remove it from promotion list */
 
-		    if ((modMask & ~curModMask) == 0) {
+		    if (IsSubsetOf(modMask, curModMask)) {
 			unsigned count = patPtr->info ? curEvent->countDetailed : curEvent->countAny;
 
 			if (patIndex < PSModMaskArr_Size(psEntry->lastModMaskArr)) {
-- 
cgit v0.12


From a485a445252972c78b1296013f221f7f838c438b Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 19 Apr 2020 09:34:18 +0000
Subject: Fix [7655f65ae7]: text positioning issues in entry widgets. This is a
 patch from Christopher Chavez, slightly modified, and addresses the bug for
 Windows, Linux and macOS.

---
 generic/tkEntry.c      | 33 ++++++++++++++++++++++++---------
 generic/ttk/ttkEntry.c | 39 ++++++++++++++++++++++++++++++---------
 2 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/generic/tkEntry.c b/generic/tkEntry.c
index 9c53769..27bcfe1 100644
--- a/generic/tkEntry.c
+++ b/generic/tkEntry.c
@@ -1727,18 +1727,14 @@ DisplayEntry(
 	}
     }
 
-    /*
-     * Draw the text in two pieces: first the unselected portion, then the
-     * selected portion on top of it.
-     */
-
-    Tk_DrawTextLayout(entryPtr->display, pixmap, entryPtr->textGC,
-	    entryPtr->textLayout, entryPtr->layoutX, entryPtr->layoutY,
-	    entryPtr->leftIndex, entryPtr->numChars);
-
     if (showSelection && (entryPtr->state != STATE_DISABLED)
 	    && (entryPtr->selTextGC != entryPtr->textGC)
 	    && (entryPtr->selectFirst < entryPtr->selectLast)) {
+
+	/*
+	 * Draw the selected and unselected portions separately.
+	 */
+
 	int selFirst;
 
 	if (entryPtr->selectFirst < entryPtr->leftIndex) {
@@ -1746,9 +1742,28 @@ DisplayEntry(
 	} else {
 	    selFirst = entryPtr->selectFirst;
 	}
+	if (entryPtr->leftIndex < selFirst) {
+	    Tk_DrawTextLayout(entryPtr->display, pixmap, entryPtr->textGC,
+		    entryPtr->textLayout, entryPtr->layoutX, entryPtr->layoutY,
+		    entryPtr->leftIndex, selFirst);
+	}
 	Tk_DrawTextLayout(entryPtr->display, pixmap, entryPtr->selTextGC,
 		entryPtr->textLayout, entryPtr->layoutX, entryPtr->layoutY,
 		selFirst, entryPtr->selectLast);
+	if (entryPtr->selectLast < entryPtr->numChars) {
+	    Tk_DrawTextLayout(entryPtr->display, pixmap, entryPtr->textGC,
+		    entryPtr->textLayout, entryPtr->layoutX, entryPtr->layoutY,
+		    entryPtr->selectLast, entryPtr->numChars);
+	}
+    } else {
+
+        /*
+         * Draw the entire visible text
+         */
+
+	Tk_DrawTextLayout(entryPtr->display, pixmap, entryPtr->textGC,
+		entryPtr->textLayout, entryPtr->layoutX, entryPtr->layoutY,
+		entryPtr->leftIndex, entryPtr->numChars);
     }
 
     if (entryPtr->type == TK_SPINBOX) {
diff --git a/generic/ttk/ttkEntry.c b/generic/ttk/ttkEntry.c
index 96f3cf2..05b4c3b 100644
--- a/generic/ttk/ttkEntry.c
+++ b/generic/ttk/ttkEntry.c
@@ -1274,16 +1274,27 @@ static void EntryDisplay(void *clientData, Drawable d)
     /* Draw the text:
      */
     gc = EntryGetGC(entryPtr, es.foregroundObj, clipRegion);
-    Tk_DrawTextLayout(
-	Tk_Display(tkwin), d, gc, entryPtr->entry.textLayout,
-	entryPtr->entry.layoutX, entryPtr->entry.layoutY,
-	leftIndex, rightIndex);
-    XSetClipMask(Tk_Display(tkwin), gc, None);
-    Tk_FreeGC(Tk_Display(tkwin), gc);
-
-    /* Overwrite the selected portion (if any) in the -selectforeground color:
-     */
     if (showSelection) {
+
+        /* Draw the selected and unselected portions separately.
+	 */
+	if (leftIndex < selFirst) {
+	    Tk_DrawTextLayout(
+		Tk_Display(tkwin), d, gc, entryPtr->entry.textLayout,
+		entryPtr->entry.layoutX, entryPtr->entry.layoutY,
+		leftIndex, selFirst);
+	}
+	if (selLast < rightIndex) {
+	    Tk_DrawTextLayout(
+		Tk_Display(tkwin), d, gc, entryPtr->entry.textLayout,
+		entryPtr->entry.layoutX, entryPtr->entry.layoutY,
+		selLast, rightIndex);
+	}
+	XSetClipMask(Tk_Display(tkwin), gc, None);
+	Tk_FreeGC(Tk_Display(tkwin), gc);
+
+	/* Draw the selected portion in the -selectforeground color:
+	 */
 	gc = EntryGetGC(entryPtr, es.selForegroundObj, clipRegion);
 	Tk_DrawTextLayout(
 	    Tk_Display(tkwin), d, gc, entryPtr->entry.textLayout,
@@ -1291,6 +1302,16 @@ static void EntryDisplay(void *clientData, Drawable d)
 	    selFirst, selLast);
 	XSetClipMask(Tk_Display(tkwin), gc, None);
 	Tk_FreeGC(Tk_Display(tkwin), gc);
+    } else {
+
+        /* Draw the entire visible text
+         */
+	Tk_DrawTextLayout(
+	    Tk_Display(tkwin), d, gc, entryPtr->entry.textLayout,
+	    entryPtr->entry.layoutX, entryPtr->entry.layoutY,
+	    leftIndex, rightIndex);
+	XSetClipMask(Tk_Display(tkwin), gc, None);
+	Tk_FreeGC(Tk_Display(tkwin), gc);
     }
 
     /* Drop the region. Note that we have to manually remove the reference to
-- 
cgit v0.12


From 981e941cbfec9cdea31b3bde6666e9a5afc6ea85 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 19 Apr 2020 10:01:26 +0000
Subject: Apply another patch by Christopher Chavez that fixes the jerk of
 strings on aqua when selecting text (see the ticket). There is no functional
 change on Windows and Linux in this patch.

---
 generic/tkFont.c      | 27 +++++++++++++++++++++++++++
 generic/tkInt.h       |  4 ++++
 macosx/tkMacOSXFont.c | 20 ++++++++------------
 macosx/tkMacOSXInt.h  |  2 +-
 unix/tkUnixFont.c     | 32 ++++++++++++++++++++++++++++++++
 win/tkWinFont.c       | 31 +++++++++++++++++++++++++++++++
 6 files changed, 103 insertions(+), 13 deletions(-)

diff --git a/generic/tkFont.c b/generic/tkFont.c
index 0ec79a6..3a06719 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.c
@@ -2304,6 +2304,10 @@ Tk_DrawTextLayout(
 				 * draw from the given text item. A number < 0
 				 * means to draw all characters. */
 {
+#if 0
+    /* Use TkDrawAngledTextLayout() implementation */
+    TkDrawAngledTextLayout(display, drawable, gc, layout, x, y, 0.0, firstChar, lastChar);
+#else
     TextLayout *layoutPtr = (TextLayout *) layout;
     int i, numDisplayChars, drawX;
     const char *firstByte, *lastByte;
@@ -2333,8 +2337,14 @@ Tk_DrawTextLayout(
 		numDisplayChars = lastChar;
 	    }
 	    lastByte = Tcl_UtfAtIndex(chunkPtr->start, numDisplayChars);
+#if TK_DRAW_IN_CONTEXT
+	    TkpDrawCharsInContext(display, drawable, gc, layoutPtr->tkfont,
+		    chunkPtr->start, chunkPtr->numBytes, firstChar,
+		    numDisplayChars - firstChar, x+chunkPtr->x, y+chunkPtr->y);
+#else /* !TK_DRAW_IN_CONTEXT */
 	    Tk_DrawChars(display, drawable, gc, layoutPtr->tkfont, firstByte,
 		    lastByte - firstByte, x+chunkPtr->x+drawX, y+chunkPtr->y);
+#endif /* TK_DRAW_IN_CONTEXT */
 	}
 	firstChar -= chunkPtr->numChars;
 	lastChar -= chunkPtr->numChars;
@@ -2343,6 +2353,7 @@ Tk_DrawTextLayout(
 	}
 	chunkPtr++;
     }
+#endif /* Use TkDrawAngledTextLayout() implementation */
 }
 
 void
@@ -2395,6 +2406,21 @@ TkDrawAngledTextLayout(
 		numDisplayChars = lastChar;
 	    }
 	    lastByte = Tcl_UtfAtIndex(chunkPtr->start, numDisplayChars);
+#if TK_DRAW_IN_CONTEXT
+	    dx = cosA * (chunkPtr->x) + sinA * (chunkPtr->y);
+	    dy = -sinA * (chunkPtr->x) + cosA * (chunkPtr->y);
+	    if (angle == 0.0) {
+		TkpDrawCharsInContext(display, drawable, gc,
+			layoutPtr->tkfont, chunkPtr->start, chunkPtr->numBytes,
+			firstChar, numDisplayChars - firstChar,
+			(int)(x + dx), (int)(y + dy));
+	    } else {
+		TkpDrawAngledCharsInContext(display, drawable, gc,
+			layoutPtr->tkfont, chunkPtr->start, chunkPtr->numBytes,
+			firstChar, numDisplayChars - firstChar,
+			x+dx, y+dy, angle);
+	    }
+#else /* !TK_DRAW_IN_CONTEXT */
 	    dx = cosA * (chunkPtr->x + drawX) + sinA * (chunkPtr->y);
 	    dy = -sinA * (chunkPtr->x + drawX) + cosA * (chunkPtr->y);
 	    if (angle == 0.0) {
@@ -2405,6 +2431,7 @@ TkDrawAngledTextLayout(
 		TkDrawAngledChars(display, drawable, gc, layoutPtr->tkfont,
 			firstByte, lastByte - firstByte, x+dx, y+dy, angle);
 	    }
+#endif /* TK_DRAW_IN_CONTEXT */
 	}
 	firstChar -= chunkPtr->numChars;
 	lastChar -= chunkPtr->numChars;
diff --git a/generic/tkInt.h b/generic/tkInt.h
index 8f958ab..2f9efe8 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -1231,6 +1231,10 @@ MODULE_SCOPE void	TkpDrawCharsInContext(Display * display,
 			    Drawable drawable, GC gc, Tk_Font tkfont,
 			    const char *source, int numBytes, int rangeStart,
 			    int rangeLength, int x, int y);
+MODULE_SCOPE void	TkpDrawAngledCharsInContext(Display * display,
+			    Drawable drawable, GC gc, Tk_Font tkfont,
+			    const char *source, int numBytes, int rangeStart,
+			    int rangeLength, double x, double y, double angle);
 MODULE_SCOPE int	TkpMeasureCharsInContext(Tk_Font tkfont,
 			    const char *source, int numBytes, int rangeStart,
 			    int rangeLength, int maxLength, int flags,
diff --git a/macosx/tkMacOSXFont.c b/macosx/tkMacOSXFont.c
index 2d8168d..01e6d98 100644
--- a/macosx/tkMacOSXFont.c
+++ b/macosx/tkMacOSXFont.c
@@ -93,10 +93,6 @@ static void		InitFont(NSFont *nsFont,
 static int		CreateNamedSystemFont(Tcl_Interp *interp,
 			    Tk_Window tkwin, const char *name,
 			    TkFontAttributes *faPtr);
-static void		DrawCharsInContext(Display *display, Drawable drawable,
-			    GC gc, Tk_Font tkfont, const char *source,
-			    int numBytes, int rangeStart, int rangeLength,
-			    int x, int y, double angle);
 
 #pragma mark -
 #pragma mark Font Helpers:
@@ -1115,7 +1111,7 @@ done:
  *	Draw a string of characters on the screen.
  *
  *	With ATSUI we need the line context to do this right, so we have the
- *	actual implementation in TkpDrawCharsInContext().
+ *	actual implementation in TkpDrawAngledCharsInContext().
  *
  * Results:
  *	None.
@@ -1144,7 +1140,7 @@ Tk_DrawChars(
     int x, int y)		/* Coordinates at which to place origin of the
 				 * string when drawing. */
 {
-    DrawCharsInContext(display, drawable, gc, tkfont, source, numBytes,
+    TkpDrawAngledCharsInContext(display, drawable, gc, tkfont, source, numBytes,
 	    0, numBytes, x, y, 0.0);
 }
 
@@ -1167,7 +1163,7 @@ TkDrawAngledChars(
 				 * string when drawing. */
     double angle)		/* What angle to put text at, in degrees. */
 {
-    DrawCharsInContext(display, drawable, gc, tkfont, source, numBytes,
+    TkpDrawAngledCharsInContext(display, drawable, gc, tkfont, source, numBytes,
 	    0, numBytes, x, y, angle);
 }
 
@@ -1212,12 +1208,12 @@ TkpDrawCharsInContext(
 				 * whole (not just the range) string when
 				 * drawing. */
 {
-    DrawCharsInContext(display, drawable, gc, tkfont, source, numBytes,
+    TkpDrawAngledCharsInContext(display, drawable, gc, tkfont, source, numBytes,
 	    rangeStart, rangeLength, x, y, 0.0);
 }
 
-static void
-DrawCharsInContext(
+void
+TkpDrawAngledCharsInContext(
     Display *display,		/* Display on which to draw. */
     Drawable drawable,		/* Window or pixmap in which to draw. */
     GC gc,			/* Graphics context for drawing characters. */
@@ -1233,10 +1229,10 @@ DrawCharsInContext(
     int numBytes,		/* Number of bytes in string. */
     int rangeStart,		/* Index of first byte to draw. */
     int rangeLength,		/* Length of range to draw in bytes. */
-    int x, int y,		/* Coordinates at which to place origin of the
+    double x, double y,		/* Coordinates at which to place origin of the
 				 * whole (not just the range) string when
 				 * drawing. */
-    double angle)
+    double angle)		/* What angle to put text at, in degrees. */
 {
     const MacFont *fontPtr = (const MacFont *) tkfont;
     NSString *string;
diff --git a/macosx/tkMacOSXInt.h b/macosx/tkMacOSXInt.h
index 9cb75d2..b6b9cca 100644
--- a/macosx/tkMacOSXInt.h
+++ b/macosx/tkMacOSXInt.h
@@ -180,7 +180,7 @@ MODULE_SCOPE void TkpFreeGCCache(GC gc);
 #define TK_MACOSX_HANDLE_EVENT_IMMEDIATELY 1024
 
 /*
- * Defines for tkTextDisp.c
+ * Defines for tkTextDisp.c and tkFont.c
  */
 
 #define TK_LAYOUT_WITH_BASE_CHUNKS	1
diff --git a/unix/tkUnixFont.c b/unix/tkUnixFont.c
index 6e7b4c3..a1b969e 100644
--- a/unix/tkUnixFont.c
+++ b/unix/tkUnixFont.c
@@ -1413,6 +1413,38 @@ TkpDrawCharsInContext(
 	    rangeLength, x+widthUntilStart, y);
 }
 
+/* UNTESTED */
+void
+TkpDrawAngledCharsInContext(
+    Display *display,		/* Display on which to draw. */
+    Drawable drawable,		/* Window or pixmap in which to draw. */
+    GC gc,			/* Graphics context for drawing characters. */
+    Tk_Font tkfont,		/* Font in which characters will be drawn; must
+				 * be the same as font used in GC. */
+    const char * source,	/* UTF-8 string to be displayed. Need not be
+				 * '\0' terminated. All Tk meta-characters
+				 * (tabs, control characters, and newlines)
+				 * should be stripped out of the string that is
+				 * passed to this function. If they are not
+				 * stripped out, they will be displayed as
+				 * regular printing characters. */
+    int numBytes,		/* Number of bytes in string. */
+    int rangeStart,		/* Index of first byte to draw. */
+    int rangeLength,		/* Length of range to draw in bytes. */
+    double x, double y,		/* Coordinates at which to place origin of the
+				 * whole (not just the range) string when
+				 * drawing. */
+    double angle)		/* What angle to put text at, in degrees. */
+{
+    int widthUntilStart;
+
+    (void) numBytes; /*unused*/
+
+    Tk_MeasureChars(tkfont, source, rangeStart, -1, 0, &widthUntilStart);
+    TkDrawAngledChars(display, drawable, gc, tkfont, source + rangeStart,
+	    rangeLength, x+widthUntilStart, y, angle);
+}
+
 /*
  *-------------------------------------------------------------------------
  *
diff --git a/win/tkWinFont.c b/win/tkWinFont.c
index cef505a..39abda4 100644
--- a/win/tkWinFont.c
+++ b/win/tkWinFont.c
@@ -1402,6 +1402,37 @@ TkpDrawCharsInContext(
 	    rangeLength, x+widthUntilStart, y);
 }
 
+/* UNTESTED */
+void
+TkpDrawAngledCharsInContext(
+    Display *display,		/* Display on which to draw. */
+    Drawable drawable,		/* Window or pixmap in which to draw. */
+    GC gc,			/* Graphics context for drawing characters. */
+    Tk_Font tkfont,		/* Font in which characters will be drawn; must
+				 * be the same as font used in GC. */
+    const char * source,	/* UTF-8 string to be displayed. Need not be
+				 * '\0' terminated. All Tk meta-characters
+				 * (tabs, control characters, and newlines)
+				 * should be stripped out of the string that is
+				 * passed to this function. If they are not
+				 * stripped out, they will be displayed as
+				 * regular printing characters. */
+    int numBytes,		/* Number of bytes in string. */
+    int rangeStart,		/* Index of first byte to draw. */
+    int rangeLength,		/* Length of range to draw in bytes. */
+    double x, double y,		/* Coordinates at which to place origin of the
+				 * whole (not just the range) string when
+				 * drawing. */
+    double angle)		/* What angle to put text at, in degrees. */
+{
+    int widthUntilStart;
+    (void) numBytes; /*unused*/
+
+    Tk_MeasureChars(tkfont, source, rangeStart, -1, 0, &widthUntilStart);
+    TkDrawAngledChars(display, drawable, gc, tkfont, source + rangeStart,
+	    rangeLength, x+widthUntilStart, y, angle);
+}
+
 /*
  *-------------------------------------------------------------------------
  *
-- 
cgit v0.12


From 5ed4790f7555c57fa47e3467c819aa111c632978 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Tue, 21 Apr 2020 06:57:35 +0000
Subject: Apply a third patch from Christopher Chavez.

---
 unix/tkUnixFont.c  |  4 +--
 unix/tkUnixRFont.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 win/tkWinFont.c    |  4 +--
 3 files changed, 84 insertions(+), 4 deletions(-)

diff --git a/unix/tkUnixFont.c b/unix/tkUnixFont.c
index a1b969e..c91da55 100644
--- a/unix/tkUnixFont.c
+++ b/unix/tkUnixFont.c
@@ -1413,7 +1413,6 @@ TkpDrawCharsInContext(
 	    rangeLength, x+widthUntilStart, y);
 }
 
-/* UNTESTED */
 void
 TkpDrawAngledCharsInContext(
     Display *display,		/* Display on which to draw. */
@@ -1437,12 +1436,13 @@ TkpDrawAngledCharsInContext(
     double angle)		/* What angle to put text at, in degrees. */
 {
     int widthUntilStart;
+    double sinA = sin(angle * PI/180.0), cosA = cos(angle * PI/180.0);
 
     (void) numBytes; /*unused*/
 
     Tk_MeasureChars(tkfont, source, rangeStart, -1, 0, &widthUntilStart);
     TkDrawAngledChars(display, drawable, gc, tkfont, source + rangeStart,
-	    rangeLength, x+widthUntilStart, y, angle);
+	    rangeLength, x+cosA*widthUntilStart, y-sinA*widthUntilStart, angle);
 }
 
 /*
diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c
index 2c3d91f..069598f 100644
--- a/unix/tkUnixRFont.c
+++ b/unix/tkUnixRFont.c
@@ -1300,6 +1300,86 @@ TkDrawAngledChars(
     }
 }
 
+/*
+ *---------------------------------------------------------------------------
+ *
+ * TkpDrawCharsInContext --
+ *
+ *	Draw a string of characters on the screen like Tk_DrawChars(), but
+ *	with access to all the characters on the line for context. On X11 this
+ *	context isn't consulted, so we just call Tk_DrawChars().
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	Information gets drawn on the screen.
+ *
+ *---------------------------------------------------------------------------
+ */
+
+void
+TkpDrawCharsInContext(
+    Display *display,		/* Display on which to draw. */
+    Drawable drawable,		/* Window or pixmap in which to draw. */
+    GC gc,			/* Graphics context for drawing characters. */
+    Tk_Font tkfont,		/* Font in which characters will be drawn;
+				 * must be the same as font used in GC. */
+    const char *source,		/* UTF-8 string to be displayed. Need not be
+				 * '\0' terminated. All Tk meta-characters
+				 * (tabs, control characters, and newlines)
+				 * should be stripped out of the string that
+				 * is passed to this function. If they are not
+				 * stripped out, they will be displayed as
+				 * regular printing characters. */
+    int numBytes,		/* Number of bytes in string. */
+    int rangeStart,		/* Index of first byte to draw. */
+    int rangeLength,		/* Length of range to draw in bytes. */
+    int x, int y)		/* Coordinates at which to place origin of the
+				 * whole (not just the range) string when
+				 * drawing. */
+{
+    int widthUntilStart;
+
+    (void) numBytes; /*unused*/
+
+    Tk_MeasureChars(tkfont, source, rangeStart, -1, 0, &widthUntilStart);
+    Tk_DrawChars(display, drawable, gc, tkfont, source + rangeStart,
+	    rangeLength, x+widthUntilStart, y);
+}
+
+void
+TkpDrawAngledCharsInContext(
+    Display *display,		/* Display on which to draw. */
+    Drawable drawable,		/* Window or pixmap in which to draw. */
+    GC gc,			/* Graphics context for drawing characters. */
+    Tk_Font tkfont,		/* Font in which characters will be drawn; must
+				 * be the same as font used in GC. */
+    const char * source,	/* UTF-8 string to be displayed. Need not be
+				 * '\0' terminated. All Tk meta-characters
+				 * (tabs, control characters, and newlines)
+				 * should be stripped out of the string that is
+				 * passed to this function. If they are not
+				 * stripped out, they will be displayed as
+				 * regular printing characters. */
+    int numBytes,		/* Number of bytes in string. */
+    int rangeStart,		/* Index of first byte to draw. */
+    int rangeLength,		/* Length of range to draw in bytes. */
+    double x, double y,		/* Coordinates at which to place origin of the
+				 * whole (not just the range) string when
+				 * drawing. */
+    double angle)		/* What angle to put text at, in degrees. */
+{
+    int widthUntilStart;
+    double sinA = sin(angle * PI/180.0), cosA = cos(angle * PI/180.0);
+
+    (void) numBytes; /*unused*/
+
+    Tk_MeasureChars(tkfont, source, rangeStart, -1, 0, &widthUntilStart);
+    TkDrawAngledChars(display, drawable, gc, tkfont, source + rangeStart,
+	    rangeLength, x+cosA*widthUntilStart, y-sinA*widthUntilStart, angle);
+}
+
 void
 TkUnixSetXftClipRegion(
     TkRegion clipRegion)	/* The clipping region to install. */
diff --git a/win/tkWinFont.c b/win/tkWinFont.c
index 39abda4..91f8f14 100644
--- a/win/tkWinFont.c
+++ b/win/tkWinFont.c
@@ -1402,7 +1402,6 @@ TkpDrawCharsInContext(
 	    rangeLength, x+widthUntilStart, y);
 }
 
-/* UNTESTED */
 void
 TkpDrawAngledCharsInContext(
     Display *display,		/* Display on which to draw. */
@@ -1426,11 +1425,12 @@ TkpDrawAngledCharsInContext(
     double angle)		/* What angle to put text at, in degrees. */
 {
     int widthUntilStart;
+    double sinA = sin(angle * PI/180.0), cosA = cos(angle * PI/180.0);
     (void) numBytes; /*unused*/
 
     Tk_MeasureChars(tkfont, source, rangeStart, -1, 0, &widthUntilStart);
     TkDrawAngledChars(display, drawable, gc, tkfont, source + rangeStart,
-	    rangeLength, x+widthUntilStart, y, angle);
+	    rangeLength, x+cosA*widthUntilStart, y-sinA*widthUntilStart, angle);
 }
 
 /*
-- 
cgit v0.12


From 15e5fa342b580bd3d22f1c83bffc4ae1c171cf65 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sat, 2 May 2020 14:19:27 +0000
Subject: Add comments

---
 generic/tkBind.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/generic/tkBind.c b/generic/tkBind.c
index c1fdc0c..c665c97 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -59,7 +59,9 @@
 
 /*
  * In old implementation (the one that used an event ring), <Double-1> and <1><1> were
- * equivalent sequences. However it is logical to give <Double-1> higher precedence.
+ * equivalent sequences. However it is logical to give <Double-1> higher precedence
+ * since it is more specific. Indeed <Double-1> includes time and space requirements,
+ * which is not the case for <1><1>.
  * This can be achieved by setting PREFER_MOST_SPECIALIZED_EVENT to 1.
  */
 
@@ -2192,7 +2194,7 @@ Tk_BindEvent(
      * Ignore the event completely if it is an Enter, Leave, FocusIn, or
      * FocusOut event with detail NotifyInferior. The reason for ignoring
      * these events is that we don't want transitions between a window and its
-     * children to visible to bindings on the parent: this would cause
+     * children to be visible to bindings on the parent: this would cause
      * problems for mega-widgets, since the internal structure of a
      * mega-widget isn't supposed to be visible to people watching the parent.
      *
-- 
cgit v0.12


From 0b6034171d1c461e9c7758e6ba29962052d89ad3 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sat, 2 May 2020 16:58:33 +0000
Subject: Add (currently failing) tests bind-33.16, bind-33.17 and bind-33.18
 exercising the case reported in bug [16ef161925]

---
 tests/bind.test | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/tests/bind.test b/tests/bind.test
index 7cb515d..8bd215a 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -6624,6 +6624,57 @@ test bind-33.15 {prefer last in case of homogeneous equal patterns} -setup {
     # because both bindings are homogeneous equal, so the most recently defined
     # must be preferred.
 } -result {last}
+test bind-33.16 {simulate use of the keyboard to trigger a pattern sequence with modifier - bug [16ef161925]} -setup {
+    pack [frame .t.f]
+    focus -force .t.f
+    update
+    set x {}
+} -body {
+    bind .t.f <Escape><Control-c> { lappend x "Esc_Control-c" }
+    event generate .t.f <Escape>
+    event generate .t.f <Control_L>
+    event generate .t.f <Control_L>
+    event generate .t.f <Control_L>
+    event generate .t.f <Control-c>
+    set x
+} -cleanup {
+    destroy .t.f
+} -result {Esc_Control-c}
+test bind-33.17 {simulate use of the keyboard to trigger a pattern sequence with modifier - bug [16ef161925]} -setup {
+    pack [frame .t.f]
+    focus -force .t.f
+    update
+    set x {}
+} -body {
+    bind .t.f <Escape><Control-c> { lappend x "Esc_Control-c" }
+    bind .t.f <Escape><Control_L><Control-c> { lappend x "Esc_Ctrl_L_Control-c" }
+    event generate .t.f <Escape>
+    event generate .t.f <Control_L>
+    event generate .t.f <Control_L>
+    event generate .t.f <Control_L>
+    event generate .t.f <Control-c>
+    set x
+} -cleanup {
+    destroy .t.f
+} -result {Esc_Ctrl_L_Control-c}
+test bind-33.18 {simulate use of the keyboard to trigger a pattern sequence with modifier - bug [16ef161925]} -setup {
+    pack [frame .t.f]
+    focus -force .t.f
+    update
+    set x {}
+} -body {
+    bind .t.f <Escape><Control-c> { lappend x "Esc_Control-c" }
+    bind .t.f <Escape><Control_L><Control-c> { lappend x "Esc_Ctrl_L_Control-c" }
+    bind .t.f <Escape><Control_L><Control_L><Control-c> { lappend x "Esc_Ctrl_L(2)_Control-c" }
+    event generate .t.f <Escape>
+    event generate .t.f <Control_L>
+    event generate .t.f <Control_L>
+    event generate .t.f <Control_L>
+    event generate .t.f <Control-c>
+    set x
+} -cleanup {
+    destroy .t.f
+} -result {Esc_Ctrl_L(2)_Control-c}
 
 test bind-34.1 {-warp works relatively to a window} -setup {
     toplevel .top
-- 
cgit v0.12


From 1f9bfb7ca41d15194eecedc6a5875fe3564ecd7c Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sat, 2 May 2020 16:59:41 +0000
Subject: Fix proposal for [16ef161925]: <Escape><Control-c> binding sequence
 not working anymore

---
 generic/tkBind.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/generic/tkBind.c b/generic/tkBind.c
index c665c97..105585e 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -2794,6 +2794,7 @@ MatchPatterns(
 		    ? psPtr->object == object
 		    : VirtPatIsBound(bindPtr, psPtr, object, physPtrPtr)) {
 		TkPattern *patPtr = psPtr->pats + patIndex;
+                unsigned i;
 
 		if (patPtr->eventType == (unsigned) curEvent->xev.type
 			&& (curEvent->xev.type != CreateNotify
@@ -2875,6 +2876,25 @@ MatchPatterns(
 			}
 		    }
 		}
+ 
+                /*
+                 * Modifier key events interlaced between patterns parts of a
+                 * sequence shall not prevent a sequence from ultimately
+                 * matching. Example: when trying to trigger <a><Control-c>
+                 * from the keyboard, the sequence of events actually seen is
+                 * <a> then <Control_L> (possibly repeating if the key is hold
+                 * down), and finally <Control-c>. At the time <Control_L> is
+                 * seen, we shall keep the <a><Control-c> pattern sequence in
+                 * the promotion list, otherwise it is impossible to trigger
+                 * it from the keyboard. See bug [16ef161925].
+                 */
+                for (i = 0; i < (unsigned) dispPtr->numModKeyCodes; ++i) {
+                    if (dispPtr->modKeyCodes[i] == curEvent->xev.xkey.keycode) {
+                        DEBUG(psEntry->expired = 0;)
+                        psEntry->keepIt = 1;
+                    }
+                }
+
 	    }
 	}
     }
-- 
cgit v0.12


From b1e49e8fcaf74233197cc64fae57ddefaa7045c0 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sat, 2 May 2020 19:25:08 +0000
Subject: Add new test bind-33.19, further exercising simulation of the
 keyboard to trigger bindings containing several patterns.

---
 tests/bind.test | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tests/bind.test b/tests/bind.test
index 8bd215a..7431079 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -6675,6 +6675,22 @@ test bind-33.18 {simulate use of the keyboard to trigger a pattern sequence with
 } -cleanup {
     destroy .t.f
 } -result {Esc_Ctrl_L(2)_Control-c}
+test bind-33.19 {simulate use of the keyboard to trigger a pattern sequence with modifier - bug [16ef161925]} -setup {
+    pack [frame .t.f]
+    focus -force .t.f
+    update
+    set x {}
+} -body {
+    bind .t.f <Escape><Control-c> { lappend x "Esc_Control-c" }
+    bind .t.f <Escape><KeyPress><KeyPress><Control-c> { lappend x "Esc_Key(2)_Control-c" }
+    event generate .t.f <Escape>
+    event generate .t.f <Alt_L>
+    event generate .t.f <Control_L>
+    event generate .t.f <Control-c>
+    set x
+} -cleanup {
+    destroy .t.f
+} -result {Esc_Key(2)_Control-c}
 
 test bind-34.1 {-warp works relatively to a window} -setup {
     toplevel .top
-- 
cgit v0.12


From b32ea1d3f743cc4b1a5c07d13006ed0d0d953946 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sat, 2 May 2020 19:33:58 +0000
Subject: Revert my fix proposal [dfa8bbc5] and commit a fix proposal from
 Gregor. Tests bind-33.16, -17 and -18 fail again. Moreover bind-33.9 now
 fails (regression).

---
 generic/tkBind.c | 45 +++++++++++++++++++--------------------------
 1 file changed, 19 insertions(+), 26 deletions(-)

diff --git a/generic/tkBind.c b/generic/tkBind.c
index 105585e..a39b01b 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -854,18 +854,25 @@ MatchEventNearby(
 	    && TestNearbyCoords(rhs->xbutton.y_root, lhs->xbutton.y_root);
 }
 
+int
+IsKeyEventType(
+    unsigned eventType)
+{
+    return eventType == KeyPress || eventType == KeyRelease;
+}
+
 static int
 MatchEventRepeat(
-    const XEvent *lhs,	/* previous key event */
-    const XEvent *rhs)	/* current key event */
+    const XKeyEvent *lhs,	/* previous key event */
+    const XKeyEvent *rhs)	/* current key event */
 {
     assert(lhs);
     assert(rhs);
-    assert(lhs->type == KeyPress || lhs->type == KeyRelease);
+    assert(IsKeyEventType(lhs->type));
     assert(lhs->type == rhs->type);
 
-    /* assert: lhs->xkey.time <= rhs->xkey.time */
-    return TestNearbyTime(rhs->xkey.time, lhs->xkey.time);
+    /* assert: lhs->time <= rhs->time */
+    return lhs->keycode == rhs->keycode && TestNearbyTime(lhs->time, rhs->time);
 }
 
 static void
@@ -2278,7 +2285,7 @@ Tk_BindEvent(
 	switch (eventPtr->type) {
 	case KeyPress:
 	case KeyRelease:
-	    if (MatchEventRepeat(&curEvent->xev, eventPtr)) {
+	    if (MatchEventRepeat(&curEvent->xev.xkey, &eventPtr->xkey)) {
 		if (curEvent->xev.xkey.keycode == eventPtr->xkey.keycode) {
 		    ++curEvent->countDetailed;
 		} else {
@@ -2767,6 +2774,7 @@ MatchPatterns(
     PatSeq *bestPhysPtr;
     ModMask bestModMask;
     const PSModMaskArr *bestModMaskArr = NULL;
+    int isModKeyOnly;
 
     assert(dispPtr);
     assert(bindPtr);
@@ -2780,6 +2788,7 @@ MatchPatterns(
     bestPtr = NULL;
     bestPhysPtr = NULL;
     window = curEvent->xev.xany.window;
+    isModKeyOnly = IsKeyEventType(curEvent->xev.type) && curEvent->xev.xkey.keycode == 0;
 
     for (psEntry = PSList_First(psList); psEntry; psEntry = PSList_Next(psEntry)) {
 	if (patIndex == 0 || psEntry->window == window) {
@@ -2790,11 +2799,13 @@ MatchPatterns(
 	    assert(psPtr->object || patIndex == 0);
 	    assert(psPtr->numPats > patIndex);
 
+            /* ignore modifier key events */
+            psEntry->keepIt = isModKeyOnly;
+
 	    if (psPtr->object
 		    ? psPtr->object == object
 		    : VirtPatIsBound(bindPtr, psPtr, object, physPtrPtr)) {
 		TkPattern *patPtr = psPtr->pats + patIndex;
-                unsigned i;
 
 		if (patPtr->eventType == (unsigned) curEvent->xev.type
 			&& (curEvent->xev.type != CreateNotify
@@ -2810,6 +2821,7 @@ MatchPatterns(
 		    ModMask curModMask = ResolveModifiers(dispPtr, bindPtr->curModMask);
 
 		    psEntry->expired = 1; /* remove it from promotion list */
+                    psEntry->keepIt = 0; /* don't keep matching patterns */
 
 		    if (IsSubsetOf(modMask, curModMask)) {
 			unsigned count = patPtr->info ? curEvent->countDetailed : curEvent->countAny;
@@ -2876,25 +2888,6 @@ MatchPatterns(
 			}
 		    }
 		}
- 
-                /*
-                 * Modifier key events interlaced between patterns parts of a
-                 * sequence shall not prevent a sequence from ultimately
-                 * matching. Example: when trying to trigger <a><Control-c>
-                 * from the keyboard, the sequence of events actually seen is
-                 * <a> then <Control_L> (possibly repeating if the key is hold
-                 * down), and finally <Control-c>. At the time <Control_L> is
-                 * seen, we shall keep the <a><Control-c> pattern sequence in
-                 * the promotion list, otherwise it is impossible to trigger
-                 * it from the keyboard. See bug [16ef161925].
-                 */
-                for (i = 0; i < (unsigned) dispPtr->numModKeyCodes; ++i) {
-                    if (dispPtr->modKeyCodes[i] == curEvent->xev.xkey.keycode) {
-                        DEBUG(psEntry->expired = 0;)
-                        psEntry->keepIt = 1;
-                    }
-                }
-
 	    }
 	}
     }
-- 
cgit v0.12


From b0496c8e6eecf19425c2cb2a790737942a052387 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 3 May 2020 09:31:07 +0000
Subject: Now a mixture of my fix with Gregor's fix. All tests from bind.test
 do pass again.

---
 generic/tkBind.c | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/generic/tkBind.c b/generic/tkBind.c
index a39b01b..8e08746 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -2774,7 +2774,7 @@ MatchPatterns(
     PatSeq *bestPhysPtr;
     ModMask bestModMask;
     const PSModMaskArr *bestModMaskArr = NULL;
-    int isModKeyOnly;
+    int i, isModKeyOnly = 0;
 
     assert(dispPtr);
     assert(bindPtr);
@@ -2788,7 +2788,26 @@ MatchPatterns(
     bestPtr = NULL;
     bestPhysPtr = NULL;
     window = curEvent->xev.xany.window;
-    isModKeyOnly = IsKeyEventType(curEvent->xev.type) && curEvent->xev.xkey.keycode == 0;
+
+    /*
+     * Modifier key events interlaced between patterns parts of a
+     * sequence shall not prevent a sequence from ultimately
+     * matching. Example: when trying to trigger <a><Control-c>
+     * from the keyboard, the sequence of events actually seen is
+     * <a> then <Control_L> (possibly repeating if the key is hold
+     * down), and finally <Control-c>. At the time <Control_L> is
+     * seen, we shall keep the <a><Control-c> pattern sequence in
+     * the promotion list, otherwise it is impossible to trigger
+     * it from the keyboard. See bug [16ef161925].
+     */
+    if (IsKeyEventType(curEvent->xev.type)) {
+        for (i = 0; i < dispPtr->numModKeyCodes; ++i) {
+            if (dispPtr->modKeyCodes[i] == curEvent->xev.xkey.keycode) {
+                isModKeyOnly = 1;
+                break;
+            }
+        }
+    }
 
     for (psEntry = PSList_First(psList); psEntry; psEntry = PSList_Next(psEntry)) {
 	if (patIndex == 0 || psEntry->window == window) {
@@ -2799,14 +2818,14 @@ MatchPatterns(
 	    assert(psPtr->object || patIndex == 0);
 	    assert(psPtr->numPats > patIndex);
 
-            /* ignore modifier key events */
-            psEntry->keepIt = isModKeyOnly;
-
 	    if (psPtr->object
 		    ? psPtr->object == object
 		    : VirtPatIsBound(bindPtr, psPtr, object, physPtrPtr)) {
 		TkPattern *patPtr = psPtr->pats + patIndex;
 
+                /* ignore modifier key events */
+                psEntry->keepIt = isModKeyOnly;
+
 		if (patPtr->eventType == (unsigned) curEvent->xev.type
 			&& (curEvent->xev.type != CreateNotify
 				|| curEvent->xev.xcreatewindow.parent == window)
-- 
cgit v0.12


From 08125543bb6f0e52cf39ebecfd21cf8371b7ab0f Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 3 May 2020 21:06:14 +0000
Subject: Make a bit more use of helper functions. No functional change.

---
 generic/tkBind.c | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/generic/tkBind.c b/generic/tkBind.c
index 8e08746..dbf8d8f 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -837,6 +837,20 @@ CountSpecialized(
     return sndCount - fstCount;
 }
 
+int
+IsKeyEventType(
+    unsigned eventType)
+{
+    return eventType == KeyPress || eventType == KeyRelease;
+}
+
+int
+IsButtonEventType(
+    unsigned eventType)
+{
+    return eventType == ButtonPress || eventType == ButtonRelease;
+}
+
 static int
 MatchEventNearby(
     const XEvent *lhs,	/* previous button event */
@@ -844,7 +858,7 @@ MatchEventNearby(
 {
     assert(lhs);
     assert(rhs);
-    assert(lhs->type == ButtonPress || lhs->type == ButtonRelease);
+    assert(IsButtonEventType(lhs->type));
     assert(lhs->type == rhs->type);
 
     /* assert: lhs->xbutton.time <= rhs->xbutton.time */
@@ -854,13 +868,6 @@ MatchEventNearby(
 	    && TestNearbyCoords(rhs->xbutton.y_root, lhs->xbutton.y_root);
 }
 
-int
-IsKeyEventType(
-    unsigned eventType)
-{
-    return eventType == KeyPress || eventType == KeyRelease;
-}
-
 static int
 MatchEventRepeat(
     const XKeyEvent *lhs,	/* previous key event */
@@ -2509,13 +2516,13 @@ Tk_BindEvent(
 		switch (patPtr->eventType) {
 		case ButtonPress:
 		case ButtonRelease:
-		    if (curEvent->xev.type == KeyPress || curEvent->xev.type == KeyRelease) {
+		    if (IsKeyEventType(curEvent->xev.type)) {
 			RemoveListEntry(&bindPtr->lookupTables.entryPool, psEntry);
 		    }
 		    break;
 		case KeyPress:
 		case KeyRelease:
-		    if (curEvent->xev.type == ButtonPress || curEvent->xev.type == ButtonRelease) {
+		    if (IsButtonEventType(curEvent->xev.type)) {
 			RemoveListEntry(&bindPtr->lookupTables.entryPool, psEntry);
 		    }
 		    break;
-- 
cgit v0.12


From 6d7c515937d71090f48a39e7659729339d235879 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sat, 16 May 2020 12:54:26 +0000
Subject: Fix [5c51be6411]: Buffer over-read in Tk_PhotoPutBlock() and
 Tk_PhotoPutZoomedBlock(). Patch from Christopher Chavez.

---
 generic/tkImgPhoto.c | 40 ++++++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c
index 96c3743..5d2c075 100644
--- a/generic/tkImgPhoto.c
+++ b/generic/tkImgPhoto.c
@@ -2771,8 +2771,21 @@ Tk_PhotoPutBlock(
     if (sourceBlock.pixelPtr >= masterPtr->pix32
 	    && sourceBlock.pixelPtr <= masterPtr->pix32 + masterPtr->width
 	    * masterPtr->height * 4) {
-	sourceBlock.pixelPtr = attemptckalloc(sourceBlock.height
-		* sourceBlock.pitch);
+	/*
+	 * Fix 0123456789: avoid reading
+	 *
+	 *	(sourceBlock.pitch - sourceBlock.width * sourceBlock.pixelSize)
+	 *
+	 * bytes past the end of masterPtr->pix32[] when
+	 *
+	 *	blockPtr->pixelPtr > (masterPtr->pix32 +
+	 *		4 * masterPtr->width * masterPtr->height -
+	 *		sourceBlock.height * sourceBlock.pitch)
+	 */
+	unsigned int cpyLen = (sourceBlock.height - 1) * sourceBlock.pitch +
+		sourceBlock.width * sourceBlock.pixelSize;
+
+	sourceBlock.pixelPtr = attemptckalloc(cpyLen);
 	if (sourceBlock.pixelPtr == NULL) {
 	    if (interp != NULL) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
@@ -2782,8 +2795,7 @@ Tk_PhotoPutBlock(
 	    return TCL_ERROR;
 	}
 	memToFree = sourceBlock.pixelPtr;
-	memcpy(sourceBlock.pixelPtr, blockPtr->pixelPtr, sourceBlock.height
-	    * sourceBlock.pitch);
+	memcpy(sourceBlock.pixelPtr, blockPtr->pixelPtr, cpyLen);
     }
 
 
@@ -3205,8 +3217,21 @@ Tk_PhotoPutZoomedBlock(
     if (sourceBlock.pixelPtr >= masterPtr->pix32
 	    && sourceBlock.pixelPtr <= masterPtr->pix32 + masterPtr->width
 	    * masterPtr->height * 4) {
-	sourceBlock.pixelPtr = attemptckalloc(sourceBlock.height
-		* sourceBlock.pitch);
+	/*
+	 * Fix 0123456789: avoid reading
+	 *
+	 *	(sourceBlock.pitch - sourceBlock.width * sourceBlock.pixelSize)
+	 *
+	 * bytes past the end of masterPtr->pix32[] when
+	 *
+	 *	blockPtr->pixelPtr > (masterPtr->pix32 +
+	 *		4 * masterPtr->width * masterPtr->height -
+	 *		sourceBlock.height * sourceBlock.pitch)
+	 */
+	unsigned int cpyLen = (sourceBlock.height - 1) * sourceBlock.pitch +
+		sourceBlock.width * sourceBlock.pixelSize;
+
+	sourceBlock.pixelPtr = attemptckalloc(cpyLen);
 	if (sourceBlock.pixelPtr == NULL) {
 	    if (interp != NULL) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
@@ -3216,8 +3241,7 @@ Tk_PhotoPutZoomedBlock(
 	    return TCL_ERROR;
 	}
 	memToFree = sourceBlock.pixelPtr;
-	memcpy(sourceBlock.pixelPtr, blockPtr->pixelPtr, sourceBlock.height
-	    * sourceBlock.pitch);
+	memcpy(sourceBlock.pixelPtr, blockPtr->pixelPtr, cpyLen);
     }
 
     xEnd = x + width;
-- 
cgit v0.12


From 6032a8780a04056c38959835e506213718674a37 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sat, 16 May 2020 12:55:11 +0000
Subject: Let the bug id be correct

---
 generic/tkImgPhoto.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c
index 5d2c075..db106f2 100644
--- a/generic/tkImgPhoto.c
+++ b/generic/tkImgPhoto.c
@@ -2772,7 +2772,7 @@ Tk_PhotoPutBlock(
 	    && sourceBlock.pixelPtr <= masterPtr->pix32 + masterPtr->width
 	    * masterPtr->height * 4) {
 	/*
-	 * Fix 0123456789: avoid reading
+	 * Fix 5c51be6411: avoid reading
 	 *
 	 *	(sourceBlock.pitch - sourceBlock.width * sourceBlock.pixelSize)
 	 *
@@ -3218,7 +3218,7 @@ Tk_PhotoPutZoomedBlock(
 	    && sourceBlock.pixelPtr <= masterPtr->pix32 + masterPtr->width
 	    * masterPtr->height * 4) {
 	/*
-	 * Fix 0123456789: avoid reading
+	 * Fix 5c51be6411: avoid reading
 	 *
 	 *	(sourceBlock.pitch - sourceBlock.width * sourceBlock.pixelSize)
 	 *
-- 
cgit v0.12


From 94796510222de972274beb287fa2aaa581dd4a7a Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Sat, 16 May 2020 14:20:06 +0000
Subject: Remove code from TkpWarpPointer which was only needed to construct
 the NSEvent that is no longer being constructed.

---
 macosx/tkMacOSXMouseEvent.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index 9a4dc46..e8296e2 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -641,25 +641,15 @@ TkpWarpPointer(
     TkDisplay *dispPtr)
 {
     CGPoint pt;
-    NSPoint loc;
-    int wNum;
 
     if (dispPtr->warpWindow) {
 	int x, y;
-	TkWindow *winPtr = (TkWindow *) dispPtr->warpWindow;
-	TkWindow *topPtr = winPtr->privatePtr->toplevel->winPtr;
-	NSWindow *w = TkMacOSXDrawableWindow(winPtr->window);
-	wNum = [w windowNumber];
 	Tk_GetRootCoords(dispPtr->warpWindow, &x, &y);
 	pt.x = x + dispPtr->warpX;
 	pt.y = y + dispPtr->warpY;
-	loc.x = dispPtr->warpX;
-	loc.y = Tk_Height(topPtr) - dispPtr->warpY;
     } else {
-	wNum = 0;
-	pt.x = loc.x = dispPtr->warpX;
+	pt.x = dispPtr->warpX;
 	pt.y = dispPtr->warpY;
-	loc.y = TkMacOSXZeroScreenHeight() - pt.y;
     }
 
     CGWarpMouseCursorPosition(pt);
-- 
cgit v0.12


From 3315ad85a29eee53ac2c7b8b9845f148ff99edaf Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Tue, 19 May 2020 20:43:44 +0000
Subject: Aqua: Try processing idle events before each call to [NSApp
 nextEventMatchingMask ...]

---
 macosx/tkMacOSXNotify.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/macosx/tkMacOSXNotify.c b/macosx/tkMacOSXNotify.c
index 96c9a7a..985d7bc 100644
--- a/macosx/tkMacOSXNotify.c
+++ b/macosx/tkMacOSXNotify.c
@@ -338,6 +338,7 @@ TkMacOSXEventsSetupProc(
 	 * Call this with dequeue=NO -- just checking if the queue is empty.
 	 */
 
+	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS|TCL_DONT_WAIT)) {}
 	NSEvent *currentEvent =
 	        [NSApp nextEventMatchingMask:NSAnyEventMask
 			untilDate:[NSDate distantPast]
@@ -407,6 +408,7 @@ TkMacOSXEventsCheckProc(
 
 	[NSApp _lockAutoreleasePool];
 	do {
+	    while (Tcl_DoOneEvent(TCL_IDLE_EVENTS|TCL_DONT_WAIT)) {}
 	    modalSession = TkMacOSXGetModalSession();
 	    testEvent = [NSApp nextEventMatchingMask:NSAnyEventMask
 		    untilDate:[NSDate distantPast]
@@ -420,6 +422,7 @@ TkMacOSXEventsCheckProc(
 	    if (testEvent && [[testEvent window] inLiveResize]) {
 		break;
 	    }
+	    while (Tcl_DoOneEvent(TCL_IDLE_EVENTS|TCL_DONT_WAIT)) {}
 	    currentEvent = [NSApp nextEventMatchingMask:NSAnyEventMask
 		    untilDate:[NSDate distantPast]
 		    inMode:GetRunLoopMode(modalSession)
-- 
cgit v0.12

-- 
cgit v0.12


From d6e49238a94a313ec7fa612387ad1c72211ea479 Mon Sep 17 00:00:00 2001
From: bll <brad.lanam.comp@gmail.com>
Date: Wed, 20 May 2020 15:43:52 +0000
Subject: Work around a windows vsapi issue where the size returned for a vsapi
 element changes upon fetching the size a second time.

---
 win/ttkWinXPTheme.c | 41 +++++++++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/win/ttkWinXPTheme.c b/win/ttkWinXPTheme.c
index 4391fdd..c32d3cd 100644
--- a/win/ttkWinXPTheme.c
+++ b/win/ttkWinXPTheme.c
@@ -373,6 +373,10 @@ static Ttk_StateTable tabitem_statemap[] =
  * <<NOTE-GetThemePartSize>>:
  *	This gives bogus metrics for some parts (in particular,
  *	BP_PUSHBUTTONS).  Set the IGNORE_THEMESIZE flag to skip this call.
+ *
+ * <<NOTE-GetThemePartSize-2>>:
+ *      It seems that fetching the part size more than once on checkbuttons 
+ *      and radiobuttons does not work properly.
  */
 
 typedef struct 	/* XP element specifications */
@@ -390,6 +394,7 @@ typedef struct 	/* XP element specifications */
 #   define 	HEAP_ELEMENT	 0x20000000U /* ElementInfo is on heap */
 #   define 	HALF_HEIGHT	 0x10000000U /* Used by GenericSizedElements */
 #   define 	HALF_WIDTH	 0x08000000U /* Used by GenericSizedElements */
+#   define      FETCH_ONCE       0x04000000U /* Used by GenericElementSize See NOTE-GetThemePartSize-2 */
 } ElementInfo;
 
 typedef struct
@@ -407,6 +412,12 @@ typedef struct
     HDC		hDC;
     HWND	hwnd;
 
+    /*
+     * To work around fetch of size returning wrong data
+     */
+    SIZE        origSize;
+    int         fetched;
+
     /* For TkWinDrawableReleaseDC: */
     Drawable	drawable;
     TkWinDCState dcState;
@@ -420,6 +431,7 @@ NewElementData(XPThemeProcs *procs, ElementInfo *info)
     elementData->procs = procs;
     elementData->info = info;
     elementData->hTheme = elementData->hDC = 0;
+    elementData->fetched = 0;
 
     return elementData;
 }
@@ -508,19 +520,28 @@ static void GenericElementSize(
 	return;
 
     if (!(elementData->info->flags & IGNORE_THEMESIZE)) {
-	result = elementData->procs->GetThemePartSize(
-	    elementData->hTheme,
-	    elementData->hDC,
-	    elementData->info->partId,
-	    Ttk_StateTableLookup(elementData->info->statemap, 0),
-	    NULL /*RECT *prc*/,
-	    TS_TRUE,
-	    &size);
+        if ((elementData->info->flags & FETCH_ONCE) && elementData->fetched) {
+            size = elementData->origSize;
+            result = 0; /* non-negative is success */
+        } else {
+	  result = elementData->procs->GetThemePartSize(
+	      elementData->hTheme,
+	      elementData->hDC,
+	      elementData->info->partId,
+	      Ttk_StateTableLookup(elementData->info->statemap, 0),
+	      NULL /*RECT *prc*/,
+	      TS_TRUE,
+	      &size);
+        }
 
 	if (SUCCEEDED(result)) {
 	    *widthPtr = size.cx;
 	    *heightPtr = size.cy;
 	}
+        if ((elementData->info->flags & FETCH_ONCE) && ! elementData->fetched) {
+            elementData->origSize = size; 
+            elementData->fetched = 1;
+        }
     }
 
     /* See NOTE-GetThemeMargins
@@ -966,9 +987,9 @@ TTK_END_LAYOUT_TABLE
 
 static ElementInfo ElementInfoTable[] = {
     { "Checkbutton.indicator", &GenericElementSpec, L"BUTTON",
-    	BP_CHECKBOX, checkbox_statemap, PAD(0, 0, 4, 0), PAD_MARGINS },
+    	BP_CHECKBOX, checkbox_statemap, PAD(0, 0, 4, 0), PAD_MARGINS | FETCH_ONCE },
     { "Radiobutton.indicator", &GenericElementSpec, L"BUTTON",
-    	BP_RADIOBUTTON, radiobutton_statemap, PAD(0, 0, 4, 0), PAD_MARGINS },
+    	BP_RADIOBUTTON, radiobutton_statemap, PAD(0, 0, 4, 0), PAD_MARGINS | FETCH_ONCE },
     { "Button.button", &GenericElementSpec, L"BUTTON",
     	BP_PUSHBUTTON, pushbutton_statemap, PAD(3, 3, 3, 3), IGNORE_THEMESIZE },
     { "Labelframe.border", &GenericElementSpec, L"BUTTON",
-- 
cgit v0.12


From 36975c88f715a973f160b5f6627d89965ebbb06e Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 24 May 2020 10:51:11 +0000
Subject: Use S_OK for result instead of directly 0.

---
 win/ttkWinXPTheme.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/win/ttkWinXPTheme.c b/win/ttkWinXPTheme.c
index c32d3cd..f91be9b 100644
--- a/win/ttkWinXPTheme.c
+++ b/win/ttkWinXPTheme.c
@@ -522,7 +522,7 @@ static void GenericElementSize(
     if (!(elementData->info->flags & IGNORE_THEMESIZE)) {
         if ((elementData->info->flags & FETCH_ONCE) && elementData->fetched) {
             size = elementData->origSize;
-            result = 0; /* non-negative is success */
+            result = S_OK;
         } else {
 	  result = elementData->procs->GetThemePartSize(
 	      elementData->hTheme,
@@ -538,7 +538,7 @@ static void GenericElementSize(
 	    *widthPtr = size.cx;
 	    *heightPtr = size.cy;
 	}
-        if ((elementData->info->flags & FETCH_ONCE) && ! elementData->fetched) {
+        if ((elementData->info->flags & FETCH_ONCE) && !elementData->fetched) {
             elementData->origSize = size; 
             elementData->fetched = 1;
         }
-- 
cgit v0.12


From 5da5fa8645eacfb6a876212e959f93a6603e1c5b Mon Sep 17 00:00:00 2001
From: bll <brad.lanam.comp@gmail.com>
Date: Sun, 24 May 2020 15:00:22 +0000
Subject: Add FETCH_ONCE to the treeview indicator also.

---
 win/ttkWinXPTheme.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/win/ttkWinXPTheme.c b/win/ttkWinXPTheme.c
index f91be9b..3252a18 100644
--- a/win/ttkWinXPTheme.c
+++ b/win/ttkWinXPTheme.c
@@ -1058,7 +1058,7 @@ static ElementInfo ElementInfoTable[] = {
     { "Treeview.field", &GenericElementSpec, L"TREEVIEW",
 	TVP_TREEITEM, treeview_statemap, PAD(1, 1, 1, 1), IGNORE_THEMESIZE },
     { "Treeitem.indicator", &TreeIndicatorElementSpec, L"TREEVIEW",
-    	TVP_GLYPH, tvpglyph_statemap, PAD(1,1,6,0), PAD_MARGINS },
+    	TVP_GLYPH, tvpglyph_statemap, PAD(1,1,6,0), PAD_MARGINS | FETCH_ONCE },
     { "Treeheading.border", &GenericElementSpec, L"HEADER",
     	HP_HEADERITEM, header_statemap, PAD(4,0,4,0),0 },
     { "sizegrip", &GenericElementSpec, L"STATUS",
-- 
cgit v0.12


From 343083448bf1002eaefaedcee770d7641a653bda Mon Sep 17 00:00:00 2001
From: bll <brad.lanam.comp@gmail.com>
Date: Sun, 24 May 2020 20:58:18 +0000
Subject: Implement a much simpler method to get the proper sizing (nemethi).

---
 win/ttkWinXPTheme.c | 43 +++++++++++--------------------------------
 1 file changed, 11 insertions(+), 32 deletions(-)

diff --git a/win/ttkWinXPTheme.c b/win/ttkWinXPTheme.c
index 3252a18..436fe00 100644
--- a/win/ttkWinXPTheme.c
+++ b/win/ttkWinXPTheme.c
@@ -373,10 +373,6 @@ static Ttk_StateTable tabitem_statemap[] =
  * <<NOTE-GetThemePartSize>>:
  *	This gives bogus metrics for some parts (in particular,
  *	BP_PUSHBUTTONS).  Set the IGNORE_THEMESIZE flag to skip this call.
- *
- * <<NOTE-GetThemePartSize-2>>:
- *      It seems that fetching the part size more than once on checkbuttons 
- *      and radiobuttons does not work properly.
  */
 
 typedef struct 	/* XP element specifications */
@@ -394,7 +390,6 @@ typedef struct 	/* XP element specifications */
 #   define 	HEAP_ELEMENT	 0x20000000U /* ElementInfo is on heap */
 #   define 	HALF_HEIGHT	 0x10000000U /* Used by GenericSizedElements */
 #   define 	HALF_WIDTH	 0x08000000U /* Used by GenericSizedElements */
-#   define      FETCH_ONCE       0x04000000U /* Used by GenericElementSize See NOTE-GetThemePartSize-2 */
 } ElementInfo;
 
 typedef struct
@@ -412,12 +407,6 @@ typedef struct
     HDC		hDC;
     HWND	hwnd;
 
-    /*
-     * To work around fetch of size returning wrong data
-     */
-    SIZE        origSize;
-    int         fetched;
-
     /* For TkWinDrawableReleaseDC: */
     Drawable	drawable;
     TkWinDCState dcState;
@@ -431,7 +420,6 @@ NewElementData(XPThemeProcs *procs, ElementInfo *info)
     elementData->procs = procs;
     elementData->info = info;
     elementData->hTheme = elementData->hDC = 0;
-    elementData->fetched = 0;
 
     return elementData;
 }
@@ -520,28 +508,19 @@ static void GenericElementSize(
 	return;
 
     if (!(elementData->info->flags & IGNORE_THEMESIZE)) {
-        if ((elementData->info->flags & FETCH_ONCE) && elementData->fetched) {
-            size = elementData->origSize;
-            result = S_OK;
-        } else {
-	  result = elementData->procs->GetThemePartSize(
-	      elementData->hTheme,
-	      elementData->hDC,
-	      elementData->info->partId,
-	      Ttk_StateTableLookup(elementData->info->statemap, 0),
-	      NULL /*RECT *prc*/,
-	      TS_TRUE,
-	      &size);
-        }
+	result = elementData->procs->GetThemePartSize(
+	    elementData->hTheme,
+	    NULL,
+	    elementData->info->partId,
+	    Ttk_StateTableLookup(elementData->info->statemap, 0),
+	    NULL /*RECT *prc*/,
+	    TS_TRUE,
+	    &size);
 
 	if (SUCCEEDED(result)) {
 	    *widthPtr = size.cx;
 	    *heightPtr = size.cy;
 	}
-        if ((elementData->info->flags & FETCH_ONCE) && !elementData->fetched) {
-            elementData->origSize = size; 
-            elementData->fetched = 1;
-        }
     }
 
     /* See NOTE-GetThemeMargins
@@ -987,9 +966,9 @@ TTK_END_LAYOUT_TABLE
 
 static ElementInfo ElementInfoTable[] = {
     { "Checkbutton.indicator", &GenericElementSpec, L"BUTTON",
-    	BP_CHECKBOX, checkbox_statemap, PAD(0, 0, 4, 0), PAD_MARGINS | FETCH_ONCE },
+    	BP_CHECKBOX, checkbox_statemap, PAD(0, 0, 4, 0), PAD_MARGINS },
     { "Radiobutton.indicator", &GenericElementSpec, L"BUTTON",
-    	BP_RADIOBUTTON, radiobutton_statemap, PAD(0, 0, 4, 0), PAD_MARGINS | FETCH_ONCE },
+    	BP_RADIOBUTTON, radiobutton_statemap, PAD(0, 0, 4, 0), PAD_MARGINS },
     { "Button.button", &GenericElementSpec, L"BUTTON",
     	BP_PUSHBUTTON, pushbutton_statemap, PAD(3, 3, 3, 3), IGNORE_THEMESIZE },
     { "Labelframe.border", &GenericElementSpec, L"BUTTON",
@@ -1058,7 +1037,7 @@ static ElementInfo ElementInfoTable[] = {
     { "Treeview.field", &GenericElementSpec, L"TREEVIEW",
 	TVP_TREEITEM, treeview_statemap, PAD(1, 1, 1, 1), IGNORE_THEMESIZE },
     { "Treeitem.indicator", &TreeIndicatorElementSpec, L"TREEVIEW",
-    	TVP_GLYPH, tvpglyph_statemap, PAD(1,1,6,0), PAD_MARGINS | FETCH_ONCE },
+    	TVP_GLYPH, tvpglyph_statemap, PAD(1,1,6,0), PAD_MARGINS },
     { "Treeheading.border", &GenericElementSpec, L"HEADER",
     	HP_HEADERITEM, header_statemap, PAD(4,0,4,0),0 },
     { "sizegrip", &GenericElementSpec, L"STATUS",
-- 
cgit v0.12


From 9ba4c746ec344f1455e03c2f97ca0ae7c95d139f Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Fri, 29 May 2020 18:21:55 +0000
Subject: Remove some unnecessary macOS conditional code by using internal
 stubs.

---
 generic/tkFont.c             | 10 ++++------
 generic/tkInt.decls          |  9 +++++++++
 generic/tkIntDecls.h         | 36 ++++++++++++++++++++++++++++++++++++
 generic/tkStubInit.c         | 20 ++++++++++++++++++++
 generic/tkTextDisp.c         | 36 +++++++++++++++++++-----------------
 macosx/tkMacOSXInt.h         |  2 --
 macosx/tkMacOSXSubwindows.c  |  8 +-------
 macosx/tkMacOSXWindowEvent.c | 35 +++++++++++++++++++++++++----------
 macosx/tkMacOSXWm.c          | 34 +++++++++++++++++++++++-----------
 unix/tkUnixPort.h            |  2 ++
 win/tkWinPort.h              |  7 +++++++
 11 files changed, 146 insertions(+), 53 deletions(-)

diff --git a/generic/tkFont.c b/generic/tkFont.c
index 53855ac..448f918 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.c
@@ -13,9 +13,7 @@
 
 #include "tkInt.h"
 #include "tkFont.h"
-#if defined(MAC_OSX_TK)
-#include "tkMacOSXInt.h"
-#endif
+
 /*
  * The following structure is used to keep track of all the fonts that exist
  * in the current application. It must be stored in the TkMainInfo for the
@@ -874,18 +872,18 @@ TheWorldHasChanged(
     ClientData clientData)	/* Info about application's fonts. */
 {
     TkFontInfo *fiPtr = clientData;
-#if defined(MAC_OSX_TK)
 
     /*
      * On macOS it is catastrophic to recompute all widgets while the
      * [NSView drawRect] method is drawing. The best that we can do in
      * that situation is to abort the recomputation and hope for the best.
+     * This is ignored on other platforms.
      */
 
-    if (TkpAppIsDrawing()) {
+    if (TkpAppCanDraw(NULL)) {
 	return;
     }
-#endif
+
     fiPtr->updatePending = 0;
     RecomputeWidgets(fiPtr->mainPtr->winPtr);
 }
diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index bb2057b..da591cb 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -634,6 +634,15 @@ declare 184 {
 	    Tk_Font tkfont, const char *source, int numBytes, double x,
 	    double y, double angle)
 }
+
+# Support for aqua's inability to draw outside [NSView drawRect:]
+declare 185 aqua {
+    void TkpRedrawWidget(Tk_Window tkwin)
+}
+declare 186 aqua {
+    int TkpAppCanDraw(Tk_Window tkwin)
+}
+
 
 ##############################################################################
 
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h
index fa1833e..7bf9bd7 100644
--- a/generic/tkIntDecls.h
+++ b/generic/tkIntDecls.h
@@ -550,6 +550,14 @@ EXTERN void		TkDrawAngledChars(Display *display,
 				Drawable drawable, GC gc, Tk_Font tkfont,
 				const char *source, int numBytes, double x,
 				double y, double angle);
+#ifdef MAC_OSX_TK /* AQUA */
+/* 185 */
+EXTERN void		TkpRedrawWidget(Tk_Window tkwin);
+#endif /* AQUA */
+#ifdef MAC_OSX_TK /* AQUA */
+/* 186 */
+EXTERN int		TkpAppCanDraw(Tk_Window tkwin);
+#endif /* AQUA */
 
 typedef struct TkIntStubs {
     int magic;
@@ -767,6 +775,26 @@ typedef struct TkIntStubs {
     void (*tkUnderlineAngledTextLayout) (Display *display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, double angle, int underline); /* 182 */
     int (*tkIntersectAngledTextLayout) (Tk_TextLayout layout, int x, int y, int width, int height, double angle); /* 183 */
     void (*tkDrawAngledChars) (Display *display, Drawable drawable, GC gc, Tk_Font tkfont, const char *source, int numBytes, double x, double y, double angle); /* 184 */
+#if !(defined(_WIN32) || defined(MAC_OSX_TK)) /* X11 */
+    void (*reserved185)(void);
+#endif /* X11 */
+#if defined(_WIN32) /* WIN */
+    void (*reserved185)(void);
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
+    void (*reserved185)(void); /* Dummy entry for stubs table backwards compatibility */
+    void (*tkpRedrawWidget) (Tk_Window tkwin); /* 185 */
+#endif /* AQUA */
+#if !(defined(_WIN32) || defined(MAC_OSX_TK)) /* X11 */
+    void (*reserved186)(void);
+#endif /* X11 */
+#if defined(_WIN32) /* WIN */
+    void (*reserved186)(void);
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
+    void (*reserved186)(void); /* Dummy entry for stubs table backwards compatibility */
+    int (*tkpAppCanDraw) (Tk_Window tkwin); /* 186 */
+#endif /* AQUA */
 } TkIntStubs;
 
 extern const TkIntStubs *tkIntStubsPtr;
@@ -1139,6 +1167,14 @@ extern const TkIntStubs *tkIntStubsPtr;
 	(tkIntStubsPtr->tkIntersectAngledTextLayout) /* 183 */
 #define TkDrawAngledChars \
 	(tkIntStubsPtr->tkDrawAngledChars) /* 184 */
+#ifdef MAC_OSX_TK /* AQUA */
+#define TkpRedrawWidget \
+	(tkIntStubsPtr->tkpRedrawWidget) /* 185 */
+#endif /* AQUA */
+#ifdef MAC_OSX_TK /* AQUA */
+#define TkpAppCanDraw \
+	(tkIntStubsPtr->tkpAppCanDraw) /* 186 */
+#endif /* AQUA */
 
 #endif /* defined(USE_TK_STUBS) */
 
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 61c698a..045c86e 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -485,6 +485,26 @@ static const TkIntStubs tkIntStubs = {
     TkUnderlineAngledTextLayout, /* 182 */
     TkIntersectAngledTextLayout, /* 183 */
     TkDrawAngledChars, /* 184 */
+#if !(defined(_WIN32) || defined(MAC_OSX_TK)) /* X11 */
+    0, /* 185 */
+#endif /* X11 */
+#if defined(_WIN32) /* WIN */
+    0, /* 185 */
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
+    0, /* 185 */ /* Dummy entry for stubs table backwards compatibility */
+    TkpRedrawWidget, /* 185 */
+#endif /* AQUA */
+#if !(defined(_WIN32) || defined(MAC_OSX_TK)) /* X11 */
+    0, /* 186 */
+#endif /* X11 */
+#if defined(_WIN32) /* WIN */
+    0, /* 186 */
+#endif /* WIN */
+#ifdef MAC_OSX_TK /* AQUA */
+    0, /* 186 */ /* Dummy entry for stubs table backwards compatibility */
+    TkpAppCanDraw, /* 186 */
+#endif /* AQUA */
 };
 
 static const TkIntPlatStubs tkIntPlatStubs = {
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index c848fd2..084fd64 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -20,15 +20,13 @@
 #include "tkWinInt.h"
 #elif defined(__CYGWIN__)
 #include "tkUnixInt.h"
+#elif defined(MAC_OSX_TK)
+#include "tkMacOSXInt.h"
+#define OK_TO_LOG (!TkpAppCanDraw(textPtr->tkwin))
 #endif
 
-#ifdef MAC_OSX_TK
-#include "tkMacOSXInt.h"
-#define OK_TO_LOG (!TkpAppIsDrawing())
-#define FORCE_DISPLAY(winPtr) TkpDisplayWindow(winPtr)
-#else
+#if !defined(MAC_OSX_TK)
 #define OK_TO_LOG 1
-#define FORCE_DISPLAY(winPtr)
 #endif
 
 /*
@@ -3157,7 +3155,7 @@ GenerateWidgetViewSyncEvent(
      */
 
     if (!tkTextDebug) {
-	FORCE_DISPLAY(textPtr->tkwin);
+	TkpRedrawWidget(textPtr->tkwin);
     }
 
     if (NewSyncState != OldSyncState) {
@@ -4176,11 +4174,23 @@ DisplayText(
 				 * warnings. */
     Tcl_Interp *interp;
 
+    
+    if ((textPtr->tkwin == NULL) || (textPtr->flags & DESTROYED)) {
+	/*
+	 * The widget has been deleted.	 Don't do anything.
+	 */
+
+	return;
+    }
+
 #ifdef MAC_OSX_TK
     /*
-     * If drawing is disabled, all we need to do is
-     * clear the REDRAW_PENDING flag.
+     * If the toplevel is being resized it would be dangerous to try redrawing
+     * the widget.  But we can just clear the REDRAW_PENDING flag and return.
+     * This display proc will be called again after the widget has been
+     * reconfigured.
      */
+
     TkWindow *winPtr = (TkWindow *)(textPtr->tkwin);
     MacDrawable *macWin = winPtr->privatePtr;
     if (macWin && (macWin->flags & TK_DO_NOT_DRAW)){
@@ -4189,14 +4199,6 @@ DisplayText(
      }
 #endif
 
-    if ((textPtr->tkwin == NULL) || (textPtr->flags & DESTROYED)) {
-	/*
-	 * The widget has been deleted.	 Don't do anything.
-	 */
-
-	return;
-    }
-
     interp = textPtr->interp;
     Tcl_Preserve(interp);
 
diff --git a/macosx/tkMacOSXInt.h b/macosx/tkMacOSXInt.h
index 9cb75d2..58761d5 100644
--- a/macosx/tkMacOSXInt.h
+++ b/macosx/tkMacOSXInt.h
@@ -200,8 +200,6 @@ MODULE_SCOPE void TkpClipDrawableToRect(Display *display, Drawable d, int x,
 MODULE_SCOPE void TkpRetainRegion(TkRegion r);
 MODULE_SCOPE void TkpReleaseRegion(TkRegion r);
 MODULE_SCOPE void TkpShiftButton(NSButton *button, NSPoint delta);
-MODULE_SCOPE Bool TkpAppIsDrawing(void);
-MODULE_SCOPE void TkpDisplayWindow(Tk_Window tkwin);
 MODULE_SCOPE Bool TkTestLogDisplay(void);
 MODULE_SCOPE Bool TkMacOSXInDarkMode(Tk_Window tkwin);
 
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index 5063fa3..6602564 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -698,16 +698,10 @@ XConfigureWindow(
 
     if (value_mask & CWStackMode) {
 	NSView *view = TkMacOSXDrawableView(macWin);
-	Rect bounds;
-	NSRect r;
 
 	if (view) {
 	    TkMacOSXInvalClipRgns((Tk_Window) winPtr->parentPtr);
-	    TkMacOSXWinBounds(winPtr, &bounds);
-	    r = NSMakeRect(bounds.left,
-		    [view bounds].size.height - bounds.bottom,
-		    bounds.right - bounds.left, bounds.bottom - bounds.top);
-	    [view setNeedsDisplayInRect:r];
+	    TkpRedrawWidget((Tk_Window) winPtr);
 	}
     }
 
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index cb4ffd1..76b2b04 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -382,26 +382,41 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
 /*
  *----------------------------------------------------------------------
  *
- * TkpAppIsDrawing --
+ * TkpAppCanDraw --
  *
  *      A widget display procedure can call this to determine whether it is
- *      being run inside of the drawRect method. This is needed for some tests,
- *      especially of the Text widget, which record data in a global Tcl
- *      variable and assume that display procedures will be run in a
- *      predictable sequence as Tcl idle tasks.
+ *      being run inside of the drawRect method. If not, it may be desirable
+ *      for the display procedure to simply clear the REDRAW_PENDING flag
+ *      and return.  The widget can be recorded in order to schedule a
+ *      redraw, via and Expose event, from within drawRect.
+ *
+ *      This is also needed for some tests, especially of the Text widget,
+ *      which record data in a global Tcl variable and assume that display
+ *      procedures will be run in a predictable sequence as Tcl idle tasks.
  *
  * Results:
- *	True only while running the drawRect method of a TKContentView;
+ *      True if called from the drawRect method of a TKContentView with
+ *      tkwin NULL or pointing to a widget in the current focusView.
  *
  * Side effects:
- *	None
+ *	The tkwin parameter may be recorded to handle redrawing the widget
+ *      later.
  *
  *----------------------------------------------------------------------
  */
 
-MODULE_SCOPE Bool
-TkpAppIsDrawing(void) {
-    return [NSApp isDrawing];
+int
+TkpAppCanDraw(Tk_Window tkwin) {
+    if (![NSApp isDrawing]) {
+	return 0;
+    }
+    if (tkwin) {
+	TkWindow *winPtr = (TkWindow *)tkwin;
+	NSView *view = TkMacOSXDrawableView(winPtr->privatePtr);
+	return (view == [NSView focusView]);
+    } else {
+	return 1;
+    }
 }
 
 /*
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 9117159..cab2b9a 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -6174,28 +6174,40 @@ TkMacOSXMakeRealWindowExist(
 /*
  *----------------------------------------------------------------------
  *
- * TkpDisplayWindow --
+ * TkpRedrawWidget --
  *
- *      Mark the contentView of this window as needing display so the window
- *      will be drawn by the window manager.  If this is called within the
- *      drawRect method, do nothing.
+ *      Mark the bounding rectangle of this widget as needing display so the
+ *      widget will be drawn by [NSView drawRect:].  If this is called within
+ *      the drawRect method, do nothing.
  *
  * Results:
  *      None.
  *
  * Side effects:
- *      The window's contentView is marked as needing display.
+ *      The widget's bounding rectangle is marked as dirty.
  *
  *----------------------------------------------------------------------
  */
 
-MODULE_SCOPE void
-TkpDisplayWindow(Tk_Window tkwin) {
-    if (![NSApp isDrawing]) {
-    	TkWindow *winPtr = (TkWindow *) tkwin;
-    	NSWindow *w = TkMacOSXDrawableWindow(winPtr->window);
+void
+TkpRedrawWidget(Tk_Window tkwin) {
+    TkWindow *winPtr = (TkWindow *) tkwin;
+    NSWindow *w;
+    Rect tkBounds;
+    NSRect bounds;
 
-    	[[w contentView] setNeedsDisplay: YES];
+    if ([NSApp isDrawing]) {
+	return;
+    }
+    w = TkMacOSXDrawableWindow(winPtr->window);
+    if (w) {
+	NSView *view = [w contentView];
+	TkMacOSXWinBounds(winPtr, &tkBounds);
+	bounds = NSMakeRect(tkBounds.left,
+			    [view bounds].size.height - tkBounds.bottom,
+			    tkBounds.right - tkBounds.left,
+			    tkBounds.bottom - tkBounds.top);
+	[view setNeedsDisplayInRect:bounds];
     }
 }
 
diff --git a/unix/tkUnixPort.h b/unix/tkUnixPort.h
index 09ff558..8fd56fe 100644
--- a/unix/tkUnixPort.h
+++ b/unix/tkUnixPort.h
@@ -167,6 +167,8 @@
 
 #define TkpButtonSetDefaults() {}
 #define TkpDestroyButton(butPtr) {}
+#define TkpAppCanDraw(tkwin) 1
+#define TkpRedrawWidget(tkwin)
 #define TkSelUpdateClipboard(a,b) {}
 #ifndef __CYGWIN__
 #define TkSetPixmapColormap(p,c) {}
diff --git a/win/tkWinPort.h b/win/tkWinPort.h
index 8cc5677..4ef8680 100644
--- a/win/tkWinPort.h
+++ b/win/tkWinPort.h
@@ -125,4 +125,11 @@
 #define TkpCreateNativeBitmap(display, source) None
 #define TkpGetNativeAppBitmap(display, name, w, h) None
 
+/*
+ * Other functions not used under Windows
+ */
+
+#define TkpAppCanDraw(tkwin) 1
+#define TkpRedrawWidget(tkwin)
+
 #endif /* _WINPORT */
-- 
cgit v0.12


From 8bfe6e9b964fb48650e31fac01c29de41ba63d44 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Sat, 30 May 2020 23:13:52 +0000
Subject: A partly but not completely successful attempt to control how
 drawRect is run.

---
 generic/tkCanvas.c           |   3 +
 macosx/tkMacOSXDraw.c        |  40 ++++++-------
 macosx/tkMacOSXNotify.c      | 115 ++++++++++++++++++++++++++++++++++---
 macosx/tkMacOSXPrivate.h     |   9 ++-
 macosx/tkMacOSXSubwindows.c  |  73 ++++++++++++++++++------
 macosx/tkMacOSXWindowEvent.c | 133 ++++++++++++++++++++-----------------------
 macosx/tkMacOSXWm.c          |   5 +-
 7 files changed, 256 insertions(+), 122 deletions(-)

diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c
index 4d68ade..941e7d2 100644
--- a/generic/tkCanvas.c
+++ b/generic/tkCanvas.c
@@ -2577,6 +2577,9 @@ DisplayCanvas(
 #else
 	canvasPtr->drawableXOrigin = canvasPtr->xOrigin;
 	canvasPtr->drawableYOrigin = canvasPtr->yOrigin;
+#if 0
+        TkpAppCanDraw(tkwin);
+#endif
 	pixmap = Tk_WindowId(tkwin);
 	TkpClipDrawableToRect(Tk_Display(tkwin), pixmap,
 		screenX1 - canvasPtr->xOrigin, screenY1 - canvasPtr->yOrigin,
diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index e56e666..d2d72e4 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -174,7 +174,9 @@ TkMacOSXBitmapRepFromDrawableRect(
 	if (cg_image) {
 	    CGImageRelease(cg_image);
 	}
-    } else if ((view = TkMacOSXDrawableView(mac_drawable)) != NULL) {
+    } else if (TkMacOSXDrawableView(mac_drawable) != NULL) {
+	TKContentView *tkview = (TKContentView *)view;
+ 
 	/*
 	 * Convert Tk top-left to NSView bottom-left coordinates.
 	 */
@@ -197,7 +199,8 @@ TkMacOSXBitmapRepFromDrawableRect(
 	    [view cacheDisplayInRect:view_rect toBitmapImageRep:bitmap_rep];
 	} else {
 	    TkMacOSXDbgMsg("No CGContext - cannot copy from screen to bitmap.");
-	    [view setNeedsDisplay:YES];
+	    [tkview setTkNeedsDisplay:YES];
+	    [tkview setTkDirtyRect:[tkview bounds]];
 	    return NULL;
 	}
     } else {
@@ -1622,7 +1625,7 @@ TkMacOSXSetupDrawingContext(
     if (dc.context) {
 	dc.portBounds = clipBounds = CGContextGetClipBoundingBox(dc.context);
     } else if (win) {
-	NSView *view = TkMacOSXDrawableView(macDraw);
+	TKContentView *view = (TKContentView *)TkMacOSXDrawableView(macDraw);
 
 	if (!view) {
 	    Tcl_Panic("TkMacOSXSetupDrawingContext(): "
@@ -1636,31 +1639,22 @@ TkMacOSXSetupDrawingContext(
 	 * tells us whether we are being called from one of those methods.
 	 *
 	 * If the CGContext is not valid then we mark our view as needing
-	 * display in the bounding rectangle of the clipping region and
-	 * return failure.  That rectangle should get drawn in a later call
-	 * to drawRect.
-	 *
-	 * As an exception to the above, if mouse buttons are pressed at the
-	 * moment when we fail to obtain a valid context we schedule the entire
-	 * view for a redraw rather than just the clipping region.  The purpose
-	 * of this is to make sure that scrollbars get updated correctly.
+	 * display.  We could try to optimize by computing a smaller dirty rect
+	 * here.
 	 */
 
 	if (![NSApp isDrawing] || view != [NSView focusView]) {
-	    NSRect bounds = [view bounds];
-	    NSRect dirtyNS = bounds;
-	    if ([NSEvent pressedMouseButtons]) {
-		[view setNeedsDisplay:YES];
-	    } else {
+	    NSRect dirtyRect = [view bounds];
+	    if (dc.clipRgn) {
+		CGRect clipRect;
 		CGAffineTransform t = { .a = 1, .b = 0, .c = 0, .d = -1, .tx = 0,
-					.ty = dirtyNS.size.height};
-		if (dc.clipRgn) {
-		    CGRect dirtyCG = NSRectToCGRect(dirtyNS);
-		    HIShapeGetBounds(dc.clipRgn, &dirtyCG);
-		    dirtyNS = NSRectToCGRect(CGRectApplyAffineTransform(dirtyCG, t));
-		}
-		[view setNeedsDisplayInRect:dirtyNS];
+					.ty = dirtyRect.size.height};
+		HIShapeGetBounds(dc.clipRgn, &clipRect);
+		clipRect = CGRectApplyAffineTransform(clipRect, t);
+		dirtyRect = NSRectFromCGRect(clipRect);
 	    }
+	    [view setTkNeedsDisplay:YES];
+	    [view setTkDirtyRect:NSUnionRect([view tkDirtyRect], dirtyRect)];
 	    canDraw = false;
 	    goto end;
 	}
diff --git a/macosx/tkMacOSXNotify.c b/macosx/tkMacOSXNotify.c
index 985d7bc..f8ac50d 100644
--- a/macosx/tkMacOSXNotify.c
+++ b/macosx/tkMacOSXNotify.c
@@ -299,6 +299,70 @@ TkMacOSXNotifyExitHandler(
 /*
  *----------------------------------------------------------------------
  *
+ * TkMacOSXDrawAllViews --
+ *
+ *       This static function is meant to be run as an idle task.  It attempts
+ *       to redraw all views which have the tkNeedsDisplay property set to YES.
+ *       This relies on a feature of [NSApp nextEventMatchingMask: ...] which
+ *       is undocumented, namely that it sometimes blocks and calls drawRect
+ *       for all views that need display before it returns.  We call it with
+ *       deQueue=NO so that it will not change anything on the AppKit event
+ *       queue, because we only want the side effect that it runs
+ *       drawRect. This function is the only place where NSViews get the
+ *       needsDisplay property set to YES.
+ *
+ *       The reason for running this as an idle task is to try to arrange that
+ *       all widgets will be fully configured before they are drawn.  Any idle
+ *       tasks that might reconfigure them should be higher on the idle queue,
+ *       so they should be run before the display procs are run by drawRect.
+ *
+ *       If this is called directly with non-NULL clientData parameter then the
+ *       int which it references will be set to the number of windows that need
+ *       display, but the needsDisplay property of those windows will not be
+ *       changed.
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	Parts of windows my get redrawn.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static void
+TkMacOSXDrawAllViews(
+    ClientData clientData)
+{
+    int count = 0, *dirtyCount = (int *)clientData;
+
+    for (NSWindow *window in [NSApp windows]) {
+	if ([[window contentView] isMemberOfClass:[TKContentView class]]) {
+	    TKContentView *view = [window contentView];
+	    if ([view tkNeedsDisplay]) {
+		count++;
+		if (dirtyCount) {
+		    continue;
+		}
+		[view setNeedsDisplayInRect:[view tkDirtyRect]];
+	    }
+	} else {
+	    [window displayIfNeeded];
+	}
+    }
+    if (dirtyCount) {
+	*dirtyCount = count;
+    }
+    
+    [NSApp nextEventMatchingMask:NSAnyEventMask
+		       untilDate:[NSDate distantPast]
+			  inMode:GetRunLoopMode(TkMacOSXGetModalSession())
+			 dequeue:NO];
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
  * TkMacOSXEventsSetupProc --
  *
  *	This procedure implements the setup part of the MacOSX event source. It
@@ -334,11 +398,13 @@ TkMacOSXEventsSetupProc(
 	static const Tcl_Time zeroBlockTime = { 0, 0 };
 	[NSApp _resetAutoreleasePool];
 
-	/*
-	 * Call this with dequeue=NO -- just checking if the queue is empty.
-	 */
+ 	/*
+ 	 * Call this with dequeue=NO to see if there are any events.  If so,
+ 	 * we set the block time to 0 and stop the heartbeat.  Tcl_DoOneEvent
+ 	 * will call the check proc to collect the events and translate them
+ 	 * into XEvents.  But also, drawRect may run.
+  	 */
 
-	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS|TCL_DONT_WAIT)) {}
 	NSEvent *currentEvent =
 	        [NSApp nextEventMatchingMask:NSAnyEventMask
 			untilDate:[NSDate distantPast]
@@ -353,7 +419,7 @@ TkMacOSXEventsSetupProc(
 	} else if (!havePeriodicEvents){
 
 	    /*
-	     * When the user is not generating events we schedule a "hearbeat"
+	     * When the user is not generating events we schedule a "heartbeat"
 	     * event to fire every 0.1 seconds.  This helps to make the vwait
 	     * command more responsive when there is no user input, e.g. when
 	     * running the test suite.
@@ -362,6 +428,12 @@ TkMacOSXEventsSetupProc(
 	    havePeriodicEvents = YES;
 	    [NSEvent startPeriodicEventsAfterDelay:0.0 withPeriod:0.1];
 	}
+
+	/*
+	 * Without this, new windows are sometimes not completely rendered.
+	 */
+	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {}
+	TkMacOSXDrawAllViews(NULL);
     }
 }
 
@@ -388,6 +460,7 @@ TkMacOSXEventsCheckProc(
     int flags)
 {
     NSString *runloopMode = [[NSRunLoop currentRunLoop] currentMode];
+    int eventsFound = 0;
 
     /*
      * runloopMode will be nil if we are in a Tcl event loop.
@@ -408,7 +481,6 @@ TkMacOSXEventsCheckProc(
 
 	[NSApp _lockAutoreleasePool];
 	do {
-	    while (Tcl_DoOneEvent(TCL_IDLE_EVENTS|TCL_DONT_WAIT)) {}
 	    modalSession = TkMacOSXGetModalSession();
 	    testEvent = [NSApp nextEventMatchingMask:NSAnyEventMask
 		    untilDate:[NSDate distantPast]
@@ -422,12 +494,12 @@ TkMacOSXEventsCheckProc(
 	    if (testEvent && [[testEvent window] inLiveResize]) {
 		break;
 	    }
-	    while (Tcl_DoOneEvent(TCL_IDLE_EVENTS|TCL_DONT_WAIT)) {}
 	    currentEvent = [NSApp nextEventMatchingMask:NSAnyEventMask
 		    untilDate:[NSDate distantPast]
 		    inMode:GetRunLoopMode(modalSession)
 		    dequeue:YES];
 	    if (currentEvent) {
+
 		/*
 		 * Generate Xevents.
 		 */
@@ -436,9 +508,12 @@ TkMacOSXEventsCheckProc(
 		NSEvent *processedEvent = [NSApp tkProcessEvent:currentEvent];
 		Tcl_SetServiceMode(oldServiceMode);
 		if (processedEvent) {
+		    eventsFound++;
+
 #ifdef TK_MAC_DEBUG_EVENTS
 		    TKLog(@"   event: %@", currentEvent);
 #endif
+
 		    if (modalSession) {
 			[NSApp _modalSession:modalSession sendEvent:currentEvent];
 		    } else {
@@ -446,6 +521,7 @@ TkMacOSXEventsCheckProc(
 		    }
 		}
 	    } else {
+		
 		break;
 	    }
 	} while (1);
@@ -453,8 +529,31 @@ TkMacOSXEventsCheckProc(
 	/*
 	 * Now we can unlock the pool.
 	 */
-
 	[NSApp _unlockAutoreleasePool];
+
+	if (eventsFound == 0) {
+
+	    /*
+	     * We found no events for Tcl in this iteration of the Tcl event
+	     * loop, so it should proceed to servicing idle tasks.  We add an
+	     * idle task to the end of the idle queue which will redisplay all
+	     * of our dirty windows.  We want this to happen after all other
+	     * idle tasks have run so that all widgets will be configured
+	     * before they are displayed.  The drawRect method "borrows" the
+	     * idle queue while drawing views. That is, it sends expose events
+	     * which cause display procs to be posted as idle tasks and then
+	     * runs an inner event loop to processes those idle tasks.  We are
+	     * trying to arrange for the idle queue to be empty when it starts
+	     * that process and empty when it finishes.
+	     */
+
+	    int dirtyCount = 0;
+	    TkMacOSXDrawAllViews(&dirtyCount);
+	    if (dirtyCount > 0) {
+		Tcl_CancelIdleCall(TkMacOSXDrawAllViews, NULL);
+		Tcl_DoWhenIdle(TkMacOSXDrawAllViews, NULL);
+	    }
+	}
     }
 }
 
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h
index be69fcd..fdd07ed 100644
--- a/macosx/tkMacOSXPrivate.h
+++ b/macosx/tkMacOSXPrivate.h
@@ -307,6 +307,8 @@ MODULE_SCOPE int	TkMacOSXRegisterServiceWidgetObjCmd(ClientData clientData,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[]);
 MODULE_SCOPE unsigned   TkMacOSXAddVirtual(unsigned int keycode);
+MODULE_SCOPE void       TkMacOSXWinNSBounds(TkWindow *winPtr, NSView *view,
+					    NSRect *bounds);
 
 #pragma mark Private Objective-C Classes
 
@@ -418,8 +420,12 @@ VISIBILITY_HIDDEN
 @private
     NSString *privateWorkingText;
     Bool _needsRedisplay;
+    Bool _tkNeedsDisplay;
+    NSRect _tkDirtyRect;
 }
 @property Bool needsRedisplay;
+@property Bool tkNeedsDisplay;
+@property NSRect tkDirtyRect;
 @end
 
 @interface TKContentView(TKKeyEvent)
@@ -428,7 +434,8 @@ VISIBILITY_HIDDEN
 @end
 
 @interface TKContentView(TKWindowEvent)
-- (void) generateExposeEvents: (HIShapeRef) shape;
+ //(HIShapeRef) shape;
+- (void) generateExposeEvents: (NSRect) rect;
 - (void) tkToolbarButton: (id) sender;
 @end
 
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index 6602564..53e5bf6 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -157,6 +157,7 @@ XMapWindow(
     winPtr->flags |= TK_MAPPED;
     if (Tk_IsTopLevel(winPtr)) {
 	if (!Tk_IsEmbedded(winPtr)) {
+	    TKContentView *view = [win contentView];
 
 	    /*
 	     * We want to activate Tk when a toplevel is mapped but we must not
@@ -169,7 +170,8 @@ XMapWindow(
 	    TkMacOSXApplyWindowAttributes(winPtr, win);
 	    [win setExcludedFromWindowsMenu:NO];
 	    [NSApp activateIgnoringOtherApps:NO];
-	    [[win contentView] setNeedsDisplay:YES];
+	    [view setTkNeedsDisplay:YES];
+	    [view setTkDirtyRect: [view bounds]];
 	    if ([win canBecomeKeyWindow]) {
 		[win makeKeyAndOrderFront:NSApp];
 	    } else {
@@ -215,7 +217,9 @@ XMapWindow(
     if ([NSApp isDrawing]) {
 	[[win contentView] setNeedsRedisplay:YES];
     } else {
-	[[win contentView] setNeedsDisplay:YES];
+	TKContentView *view = [win contentView];
+	[view setTkNeedsDisplay:YES];
+	[view setTkDirtyRect:[view bounds]];
     }
 
     /*
@@ -332,7 +336,9 @@ XUnmapWindow(
     if ([NSApp isDrawing]) {
 	[[win contentView] setNeedsRedisplay:YES];
     } else {
-	[[win contentView] setNeedsDisplay:YES];
+	TKContentView *view = [win contentView];
+	[view setTkNeedsDisplay:YES];
+	[view setTkDirtyRect:[view bounds]];
     }
     return Success;
 }
@@ -986,8 +992,9 @@ InvalViewRect(
     void *ref)
 {
     static CGAffineTransform t;
-    NSView *view = ref;
-
+    TKContentView *view = ref;
+    NSRect dirtyRect;
+    
     if (!view) {
 	return paramErr;
     }
@@ -997,8 +1004,9 @@ InvalViewRect(
 		NSHeight([view bounds]));
 	break;
     case kHIShapeEnumerateRect:
-	[view setNeedsDisplayInRect:NSRectFromCGRect(
-		CGRectApplyAffineTransform(*rect, t))];
+	dirtyRect = NSRectFromCGRect(CGRectApplyAffineTransform(*rect, t));
+	[view setTkNeedsDisplay:YES];
+	[view setTkDirtyRect:NSUnionRect([view tkDirtyRect], dirtyRect)];
 	break;
     }
     return noErr;
@@ -1275,16 +1283,15 @@ TkMacOSXInvalClipRgns(
  *
  * TkMacOSXWinBounds --
  *
- *	Given a Tk window this function determines the windows bounds in
- *	relation to the Macintosh window's coordinate system. This is also the
- *	same coordinate system as the Tk toplevel window in which this window
- *	is contained.
+ *	Given a Tk window this function determines the window's bounds in
+ *	the coordinate system of the Tk toplevel window in which this window
+ *	is contained.  This fills in a Rect struct.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	None.
+ *	Fills in a Rect.
  *
  *----------------------------------------------------------------------
  */
@@ -1307,16 +1314,15 @@ TkMacOSXWinBounds(
  *
  * TkMacOSXWinCGBounds --
  *
- *	Given a Tk window this function determines the windows bounds in
- *	relation to the Macintosh window's coordinate system. This is also the
- *	same coordinate system as the Tk toplevel window in which this window
- *	is contained.
+ *	Given a Tk window this function determines the window's bounds in
+ *	the coordinate system of the Tk toplevel window in which this window
+ *	is contained.  This fills in a CGRect struct.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	None.
+ *	Fill in a CGRect.
  *
  *----------------------------------------------------------------------
  */
@@ -1331,6 +1337,39 @@ TkMacOSXWinCGBounds(
     bounds->size.width = winPtr->changes.width;
     bounds->size.height = winPtr->changes.height;
 }
+/*
+ *----------------------------------------------------------------------
+ *
+ * TkMacOSXWinNSBounds --
+ *
+ *	Given a Tk window this function determines the window's bounds in
+ *	the coordinate system of the TKContentView in which this Tk window
+ *	is contained, which has the origin at the lower left corner.  This
+ *      fills in an NSRect struct and requires the TKContentView as a
+ *      parameter
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	Fills in an NSRect.
+ *
+ *----------------------------------------------------------------------
+ */
+
+void
+TkMacOSXWinNSBounds(
+    TkWindow *winPtr,
+    NSView *view,
+    NSRect *bounds)
+{
+    bounds->size.width = winPtr->changes.width;
+    bounds->size.height = winPtr->changes.height;
+    bounds->origin.x = winPtr->privatePtr->xOff;
+    bounds->origin.y = ([view bounds].size.height -
+		       bounds->size.height -
+		       winPtr->privatePtr->yOff);
+}
 
 /*
  *----------------------------------------------------------------------
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 76b2b04..6e8f7c4 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -30,8 +30,8 @@
  * Declaration of functions used only in this file
  */
 
-static int		GenerateUpdates(HIShapeRef updateRgn,
-			   CGRect *updateBounds, TkWindow *winPtr);
+static int		GenerateUpdates(
+			    CGRect *updateBounds, TkWindow *winPtr);
 static int		GenerateActivateEvents(TkWindow *winPtr,
 			    int activeFlag);
 static void		DoWindowActivate(ClientData clientData);
@@ -407,16 +407,29 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
 
 int
 TkpAppCanDraw(Tk_Window tkwin) {
-    if (![NSApp isDrawing]) {
-	return 0;
-    }
+    int result;
     if (tkwin) {
 	TkWindow *winPtr = (TkWindow *)tkwin;
-	NSView *view = TkMacOSXDrawableView(winPtr->privatePtr);
-	return (view == [NSView focusView]);
+	TKContentView *view = (TKContentView *) TkMacOSXDrawableView(
+						    winPtr->privatePtr);
+	result = ([NSApp isDrawing] && view == [NSView focusView]);
+#if 0
+	printf("TkAppCanDraw: %s %d  %d \n", Tk_PathName(tkwin),
+	       [NSApp isDrawing], (view == [NSView focusView]));
+	if (!result) {
+	    NSRect dirtyRect;
+	    TkMacOSXWinNSBounds(winPtr, view, &dirtyRect);
+	    printf("TkpAppCanDraw: dirtyRect for %s is %s\n",
+		   Tk_PathName(tkwin),
+		   NSStringFromRect(dirtyRect).UTF8String);
+	    [view setTkNeedsDisplay:YES];
+	    [view setTkDirtyRect:dirtyRect];
+	}
+#endif
     } else {
-	return 1;
+	result = [NSApp isDrawing];
     }
+    return result;
 }
 
 /*
@@ -424,9 +437,9 @@ TkpAppCanDraw(Tk_Window tkwin) {
  *
  * GenerateUpdates --
  *
- *	Given a Macintosh update region and a Tk window this function geneates
+ *	Given an update rectangle and a Tk window, this function geneates
  *	an X Expose event for the window if it meets the update region. The
- *	function will then recursivly have each damaged window generate Expose
+ *	function will then recursively have each damaged window generate Expose
  *	events for its child windows.
  *
  * Results:
@@ -440,39 +453,23 @@ TkpAppCanDraw(Tk_Window tkwin) {
 
 static int
 GenerateUpdates(
-    HIShapeRef updateRgn,
     CGRect *updateBounds,
     TkWindow *winPtr)
 {
     TkWindow *childPtr;
     XEvent event;
     CGRect bounds, damageBounds;
-    HIShapeRef boundsRgn, damageRgn;
 
     TkMacOSXWinCGBounds(winPtr, &bounds);
     if (!CGRectIntersectsRect(bounds, *updateBounds)) {
 	return 0;
     }
-    if (!HIShapeIntersectsRect(updateRgn, &bounds)) {
-	return 0;
-    }
 
     /*
      * Compute the bounding box of the area that the damage occured in.
      */
 
-    boundsRgn = HIShapeCreateWithRect(&bounds);
-    damageRgn = HIShapeCreateIntersection(updateRgn, boundsRgn);
-    if (HIShapeIsEmpty(damageRgn)) {
-	CFRelease(damageRgn);
-	CFRelease(boundsRgn);
-	return 0;
-    }
-    HIShapeGetBounds(damageRgn, &damageBounds);
-
-    CFRelease(damageRgn);
-    CFRelease(boundsRgn);
-
+    damageBounds = CGRectIntersection(bounds, *updateBounds);
     event.xany.serial = LastKnownRequestProcessed(Tk_Display(winPtr));
     event.xany.send_event = false;
     event.xany.window = Tk_WindowId(winPtr);
@@ -486,7 +483,7 @@ GenerateUpdates(
     Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
 
 #ifdef TK_MAC_DEBUG_DRAWING
-    TKLog(@"Expose %p {{%d, %d}, {%d, %d}}", event.xany.window, event.xexpose.x,
+    TKLog(@"Exposed %p {{%d, %d}, {%d, %d}}", event.xany.window, event.xexpose.x,
 	event.xexpose.y, event.xexpose.width, event.xexpose.height);
 #endif
 
@@ -499,7 +496,7 @@ GenerateUpdates(
 	if (!Tk_IsMapped(childPtr) || Tk_IsTopLevel(childPtr)) {
 	    continue;
 	}
-	GenerateUpdates(updateRgn, updateBounds, childPtr);
+	GenerateUpdates(updateBounds, childPtr);
     }
 
     /*
@@ -509,7 +506,7 @@ GenerateUpdates(
     if (Tk_IsContainer(winPtr)) {
 	childPtr = TkpGetOtherWindow(winPtr);
 	if (childPtr != NULL && Tk_IsMapped(childPtr)) {
-	    GenerateUpdates(updateRgn, updateBounds, childPtr);
+	    GenerateUpdates(updateBounds, childPtr);
 	}
 
 	/*
@@ -928,10 +925,10 @@ ConfigureRestrictProc(
  */
 
 static void
-RedisplayView(
+RedisplayView( 
     ClientData clientdata)
 {
-    NSView *view = (NSView *) clientdata;
+    TKContentView *view = (TKContentView *) clientdata;
 
     /*
      * Make sure that we are not trying to displaying a view that no longer
@@ -941,7 +938,8 @@ RedisplayView(
 
     for (NSWindow *w in [NSApp windows]) {
 	if ([w contentView] == view) {
-	    [view setNeedsDisplay:YES];
+	    [view setTkNeedsDisplay:YES];
+	    [view setTkDirtyRect:[view bounds]];
 	    break;
 	}
     }
@@ -951,13 +949,13 @@ RedisplayView(
 
 - (void) drawRect: (NSRect) rect
 {
-    const NSRect *rectsBeingDrawn;
-    NSInteger rectsBeingDrawnCount;
 
 #ifdef TK_MAC_DEBUG_DRAWING
     TkWindow *winPtr = TkMacOSXGetTkWindow([self window]);
-    if (winPtr) fprintf(stderr, "drawRect: drawing %s\n",
-			Tk_PathName(winPtr));
+    if (winPtr) {
+	fprintf(stderr, "drawRect: drawing %s in %s\n",
+	    Tk_PathName(winPtr), NSStringFromRect(rect).UTF8String);
+    }
 #endif
 
     /*
@@ -974,23 +972,11 @@ RedisplayView(
 
     [NSApp setIsDrawing: YES];
 
-    [self getRectsBeingDrawn:&rectsBeingDrawn count:&rectsBeingDrawnCount];
-    CGFloat height = [self bounds].size.height;
-    HIMutableShapeRef drawShape = HIShapeCreateMutable();
-
-    while (rectsBeingDrawnCount--) {
-	CGRect r = NSRectToCGRect(*rectsBeingDrawn++);
-
 #ifdef TK_MAC_DEBUG_DRAWING
-	fprintf(stderr, "drawRect: %dx%d@(%d,%d)\n", (int)r.size.width,
-	       (int)r.size.height, (int)r.origin.x, (int)r.origin.y);
+    fprintf(stderr, "drawRect: %s\n", NSStringFromRect(rect).UTF8String;
 #endif
 
-	r.origin.y = height - (r.origin.y + r.size.height);
-	HIShapeUnionWithRect(drawShape, &r);
-    }
-    [self generateExposeEvents:(HIShapeRef)drawShape];
-    CFRelease(drawShape);
+    [self generateExposeEvents:rect];
     [NSApp setIsDrawing: NO];
 
     if ([self needsRedisplay]) {
@@ -998,6 +984,9 @@ RedisplayView(
 	Tcl_DoWhenIdle(RedisplayView, self);
     }
 
+    [self setTkNeedsDisplay:NO];
+    [self setTkDirtyRect:NSZeroRect];
+
 #ifdef TK_MAC_DEBUG_DRAWING
     fprintf(stderr, "drawRect: done.\n");
 #endif
@@ -1056,9 +1045,7 @@ RedisplayView(
 	  * Generate and process expose events to redraw the window.
 	  */
 
-	HIRect bounds = NSRectToCGRect([self bounds]);
-	HIShapeRef shape = HIShapeCreateWithRect(&bounds);
-	[self generateExposeEvents: shape];
+	[self generateExposeEvents: [self bounds]];
 	[w displayIfNeeded];
 
 	/*
@@ -1076,11 +1063,11 @@ RedisplayView(
  * pending idle events are processed so the drawing will actually take place.
  */
 
-- (void) generateExposeEvents: (HIShapeRef) shape
+- (void) generateExposeEvents: (NSRect) rect
 {
     unsigned long serial;
-    CGRect updateBounds;
     int updatesNeeded;
+    CGRect updateBounds;
     TkWindow *winPtr = TkMacOSXGetTkWindow([self window]);
     ClientData oldArg;
     Tk_RestrictProc *oldProc;
@@ -1089,20 +1076,18 @@ RedisplayView(
     }
 
     /*
-     * Generate Tk Expose events.
-     */
-
-    HIShapeGetBounds(shape, &updateBounds);
-
-    /*
-     * All of these events will share the same serial number.
+     * Generate Tk Expose events.  All of these events will share the same
+     * serial number.
      */
-
-    serial = LastKnownRequestProcessed(Tk_Display(winPtr));
-    updatesNeeded = GenerateUpdates(shape, &updateBounds, winPtr);
-
+    
+    updateBounds = NSRectToCGRect(rect);
+    updateBounds.origin.y = ([self bounds].size.height - updateBounds.origin.y
+			     - updateBounds.size.height);
+    updatesNeeded = GenerateUpdates(&updateBounds, winPtr);
     if (updatesNeeded) {
 
+	serial = LastKnownRequestProcessed(Tk_Display(winPtr));
+
 	/*
 	 * First process all of the Expose events.
 	 */
@@ -1120,9 +1105,10 @@ RedisplayView(
 	 * effect.)
 	 *
 	 * Fortunately, Tk schedules all drawing to be done while Tcl is idle.
-	 * So we can do the drawing by processing all of the idle events that
-	 * were created when the expose events were processed.
+	 * So we can do the drawing now by processing all of the idle events
+	 * that were created when the expose events were processed.
 	 */
+
 	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {}
     }
 }
@@ -1202,10 +1188,15 @@ RedisplayView(
 - (BOOL) isOpaque
 {
     NSWindow *w = [self window];
-      return (w && (([w styleMask] & NSTexturedBackgroundWindowMask) ||
-    	    ![w isOpaque]) ? NO : YES);
+    return (w && (([w styleMask] & NSTexturedBackgroundWindowMask) ||
+		  ![w isOpaque]) ? NO : YES);
 }
 
+/*
+ * On Catalina this is never called and drawRect clips to the rect that
+ * is passed to it by AppKit.
+ */
+
 - (BOOL) wantsDefaultClipping
 {
     return NO;
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index cab2b9a..1b51479 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -6201,13 +6201,14 @@ TkpRedrawWidget(Tk_Window tkwin) {
     }
     w = TkMacOSXDrawableWindow(winPtr->window);
     if (w) {
-	NSView *view = [w contentView];
+	TKContentView *view = [w contentView];
 	TkMacOSXWinBounds(winPtr, &tkBounds);
 	bounds = NSMakeRect(tkBounds.left,
 			    [view bounds].size.height - tkBounds.bottom,
 			    tkBounds.right - tkBounds.left,
 			    tkBounds.bottom - tkBounds.top);
-	[view setNeedsDisplayInRect:bounds];
+	[view setTkNeedsDisplay:YES];
+	[view setTkDirtyRect:bounds];
     }
 }
 
-- 
cgit v0.12


From 4d6ace7f224a40a423390fa6c0bb3c39d4162313 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Sun, 31 May 2020 17:21:57 +0000
Subject: Rename Aqua stub TkpAppCanDraw as TkpWillDrawWidget

---
 generic/tkFont.c             | 2 +-
 generic/tkInt.decls          | 2 +-
 generic/tkIntDecls.h         | 8 ++++----
 generic/tkStubInit.c         | 2 +-
 generic/tkTextDisp.c         | 4 ++--
 macosx/tkMacOSXWindowEvent.c | 4 ++--
 unix/tkUnixPort.h            | 2 +-
 win/tkWinPort.h              | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/generic/tkFont.c b/generic/tkFont.c
index 448f918..e53e3f9 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.c
@@ -880,7 +880,7 @@ TheWorldHasChanged(
      * This is ignored on other platforms.
      */
 
-    if (TkpAppCanDraw(NULL)) {
+    if (!TkpWillDrawWidget(NULL)) {
 	return;
     }
 
diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index da591cb..f6e7ea9 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -640,7 +640,7 @@ declare 185 aqua {
     void TkpRedrawWidget(Tk_Window tkwin)
 }
 declare 186 aqua {
-    int TkpAppCanDraw(Tk_Window tkwin)
+    int TkpWillDrawWidget(Tk_Window tkwin)
 }
 
 
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h
index 7bf9bd7..1344cc6 100644
--- a/generic/tkIntDecls.h
+++ b/generic/tkIntDecls.h
@@ -556,7 +556,7 @@ EXTERN void		TkpRedrawWidget(Tk_Window tkwin);
 #endif /* AQUA */
 #ifdef MAC_OSX_TK /* AQUA */
 /* 186 */
-EXTERN int		TkpAppCanDraw(Tk_Window tkwin);
+EXTERN int		TkpWillDrawWidget(Tk_Window tkwin);
 #endif /* AQUA */
 
 typedef struct TkIntStubs {
@@ -793,7 +793,7 @@ typedef struct TkIntStubs {
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
     void (*reserved186)(void); /* Dummy entry for stubs table backwards compatibility */
-    int (*tkpAppCanDraw) (Tk_Window tkwin); /* 186 */
+    int (*tkpWillDrawWidget) (Tk_Window tkwin); /* 186 */
 #endif /* AQUA */
 } TkIntStubs;
 
@@ -1172,8 +1172,8 @@ extern const TkIntStubs *tkIntStubsPtr;
 	(tkIntStubsPtr->tkpRedrawWidget) /* 185 */
 #endif /* AQUA */
 #ifdef MAC_OSX_TK /* AQUA */
-#define TkpAppCanDraw \
-	(tkIntStubsPtr->tkpAppCanDraw) /* 186 */
+#define TkpWillDrawWidget \
+	(tkIntStubsPtr->tkpWillDrawWidget) /* 186 */
 #endif /* AQUA */
 
 #endif /* defined(USE_TK_STUBS) */
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 045c86e..4abc637 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -503,7 +503,7 @@ static const TkIntStubs tkIntStubs = {
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
     0, /* 186 */ /* Dummy entry for stubs table backwards compatibility */
-    TkpAppCanDraw, /* 186 */
+    TkpWillDrawWidget, /* 186 */
 #endif /* AQUA */
 };
 
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 084fd64..2deeaf2 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -22,7 +22,7 @@
 #include "tkUnixInt.h"
 #elif defined(MAC_OSX_TK)
 #include "tkMacOSXInt.h"
-#define OK_TO_LOG (!TkpAppCanDraw(textPtr->tkwin))
+#define OK_TO_LOG (!TkpWillDrawWidget(textPtr->tkwin))
 #endif
 
 #if !defined(MAC_OSX_TK)
@@ -4174,7 +4174,7 @@ DisplayText(
 				 * warnings. */
     Tcl_Interp *interp;
 
-    
+
     if ((textPtr->tkwin == NULL) || (textPtr->flags & DESTROYED)) {
 	/*
 	 * The widget has been deleted.	 Don't do anything.
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 76b2b04..ee49541 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -382,7 +382,7 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
 /*
  *----------------------------------------------------------------------
  *
- * TkpAppCanDraw --
+ * TkpWillDrawWidget --
  *
  *      A widget display procedure can call this to determine whether it is
  *      being run inside of the drawRect method. If not, it may be desirable
@@ -406,7 +406,7 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
  */
 
 int
-TkpAppCanDraw(Tk_Window tkwin) {
+TkpWillDrawWidget(Tk_Window tkwin) {
     if (![NSApp isDrawing]) {
 	return 0;
     }
diff --git a/unix/tkUnixPort.h b/unix/tkUnixPort.h
index 8fd56fe..491a339 100644
--- a/unix/tkUnixPort.h
+++ b/unix/tkUnixPort.h
@@ -167,7 +167,7 @@
 
 #define TkpButtonSetDefaults() {}
 #define TkpDestroyButton(butPtr) {}
-#define TkpAppCanDraw(tkwin) 1
+#define TkpWillDrawWidget(tkwin) 1
 #define TkpRedrawWidget(tkwin)
 #define TkSelUpdateClipboard(a,b) {}
 #ifndef __CYGWIN__
diff --git a/win/tkWinPort.h b/win/tkWinPort.h
index 4ef8680..dbde9e1 100644
--- a/win/tkWinPort.h
+++ b/win/tkWinPort.h
@@ -129,7 +129,7 @@
  * Other functions not used under Windows
  */
 
-#define TkpAppCanDraw(tkwin) 1
+#define TkpWillDrawWidget(tkwin) 1
 #define TkpRedrawWidget(tkwin)
 
 #endif /* _WINPORT */
-- 
cgit v0.12


From 11b02278eef59eb2b8412727e92256477ea6188b Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Sun, 31 May 2020 21:19:29 +0000
Subject: Add some methods for managing damage rectangles.

---
 generic/tkCanvas.c           |  3 ---
 macosx/tkMacOSXDraw.c        | 10 ++++------
 macosx/tkMacOSXPrivate.h     |  3 ++-
 macosx/tkMacOSXSubwindows.c  |  5 ++---
 macosx/tkMacOSXWindowEvent.c | 23 +++++++++++++++++------
 5 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c
index 941e7d2..4d68ade 100644
--- a/generic/tkCanvas.c
+++ b/generic/tkCanvas.c
@@ -2577,9 +2577,6 @@ DisplayCanvas(
 #else
 	canvasPtr->drawableXOrigin = canvasPtr->xOrigin;
 	canvasPtr->drawableYOrigin = canvasPtr->yOrigin;
-#if 0
-        TkpAppCanDraw(tkwin);
-#endif
 	pixmap = Tk_WindowId(tkwin);
 	TkpClipDrawableToRect(Tk_Display(tkwin), pixmap,
 		screenX1 - canvasPtr->xOrigin, screenY1 - canvasPtr->yOrigin,
diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index d2d72e4..dcc3d79 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -1646,15 +1646,13 @@ TkMacOSXSetupDrawingContext(
 	if (![NSApp isDrawing] || view != [NSView focusView]) {
 	    NSRect dirtyRect = [view bounds];
 	    if (dc.clipRgn) {
-		CGRect clipRect;
 		CGAffineTransform t = { .a = 1, .b = 0, .c = 0, .d = -1, .tx = 0,
 					.ty = dirtyRect.size.height};
-		HIShapeGetBounds(dc.clipRgn, &clipRect);
-		clipRect = CGRectApplyAffineTransform(clipRect, t);
-		dirtyRect = NSRectFromCGRect(clipRect);
+		HIShapeGetBounds(dc.clipRgn, &clipBounds);
+		clipBounds = CGRectApplyAffineTransform(clipBounds, t);
+		dirtyRect = NSRectFromCGRect(clipBounds);
 	    }
-	    [view setTkNeedsDisplay:YES];
-	    [view setTkDirtyRect:NSUnionRect([view tkDirtyRect], dirtyRect)];
+	    [view addTkDirtyRect:dirtyRect];
 	    canDraw = false;
 	    goto end;
 	}
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h
index fdd07ed..11dee7c 100644
--- a/macosx/tkMacOSXPrivate.h
+++ b/macosx/tkMacOSXPrivate.h
@@ -434,7 +434,8 @@ VISIBILITY_HIDDEN
 @end
 
 @interface TKContentView(TKWindowEvent)
- //(HIShapeRef) shape;
+- (void) addTkDirtyRect: (NSRect) rect;
+- (void) clearTkDirtyRect;
 - (void) generateExposeEvents: (NSRect) rect;
 - (void) tkToolbarButton: (id) sender;
 @end
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index 53e5bf6..c25f600 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -994,7 +994,7 @@ InvalViewRect(
     static CGAffineTransform t;
     TKContentView *view = ref;
     NSRect dirtyRect;
-    
+
     if (!view) {
 	return paramErr;
     }
@@ -1005,8 +1005,7 @@ InvalViewRect(
 	break;
     case kHIShapeEnumerateRect:
 	dirtyRect = NSRectFromCGRect(CGRectApplyAffineTransform(*rect, t));
-	[view setTkNeedsDisplay:YES];
-	[view setTkDirtyRect:NSUnionRect([view tkDirtyRect], dirtyRect)];
+	[view addTkDirtyRect:dirtyRect];
 	break;
     }
     return noErr;
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 5619454..6c7e9ff 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -399,8 +399,8 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
  *      tkwin NULL or pointing to a widget in the current focusView.
  *
  * Side effects:
- *	The tkwin parameter may be recorded to handle redrawing the widget
- *      later.
+ *	Currently none.  One day the tkwin parameter may be recorded to
+ *      handle redrawing the widget later.
  *
  *----------------------------------------------------------------------
  */
@@ -925,7 +925,7 @@ ConfigureRestrictProc(
  */
 
 static void
-RedisplayView( 
+RedisplayView(
     ClientData clientdata)
 {
     TKContentView *view = (TKContentView *) clientdata;
@@ -947,6 +947,18 @@ RedisplayView(
 
 @implementation TKContentView(TKWindowEvent)
 
+- (void) addTkDirtyRect: (NSRect) rect
+{
+    _tkNeedsDisplay = YES;
+    _tkDirtyRect = NSUnionRect(_tkDirtyRect, rect);
+}
+
+- (void) clearTkDirtyRect
+{
+    _tkNeedsDisplay = NO;
+    _tkDirtyRect = NSZeroRect;
+}
+
 - (void) drawRect: (NSRect) rect
 {
 
@@ -984,8 +996,7 @@ RedisplayView(
 	Tcl_DoWhenIdle(RedisplayView, self);
     }
 
-    [self setTkNeedsDisplay:NO];
-    [self setTkDirtyRect:NSZeroRect];
+    [self clearTkDirtyRect];
 
 #ifdef TK_MAC_DEBUG_DRAWING
     fprintf(stderr, "drawRect: done.\n");
@@ -1079,7 +1090,7 @@ RedisplayView(
      * Generate Tk Expose events.  All of these events will share the same
      * serial number.
      */
-    
+
     updateBounds = NSRectToCGRect(rect);
     updateBounds.origin.y = ([self bounds].size.height - updateBounds.origin.y
 			     - updateBounds.size.height);
-- 
cgit v0.12


From aeb89ef62c14b00be0853a7539e807bb3937a6f8 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Mon, 1 Jun 2020 21:34:36 +0000
Subject: Better control over when drawRect runs.  Add check for drawing
 outside of the drawRect clipping rectangle.

---
 generic/tkFont.c             |  2 +-
 macosx/tkMacOSXDraw.c        | 55 +++++++++++++++++++++++------------
 macosx/tkMacOSXNotify.c      | 68 ++++++++++++++++++++++++++------------------
 macosx/tkMacOSXPrivate.h     |  1 +
 macosx/tkMacOSXWindowEvent.c | 40 ++++----------------------
 tests/canvImg.test           |  8 +-----
 tests/image.test             | 17 ++---------
 tests/listbox.test           |  4 +--
 8 files changed, 90 insertions(+), 105 deletions(-)

diff --git a/generic/tkFont.c b/generic/tkFont.c
index e53e3f9..17e0aa9 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.c
@@ -880,7 +880,7 @@ TheWorldHasChanged(
      * This is ignored on other platforms.
      */
 
-    if (!TkpWillDrawWidget(NULL)) {
+    if (TkpWillDrawWidget(NULL)) {
 	return;
     }
 
diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index dcc3d79..1ec2cfe 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -1631,30 +1631,47 @@ TkMacOSXSetupDrawingContext(
 	    Tcl_Panic("TkMacOSXSetupDrawingContext(): "
 		    "no NSView to draw into !");
 	}
+	if (dc.clipRgn) {
+	    CGAffineTransform t = { .a = 1, .b = 0, .c = 0, .d = -1, .tx = 0,
+				    .ty = [view bounds].size.height};
+	    HIShapeGetBounds(dc.clipRgn, &clipBounds);
+	    clipBounds = CGRectApplyAffineTransform(clipBounds, t);
+	}
+	if (![NSApp isDrawing] || view != [NSView focusView]) {
 
-	/*
-	 * We can only draw into the view when the current CGContext is valid
-	 * and belongs to the view.  Validity can only be guaranteed inside of
-	 * a view's drawRect or setFrame methods.  The isDrawing attribute
-	 * tells us whether we are being called from one of those methods.
-	 *
-	 * If the CGContext is not valid then we mark our view as needing
-	 * display.  We could try to optimize by computing a smaller dirty rect
-	 * here.
-	 */
+	    /*
+	     * We can only draw into the view when the current CGContext is
+	     * valid and belongs to the view.  Validity can only be guaranteed
+	     * inside of a view's drawRect or setFrame methods.  The isDrawing
+	     * attribute tells us whether we are being called from one of those
+	     * methods.  If the CGContext is not valid then we mark our view as
+	     * needing display.
+	     */
 
-	if (![NSApp isDrawing] || view != [NSView focusView]) {
-	    NSRect dirtyRect = [view bounds];
 	    if (dc.clipRgn) {
-		CGAffineTransform t = { .a = 1, .b = 0, .c = 0, .d = -1, .tx = 0,
-					.ty = dirtyRect.size.height};
-		HIShapeGetBounds(dc.clipRgn, &clipBounds);
-		clipBounds = CGRectApplyAffineTransform(clipBounds, t);
-		dirtyRect = NSRectFromCGRect(clipBounds);
+		[view addTkDirtyRect:clipBounds];
+	    } else {
+		[view addTkDirtyRect:[view bounds]];
 	    }
-	    [view addTkDirtyRect:dirtyRect];
 	    canDraw = false;
 	    goto end;
+	} else if (dc.clipRgn) {
+
+	    /*
+	     * Drawing can also fail when we are being called from drawRect but
+	     * the clipping region set by drawRect does not contain the clipping
+	     * region of our drawing context.  See bug [2a61eca3a8].
+	     */
+
+	    CGRect currentClip = CGContextGetClipBoundingBox(
+				     [NSGraphicsContext currentContext].CGContext);
+	    if (!NSContainsRect(currentClip, clipBounds)) {
+		[view addTkDirtyRect:clipBounds];
+		// XXXX we should be able to skip drawing but sometimes the clipBounds
+		// are wrong.
+		//canDraw = false;
+		//goto end;		      
+	    }
 	}
 
 	dc.view = view;
@@ -1686,6 +1703,7 @@ TkMacOSXSetupDrawingContext(
 	CGContextSetTextDrawingMode(dc.context, kCGTextFill);
 	CGContextConcatCTM(dc.context, t);
 	if (dc.clipRgn) {
+
 #ifdef TK_MAC_DEBUG_DRAWING
 	    CGContextSaveGState(dc.context);
 	    ChkErr(HIShapeReplacePathInCGContext, dc.clipRgn, dc.context);
@@ -1693,6 +1711,7 @@ TkMacOSXSetupDrawingContext(
 	    CGContextEOFillPath(dc.context);
 	    CGContextRestoreGState(dc.context);
 #endif /* TK_MAC_DEBUG_DRAWING */
+
 	    CGRect r;
 
 	    if (!HIShapeIsRectangular(dc.clipRgn) || !CGRectContainsRect(
diff --git a/macosx/tkMacOSXNotify.c b/macosx/tkMacOSXNotify.c
index f8ac50d..7de6bec 100644
--- a/macosx/tkMacOSXNotify.c
+++ b/macosx/tkMacOSXNotify.c
@@ -307,19 +307,20 @@ TkMacOSXNotifyExitHandler(
  *       is undocumented, namely that it sometimes blocks and calls drawRect
  *       for all views that need display before it returns.  We call it with
  *       deQueue=NO so that it will not change anything on the AppKit event
- *       queue, because we only want the side effect that it runs
- *       drawRect. This function is the only place where NSViews get the
- *       needsDisplay property set to YES.
+ *       queue, because we only want the side effect that it runs drawRect. The
+ *       only time when any NSViews have the needsDisplay property set to YES
+ *       is during execution of this function.
  *
- *       The reason for running this as an idle task is to try to arrange that
- *       all widgets will be fully configured before they are drawn.  Any idle
- *       tasks that might reconfigure them should be higher on the idle queue,
- *       so they should be run before the display procs are run by drawRect.
+ *       The reason for running this function as an idle task is to try to
+ *       arrange that all widgets will be fully configured before they are
+ *       drawn.  Any idle tasks that might reconfigure them should be higher on
+ *       the idle queue, so they should be run before the display procs are run
+ *       by drawRect.
  *
- *       If this is called directly with non-NULL clientData parameter then the
- *       int which it references will be set to the number of windows that need
- *       display, but the needsDisplay property of those windows will not be
- *       changed.
+ *       If this function is called directly with non-NULL clientData parameter
+ *       then the int which it references will be set to the number of windows
+ *       that need display, but the needsDisplay property of those windows will
+ *       not be changed.
  *
  * Results:
  *	None.
@@ -330,11 +331,11 @@ TkMacOSXNotifyExitHandler(
  *----------------------------------------------------------------------
  */
 
-static void
+void
 TkMacOSXDrawAllViews(
     ClientData clientData)
 {
-    int count = 0, *dirtyCount = (int *)clientData;
+       int count = 0, *dirtyCount = (int *)clientData;
 
     for (NSWindow *window in [NSApp windows]) {
 	if ([[window contentView] isMemberOfClass:[TKContentView class]]) {
@@ -342,22 +343,37 @@ TkMacOSXDrawAllViews(
 	    if ([view tkNeedsDisplay]) {
 		count++;
 		if (dirtyCount) {
-		    continue;
+		   continue;
 		}
 		[view setNeedsDisplayInRect:[view tkDirtyRect]];
+		[view setTkDirtyRect:NSZeroRect];
 	    }
 	} else {
 	    [window displayIfNeeded];
 	}
     }
     if (dirtyCount) {
-	*dirtyCount = count;
+    	*dirtyCount = count;
     }
-    
     [NSApp nextEventMatchingMask:NSAnyEventMask
 		       untilDate:[NSDate distantPast]
 			  inMode:GetRunLoopMode(TkMacOSXGetModalSession())
 			 dequeue:NO];
+    for (NSWindow *window in [NSApp windows]) {
+	if ([[window contentView] isMemberOfClass:[TKContentView class]]) {
+	    TKContentView *view = [window contentView];
+
+	    /*
+	     * If we did not run drawRect, we set needsDisplay back to NO.
+	     * Note that if drawRect did run it may have added to Tk's dirty
+	     * rect, due to attempts to draw outside of drawRect's dirty rect.
+	     */
+
+	    if ([view tkNeedsDisplay]) {
+		[view setNeedsDisplay: NO];
+	    }
+	}
+    }
 }
 
 /*
@@ -399,10 +415,11 @@ TkMacOSXEventsSetupProc(
 	[NSApp _resetAutoreleasePool];
 
  	/*
- 	 * Call this with dequeue=NO to see if there are any events.  If so,
- 	 * we set the block time to 0 and stop the heartbeat.  Tcl_DoOneEvent
- 	 * will call the check proc to collect the events and translate them
- 	 * into XEvents.  But also, drawRect may run.
+ 	 * Call this with dequeue=NO to see if there are any events.  If so, we
+ 	 * set the block time to 0 and stop the heartbeat.  Next Tcl_DoOneEvent
+ 	 * will call Tcl_WaitForEvent, which will poll instead of waiting since
+ 	 * the block time is 0.  Then it will call check proc to collect the
+ 	 * events and translate them into XEvents.
   	 */
 
 	NSEvent *currentEvent =
@@ -428,11 +445,7 @@ TkMacOSXEventsSetupProc(
 	    havePeriodicEvents = YES;
 	    [NSEvent startPeriodicEventsAfterDelay:0.0 withPeriod:0.1];
 	}
-
-	/*
-	 * Without this, new windows are sometimes not completely rendered.
-	 */
-	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {}
+	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {};
 	TkMacOSXDrawAllViews(NULL);
     }
 }
@@ -521,7 +534,6 @@ TkMacOSXEventsCheckProc(
 		    }
 		}
 	    } else {
-		
 		break;
 	    }
 	} while (1);
@@ -529,8 +541,8 @@ TkMacOSXEventsCheckProc(
 	/*
 	 * Now we can unlock the pool.
 	 */
-	[NSApp _unlockAutoreleasePool];
 
+	[NSApp _unlockAutoreleasePool];
 	if (eventsFound == 0) {
 
 	    /*
@@ -552,7 +564,7 @@ TkMacOSXEventsCheckProc(
 	    if (dirtyCount > 0) {
 		Tcl_CancelIdleCall(TkMacOSXDrawAllViews, NULL);
 		Tcl_DoWhenIdle(TkMacOSXDrawAllViews, NULL);
-	    }
+	    	}
 	}
     }
 }
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h
index 11dee7c..719b0b1 100644
--- a/macosx/tkMacOSXPrivate.h
+++ b/macosx/tkMacOSXPrivate.h
@@ -309,6 +309,7 @@ MODULE_SCOPE int	TkMacOSXRegisterServiceWidgetObjCmd(ClientData clientData,
 MODULE_SCOPE unsigned   TkMacOSXAddVirtual(unsigned int keycode);
 MODULE_SCOPE void       TkMacOSXWinNSBounds(TkWindow *winPtr, NSView *view,
 					    NSRect *bounds);
+MODULE_SCOPE void	TkMacOSXDrawAllViews(ClientData clientData);
 
 #pragma mark Private Objective-C Classes
 
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 6c7e9ff..0f58c70 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -122,7 +122,7 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
 	     */
 
 	    while (Tcl_ServiceEvent(0)) {}
-	    while (Tcl_DoOneEvent(TCL_IDLE_EVENTS|TCL_DONT_WAIT)) {}
+	    while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {}
 
 	    /*
 	     * NSWindowDidDeminiaturizeNotification is received after
@@ -919,32 +919,6 @@ ConfigureRestrictProc(
     return (eventPtr->type==ConfigureNotify ? TK_PROCESS_EVENT : TK_DEFER_EVENT);
 }
 
-/*
- * If a window gets mapped inside the drawRect method, this will be run as an
- * idle task, after drawRect returns, to clean up the mess.
- */
-
-static void
-RedisplayView(
-    ClientData clientdata)
-{
-    TKContentView *view = (TKContentView *) clientdata;
-
-    /*
-     * Make sure that we are not trying to displaying a view that no longer
-     * exists. Must call [NSApp windows] because [NSApp orderedWindows] excludes
-     * floating/utility windows and other window panels.
-     */
-
-    for (NSWindow *w in [NSApp windows]) {
-	if ([w contentView] == view) {
-	    [view setTkNeedsDisplay:YES];
-	    [view setTkDirtyRect:[view bounds]];
-	    break;
-	}
-    }
-}
-
 @implementation TKContentView(TKWindowEvent)
 
 - (void) addTkDirtyRect: (NSRect) rect
@@ -983,21 +957,16 @@ RedisplayView(
     }
 
     [NSApp setIsDrawing: YES];
-
-#ifdef TK_MAC_DEBUG_DRAWING
-    fprintf(stderr, "drawRect: %s\n", NSStringFromRect(rect).UTF8String;
-#endif
-
+    [self setTkDirtyRect:NSZeroRect];
     [self generateExposeEvents:rect];
+    [self setTkNeedsDisplay: NO];
     [NSApp setIsDrawing: NO];
 
     if ([self needsRedisplay]) {
 	[self setNeedsRedisplay:NO];
-	Tcl_DoWhenIdle(RedisplayView, self);
+	Tcl_DoWhenIdle(TkMacOSXDrawAllViews, NULL);
     }
 
-    [self clearTkDirtyRect];
-
 #ifdef TK_MAC_DEBUG_DRAWING
     fprintf(stderr, "drawRect: done.\n");
 #endif
@@ -1102,6 +1071,7 @@ RedisplayView(
 	/*
 	 * First process all of the Expose events.
 	 */
+    	while (Tcl_ServiceEvent(TCL_IDLE_EVENTS)) {};
 
     	oldProc = Tk_RestrictEvents(ExposeRestrictProc, UINT2PTR(serial), &oldArg);
     	while (Tcl_ServiceEvent(TCL_WINDOW_EVENTS)) {};
diff --git a/tests/canvImg.test b/tests/canvImg.test
index b60e384..1abea78 100644
--- a/tests/canvImg.test
+++ b/tests/canvImg.test
@@ -727,12 +727,6 @@ test canvImg-9.1 {DisplayImage procedure} -constraints testImageType -setup {
 	image delete foo
 } -result {75 150 105 165}
 
-if {[tk windowingsystem] == "aqua" && $tcl_platform(osVersion) > 18} {
-    # Aqua >= 10.14 will redraw the entire image.
-    set result_10_1 {{foo display 0 0 30 15}}
-} else {
-    set result_10_1 {{foo display 2 4 6 8}} 
-}
 test canvImg-10.1 {TranslateImage procedure} -constraints testImageType -setup {
     .c delete all
     update
@@ -750,7 +744,7 @@ test canvImg-10.1 {TranslateImage procedure} -constraints testImageType -setup {
 } -cleanup {
     .c delete all
     image delete foo
-} -result $result_10_1
+} -result {{foo display 2 4 6 8}} 
 
 test canvImg-11.1 {TranslateImage procedure} -constraints testImageType -setup {
     .c delete all
diff --git a/tests/image.test b/tests/image.test
index da65a66..cac304f 100644
--- a/tests/image.test
+++ b/tests/image.test
@@ -357,12 +357,6 @@ test image-8.1 {Tk_ImageCmd procedure, "inuse" option} -constraints {
     catch {destroy .b}
 } -result [list 0 1]
 
-if {[tk windowingsystem] == "aqua" && $tcl_platform(osVersion) > 18} {
-    # Aqua >= 10.14 will redraw the entire image in drawRect.
-    set result_9_1 {{foo display 0 0 30 15}}
-} else {
-    set result_9_1 {{foo display 5 6 7 8}}
-}
 test image-9.1 {Tk_ImageChanged procedure} -constraints testImageType -setup {
     .c delete all
     imageCleanup
@@ -385,13 +379,8 @@ test image-9.1 {Tk_ImageChanged procedure} -constraints testImageType -setup {
 } -cleanup {
     .c delete all
     imageCleanup
-} -result $result_9_1
-if {[tk windowingsystem] == "aqua" && $tcl_platform(osVersion) > 18} {
-    # Aqua >= 10.14 will redraw the entire image.
-    set result_9_2 {{foo display 0 0 30 15} {foo display 0 0 30 15}}
-} else {
-    set result_9_2 {{foo display 5 6 25 9} {foo display 0 0 12 14}}
-}
+} -result {{foo display 5 6 7 8}}
+
 test image-9.2 {Tk_ImageChanged procedure} -constraints testImageType -setup {
     .c delete all
     imageCleanup
@@ -411,7 +400,7 @@ test image-9.2 {Tk_ImageChanged procedure} -constraints testImageType -setup {
 } -cleanup {
     .c delete all
     imageCleanup
-} -result $result_9_2
+} -result {{foo display 5 6 25 9} {foo display 0 0 12 14}}
 
 test image-10.1 {Tk_GetImage procedure} -setup {
     imageCleanup
diff --git a/tests/listbox.test b/tests/listbox.test
index 14c5c97..8d4ed33 100644
--- a/tests/listbox.test
+++ b/tests/listbox.test
@@ -2800,13 +2800,13 @@ test listbox-21.16 {ListboxListVarProc, update vertical scrollbar} -setup {
 test listbox-22.1 {UpdateHScrollbar} -setup {
     destroy .l
 } -body {
-    listbox .l -font $fixed -width 10 -xscrollcommand "record x"
     set log {}
+    listbox .l -font $fixed -width 10 -xscrollcommand "record x"
     pack .l
     set timeout [after 500 {set log timeout}] 
     vwait log
     .l insert end "0000000000"
-    update
+    update idletasks
     .l insert end "00000000000000000000"
     vwait log
     set log
-- 
cgit v0.12


From 6694505c3ede36fbdf40007bf50495675a8d9455 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Tue, 2 Jun 2020 06:16:12 +0000
Subject: A more robust approach to warping with respect to a window: make the
 call to TkpWarpPointer happen in TkPointerEvent instead of as an idle event.
 This allows to remove some update/after commands in tests since warping with
 respect to a window is now synchronous (it happens before event generate $win
 <Motion> -warp 1 ... returns).

---
 generic/tkBind.c | 34 +++++++++++++++++++---------------
 generic/tkGrab.c | 37 +++++++++++++++++++++++++++++++++++++
 tests/bind.test  |  6 ------
 3 files changed, 56 insertions(+), 21 deletions(-)

diff --git a/generic/tkBind.c b/generic/tkBind.c
index af6ab15..ea1f721 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -4364,8 +4364,21 @@ HandleEventGenerate(
 	    dispPtr->warpX = event.general.xmotion.x;
 	    dispPtr->warpY = event.general.xmotion.y;
 
+            /*
+             * Warping with respect to a window will be done when Tk_handleEvent
+             * below will run the event handlers and in particular TkPointerEvent.
+             * This allows to make grabs and warping work together robustly, that
+             * is without depending on a precise sequence of events.
+             * Warping with respect to the whole screen (i.e. dispPtr->warpWindow
+             * is NULL) is run as an idle task because the event handlers are not
+             * designed to work without a window (and there is anyway no point in
+             * making this case sleep with grabs).
+             */
+
 	    if (!(dispPtr->flags & TK_DISPLAY_IN_WARP)) {
-		Tcl_DoWhenIdle(DoWarp, dispPtr);
+                if (!dispPtr->warpWindow) {
+		    Tcl_DoWhenIdle(DoWarp, dispPtr);
+                }
 		dispPtr->flags |= TK_DISPLAY_IN_WARP;
 	    }
 	}
@@ -4473,23 +4486,14 @@ DoWarp(
     assert(clientData);
 
     /*
-     * DoWarp was scheduled only if the window was mapped. It needs to be
-     * still mapped at the time the present idle callback is executed. Also
-     * one needs to guard against window destruction in the meantime.
-     * Finally, the case warpWindow == NULL is special in that it means
-     * the whole screen.
+     * A non-NULL warpWindow means warping with respect to this window.
+     * We can only be here if we're warping with respect to the whole screen.
      */
 
-    if (!dispPtr->warpWindow ||
-            (Tk_IsMapped(dispPtr->warpWindow) && Tk_WindowId(dispPtr->warpWindow) != None)) {
-        TkpWarpPointer(dispPtr);
-        XForceScreenSaver(dispPtr->display, ScreenSaverReset);
-    }
+    assert(!dispPtr->warpWindow);
 
-    if (dispPtr->warpWindow) {
-	Tcl_Release(dispPtr->warpWindow);
-	dispPtr->warpWindow = NULL;
-    }
+    TkpWarpPointer(dispPtr);
+    XForceScreenSaver(dispPtr->display, ScreenSaverReset);
     dispPtr->flags &= ~TK_DISPLAY_IN_WARP;
 }
 
diff --git a/generic/tkGrab.c b/generic/tkGrab.c
index 2855637..0750bd5 100644
--- a/generic/tkGrab.c
+++ b/generic/tkGrab.c
@@ -774,6 +774,33 @@ TkPointerEvent(
 	return 1;
     }
 
+    if ((eventPtr->type == MotionNotify) && !appGrabbed) {
+        if ((dispPtr->flags & TK_DISPLAY_IN_WARP)) {
+
+            /*
+             * A NULL warpWindow means warping with respect to the whole screen.
+             * We can only be here if we're warping with respect to a window.
+             */
+
+            assert(dispPtr->warpWindow);
+
+            /*
+             * Warping with respect to a window can only be done if the window is
+             * mapped. This was checked in HandleEvent. The windows needs to be
+             * still mapped at the time the present code is executed. Also
+             * one needs to guard against window destruction in the meantime.
+             */
+
+            if (Tk_IsMapped(dispPtr->warpWindow) && Tk_WindowId(dispPtr->warpWindow) != None) {
+                TkpWarpPointer(dispPtr);
+                XForceScreenSaver(dispPtr->display, ScreenSaverReset);
+            }
+	    Tcl_Release(dispPtr->warpWindow);
+	    dispPtr->warpWindow = NULL;
+            dispPtr->flags &= ~TK_DISPLAY_IN_WARP;
+        }
+    }
+        
     if (!appGrabbed) {
 	return 1;
     }
@@ -800,6 +827,16 @@ TkPointerEvent(
 	    Tk_QueueWindowEvent(eventPtr, TCL_QUEUE_HEAD);
 	    return 0;
 	}
+        if ((dispPtr->flags & TK_DISPLAY_IN_WARP)) {
+            assert(dispPtr->warpWindow);
+            if (Tk_IsMapped(dispPtr->warpWindow) && Tk_WindowId(dispPtr->warpWindow) != None) {
+                TkpWarpPointer(dispPtr);
+                XForceScreenSaver(dispPtr->display, ScreenSaverReset);
+            }
+	    Tcl_Release(dispPtr->warpWindow);
+	    dispPtr->warpWindow = NULL;
+            dispPtr->flags &= ~TK_DISPLAY_IN_WARP;
+        }
 	return 1;
     }
 
diff --git a/tests/bind.test b/tests/bind.test
index a001580..2531a65 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -6635,14 +6635,10 @@ test bind-34.1 {-warp works relatively to a window} -setup {
     wm geometry .top +200+200
     update
     event generate .top <Motion> -x 20 -y 20 -warp 1
-    update idletasks ; # DoWarp is an idle callback
-    after 50         ; # Win specific - wait for SendInput to be executed
     set pointerPos1 [winfo pointerxy .t]
     wm geometry .top +600+600
     update
     event generate .top <Motion> -x 20 -y 20 -warp 1
-    update idletasks ; # DoWarp is an idle callback
-    after 50         ; # Win specific - wait for SendInput to be executed
     set pointerPos2 [winfo pointerxy .t]
     # from the first warped position to the second one, the mouse
     # pointer should have moved the same amount as the window moved
@@ -6736,14 +6732,12 @@ test bind-35.1 {pointer warp with grab on master, bug [e3888d5820]} -constraints
     grab .top  ; # this will queue events
     waitForGrab grabbed .top
     event generate .top.l <Motion> -warp 1 -x 10 -y 10
-    update idletasks ; after 50
     foreach {x1 y1} [winfo pointerxy .top.l] {}
     event generate {} <Motion> -warp 1 -x 50 -y 50
     update idletasks ; after 50
     grab release .top  ; # this will queue events
     waitForGrab released .top
     event generate .top.l <Motion> -warp 1 -x 10 -y 10
-    update idletasks ; after 50
     foreach {x2 y2} [winfo pointerxy .top.l] {}
     expr {$x1==$x2 && $y1==$y2}
 } -cleanup {
-- 
cgit v0.12


From 7e224c0bcdec400cbdb89459313b1e4ea73bc896 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Tue, 2 Jun 2020 06:45:54 +0000
Subject: Warping with respect to the whole screen is now synchronous as well
 (it is no longer executed as an idle task). This allows to remove some
 further update/after commands in tests.

---
 generic/tkBind.c | 17 +++++++----------
 tests/bind.test  | 13 ++-----------
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/generic/tkBind.c b/generic/tkBind.c
index ea1f721..a2f8532 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -717,7 +717,7 @@ static int		NameToWindow(Tcl_Interp *interp, Tk_Window main,
 			    Tcl_Obj *objPtr, Tk_Window *tkwinPtr);
 static unsigned		ParseEventDescription(Tcl_Interp *interp, const char **eventStringPtr,
 			    TkPattern *patPtr, EventMask *eventMaskPtr);
-static void		DoWarp(ClientData clientData);
+static void		DoWarp(TkDisplay *dispPtr);
 static PSList *		GetLookupForEvent(LookupTables* lookupPtr, const Event *eventPtr,
 			    Tcl_Obj *object, int onlyConsiderDetailedEvents);
 static void		ClearLookupTable(LookupTables *lookupTables, ClientData object);
@@ -4376,10 +4376,10 @@ HandleEventGenerate(
              */
 
 	    if (!(dispPtr->flags & TK_DISPLAY_IN_WARP)) {
+		dispPtr->flags |= TK_DISPLAY_IN_WARP;
                 if (!dispPtr->warpWindow) {
-		    Tcl_DoWhenIdle(DoWarp, dispPtr);
+		    DoWarp(dispPtr);
                 }
-		dispPtr->flags |= TK_DISPLAY_IN_WARP;
 	    }
 	}
 
@@ -4466,24 +4466,22 @@ NameToWindow(
  *
  * DoWarp --
  *
- *	Perform Warping of X pointer. Executed as an idle handler only.
+ *	Perform warping of mouse pointer with respect to the whole screen.
  *
  * Results:
  *	None
  *
  * Side effects:
- *	X Pointer will move to a new location.
+ *	Mouse pointer moves to a new location.
  *
  *-------------------------------------------------------------------------
  */
 
 static void
 DoWarp(
-    ClientData clientData)
+    TkDisplay *dispPtr)
 {
-    TkDisplay *dispPtr = clientData;
-
-    assert(clientData);
+    assert(dispPtr);
 
     /*
      * A non-NULL warpWindow means warping with respect to this window.
@@ -5286,7 +5284,6 @@ TkpCancelWarp(
     assert(dispPtr);
 
     if (dispPtr->flags & TK_DISPLAY_IN_WARP) {
-	Tcl_CancelIdleCall(DoWarp, dispPtr);
 	dispPtr->flags &= ~TK_DISPLAY_IN_WARP;
     }
 }
diff --git a/tests/bind.test b/tests/bind.test
index 2531a65..c677109 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -6137,6 +6137,8 @@ test bind-31.7 {virtual event user_data field - unshared, asynch} -setup {
 } -result {{} {} {TestUserData >b<}}
 
 test bind-32.1 {-warp, window was destroyed before the idle callback DoWarp} -setup {
+    # note: this test is now essentially useless
+    #       since DoWarp no longer is an idle callback
     frame .t.f
     pack .t.f
     focus -force .t.f
@@ -6656,12 +6658,8 @@ test bind-34.2 {-warp works relatively to the screen} -setup {
 } -body {
     # Contrary to bind-34.1, we're directly checking screen coordinates
     event generate {} <Motion> -x 20 -y 20 -warp 1
-    update idletasks ; # DoWarp is an idle callback
-    after 50         ; # Win specific - wait for SendInput to be executed
     set res [winfo pointerxy .]
     event generate {} <Motion> -x 200 -y 200 -warp 1
-    update idletasks ; # DoWarp is an idle callback
-    after 50         ; # Win specific - wait for SendInput to be executed
     lappend res {*}[winfo pointerxy .]
 } -cleanup {
 } -result {20 20 200 200}
@@ -6679,8 +6677,6 @@ test bind-34.3 {-warp works with null or negative coordinates} -setup {
     set res {}
 } -body {
     event generate {} <Motion> -x 0 -y 0 -warp 1
-    update idletasks ; # DoWarp is an idle callback
-    after 50         ; # Win specific - wait for SendInput to be executed
     foreach dim [winfo pointerxy .] {
         if {$dim <= $halo} {
             lappend res ok
@@ -6689,9 +6685,7 @@ test bind-34.3 {-warp works with null or negative coordinates} -setup {
         }
     }
     event generate {} <Motion> -x 100 -y 100 -warp 1
-    update idletasks ; after 50
     event generate {} <Motion> -x -1 -y -1 -warp 1
-    update idletasks ; after 50
     foreach dim [winfo pointerxy .] {
         if {$dim <= $halo} {
             lappend res ok
@@ -6718,8 +6712,6 @@ test bind-35.1 {pointer warp with grab on master, bug [e3888d5820]} -constraints
         }
     }
     event generate {} <Motion> -warp 1 -x 50 -y 50
-    update idletasks ; # DoWarp is an idle callback
-    after 50         ; # Win specific - wait for SendInput to be executed
     toplevel .top
     grab release .top
     waitForGrab released .top
@@ -6734,7 +6726,6 @@ test bind-35.1 {pointer warp with grab on master, bug [e3888d5820]} -constraints
     event generate .top.l <Motion> -warp 1 -x 10 -y 10
     foreach {x1 y1} [winfo pointerxy .top.l] {}
     event generate {} <Motion> -warp 1 -x 50 -y 50
-    update idletasks ; after 50
     grab release .top  ; # this will queue events
     waitForGrab released .top
     event generate .top.l <Motion> -warp 1 -x 10 -y 10
-- 
cgit v0.12


From 169bf5a922972c64aa154479d588919763f77e88 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Tue, 2 Jun 2020 06:52:47 +0000
Subject: Remove the TK_DISPLAY_IN_WARP machinery completely.

---
 generic/tkBind.c   | 38 +++-----------------------------------
 generic/tkGrab.c   | 16 ++++++----------
 generic/tkInt.h    |  6 +-----
 generic/tkWindow.c |  2 --
 4 files changed, 10 insertions(+), 52 deletions(-)

diff --git a/generic/tkBind.c b/generic/tkBind.c
index a2f8532..7fd9e74 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -4375,12 +4375,9 @@ HandleEventGenerate(
              * making this case sleep with grabs).
              */
 
-	    if (!(dispPtr->flags & TK_DISPLAY_IN_WARP)) {
-		dispPtr->flags |= TK_DISPLAY_IN_WARP;
-                if (!dispPtr->warpWindow) {
-		    DoWarp(dispPtr);
-                }
-	    }
+            if (!dispPtr->warpWindow) {
+		DoWarp(dispPtr);
+            }
 	}
 
 	/*
@@ -4492,7 +4489,6 @@ DoWarp(
 
     TkpWarpPointer(dispPtr);
     XForceScreenSaver(dispPtr->display, ScreenSaverReset);
-    dispPtr->flags &= ~TK_DISPLAY_IN_WARP;
 }
 
 /*
@@ -5263,34 +5259,6 @@ TkpGetBindingXEvent(
 /*
  *----------------------------------------------------------------------
  *
- * TkpCancelWarp --
- *
- *	This function cancels an outstanding pointer warp and
- *	is called during tear down of the display.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TkpCancelWarp(
-    TkDisplay *dispPtr)
-{
-    assert(dispPtr);
-
-    if (dispPtr->flags & TK_DISPLAY_IN_WARP) {
-	dispPtr->flags &= ~TK_DISPLAY_IN_WARP;
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
  * TkpDumpPS --
  *
  *	Dump given pattern sequence to stdout.
diff --git a/generic/tkGrab.c b/generic/tkGrab.c
index 0750bd5..c923608 100644
--- a/generic/tkGrab.c
+++ b/generic/tkGrab.c
@@ -775,14 +775,13 @@ TkPointerEvent(
     }
 
     if ((eventPtr->type == MotionNotify) && !appGrabbed) {
-        if ((dispPtr->flags & TK_DISPLAY_IN_WARP)) {
 
-            /*
-             * A NULL warpWindow means warping with respect to the whole screen.
-             * We can only be here if we're warping with respect to a window.
-             */
+        /*
+         * A NULL warpWindow means warping with respect to the whole screen.
+         * We want to warp here only if we're warping with respect to a window.
+         */
 
-            assert(dispPtr->warpWindow);
+        if (dispPtr->warpWindow) {
 
             /*
              * Warping with respect to a window can only be done if the window is
@@ -797,7 +796,6 @@ TkPointerEvent(
             }
 	    Tcl_Release(dispPtr->warpWindow);
 	    dispPtr->warpWindow = NULL;
-            dispPtr->flags &= ~TK_DISPLAY_IN_WARP;
         }
     }
         
@@ -827,15 +825,13 @@ TkPointerEvent(
 	    Tk_QueueWindowEvent(eventPtr, TCL_QUEUE_HEAD);
 	    return 0;
 	}
-        if ((dispPtr->flags & TK_DISPLAY_IN_WARP)) {
-            assert(dispPtr->warpWindow);
+        if (dispPtr->warpWindow) {
             if (Tk_IsMapped(dispPtr->warpWindow) && Tk_WindowId(dispPtr->warpWindow) != None) {
                 TkpWarpPointer(dispPtr);
                 XForceScreenSaver(dispPtr->display, ScreenSaverReset);
             }
 	    Tcl_Release(dispPtr->warpWindow);
 	    dispPtr->warpWindow = NULL;
-            dispPtr->flags &= ~TK_DISPLAY_IN_WARP;
         }
 	return 1;
     }
diff --git a/generic/tkInt.h b/generic/tkInt.h
index c1bd562d..cc710d6 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -535,15 +535,12 @@ typedef struct TkDisplay {
  *	Whether to use input methods for this display
  *  TK_DISPLAY_WM_TRACING:		(default off)
  *	Whether we should do wm tracing on this display.
- *  TK_DISPLAY_IN_WARP:			(default off)
- *	Indicates that we are in a pointer warp
  */
 
 #define TK_DISPLAY_COLLAPSE_MOTION_EVENTS	(1 << 0)
 #define TK_DISPLAY_USE_IM			(1 << 1)
 #define TK_DISPLAY_WM_TRACING			(1 << 3)
-#define TK_DISPLAY_IN_WARP			(1 << 4)
-#define TK_DISPLAY_USE_XKB			(1 << 5)
+#define TK_DISPLAY_USE_XKB			(1 << 4)
 
 /*
  * One of the following structures exists for each error handler created by a
@@ -1251,7 +1248,6 @@ MODULE_SCOPE int	TkInitTkCmd(Tcl_Interp *interp,
 MODULE_SCOPE int	TkInitFontchooser(Tcl_Interp *interp,
 			    ClientData clientData);
 MODULE_SCOPE void	TkpWarpPointer(TkDisplay *dispPtr);
-MODULE_SCOPE void	TkpCancelWarp(TkDisplay *dispPtr);
 MODULE_SCOPE int	TkListCreateFrame(ClientData clientData,
 			    Tcl_Interp *interp, Tcl_Obj *listObj,
 			    int toplevel, Tcl_Obj *nameObj);
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index 00fb344..93282dc 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.c
@@ -239,8 +239,6 @@ TkCloseDisplay(
 {
     TkClipCleanup(dispPtr);
 
-    TkpCancelWarp(dispPtr);
-
     if (dispPtr->name != NULL) {
 	ckfree(dispPtr->name);
     }
-- 
cgit v0.12


From 7f9a1328482227ad2462a296bb956c68df2cb2e1 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 2 Jun 2020 09:50:22 +0000
Subject: Fix two (minor) warnings, discovered with gcc-10, using Tcl 9
 headers) .

---
 generic/tkCanvText.c   | 2 +-
 generic/ttk/ttkEntry.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/generic/tkCanvText.c b/generic/tkCanvText.c
index 1c8bc04..a1b2358 100644
--- a/generic/tkCanvText.c
+++ b/generic/tkCanvText.c
@@ -960,7 +960,7 @@ DisplayCanvText(
      * anti-aliasing colors would blend together.
      */
 
-    if ((selFirstChar >= 0) && (textPtr->selTextGC != textPtr->gc)) {
+    if ((selFirstChar != TCL_INDEX_NONE) && (textPtr->selTextGC != textPtr->gc)) {
 	if (0 < selFirstChar) {
 	    TkDrawAngledTextLayout(display, drawable, textPtr->gc,
 		    textPtr->textLayout, drawableX, drawableY, textPtr->angle,
diff --git a/generic/ttk/ttkEntry.c b/generic/ttk/ttkEntry.c
index e07617c..cbc3b3f 100644
--- a/generic/ttk/ttkEntry.c
+++ b/generic/ttk/ttkEntry.c
@@ -1312,7 +1312,7 @@ static void EntryDisplay(void *clientData, Drawable d)
 	}
 	/* Use placeholder text width */
 	leftIndex = 0;
-	TkGetStringFromObj(entryPtr->entry.placeholderObj, &rightIndex);
+	(void)TkGetStringFromObj(entryPtr->entry.placeholderObj, &rightIndex);
     } else {
 	foregroundObj = es.foregroundObj;
     }
-- 
cgit v0.12


From f0b89aefda27ec85cef23db0ada5b6e292844a1b Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Tue, 2 Jun 2020 20:48:00 +0000
Subject: Rename DoWarp to DoWarWrtScreen, add function DoWarpWrtWin to
 factorize the code a bit.

---
 generic/tkBind.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++----
 generic/tkGrab.c | 32 ++------------------------------
 generic/tkInt.h  |  1 +
 tests/bind.test  |  4 ++--
 4 files changed, 55 insertions(+), 36 deletions(-)

diff --git a/generic/tkBind.c b/generic/tkBind.c
index 7fd9e74..6eac1dd 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -717,7 +717,7 @@ static int		NameToWindow(Tcl_Interp *interp, Tk_Window main,
 			    Tcl_Obj *objPtr, Tk_Window *tkwinPtr);
 static unsigned		ParseEventDescription(Tcl_Interp *interp, const char **eventStringPtr,
 			    TkPattern *patPtr, EventMask *eventMaskPtr);
-static void		DoWarp(TkDisplay *dispPtr);
+static void		DoWarpWrtScreen(TkDisplay *dispPtr);
 static PSList *		GetLookupForEvent(LookupTables* lookupPtr, const Event *eventPtr,
 			    Tcl_Obj *object, int onlyConsiderDetailedEvents);
 static void		ClearLookupTable(LookupTables *lookupTables, ClientData object);
@@ -4376,7 +4376,7 @@ HandleEventGenerate(
              */
 
             if (!dispPtr->warpWindow) {
-		DoWarp(dispPtr);
+		DoWarpWrtScreen(dispPtr);
             }
 	}
 
@@ -4461,7 +4461,7 @@ NameToWindow(
 /*
  *-------------------------------------------------------------------------
  *
- * DoWarp --
+ * DoWarpWrtScreen --
  *
  *	Perform warping of mouse pointer with respect to the whole screen.
  *
@@ -4475,7 +4475,7 @@ NameToWindow(
  */
 
 static void
-DoWarp(
+DoWarpWrtScreen(
     TkDisplay *dispPtr)
 {
     assert(dispPtr);
@@ -4494,6 +4494,52 @@ DoWarp(
 /*
  *-------------------------------------------------------------------------
  *
+ * DoWarpWrtWin --
+ *
+ *	Perform warping of mouse pointer with respect to a window.
+ *
+ * Results:
+ *	None
+ *
+ * Side effects:
+ *	Mouse pointer moves to a new location.
+ *
+ *-------------------------------------------------------------------------
+ */
+
+void
+DoWarpWrtWin(
+    TkDisplay *dispPtr)
+{
+    assert(dispPtr);
+
+    /*
+     * A NULL warpWindow means warping with respect to the whole screen.
+     * We want to warp here only if we're warping with respect to a window.
+     */
+
+    if (dispPtr->warpWindow) {
+
+        /*
+         * Warping with respect to a window can only be done if the window is
+         * mapped. This was checked in HandleEvent. The window needs to be
+         * still mapped at the time the present code is executed. Also
+         * one needs to guard against window destruction in the meantime,
+         * which could have happened as a side effect of an event handler.
+         */
+
+        if (Tk_IsMapped(dispPtr->warpWindow) && Tk_WindowId(dispPtr->warpWindow) != None) {
+            TkpWarpPointer(dispPtr);
+            XForceScreenSaver(dispPtr->display, ScreenSaverReset);
+        }
+        Tcl_Release(dispPtr->warpWindow);
+        dispPtr->warpWindow = NULL;
+    }
+}
+
+/*
+ *-------------------------------------------------------------------------
+ *
  * GetVirtualEventUid --
  *
  *	Determine if the given string is in the proper format for a virtual
diff --git a/generic/tkGrab.c b/generic/tkGrab.c
index c923608..711bcad 100644
--- a/generic/tkGrab.c
+++ b/generic/tkGrab.c
@@ -775,28 +775,7 @@ TkPointerEvent(
     }
 
     if ((eventPtr->type == MotionNotify) && !appGrabbed) {
-
-        /*
-         * A NULL warpWindow means warping with respect to the whole screen.
-         * We want to warp here only if we're warping with respect to a window.
-         */
-
-        if (dispPtr->warpWindow) {
-
-            /*
-             * Warping with respect to a window can only be done if the window is
-             * mapped. This was checked in HandleEvent. The windows needs to be
-             * still mapped at the time the present code is executed. Also
-             * one needs to guard against window destruction in the meantime.
-             */
-
-            if (Tk_IsMapped(dispPtr->warpWindow) && Tk_WindowId(dispPtr->warpWindow) != None) {
-                TkpWarpPointer(dispPtr);
-                XForceScreenSaver(dispPtr->display, ScreenSaverReset);
-            }
-	    Tcl_Release(dispPtr->warpWindow);
-	    dispPtr->warpWindow = NULL;
-        }
+        DoWarpWrtWin(dispPtr);
     }
         
     if (!appGrabbed) {
@@ -825,14 +804,7 @@ TkPointerEvent(
 	    Tk_QueueWindowEvent(eventPtr, TCL_QUEUE_HEAD);
 	    return 0;
 	}
-        if (dispPtr->warpWindow) {
-            if (Tk_IsMapped(dispPtr->warpWindow) && Tk_WindowId(dispPtr->warpWindow) != None) {
-                TkpWarpPointer(dispPtr);
-                XForceScreenSaver(dispPtr->display, ScreenSaverReset);
-            }
-	    Tcl_Release(dispPtr->warpWindow);
-	    dispPtr->warpWindow = NULL;
-        }
+        DoWarpWrtWin(dispPtr);
 	return 1;
     }
 
diff --git a/generic/tkInt.h b/generic/tkInt.h
index cc710d6..5dd1454 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -1247,6 +1247,7 @@ MODULE_SCOPE int	TkInitTkCmd(Tcl_Interp *interp,
 			    ClientData clientData);
 MODULE_SCOPE int	TkInitFontchooser(Tcl_Interp *interp,
 			    ClientData clientData);
+MODULE_SCOPE void	DoWarpWrtWin(TkDisplay *dispPtr);
 MODULE_SCOPE void	TkpWarpPointer(TkDisplay *dispPtr);
 MODULE_SCOPE int	TkListCreateFrame(ClientData clientData,
 			    Tcl_Interp *interp, Tcl_Obj *listObj,
diff --git a/tests/bind.test b/tests/bind.test
index c677109..b9dab48 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -6136,9 +6136,9 @@ test bind-31.7 {virtual event user_data field - unshared, asynch} -setup {
     destroy .t.f
 } -result {{} {} {TestUserData >b<}}
 
-test bind-32.1 {-warp, window was destroyed before the idle callback DoWarp} -setup {
+test bind-32.1 {-warp, window was destroyed before the idle callback DoWarpWrtScreen} -setup {
     # note: this test is now essentially useless
-    #       since DoWarp no longer is an idle callback
+    #       since DoWarpWrtScreen no longer is an idle callback
     frame .t.f
     pack .t.f
     focus -force .t.f
-- 
cgit v0.12


From d3c2fbd34a2b6d1541f4b904ecf3d6fac896e9d7 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Tue, 2 Jun 2020 21:11:28 +0000
Subject: Remove function DoWarpWrtScreen which was called from only one place,
 and add comments.

---
 generic/tkBind.c | 41 +++--------------------------------------
 generic/tkGrab.c | 20 ++++++++++++++++++++
 tests/bind.test  |  4 ++--
 3 files changed, 25 insertions(+), 40 deletions(-)

diff --git a/generic/tkBind.c b/generic/tkBind.c
index 6eac1dd..64bfff2 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -717,7 +717,6 @@ static int		NameToWindow(Tcl_Interp *interp, Tk_Window main,
 			    Tcl_Obj *objPtr, Tk_Window *tkwinPtr);
 static unsigned		ParseEventDescription(Tcl_Interp *interp, const char **eventStringPtr,
 			    TkPattern *patPtr, EventMask *eventMaskPtr);
-static void		DoWarpWrtScreen(TkDisplay *dispPtr);
 static PSList *		GetLookupForEvent(LookupTables* lookupPtr, const Event *eventPtr,
 			    Tcl_Obj *object, int onlyConsiderDetailedEvents);
 static void		ClearLookupTable(LookupTables *lookupTables, ClientData object);
@@ -4370,13 +4369,12 @@ HandleEventGenerate(
              * This allows to make grabs and warping work together robustly, that
              * is without depending on a precise sequence of events.
              * Warping with respect to the whole screen (i.e. dispPtr->warpWindow
-             * is NULL) is run as an idle task because the event handlers are not
-             * designed to work without a window (and there is anyway no point in
-             * making this case sleep with grabs).
+             * is NULL) is run directly here.
              */
 
             if (!dispPtr->warpWindow) {
-		DoWarpWrtScreen(dispPtr);
+                TkpWarpPointer(dispPtr);
+                XForceScreenSaver(dispPtr->display, ScreenSaverReset);
             }
 	}
 
@@ -4461,39 +4459,6 @@ NameToWindow(
 /*
  *-------------------------------------------------------------------------
  *
- * DoWarpWrtScreen --
- *
- *	Perform warping of mouse pointer with respect to the whole screen.
- *
- * Results:
- *	None
- *
- * Side effects:
- *	Mouse pointer moves to a new location.
- *
- *-------------------------------------------------------------------------
- */
-
-static void
-DoWarpWrtScreen(
-    TkDisplay *dispPtr)
-{
-    assert(dispPtr);
-
-    /*
-     * A non-NULL warpWindow means warping with respect to this window.
-     * We can only be here if we're warping with respect to the whole screen.
-     */
-
-    assert(!dispPtr->warpWindow);
-
-    TkpWarpPointer(dispPtr);
-    XForceScreenSaver(dispPtr->display, ScreenSaverReset);
-}
-
-/*
- *-------------------------------------------------------------------------
- *
  * DoWarpWrtWin --
  *
  *	Perform warping of mouse pointer with respect to a window.
diff --git a/generic/tkGrab.c b/generic/tkGrab.c
index 711bcad..a977ed8 100644
--- a/generic/tkGrab.c
+++ b/generic/tkGrab.c
@@ -667,6 +667,9 @@ ReleaseButtonGrab(
  *	This function is called for each pointer-related event, before the
  *	event has been processed. It does various things to make grabs work
  *	correctly.
+ *	Also, this function takes care of warping the mouse pointer with
+ *	respect to a given window, both when there is a grab in effect and
+ *	when there is none.
  *
  * Results:
  *	If the return value is 1 it means the event should be processed (event
@@ -678,6 +681,7 @@ ReleaseButtonGrab(
  *	Grab state information may be updated. New events may also be pushed
  *	back onto the event queue to replace or augment the one passed in
  *	here.
+ *	The mouse pointer may be moved.
  *
  *----------------------------------------------------------------------
  */
@@ -775,6 +779,12 @@ TkPointerEvent(
     }
 
     if ((eventPtr->type == MotionNotify) && !appGrabbed) {
+
+        /*
+         * Warp the mouse pointer with respect to window dispPtr->warpWindow
+         * if such a window was set in HandleEventGenerate.
+         */
+
         DoWarpWrtWin(dispPtr);
     }
         
@@ -782,6 +792,10 @@ TkPointerEvent(
 	return 1;
     }
 
+    /*
+     * From this point on, there is a grab in effect.
+     */
+
     if (eventPtr->type == MotionNotify) {
 	/*
 	 * When grabs are active, X reports motion events relative to the
@@ -804,6 +818,12 @@ TkPointerEvent(
 	    Tk_QueueWindowEvent(eventPtr, TCL_QUEUE_HEAD);
 	    return 0;
 	}
+
+        /*
+         * Warp the mouse pointer with respect to window dispPtr->warpWindow
+         * if such a window was set in HandleEventGenerate.
+         */
+
         DoWarpWrtWin(dispPtr);
 	return 1;
     }
diff --git a/tests/bind.test b/tests/bind.test
index b9dab48..70161f0 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -6136,9 +6136,9 @@ test bind-31.7 {virtual event user_data field - unshared, asynch} -setup {
     destroy .t.f
 } -result {{} {} {TestUserData >b<}}
 
-test bind-32.1 {-warp, window was destroyed before the idle callback DoWarpWrtScreen} -setup {
+test bind-32.1 {-warp, window was destroyed before the idle callback DoWarp} -setup {
     # note: this test is now essentially useless
-    #       since DoWarpWrtScreen no longer is an idle callback
+    #       since DoWarp no longer exist, not even as an idle callback
     frame .t.f
     pack .t.f
     focus -force .t.f
-- 
cgit v0.12


From d45f5ead66cf0fcf7b2f562cd1937b910cc31285 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Tue, 2 Jun 2020 21:16:42 +0000
Subject: Rename DoWarpWrtWin --> TkDoWarpWrtWin

---
 generic/tkBind.c | 4 ++--
 generic/tkGrab.c | 4 ++--
 generic/tkInt.h  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/generic/tkBind.c b/generic/tkBind.c
index 64bfff2..992d881 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -4459,7 +4459,7 @@ NameToWindow(
 /*
  *-------------------------------------------------------------------------
  *
- * DoWarpWrtWin --
+ * TkDoWarpWrtWin --
  *
  *	Perform warping of mouse pointer with respect to a window.
  *
@@ -4473,7 +4473,7 @@ NameToWindow(
  */
 
 void
-DoWarpWrtWin(
+TkDoWarpWrtWin(
     TkDisplay *dispPtr)
 {
     assert(dispPtr);
diff --git a/generic/tkGrab.c b/generic/tkGrab.c
index a977ed8..8f09f50 100644
--- a/generic/tkGrab.c
+++ b/generic/tkGrab.c
@@ -785,7 +785,7 @@ TkPointerEvent(
          * if such a window was set in HandleEventGenerate.
          */
 
-        DoWarpWrtWin(dispPtr);
+        TkDoWarpWrtWin(dispPtr);
     }
         
     if (!appGrabbed) {
@@ -824,7 +824,7 @@ TkPointerEvent(
          * if such a window was set in HandleEventGenerate.
          */
 
-        DoWarpWrtWin(dispPtr);
+        TkDoWarpWrtWin(dispPtr);
 	return 1;
     }
 
diff --git a/generic/tkInt.h b/generic/tkInt.h
index 5dd1454..f5ec1f6 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -1247,7 +1247,7 @@ MODULE_SCOPE int	TkInitTkCmd(Tcl_Interp *interp,
 			    ClientData clientData);
 MODULE_SCOPE int	TkInitFontchooser(Tcl_Interp *interp,
 			    ClientData clientData);
-MODULE_SCOPE void	DoWarpWrtWin(TkDisplay *dispPtr);
+MODULE_SCOPE void	TkDoWarpWrtWin(TkDisplay *dispPtr);
 MODULE_SCOPE void	TkpWarpPointer(TkDisplay *dispPtr);
 MODULE_SCOPE int	TkListCreateFrame(ClientData clientData,
 			    Tcl_Interp *interp, Tcl_Obj *listObj,
-- 
cgit v0.12


From 09befbb4eac44f8ad13d3d5cf4250cbfc926039a Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Tue, 2 Jun 2020 21:33:53 +0000
Subject: Fix error (with no consequences) in test bind-34.1

---
 tests/bind.test | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/bind.test b/tests/bind.test
index a001580..e62ce8d 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -6637,13 +6637,13 @@ test bind-34.1 {-warp works relatively to a window} -setup {
     event generate .top <Motion> -x 20 -y 20 -warp 1
     update idletasks ; # DoWarp is an idle callback
     after 50         ; # Win specific - wait for SendInput to be executed
-    set pointerPos1 [winfo pointerxy .t]
+    set pointerPos1 [winfo pointerxy .top]
     wm geometry .top +600+600
     update
     event generate .top <Motion> -x 20 -y 20 -warp 1
     update idletasks ; # DoWarp is an idle callback
     after 50         ; # Win specific - wait for SendInput to be executed
-    set pointerPos2 [winfo pointerxy .t]
+    set pointerPos2 [winfo pointerxy .top]
     # from the first warped position to the second one, the mouse
     # pointer should have moved the same amount as the window moved
     set res 1
-- 
cgit v0.12


From d4d3034d257d3c52965a56c421faaaade35f1242 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Tue, 2 Jun 2020 21:39:28 +0000
Subject: Make test bind-34.1 pass on Debian 10 with KDE/Plasma.

---
 tests/bind.test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/bind.test b/tests/bind.test
index e62ce8d..e68368a 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -6627,6 +6627,7 @@ test bind-33.15 {prefer last in case of homogeneous equal patterns} -setup {
 
 test bind-34.1 {-warp works relatively to a window} -setup {
     toplevel .top
+    update
 } -body {
     # In order to avoid platform-dependent coordinate results due to
     # decorations and borders, this test warps the pointer twice 
-- 
cgit v0.12


From c0f2471d203026409e33969ccdb40cf06ff0f99c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 2 Jun 2020 21:51:23 +0000
Subject: size_t for Tk_ItemDCharsProc(), with Tcl 9 headers

---
 generic/tk.h         | 41 +++++++++++++++++++----------------------
 generic/tkCanvLine.c | 12 ++++++------
 generic/tkCanvPoly.c | 16 ++++++++--------
 generic/tkCanvText.c | 24 ++++++++++++------------
 generic/tkText.c     | 49 +++++++++++++++++++++++++------------------------
 5 files changed, 70 insertions(+), 72 deletions(-)

diff --git a/generic/tk.h b/generic/tk.h
index 5efd2cb..90d4115 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -1047,13 +1047,17 @@ typedef struct Tk_Item {
  * lines, circles, etc.) that can form part of a canvas widget.
  */
 
-#ifdef USE_OLD_CANVAS
+#if defined(USE_OLD_CANVAS) && TCL_MAJOR_VERSION < 9
 typedef int	(Tk_ItemCreateProc)(Tcl_Interp *interp, Tk_Canvas canvas,
 		    Tk_Item *itemPtr, int argc, char **argv);
 typedef int	(Tk_ItemConfigureProc)(Tcl_Interp *interp, Tk_Canvas canvas,
 		    Tk_Item *itemPtr, int argc, char **argv, int flags);
 typedef int	(Tk_ItemCoordProc)(Tcl_Interp *interp, Tk_Canvas canvas,
 		    Tk_Item *itemPtr, int argc, char **argv);
+typedef void	(Tk_ItemInsertProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
+		    int beforeThis, char *string);
+typedef int	(Tk_ItemIndexProc)(Tcl_Interp *interp, Tk_Canvas canvas,
+		    Tk_Item *itemPtr, char *indexString, int *indexPtr);
 #else
 typedef int	(Tk_ItemCreateProc)(Tcl_Interp *interp, Tk_Canvas canvas,
 		    Tk_Item *itemPtr, int argc, Tcl_Obj *const objv[]);
@@ -1062,6 +1066,17 @@ typedef int	(Tk_ItemConfigureProc)(Tcl_Interp *interp, Tk_Canvas canvas,
 		    int flags);
 typedef int	(Tk_ItemCoordProc)(Tcl_Interp *interp, Tk_Canvas canvas,
 		    Tk_Item *itemPtr, int argc, Tcl_Obj *const argv[]);
+#if TCL_MAJOR_VERSION > 8
+typedef void	(Tk_ItemInsertProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
+		    size_t beforeThis, Tcl_Obj *string);
+typedef int	(Tk_ItemIndexProc)(Tcl_Interp *interp, Tk_Canvas canvas,
+		    Tk_Item *itemPtr, Tcl_Obj *indexString, size_t *indexPtr);
+#else
+typedef void	(Tk_ItemInsertProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
+		    int beforeThis, Tcl_Obj *string);
+typedef int	(Tk_ItemIndexProc)(Tcl_Interp *interp, Tk_Canvas canvas,
+		    Tk_Item *itemPtr, Tcl_Obj *indexString, int *indexPtr);
+#endif
 #endif /* USE_OLD_CANVAS */
 typedef void	(Tk_ItemDeleteProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
 		    Display *display);
@@ -1081,39 +1096,21 @@ typedef void	(Tk_ItemScaleProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
 		    double scaleY);
 typedef void	(Tk_ItemTranslateProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
 		    double deltaX, double deltaY);
-#ifdef USE_OLD_CANVAS
-typedef int	(Tk_ItemIndexProc)(Tcl_Interp *interp, Tk_Canvas canvas,
-		    Tk_Item *itemPtr, char *indexString, int *indexPtr);
-#elif TCL_MAJOR_VERSION > 8
-typedef int	(Tk_ItemIndexProc)(Tcl_Interp *interp, Tk_Canvas canvas,
-		    Tk_Item *itemPtr, Tcl_Obj *indexString, size_t *indexPtr);
-#else
-typedef int	(Tk_ItemIndexProc)(Tcl_Interp *interp, Tk_Canvas canvas,
-		    Tk_Item *itemPtr, Tcl_Obj *indexString, int *indexPtr);
-#endif /* USE_OLD_CANVAS */
 #if TCL_MAJOR_VERSION > 8
 typedef void	(Tk_ItemCursorProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
 		    size_t index);
 typedef size_t	(Tk_ItemSelectionProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
 		    size_t offset, char *buffer, size_t maxBytes);
+typedef void	(Tk_ItemDCharsProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
+		    size_t first, size_t last);
 #else
 typedef void	(Tk_ItemCursorProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
 		    int index);
 typedef int	(Tk_ItemSelectionProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
 		    int offset, char *buffer, int maxBytes);
-#endif
-#ifdef USE_OLD_CANVAS
-typedef void	(Tk_ItemInsertProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
-		    int beforeThis, char *string);
-#elif TCL_MAJOR_VERSION > 8
-typedef void	(Tk_ItemInsertProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
-		    size_t beforeThis, Tcl_Obj *string);
-#else
-typedef void	(Tk_ItemInsertProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
-		    int beforeThis, Tcl_Obj *string);
-#endif /* USE_OLD_CANVAS */
 typedef void	(Tk_ItemDCharsProc)(Tk_Canvas canvas, Tk_Item *itemPtr,
 		    int first, int last);
+#endif
 
 #ifndef __NO_OLD_CONFIG
 
diff --git a/generic/tkCanvLine.c b/generic/tkCanvLine.c
index 484f41c..88ddc97 100644
--- a/generic/tkCanvLine.c
+++ b/generic/tkCanvLine.c
@@ -97,7 +97,7 @@ static int		LineCoords(Tcl_Interp *interp,
 			    Tk_Canvas canvas, Tk_Item *itemPtr,
 			    int objc, Tcl_Obj *const objv[]);
 static void		LineDeleteCoords(Tk_Canvas canvas,
-			    Tk_Item *itemPtr, int first, int last);
+			    Tk_Item *itemPtr, TkSizeT first, TkSizeT last);
 static void		LineInsert(Tk_Canvas canvas,
 			    Tk_Item *itemPtr, TkSizeT beforeThis, Tcl_Obj *obj);
 static int		LineToArea(Tk_Canvas canvas,
@@ -1153,8 +1153,8 @@ static void
 LineDeleteCoords(
     Tk_Canvas canvas,		/* Canvas containing itemPtr. */
     Tk_Item *itemPtr,		/* Item in which to delete characters. */
-    int first,			/* Index of first character to delete. */
-    int last)			/* Index of last character to delete. */
+    TkSizeT first,			/* Index of first character to delete. */
+    TkSizeT last)			/* Index of last character to delete. */
 {
     LineItem *linePtr = (LineItem *) itemPtr;
     int count, i, first1, last1;
@@ -1169,13 +1169,13 @@ LineDeleteCoords(
     first &= -2;
     last &= -2;
 
-    if (first < 0) {
+    if ((int)first < 0) {
 	first = 0;
     }
-    if (last >= length) {
+    if ((int)last >= length) {
 	last = length-2;
     }
-    if (first > last) {
+    if ((int)first > (int)last) {
 	return;
     }
     if (linePtr->firstArrowPtr != NULL) {
diff --git a/generic/tkCanvPoly.c b/generic/tkCanvPoly.c
index f4f0163..88f63e8 100644
--- a/generic/tkCanvPoly.c
+++ b/generic/tkCanvPoly.c
@@ -168,7 +168,7 @@ static int		PolygonCoords(Tcl_Interp *interp,
 			    Tk_Canvas canvas, Tk_Item *itemPtr,
 			    int objc, Tcl_Obj *const objv[]);
 static void		PolygonDeleteCoords(Tk_Canvas canvas,
-			    Tk_Item *itemPtr, int first, int last);
+			    Tk_Item *itemPtr, TkSizeT first, TkSizeT last);
 static void		PolygonInsert(Tk_Canvas canvas,
 			    Tk_Item *itemPtr, TkSizeT beforeThis, Tcl_Obj *obj);
 static int		PolygonToArea(Tk_Canvas canvas,
@@ -1172,23 +1172,23 @@ static void
 PolygonDeleteCoords(
     Tk_Canvas canvas,		/* Canvas containing itemPtr. */
     Tk_Item *itemPtr,		/* Item in which to delete characters. */
-    int first,			/* Index of first character to delete. */
-    int last)			/* Index of last character to delete. */
+    TkSizeT first,			/* Index of first character to delete. */
+    TkSizeT last)			/* Index of last character to delete. */
 {
     PolygonItem *polyPtr = (PolygonItem *) itemPtr;
     int count, i;
     int length = 2*(polyPtr->numPoints - polyPtr->autoClosed);
 
-    while (first >= length) {
+    while ((int)first >= length) {
 	first -= length;
     }
-    while (first < 0) {
+    while ((int)first < 0) {
 	first += length;
     }
-    while (last >= length) {
+    while ((int)last >= length) {
 	last -= length;
     }
-    while (last < 0) {
+    while ((int)last < 0) {
 	last += length;
     }
 
@@ -1215,7 +1215,7 @@ PolygonDeleteCoords(
 	    polyPtr->coordPtr[i-count] = polyPtr->coordPtr[i];
 	}
     } else {
-	for (i=last; i<=first; i++) {
+	for (i=last; i<=(int)first; i++) {
 	    polyPtr->coordPtr[i-last] = polyPtr->coordPtr[i];
 	}
     }
diff --git a/generic/tkCanvText.c b/generic/tkCanvText.c
index a1b2358..304e009 100644
--- a/generic/tkCanvText.c
+++ b/generic/tkCanvText.c
@@ -161,7 +161,7 @@ static int		TextCoords(Tcl_Interp *interp,
 			    Tk_Canvas canvas, Tk_Item *itemPtr,
 			    int argc, Tcl_Obj *const objv[]);
 static void		TextDeleteChars(Tk_Canvas canvas,
-			    Tk_Item *itemPtr, int first, int last);
+			    Tk_Item *itemPtr, TkSizeT first, TkSizeT last);
 static void		TextInsert(Tk_Canvas canvas,
 			    Tk_Item *itemPtr, TkSizeT beforeThis, Tcl_Obj *obj);
 static int		TextToArea(Tk_Canvas canvas,
@@ -1091,9 +1091,9 @@ static void
 TextDeleteChars(
     Tk_Canvas canvas,		/* Canvas containing itemPtr. */
     Tk_Item *itemPtr,		/* Item in which to delete characters. */
-    int first,			/* Character index of first character to
+    TkSizeT first,			/* Character index of first character to
 				 * delete. */
-    int last)			/* Character index of last character to delete
+    TkSizeT last)			/* Character index of last character to delete
 				 * (inclusive). */
 {
     TextItem *textPtr = (TextItem *) itemPtr;
@@ -1102,13 +1102,13 @@ TextDeleteChars(
     Tk_CanvasTextInfo *textInfoPtr = textPtr->textInfoPtr;
 
     text = textPtr->text;
-    if (first < 0) {
+    if ((int)first < 0) {
 	first = 0;
     }
-    if (last >= (int)textPtr->numChars) {
+    if (last + 1 >= textPtr->numChars + 1) {
 	last = textPtr->numChars - 1;
     }
-    if (first > last) {
+    if (first + 1 > last + 1) {
 	return;
     }
     charsRemoved = last + 1 - first;
@@ -1132,15 +1132,15 @@ TextDeleteChars(
      */
 
     if (textInfoPtr->selItemPtr == itemPtr) {
-	if (textInfoPtr->selectFirst + 1 > (TkSizeT)first + 1) {
+	if (textInfoPtr->selectFirst + 1 > first + 1) {
 	    textInfoPtr->selectFirst -= charsRemoved;
 	    if ((int)textInfoPtr->selectFirst + 1 < (int)first + 1) {
 		textInfoPtr->selectFirst = first;
 	    }
 	}
-	if (textInfoPtr->selectLast + 1 >= (TkSizeT)first + 1) {
+	if (textInfoPtr->selectLast + 1 >= first + 1) {
 	    textInfoPtr->selectLast -= charsRemoved;
-	    if (textInfoPtr->selectLast + 1 < (TkSizeT)first) {
+	    if (textInfoPtr->selectLast + 1 < first) {
 		textInfoPtr->selectLast = first - 1;
 	    }
 	}
@@ -1148,14 +1148,14 @@ TextDeleteChars(
 	    textInfoPtr->selItemPtr = NULL;
 	}
 	if ((textInfoPtr->anchorItemPtr == itemPtr)
-		&& (textInfoPtr->selectAnchor + 1 > (TkSizeT)first + 1)) {
+		&& (textInfoPtr->selectAnchor + 1 > first + 1)) {
 	    textInfoPtr->selectAnchor -= charsRemoved;
-	    if (textInfoPtr->selectAnchor + 1 < (TkSizeT)first + 1) {
+	    if (textInfoPtr->selectAnchor + 1 < first + 1) {
 		textInfoPtr->selectAnchor = first;
 	    }
 	}
     }
-    if (textPtr->insertPos + 1 > (TkSizeT)first + 1) {
+    if (textPtr->insertPos + 1 > first + 1) {
 	textPtr->insertPos -= charsRemoved;
 	if ((int)textPtr->insertPos + 1 < (int)first + 1) {
 	    textPtr->insertPos = first;
diff --git a/generic/tkText.c b/generic/tkText.c
index 2f5991b..39be0b7 100644
--- a/generic/tkText.c
+++ b/generic/tkText.c
@@ -279,10 +279,10 @@ typedef ClientData	SearchAddLineProc(int lineNum,
 typedef int		SearchMatchProc(int lineNum,
 			    struct SearchSpec *searchSpecPtr,
 			    ClientData clientData, Tcl_Obj *theLine,
-			    int matchOffset, int matchLength);
+			    TkSizeT matchOffset, TkSizeT matchLength);
 typedef int		SearchLineIndexProc(Tcl_Interp *interp,
 			    Tcl_Obj *objPtr, struct SearchSpec *searchSpecPtr,
-			    int *linePosPtr, int *offsetPosPtr);
+			    int *linePosPtr, TkSizeT *offsetPosPtr);
 
 typedef struct SearchSpec {
     int exact;			/* Whether search is exact or regexp. */
@@ -298,10 +298,10 @@ typedef struct SearchSpec {
     int all;			/* Whether all or the first match should be
 				 * reported. */
     int startLine;		/* First line to examine. */
-    int startOffset;		/* Index in first line to start at. */
+    TkSizeT startOffset1;		/* Index in first line to start at. */
     int stopLine;		/* Last line to examine, or -1 when we search
 				 * all available text. */
-    int stopOffset;		/* Index to stop at, provided stopLine is not
+    TkSizeT stopOffset1;		/* Index to stop at, provided stopLine is not
 				 * -1. */
     int numLines;		/* Total lines which are available. */
     int backwards;		/* Searching forwards or backwards. */
@@ -410,8 +410,8 @@ static void		TextPushUndoAction(TkText *textPtr,
 			    Tcl_Obj *undoString, int insert,
 			    const TkTextIndex *index1Ptr,
 			    const TkTextIndex *index2Ptr);
-static int		TextSearchIndexInLine(const SearchSpec *searchSpecPtr,
-			    TkTextLine *linePtr, int byteIndex);
+static TkSizeT		TextSearchIndexInLine(const SearchSpec *searchSpecPtr,
+			    TkTextLine *linePtr, TkSizeT byteIndex);
 static int		TextPeerCmd(TkText *textPtr, Tcl_Interp *interp,
 			    int objc, Tcl_Obj *const objv[]);
 static TkUndoProc	TextUndoRedoCallback;
@@ -4015,7 +4015,7 @@ TextSearchGetLineIndex(
     Tcl_Obj *objPtr,		/* Contains a textual index like "1.2" */
     SearchSpec *searchSpecPtr,	/* Contains other search parameters. */
     int *linePosPtr,		/* For returning the line number. */
-    int *offsetPosPtr)		/* For returning the text offset in the
+    TkSizeT *offsetPosPtr)		/* For returning the text offset in the
 				 * line. */
 {
     const TkTextIndex *indexPtr;
@@ -4075,35 +4075,36 @@ TextSearchGetLineIndex(
  *----------------------------------------------------------------------
  */
 
-static int
+static TkSizeT
 TextSearchIndexInLine(
     const SearchSpec *searchSpecPtr,
 				/* Search parameters. */
     TkTextLine *linePtr,	/* The line we're looking at. */
-    int byteIndex)		/* Index into the line. */
+    TkSizeT byteIndex)		/* Index into the line. */
 {
     TkTextSegment *segPtr;
     TkTextIndex curIndex;
-    int index, leftToScan;
+    TkSizeT index;
+    int leftToScan;
     TkText *textPtr = (TkText *)searchSpecPtr->clientData;
 
     index = 0;
     curIndex.tree = textPtr->sharedTextPtr->tree;
     curIndex.linePtr = linePtr; curIndex.byteIndex = 0;
     for (segPtr = linePtr->segPtr, leftToScan = byteIndex;
-	    leftToScan > 0;
+	    leftToScan + 1 > 1;
 	    curIndex.byteIndex += segPtr->size, segPtr = segPtr->nextPtr) {
 	if ((segPtr->typePtr == &tkTextCharType) &&
 		(searchSpecPtr->searchElide
 		|| !TkTextIsElided(textPtr, &curIndex, NULL))) {
-	    if (leftToScan < (int)segPtr->size) {
+	    if (leftToScan + 1 < (int)segPtr->size + 1) {
 		if (searchSpecPtr->exact) {
 		    index += leftToScan;
 		} else {
 		    index += Tcl_NumUtfChars(segPtr->body.chars, leftToScan);
 		}
 	    } else if (searchSpecPtr->exact) {
-		index += (int)segPtr->size;
+		index += segPtr->size;
 	    } else {
 		index += Tcl_NumUtfChars(segPtr->body.chars, -1);
 	    }
@@ -4267,9 +4268,9 @@ TextSearchFoundMatch(
     Tcl_Obj *theLine,		/* Text from current line, only accessed for
 				 * exact searches, and is allowed to be NULL
 				 * for regexp searches. */
-    int matchOffset,		/* Offset of found item in utf-8 bytes for
+    TkSizeT matchOffset,		/* Offset of found item in utf-8 bytes for
 				 * exact search, Unicode chars for regexp. */
-    int matchLength)		/* Length also in bytes/chars as per search
+    TkSizeT matchLength)		/* Length also in bytes/chars as per search
 				 * type. */
 {
     TkSizeT numChars;
@@ -4287,7 +4288,7 @@ TextSearchFoundMatch(
 	 */
 
 	if (searchSpecPtr->backwards ^
-		(matchOffset >= searchSpecPtr->stopOffset)) {
+		(matchOffset + 1 >= searchSpecPtr->stopOffset1 + 1)) {
 	    return 0;
 	}
     }
@@ -4312,7 +4313,7 @@ TextSearchFoundMatch(
 
     if (searchSpecPtr->strictLimits && lineNum == searchSpecPtr->stopLine) {
 	if (searchSpecPtr->backwards ^
-		((matchOffset + numChars + 1) > (TkSizeT) searchSpecPtr->stopOffset + 1)) {
+		((matchOffset + numChars + 1) > searchSpecPtr->stopOffset1 + 1)) {
 	    return 0;
 	}
     }
@@ -5663,7 +5664,7 @@ SearchPerform(
 
     if (searchSpecPtr->lineIndexProc(interp, fromPtr, searchSpecPtr,
 	    &searchSpecPtr->startLine,
-	    &searchSpecPtr->startOffset) != TCL_OK) {
+	    &searchSpecPtr->startOffset1) != TCL_OK) {
 	return TCL_ERROR;
     }
 
@@ -5694,7 +5695,7 @@ SearchPerform(
 
 	if (searchSpecPtr->lineIndexProc(interp, toPtr, searchSpecPtr,
 		&searchSpecPtr->stopLine,
-		&searchSpecPtr->stopOffset) != TCL_OK) {
+		&searchSpecPtr->stopOffset1) != TCL_OK) {
 	    return TCL_ERROR;
 	}
     } else {
@@ -5893,7 +5894,7 @@ SearchCore(
 	}
 
 	if (lineNum == searchSpecPtr->stopLine && searchSpecPtr->backwards) {
-	    firstOffset = searchSpecPtr->stopOffset;
+	    firstOffset = searchSpecPtr->stopOffset1;
 	} else {
 	    firstOffset = 0;
 	}
@@ -5927,8 +5928,8 @@ SearchCore(
 		 * Only use the last part of the line.
 		 */
 
-		if (searchSpecPtr->startOffset > firstOffset) {
-		    firstOffset = searchSpecPtr->startOffset;
+		if (searchSpecPtr->startOffset1 + 1 > (TkSizeT)firstOffset + 1) {
+		    firstOffset = searchSpecPtr->startOffset1;
 		}
 		if ((firstOffset >= lastOffset)
 		    && ((lastOffset != 0) || searchSpecPtr->exact)) {
@@ -5939,8 +5940,8 @@ SearchCore(
 		 * Use only the first part of the line.
 		 */
 
-		if (searchSpecPtr->startOffset < lastOffset) {
-		    lastOffset = searchSpecPtr->startOffset;
+		if (searchSpecPtr->startOffset1 + 1 < (TkSizeT)lastOffset + 1) {
+		    lastOffset = searchSpecPtr->startOffset1;
 		}
 	    }
 	}
-- 
cgit v0.12


From 036a7d32a1d9178d587e502932f33a481483c9fa Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Tue, 2 Jun 2020 21:56:14 +0000
Subject: Remove proc waitForGrab from test bind-35.1

---
 tests/bind.test | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/tests/bind.test b/tests/bind.test
index aa91126..d8a6c41 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -6698,44 +6698,27 @@ test bind-34.3 {-warp works with null or negative coordinates} -setup {
 } -cleanup {
 } -result {ok ok ok ok}
 
-test bind-35.1 {pointer warp with grab on master, bug [e3888d5820]} -constraints {
-    testgrab
-} -setup {
-    proc waitForGrab {type grabWin} {
-    # process events while $grabWin is not grabbed ($type == "grabbed"),
-    # or while $grabWin is not released ($type == "released"), but don't
-    # spend more than 5 seconds doing this
-        set i 0
-        while {![testgrab $type $grabWin] && $i < 500} {
-            after 10
-            update
-            incr i
-        }
-    }
+test bind-35.1 {pointer warp with grab on master, bug [e3888d5820]} -setup {
     event generate {} <Motion> -warp 1 -x 50 -y 50
     toplevel .top
     grab release .top
-    waitForGrab released .top
     wm geometry .top 200x200+300+300
     label .top.l -height 5 -width 20 -highlightthickness 2 \
             -highlightbackground black -bg yellow -text "My label"
     pack .top.l -side bottom
     update
 } -body {
-    grab .top  ; # this will queue events
-    waitForGrab grabbed .top
+    grab .top
     event generate .top.l <Motion> -warp 1 -x 10 -y 10
     foreach {x1 y1} [winfo pointerxy .top.l] {}
     event generate {} <Motion> -warp 1 -x 50 -y 50
-    grab release .top  ; # this will queue events
-    waitForGrab released .top
+    grab release .top
     event generate .top.l <Motion> -warp 1 -x 10 -y 10
     foreach {x2 y2} [winfo pointerxy .top.l] {}
     expr {$x1==$x2 && $y1==$y2}
 } -cleanup {
     destroy .top
     unset x1 y1 x2 y2
-    rename waitForGrab {}
 } -result {1}
 
 # cleanup
-- 
cgit v0.12


From 932a73175b6850265b0a9af952dfd667e41b9231 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Tue, 2 Jun 2020 21:59:29 +0000
Subject: Remove now useless command and test constraint testgrab

---
 generic/tkTest.c      | 78 ---------------------------------------------------
 tests/constraints.tcl |  1 -
 2 files changed, 79 deletions(-)

diff --git a/generic/tkTest.c b/generic/tkTest.c
index 1f373ad..a8929b9 100644
--- a/generic/tkTest.c
+++ b/generic/tkTest.c
@@ -206,9 +206,6 @@ static int		TrivialConfigObjCmd(ClientData dummy,
 			    Tcl_Obj * const objv[]);
 static void		TrivialEventProc(ClientData clientData,
 			    XEvent *eventPtr);
-static int		TestgrabObjCmd(ClientData clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
 
 /*
  *----------------------------------------------------------------------
@@ -284,9 +281,6 @@ Tktest_Init(
 	    (ClientData) Tk_MainWindow(interp), NULL);
 #endif /* _WIN32 */
 
-    Tcl_CreateObjCommand(interp, "testgrab", TestgrabObjCmd,
-	    (ClientData) Tk_MainWindow(interp), NULL);
-
     /*
      * Create test image type.
      */
@@ -2084,78 +2078,6 @@ CustomOptionFree(
 }
 
 /*
- *----------------------------------------------------------------------
- *
- * TestgrabObjCmd --
- *
- *	This function implements the "testgrab" command, which is used to test
- *	grabbing of windows.
- *
- *	testgrab grabbed  $win: returns true if $win is currently grabbed
- *	testgrab released $win: returns true if $win is currently not grabbed
- *
- *	This function is useful when one wants to test for a grabbing window
- *	at the moment it is called. [grab current] cannot be used for that
- *	purpose because it returns the window dereferenced by eventualGrabWinPtr
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestgrabObjCmd(
-    ClientData clientData,	/* Main window for application. */
-    Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,			/* Number of arguments. */
-    Tcl_Obj *const objv[])	/* Argument objects. */
-{
-    static const char *const options[] = {"grabbed", "released", NULL};
-    enum option {GRABBED, RELEASED};
-    int index, res = 0;
-    Tk_Window mainWin, tkwin;
-
-    mainWin = (Tk_Window) clientData;
-
-    if (objc < 3) {
-	Tcl_WrongNumArgs(interp, 1, objv, "option window");
-	return TCL_ERROR;
-    }
-
-    if (Tcl_GetIndexFromObjStruct(interp, objv[1], options,
-	    sizeof(char *), "command", 0, &index)!= TCL_OK) {
-	return TCL_ERROR;
-    }
-
-    tkwin = Tk_NameToWindow(interp, Tcl_GetString(objv[2]), mainWin);
-    if (tkwin == NULL) {
-        return TCL_ERROR;
-    }
-    /*printf("TestgrabObjCmd %s, grabWinPtr = %p , tkwin = %p\n", options[index],
-            ((TkWindow *) tkwin)->dispPtr->grabWinPtr, tkwin);fflush(stdout);*/
-
-    switch ((enum option) index) {
-    case GRABBED:
-        if (TkGrabState((TkWindow *) tkwin) != TK_GRAB_NONE) {
-            res = 1;
-        }
-	break;
-    case RELEASED:
-        if (TkGrabState((TkWindow *) tkwin) == TK_GRAB_NONE) {
-            res = 1;
-        }
-	break;
-    }
-
-    Tcl_SetObjResult(interp, Tcl_NewBooleanObj(res));
-    return TCL_OK;
-}
-
-/*
  * Local Variables:
  * mode: c
  * c-basic-offset: 4
diff --git a/tests/constraints.tcl b/tests/constraints.tcl
index 49da142..c77fb00 100644
--- a/tests/constraints.tcl
+++ b/tests/constraints.tcl
@@ -207,7 +207,6 @@ testConstraint testcolor     [llength [info commands testcolor]]
 testConstraint testcursor    [llength [info commands testcursor]]
 testConstraint testembed     [llength [info commands testembed]]
 testConstraint testfont      [llength [info commands testfont]]
-testConstraint testgrab      [llength [info commands testgrab]]
 testConstraint testmakeexist [llength [info commands testmakeexist]]
 testConstraint testmenubar   [llength [info commands testmenubar]]
 testConstraint testmetrics   [llength [info commands testmetrics]]
-- 
cgit v0.12


From 876fc6d65e63ae72fe52d8435ef703efa50fe814 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Wed, 3 Jun 2020 03:23:12 +0000
Subject: Do not draw in the setup proc.  Fix the heartbeat so it can wake up
 Tcl_WaitForEvent.  Handle the first drawing of a window.

---
 macosx/tkMacOSXDraw.c        | 22 ++++++------
 macosx/tkMacOSXNotify.c      | 84 +++++++++++++++++++++++---------------------
 macosx/tkMacOSXWindowEvent.c | 21 ++++++++---
 3 files changed, 71 insertions(+), 56 deletions(-)

diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index 1ec2cfe..6a63449 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -1658,19 +1658,19 @@ TkMacOSXSetupDrawingContext(
 	} else if (dc.clipRgn) {
 
 	    /*
-	     * Drawing can also fail when we are being called from drawRect but
-	     * the clipping region set by drawRect does not contain the clipping
-	     * region of our drawing context.  See bug [2a61eca3a8].
+	     * Drawing will also fail if we are being called from drawRect but
+	     * the clipping rectangle set by drawRect does not contain the
+	     * clipping region of our drawing context.  See bug [2a61eca3a8].
+	     * If we can't draw all of the clipping region of the drawing
+	     * context then we draw whatever we can, but we also add a dirty
+	     * rectangle so the entire widget will get redrawn in the next
+	     * cycle.
 	     */
 
 	    CGRect currentClip = CGContextGetClipBoundingBox(
 				     [NSGraphicsContext currentContext].CGContext);
 	    if (!NSContainsRect(currentClip, clipBounds)) {
 		[view addTkDirtyRect:clipBounds];
-		// XXXX we should be able to skip drawing but sometimes the clipBounds
-		// are wrong.
-		//canDraw = false;
-		//goto end;		      
 	    }
 	}
 
@@ -1715,10 +1715,10 @@ TkMacOSXSetupDrawingContext(
 	    CGRect r;
 
 	    if (!HIShapeIsRectangular(dc.clipRgn) || !CGRectContainsRect(
-		    *HIShapeGetBounds(dc.clipRgn, &r),
-		    CGRectApplyAffineTransform(clipBounds, t))) {
-		ChkErr(HIShapeReplacePathInCGContext, dc.clipRgn, dc.context);
-		CGContextEOClip(dc.context);
+		*HIShapeGetBounds(dc.clipRgn, &r),
+		CGRectApplyAffineTransform(clipBounds, t))) {
+	    	ChkErr(HIShapeReplacePathInCGContext, dc.clipRgn, dc.context);
+	    	CGContextEOClip(dc.context);
 	    }
 	}
 	if (gc) {
diff --git a/macosx/tkMacOSXNotify.c b/macosx/tkMacOSXNotify.c
index 7de6bec..8bf5e66 100644
--- a/macosx/tkMacOSXNotify.c
+++ b/macosx/tkMacOSXNotify.c
@@ -398,12 +398,24 @@ TkMacOSXDrawAllViews(
  *----------------------------------------------------------------------
  */
 
+#define TICK 100
+static Tcl_TimerToken ticker = NULL;
+
+static void
+Heartbeat(
+    ClientData clientData)
+{
+
+    if (ticker) {
+	ticker = Tcl_CreateTimerHandler(TICK, Heartbeat, NULL);
+    }
+}
+
 static void
 TkMacOSXEventsSetupProc(
     ClientData clientData,
     int flags)
 {
-    static Bool havePeriodicEvents = NO;
     NSString *runloopMode = [[NSRunLoop currentRunLoop] currentMode];
 
     /*
@@ -412,6 +424,7 @@ TkMacOSXEventsSetupProc(
 
     if (flags & TCL_WINDOW_EVENTS && !runloopMode) {
 	static const Tcl_Time zeroBlockTime = { 0, 0 };
+
 	[NSApp _resetAutoreleasePool];
 
  	/*
@@ -427,26 +440,21 @@ TkMacOSXEventsSetupProc(
 			untilDate:[NSDate distantPast]
 			inMode:GetRunLoopMode(TkMacOSXGetModalSession())
 			dequeue:NO];
-	if (currentEvent) {
-	    if (currentEvent.type > 0) {
+	if (currentEvent && currentEvent.type > 0) {
 		Tcl_SetMaxBlockTime(&zeroBlockTime);
-		[NSEvent stopPeriodicEvents];
-		havePeriodicEvents = NO;
-	    }
-	} else if (!havePeriodicEvents){
-
-	    /*
-	     * When the user is not generating events we schedule a "heartbeat"
-	     * event to fire every 0.1 seconds.  This helps to make the vwait
-	     * command more responsive when there is no user input, e.g. when
-	     * running the test suite.
-	     */
-
-	    havePeriodicEvents = YES;
-	    [NSEvent startPeriodicEventsAfterDelay:0.0 withPeriod:0.1];
-	}
-	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {};
-	TkMacOSXDrawAllViews(NULL);
+		Tcl_DeleteTimerHandler(ticker);
+		ticker = NULL;
+	} else if (ticker == NULL) {
+
+    	     	/*
+    	     	 * When the user is not generating events we schedule a "heartbeat"
+    	     	 * TimerHandler to fire every 200 milliseconds.  The handler does
+		 * nothing, but when its timer fires TclWaitForEvent will return,
+		 * causing TkMacOSXCheckProc to be called.
+    	     	 */
+
+	    ticker = Tcl_CreateTimerHandler(TICK, Heartbeat, NULL);
+    	}
     }
 }
 
@@ -543,28 +551,24 @@ TkMacOSXEventsCheckProc(
 	 */
 
 	[NSApp _unlockAutoreleasePool];
-	if (eventsFound == 0) {
 
-	    /*
-	     * We found no events for Tcl in this iteration of the Tcl event
-	     * loop, so it should proceed to servicing idle tasks.  We add an
-	     * idle task to the end of the idle queue which will redisplay all
-	     * of our dirty windows.  We want this to happen after all other
-	     * idle tasks have run so that all widgets will be configured
-	     * before they are displayed.  The drawRect method "borrows" the
-	     * idle queue while drawing views. That is, it sends expose events
-	     * which cause display procs to be posted as idle tasks and then
-	     * runs an inner event loop to processes those idle tasks.  We are
-	     * trying to arrange for the idle queue to be empty when it starts
-	     * that process and empty when it finishes.
-	     */
+	/*
+	 * Add an idle task to the end of the idle queue which will redisplay
+	 * all of our dirty windows.  We want this to happen after all other
+	 * idle tasks have run so that all widgets will be configured before
+	 * they are displayed.  The drawRect method "borrows" the idle queue
+	 * while drawing views. That is, it sends expose events which cause
+	 * display procs to be posted as idle tasks and then runs an inner
+	 * event loop to processes those idle tasks.  We are trying to arrange
+	 * for the idle queue to be empty when it starts that process and empty
+	 * when it finishes.
+	 */
 
-	    int dirtyCount = 0;
-	    TkMacOSXDrawAllViews(&dirtyCount);
-	    if (dirtyCount > 0) {
-		Tcl_CancelIdleCall(TkMacOSXDrawAllViews, NULL);
-		Tcl_DoWhenIdle(TkMacOSXDrawAllViews, NULL);
-	    	}
+	int dirtyCount = 0;
+	TkMacOSXDrawAllViews(&dirtyCount);
+	if (dirtyCount > 0) {
+	    Tcl_CancelIdleCall(TkMacOSXDrawAllViews, NULL);
+	    Tcl_DoWhenIdle(TkMacOSXDrawAllViews, NULL);
 	}
     }
 }
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 0f58c70..d052005 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -38,6 +38,8 @@ static void		DoWindowActivate(ClientData clientData);
 
 #pragma mark TKApplication(TKWindowEvent)
 
+extern NSString *NSWindowDidOrderOnScreenNotification;
+
 #ifdef TK_MAC_DEBUG_NOTIFICATIONS
 extern NSString *NSWindowWillOrderOnScreenNotification;
 extern NSString *NSWindowDidOrderOnScreenNotification;
@@ -208,6 +210,18 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
     return (winPtr ? NO : YES);
 }
 
+- (void) windowBecameVisible: (NSNotification *) notification
+{
+    NSWindow *window = [notification object];
+    TkWindow *winPtr = TkMacOSXGetTkWindow(window);
+    if (winPtr) {
+	TKContentView *view = [window contentView];
+	while(Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {};
+	[view setTkDirtyRect:[view bounds]];
+	TkMacOSXDrawAllViews(NULL);
+    }
+}
+
 #ifdef TK_MAC_DEBUG_NOTIFICATIONS
 
 - (void) windowDragStart: (NSNotification *) notification
@@ -227,16 +241,12 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
     NSWindow *w = [notification object];
     TkWindow *winPtr = TkMacOSXGetTkWindow(w);
 
+    printf("windowMapped\n");
     if (winPtr) {
 	//Tk_MapWindow((Tk_Window) winPtr);
     }
 }
 
-- (void) windowBecameVisible: (NSNotification *) notification
-{
-    TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification);
-}
-
 - (void) windowUnmapped: (NSNotification *) notification
 {
     TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification);
@@ -263,6 +273,7 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
     observe(NSWindowDidResizeNotification, windowBoundsChanged:);
     observe(NSWindowDidDeminiaturizeNotification, windowExpanded:);
     observe(NSWindowDidMiniaturizeNotification, windowCollapsed:);
+    observe(NSWindowDidOrderOnScreenNotification, windowBecameVisible:);
 
 #if !(MAC_OS_X_VERSION_MAX_ALLOWED < 1070)
     observe(NSWindowDidEnterFullScreenNotification, windowEnteredFullScreen:);
-- 
cgit v0.12


From 9fb818caa0ef424af5d38f5be645c0e911460eda Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Wed, 3 Jun 2020 05:56:44 +0000
Subject: Remove excess spacing.

---
 generic/tkGrab.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tkGrab.c b/generic/tkGrab.c
index 8f09f50..9a28f62 100644
--- a/generic/tkGrab.c
+++ b/generic/tkGrab.c
@@ -787,7 +787,7 @@ TkPointerEvent(
 
         TkDoWarpWrtWin(dispPtr);
     }
-        
+
     if (!appGrabbed) {
 	return 1;
     }
-- 
cgit v0.12


From ebbce5dd4848c8dd3bf2ea49d23f83fc2343e425 Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Thu, 4 Jun 2020 19:12:50 +0000
Subject: photo read command: memory error on shrink option did not close the
 channel

---
 generic/tkImgPhoto.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c
index 96c3743..ab962c1 100644
--- a/generic/tkImgPhoto.c
+++ b/generic/tkImgPhoto.c
@@ -1106,6 +1106,7 @@ ImgPhotoCmd(
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			TK_PHOTO_ALLOC_FAILURE_MESSAGE, -1));
 		Tcl_SetErrorCode(interp, "TK", "MALLOC", NULL);
+		Tcl_Close(NULL, chan);
 		return TCL_ERROR;
 	    }
 	}
-- 
cgit v0.12


From f31664f2a7c475db0fcb646accf6f58d78407da8 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Fri, 5 Jun 2020 18:00:00 +0000
Subject: Fixed a bug in TkpDrawAllViews and added a mechanism to prevent
 Tcl_WaitForEvent from blocking if there is drawing that needs to be done.

---
 macosx/tkMacOSXDraw.c        |  5 ++---
 macosx/tkMacOSXNotify.c      | 41 ++++++++++++++++++++++-------------------
 macosx/tkMacOSXPrivate.h     |  2 ++
 macosx/tkMacOSXSubwindows.c  |  9 +++------
 macosx/tkMacOSXWindowEvent.c |  9 +++++----
 tests/listbox.test           | 21 ++++++++-------------
 6 files changed, 42 insertions(+), 45 deletions(-)

diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index 6a63449..f3d6ba4 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -176,7 +176,7 @@ TkMacOSXBitmapRepFromDrawableRect(
 	}
     } else if (TkMacOSXDrawableView(mac_drawable) != NULL) {
 	TKContentView *tkview = (TKContentView *)view;
- 
+
 	/*
 	 * Convert Tk top-left to NSView bottom-left coordinates.
 	 */
@@ -199,8 +199,7 @@ TkMacOSXBitmapRepFromDrawableRect(
 	    [view cacheDisplayInRect:view_rect toBitmapImageRep:bitmap_rep];
 	} else {
 	    TkMacOSXDbgMsg("No CGContext - cannot copy from screen to bitmap.");
-	    [tkview setTkNeedsDisplay:YES];
-	    [tkview setTkDirtyRect:[tkview bounds]];
+	    [tkview addTkDirtyRect:[tkview bounds]];
 	    return NULL;
 	}
     } else {
diff --git a/macosx/tkMacOSXNotify.c b/macosx/tkMacOSXNotify.c
index 8bf5e66..daa1321 100644
--- a/macosx/tkMacOSXNotify.c
+++ b/macosx/tkMacOSXNotify.c
@@ -346,7 +346,6 @@ TkMacOSXDrawAllViews(
 		   continue;
 		}
 		[view setNeedsDisplayInRect:[view tkDirtyRect]];
-		[view setTkDirtyRect:NSZeroRect];
 	    }
 	} else {
 	    [window displayIfNeeded];
@@ -374,6 +373,7 @@ TkMacOSXDrawAllViews(
 	    }
 	}
     }
+    [NSApp setNeedsToDraw:NO];
 }
 
 /*
@@ -392,13 +392,14 @@ TkMacOSXDrawAllViews(
  *
  * Side effects:
  *
- *	If NSEvents are queued, then the maximum block time will be set to 0 to
- *	ensure that control returns immediately to Tcl.
+ *	If NSEvents are queued, or if there is any drawing that needs to be
+ *      done, then the maximum block time will be set to 0 to ensure that
+ *      Tcl_WaitForEvent returns immediately.
  *
  *----------------------------------------------------------------------
  */
 
-#define TICK 100
+#define TICK 200
 static Tcl_TimerToken ticker = NULL;
 
 static void
@@ -428,11 +429,13 @@ TkMacOSXEventsSetupProc(
 	[NSApp _resetAutoreleasePool];
 
  	/*
- 	 * Call this with dequeue=NO to see if there are any events.  If so, we
- 	 * set the block time to 0 and stop the heartbeat.  Next Tcl_DoOneEvent
- 	 * will call Tcl_WaitForEvent, which will poll instead of waiting since
- 	 * the block time is 0.  Then it will call check proc to collect the
+	 * After calling this setup proc, Tcl_DoOneEvent will call
+ 	 * Tcl_WaitForEvent.  Then it will call check proc to collect the
  	 * events and translate them into XEvents.
+	 *
+ 	 * If we have any events waiting or if there is any drawing to be done
+	 * we want Tcl_WaitForEvent to return immediately.  So we set the block
+	 * time to 0.  We also stop the heartbeat, since we won't need it.
   	 */
 
 	NSEvent *currentEvent =
@@ -440,21 +443,21 @@ TkMacOSXEventsSetupProc(
 			untilDate:[NSDate distantPast]
 			inMode:GetRunLoopMode(TkMacOSXGetModalSession())
 			dequeue:NO];
-	if (currentEvent && currentEvent.type > 0) {
-		Tcl_SetMaxBlockTime(&zeroBlockTime);
-		Tcl_DeleteTimerHandler(ticker);
-		ticker = NULL;
+	if ((currentEvent) || [NSApp needsToDraw] ) {
+	    Tcl_SetMaxBlockTime(&zeroBlockTime);
+	    Tcl_DeleteTimerHandler(ticker);
+	    ticker = NULL;
 	} else if (ticker == NULL) {
 
-    	     	/*
-    	     	 * When the user is not generating events we schedule a "heartbeat"
-    	     	 * TimerHandler to fire every 200 milliseconds.  The handler does
-		 * nothing, but when its timer fires TclWaitForEvent will return,
-		 * causing TkMacOSXCheckProc to be called.
-    	     	 */
+	    /*
+	     * When the user is not generating events we schedule a "heartbeat"
+	     * TimerHandler to fire every 200 milliseconds.  The handler does
+	     * nothing, but when its timer fires it causes Tcl_WaitForEvent to
+	     * return.  This helps avoid hangs when calling vwait.
+	     */
 
 	    ticker = Tcl_CreateTimerHandler(TICK, Heartbeat, NULL);
-    	}
+	}
     }
 }
 
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h
index 719b0b1..40bbd9c 100644
--- a/macosx/tkMacOSXPrivate.h
+++ b/macosx/tkMacOSXPrivate.h
@@ -345,11 +345,13 @@ VISIBILITY_HIDDEN
     int _poolLock;
     int _macMinorVersion;
     Bool _isDrawing;
+    Bool _needsToDraw;
 #endif
 }
 @property int poolLock;
 @property int macMinorVersion;
 @property Bool isDrawing;
+@property Bool needsToDraw;
 
 @end
 @interface TKApplication(TKInit)
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index c25f600..bf59901 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -170,8 +170,7 @@ XMapWindow(
 	    TkMacOSXApplyWindowAttributes(winPtr, win);
 	    [win setExcludedFromWindowsMenu:NO];
 	    [NSApp activateIgnoringOtherApps:NO];
-	    [view setTkNeedsDisplay:YES];
-	    [view setTkDirtyRect: [view bounds]];
+	    [view addTkDirtyRect: [view bounds]];
 	    if ([win canBecomeKeyWindow]) {
 		[win makeKeyAndOrderFront:NSApp];
 	    } else {
@@ -218,8 +217,7 @@ XMapWindow(
 	[[win contentView] setNeedsRedisplay:YES];
     } else {
 	TKContentView *view = [win contentView];
-	[view setTkNeedsDisplay:YES];
-	[view setTkDirtyRect:[view bounds]];
+	[view addTkDirtyRect:[view bounds]];
     }
 
     /*
@@ -337,8 +335,7 @@ XUnmapWindow(
 	[[win contentView] setNeedsRedisplay:YES];
     } else {
 	TKContentView *view = [win contentView];
-	[view setTkNeedsDisplay:YES];
-	[view setTkDirtyRect:[view bounds]];
+	[view addTkDirtyRect:[view bounds]];
     }
     return Success;
 }
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index d052005..b5e6ee3 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -217,7 +217,7 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
     if (winPtr) {
 	TKContentView *view = [window contentView];
 	while(Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {};
-	[view setTkDirtyRect:[view bounds]];
+	[view addTkDirtyRect:[view bounds]];
 	TkMacOSXDrawAllViews(NULL);
     }
 }
@@ -433,8 +433,7 @@ TkpWillDrawWidget(Tk_Window tkwin) {
 	    printf("TkpAppCanDraw: dirtyRect for %s is %s\n",
 		   Tk_PathName(tkwin),
 		   NSStringFromRect(dirtyRect).UTF8String);
-	    [view setTkNeedsDisplay:YES];
-	    [view setTkDirtyRect:dirtyRect];
+	    [view addTkDirtyRect:dirtyRect];
 	}
 #endif
     } else {
@@ -936,12 +935,14 @@ ConfigureRestrictProc(
 {
     _tkNeedsDisplay = YES;
     _tkDirtyRect = NSUnionRect(_tkDirtyRect, rect);
+    [NSApp setNeedsToDraw:YES];
 }
 
 - (void) clearTkDirtyRect
 {
     _tkNeedsDisplay = NO;
     _tkDirtyRect = NSZeroRect;
+    [NSApp setNeedsToDraw:NO];
 }
 
 - (void) drawRect: (NSRect) rect
@@ -968,7 +969,7 @@ ConfigureRestrictProc(
     }
 
     [NSApp setIsDrawing: YES];
-    [self setTkDirtyRect:NSZeroRect];
+    [self clearTkDirtyRect];
     [self generateExposeEvents:rect];
     [self setTkNeedsDisplay: NO];
     [NSApp setIsDrawing: NO];
diff --git a/tests/listbox.test b/tests/listbox.test
index 8d4ed33..0917e84 100644
--- a/tests/listbox.test
+++ b/tests/listbox.test
@@ -2666,7 +2666,7 @@ test listbox-21.9 {ListboxListVarProc, test hscrollbar after listvar mod} -setup
     listbox .l -font $fixed -width 10 -xscrollcommand "record x" -listvar x
     set log {}
     pack .l
-    set timeout [after 500 {set log timeout}] 
+    set timeout [after 500 {set log timeout}]
     vwait log
     lappend x "0000000000"
     update
@@ -2684,7 +2684,7 @@ test listbox-21.10 {ListboxListVarProc, test hscrollbar after listvar mod} -setu
     listbox .l -font $fixed -width 10 -xscrollcommand "record x" -listvar x
     set log {}
     pack .l
-    set timeout [after 500 {set log timeout}] 
+    set timeout [after 500 {set log timeout}]
     vwait log
     lappend x "0000000000"
     update
@@ -2764,7 +2764,7 @@ test listbox-21.15 {ListboxListVarProc, update vertical scrollbar} -setup {
     update
     set log {}
     pack .l
-    set timeout [after 500 {set log timeout}] 
+    set timeout [after 500 {set log timeout}]
     vwait log
     update
     lappend x a b c d e f
@@ -2800,20 +2800,20 @@ test listbox-21.16 {ListboxListVarProc, update vertical scrollbar} -setup {
 test listbox-22.1 {UpdateHScrollbar} -setup {
     destroy .l
 } -body {
-    set log {}
     listbox .l -font $fixed -width 10 -xscrollcommand "record x"
     pack .l
-    set timeout [after 500 {set log timeout}] 
-    vwait log
-    .l insert end "0000000000"
     update idletasks
+    set log {}
+    set timeout [after 500 {set log timeout}]
+    .l insert end "0000000000"
+    vwait log
     .l insert end "00000000000000000000"
     vwait log
     set log
 } -cleanup {
     destroy .l
     after cancel $timeout
-} -result [list {x 0 1} {x 0 1} {x 0 0.5}]
+} -result [list {x 0 1} {x 0 0.5}]
 
 
 # ConfigureListboxItem
@@ -3221,8 +3221,3 @@ option clear
 # cleanup
 cleanupTests
 return
-
-
-
-
-
-- 
cgit v0.12


From e159a0d79d67dd98e17595c467599e0a54837677 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sat, 6 Jun 2020 07:45:20 +0000
Subject: Update leftover comments that didn't follow the changes made in
 [0deef053f6]

---
 generic/tkCanvas.c  | 4 ++--
 generic/tkListbox.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c
index 4d68ade..8230122 100644
--- a/generic/tkCanvas.c
+++ b/generic/tkCanvas.c
@@ -5556,8 +5556,8 @@ CanvasUpdateScrollbars(
     Tcl_DString buf;
 
     /*
-     * Save all the relevant values from the canvasPtr, because it might be
-     * deleted as part of either of the two calls to Tcl_VarEval below.
+     * Preserve the relevant values from the canvasPtr, because it might be
+     * deleted as part of either of the two calls to Tcl_EvalEx below.
      */
 
     interp = canvasPtr->interp;
diff --git a/generic/tkListbox.c b/generic/tkListbox.c
index d92325f..b00a895 100644
--- a/generic/tkListbox.c
+++ b/generic/tkListbox.c
@@ -3318,7 +3318,7 @@ ListboxUpdateVScrollbar(
 
     /*
      * We must hold onto the interpreter from the listPtr because the data at
-     * listPtr might be freed as a result of the Tcl_VarEval.
+     * listPtr might be freed as a result of the Tcl_EvalEx.
      */
 
     interp = listPtr->interp;
@@ -3390,7 +3390,7 @@ ListboxUpdateHScrollbar(
 
     /*
      * We must hold onto the interpreter because the data referred to at
-     * listPtr might be freed as a result of the call to Tcl_VarEval.
+     * listPtr might be freed as a result of the call to Tcl_EvalEx.
      */
 
     interp = listPtr->interp;
-- 
cgit v0.12


From c6c4a8052b1935186c0efaf8269deac67e050a22 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sat, 6 Jun 2020 15:06:52 +0000
Subject: Make success criterion for test bind-35.1 more specific, so that this
 same test passes in branch bug-e3888d5820-alt1 but fails in core-8-6-branch
 (previously bind-35.1 did not fail in core-8-6-branch, in which bug
 [e3888d5820] is not yet solved).

---
 tests/bind.test | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/bind.test b/tests/bind.test
index d8a6c41..963119e 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -6715,7 +6715,10 @@ test bind-35.1 {pointer warp with grab on master, bug [e3888d5820]} -setup {
     grab release .top
     event generate .top.l <Motion> -warp 1 -x 10 -y 10
     foreach {x2 y2} [winfo pointerxy .top.l] {}
-    expr {$x1==$x2 && $y1==$y2}
+    # success if the coords are the same with or without the grab, and if they
+    # are at least at (10,10) inside the window located at (300,300).
+    # ">=" instead of "==" to take WM-specific decorations into account.
+    expr {$x1==$x2 && $y1==$y2 && $x1>=310 && $y1>=310}
 } -cleanup {
     destroy .top
     unset x1 y1 x2 y2
-- 
cgit v0.12


From bcf017e94b644b427d704da23be4bbe164978fff Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Sat, 6 Jun 2020 18:53:04 +0000
Subject: A different attempt to make sure new windows are completely drawn.

---
 macosx/tkMacOSXKeyEvent.c    | 3 +--
 macosx/tkMacOSXNotify.c      | 3 +++
 macosx/tkMacOSXWindowEvent.c | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/macosx/tkMacOSXKeyEvent.c b/macosx/tkMacOSXKeyEvent.c
index e0b0094..bff9e26 100644
--- a/macosx/tkMacOSXKeyEvent.c
+++ b/macosx/tkMacOSXKeyEvent.c
@@ -255,12 +255,11 @@ static NSUInteger textInputModifiers;
      */
 
     if (type == NSKeyDown && [theEvent isARepeat]) {
+	
 	xEvent.xany.type = KeyRelease;
 	Tk_QueueWindowEvent(&xEvent, TCL_QUEUE_TAIL);
 	xEvent.xany.type = KeyPress;
     }
-    if (xEvent.xany.type == KeyPress) {
-    }
     Tk_QueueWindowEvent(&xEvent, TCL_QUEUE_TAIL);
     return theEvent;
 }
diff --git a/macosx/tkMacOSXNotify.c b/macosx/tkMacOSXNotify.c
index daa1321..3433e56 100644
--- a/macosx/tkMacOSXNotify.c
+++ b/macosx/tkMacOSXNotify.c
@@ -457,6 +457,9 @@ TkMacOSXEventsSetupProc(
 	     */
 
 	    ticker = Tcl_CreateTimerHandler(TICK, Heartbeat, NULL);
+	    Tcl_CancelIdleCall(TkMacOSXDrawAllViews, NULL);
+	    Tcl_DoWhenIdle(TkMacOSXDrawAllViews, NULL);
+	    while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {}
 	}
     }
 }
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index b5e6ee3..debe5b8 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -42,7 +42,6 @@ extern NSString *NSWindowDidOrderOnScreenNotification;
 
 #ifdef TK_MAC_DEBUG_NOTIFICATIONS
 extern NSString *NSWindowWillOrderOnScreenNotification;
-extern NSString *NSWindowDidOrderOnScreenNotification;
 extern NSString *NSWindowDidOrderOffScreenNotification;
 #endif
 
@@ -216,9 +215,10 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
     TkWindow *winPtr = TkMacOSXGetTkWindow(window);
     if (winPtr) {
 	TKContentView *view = [window contentView];
-	while(Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {};
 	[view addTkDirtyRect:[view bounds]];
-	TkMacOSXDrawAllViews(NULL);
+	Tcl_CancelIdleCall(TkMacOSXDrawAllViews, NULL);
+	Tcl_DoWhenIdle(TkMacOSXDrawAllViews, NULL);
+	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {}
     }
 }
 
-- 
cgit v0.12


From 713dedd103bb6e51fc6ad17c3b8386b91ee34be6 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sat, 6 Jun 2020 19:56:28 +0000
Subject: Take into account that some WM, such as KDE/Plasma with the Aurorae
 theme engine, need a bit more time to setup a new toplevel and display its
 content.

---
 tests/bind.test | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/bind.test b/tests/bind.test
index 963119e..8ac5db8 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -6707,6 +6707,11 @@ test bind-35.1 {pointer warp with grab on master, bug [e3888d5820]} -setup {
             -highlightbackground black -bg yellow -text "My label"
     pack .top.l -side bottom
     update
+    # On KDE/Plasma _with_the_Aurorae_theme_ (at least), setting up the toplevel
+    # and the label will not be finished after the above 'update'. The WM still
+    # needs some time before the window is fully ready. For me 50 ms is enough,
+    # but let's wait more (it depends on computer performance).
+    after 100 ; update
 } -body {
     grab .top
     event generate .top.l <Motion> -warp 1 -x 10 -y 10
-- 
cgit v0.12


From cb7dce629f945d134a4d7595fbbb3b927f8829e2 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sat, 6 Jun 2020 20:51:39 +0000
Subject: Cherry-pick [a6c87041]: Make bind-34.1 pass on Debian 10 with
 KDE/Plasma by giving the WM a more complete setup for this test.

---
 tests/bind.test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/bind.test b/tests/bind.test
index e68368a..a2758c5 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -6627,6 +6627,7 @@ test bind-33.15 {prefer last in case of homogeneous equal patterns} -setup {
 
 test bind-34.1 {-warp works relatively to a window} -setup {
     toplevel .top
+    wm geometry .top +100+100
     update
 } -body {
     # In order to avoid platform-dependent coordinate results due to
-- 
cgit v0.12


From fc3ac7bddfaab3aa339544ced10afdf77c0477c4 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sat, 6 Jun 2020 21:04:19 +0000
Subject: Take into account that some WM, such as KDE/Plasma with the Aurorae
 theme engine, need a bit more time to setup a new toplevel and display its
 content.

---
 tests/bind.test | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/bind.test b/tests/bind.test
index a2758c5..fb36445 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -6734,6 +6734,11 @@ test bind-35.1 {pointer warp with grab on master, bug [e3888d5820]} -constraints
             -highlightbackground black -bg yellow -text "My label"
     pack .top.l -side bottom
     update
+    # On KDE/Plasma _with_the_Aurorae_theme_ (at least), setting up the toplevel
+    # and the label will not be finished after the above 'update'. The WM still
+    # needs some time before the window is fully ready. For me 50 ms is enough,
+    # but let's wait more (it depends on computer performance).
+    after 100 ; update
 } -body {
     grab .top  ; # this will queue events
     waitForGrab grabbed .top
-- 
cgit v0.12


From 94df92d713ad84ae1e93183be6a9927209783795 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Sat, 6 Jun 2020 21:20:19 +0000
Subject: More attempts to make sure new windows are complete.

---
 macosx/tkMacOSXWindowEvent.c | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index debe5b8..07965f0 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -39,9 +39,9 @@ static void		DoWindowActivate(ClientData clientData);
 #pragma mark TKApplication(TKWindowEvent)
 
 extern NSString *NSWindowDidOrderOnScreenNotification;
+extern NSString *NSWindowWillOrderOnScreenNotification;
 
 #ifdef TK_MAC_DEBUG_NOTIFICATIONS
-extern NSString *NSWindowWillOrderOnScreenNotification;
 extern NSString *NSWindowDidOrderOffScreenNotification;
 #endif
 
@@ -218,6 +218,15 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
 	[view addTkDirtyRect:[view bounds]];
 	Tcl_CancelIdleCall(TkMacOSXDrawAllViews, NULL);
 	Tcl_DoWhenIdle(TkMacOSXDrawAllViews, NULL);
+    }
+}
+
+- (void) windowMapped: (NSNotification *) notification
+{
+    NSWindow *w = [notification object];
+    TkWindow *winPtr = TkMacOSXGetTkWindow(w);
+
+    if (winPtr) {
 	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {}
     }
 }
@@ -235,18 +244,6 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
     //BOOL start = [[notification name] isEqualToString:NSWindowWillStartLiveResizeNotification];
 }
 
-- (void) windowMapped: (NSNotification *) notification
-{
-    TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification);
-    NSWindow *w = [notification object];
-    TkWindow *winPtr = TkMacOSXGetTkWindow(w);
-
-    printf("windowMapped\n");
-    if (winPtr) {
-	//Tk_MapWindow((Tk_Window) winPtr);
-    }
-}
-
 - (void) windowUnmapped: (NSNotification *) notification
 {
     TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification);
@@ -274,6 +271,8 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
     observe(NSWindowDidDeminiaturizeNotification, windowExpanded:);
     observe(NSWindowDidMiniaturizeNotification, windowCollapsed:);
     observe(NSWindowDidOrderOnScreenNotification, windowBecameVisible:);
+    observe(NSWindowWillOrderOnScreenNotification, windowMapped:);
+    observe(NSWindowDidOrderOnScreenNotification, windowBecameVisible:);
 
 #if !(MAC_OS_X_VERSION_MAX_ALLOWED < 1070)
     observe(NSWindowDidEnterFullScreenNotification, windowEnteredFullScreen:);
@@ -284,8 +283,6 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
     observe(NSWindowWillMoveNotification, windowDragStart:);
     observe(NSWindowWillStartLiveResizeNotification, windowLiveResize:);
     observe(NSWindowDidEndLiveResizeNotification, windowLiveResize:);
-    observe(NSWindowWillOrderOnScreenNotification, windowMapped:);
-    observe(NSWindowDidOrderOnScreenNotification, windowBecameVisible:);
     observe(NSWindowDidOrderOffScreenNotification, windowUnmapped:);
 #endif
 #undef observe
-- 
cgit v0.12


From 65275b4068ba0e838ab38828a58122526789d270 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 7 Jun 2020 19:55:26 +0000
Subject: Be even more specific in the result expected from bind-35.1

---
 tests/bind.test | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/bind.test b/tests/bind.test
index fb36445..e6517e0 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -6752,7 +6752,8 @@ test bind-35.1 {pointer warp with grab on master, bug [e3888d5820]} -constraints
     event generate .top.l <Motion> -warp 1 -x 10 -y 10
     update idletasks ; after 50
     foreach {x2 y2} [winfo pointerxy .top.l] {}
-    expr {$x1==$x2 && $y1==$y2}
+    expr {$x1==$x2 && $y1==$y2 && $x1==[winfo rootx .top.l]+10 \
+                               && $y1==[winfo rooty .top.l]+10}
 } -cleanup {
     destroy .top
     unset x1 y1 x2 y2
-- 
cgit v0.12


From 8dce88c3bfe67441ecf8b23a5f8ef9946485aa88 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 7 Jun 2020 19:58:45 +0000
Subject: Add comment explaining the result expected for bind-35.1

---
 tests/bind.test | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/bind.test b/tests/bind.test
index e6517e0..e333c6c 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -6752,6 +6752,8 @@ test bind-35.1 {pointer warp with grab on master, bug [e3888d5820]} -constraints
     event generate .top.l <Motion> -warp 1 -x 10 -y 10
     update idletasks ; after 50
     foreach {x2 y2} [winfo pointerxy .top.l] {}
+    # success if the coords are the same with or without the grab, and if they
+    # are at (10,10) inside the label widget as requested by the warping
     expr {$x1==$x2 && $y1==$y2 && $x1==[winfo rootx .top.l]+10 \
                                && $y1==[winfo rooty .top.l]+10}
 } -cleanup {
-- 
cgit v0.12


From 84cfc97d7f9469cb9f4406c0f26a15941de718d6 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 7 Jun 2020 20:10:59 +0000
Subject: Don't use external base64 encoder for Tk's own test-cases.
 Cherry-picked from  tip-529-image-metadata branch (good idea!)

---
 tests/imgPhoto.test | 34 ++++++++--------------------------
 1 file changed, 8 insertions(+), 26 deletions(-)

diff --git a/tests/imgPhoto.test b/tests/imgPhoto.test
index c45c5fb..50f0688 100644
--- a/tests/imgPhoto.test
+++ b/tests/imgPhoto.test
@@ -59,14 +59,6 @@ set README [makeFile {
 set teapotPhotoFile [file join [file dirname [info script]] teapot.ppm]
 testConstraint hasTeapotPhoto [file exists $teapotPhotoFile]
 
-proc base64ok {} {
-    expr {
-        ![catch {package require base64}]
-    }
-}
-
-testConstraint base64PackageNeeded [base64ok]
-
 test imgPhoto-1.1 {options for photo images} -body {
     image create photo photo1 -width 79 -height 83
     list [photo1 cget -width] [photo1 cget -height] \
@@ -1306,11 +1298,8 @@ test imgPhoto-17.3 {photo write: format guessing from filename} -setup {
 # Reject corrupted or truncated image [Bug b601ce3ab1].
 # WARNING - tests 18.1-18.9 will cause a segfault on 8.5.19 and lower,
 #           and on 8.6.6 and lower.
-test imgPhoto-18.1 {Reject corrupted GIF (binary string)} -constraints {
-    base64PackageNeeded
-} -setup {
-    package require base64
-    set data [base64::decode {
+test imgPhoto-18.1 {Reject corrupted GIF (binary string)} -setup {
+    set data [binary decode base64 {
 	R0lGODlhAAQABP8zM/8z/zP/MzP/////M////yH5CiwheLrcLTBCd6Tv2qW16tdK4jhV
 	5qpraXIvM1JlNyAgOw==
     }]
@@ -1336,11 +1325,8 @@ test imgPhoto-18.3 {Reject corrupted GIF (file)} -setup {
 } -cleanup {
     catch {image delete gif1}
 } -returnCodes error -result {error reading color map|not enough free memory for image buffer} -match regexp
-test imgPhoto-18.4 {Reject truncated GIF (binary string)} -constraints {
-    base64PackageNeeded
-} -setup {
-    package require base64
-    set data [base64::decode {
+test imgPhoto-18.4 {Reject truncated GIF (binary string)} -setup {
+    set data [binary decode base64 {
 	R0lGODlhEAAQAMIHAAAAADMz//8zM/8z/zP/MzP///8=
     }]
 } -body {
@@ -1365,14 +1351,13 @@ test imgPhoto-18.6 {Reject truncated GIF (file)} -setup {
     catch {image delete gif1}
 } -returnCodes error -result {error reading color map}
 test imgPhoto-18.7 {Reject corrupted GIF (> 4Gb) (binary string)} -constraints {
-    base64PackageNeeded nonPortable
+    nonPortable
 } -setup {
     # About the non portability constraint of this test: see ticket [cc42cc18a5]
     # If there is insufficient memory, the error message
     # {not enough free memory for image buffer} should be returned.
     # Instead, some systems (e.g. FreeBSD 11.1) terminate the test interpreter.
-    package require base64
-    set data [base64::decode {
+    set data [binary decode base64 {
 	R0lGODlhwmYz//8zM/8z/zP/MzP/////M////yH5Ciwhe
 	LrcLTBCd6Tv2qW16tdK4jhV5qpraXIvM1JlNyAgOw==
     }]
@@ -1410,14 +1395,11 @@ test imgPhoto-18.9 {Reject corrupted GIF (> 4Gb) (file)} -constraints {
 } -cleanup {
     catch {image delete gif1}
 } -returnCodes error -result {error reading color map|not enough free memory for image buffer} -match regexp
-test imgPhoto-18.10 {Valid GIF (binary string)} -constraints {
-    base64PackageNeeded
-} -setup {
+test imgPhoto-18.10 {Valid GIF (binary string)} -setup {
     # Test the binary string reader with a valid GIF.
     # This is not tested elsewhere.
     # Tests 18.11, 18.12, with matching data, are included for completeness.
-    package require base64
-    set data [base64::decode {
+    set data [binary decode base64 {
 	R0lGODlhEAAQAMIHAAAAADMz//8zM/8z/zP/MzP/////M////yH5BAEKAAcALAAA
 	AAAQABAAAAMheLrcLTBCd6QV79qlterXB0riOFXmmapraXIvM1IdZTcJADs=
     }]
-- 
cgit v0.12


From 8b94c471d7cb1f24b1e22e5c64f90197d220fbe2 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Sun, 7 Jun 2020 22:19:45 +0000
Subject: Fix the Redisplay to make new windows complete.

---
 macosx/tkMacOSXNotify.c      | 13 ++++++-------
 macosx/tkMacOSXSubwindows.c  | 10 ++++------
 macosx/tkMacOSXWindowEvent.c |  6 ++----
 tests/wm.test                | 12 ++++++++----
 4 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/macosx/tkMacOSXNotify.c b/macosx/tkMacOSXNotify.c
index 3433e56..2d25ce1 100644
--- a/macosx/tkMacOSXNotify.c
+++ b/macosx/tkMacOSXNotify.c
@@ -368,7 +368,7 @@ TkMacOSXDrawAllViews(
 	     * rect, due to attempts to draw outside of drawRect's dirty rect.
 	     */
 
-	    if ([view tkNeedsDisplay]) {
+	    if ([view needsDisplay]) {
 		[view setNeedsDisplay: NO];
 	    }
 	}
@@ -412,6 +412,8 @@ Heartbeat(
     }
 }
 
+static const Tcl_Time zeroBlockTime = { 0, 0 };
+
 static void
 TkMacOSXEventsSetupProc(
     ClientData clientData,
@@ -424,7 +426,6 @@ TkMacOSXEventsSetupProc(
      */
 
     if (flags & TCL_WINDOW_EVENTS && !runloopMode) {
-	static const Tcl_Time zeroBlockTime = { 0, 0 };
 
 	[NSApp _resetAutoreleasePool];
 
@@ -435,7 +436,7 @@ TkMacOSXEventsSetupProc(
 	 *
  	 * If we have any events waiting or if there is any drawing to be done
 	 * we want Tcl_WaitForEvent to return immediately.  So we set the block
-	 * time to 0.  We also stop the heartbeat, since we won't need it.
+	 * time to 0 and stop the heatbeat.
   	 */
 
 	NSEvent *currentEvent =
@@ -453,13 +454,11 @@ TkMacOSXEventsSetupProc(
 	     * When the user is not generating events we schedule a "heartbeat"
 	     * TimerHandler to fire every 200 milliseconds.  The handler does
 	     * nothing, but when its timer fires it causes Tcl_WaitForEvent to
-	     * return.  This helps avoid hangs when calling vwait.
+	     * return.  This helps avoid hangs when calling vwait during the
+	     * non-regression tests.
 	     */
 
 	    ticker = Tcl_CreateTimerHandler(TICK, Heartbeat, NULL);
-	    Tcl_CancelIdleCall(TkMacOSXDrawAllViews, NULL);
-	    Tcl_DoWhenIdle(TkMacOSXDrawAllViews, NULL);
-	    while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {}
 	}
     }
 }
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index bf59901..a0f445f 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -213,12 +213,11 @@ XMapWindow(
 	TkMacOSXInvalClipRgns((Tk_Window) winPtr->parentPtr);
     }
 
-    if ([NSApp isDrawing]) {
-	[[win contentView] setNeedsRedisplay:YES];
-    } else {
+    if (![NSApp isDrawing]) {
 	TKContentView *view = [win contentView];
 	[view addTkDirtyRect:[view bounds]];
     }
+    [[win contentView] setNeedsRedisplay:YES];
 
     /*
      * Generate VisibilityNotify events for window and all mapped children.
@@ -331,12 +330,11 @@ XUnmapWindow(
 	TkMacOSXUpdateClipRgn(parentPtr);
     }
     winPtr->flags &= ~TK_MAPPED;
-    if ([NSApp isDrawing]) {
-	[[win contentView] setNeedsRedisplay:YES];
-    } else {
+    if (![NSApp isDrawing]) {
 	TKContentView *view = [win contentView];
 	[view addTkDirtyRect:[view bounds]];
     }
+    [[win contentView] setNeedsRedisplay:YES];
     return Success;
 }
 
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 07965f0..9edbd69 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -968,13 +968,11 @@ ConfigureRestrictProc(
     [NSApp setIsDrawing: YES];
     [self clearTkDirtyRect];
     [self generateExposeEvents:rect];
-    [self setTkNeedsDisplay: NO];
-    [NSApp setIsDrawing: NO];
-
     if ([self needsRedisplay]) {
 	[self setNeedsRedisplay:NO];
-	Tcl_DoWhenIdle(TkMacOSXDrawAllViews, NULL);
+	[self addTkDirtyRect: [self bounds]];
     }
+    [NSApp setIsDrawing:NO];
 
 #ifdef TK_MAC_DEBUG_DRAWING
     fprintf(stderr, "drawRect: done.\n");
diff --git a/tests/wm.test b/tests/wm.test
index 4d0d73b..9e6d8ce 100644
--- a/tests/wm.test
+++ b/tests/wm.test
@@ -2310,6 +2310,11 @@ test wm-forget-1.4 "pack into unmapped toplevel causes crash" -body {
 test wm-forget-2 {bug [e9112ef96e] - [wm forget] doesn't completely} -setup {
     catch {destroy .l .f.b .f}
     set res {}
+    if {[tk windowingsystem] == "aqua"} {
+	proc doUpdate {} {update idletasks}
+    } else {
+	proc doUpdate {} {update}
+    }
 } -body {
     label .l -text "Top Dot"
     frame .f
@@ -2317,16 +2322,15 @@ test wm-forget-2 {bug [e9112ef96e] - [wm forget] doesn't completely} -setup {
     pack .l -side top
     pack .f.b
     pack .f -side bottom
-    update
     set res [winfo manager .f]
     pack forget .f
-    update
+    doUpdate
     lappend res [winfo manager .f]
     wm manage .f
-    update
+    doUpdate
     lappend res [winfo manager .f]
     wm forget .f
-    update
+    doUpdate
     lappend res [winfo manager .f]
 } -cleanup {
     destroy .l .f.b .f
-- 
cgit v0.12


From a51d1909f467d11adf3d095e1fa302f161929cbb Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 8 Jun 2020 09:29:02 +0000
Subject: Add "-fno-common" to SHARED_CFLAGS on various platforms (e.g. Linux,
 CYGWIN). This is the default with gcc-10, so better make sure it doesn't
 cause problems.

---
 unix/configure | 15 ++++++++-------
 unix/tcl.m4    | 15 ++++++++-------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/unix/configure b/unix/configure
index dceb0a1..13c36a9 100755
--- a/unix/configure
+++ b/unix/configure
@@ -4241,7 +4241,7 @@ fi
 	CFLAGS_OPTIMIZE=-O2
 	CFLAGS_WARNING="-Wall -Wextra -Wwrite-strings -Wpointer-arith"
 	case "${CC}" in
-	    *++)
+	    *++|*++-*)
 		;;
 	    *)
 		CFLAGS_WARNING="${CFLAGS_WARNING} -Wc++-compat -Wdeclaration-after-statement"
@@ -4514,7 +4514,7 @@ fi
 	    LD_SEARCH_FLAGS=""
 	    ;;
 	CYGWIN_*)
-	    SHLIB_CFLAGS=""
+	    SHLIB_CFLAGS="-fno-common"
 	    SHLIB_LD='${CC} -shared'
 	    SHLIB_SUFFIX=".dll"
 	    DL_OBJS="tclLoadDl.o"
@@ -4897,7 +4897,7 @@ fi
 fi
 	    ;;
 	Linux*|GNU*|NetBSD-Debian)
-	    SHLIB_CFLAGS="-fPIC"
+	    SHLIB_CFLAGS="-fPIC -fno-common"
 	    SHLIB_SUFFIX=".so"
 
 	    CFLAGS_OPTIMIZE="-O2"
@@ -5033,7 +5033,6 @@ fi
 	    ;;
 	DragonFly-*|FreeBSD-*)
 	    # This configuration from FreeBSD Ports.
-	    SHLIB_CFLAGS="-fPIC"
 	    SHLIB_LD="${CC} -shared"
 	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,-soname,\$@"
 	    SHLIB_SUFFIX=".so"
@@ -5421,7 +5420,6 @@ fi
 	QNX-6*)
 	    # QNX RTP
 	    # This may work for all QNX, but it was only reported for v6.
-	    SHLIB_CFLAGS="-fPIC"
 	    SHLIB_LD="ld -Bshareable -x"
 	    SHLIB_LD_LIBS=""
 	    SHLIB_SUFFIX=".so"
@@ -5765,9 +5763,12 @@ fi
 	    AIX-*) ;;
 	    BSD/OS*) ;;
 	    CYGWIN_*) ;;
-	    IRIX*) ;;
-	    NetBSD-*|DragonFly-*|FreeBSD-*|OpenBSD-*) ;;
+	    HP_UX*) ;;
 	    Darwin-*) ;;
+	    IRIX*) ;;
+	    Linux*|GNU*) ;;
+	    NetBSD-*|OpenBSD-*) ;;
+	    OSF1-V*) ;;
 	    SCO_SV-3.2*) ;;
 	    *) SHLIB_CFLAGS="-fPIC" ;;
 	esac
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 0a2920b..aed464f 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -968,7 +968,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 	CFLAGS_OPTIMIZE=-O2
 	CFLAGS_WARNING="-Wall -Wextra -Wwrite-strings -Wpointer-arith"
 	case "${CC}" in
-	    *++)
+	    *++|*++-*)
 		;;
 	    *)
 		CFLAGS_WARNING="${CFLAGS_WARNING} -Wc++-compat -Wdeclaration-after-statement"
@@ -1084,7 +1084,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 	    LD_SEARCH_FLAGS=""
 	    ;;
 	CYGWIN_*)
-	    SHLIB_CFLAGS=""
+	    SHLIB_CFLAGS="-fno-common"
 	    SHLIB_LD='${CC} -shared'
 	    SHLIB_SUFFIX=".dll"
 	    DL_OBJS="tclLoadDl.o"
@@ -1269,7 +1269,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 	    ])
 	    ;;
 	Linux*|GNU*|NetBSD-Debian)
-	    SHLIB_CFLAGS="-fPIC"
+	    SHLIB_CFLAGS="-fPIC -fno-common"
 	    SHLIB_SUFFIX=".so"
 
 	    CFLAGS_OPTIMIZE="-O2"
@@ -1364,7 +1364,6 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 	    ;;
 	DragonFly-*|FreeBSD-*)
 	    # This configuration from FreeBSD Ports.
-	    SHLIB_CFLAGS="-fPIC"
 	    SHLIB_LD="${CC} -shared"
 	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,-soname,\$[@]"
 	    SHLIB_SUFFIX=".so"
@@ -1558,7 +1557,6 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 	QNX-6*)
 	    # QNX RTP
 	    # This may work for all QNX, but it was only reported for v6.
-	    SHLIB_CFLAGS="-fPIC"
 	    SHLIB_LD="ld -Bshareable -x"
 	    SHLIB_LD_LIBS=""
 	    SHLIB_SUFFIX=".so"
@@ -1786,9 +1784,12 @@ dnl # preprocessing tests use only CPPFLAGS.
 	    AIX-*) ;;
 	    BSD/OS*) ;;
 	    CYGWIN_*) ;;
-	    IRIX*) ;;
-	    NetBSD-*|DragonFly-*|FreeBSD-*|OpenBSD-*) ;;
+	    HP_UX*) ;;
 	    Darwin-*) ;;
+	    IRIX*) ;;
+	    Linux*|GNU*) ;;
+	    NetBSD-*|OpenBSD-*) ;;
+	    OSF1-V*) ;;
 	    SCO_SV-3.2*) ;;
 	    *) SHLIB_CFLAGS="-fPIC" ;;
 	esac])
-- 
cgit v0.12


From 25b8569df74d9afc67272322fe89a9ff6dc05a2e Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 8 Jun 2020 10:31:10 +0000
Subject: When TK_NO_DEPRECATED is defined or when Tk is compiled with Tcl 9
 headers, no longer support the oldImageType.

---
 generic/tk.h         |  2 +-
 generic/tkDecls.h    |  1 +
 generic/tkImgPhoto.c | 24 +++++++++++++++++++++---
 generic/tkOldTest.c  |  8 ++++++--
 generic/tkStubInit.c |  1 +
 tests/image.test     |  6 ++++--
 6 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/generic/tk.h b/generic/tk.h
index 90d4115..cec87b3 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -1301,7 +1301,7 @@ typedef struct Tk_Outline {
  */
 
 typedef struct Tk_ImageType Tk_ImageType;
-#ifdef USE_OLD_IMAGE
+#if !defined(TK_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9 && defined(USE_OLD_IMAGE)
 typedef int (Tk_ImageCreateProc) (Tcl_Interp *interp, char *name, int argc,
 	char **argv, Tk_ImageType *typePtr, Tk_ImageMaster master,
 	ClientData *masterDataPtr);
diff --git a/generic/tkDecls.h b/generic/tkDecls.h
index 0d52f2f..8753b2d 100644
--- a/generic/tkDecls.h
+++ b/generic/tkDecls.h
@@ -1757,6 +1757,7 @@ extern const TkStubs *tkStubsPtr;
 #undef Tk_PhotoPutBlock_Panic
 #undef Tk_PhotoPutZoomedBlock_Panic
 #undef Tk_PhotoSetSize_Panic
+#undef Tk_CreateOldPhotoImageFormat
 #endif /* TK_NO_DEPRECATED */
 
 #undef TCL_STORAGE_CLASS
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c
index 684f10b..5b6d0d3 100644
--- a/generic/tkImgPhoto.c
+++ b/generic/tkImgPhoto.c
@@ -135,9 +135,11 @@ 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
     int initialized;		/* Set to 1 if we've initialized the
 				 * structure. */
 } ThreadSpecificData;
@@ -226,11 +228,13 @@ PhotoFormatThreadExitProc(
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
     (void)dummy;
 
+#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;
@@ -258,6 +262,7 @@ PhotoFormatThreadExitProc(
  *----------------------------------------------------------------------
  */
 
+#if !defined(TK_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
 void
 Tk_CreateOldPhotoImageFormat(
     const Tk_PhotoImageFormat *formatPtr)
@@ -278,6 +283,7 @@ Tk_CreateOldPhotoImageFormat(
     copyPtr->nextPtr = tsdPtr->oldFormatList;
     tsdPtr->oldFormatList = copyPtr;
 }
+#endif
 
 void
 Tk_CreatePhotoImageFormat(
@@ -296,10 +302,13 @@ 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 {
+    } else
+#endif
+    {
 	/* for compatibility with aMSN: make a copy of formatPtr->name */
 	char *name = (char *)ckalloc(strlen(formatPtr->name) + 1);
 	strcpy(name, formatPtr->name);
@@ -732,6 +741,7 @@ ImgPhotoCmd(
                 }
 	    }
 	}
+#if !defined(TK_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
 	if (stringWriteProc == NULL) {
 	    oldformat = 1;
 	    for (imageFormat = tsdPtr->oldFormatList; imageFormat != NULL;
@@ -747,6 +757,7 @@ ImgPhotoCmd(
                 }
 	    }
 	}
+#endif
 	if (stringWriteProc == NULL) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
                     "image string format \"%s\" is %s",
@@ -1339,6 +1350,7 @@ ImgPhotoCmd(
 		}
 	    }
 	}
+#if !defined(TK_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
 	if (imageFormat == NULL) {
 	    oldformat = 1;
 	    for (imageFormat = tsdPtr->oldFormatList; imageFormat != NULL;
@@ -1353,6 +1365,7 @@ ImgPhotoCmd(
 		}
 	    }
 	}
+#endif
 	if (usedExt && !matched) {
 	    /*
 	     * If we didn't find one and we're using file extensions as the
@@ -2394,7 +2407,8 @@ MatchFileFormat(
 				 * here. */
     int *oldformat)		/* Returns 1 if the old image API is used. */
 {
-    int matched = 0, useoldformat = 0;
+    int matched = 0;
+    int useoldformat = 0;
     Tk_PhotoImageFormat *formatPtr;
     ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
@@ -2441,7 +2455,8 @@ MatchFileFormat(
 	    }
 	}
     }
-    if (formatPtr == NULL) {
+#if !defined(TK_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
+if (formatPtr == NULL) {
 	useoldformat = 1;
 	for (formatPtr = tsdPtr->oldFormatList; formatPtr != NULL;
 		formatPtr = formatPtr->nextPtr) {
@@ -2475,6 +2490,7 @@ MatchFileFormat(
 	    }
 	}
     }
+#endif
 
     if (formatPtr == NULL) {
 	if ((formatObj != NULL) && !matched) {
@@ -2594,6 +2610,7 @@ MatchStringFormat(
 	}
     }
 
+#if !defined(TK_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
     if (formatPtr == NULL) {
 	useoldformat = 1;
 	for (formatPtr = tsdPtr->oldFormatList; formatPtr != NULL;
@@ -2623,6 +2640,7 @@ MatchStringFormat(
 	    }
 	}
     }
+#endif
 
     if (formatPtr == NULL) {
 	/*
diff --git a/generic/tkOldTest.c b/generic/tkOldTest.c
index d9e8053..0702347 100644
--- a/generic/tkOldTest.c
+++ b/generic/tkOldTest.c
@@ -24,6 +24,7 @@
 #endif
 #include "tkInt.h"
 
+#if !defined(TK_NO_DEPRECATED) && (TCL_MAJOR_VERSION < 9)
 /*
  * The following data structure represents the master for a test image:
  */
@@ -84,7 +85,7 @@ static Tk_ImageType imageType = {
 static int              ImageObjCmd(ClientData dummy,
                             Tcl_Interp *interp, int objc,
             			    Tcl_Obj * const objv[]);
-
+#endif
 
 /*
  *----------------------------------------------------------------------
@@ -113,7 +114,9 @@ TkOldTestInit(
 
     if (!initialized) {
 	initialized = 1;
+#if !defined(TK_NO_DEPRECATED) && (TCL_MAJOR_VERSION < 9)
 	Tk_CreateImageType(&imageType);
+#endif
     }
     return TCL_OK;
 }
@@ -133,7 +136,7 @@ TkOldTestInit(
  *
  *----------------------------------------------------------------------
  */
-
+#if !defined(TK_NO_DEPRECATED) && (TCL_MAJOR_VERSION < 9)
 static int
 ImageCreate(
     Tcl_Interp *interp,		/* Interpreter for application containing
@@ -400,6 +403,7 @@ ImageDelete(
     ckfree(timPtr->varName);
     ckfree(timPtr);
 }
+#endif
 
 /*
  * Local Variables:
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index a0125a8..5880d7b 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -70,6 +70,7 @@ static int TkWinGetPlatformId(void) {
 #define Tk_PhotoPutBlock_Panic 0
 #define Tk_PhotoPutZoomedBlock_Panic 0
 #define Tk_PhotoSetSize_Panic 0
+#define Tk_CreateOldPhotoImageFormat 0
 #else
 static void
 doNothing(void)
diff --git a/tests/image.test b/tests/image.test
index da65a66..ee3f3d9 100644
--- a/tests/image.test
+++ b/tests/image.test
@@ -308,11 +308,13 @@ test image-5.7 {Tk_ImageCmd procedure, "type" option} -constraints {
 } -returnCodes error -result {image "myimage" doesn't exist}
 
 
-test image-6.1 {Tk_ImageCmd procedure, "types" option} -body {
+test image-6.1 {Tk_ImageCmd procedure, "types" option} -constraints {
+    testImageType
+} -body {
     image types x
 } -returnCodes error -result {wrong # args: should be "image types"}
 test image-6.2 {Tk_ImageCmd procedure, "types" option} -constraints {
-    testImageType
+    testOldImageType
 } -body {
     lsort [image types]
 } -result {bitmap oldtest photo test}
-- 
cgit v0.12


From 50d501f90b85fcd0a3beaf485da84379975c9504 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 8 Jun 2020 12:41:00 +0000
Subject: Fix [2790615]: "update" performs Tk callbacks in its own stack frame.
 by adding TCL_EVAL_GLOBAL in a lot of places.

---
 generic/tkCanvPs.c     | 2 +-
 generic/tkCanvas.c     | 4 ++--
 generic/tkEntry.c      | 2 +-
 generic/tkListbox.c    | 4 ++--
 generic/tkMenu.c       | 2 +-
 generic/tkText.c       | 2 +-
 generic/tkTextDisp.c   | 4 ++--
 generic/tkWindow.c     | 2 +-
 macosx/tkMacOSXScale.c | 2 +-
 unix/tkUnixScale.c     | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/generic/tkCanvPs.c b/generic/tkCanvPs.c
index 2cb4d27..bcd1d13 100644
--- a/generic/tkCanvPs.c
+++ b/generic/tkCanvPs.c
@@ -193,7 +193,7 @@ TkCanvPostscriptCmd(
      * such.
      */
 
-    result = Tcl_EvalEx(interp, "::tk::ensure_psenc_is_loaded", -1, 0);
+    result = Tcl_EvalEx(interp, "::tk::ensure_psenc_is_loaded", -1, TCL_EVAL_GLOBAL);
     if (result != TCL_OK) {
 	return result;
     }
diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c
index 8230122..9f661bc 100644
--- a/generic/tkCanvas.c
+++ b/generic/tkCanvas.c
@@ -5588,7 +5588,7 @@ CanvasUpdateScrollbars(
 	Tcl_DStringAppend(&buf, xScrollCmd, -1);
 	Tcl_DStringAppend(&buf, " ", -1);
 	Tcl_DStringAppend(&buf, Tcl_GetString(fractions), -1);
-	result = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, 0);
+	result = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, TCL_EVAL_GLOBAL);
 	Tcl_DStringFree(&buf);
 	Tcl_DecrRefCount(fractions);
 	if (result != TCL_OK) {
@@ -5606,7 +5606,7 @@ CanvasUpdateScrollbars(
 	Tcl_DStringAppend(&buf, yScrollCmd, -1);
 	Tcl_DStringAppend(&buf, " ", -1);
 	Tcl_DStringAppend(&buf, Tcl_GetString(fractions), -1);
-	result = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, 0);
+	result = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, TCL_EVAL_GLOBAL);
 	Tcl_DStringFree(&buf);
 	Tcl_DecrRefCount(fractions);
 	if (result != TCL_OK) {
diff --git a/generic/tkEntry.c b/generic/tkEntry.c
index fc5ba63..468eabe 100644
--- a/generic/tkEntry.c
+++ b/generic/tkEntry.c
@@ -3007,7 +3007,7 @@ EntryUpdateScrollbar(
     Tcl_DStringAppend(&buf, firstStr, -1);
     Tcl_DStringAppend(&buf, " ", -1);
     Tcl_DStringAppend(&buf, lastStr, -1);
-    code = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, 0);
+    code = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, TCL_EVAL_GLOBAL);
     Tcl_DStringFree(&buf);
     if (code != TCL_OK) {
 	Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
diff --git a/generic/tkListbox.c b/generic/tkListbox.c
index b00a895..514b349 100644
--- a/generic/tkListbox.c
+++ b/generic/tkListbox.c
@@ -3329,7 +3329,7 @@ ListboxUpdateVScrollbar(
     Tcl_DStringAppend(&buf, firstStr, -1);
     Tcl_DStringAppend(&buf, " ", -1);
     Tcl_DStringAppend(&buf, lastStr, -1);
-    result = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, 0);
+    result = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, TCL_EVAL_GLOBAL);
     Tcl_DStringFree(&buf);
     if (result != TCL_OK) {
 	Tcl_AddErrorInfo(interp,
@@ -3401,7 +3401,7 @@ ListboxUpdateHScrollbar(
     Tcl_DStringAppend(&buf, firstStr, -1);
     Tcl_DStringAppend(&buf, " ", -1);
     Tcl_DStringAppend(&buf, lastStr, -1);
-    result = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, 0);
+    result = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, TCL_EVAL_GLOBAL);
     Tcl_DStringFree(&buf);
     if (result != TCL_OK) {
 	Tcl_AddErrorInfo(interp,
diff --git a/generic/tkMenu.c b/generic/tkMenu.c
index 318930f..f43bbe0 100644
--- a/generic/tkMenu.c
+++ b/generic/tkMenu.c
@@ -1019,7 +1019,7 @@ TkInvokeMenu(
 	Tcl_DStringInit(&ds);
 	Tcl_DStringAppend(&ds, "tk::TearOffMenu ", -1);
 	Tcl_DStringAppend(&ds, Tk_PathName(menuPtr->tkwin), -1);
-	result = Tcl_EvalEx(interp, Tcl_DStringValue(&ds), -1, 0);
+	result = Tcl_EvalEx(interp, Tcl_DStringValue(&ds), -1, TCL_EVAL_GLOBAL);
 	Tcl_DStringFree(&ds);
     } else if ((mePtr->type == CHECK_BUTTON_ENTRY)
 	    && (mePtr->namePtr != NULL)) {
diff --git a/generic/tkText.c b/generic/tkText.c
index b696647..2ddfea1 100644
--- a/generic/tkText.c
+++ b/generic/tkText.c
@@ -5039,7 +5039,7 @@ DumpSegment(
 	Tcl_DStringAppend(&buf, Tcl_GetString(command), -1);
 	Tcl_DStringAppend(&buf, " ", -1);
 	Tcl_DStringAppend(&buf, Tcl_GetString(tuple), -1);
-	code = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, 0);
+	code = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, TCL_EVAL_GLOBAL);
 	Tcl_DStringFree(&buf);
 	if (code != TCL_OK) {
 	    Tcl_AddErrorInfo(interp,
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 2deeaf2..93b56aa 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -6527,7 +6527,7 @@ GetXView(
 	Tcl_DStringAppend(&buf, textPtr->xScrollCmd, -1);
 	Tcl_DStringAppend(&buf, buf1, -1);
 	Tcl_DStringAppend(&buf, buf2, -1);
-	code = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, 0);
+	code = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, TCL_EVAL_GLOBAL);
 	Tcl_DStringFree(&buf);
 	if (code != TCL_OK) {
 	    Tcl_AddErrorInfo(interp,
@@ -6812,7 +6812,7 @@ GetYView(
 	Tcl_DStringAppend(&buf, textPtr->yScrollCmd, -1);
 	Tcl_DStringAppend(&buf, buf1, -1);
 	Tcl_DStringAppend(&buf, buf2, -1);
-	code = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, 0);
+	code = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, TCL_EVAL_GLOBAL);
 	Tcl_DStringFree(&buf);
 	if (code != TCL_OK) {
 	    Tcl_AddErrorInfo(interp,
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index 121bb5a..8ec18e2 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.c
@@ -3339,7 +3339,7 @@ Initialize(
     tcl_findLibrary tk $tk_version $tk_patchLevel tk.tcl TK_LIBRARY tk_library\n\
   }\n\
 }\n\
-tkInit", -1, 0);
+tkInit", -1, TCL_EVAL_GLOBAL);
     }
     if (code == TCL_OK) {
 	/*
diff --git a/macosx/tkMacOSXScale.c b/macosx/tkMacOSXScale.c
index 0195ffb..6ea9f14 100644
--- a/macosx/tkMacOSXScale.c
+++ b/macosx/tkMacOSXScale.c
@@ -179,7 +179,7 @@ TkpDisplayScale(
 	Tcl_DStringAppend(&buf, scalePtr->command, -1);
 	Tcl_DStringAppend(&buf, " ", -1);
 	Tcl_DStringAppend(&buf, string, -1);
-	result = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, 0);
+	result = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, TCL_EVAL_GLOBAL);
 	Tcl_DStringFree(&buf);
 	if (result != TCL_OK) {
 	    Tcl_AddErrorInfo(interp, "\n    (command executed by scale)");
diff --git a/unix/tkUnixScale.c b/unix/tkUnixScale.c
index 778c010..9c6e4f3 100644
--- a/unix/tkUnixScale.c
+++ b/unix/tkUnixScale.c
@@ -575,7 +575,7 @@ TkpDisplayScale(
 	Tcl_DStringAppend(&buf, scalePtr->command, -1);
 	Tcl_DStringAppend(&buf, " ", -1);
 	Tcl_DStringAppend(&buf, string, -1);
-	result = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, 0);
+	result = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, TCL_EVAL_GLOBAL);
 	Tcl_DStringFree(&buf);
 	if (result != TCL_OK) {
 	    Tcl_AddErrorInfo(interp, "\n    (command executed by scale)");
-- 
cgit v0.12


From 28010d48e92cd516ab264586ddeff2233cc5eb4a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 9 Jun 2020 07:23:05 +0000
Subject: Remove many unnessesaary curly-braces in testcases

---
 tests/bind.test                 | 266 ++++++++++++++++++++--------------------
 tests/busy.test                 |   8 +-
 tests/button.test               |  80 ++++++------
 tests/canvPs.test               |   4 +-
 tests/canvText.test             |  16 +--
 tests/canvas.test               |  24 ++--
 tests/config.test               |  50 ++++----
 tests/dialog.test               |   4 +-
 tests/entry.test                | 148 +++++++++++-----------
 tests/font.test                 |  52 ++++----
 tests/fontchooser.test          |   8 +-
 tests/frame.test                |  64 +++++-----
 tests/geometry.test             |   2 +-
 tests/grid.test                 |  28 ++---
 tests/image.test                |   2 +-
 tests/imgBmap.test              |   2 +-
 tests/imgListFormat.test        |   2 +-
 tests/imgPNG.test               |   2 +-
 tests/imgPhoto.test             |  12 +-
 tests/imgSVGnano.test           |   4 +-
 tests/listbox.test              | 112 ++++++++---------
 tests/menu.test                 |  50 ++++----
 tests/menubut.test              |  24 ++--
 tests/message.test              |  14 +--
 tests/pack.test                 |  12 +-
 tests/panedwindow.test          |   4 +-
 tests/place.test                |  16 +--
 tests/safePrimarySelection.test |  32 ++---
 tests/scale.test                |  48 ++++----
 tests/spinbox.test              | 144 +++++++++++-----------
 tests/text.test                 | 156 +++++++++++------------
 tests/textDisp.test             |   2 +-
 tests/textTag.test              |  18 +--
 tests/textWind.test             |   4 +-
 tests/tk.test                   |  12 +-
 tests/ttk/entry.test            |  10 +-
 tests/ttk/spinbox.test          |   2 +-
 tests/ttk/treeview.test         |   4 +-
 tests/unixEmbed.test            |   4 +-
 tests/unixSelect.test           |   4 +-
 tests/util.test                 |   8 +-
 tests/visual.test               |   8 +-
 tests/winDialog.test            |  22 ++--
 tests/winFont.test              |  12 +-
 tests/winWm.test                |   2 +-
 tests/winfo.test                |  22 ++--
 tests/wm.test                   |  14 +--
 47 files changed, 769 insertions(+), 769 deletions(-)

diff --git a/tests/bind.test b/tests/bind.test
index adc628a..d516a6e 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -971,7 +971,7 @@ test bind-13.35 {Tk_BindEvent procedure: execute binding} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-13.38 {Tk_BindEvent procedure: binding gets to run} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1054,7 +1054,7 @@ test bind-15.1 {MatchPatterns procedure, ignoring type mismatches} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-15.2 {MatchPatterns procedure, ignoring type mismatches} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1072,7 +1072,7 @@ test bind-15.2 {MatchPatterns procedure, ignoring type mismatches} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-15.3 {MatchPatterns procedure, ignoring type mismatches} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1087,7 +1087,7 @@ test bind-15.3 {MatchPatterns procedure, ignoring type mismatches} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {0}
+} -result 0
 test bind-15.4 {MatchPatterns procedure, ignoring type mismatches} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1103,7 +1103,7 @@ test bind-15.4 {MatchPatterns procedure, ignoring type mismatches} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-15.5 {MatchPatterns procedure, ignoring type mismatches} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1119,7 +1119,7 @@ test bind-15.5 {MatchPatterns procedure, ignoring type mismatches} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-15.6 {MatchPatterns procedure, ignoring type mismatches} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1136,7 +1136,7 @@ test bind-15.6 {MatchPatterns procedure, ignoring type mismatches} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {0}
+} -result 0
 test bind-15.7 {MatchPatterns procedure, ignoring type mismatches} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1153,7 +1153,7 @@ test bind-15.7 {MatchPatterns procedure, ignoring type mismatches} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-15.8 {MatchPatterns procedure, ignoring type mismatches} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1168,7 +1168,7 @@ test bind-15.8 {MatchPatterns procedure, ignoring type mismatches} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {0}
+} -result 0
 test bind-15.9 {MatchPatterns procedure, modifier checks} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1181,7 +1181,7 @@ test bind-15.9 {MatchPatterns procedure, modifier checks} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-15.10 {MatchPatterns procedure, modifier checks} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1194,7 +1194,7 @@ test bind-15.10 {MatchPatterns procedure, modifier checks} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-15.11 {MatchPatterns procedure, modifier checks} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1207,7 +1207,7 @@ test bind-15.11 {MatchPatterns procedure, modifier checks} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {0}
+} -result 0
 test bind-15.12 {MatchPatterns procedure, ignore modifier presses and releases} -constraints {
     nonPortable
 } -setup {
@@ -1226,7 +1226,7 @@ test bind-15.12 {MatchPatterns procedure, ignore modifier presses and releases}
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-15.13 {MatchPatterns procedure, checking detail} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1240,7 +1240,7 @@ test bind-15.13 {MatchPatterns procedure, checking detail} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {0}
+} -result 0
 test bind-15.14 {MatchPatterns procedure, checking "nearby"} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1257,7 +1257,7 @@ test bind-15.14 {MatchPatterns procedure, checking "nearby"} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-15.15 {MatchPatterns procedure, checking "nearby"} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1274,7 +1274,7 @@ test bind-15.15 {MatchPatterns procedure, checking "nearby"} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-15.16 {MatchPatterns procedure, checking "nearby"} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1291,7 +1291,7 @@ test bind-15.16 {MatchPatterns procedure, checking "nearby"} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {0}
+} -result 0
 test bind-15.17 {MatchPatterns procedure, checking "nearby"} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1308,7 +1308,7 @@ test bind-15.17 {MatchPatterns procedure, checking "nearby"} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {0}
+} -result 0
 test bind-15.18 {MatchPatterns procedure, checking "nearby"} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1325,7 +1325,7 @@ test bind-15.18 {MatchPatterns procedure, checking "nearby"} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {0}
+} -result 0
 test bind-15.19 {MatchPatterns procedure, checking "nearby"} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1342,7 +1342,7 @@ test bind-15.19 {MatchPatterns procedure, checking "nearby"} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {0}
+} -result 0
 test bind-15.20 {MatchPatterns procedure, checking "nearby"} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1359,7 +1359,7 @@ test bind-15.20 {MatchPatterns procedure, checking "nearby"} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-15.21 {MatchPatterns procedure, checking "nearby"} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1376,7 +1376,7 @@ test bind-15.21 {MatchPatterns procedure, checking "nearby"} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {0}
+} -result 0
 test bind-15.22 {MatchPatterns procedure, time wrap-around} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1391,7 +1391,7 @@ test bind-15.22 {MatchPatterns procedure, time wrap-around} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-15.23 {MatchPatterns procedure, time wrap-around} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1406,7 +1406,7 @@ test bind-15.23 {MatchPatterns procedure, time wrap-around} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {0}
+} -result 0
 test bind-15.24 {MatchPatterns procedure, virtual event} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1479,7 +1479,7 @@ test bind-15.27 {MatchPatterns procedure, conflict resolution} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-15.28 {MatchPatterns procedure, conflict resolution} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1493,7 +1493,7 @@ test bind-15.28 {MatchPatterns procedure, conflict resolution} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {0}
+} -result 0
 test bind-15.29 {MatchPatterns procedure, conflict resolution} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1525,7 +1525,7 @@ test bind-15.30 {MatchPatterns procedure, conflict resolution} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-15.31 {MatchPatterns procedure, conflict resolution} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1539,7 +1539,7 @@ test bind-15.31 {MatchPatterns procedure, conflict resolution} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-15.32 {MatchPatterns procedure, conflict resolution} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1553,7 +1553,7 @@ test bind-15.32 {MatchPatterns procedure, conflict resolution} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-15.33 {MatchPatterns procedure, conflict resolution} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1601,7 +1601,7 @@ test bind-16.2 {ExpandPercents procedure} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {1234}
+} -result 1234
 test bind-16.3 {ExpandPercents procedure} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1628,7 +1628,7 @@ test bind-16.4 {ExpandPercents procedure} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {3}
+} -result 3
 test bind-16.5 {ExpandPercents procedure} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1641,7 +1641,7 @@ test bind-16.5 {ExpandPercents procedure} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {47}
+} -result 47
 test bind-16.6 {ExpandPercents procedure} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1745,7 +1745,7 @@ test bind-16.13 {ExpandPercents procedure} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-16.14 {ExpandPercents procedure} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1784,7 +1784,7 @@ test bind-16.16 {ExpandPercents procedure} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {146}
+} -result 146
 test bind-16.17 {ExpandPercents procedure} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1850,7 +1850,7 @@ test bind-16.21 {ExpandPercents procedure} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-16.22 {ExpandPercents procedure} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1863,7 +1863,7 @@ test bind-16.22 {ExpandPercents procedure} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-16.23 {ExpandPercents procedure} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1876,7 +1876,7 @@ test bind-16.23 {ExpandPercents procedure} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-16.24 {ExpandPercents procedure} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1916,7 +1916,7 @@ test bind-16.26 {ExpandPercents procedure} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {1402}
+} -result 1402
 test bind-16.27 {ExpandPercents procedure} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1929,7 +1929,7 @@ test bind-16.27 {ExpandPercents procedure} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {1023}
+} -result 1023
 test bind-16.28 {ExpandPercents procedure} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -1982,7 +1982,7 @@ test bind-16.31 {ExpandPercents procedure} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {4294}
+} -result 4294
 test bind-16.32 {ExpandPercents procedure} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -2061,7 +2061,7 @@ test bind-16.36 {ExpandPercents procedure} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {24}
+} -result 24
 test bind-16.37 {ExpandPercents procedure} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -2074,7 +2074,7 @@ test bind-16.37 {ExpandPercents procedure} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-16.38 {ExpandPercents procedure} -constraints {
     nonPortable
 } -setup {
@@ -2109,7 +2109,7 @@ test bind-16.39 {ExpandPercents procedure} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {32}
+} -result 32
 test bind-16.40 {ExpandPercents procedure} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -2135,7 +2135,7 @@ test bind-16.41 {ExpandPercents procedure} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {2}
+} -result 2
 test bind-16.42 {ExpandPercents procedure} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -2321,7 +2321,7 @@ test bind-17.16 {event command: generate} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-17.17 {event command: generate} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -2463,7 +2463,7 @@ test bind-19.11 {DeleteVirtualEvent procedure: owned by 1, only} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {101}
+} -result 101
 test bind-19.12 {DeleteVirtualEvent procedure: owned by 1, first in chain} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -2801,7 +2801,7 @@ test bind-22.11 {HandleEventGenerate} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-22.12 {HandleEventGenerate} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -2814,7 +2814,7 @@ test bind-22.12 {HandleEventGenerate} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {4}
+} -result 4
 test bind-22.13 {HandleEventGenerate} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -2828,7 +2828,7 @@ test bind-22.13 {HandleEventGenerate} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {100}
+} -result 100
 test bind-22.14 {HandleEventGenerate} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -2984,7 +2984,7 @@ test bind-22.25 {HandleEventGenerate: options <Configure> -borderwidth 2i} -setu
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.26 {HandleEventGenerate: options <Key> -borderwidth 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3078,7 +3078,7 @@ test bind-22.32 {HandleEventGenerate: options <Expose> -count 20} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {20}
+} -result 20
 
 test bind-22.33 {HandleEventGenerate: options <Key> -count 20} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3186,7 +3186,7 @@ test bind-22.39 {HandleEventGenerate: options <Enter> -focus 1} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.40 {HandleEventGenerate: options <Key> -focus 1} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3226,7 +3226,7 @@ test bind-22.42 {HandleEventGenerate: options <Expose> -height 2i} -setup {
     expr {$x eq [winfo pixels .t.f 2i]}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.43 {HandleEventGenerate: options <Configure> -height 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3240,7 +3240,7 @@ test bind-22.43 {HandleEventGenerate: options <Configure> -height 2i} -setup {
     expr {$x eq [winfo pixels .t.f 2i]}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.44 {HandleEventGenerate: options <Key> -height 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3280,7 +3280,7 @@ test bind-22.46 {HandleEventGenerate: options <Key> -keycode 20} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {20}
+} -result 20
 
 test bind-22.47 {HandleEventGenerate: options <Button> -keycode 20} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3413,7 +3413,7 @@ test bind-22.56 {HandleEventGenerate: options <Map> -override 1} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.57 {HandleEventGenerate: options <Reparent> -override 1} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3427,7 +3427,7 @@ test bind-22.57 {HandleEventGenerate: options <Reparent> -override 1} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.58 {HandleEventGenerate: options <Configure> -override 1} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3441,7 +3441,7 @@ test bind-22.58 {HandleEventGenerate: options <Configure> -override 1} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.59 {HandleEventGenerate: options <Key> -override 1} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3521,7 +3521,7 @@ test bind-22.64 {HandleEventGenerate: options <Key> -root .t} -setup {
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.65 {HandleEventGenerate: options <Key> -root xyz} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3548,7 +3548,7 @@ test bind-22.66 {HandleEventGenerate: options <Key> -root [winfo id .t]} -setup
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.67 {HandleEventGenerate: options <Button> -root .t} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3562,7 +3562,7 @@ test bind-22.67 {HandleEventGenerate: options <Button> -root .t} -setup {
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.68 {HandleEventGenerate: options <ButtonRelease> -root .t} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3576,7 +3576,7 @@ test bind-22.68 {HandleEventGenerate: options <ButtonRelease> -root .t} -setup {
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.69 {HandleEventGenerate: options <Motion> -root .t} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3590,7 +3590,7 @@ test bind-22.69 {HandleEventGenerate: options <Motion> -root .t} -setup {
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.70 {HandleEventGenerate: options <<Paste>> -root .t} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3604,7 +3604,7 @@ test bind-22.70 {HandleEventGenerate: options <<Paste>> -root .t} -setup {
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.71 {HandleEventGenerate: options <Enter> -root .t} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3618,7 +3618,7 @@ test bind-22.71 {HandleEventGenerate: options <Enter> -root .t} -setup {
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.72 {HandleEventGenerate: options <Configure> -root .t} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3658,7 +3658,7 @@ test bind-22.74 {HandleEventGenerate: options <Key> -rootx 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.75 {HandleEventGenerate: options <Button> -rootx 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3672,7 +3672,7 @@ test bind-22.75 {HandleEventGenerate: options <Button> -rootx 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.76 {HandleEventGenerate: options <ButtonRelease> -rootx 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3686,7 +3686,7 @@ test bind-22.76 {HandleEventGenerate: options <ButtonRelease> -rootx 2i} -setup
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.77 {HandleEventGenerate: options <Motion> -rootx 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3700,7 +3700,7 @@ test bind-22.77 {HandleEventGenerate: options <Motion> -rootx 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.78 {HandleEventGenerate: options <<Paste>> -rootx 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3714,7 +3714,7 @@ test bind-22.78 {HandleEventGenerate: options <<Paste>> -rootx 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.79 {HandleEventGenerate: options <Enter> -rootx 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3728,7 +3728,7 @@ test bind-22.79 {HandleEventGenerate: options <Enter> -rootx 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.80 {HandleEventGenerate: options <Configure> -rootx 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3768,7 +3768,7 @@ test bind-22.82 {HandleEventGenerate: options <Key> -rooty 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.83 {HandleEventGenerate: options <Button> -rooty 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3782,7 +3782,7 @@ test bind-22.83 {HandleEventGenerate: options <Button> -rooty 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.84 {HandleEventGenerate: options <ButtonRelease> -rooty 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3796,7 +3796,7 @@ test bind-22.84 {HandleEventGenerate: options <ButtonRelease> -rooty 2i} -setup
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.85 {HandleEventGenerate: options <Motion> -rooty 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3810,7 +3810,7 @@ test bind-22.85 {HandleEventGenerate: options <Motion> -rooty 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.86 {HandleEventGenerate: options <<Paste>> -rooty 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3824,7 +3824,7 @@ test bind-22.86 {HandleEventGenerate: options <<Paste>> -rooty 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.87 {HandleEventGenerate: options <Enter> -rooty 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3838,7 +3838,7 @@ test bind-22.87 {HandleEventGenerate: options <Enter> -rooty 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.88 {HandleEventGenerate: options <Configure> -rooty 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3878,7 +3878,7 @@ test bind-22.90 {HandleEventGenerate: options <Key> -sendevent 1} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.91 {HandleEventGenerate: options <Key> -sendevent yes} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3892,7 +3892,7 @@ test bind-22.91 {HandleEventGenerate: options <Key> -sendevent yes} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.92 {HandleEventGenerate: options <Key> -sendevent 43} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3906,7 +3906,7 @@ test bind-22.92 {HandleEventGenerate: options <Key> -sendevent 43} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.93 {HandleEventGenerate: options <Key> -serial xyz} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3933,7 +3933,7 @@ test bind-22.94 {HandleEventGenerate: options <Key> -serial 100} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {100}
+} -result 100
 
 test bind-22.95 {HandleEventGenerate: options <Key> -state xyz} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3960,7 +3960,7 @@ test bind-22.96 {HandleEventGenerate: options <Key> -state 1} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.97 {HandleEventGenerate: options <Button> -state 1025} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3974,7 +3974,7 @@ test bind-22.97 {HandleEventGenerate: options <Button> -state 1025} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1025}
+} -result 1025
 
 test bind-22.98 {HandleEventGenerate: options <ButtonRelease> -state 1025} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -3988,7 +3988,7 @@ test bind-22.98 {HandleEventGenerate: options <ButtonRelease> -state 1025} -setu
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1025}
+} -result 1025
 
 test bind-22.99 {HandleEventGenerate: options <Motion> -state 1} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4002,7 +4002,7 @@ test bind-22.99 {HandleEventGenerate: options <Motion> -state 1} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.100 {HandleEventGenerate: options <<Paste>> -state 1} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4016,7 +4016,7 @@ test bind-22.100 {HandleEventGenerate: options <<Paste>> -state 1} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.101 {HandleEventGenerate: options <Enter> -state 1} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4030,7 +4030,7 @@ test bind-22.101 {HandleEventGenerate: options <Enter> -state 1} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.102 {HandleEventGenerate: options <Visibility> -state xyz} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4097,7 +4097,7 @@ test bind-22.106 {HandleEventGenerate: options <Key> -subwindow .t} -setup {
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.107 {HandleEventGenerate: options <Key> -subwindow xyz} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4124,7 +4124,7 @@ test bind-22.108 {HandleEventGenerate: options <Key> -subwindow [winfo id .t]} -
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.109 {HandleEventGenerate: options <Button> -subwindow .t} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4138,7 +4138,7 @@ test bind-22.109 {HandleEventGenerate: options <Button> -subwindow .t} -setup {
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.110 {HandleEventGenerate: options <ButtonRelease> -subwindow .t} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4152,7 +4152,7 @@ test bind-22.110 {HandleEventGenerate: options <ButtonRelease> -subwindow .t} -s
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.111 {HandleEventGenerate: options <Motion> -subwindow .t} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4166,7 +4166,7 @@ test bind-22.111 {HandleEventGenerate: options <Motion> -subwindow .t} -setup {
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.112 {HandleEventGenerate: options <<Paste>> -subwindow .t} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4180,7 +4180,7 @@ test bind-22.112 {HandleEventGenerate: options <<Paste>> -subwindow .t} -setup {
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.113 {HandleEventGenerate: options <Enter> -subwindow .t} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4194,7 +4194,7 @@ test bind-22.113 {HandleEventGenerate: options <Enter> -subwindow .t} -setup {
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.114 {HandleEventGenerate: options <Configure> -subwindow .t} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4234,7 +4234,7 @@ test bind-22.116 {HandleEventGenerate: options <Key> -time 100} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {100}
+} -result 100
 
 test bind-22.117 {HandleEventGenerate: options <Button> -time 100} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4248,7 +4248,7 @@ test bind-22.117 {HandleEventGenerate: options <Button> -time 100} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {100}
+} -result 100
 
 test bind-22.118 {HandleEventGenerate: options <ButtonRelease> -time 100} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4262,7 +4262,7 @@ test bind-22.118 {HandleEventGenerate: options <ButtonRelease> -time 100} -setup
     return $x
 } -cleanup {
     destroy .t.f
-} -result {100}
+} -result 100
 
 test bind-22.119 {HandleEventGenerate: options <Motion> -time 100} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4276,7 +4276,7 @@ test bind-22.119 {HandleEventGenerate: options <Motion> -time 100} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {100}
+} -result 100
 
 test bind-22.120 {HandleEventGenerate: options <<Paste>> -time 100} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4290,7 +4290,7 @@ test bind-22.120 {HandleEventGenerate: options <<Paste>> -time 100} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {100}
+} -result 100
 
 test bind-22.121 {HandleEventGenerate: options <Enter> -time 100} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4304,7 +4304,7 @@ test bind-22.121 {HandleEventGenerate: options <Enter> -time 100} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {100}
+} -result 100
 
 test bind-22.122 {HandleEventGenerate: options <Property> -time 100} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4318,7 +4318,7 @@ test bind-22.122 {HandleEventGenerate: options <Property> -time 100} -setup {
     return $x
 } -cleanup {
     destroy .t.f
-} -result {100}
+} -result 100
 
 test bind-22.123 {HandleEventGenerate: options <Configure> -time 100} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4358,7 +4358,7 @@ test bind-22.125 {HandleEventGenerate: options <Expose> -width 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.126 {HandleEventGenerate: options <Configure> -width 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4372,7 +4372,7 @@ test bind-22.126 {HandleEventGenerate: options <Configure> -width 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.127 {HandleEventGenerate: options <Key> -width 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4563,7 +4563,7 @@ test bind-22.140 {HandleEventGenerate: options <Key> -x 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.141 {HandleEventGenerate: options <Button> -x 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4577,7 +4577,7 @@ test bind-22.141 {HandleEventGenerate: options <Button> -x 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.142 {HandleEventGenerate: options <ButtonRelease> -x 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4591,7 +4591,7 @@ test bind-22.142 {HandleEventGenerate: options <ButtonRelease> -x 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.143 {HandleEventGenerate: options <Motion> -x 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4605,7 +4605,7 @@ test bind-22.143 {HandleEventGenerate: options <Motion> -x 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.144 {HandleEventGenerate: options <<Paste>> -x 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4619,7 +4619,7 @@ test bind-22.144 {HandleEventGenerate: options <<Paste>> -x 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.145 {HandleEventGenerate: options <Enter> -x 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4633,7 +4633,7 @@ test bind-22.145 {HandleEventGenerate: options <Enter> -x 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.146 {HandleEventGenerate: options <Expose> -x 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4647,7 +4647,7 @@ test bind-22.146 {HandleEventGenerate: options <Expose> -x 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.147 {HandleEventGenerate: options <Configure> -x 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4661,7 +4661,7 @@ test bind-22.147 {HandleEventGenerate: options <Configure> -x 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.148 {HandleEventGenerate: options <Gravity> -x 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4675,7 +4675,7 @@ test bind-22.148 {HandleEventGenerate: options <Gravity> -x 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.149 {HandleEventGenerate: options <Reparent> -x 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4689,7 +4689,7 @@ test bind-22.149 {HandleEventGenerate: options <Reparent> -x 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.150 {HandleEventGenerate: options <Map> -x 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4729,7 +4729,7 @@ test bind-22.152 {HandleEventGenerate: options <Key> -y 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.153 {HandleEventGenerate: options <Button> -y 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4743,7 +4743,7 @@ test bind-22.153 {HandleEventGenerate: options <Button> -y 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.154 {HandleEventGenerate: options <ButtonRelease> -y 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4757,7 +4757,7 @@ test bind-22.154 {HandleEventGenerate: options <ButtonRelease> -y 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.155 {HandleEventGenerate: options <Motion> -y 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4771,7 +4771,7 @@ test bind-22.155 {HandleEventGenerate: options <Motion> -y 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.156 {HandleEventGenerate: options <<Paste>> -y 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4785,7 +4785,7 @@ test bind-22.156 {HandleEventGenerate: options <<Paste>> -y 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.157 {HandleEventGenerate: options <Enter> -y 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4799,7 +4799,7 @@ test bind-22.157 {HandleEventGenerate: options <Enter> -y 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.158 {HandleEventGenerate: options <Expose> -y 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4813,7 +4813,7 @@ test bind-22.158 {HandleEventGenerate: options <Expose> -y 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.159 {HandleEventGenerate: options <Configure> -y 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4827,7 +4827,7 @@ test bind-22.159 {HandleEventGenerate: options <Configure> -y 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.160 {HandleEventGenerate: options <Gravity> -y 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4841,7 +4841,7 @@ test bind-22.160 {HandleEventGenerate: options <Gravity> -y 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.161 {HandleEventGenerate: options <Reparent> -y 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -4855,7 +4855,7 @@ test bind-22.161 {HandleEventGenerate: options <Reparent> -y 2i} -setup {
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 
 test bind-22.162 {HandleEventGenerate: options <Map> -y 2i} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -6118,7 +6118,7 @@ test bind-30.2 {MouseWheel events} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {120}
+} -result 120
 test bind-30.3 {MouseWheel events} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
@@ -6414,7 +6414,7 @@ test bind-32.12 {don't detect repetition when window has changed} -setup {
 } -cleanup {
     destroy .t.f
     destroy .t.g
-} -result {1}
+} -result 1
 test bind-32.13 {don't detect repetition when window has changed} -setup {
     pack [frame .t.f]
     pack [frame .t.g]
@@ -6446,7 +6446,7 @@ test bind-32.14 {don't detect repetition when window has changed} -setup {
 } -cleanup {
     destroy .t.f
     destroy .t.g
-} -result {1}
+} -result 1
 test bind-32.15 {reset button state when destroying window} -setup {
     set x {}
 } -body {
@@ -6461,7 +6461,7 @@ test bind-32.15 {reset button state when destroying window} -setup {
     event generate .t.f <Button-1>
     destroy .t.f
     set x
-} -result {1}
+} -result 1
 
 test bind-33.1 {prefer longest match} -setup {
     pack [frame .t.f]
@@ -6521,7 +6521,7 @@ test bind-33.4 {prefer most specific event} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {11}
+} -result 11
 test bind-33.5 {prefer most specific event} -setup {
     pack [frame .t.f]
     focus -force .t.f
@@ -6535,7 +6535,7 @@ test bind-33.5 {prefer most specific event} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {11}
+} -result 11
 test bind-33.6 {prefer most specific event} -setup {
     pack [frame .t.f]
     focus -force .t.f
@@ -6553,7 +6553,7 @@ test bind-33.6 {prefer most specific event} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {1111}
+} -result 1111
 test bind-33.7 {prefer most specific event} -setup {
     pack [frame .t.f]
     focus -force .t.f
@@ -6567,7 +6567,7 @@ test bind-33.7 {prefer most specific event} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-33.8 {prefer most specific event} -setup {
     pack [frame .t.f]
     focus -force .t.f
@@ -6582,7 +6582,7 @@ test bind-33.8 {prefer most specific event} -setup {
     set x
 } -cleanup {
     destroy .t.f
-} -result {1}
+} -result 1
 test bind-33.9 {prefer last in case of homogeneous equal patterns} -setup {
     pack [frame .t.f]
     focus -force .t.f
@@ -6737,7 +6737,7 @@ test bind-34.1 {-warp works relatively to a window} -setup {
     set res
 } -cleanup {
     destroy .top
-} -result {1}
+} -result 1
 test bind-34.2 {-warp works relatively to the screen} -setup {
 } -body {
     # Contrary to bind-34.1, we're directly checking screen coordinates
diff --git a/tests/busy.test b/tests/busy.test
index 001bb6c..6a1263f 100644
--- a/tests/busy.test
+++ b/tests/busy.test
@@ -350,14 +350,14 @@ test busy-6.1 {tk busy status} -returnCodes error -body {
 } -result {wrong # args: should be "tk busy status window"}
 test busy-6.2 {tk busy status non existing window} -body {
     tk busy status .f
-} -result {0}
+} -result 0
 test busy-6.3 {tk busy status non busy window} -setup {
     pack [frame .f]
 } -body {
     tk busy status .f
 } -cleanup {
     destroy .f
-} -result {0}
+} -result 0
 test busy-6.4 {tk busy status busy window} -setup {
     pack [frame .f]
     tk busy hold .f
@@ -367,7 +367,7 @@ test busy-6.4 {tk busy status busy window} -setup {
 } -cleanup {
     tk busy forget .f
     destroy .f
-} -result {1}
+} -result 1
 test busy-6.5 {tk busy status forgotten busy window} -setup {
     pack [frame .f]
     tk busy hold .f
@@ -377,7 +377,7 @@ test busy-6.5 {tk busy status forgotten busy window} -setup {
     tk busy status .f
 } -cleanup {
     destroy .f
-} -result {0}
+} -result 0
 
 test busy-7.1 {tk busy current no busy} -body {
     tk busy current
diff --git a/tests/button.test b/tests/button.test
index f3292b31..9a69b1b 100644
--- a/tests/button.test
+++ b/tests/button.test
@@ -334,7 +334,7 @@ test button-1.33 {configuration option: "bd" for label} -setup {
     .l cget -bd
 } -cleanup {
     destroy .l
-} -result {4}
+} -result 4
 test button-1.34 {configuration option: "bd" for label} -setup {
     label .l -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .l
@@ -353,7 +353,7 @@ test button-1.35 {configuration option: "bd" for button} -setup {
     .b cget -bd
 } -cleanup {
     destroy .b
-} -result {4}
+} -result 4
 test button-1.36 {configuration option: "bd" for button} -setup {
     button .b -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .b
@@ -372,7 +372,7 @@ test button-1.37 {configuration option: "bd" for checkbutton} -setup {
     .c cget -bd
 } -cleanup {
     destroy .c
-} -result {4}
+} -result 4
 test button-1.38 {configuration option: "bd" for checkbutton} -setup {
     checkbutton .c -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .c
@@ -391,7 +391,7 @@ test button-1.39 {configuration option: "bd" for radiobutton} -setup {
     .r cget -bd
 } -cleanup {
     destroy .r
-} -result {4}
+} -result 4
 test button-1.40 {configuration option: "bd" for radiobutton} -setup {
     radiobutton .r -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .r
@@ -1165,7 +1165,7 @@ test button-1.119 {configuration option: "height" for label} -setup {
     .l cget -height
 } -cleanup {
     destroy .l
-} -result {18}
+} -result 18
 test button-1.120 {configuration option: "height" for label} -setup {
     label .l -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .l
@@ -1184,7 +1184,7 @@ test button-1.121 {configuration option: "height" for button} -setup {
     .b cget -height
 } -cleanup {
     destroy .b
-} -result {18}
+} -result 18
 test button-1.122 {configuration option: "height" for button} -setup {
     button .b -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .b
@@ -1203,7 +1203,7 @@ test button-1.123 {configuration option: "height" for checkbutton} -setup {
     .c cget -height
 } -cleanup {
     destroy .c
-} -result {18}
+} -result 18
 test button-1.124 {configuration option: "height" for checkbutton} -setup {
     checkbutton .c -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .c
@@ -1222,7 +1222,7 @@ test button-1.125 {configuration option: "height" for radiobutton} -setup {
     .r cget -height
 } -cleanup {
     destroy .r
-} -result {18}
+} -result 18
 test button-1.126 {configuration option: "height" for radiobutton} -setup {
     radiobutton .r -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .r
@@ -1566,7 +1566,7 @@ test button-1.159 {configuration option: "indicatoron" for checkbutton} -setup {
     .c cget -indicatoron
 } -cleanup {
     destroy .c
-} -result {1}
+} -result 1
 test button-1.160 {configuration option: "indicatoron" for checkbutton} -setup {
     checkbutton .c -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .c
@@ -1585,7 +1585,7 @@ test button-1.161 {configuration option: "indicatoron" for radiobutton} -setup {
     .r cget -indicatoron
 } -cleanup {
     destroy .r
-} -result {1}
+} -result 1
 test button-1.162 {configuration option: "indicatoron" for radiobutton} -setup {
     radiobutton .r -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .r
@@ -1955,7 +1955,7 @@ test button-1.199 {configuration option: "repeatdelay" for button} -setup {
     .b cget -repeatdelay
 } -cleanup {
     destroy .b
-} -result {100}
+} -result 100
 test button-1.200 {configuration option: "repeatdelay" for button} -setup {
     button .b -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .b
@@ -1975,7 +1975,7 @@ test button-1.201 {configuration option: "repeatinterval" for button} -setup {
     .b cget -repeatinterval
 } -cleanup {
     destroy .b
-} -result {100}
+} -result 100
 test button-1.202 {configuration option: "repeatinterval" for button} -setup {
     button .b -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .b
@@ -2405,7 +2405,7 @@ test button-1.243 {configuration option: "underline" for label} -setup {
     .l cget -underline
 } -cleanup {
     destroy .l
-} -result {5}
+} -result 5
 test button-1.244 {configuration option: "underline" for label} -setup {
     label .l -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .l
@@ -2424,7 +2424,7 @@ test button-1.245 {configuration option: "underline" for button} -setup {
     .b cget -underline
 } -cleanup {
     destroy .b
-} -result {5}
+} -result 5
 test button-1.246 {configuration option: "underline" for button} -setup {
     button .b -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .b
@@ -2443,7 +2443,7 @@ test button-1.247 {configuration option: "underline" for checkbutton} -setup {
     .c cget -underline
 } -cleanup {
     destroy .c
-} -result {5}
+} -result 5
 test button-1.248 {configuration option: "underline" for checkbutton} -setup {
     checkbutton .c -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .c
@@ -2462,7 +2462,7 @@ test button-1.249 {configuration option: "underline" for radiobutton} -setup {
     .r cget -underline
 } -cleanup {
     destroy .r
-} -result {5}
+} -result 5
 test button-1.250 {configuration option: "underline" for radiobutton} -setup {
     radiobutton .r -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .r
@@ -2514,7 +2514,7 @@ test button-1.254 {configuration option: "width" for label} -setup {
     .l cget -width
 } -cleanup {
     destroy .l
-} -result {402}
+} -result 402
 test button-1.255 {configuration option: "width" for label} -setup {
     label .l -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .l
@@ -2533,7 +2533,7 @@ test button-1.256 {configuration option: "width" for button} -setup {
     .b cget -width
 } -cleanup {
     destroy .b
-} -result {402}
+} -result 402
 test button-1.257 {configuration option: "width" for button} -setup {
     button .b -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .b
@@ -2552,7 +2552,7 @@ test button-1.258 {configuration option: "width" for checkbutton} -setup {
     .c cget -width
 } -cleanup {
     destroy .c
-} -result {402}
+} -result 402
 test button-1.259 {configuration option: "width" for checkbutton} -setup {
     checkbutton .c -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .c
@@ -2571,7 +2571,7 @@ test button-1.260 {configuration option: "width" for radiobutton} -setup {
     .r cget -width
 } -cleanup {
     destroy .r
-} -result {402}
+} -result 402
 test button-1.261 {configuration option: "width" for radiobutton} -setup {
     radiobutton .r -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .r
@@ -2591,7 +2591,7 @@ test button-1.262 {configuration option: "wraplength" for label} -setup {
     .l cget -wraplength
 } -cleanup {
     destroy .l
-} -result {100}
+} -result 100
 test button-1.263 {configuration option: "wraplength" for label} -setup {
     label .l -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .l
@@ -2610,7 +2610,7 @@ test button-1.264 {configuration option: "wraplength" for button} -setup {
     .b cget -wraplength
 } -cleanup {
     destroy .b
-} -result {100}
+} -result 100
 test button-1.265 {configuration option: "wraplength" for button} -setup {
     button .b -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .b
@@ -2629,7 +2629,7 @@ test button-1.266 {configuration option: "wraplength" for checkbutton} -setup {
     .c cget -wraplength
 } -cleanup {
     destroy .c
-} -result {100}
+} -result 100
 test button-1.267 {configuration option: "wraplength" for checkbutton} -setup {
     checkbutton .c -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .c
@@ -2648,7 +2648,7 @@ test button-1.268 {configuration option: "wraplength" for radiobutton} -setup {
     .r cget -wraplength
 } -cleanup {
     destroy .r
-} -result {100}
+} -result 100
 test button-1.269 {configuration option: "wraplength" for radiobutton} -setup {
     radiobutton .r -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .r
@@ -2834,13 +2834,13 @@ test button-3.13 {ButtonWidgetCmd procedure, "configure" option} -body {
     lindex [.b configure -highlightthickness] 4
 } -cleanup {
     destroy .b
-}  -result {3}
+}  -result 3
 test button-3.14 {ButtonWidgetCmd procedure, "configure" option} -body {
     checkbutton .c
     llength [.c configure]
 } -cleanup {
     destroy .c
-} -result {41}
+} -result 41
 test button-3.15 {ButtonWidgetCmd procedure, "configure" option} -body {
     button .b
     .b configure -gorp
@@ -2889,7 +2889,7 @@ test button-3.21 {ButtonWidgetCmd procedure, "deselect" option} -body {
     return $checkvar
 } -cleanup {
     destroy .c
-} -result {0}
+} -result 0
 test button-3.22 {ButtonWidgetCmd procedure, "deselect" option} -body {
     radiobutton .r -variable radiovar -value red
     set radiovar green
@@ -3249,7 +3249,7 @@ test button-5.4 {ConfigureButton - variable trace} -body {  ;# ex 6.2a
     return $y
 } -cleanup {
     destroy .c
-} -result {1}
+} -result 1
 
 test button-5.5 {ConfigureButton - image handling} -constraints {
     testImageType
@@ -3282,7 +3282,7 @@ test button-5.7 {ConfigureButton - setting selected state from variable} -body {
     return $y
 } -cleanup {
     destroy .c
-} -result {0}
+} -result 0
 test button-5.8 {ConfigureButton - setting selected state from variable} -setup {
     unset -nocomplain x
 } -body {
@@ -3487,7 +3487,7 @@ test button-5.25 {ConfigureButton - computing geometry} -setup {
     expr {$old == $new}
 } -cleanup {
     destroy .b
-} -result {0}
+} -result 0
 
 test button-6.1 {ButtonEventProc procedure} -body {
     button .b -text "Test Button" -command {
@@ -3554,7 +3554,7 @@ test button-8.3 {TkInvokeButton procedure} -setup {
 } -cleanup {
     destroy .c
     trace vdelete x w bogusTrace
-} -result {1}
+} -result 1
 test button-8.4 {TkInvokeButton procedure} -setup {
     set x 1
 } -body {
@@ -3575,7 +3575,7 @@ test button-8.5 {TkInvokeButton procedure} -setup {
 } -cleanup {
     destroy .c
     trace vdelete x w bogusTrace
-} -result {0}
+} -result 0
 
 test button-8.6 {TkInvokeButton procedure} -setup {
     set x 0
@@ -3665,7 +3665,7 @@ test button-9.2 {ButtonVarProc procedure} -body {
     return $x
 } -cleanup {
     destroy .c
-} -result {1}
+} -result 1
 test button-9.3 {ButtonVarProc procedure} -setup {
     set x 1
 } -body {
@@ -3675,7 +3675,7 @@ test button-9.3 {ButtonVarProc procedure} -setup {
     return $x
 } -cleanup {
     destroy .c
-} -result {1}
+} -result 1
 test button-9.4 {ButtonVarProc procedure} -setup {
     set x 0
 } -body {
@@ -3685,7 +3685,7 @@ test button-9.4 {ButtonVarProc procedure} -setup {
     return $x
 } -cleanup {
     destroy .c
-} -result {0}
+} -result 0
 test button-9.5 {ButtonVarProc procedure} -setup {
     set x 1
 } -body {
@@ -3695,7 +3695,7 @@ test button-9.5 {ButtonVarProc procedure} -setup {
     return $x
 } -cleanup {
     destroy .c
-} -result {0}
+} -result 0
 test button-9.6 {ButtonVarProc procedure} -setup {
     set x 0
 } -body {
@@ -3705,7 +3705,7 @@ test button-9.6 {ButtonVarProc procedure} -setup {
     return $x
 } -cleanup {
     destroy .c
-} -result {1}
+} -result 1
 test button-9.7 {ButtonVarProc procedure} -setup {
     set x 1
 } -body {
@@ -3715,7 +3715,7 @@ test button-9.7 {ButtonVarProc procedure} -setup {
     return $x
 } -cleanup {
     destroy .c
-} -result {1}
+} -result 1
 test button-9.8 {ButtonVarProc procedure, can't read variable} -setup {
 # This test does nothing but produce a core dump if there's a prbblem.
     unset -nocomplain a
@@ -3751,7 +3751,7 @@ test button-10.2 {ButtonTextVarProc procedure} -setup {
     expr {$old == $new}
 } -cleanup {
     destroy .b
-} -result {0}
+} -result 0
 
 test button-11.1 {ButtonImageProc procedure} -constraints {
     testImageType
@@ -3780,7 +3780,7 @@ test button-12.1 {button widget vs hidden commands} -body {
     expr {$res1 == $res2}
 } -cleanup {
     destroy .b
-} -result {1}
+} -result 1
 
 test button-13.1 {size behavior: label} -setup {
     label .a -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
diff --git a/tests/canvPs.test b/tests/canvPs.test
index eb09af9..aa69336 100644
--- a/tests/canvPs.test
+++ b/tests/canvPs.test
@@ -158,7 +158,7 @@ test canvPs-3.1 {test ps generation with an embedded window} -constraints {
     destroy .c
     imageCleanup
     removeFile bar.ps
-} -result {1}
+} -result 1
 test canvPs-3.2 {test ps generation with an embedded window not mapped} -setup {
     set bar [makeFile {} bar.ps]
     file delete $bar
@@ -172,7 +172,7 @@ test canvPs-3.2 {test ps generation with an embedded window not mapped} -setup {
 } -cleanup {
     destroy .c
     removeFile bar.ps
-} -result {1}
+} -result 1
 
 
 test canvPs-4.1 {test ps generation with single-point uncolored poly, bug 734498} -body {
diff --git a/tests/canvText.test b/tests/canvText.test
index 20cbff4..da60ea4 100644
--- a/tests/canvText.test
+++ b/tests/canvText.test
@@ -250,7 +250,7 @@ test canvText-4.6 {ConfigureText procedure: adjust cursor} -setup {
     .c index test insert
 } -cleanup {
 	.c delete test
-} -result {4}
+} -result 4
 
 
 test canvText-5.1 {ConfigureText procedure: adjust cursor} -body {
@@ -573,7 +573,7 @@ test canvText-8.8 {TextInsert procedure: inserting before cursor} -setup {
     .c icursor test 3
     .c insert test 2 "xyz"
     .c index test insert
-} -result {6}
+} -result 6
 test canvText-8.9 {TextInsert procedure: inserting after cursor} -setup {
     .c create text 20 20 -tag test
     focus .c
@@ -583,7 +583,7 @@ test canvText-8.9 {TextInsert procedure: inserting after cursor} -setup {
     .c icursor test 3
     .c insert test 4 "xyz"
     .c index test insert
-} -result {3}
+} -result 3
 
 # Item used in 9.* tests
 .c create text 20 20 -tag test
@@ -673,19 +673,19 @@ test canvText-9.13 {TextInsert procedure: move cursor} -body {
     .c icursor test 6
     .c dchars test 2 4
     .c index test insert
-} -result {3}
+} -result 3
 test canvText-9.14 {TextInsert procedure: keep cursor >= first} -body {
     .c itemconfig test -text "abcdefghijk"
     .c icursor test 6
     .c dchars test 2 10
     .c index test insert
-} -result {2}
+} -result 2
 test canvText-9.15 {TextInsert procedure: cursor doesn't move} -body {
     .c itemconfig test -text "abcdefghijk"
     .c icursor test 5
     .c dchars test 7 9
     .c index test insert
-} -result {5}
+} -result 5
 .c delete test
 
 
@@ -695,7 +695,7 @@ test canvText-10.1 {TextToPoint procedure} -body {
     .c index test @0,0
 } -cleanup {
 	.c delete test
-} -result {0}
+} -result 0
 
 
 test canvText-11.1 {TextToArea procedure} -setup {
@@ -834,7 +834,7 @@ test canvText-15.1 {SetTextCursor procedure} -setup {
     .c index test insert
 } -cleanup {
     .c delete test
-} -result {3}
+} -result 3
 
 test canvText-16.1 {GetSelText procedure} -setup {
     .c create text 0 0 -tag test
diff --git a/tests/canvas.test b/tests/canvas.test
index 5086389..e5e5ac9 100644
--- a/tests/canvas.test
+++ b/tests/canvas.test
@@ -37,14 +37,14 @@ test canvas-1.4 {configuration options: bad value for "bg"} -body {
 test canvas-1.5 {configuration options: good value for "bd"} -body {
     .c configure -bd 4
     .c cget -bd
-} -result {4}
+} -result 4
 test canvas-1.6 {configuration options: bad value for "bd"} -body {
     .c configure -bd badValue
 } -returnCodes error -result {bad screen distance "badValue"}
 test canvas-1.7 {configuration options: good value for "borderwidth"} -body {
     .c configure -borderwidth 1.3
     .c cget -borderwidth
-} -result {1}
+} -result 1
 test canvas-1.8 {configuration options: bad value for "borderwidth"} -body {
     .c configure -borderwidth badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -58,7 +58,7 @@ test canvas-1.10 {configuration options: bad value for "closeenough"} -body {
 test canvas-1.11 {configuration options: good value for "confine"} -body {
     .c configure -confine true
     .c cget -confine
-} -result {1}
+} -result 1
 test canvas-1.12 {configuration options: bad value for "confine"} -body {
     .c configure -confine silly
 } -returnCodes error -result {expected boolean value but got "silly"}
@@ -72,7 +72,7 @@ test canvas-1.14 {configuration options: bad value for "cursor"} -body {
 test canvas-1.15 {configuration options: good value for "height"} -body {
     .c configure -height 2.1
     .c cget -height
-} -result {2}
+} -result 2
 test canvas-1.16 {configuration options: bad value for "height"} -body {
     .c configure -height x42
 } -returnCodes error -result {bad screen distance "x42"}
@@ -93,7 +93,7 @@ test canvas-1.20 {configuration options: bad value for "highlightcolor"} -body {
 test canvas-1.21 {configuration options: good value for "highlightthickness"} -body {
     .c configure -highlightthickness 18
     .c cget -highlightthickness
-} -result {18}
+} -result 18
 test canvas-1.22 {configuration options: bad value for "highlightthickness"} -body {
     .c configure -highlightthickness badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -107,28 +107,28 @@ test canvas-1.24 {configuration options: bad value for "insertbackground"} -body
 test canvas-1.25 {configuration options: good value for "insertborderwidth"} -body {
     .c configure -insertborderwidth 1.3
     .c cget -insertborderwidth
-} -result {1}
+} -result 1
 test canvas-1.26 {configuration options: bad value for "insertborderwidth"} -body {
     .c configure -insertborderwidth 2.6x
 } -returnCodes error -result {bad screen distance "2.6x"}
 test canvas-1.27 {configuration options: good value for "insertofftime"} -body {
     .c configure -insertofftime 100
     .c cget -insertofftime
-} -result {100}
+} -result 100
 test canvas-1.28 {configuration options: bad value for "insertofftime"} -body {
     .c configure -insertofftime 3.2
 } -returnCodes error -result {expected integer but got "3.2"}
 test canvas-1.29 {configuration options: good value for "insertontime"} -body {
     .c configure -insertontime 100
     .c cget -insertontime
-} -result {100}
+} -result 100
 test canvas-1.30 {configuration options: bad value for "insertontime"} -body {
     .c configure -insertontime 3.2
 } -returnCodes error -result {expected integer but got "3.2"}
 test canvas-1.31 {configuration options: good value for "insertwidth"} -body {
     .c configure -insertwidth 1.3
     .c cget -insertwidth
-} -result {1}
+} -result 1
 test canvas-1.32 {configuration options: bad value for "insertwidth"} -body {
     .c configure -insertwidth 6x
 } -returnCodes error -result {bad screen distance "6x"}
@@ -149,7 +149,7 @@ test canvas-1.36 {configuration options: bad value for "selectbackground"} -body
 test canvas-1.37 {configuration options: good value for "selectborderwidth"} -body {
     .c configure -selectborderwidth 1.3
     .c cget -selectborderwidth
-} -result {1}
+} -result 1
 test canvas-1.38 {configuration options: bad value for "selectborderwidth"} -body {
     .c configure -selectborderwidth badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -167,7 +167,7 @@ test canvas-1.41 {configuration options: good value for "takefocus"} -body {
 test canvas-1.42 {configuration options: good value for "width"} -body {
     .c configure -width 402
     .c cget -width
-} -result {402}
+} -result 402
 test canvas-1.43 {configuration options: bad value for "width"} -body {
     .c configure -width xyz
 } -returnCodes error -result {bad screen distance "xyz"}
@@ -741,7 +741,7 @@ test canvas-15.19 "basic coords check: centimeters are larger than pixels" -setu
 } -body {
     set id [.c create rect 0 0 1cm 1cm]
     expr {[lindex [.c coords $id] 2]>1}
-} -result {1}
+} -result 1
 destroy .c
 
 test canvas-16.1 {arc coords check} -setup {
diff --git a/tests/config.test b/tests/config.test
index 9fd048a..9f1c7e3 100644
--- a/tests/config.test
+++ b/tests/config.test
@@ -235,7 +235,7 @@ test config-4.2 {DoObjConfig - boolean} -constraints testobjconfig -setup {
     .foo cget -boolean
 } -cleanup {
     killTables
-} -returnCodes ok -result {0}
+} -returnCodes ok -result 0
 test config-4.3 {DoObjConfig - boolean} -constraints testobjconfig -setup {
     catch {rename .foo {}}
 } -body {
@@ -259,7 +259,7 @@ test config-4.5 {DoObjConfig - boolean} -constraints testobjconfig -setup {
     .foo cget -boolean
 } -cleanup {
     killTables
-} -returnCodes ok -result {1}
+} -returnCodes ok -result 1
 test config-4.6 {DoObjConfig - boolean} -constraints testobjconfig -setup {
     catch {rename .foo {}}
 } -body {
@@ -287,7 +287,7 @@ test config-4.8 {DoObjConfig - boolean internal value} -constraints {
     .foo cget -boolean
 } -cleanup {
     killTables
-} -result {0}
+} -result 0
 
 test config-4.9 {DoObjConfig - integer} -constraints testobjconfig -setup {
     catch {rename .foo {}}
@@ -303,7 +303,7 @@ test config-4.10 {DoObjConfig - integer} -constraints testobjconfig -setup {
     .foo cget -integer
 } -cleanup {
     killTables
-} -returnCodes ok -result {3}
+} -returnCodes ok -result 3
 test config-4.11 {DoObjConfig - integer} -constraints testobjconfig -setup {
     catch {rename .foo {}}
 } -body {
@@ -333,7 +333,7 @@ test config-4.13 {DoObjConfig - integer internal value} -constraints {
     .foo cget -integer
 } -cleanup {
     killTables
-} -result {421}
+} -result 421
 
 test config-4.14 {DoObjConfig - double} -constraints testobjconfig -setup {
     catch {rename .foo {}}
@@ -472,7 +472,7 @@ test config-4.30 {DoObjConfig - new string table} -constraints {
     .foo configure -stringtable three
 } -cleanup {
     killTables
-} -returnCodes ok -result {16}
+} -returnCodes ok -result 16
 test config-4.31 {DoObjConfig - new string table} -constraints {
     testobjconfig
 } -body {
@@ -564,7 +564,7 @@ test config-4.42 {DoObjConfig - getting rid of old color} -constraints {
     .foo configure -color #444444
 } -cleanup {
     killTables
-} -returnCodes ok -result {32}
+} -returnCodes ok -result 32
 test config-4.43 {DoObjConfig - getting rid of old color} -constraints {
     testobjconfig
 } -body {
@@ -607,7 +607,7 @@ test config-4.47 {DoObjConfig - new font} -constraints testobjconfig -setup {
     .foo configure -font {Helvetica 72}
 } -cleanup {
     killTables
-} -returnCodes ok -result {64}
+} -returnCodes ok -result 64
 test config-4.48 {DoObjConfig - new font} -constraints testobjconfig -setup {
     catch {rename .foo {}}
 } -body {
@@ -668,7 +668,7 @@ test config-4.55 {DoObjConfig - new bitmap} -constraints testobjconfig -body {
     .foo configure -bitmap gray50
 } -cleanup {
     killTables
-} -returnCodes ok -result {128}
+} -returnCodes ok -result 128
 test config-4.56 {DoObjConfig - new bitmap} -constraints testobjconfig -body {
     testobjconfig alltypes .foo -bitmap gray75
     .foo configure -bitmap gray50
@@ -751,7 +751,7 @@ test config-4.67 {DoObjConfig - getting rid of old border} -constraints {
     .foo configure -border #444444
 } -cleanup {
     killTables
-} -returnCodes ok -result {256}
+} -returnCodes ok -result 256
 test config-4.68 {DoObjConfig - getting rid of old border} -constraints {
     testobjconfig
 } -body {
@@ -793,7 +793,7 @@ test config-4.73 {DoObjConfig - new relief} -constraints testobjconfig -body {
     .foo configure -relief flat
 } -cleanup {
     killTables
-} -returnCodes ok -result {512}
+} -returnCodes ok -result 512
 test config-4.74 {DoObjConfig - new relief} -constraints testobjconfig -body {
     testobjconfig alltypes .foo -relief raised
     .foo configure -relief flat
@@ -838,7 +838,7 @@ test config-4.80 {DoObjConfig - new cursor} -constraints testobjconfig -body {
     .foo configure -cursor arrow
 } -cleanup {
     killTables
-} -returnCodes ok -result {1024}
+} -returnCodes ok -result 1024
 test config-4.81 {DoObjConfig - new cursor} -constraints testobjconfig -body {
     testobjconfig alltypes .foo -cursor xterm
     .foo configure -cursor arrow
@@ -878,7 +878,7 @@ test config-4.86 {DoObjConfig - new justify} -constraints testobjconfig -body {
     .foo configure -justify right
 } -cleanup {
     killTables
-} -returnCodes ok -result {2048}
+} -returnCodes ok -result 2048
 test config-4.87 {DoObjConfig - new justify} -constraints testobjconfig -body {
     testobjconfig alltypes .foo -justify left
     .foo configure -justify right
@@ -918,7 +918,7 @@ test config-4.92 {DoObjConfig - new anchor} -constraints testobjconfig -body {
     .foo configure -anchor n
 } -cleanup {
     killTables
-} -returnCodes ok -result {4096}
+} -returnCodes ok -result 4096
 test config-4.93 {DoObjConfig - new anchor} -constraints testobjconfig -body {
     testobjconfig alltypes .foo -anchor e
     .foo configure -anchor n
@@ -946,7 +946,7 @@ test config-4.96 {DoObjConfig - pixel} -constraints testobjconfig -body {
     .foo cget -pixel
 } -cleanup {
     killTables
-} -returnCodes ok -result {42}
+} -returnCodes ok -result 42
 test config-4.97 {DoObjConfig - invalid pixel} -constraints testobjconfig -body {
     testobjconfig alltypes .foo -pixel foo
 } -cleanup {
@@ -957,7 +957,7 @@ test config-4.98 {DoObjConfig - new pixel} -constraints testobjconfig -body {
     .foo configure -pixel 3c
 } -cleanup {
     killTables
-} -returnCodes ok -result {8192}
+} -returnCodes ok -result 8192
 test config-4.99 {DoObjConfig - new pixel} -constraints testobjconfig -body {
     testobjconfig alltypes .foo -pixel 42m
     .foo configure -pixel 3c
@@ -976,7 +976,7 @@ test config-4.100 {DoObjConfig - pixel internal value} -constraints {
     expr {$screenW eq $result}
 } -cleanup {
     killTables
-} -result {1}
+} -result 1
 
 test config-4.101 {DoObjConfig - window} -constraints testobjconfig -body {
     toplevel .bar
@@ -1017,7 +1017,7 @@ test config-4.106 {DoObjConfig - new window} -constraints testobjconfig -body {
     .foo configure -window .blamph
 } -cleanup {
     killTables
-} -returnCodes ok -result {0}
+} -returnCodes ok -result 0
 test config-4.107 {DoObjConfig - new window} -constraints testobjconfig -body {
     toplevel .bar
     toplevel .blamph
@@ -1258,7 +1258,7 @@ test config-7.11 {Tk_SetOptions - synonym name in error message} -constraints {
 ".a configure -synonym bogus"}
 test config-7.12 {Tk_SetOptions - returning mask} -constraints testobjconfig -body {
     format %x [.a configure -color red -int 7 -relief raised -double 3.14159]
-} -result {226}
+} -result 226
 test config-7.13 {Tk_SetOptions - error in DoObjConfig with custom option} -constraints {
     testobjconfig
 } -body {
@@ -1304,7 +1304,7 @@ test config-8.3 {Tk_RestoreSavedOptions - freeing object memory} -constraints {
     .a csave -color green -color black -color blue -color #ffff00 -color #ff00ff
 } -cleanup {
     killTables
-} -result {32}
+} -result 32
 test config-8.4 {Tk_RestoreSavedOptions - boolean internal form} -constraints {
     testobjconfig
 } -body {
@@ -1321,7 +1321,7 @@ test config-8.5 {Tk_RestoreSavedOptions - boolean internal form} -constraints {
     .a cget -boolean
 } -cleanup {
     killTables
-} -result {1}
+} -result 1
 test config-8.6 {Tk_RestoreSavedOptions - integer internal form} -constraints {
     testobjconfig
 } -body {
@@ -1338,7 +1338,7 @@ test config-8.7 {Tk_RestoreSavedOptions - integer internal form} -constraints {
     .a cget -integer
 } -cleanup {
     killTables
-} -result {148962237}
+} -result 148962237
 test config-8.8 {Tk_RestoreSavedOptions - double internal form} -constraints {
     testobjconfig
 } -body {
@@ -1620,11 +1620,11 @@ if {[testConstraint testobjconfig]} {
 test config-12.1 {GetObjectForOption - boolean} -constraints testobjconfig -body {
     .a configure -boolean 0
     .a cget -boolean
-} -result {0}
+} -result 0
 test config-12.2 {GetObjectForOption - integer} -constraints testobjconfig -body {
     .a configure -integer 1247
     .a cget -integer
-} -result {1247}
+} -result 1247
 test config-12.3 {GetObjectForOption - double} -constraints testobjconfig -body {
     .a configure -double -88.82
     .a cget -double
@@ -1680,7 +1680,7 @@ test config-12.13 {GetObjectForOption - anchor} -constraints testobjconfig -body
 test config-12.14 {GetObjectForOption - pixels} -constraints testobjconfig -body {
     .a configure -pixel 193.2
     .a cget -pixel
-} -result {193}
+} -result 193
 test config-12.15 {GetObjectForOption - window} -constraints testobjconfig -body {
     .a configure -window .a
     .a cget -window
diff --git a/tests/dialog.test b/tests/dialog.test
index 2d88103..3ca5146 100644
--- a/tests/dialog.test
+++ b/tests/dialog.test
@@ -36,7 +36,7 @@ test dialog-2.1 {tk_dialog operation} -setup {
     return $res
 } -cleanup {
     destroy .d
-} -result {0}
+} -result 0
 test dialog-2.2 {tk_dialog operation} -setup {
     proc HitReturn {w} {
         event generate $w <Enter>
@@ -51,7 +51,7 @@ test dialog-2.2 {tk_dialog operation} -setup {
     return $res
 } -cleanup {
     destroy .d
-} -result {1}
+} -result 1
 test dialog-2.3 {tk_dialog operation} -body {
     set x [after 5000 [list set tk::Priv(button) "no response"]]
     after 100 destroy .d
diff --git a/tests/entry.test b/tests/entry.test
index b92c894..5b6bfac 100644
--- a/tests/entry.test
+++ b/tests/entry.test
@@ -69,7 +69,7 @@ test entry-1.3 {configuration option: "bd" for entry} -setup {
     .e cget -bd
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test entry-1.4 {configuration option: "bd" for entry} -setup {
     entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .e
@@ -109,7 +109,7 @@ test entry-1.7 {configuration option: "borderwidth" for entry} -setup {
     .e cget -borderwidth
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test entry-1.8 {configuration option: "borderwidth" for entry} -setup {
     entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .e
@@ -189,7 +189,7 @@ test entry-1.15 {configuration option: "exportselection" for entry} -setup {
     .e cget -exportselection
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test entry-1.16 {configuration option: "exportselection" for entry} -setup {
     entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .e
@@ -309,7 +309,7 @@ test entry-1.27 {configuration option: "highlightthickness" for entry} -setup {
     .e cget -highlightthickness
 } -cleanup {
     destroy .e
-} -result {6}
+} -result 6
 test entry-1.28 {configuration option: "highlightthickness" for entry} -setup {
     entry .e -borderwidth 2 -font {Helvetica -12 bold}
     pack .e
@@ -319,7 +319,7 @@ test entry-1.28 {configuration option: "highlightthickness" for entry} -setup {
     .e cget -highlightthickness
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 test entry-1.29 {configuration option: "highlightthickness" for entry} -setup {
     entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .e
@@ -359,7 +359,7 @@ test entry-1.32 {configuration option: "insertborderwidth" for entry} -setup {
     .e cget -insertborderwidth
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test entry-1.33 {configuration option: "insertborderwidth" for entry} -setup {
     entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .e
@@ -379,7 +379,7 @@ test entry-1.34 {configuration option: "insertofftime" for entry} -setup {
     .e cget -insertofftime
 } -cleanup {
     destroy .e
-} -result {100}
+} -result 100
 test entry-1.35 {configuration option: "insertofftime" for entry} -setup {
     entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .e
@@ -399,7 +399,7 @@ test entry-1.36 {configuration option: "insertontime" for entry} -setup {
     .e cget -insertontime
 } -cleanup {
     destroy .e
-} -result {100}
+} -result 100
 test entry-1.37 {configuration option: "insertontime" for entry} -setup {
     entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .e
@@ -512,7 +512,7 @@ test entry-1.47 {configuration option: "selectborderwidth" for entry} -setup {
     .e cget -selectborderwidth
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test entry-1.48 {configuration option: "selectborderwidth" for entry} -setup {
     entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .e
@@ -605,7 +605,7 @@ test entry-1.56 {configuration option: "width" for entry} -setup {
     .e cget -width
 } -cleanup {
     destroy .e
-} -result {402}
+} -result 402
 test entry-1.57 {configuration option: "width" for entry} -setup {
     entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .e
@@ -816,7 +816,7 @@ test entry-3.14 {EntryWidgetCmd procedure, "cget" widget command} -setup {
     .e cget -bd
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test entry-3.15 {EntryWidgetCmd procedure, "configure" widget command} -setup {
     entry .e
     pack .e
@@ -825,7 +825,7 @@ test entry-3.15 {EntryWidgetCmd procedure, "configure" widget command} -setup {
     llength [.e configure]
 } -cleanup {
     destroy .e
-} -result {38}
+} -result 38
 test entry-3.16 {EntryWidgetCmd procedure, "configure" widget command} -setup {
     entry .e
 } -body {
@@ -841,7 +841,7 @@ test entry-3.17 {EntryWidgetCmd procedure, "configure" widget command} -setup {
     lindex [.e configure -bd] 4
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test entry-3.18 {EntryWidgetCmd procedure, "delete" widget command} -setup {
     entry .e
 } -body {
@@ -880,7 +880,7 @@ test entry-3.22 {EntryWidgetCmd procedure, "delete" widget command} -setup {
     .e get
 } -cleanup {
     destroy .e
-} -result {014567890}
+} -result 014567890
 test entry-3.23 {EntryWidgetCmd procedure, "delete" widget command} -setup {
     entry .e
 } -body {
@@ -889,7 +889,7 @@ test entry-3.23 {EntryWidgetCmd procedure, "delete" widget command} -setup {
     .e get
 } -cleanup {
     destroy .e
-} -result {0123457890}
+} -result 0123457890
 test entry-3.24 {EntryWidgetCmd procedure, "delete" widget command} -setup {
     entry .e
     pack .e
@@ -921,7 +921,7 @@ test entry-3.25 {EntryWidgetCmd procedure, "delete" widget command} -setup {
     .e get
 } -cleanup {
     destroy .e
-} -result {01234567890}
+} -result 01234567890
 test entry-3.26 {EntryWidgetCmd procedure, "delete" widget command} -setup {
     entry .e
     pack .e
@@ -934,7 +934,7 @@ test entry-3.26 {EntryWidgetCmd procedure, "delete" widget command} -setup {
     .e get
 } -cleanup {
     destroy .e
-} -result {01234567890}
+} -result 01234567890
 test entry-3.26a {EntryWidgetCmd procedure, "delete" widget command} -setup {
     entry .e
     pack .e
@@ -947,7 +947,7 @@ test entry-3.26a {EntryWidgetCmd procedure, "delete" widget command} -setup {
     .e get
 } -cleanup {
     destroy .e
-} -result {01234567890}
+} -result 01234567890
 test entry-3.27 {EntryWidgetCmd procedure, "get" widget command} -setup {
     entry .e
 } -body {
@@ -977,7 +977,7 @@ test entry-3.30 {EntryWidgetCmd procedure, "icursor" widget command} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test entry-3.31 {EntryWidgetCmd procedure, "index" widget command} -setup {
     entry .e
 } -body {
@@ -1063,7 +1063,7 @@ test entry-3.40 {EntryWidgetCmd procedure, "insert" widget command} -setup {
     .e get
 } -cleanup {
     destroy .e
-} -result {01234567890}
+} -result 01234567890
 test entry-3.40a {EntryWidgetCmd procedure, "insert" widget command} -setup {
     entry .e
     pack .e
@@ -1076,7 +1076,7 @@ test entry-3.40a {EntryWidgetCmd procedure, "insert" widget command} -setup {
     .e get
 } -cleanup {
     destroy .e
-} -result {01234567890}
+} -result 01234567890
 test entry-3.41 {EntryWidgetCmd procedure, "insert" widget command} -setup {
     entry .e
 } -body {
@@ -1136,7 +1136,7 @@ test entry-3.46 {EntryWidgetCmd procedure, "scan" widget command} -constraints {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {2}
+} -result 2
 test entry-3.47 {EntryWidgetCmd procedure, "select" widget command} -setup {
     entry .e
 } -body {
@@ -1205,7 +1205,7 @@ test entry-3.52 {EntryWidgetCmd procedure, "selection present" widget command} -
     .e selection present
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test entry-3.53 {EntryWidgetCmd procedure, "selection present" widget command} -setup {
     entry .e
     pack .e
@@ -1218,7 +1218,7 @@ test entry-3.53 {EntryWidgetCmd procedure, "selection present" widget command} -
     .e selection present
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test entry-3.54 {EntryWidgetCmd procedure, "selection present" widget command} -setup {
     entry .e
     pack .e
@@ -1231,7 +1231,7 @@ test entry-3.54 {EntryWidgetCmd procedure, "selection present" widget command} -
     .e selection present
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 test entry-3.55 {EntryWidgetCmd procedure, "selection adjust" widget command} -setup {
     entry .e
 } -body {
@@ -1259,7 +1259,7 @@ test entry-3.57 {EntryWidgetCmd procedure, "selection adjust" widget command} -s
     selection get
 } -cleanup {
     destroy .e
-} -result {123}
+} -result 123
 test entry-3.58 {EntryWidgetCmd procedure, "selection adjust" widget command} -setup {
     entry .e
     pack .e
@@ -1273,7 +1273,7 @@ test entry-3.58 {EntryWidgetCmd procedure, "selection adjust" widget command} -s
     selection get
 } -cleanup {
     destroy .e
-} -result {234}
+} -result 234
 test entry-3.59 {EntryWidgetCmd procedure, "selection from" widget command} -setup {
     entry .e
 } -body {
@@ -1487,7 +1487,7 @@ test entry-3.75 {EntryWidgetCmd procedure, "xview" widget command} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {32}
+} -result 32
 test entry-3.76 {EntryWidgetCmd procedure, "xview" widget command} -setup {
     entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
@@ -1501,7 +1501,7 @@ test entry-3.76 {EntryWidgetCmd procedure, "xview" widget command} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {29}
+} -result 29
 test entry-3.77 {EntryWidgetCmd procedure, "xview" widget command} -setup {
     entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
@@ -1537,7 +1537,7 @@ test entry-3.79 {EntryWidgetCmd procedure, "xview" widget command} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 test entry-3.80 {EntryWidgetCmd procedure, "xview" widget command} -setup {
     entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
@@ -1549,7 +1549,7 @@ test entry-3.80 {EntryWidgetCmd procedure, "xview" widget command} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {73}
+} -result 73
 test entry-3.86 {EntryWidgetCmd procedure, "xview" widget command} -setup {
     entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
@@ -1600,7 +1600,7 @@ test entry-5.1 {ConfigureEntry procedure, -textvariable} -body {
     .e get
 } -cleanup {
     destroy .e
-} -result {12345}
+} -result 12345
 test entry-5.2 {ConfigureEntry procedure, -textvariable} -body {
     set x 12345
     entry .e -textvariable x
@@ -1806,7 +1806,7 @@ test entry-6.4 {EntryComputeGeometry procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {6}
+} -result 6
 test entry-6.5 {EntryComputeGeometry procedure} -setup {
     entry .e -highlightthickness 2
     pack .e
@@ -1818,7 +1818,7 @@ test entry-6.5 {EntryComputeGeometry procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {6}
+} -result 6
 test entry-6.6 {EntryComputeGeometry procedure} -constraints {
     fonts
 } -setup {
@@ -2026,7 +2026,7 @@ test entry-7.7 {InsertChars procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {7}
+} -result 7
 test entry-7.8 {InsertChars procedure} -setup {
     entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2037,7 +2037,7 @@ test entry-7.8 {InsertChars procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test entry-7.9 {InsertChars procedure} -setup {
     entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2049,7 +2049,7 @@ test entry-7.9 {InsertChars procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {7}
+} -result 7
 test entry-7.10 {InsertChars procedure} -setup {
     entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2061,7 +2061,7 @@ test entry-7.10 {InsertChars procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 
 test entry-7.11 {InsertChars procedure} -constraints {
     fonts
@@ -2075,7 +2075,7 @@ test entry-7.11 {InsertChars procedure} -constraints {
     winfo reqwidth .e
 } -cleanup {
     destroy .e
-} -result {59}
+} -result 59
 
 test entry-8.1 {DeleteChars procedure} -setup {
     unset -nocomplain contents
@@ -2260,7 +2260,7 @@ test entry-8.12 {DeleteChars procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test entry-8.13 {DeleteChars procedure} -setup {
     entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2273,7 +2273,7 @@ test entry-8.13 {DeleteChars procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test entry-8.14 {DeleteChars procedure} -setup {
     entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2286,7 +2286,7 @@ test entry-8.14 {DeleteChars procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test entry-8.15 {DeleteChars procedure} -setup {
     entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2299,7 +2299,7 @@ test entry-8.15 {DeleteChars procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test entry-8.16 {DeleteChars procedure} -setup {
     entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2312,7 +2312,7 @@ test entry-8.16 {DeleteChars procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test entry-8.17 {DeleteChars procedure} -setup {
     entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2325,7 +2325,7 @@ test entry-8.17 {DeleteChars procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test entry-8.18 {DeleteChars procedure} -setup {
     entry .e -width 0 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2347,7 +2347,7 @@ test entry-8.18 {DeleteChars procedure} -setup {
 } -cleanup {
     destroy .e
     unset XPAD expected
-} -result {1}
+} -result 1
 
 test entry-9.1 {EntryValueChanged procedure} -setup {
     unset -nocomplain x
@@ -2428,7 +2428,7 @@ test entry-10.5 {EntrySetValue procedure, updating display position} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 test entry-10.6 {EntrySetValue procedure, updating display position} -setup {
     unset -nocomplain x
     entry .e -highlightthickness 2 -bd 2
@@ -2444,7 +2444,7 @@ test entry-10.6 {EntrySetValue procedure, updating display position} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {10}
+} -result 10
 test entry-10.7 {EntrySetValue procedure, updating insertion cursor} -setup {
     unset -nocomplain x
     entry .e -highlightthickness 2 -bd 2
@@ -2459,7 +2459,7 @@ test entry-10.7 {EntrySetValue procedure, updating insertion cursor} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {3}
+} -result 3
 test entry-10.8 {EntrySetValue procedure, updating insertion cursor} -setup {
     unset -nocomplain x
     entry .e -highlightthickness 2 -bd 2
@@ -2473,7 +2473,7 @@ test entry-10.8 {EntrySetValue procedure, updating insertion cursor} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {5}
+} -result 5
 
 test entry-11.1 {EntryEventProc procedure} -setup {
     entry .e -highlightthickness 2 -bd 2 -font {Helvetica -12}
@@ -2517,7 +2517,7 @@ test entry-13.1 {GetEntryIndex procedure} -setup {
     .e index end
 } -cleanup {
     destroy .e
-} -result {21}
+} -result 21
 test entry-13.2 {GetEntryIndex procedure} -body {
     entry .e
     .e index abogus
@@ -2536,7 +2536,7 @@ test entry-13.3 {GetEntryIndex procedure} -setup {
     .e index anchor
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test entry-13.4 {GetEntryIndex procedure} -setup {
     entry .e -font {Courier -12} -width 5 -bd 2 -relief sunken
     pack .e
@@ -2549,7 +2549,7 @@ test entry-13.4 {GetEntryIndex procedure} -setup {
     .e index anchor
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test entry-13.5 {GetEntryIndex procedure} -setup {
     entry .e -font {Courier -12} -width 5 -bd 2 -relief sunken
     pack .e
@@ -2563,7 +2563,7 @@ test entry-13.5 {GetEntryIndex procedure} -setup {
     .e index anchor
 } -cleanup {
     destroy .e
-} -result {15}
+} -result 15
 test entry-13.6 {GetEntryIndex procedure} -setup {
     entry .e
 } -body {
@@ -2582,7 +2582,7 @@ test entry-13.7 {GetEntryIndex procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {2}
+} -result 2
 test entry-13.8 {GetEntryIndex procedure} -setup {
     entry .e
 } -body {
@@ -2647,7 +2647,7 @@ test entry-13.11 {GetEntryIndex procedure} -constraints aquaOrWin32 -body {
     .e index sel.first
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 
 test entry-13.12 {GetEntryIndex procedure} -constraints x11 -body {
 # Previous settings:
@@ -2761,7 +2761,7 @@ test entry-13.16 {GetEntryIndex procedure} -constraints fonts -body {
     .e index @4
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test entry-13.17 {GetEntryIndex procedure} -constraints fonts -body {
     entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
         -font {Courier -12}
@@ -2772,7 +2772,7 @@ test entry-13.17 {GetEntryIndex procedure} -constraints fonts -body {
     .e index @11
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test entry-13.18 {GetEntryIndex procedure} -constraints fonts -body {
     entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
         -font {Courier -12}
@@ -2783,7 +2783,7 @@ test entry-13.18 {GetEntryIndex procedure} -constraints fonts -body {
     .e index @12
 } -cleanup {
     destroy .e
-} -result {5}
+} -result 5
 test entry-13.19 {GetEntryIndex procedure} -constraints fonts -body {
     entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
         -font {Courier -12}
@@ -2794,7 +2794,7 @@ test entry-13.19 {GetEntryIndex procedure} -constraints fonts -body {
     .e index @[expr {[winfo width .e] - 6}]
 } -cleanup {
     destroy .e
-} -result {8}
+} -result 8
 test entry-13.20 {GetEntryIndex procedure} -constraints fonts -body {
     entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
         -font {Courier -12}
@@ -2805,7 +2805,7 @@ test entry-13.20 {GetEntryIndex procedure} -constraints fonts -body {
     .e index @[expr {[winfo width .e] - 5}]
 } -cleanup {
     destroy .e
-} -result {9}
+} -result 9
 test entry-13.21 {GetEntryIndex procedure} -body {
     entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
         -font {Courier -12}
@@ -2816,7 +2816,7 @@ test entry-13.21 {GetEntryIndex procedure} -body {
     .e index @1000
 } -cleanup {
     destroy .e
-} -result {9}
+} -result 9
 test entry-13.22 {GetEntryIndex procedure} -setup {
     entry .e
     pack .e
@@ -2836,7 +2836,7 @@ test entry-13.23 {GetEntryIndex procedure} -body {
     .e index -10
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 test entry-13.24 {GetEntryIndex procedure} -body {
     entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
         -font {Courier -12}
@@ -2847,7 +2847,7 @@ test entry-13.24 {GetEntryIndex procedure} -body {
     .e index 12
 } -cleanup {
     destroy .e
-} -result {12}
+} -result 12
 test entry-13.25 {GetEntryIndex procedure} -body {
     entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
         -font {Courier -12}
@@ -2858,7 +2858,7 @@ test entry-13.25 {GetEntryIndex procedure} -body {
     .e index 49
 } -cleanup {
     destroy .e
-} -result {21}
+} -result 21
 test entry-13.26 {GetEntryIndex procedure} -constraints fonts -body {
     entry .e -highlightthickness 2 -bd 2 -font {Helvetica -12}
     selection clear .e
@@ -2905,7 +2905,7 @@ test entry-14.3 {EntryFetchSelection procedure} -setup {
     string compare [selection get] $x
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 
 test entry-15.1 {EntryLostSelection} -body {
     entry .e
@@ -3025,7 +3025,7 @@ test entry-18.1 {Entry widget vs hiding} -setup {
     set res1 [list [winfo children .] [interp hidden]]
     set res2 [list {} $l]
     expr {$res1 == $res2}
-} -result {1}
+} -result 1
 
 ##
 ## Entry widget VALIDATION tests
@@ -3424,7 +3424,7 @@ test entry-20.1 {widget deletion while active} -body {
     winfo exists .e
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 
 test entry-20.2 {widget deletion while active} -body {
     entry .e -validate all \
@@ -3434,7 +3434,7 @@ test entry-20.2 {widget deletion while active} -body {
     winfo exists .e
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 
 test entry-20.3 {widget deletion while active} -body {
     entry .e -validate all \
@@ -3443,7 +3443,7 @@ test entry-20.3 {widget deletion while active} -body {
     winfo exists .e
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 
 test entry-20.4 {widget deletion while active} -body {
     entry .e -validate all \
@@ -3453,7 +3453,7 @@ test entry-20.4 {widget deletion while active} -body {
     winfo exists .e
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 
 test entry-20.5 {widget deletion while active} -body {
     entry .e -validatecommand { destroy .e ; return 0 }
@@ -3461,7 +3461,7 @@ test entry-20.5 {widget deletion while active} -body {
     winfo exists .e
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 
 test entry-20.6 {widget deletion while active} -body {
     pack [entry .e]
@@ -3471,7 +3471,7 @@ test entry-20.6 {widget deletion while active} -body {
     winfo exists .e
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 
 test entry-20.7 {widget deletion with textvariable active} -body {
 # SF bugs 607390 and 617446
@@ -3483,7 +3483,7 @@ test entry-20.7 {widget deletion with textvariable active} -body {
     winfo exists .e
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 
 
 test entry-21.1 {selection present while disabled, bug 637828} -body {
diff --git a/tests/font.test b/tests/font.test
index 9f279dd..92894d1 100644
--- a/tests/font.test
+++ b/tests/font.test
@@ -121,7 +121,7 @@ test font-4.3 {font command: actual: arguments} -body {
 } -returnCodes error -result {wrong # args: should be "font actual font ?-displayof window? ?option? ?--? ?char?"}
 test font-4.4 {font command: actual: displayof specified, so skip to next} -body {
     catch {font actual xyz -displayof . -size}
-} -result {0}
+} -result 0
 test font-4.5 {font command: actual: displayof specified, so skip to next} -body {
     lindex [font actual xyz -displayof .] 0
 } -result {-family}
@@ -536,7 +536,7 @@ test font-12.2 {UpdateDependantFonts procedure: pings the widgets} -setup {
 } -cleanup {
 	destroy .t.f
     font delete xyz
-} -result {1}
+} -result 1
 
 
 test font-13.1 {CreateNamedFont: new named font} -setup {
@@ -1703,7 +1703,7 @@ update
 test font-28.1 {Tk_PointToChar procedure: above all lines} -body {
     csetup "000"
     .t.c index text @-1,0
-} -result {0}
+} -result 0
 test font-28.2 {Tk_PointToChar procedure: no chars} -body {
     # After fixing the following bug:
     #
@@ -1715,46 +1715,46 @@ test font-28.2 {Tk_PointToChar procedure: no chars} -body {
 
     csetup ""
     .t.c index text @100,100
-} -result {0}
+} -result 0
 test font-28.3 {Tk_PointToChar procedure: loop test} -body {
     csetup "000\n000\n000\n000"
     .t.c index text @10000,0
-} -result {3}
+} -result 3
 test font-28.4 {Tk_PointToChar procedure: intersect line} -body {
     csetup "000\n000\n000"
     .t.c index text @0,$ay
-} -result {4}
+} -result 4
 test font-28.5 {Tk_PointToChar procedure: to the left of all chunks} -body {
     csetup "000\n000\n000"
     .t.c index text @-100,$ay
-} -result {4}
+} -result 4
 test font-28.6 {Tk_PointToChar procedure: past any possible chunk} -body {
     csetup "000\n000\n000"
     .t.c index text @100000,$ay
-} -result {7}
+} -result 7
 test font-28.7 {Tk_PointToChar procedure: which chunk on this line} -body {
     csetup "000\n000\t000\t000\n000"
     .t.c index text @[expr $ax*2],$ay
-} -result {6}
+} -result 6
 test font-28.8 {Tk_PointToChar procedure: which chunk on this line} -body {
     csetup "000\n000\t000\t000\n000"
     .t.c index text @[expr $ax*10],$ay
-} -result {10}
+} -result 10
 test font-28.9 {Tk_PointToChar procedure: in special chunk} -body {
     csetup "000\n000\t000\t000\n000"
     .t.c index text @[expr $ax*6],$ay
-} -result {7}
+} -result 7
 test font-28.10 {Tk_PointToChar procedure: past all chars in chunk} -body {
     csetup "000 0000000"
     .t.c itemconfig text -width [expr $ax*5]
     set x [.t.c index text @[expr $ax*5],0]
     .t.c itemconfig text -width 0
     return $x
-} -result {3}
+} -result 3
 test font-28.11 {Tk_PointToChar procedure: below all chunks} -body {
     csetup "000 0000000"
     .t.c index text @0,1000000
-} -result {11}
+} -result 11
 destroy .t.c
 
 
@@ -1801,7 +1801,7 @@ test font-30.1 {Tk_DistanceToTextLayout procedure: loop once} -body {
     return $x
 } -cleanup {
 	bind all <Enter> {}
-} -result {0}
+} -result 0
 test font-30.2 {Tk_DistanceToTextLayout procedure: loop multiple} -body {
     csetup "000\n000\n000"
 	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
@@ -1811,7 +1811,7 @@ test font-30.2 {Tk_DistanceToTextLayout procedure: loop multiple} -body {
     return $x
 } -cleanup {
 	bind all <Enter> {}
-} -result {5}
+} -result 5
 test font-30.3 {Tk_DistanceToTextLayout procedure: loop to end} -body {
     csetup "000\n0\n000"
 	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
@@ -1831,7 +1831,7 @@ test font-30.4 {Tk_DistanceToTextLayout procedure: hit a special char (tab)} -bo
     return $x
 } -cleanup {
 	bind all <Enter> {}
-} -result {3}
+} -result 3
 test font-30.5 {Tk_DistanceToTextLayout procedure: ignore newline} -body {
     csetup "000\n0\n000"
 	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
@@ -1884,7 +1884,7 @@ test font-30.9 {Tk_DistanceToTextLayout procedure: inside line} -body {
     return $x
 } -cleanup {
 	bind all <Enter> {}
-} -result {0}
+} -result 0
 test font-30.10 {Tk_DistanceToTextLayout procedure: above line} -body {
     csetup "0\n000"
 	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
@@ -1914,7 +1914,7 @@ test font-30.12 {Tk_DistanceToTextLayout procedure: in line} -body {
     return $x
 } -cleanup {
 	bind all <Enter> {}
-} -result {3}
+} -result 3
 .t.c itemconfig text -justify left
 test font-30.13 {Tk_DistanceToTextLayout procedure: exact hit} -body {
     csetup "000"
@@ -1925,7 +1925,7 @@ test font-30.13 {Tk_DistanceToTextLayout procedure: exact hit} -body {
     return $x
 } -cleanup {
 	bind all <Enter> {}
-} -result {1}
+} -result 1
 destroy .t.c
 
 
@@ -1971,7 +1971,7 @@ test font-31.7 {TkIntersectAngledTextLayout procedure: bug [514ff64dd0]} -body {
     # The text has been rotated 90 degrees around it's upper left corner,
     # so it's enough to check with a small rectangle with small negative y coords.
     .t.c find overlapping 5 -7 7 -5
-} -result {1}
+} -result 1
 destroy .t.c
 
 
@@ -2182,7 +2182,7 @@ test font-37.3 {GetAttributeInfo procedure: size} -setup {
 	font config xyz -size
 } -cleanup {
 	font delete xyz
-} -result {20}
+} -result 20
 test font-37.4 {GetAttributeInfo procedure: weight} -setup {
     catch {font delete xyz}
 	set x {}
@@ -2209,7 +2209,7 @@ test font-37.6 {GetAttributeInfo procedure: underline} -setup {
 	font config xyz -underline
 } -cleanup {
 	font delete xyz
-} -result {1}
+} -result 1
 test font-37.7 {GetAttributeInfo procedure: overstrike} -setup {
     catch {font delete xyz}
 	set x {}
@@ -2218,7 +2218,7 @@ test font-37.7 {GetAttributeInfo procedure: overstrike} -setup {
 	font config xyz -overstrike
 } -cleanup {
 	font delete xyz
-} -result {0}
+} -result 0
 
 
 # In tests below, one field is set to "xyz" so that font name doesn't
@@ -2345,7 +2345,7 @@ test font-44.1 {TkFontGetPixels: size < 0} -setup {
     font actual {times -12} -size
 } -cleanup {
 	tk scaling $oldscale
-} -result {24}
+} -result 24
 test font-44.2 {TkFontGetPoints: size >= 0} -constraints noExceed -setup {
 	set oldscale [tk scaling]
 } -body {
@@ -2353,7 +2353,7 @@ test font-44.2 {TkFontGetPoints: size >= 0} -constraints noExceed -setup {
     font actual {times 12} -size
 } -cleanup {
 	tk scaling $oldscale
-} -result {12}
+} -result 12
 
 
 test font-45.1 {TkFontGetAliasList: no match} -body {
@@ -2370,7 +2370,7 @@ test font-45.3 {TkFontGetAliasList: match} -constraints {noExceed} -body {
         set res [expr {[font actual {{times new roman} 10} -family] eq \
                        [font actual {times 10} -family]} ]
     }
-} -result {1}
+} -result 1
 
 
 test font-46.1 {font actual, with character, no option, no --} -body {
diff --git a/tests/fontchooser.test b/tests/fontchooser.test
index 4dad5da..b16bdcc 100644
--- a/tests/fontchooser.test
+++ b/tests/fontchooser.test
@@ -79,7 +79,7 @@ test fontchooser-1.7 {tk fontchooser: usage} -returnCodes error -body {
 
 test fontchooser-1.8 {tk fontchooser: usage} -returnCodes ok -body {
     tk fontchooser configure -visible
-} -result {0}
+} -result 0
 
 test fontchooser-1.9 {tk fontchooser: usage} -returnCodes error -body {
     tk fontchooser configure -visible 1
@@ -155,7 +155,7 @@ test fontchooser-4.1 {fontchooser -font} -constraints scriptImpl -body {
         Click ok
     }
     expr {$::testfont ne {}}
-} -result {1}
+} -result 1
 
 test fontchooser-4.2 {fontchooser -font} -constraints scriptImpl -body {
     start {
@@ -166,7 +166,7 @@ test fontchooser-4.2 {fontchooser -font} -constraints scriptImpl -body {
         Click ok
     }
     expr {$::testfont ne {}}
-} -result {1}
+} -result 1
 
 test fontchooser-4.3 {fontchooser -font} -constraints scriptImpl -body {
     start {
@@ -177,7 +177,7 @@ test fontchooser-4.3 {fontchooser -font} -constraints scriptImpl -body {
         Click ok
     }
     expr {$::testfont ne {}}
-} -result {1}
+} -result 1
 
 test fontchooser-4.4 {fontchooser -font} -constraints scriptImpl -body {
     start {
diff --git a/tests/frame.test b/tests/frame.test
index bdeb2e9..3dbdef6 100644
--- a/tests/frame.test
+++ b/tests/frame.test
@@ -195,7 +195,7 @@ test frame-1.15 {frame configuration options} -body {
     lindex [.f configure -bd] 4
 } -cleanup {
     .f configure -bd [lindex [.f configure -bd] 3]
-} -result {4}
+} -result 4
 test frame-1.16 {frame configuration options} -body {
     .f configure -bd badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -213,7 +213,7 @@ test frame-1.19 {frame configuration options} -body {
     lindex [.f configure -borderwidth] 4
 } -cleanup {
     .f configure -borderwidth [lindex [.f configure -borderwidth] 3]
-} -result {1}
+} -result 1
 test frame-1.20 {frame configuration options} -body {
     .f configure -borderwidth badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -231,7 +231,7 @@ test frame-1.23 {frame configuration options} -body {
     lindex [.f configure -height] 4
 } -cleanup {
     .f configure -height [lindex [.f configure -height] 3]
-} -result {100}
+} -result 100
 test frame-1.24 {frame configuration options} -body {
     .f configure -height not_a_number
 } -returnCodes error -result {bad screen distance "not_a_number"}
@@ -258,7 +258,7 @@ test frame-1.29 {frame configuration options} -body {
     lindex [.f configure -highlightthickness] 4
 } -cleanup {
     .f configure -highlightthickness [lindex [.f configure -highlightthickness] 3]
-} -result {6}
+} -result 6
 test frame-1.30 {frame configuration options} -body {
     .f configure -highlightthickness badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -267,7 +267,7 @@ test frame-1.31 {frame configuration options} -body {
     lindex [.f configure -padx] 4
 } -cleanup {
     .f configure -padx [lindex [.f configure -padx] 3]
-} -result {3}
+} -result 3
 test frame-1.32 {frame configuration options} -body {
     .f configure -padx badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -276,7 +276,7 @@ test frame-1.33 {frame configuration options} -body {
     lindex [.f configure -pady] 4
 } -cleanup {
     .f configure -pady [lindex [.f configure -pady] 3]
-} -result {4}
+} -result 4
 test frame-1.34 {frame configuration options} -body {
     .f configure -pady badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -300,7 +300,7 @@ test frame-1.38 {frame configuration options} -body {
     lindex [.f configure -width] 4
 } -cleanup {
     .f configure -width [lindex [.f configure -width] 3]
-} -result {32}
+} -result 32
 test frame-1.39 {frame configuration options} -body {
     .f configure -width badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -500,7 +500,7 @@ test frame-2.21 {toplevel configuration options} -body {
 test frame-2.22 {toplevel configuration options} -body {
     .t configure -bd 4
     lindex [.t configure -bd] 4
-} -result {4}
+} -result 4
 test frame-2.23 {toplevel configuration options} -body {
     .t configure -bd badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -514,7 +514,7 @@ test frame-2.25 {toplevel configuration options} -body {
 test frame-2.26 {toplevel configuration options} -body {
     .t configure -borderwidth 1.3
     lindex [.t configure -borderwidth] 4
-} -result {1}
+} -result 1
 test frame-2.27 {toplevel configuration options} -body {
     .t configure -borderwidth badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -528,7 +528,7 @@ test frame-2.29 {toplevel configuration options} -body {
 test frame-2.30 {toplevel configuration options} -body {
     .t configure -height 100
     lindex [.t configure -height] 4
-} -result {100}
+} -result 100
 test frame-2.31 {toplevel configuration options} -body {
     .t configure -height not_a_number
 } -returnCodes error -result {bad screen distance "not_a_number"}
@@ -542,21 +542,21 @@ test frame-2.33 {toplevel configuration options} -body {
 test frame-2.34 {toplevel configuration options} -body {
     .t configure -highlightthickness 3
     lindex [.t configure -highlightthickness] 4
-} -result {3}
+} -result 3
 test frame-2.35 {toplevel configuration options} -body {
     .t configure -highlightthickness badValue
 } -returnCodes error -result {bad screen distance "badValue"}
 test frame-2.36 {toplevel configuration options} -body {
     .t configure -padx 3
     lindex [.t configure -padx] 4
-} -result {3}
+} -result 3
 test frame-2.37 {toplevel configuration options} -body {
     .t configure -padx badValue
 } -returnCodes error -result {bad screen distance "badValue"}
 test frame-2.38 {toplevel configuration options} -body {
     .t configure -pady 4
     lindex [.t configure -pady] 4
-} -result {4}
+} -result 4
 test frame-2.39 {toplevel configuration options} -body {
     .t configure -pady badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -570,7 +570,7 @@ test frame-2.41 {toplevel configuration options} -returnCodes error -body {
 test frame-2.42 {toplevel configuration options} -body {
     .t configure -width 32
     lindex [.t configure -width] 4
-} -result {32}
+} -result 32
 test frame-2.43 {toplevel configuration options} -body {
     .t configure -width badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -707,7 +707,7 @@ test frame-3.11 {TkCreateFrame procedure} -constraints {
     colorsFree .t
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test frame-3.12 {TkCreateFrame procedure} -constraints {
     defaultPseudocolor8 nonPortable
 } -setup {
@@ -719,7 +719,7 @@ test frame-3.12 {TkCreateFrame procedure} -constraints {
     colorsFree .t
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test frame-3.13 {TkCreateFrame procedure} -constraints {
     defaultPseudocolor8 nonPortable
 } -setup {
@@ -734,7 +734,7 @@ test frame-3.13 {TkCreateFrame procedure} -constraints {
     colorsFree .t
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test frame-3.14 {TkCreateFrame procedure} -constraints {
     defaultPseudocolor8 nonPortable
 } -setup {
@@ -749,7 +749,7 @@ test frame-3.14 {TkCreateFrame procedure} -constraints {
     colorsFree .t
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test frame-3.15 {TkCreateFrame procedure, -use and -colormap} -constraints {
     defaultPseudocolor8 unix nonPortable
 } -setup {
@@ -774,7 +774,7 @@ test frame-3.16 {TkCreateFrame procedure} -constraints {
     colorsFree .t
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test frame-3.17 {TkCreateFrame procedure} -constraints {
     defaultPseudocolor8 nonPortable
 } -setup {
@@ -787,7 +787,7 @@ test frame-3.17 {TkCreateFrame procedure} -constraints {
     colorsFree .t
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test frame-3.18 {TkCreateFrame procedure} -constraints {
     defaultPseudocolor8 haveGrayscale8 nonPortable
 } -setup {
@@ -799,7 +799,7 @@ test frame-3.18 {TkCreateFrame procedure} -constraints {
     colorsFree .t 131 131 131
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test frame-3.19 {TkCreateFrame procedure} -constraints {
     defaultPseudocolor8 haveGrayscale8 nonPortable
 } -setup {
@@ -841,7 +841,7 @@ test frame-3.21 {TkCreateFrame procedure} -constraints {
     colorsFree .t 131 131 131
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 if {[testConstraint defaultPseudocolor8]} {
     destroy .t1
 }
@@ -1041,7 +1041,7 @@ test frame-9.2 {MapFrame procedure} -setup {
     destroy .t
     update
     winfo exists .t
-} -result {0}
+} -result 0
 test frame-9.3 {MapFrame procedure, window deleted while mapping} -setup {
     deleteWindows
 } -body {
@@ -1057,7 +1057,7 @@ test frame-9.3 {MapFrame procedure, window deleted while mapping} -setup {
     winfo exists .t
 } -cleanup {
     deleteWindows
-} -result {0}
+} -result 0
 
 test frame-10.1 {frame widget vs hidden commands} -setup {
     deleteWindows
@@ -1167,7 +1167,7 @@ test frame-12.3 {FrameWorldChanged procedure} -setup {
 } -cleanup {
     deleteWindows
     font delete myfont
-} -result {0}
+} -result 0
 
 test frame-13.1 {labelframe configuration options} -setup {
     deleteWindows
@@ -1252,7 +1252,7 @@ test frame-13.12 {labelframe configuration options} -body {
     lindex [.f configure -bd] 4
 } -cleanup {
     .f configure -bd [lindex [.f configure -bd] 3]
-} -result {4}
+} -result 4
 test frame-13.13 {labelframe configuration options} -body {
     .f configure -bd badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -1270,7 +1270,7 @@ test frame-13.16 {labelframe configuration options} -body {
     lindex [.f configure -borderwidth] 4
 } -cleanup {
     .f configure -borderwidth [lindex [.f configure -borderwidth] 3]
-} -result {1}
+} -result 1
 test frame-13.17 {labelframe configuration options} -body {
     .f configure -borderwidth badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -1312,7 +1312,7 @@ test frame-13.25 {labelframe configuration options} -body {
     lindex [.f configure -height] 4
 } -cleanup {
     .f configure -height [lindex [.f configure -height] 3]
-} -result {100}
+} -result 100
 test frame-13.26 {labelframe configuration options} -body {
     .f configure -height not_a_number
 } -returnCodes error -result {bad screen distance "not_a_number"}
@@ -1339,7 +1339,7 @@ test frame-13.31 {labelframe configuration options} -body {
     lindex [.f configure -highlightthickness] 4
 } -cleanup {
     .f configure -highlightthickness [lindex [.f configure -highlightthickness] 3]
-} -result {6}
+} -result 6
 test frame-13.32 {labelframe configuration options} -body {
     .f configure -highlightthickness badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -1357,7 +1357,7 @@ test frame-13.35 {labelframe configuration options} -body {
     lindex [.f configure -padx] 4
 } -cleanup {
     .f configure -padx [lindex [.f configure -padx] 3]
-} -result {3}
+} -result 3
 test frame-13.36 {labelframe configuration options} -body {
     .f configure -padx badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -1366,7 +1366,7 @@ test frame-13.37 {labelframe configuration options} -body {
     lindex [.f configure -pady] 4
 } -cleanup {
     .f configure -pady [lindex [.f configure -pady] 3]
-} -result {4}
+} -result 4
 test frame-13.38 {labelframe configuration options} -body {
     .f configure -pady badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -1396,7 +1396,7 @@ test frame-13.43 {labelframe configuration options} -body {
     lindex [.f configure -width] 4
 } -cleanup {
     .f configure -width [lindex [.f configure -width] 3]
-} -result {32}
+} -result 32
 test frame-13.44 {labelframe configuration options} -body {
     .f configure -width badValue
 } -returnCodes error -result {bad screen distance "badValue"}
diff --git a/tests/geometry.test b/tests/geometry.test
index c10a119..d3bb0c5 100644
--- a/tests/geometry.test
+++ b/tests/geometry.test
@@ -282,7 +282,7 @@ test geometry-4.10 {Tk_MaintainGeometry and Tk_UnmaintainGeometry} -setup {
     winfo ismapped .t.quit
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 
 
 # cleanup
diff --git a/tests/grid.test b/tests/grid.test
index 53f8be5..c138479 100644
--- a/tests/grid.test
+++ b/tests/grid.test
@@ -389,12 +389,12 @@ test grid-7.2 {propagate} -body {
     grid propagate .
 } -cleanup {
     grid_reset 7.2
-} -result {1}
+} -result 1
 test grid-7.3 {propagate} -body {
     grid propagate . 0;grid propagate .
 } -cleanup {
     grid_reset 7.3
-} -result {0}
+} -result 0
 test grid-7.4 {propagate} -body {
     grid propagate .x
 } -cleanup {
@@ -596,7 +596,7 @@ test grid-10.5 {column/row configure} -body {
     grid columnconfigure . 265 -weight
 } -cleanup {
     grid_reset 10.5
-} -result {0}
+} -result 0
 test grid-10.6 {column/row configure} -body {
     grid columnconfigure . 0
 } -cleanup {
@@ -622,7 +622,7 @@ test grid-10.10 {column/row configure} -body {
     grid columnconfigure . 0 -minsize
 } -cleanup {
     grid_reset 10.10
-} -result {10}
+} -result 10
 test grid-10.11 {column/row configure} -body {
     grid columnconfigure . 0 -weight bad
 } -cleanup {
@@ -638,7 +638,7 @@ test grid-10.13 {column/row configure} -body {
     grid columnconfigure . 0 -weight
 } -cleanup {
     grid_reset 10.13
-} -result {3}
+} -result 3
 test grid-10.14 {column/row configure} -body {
     grid columnconfigure . 0 -pad foo
 } -cleanup {
@@ -654,7 +654,7 @@ test grid-10.16 {column/row configure} -body {
     grid columnconfigure . 0 -pad
 } -cleanup {
     grid_reset 10.16
-} -result {3}
+} -result 3
 test grid-10.17 {column/row configure} -body {
     frame .f
     set a ""
@@ -2055,7 +2055,7 @@ test grid-24.1 {<<NoManagedChild>> fires on last grid forget} -setup {
 } -cleanup {
     bind . <<NoManagedChild>> {}
     grid_reset 24.1
-} -result {1}
+} -result 1
 test grid-24.2 {<<NoManagedChild>> fires on last grid remove} -setup {
     global A
     unset -nocomplain A
@@ -2069,7 +2069,7 @@ test grid-24.2 {<<NoManagedChild>> fires on last grid remove} -setup {
 } -cleanup {
     bind . <<NoManagedChild>> {}
     grid_reset 24.2
-} -result {1}
+} -result 1
 test grid-24.3 {<<NoManagedChild>> fires on last gridded child destruction} -setup {
     global A
     unset -nocomplain A
@@ -2083,7 +2083,7 @@ test grid-24.3 {<<NoManagedChild>> fires on last gridded child destruction} -set
 } -cleanup {
     bind . <<NoManagedChild>> {}
     grid_reset 24.3
-} -result {1}
+} -result 1
 test grid-24.4 {<Configure> does not fire on last grid forget} -setup {
     global A
     unset -nocomplain A
@@ -2097,7 +2097,7 @@ test grid-24.4 {<Configure> does not fire on last grid forget} -setup {
 } -cleanup {
     bind . <Configure> {}
     grid_reset 24.4
-} -result {0}
+} -result 0
 test grid-24.5 {<Configure> fires on forelast grid forget} -setup {
     global A
     unset -nocomplain A
@@ -2112,7 +2112,7 @@ test grid-24.5 {<Configure> fires on forelast grid forget} -setup {
 } -cleanup {
     bind . <Configure> {}
     grid_reset 24.5
-} -result {1}
+} -result 1
 test grid-24.6 {<<NoManagedChild>> does not fire on forelast grid forget} -setup {
     global A
     unset -nocomplain A
@@ -2127,7 +2127,7 @@ test grid-24.6 {<<NoManagedChild>> does not fire on forelast grid forget} -setup
 } -cleanup {
     bind . <<NoManagedChild>> {}
     grid_reset 24.6
-} -result {0}
+} -result 0
 test grid-24.7 {<<NoManagedChild>> does not fire on grid anchor} -setup {
     global A
     unset -nocomplain A
@@ -2140,7 +2140,7 @@ test grid-24.7 {<<NoManagedChild>> does not fire on grid anchor} -setup {
     grid anchor . nw
     bind . <<NoManagedChild>> {}
     grid_reset 24.7
-} -result {0}
+} -result 0
 test grid-24.8 {<<NoManagedChild>> does not fire on last grid forget if propagation is off} -setup {
     global A
     unset -nocomplain A
@@ -2155,7 +2155,7 @@ test grid-24.8 {<<NoManagedChild>> does not fire on last grid forget if propagat
 } -cleanup {
     bind . <<NoManagedChild>> {}
     grid_reset 24.8
-} -result {0}
+} -result 0
 
 # cleanup
 cleanupTests
diff --git a/tests/image.test b/tests/image.test
index ee3f3d9..31b7099 100644
--- a/tests/image.test
+++ b/tests/image.test
@@ -50,7 +50,7 @@ test image-1.6 {Tk_ImageCmd procedure, "create" option} -constraints {
     expr {$second-$first}
 } -cleanup {
     imageCleanup
-} -result {1}
+} -result 1
 
 test image-1.7 {Tk_ImageCmd procedure, "create" option} -constraints {
     testImageType
diff --git a/tests/imgBmap.test b/tests/imgBmap.test
index e7f2c7e..f9fab4d 100644
--- a/tests/imgBmap.test
+++ b/tests/imgBmap.test
@@ -366,7 +366,7 @@ test imageBmap-7.5 {ImgBmapCmd procedure, "cget" option} -body {
 } -returnCodes error -result {unknown option "-stupid"}
 test imageBmap-7.6 {ImgBmapCmd procedure} -body {
     llength [i1 configure]
-} -result {6}
+} -result 6
 test imageBmap-7.7 {ImgBmapCmd procedure} -body {
     i1 co -foreground #001122
     i1 configure -foreground
diff --git a/tests/imgListFormat.test b/tests/imgListFormat.test
index 331b572..be92a07 100644
--- a/tests/imgListFormat.test
+++ b/tests/imgListFormat.test
@@ -187,7 +187,7 @@ test imgListFormat-4.4 {StringReadDef: normal use case} -constraints {
 } -cleanup {
     imageCleanup
     unset imgData
-} -result {1}
+} -result 1
 test imgListFormat-4.5 {StringReadDef: correct compositing rule} -constraints {
     hasTranspTeapotPhoto
 } -setup {
diff --git a/tests/imgPNG.test b/tests/imgPNG.test
index 4900e9c..927725c 100644
--- a/tests/imgPNG.test
+++ b/tests/imgPNG.test
@@ -1113,7 +1113,7 @@ test imgPNG-3.1 {reading image with unknown ancillary chunk - bug [1c659ef0f1]}
     catch {set i [image create photo -file $fileName]}
 } -cleanup {
     image delete $i
-} -result {0}
+} -result 0
 
 }
 namespace delete png
diff --git a/tests/imgPhoto.test b/tests/imgPhoto.test
index efe0a74..782a210 100644
--- a/tests/imgPhoto.test
+++ b/tests/imgPhoto.test
@@ -185,7 +185,7 @@ test imgPhoto-1.12 {option -alpha, normal use} -setup {
     photo1 transparency get 0 0 -alpha
 } -cleanup {
     imageCleanup
-} -result {255}
+} -result 255
 test imgPhoto-1.13 {option -withalpha, normal use} -setup {
     image create photo photo1
 } -body {
@@ -1203,7 +1203,7 @@ test imgPhoto-4.100 {ImgPhotoCmd put: no changes on empty data} -setup {
     string equal $imgData [photo1 data]
 } -cleanup {
     imageCleanup
-} -result {1}
+} -result 1
 test imgPhoto-4.101 {ImgPhotoCmd get: too many args} -setup {
     image create photo photo1
 } -body {
@@ -1519,7 +1519,7 @@ test imgPhoto-10.2 {Tk_ImgPhotoPutBlock, same source and dest img} -constraints
     string equal [photo1 data] [photo2 data]
 } -cleanup {
     imageCleanup
-} -result {1}
+} -result 1
 test imgPhoto-10.3 {Tk_ImgPhotoPutBlock, same source and dest img} -constraints {
     hasTeapotPhoto
 } -setup {
@@ -1533,7 +1533,7 @@ test imgPhoto-10.3 {Tk_ImgPhotoPutBlock, same source and dest img} -constraints
     string equal [photo1 data] [photo2 data]
 } -cleanup {
     imageCleanup
-} -result {1}
+} -result 1
 test imgPhoto-10.4 {Tk_ImgPhotoPutBlock, empty image} -setup {
     imageCleanup
 } -body {
@@ -1575,7 +1575,7 @@ test imgPhoto-12.2 {Tk_ImgPhotoPutZoomedBlock, same source and dest img} -constr
     string equal [photo1 data] [photo2 data]
 } -cleanup {
     imageCleanup
-} -result {1}
+} -result 1
 test imgPhoto-12.3 {Tk_ImgPhotoPutZoomedBlock, same source and dest img} -setup {
     imageCleanup
 } -body {
@@ -1587,7 +1587,7 @@ test imgPhoto-12.3 {Tk_ImgPhotoPutZoomedBlock, same source and dest img} -setup
     string equal [photo1 data] [photo2 data]
 } -cleanup {
     imageCleanup
-} -result {1}
+} -result 1
 test imgPhoto-12.4 {Tk_ImgPhotoPutZoomedBlock, empty image} -setup {
     imageCleanup
 } -body {
diff --git a/tests/imgSVGnano.test b/tests/imgSVGnano.test
index ff7046a..44b4e72 100644
--- a/tests/imgSVGnano.test
+++ b/tests/imgSVGnano.test
@@ -158,7 +158,7 @@ test imgSVGnano-3.7 {Option -scaletowidth} -body {
     image width foo
 } -cleanup {
     rename foo ""
-} -result {20}
+} -result 20
 
 test imgSVGnano-3.8 {Option -scaletoheight} -body {
     image create photo foo -format "svg -scaletoheight 20"\
@@ -166,7 +166,7 @@ test imgSVGnano-3.8 {Option -scaletoheight} -body {
     image height foo
 } -cleanup {
     rename foo ""
-} -result {20}
+} -result 20
 
 test imgSVGnano-3.10 {change from -scaletoheight to -scale} -body {
     set res {}
diff --git a/tests/listbox.test b/tests/listbox.test
index 98ec96c..8a54916 100644
--- a/tests/listbox.test
+++ b/tests/listbox.test
@@ -376,15 +376,15 @@ test listbox-3.5 {ListboxWidgetCmd procedure, "activate" option} -body {
 test listbox-3.6 {ListboxWidgetCmd procedure, "activate" option} -body {
     .l activate -1
     .l index active
-} -result {0}
+} -result 0
 test listbox-3.7 {ListboxWidgetCmd procedure, "activate" option} -body {
     .l activate 30
     .l index active
-} -result {17}
+} -result 17
 test listbox-3.8 {ListboxWidgetCmd procedure, "activate" option} -body {
     .l activate end
     .l index active
-} -result {17}
+} -result 17
 test listbox-3.9 {ListboxWidgetCmd procedure, "bbox" option} -body {
     .l bbox
 } -returnCodes error -result {wrong # args: should be ".l bbox index"}
@@ -508,7 +508,7 @@ test listbox-3.18b {ListboxWidgetCmd procedure, "bbox" option, justified, non-de
 } -cleanup {
     destroy .top.l .top
     unset -nocomplain lres res
-} -result {1}
+} -result 1
 test listbox-3.19 {ListboxWidgetCmd procedure, "cget" option} -body {
     .l cget
 } -returnCodes error -result {wrong # args: should be ".l cget option"}
@@ -520,10 +520,10 @@ test listbox-3.21 {ListboxWidgetCmd procedure, "cget" option} -body {
 } -returnCodes error -result {unknown option "-gorp"}
 test listbox-3.22 {ListboxWidgetCmd procedure, "cget" option} -body {
     .l cget -setgrid
-} -result {0}
+} -result 0
 test listbox-3.23 {ListboxWidgetCmd procedure, "configure" option} -body {
     llength [.l configure]
-} -result {28}
+} -result 28
 test listbox-3.24 {ListboxWidgetCmd procedure, "configure" option} -body {
     .l configure -gorp
 } -returnCodes error -result {unknown option "-gorp"}
@@ -783,7 +783,7 @@ test listbox-3.72 {ListboxWidgetCmd procedure, "nearest" option} -body {
 test listbox-3.73 {ListboxWidgetCmd procedure, "nearest" option} -body {
     .l yview 3
     .l nearest 1000
-} -result {7}
+} -result 7
 test listbox-3.74 {ListboxWidgetCmd procedure, "scan" option} -body {
     .l scan a b
 } -returnCodes error -result {wrong # args: should be ".l scan mark|dragto x y"}
@@ -830,52 +830,52 @@ test listbox-3.83 {ListboxWidgetCmd procedure, "see" option} -body {
     .l yview 7
     .l see 7
     .l index @0,0
-} -result {7}
+} -result 7
 test listbox-3.84 {ListboxWidgetCmd procedure, "see" option} -body {
     .l yview 7
     .l see 11
     .l index @0,0
-} -result {7}
+} -result 7
 test listbox-3.85 {ListboxWidgetCmd procedure, "see" option} -body {
     .l yview 7
     .l see 6
     .l index @0,0
-} -result {6}
+} -result 6
 test listbox-3.86 {ListboxWidgetCmd procedure, "see" option} -body {
     .l yview 7
     .l see 5
     .l index @0,0
-} -result {3}
+} -result 3
 test listbox-3.87 {ListboxWidgetCmd procedure, "see" option} -body {
     .l yview 7
     .l see 12
     .l index @0,0
-} -result {8}
+} -result 8
 test listbox-3.88 {ListboxWidgetCmd procedure, "see" option} -body {
     .l yview 7
     .l see 13
     .l index @0,0
-} -result {11}
+} -result 11
 test listbox-3.89 {ListboxWidgetCmd procedure, "see" option} -body {
     .l yview 7
     .l see -1
     .l index @0,0
-} -result {0}
+} -result 0
 test listbox-3.90 {ListboxWidgetCmd procedure, "see" option} -body {
     .l yview 7
     .l see end
     .l index @0,0
-} -result {13}
+} -result 13
 test listbox-3.91 {ListboxWidgetCmd procedure, "see" option} -body {
     .l yview 7
     .l see 322
     .l index @0,0
-} -result {13}
+} -result 13
 test listbox-3.92 {ListboxWidgetCmd procedure, "see" option, partial last line} -body {
     mkPartial
     .partial.l see 4
     .partial.l index @0,0
-} -result {1}
+} -result 1
 test listbox-3.93 {ListboxWidgetCmd procedure, "selection" option} -body {
     .l select a
 } -returnCodes error -result {wrong # args: should be ".l selection option index ?index?"}
@@ -898,15 +898,15 @@ test listbox-3.98 {ListboxWidgetCmd procedure, "selection" option} -body {
 test listbox-3.99 {ListboxWidgetCmd procedure, "selection" option} -body {
     .l selection anchor -1
     .l index anchor
-} -result {0}
+} -result 0
 test listbox-3.100 {ListboxWidgetCmd procedure, "selection" option} -body {
     .l selection anchor end
     .l index anchor
-} -result {17}
+} -result 17
 test listbox-3.101 {ListboxWidgetCmd procedure, "selection" option} -body {
     .l selection anchor 44
     .l index anchor
-} -result {17}
+} -result 17
 test listbox-3.102 {ListboxWidgetCmd procedure, "selection" option} -body {
     .l selection clear 0 end
     .l selection set 2 8
@@ -926,16 +926,16 @@ test listbox-3.104 {ListboxWidgetCmd procedure, "selection" option} -body {
 test listbox-3.105 {ListboxWidgetCmd procedure, "selection" option} -body {
     .l selection set 0 end
     .l selection includes -1
-} -result {0}
+} -result 0
 test listbox-3.106 {ListboxWidgetCmd procedure, "selection" option} -body {
     .l selection clear 0 end
     .l selection set end
     .l selection includes end
-} -result {1}
+} -result 1
 test listbox-3.107 {ListboxWidgetCmd procedure, "selection" option} -body {
     .l selection set 0 end
     .l selection includes 44
-} -result {0}
+} -result 0
 test listbox-3.108 {ListboxWidgetCmd procedure, "selection" option} -setup {
     destroy .l2
 } -body {
@@ -943,7 +943,7 @@ test listbox-3.108 {ListboxWidgetCmd procedure, "selection" option} -setup {
     .l2 selection includes 0
 } -cleanup {
     destroy .l2
-} -result {0}
+} -result 0
 test listbox-3.109 {ListboxWidgetCmd procedure, "selection" option} -body {
     .l selection clear 0 end
     .l selection set 2
@@ -965,7 +965,7 @@ test listbox-3.112 {ListboxWidgetCmd procedure, "size" option} -body {
 } -returnCodes error -result {wrong # args: should be ".l size"}
 test listbox-3.113 {ListboxWidgetCmd procedure, "size" option} -body {
     .l size
-} -result {18}
+} -result 18
 test listbox-3.114 {ListboxWidgetCmd procedure, "xview" option} -setup {
     destroy .l2
 } -body {
@@ -1242,7 +1242,7 @@ test listbox-4.2 {ConfigureListbox procedure} -setup {
     .l cget -highlightthickness
 } -cleanup {
     deleteWindows
-} -result {0}
+} -result 0
 test listbox-4.3 {ConfigureListbox procedure} -setup {
     deleteWindows
     destroy .l
@@ -1573,14 +1573,14 @@ test listbox-6.2 {InsertEls procedure} -body {
     .l selection anchor 2
     .l insert 2 A B
     .l index anchor
-} -result {4}
+} -result 4
 test listbox-6.3 {InsertEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
     .l selection anchor 2
     .l insert 3 A B
     .l index anchor
-} -result {2}
+} -result 2
 test listbox-6.4 {InsertEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
@@ -1588,7 +1588,7 @@ test listbox-6.4 {InsertEls procedure} -body {
     update
     .l insert 2 A B
     .l index @0,0
-} -result {5}
+} -result 5
 test listbox-6.5 {InsertEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
@@ -1596,31 +1596,31 @@ test listbox-6.5 {InsertEls procedure} -body {
     update
     .l insert 3 A B
     .l index @0,0
-} -result {3}
+} -result 3
 test listbox-6.6 {InsertEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
     .l activate 5
     .l insert 5 A B
     .l index active
-} -result {7}
+} -result 7
 test listbox-6.7 {InsertEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
     .l activate 5
     .l insert 6 A B
     .l index active
-} -result {5}
+} -result 5
 test listbox-6.8 {InsertEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c
     .l index active
-} -result {2}
+} -result 2
 test listbox-6.9 {InsertEls procedure} -body {
     .l delete 0 end
     .l insert 0
     .l index active
-} -result {0}
+} -result 0
 test listbox-6.10 {InsertEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b "two words"  c d e f g h i j
@@ -1728,28 +1728,28 @@ test listbox-7.5 {DeleteEls procedure} -body {
     .l selection anchor 2
     .l delete 0 1
     .l index anchor
-} -result {0}
+} -result 0
 test listbox-7.6 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
     .l selection anchor 2
     .l delete 2
     .l index anchor
-} -result {2}
+} -result 2
 test listbox-7.7 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
     .l selection anchor 4
     .l delete 2 5
     .l index anchor
-} -result {2}
+} -result 2
 test listbox-7.8 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
     .l selection anchor 3
     .l delete 4 5
     .l index anchor
-} -result {3}
+} -result 3
 test listbox-7.9 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
@@ -1757,7 +1757,7 @@ test listbox-7.9 {DeleteEls procedure} -body {
     update
     .l delete 1 2
     .l index @0,0
-} -result {1}
+} -result 1
 test listbox-7.10 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
@@ -1765,7 +1765,7 @@ test listbox-7.10 {DeleteEls procedure} -body {
     update
     .l delete 3 4
     .l index @0,0
-} -result {3}
+} -result 3
 test listbox-7.11 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
@@ -1773,7 +1773,7 @@ test listbox-7.11 {DeleteEls procedure} -body {
     update
     .l delete 4 6
     .l index @0,0
-} -result {3}
+} -result 3
 test listbox-7.12 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
@@ -1781,42 +1781,42 @@ test listbox-7.12 {DeleteEls procedure} -body {
     update
     .l delete 3 end
     .l index @0,0
-} -result {1}
+} -result 1
 test listbox-7.13 {DeleteEls procedure, updating view with partial last line} -body {
     mkPartial
     .partial.l yview 8
     update
     .partial.l delete 10 13
     .partial.l index @0,0
-} -result {7}
+} -result 7
 test listbox-7.14 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
     .l activate 6
     .l delete 3 4
     .l index active
-} -result {4}
+} -result 4
 test listbox-7.15 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
     .l activate 6
     .l delete 5 7
     .l index active
-} -result {5}
+} -result 5
 test listbox-7.16 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
     .l activate 6
     .l delete 5 end
     .l index active
-} -result {4}
+} -result 4
 test listbox-7.17 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
     .l activate 6
     .l delete 0 end
     .l index active
-} -result {0}
+} -result 0
 test listbox-7.18 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c "two words" d e f g h i j
@@ -1987,7 +1987,7 @@ test listbox-10.5 {GetListboxIndex procedure} -setup {
     .l index end
 } -cleanup {
     destroy .l
-} -result {12}
+} -result 12
 test listbox-10.6 {GetListboxIndex procedure} -setup {
     destroy .l
 } -body {
@@ -2102,7 +2102,7 @@ test listbox-10.16 {GetListboxIndex procedure} -setup {
     .l index 3
 } -cleanup {
     destroy .l
-} -result {3}
+} -result 3
 test listbox-10.17 {GetListboxIndex procedure} -setup {
     destroy .l
 } -body {
@@ -2112,7 +2112,7 @@ test listbox-10.17 {GetListboxIndex procedure} -setup {
     .l index 20
 } -cleanup {
     destroy .l
-} -result {12}
+} -result 12
 test listbox-10.18 {GetListboxIndex procedure} -setup {
     destroy .l
 } -body {
@@ -2226,7 +2226,7 @@ test listbox-11.6 {ChangeListboxView procedure, partial last line} -body {
     .partial.l index @0,0
 } -cleanup {
     destroy .l
-} -result {11}
+} -result 11
 
 
 # Listbox used in 12.* tests
@@ -2314,7 +2314,7 @@ test listbox-13.3 {ListboxScanTo procedure} -constraints {
 test listbox-14.1 {NearestListboxElement procedure, partial last line} -body {
     mkPartial
     .partial.l nearest [winfo height .partial.l]
-} -result {4}
+} -result 4
 # Listbox used in 14.* tests
 destroy .l
 listbox .l -font $fixed -width 20 -height 10
@@ -2326,7 +2326,7 @@ test listbox-14.2 {NearestListboxElement procedure} -constraints {
 	fonts
 } -body {
     .l index @50,0
-} -result {4}
+} -result 4
 test listbox-14.3 {NearestListboxElement procedure} -constraints {
 	fonts
 } -body {
@@ -2336,7 +2336,7 @@ test listbox-14.4 {NearestListboxElement procedure} -constraints {
 	fonts
 } -body {
     .l index @50,200
-} -result {13}
+} -result 13
 
 
 # Listbox used in 15.* 16.* and 17.* tests
@@ -2415,7 +2415,7 @@ test listbox-15.9 {ListboxSelect procedure, boundary conditions for indices} -bo
     .l select clear 0 end
     .l select set end 30
     .l curselection
-} -result {5}
+} -result 5
 test listbox-15.10 {ListboxSelect procedure, boundary conditions for indices} -body {
     .l delete 0 end
     .l insert 0 a b c d e f
@@ -2451,7 +2451,7 @@ test listbox-16.3 {ListboxFetchSelection procedure, retrieve in several parts} -
     string compare 1$long\n2$long\n3$long\n4$long\n5$long $sel
 } -cleanup {
     catch {unset long sel}
-} -result {0}
+} -result 0
 
 
 test listbox-17.1 {ListboxLostSelection procedure} -setup {
diff --git a/tests/menu.test b/tests/menu.test
index 5d4884c..c288661 100644
--- a/tests/menu.test
+++ b/tests/menu.test
@@ -270,11 +270,11 @@ test menu-2.27 {configuration options -takefocus {any string}} -body {
 test menu-2.28 {configuration options -tearoff 0} -body {
     .m1 configure -tearoff 0
     .m1 cget -tearoff
-} -result {0}
+} -result 0
 test menu-2.29 {configuration options -tearoff 1} -body {
     .m1 configure -tearoff 1
     .m1 cget -tearoff
-} -result {1}
+} -result 1
 test menu-2.30 {configuration options -tearoffcommand {any old string}} -body {
     .m1 configure -tearoffcommand {any old string}
     .m1 cget -tearoffcommand
@@ -545,12 +545,12 @@ test menu-2.85 {entry configuration options 0 -columnbreak 1 tearoff} -body {
 test menu-2.86 {entry configuration options 1 -columnbreak 1 command} -body {
     .m1 entryconfigure 1 -columnbreak 1
     lindex [.m1 entryconfigure 1 -columnbreak] 4
-} -result {1}
+} -result 1
 
 test menu-2.87 {entry configuration options 2 -columnbreak 1 cascade} -body {
     .m1 entryconfigure 2 -columnbreak 1
     lindex [.m1 entryconfigure 2 -columnbreak] 4
-} -result {1}
+} -result 1
 
 test menu-2.88 {entry configuration options 3 -columnbreak 1 separator} -body {
     .m1 entryconfigure 3 -columnbreak 1
@@ -559,12 +559,12 @@ test menu-2.88 {entry configuration options 3 -columnbreak 1 separator} -body {
 test menu-2.89 {entry configuration options 4 -columnbreak 1 checkbutton} -body {
     .m1 entryconfigure 4 -columnbreak 1
     lindex [.m1 entryconfigure 4 -columnbreak] 4
-} -result {1}
+} -result 1
 
 test menu-2.90 {entry configuration options 5 -columnbreak 1 radiobutton} -body {
     .m1 entryconfigure 5 -columnbreak 1
     lindex [.m1 entryconfigure 5 -columnbreak] 4
-} -result {1}
+} -result 1
 
 test menu-2.91 {entry configuration options 0 -command beep tearoff} -body {
     .m1 entryconfigure 0 -command beep
@@ -829,12 +829,12 @@ test menu-2.142 {entry configuration options 3 -indicatoron 1 separator} -body {
 test menu-2.143 {entry configuration options 4 -indicatoron 1 checkbutton} -body {
     .m1 entryconfigure 4 -indicatoron 1
     lindex [.m1 entryconfigure 4 -indicatoron] 4
-} -result {1}
+} -result 1
 
 test menu-2.144 {entry configuration options 5 -indicatoron 1 radiobutton} -body {
     .m1 entryconfigure 5 -indicatoron 1
     lindex [.m1 entryconfigure 5 -indicatoron] 4
-} -result {1}
+} -result 1
 
 test menu-2.145 {entry configuration options 0 -label test tearoff} -body {
     .m1 entryconfigure 0 -label test
@@ -1172,12 +1172,12 @@ test menu-2.217 {entry configuration options 0 -underline 0 tearoff} -body {
 test menu-2.218 {entry configuration options 1 -underline 0 command} -body {
     .m1 entryconfigure 1 -underline 0
     lindex [.m1 entryconfigure 1 -underline] 4
-} -result {0}
+} -result 0
 
 test menu-2.219 {entry configuration options 2 -underline 0 cascade} -body {
     .m1 entryconfigure 2 -underline 0
     lindex [.m1 entryconfigure 2 -underline] 4
-} -result {0}
+} -result 0
 
 test menu-2.220 {entry configuration options 3 -underline 0 separator} -body {
     .m1 entryconfigure 3 -underline 0
@@ -1186,12 +1186,12 @@ test menu-2.220 {entry configuration options 3 -underline 0 separator} -body {
 test menu-2.221 {entry configuration options 4 -underline 0 checkbutton} -body {
     .m1 entryconfigure 4 -underline 0
     lindex [.m1 entryconfigure 4 -underline] 4
-} -result {0}
+} -result 0
 
 test menu-2.222 {entry configuration options 5 -underline 0 radiobutton} -body {
     .m1 entryconfigure 5 -underline 0
     lindex [.m1 entryconfigure 5 -underline] 4
-} -result {0}
+} -result 0
 
 test menu-2.223 {entry configuration options 0 -underline 3p tearoff} -body {
     .m1 entryconfigure 0 -underline 3p
@@ -1367,7 +1367,7 @@ test menu-3.18 {MenuWidgetCmd procedure, "configure" option} -setup {
     llength [.m1 configure]
 } -cleanup {
 	destroy .m1
-} -result {21}
+} -result 21
 test menu-3.19 {MenuWidgetCmd procedure, "configure" option} -setup {
 	destroy .m1
 } -body {
@@ -1519,7 +1519,7 @@ test menu-3.36 {MenuWidgetCmd procedure, "entryconfigure" option} -setup {
     llength [.m1 entryconfigure 1]
 } -cleanup {
 	destroy .m1
-} -result {15}
+} -result 15
 test menu-3.37 {MenuWidgetCmd procedure, "entryconfigure" option} -setup {
 	destroy .m1
 } -body {
@@ -1787,7 +1787,7 @@ test menu-3.66a {MenuWidgetCmd procedure, "yposition" option, no tearoff} -setup
     .m1 yposition 1
 } -cleanup {
 	destroy .m1
-} -result {0}
+} -result 0
 test menu-3.66b {MenuWidgetCmd procedure, "yposition" option, with tearoff} -constraints {
     notAqua
 } -setup {
@@ -1799,7 +1799,7 @@ test menu-3.66b {MenuWidgetCmd procedure, "yposition" option, with tearoff} -con
     .m1 yposition 1
 } -cleanup {
 	destroy .m1
-} -result {1}
+} -result 1
 test menu-3.66c {MenuWidgetCmd procedure, "yposition" option, with tearoff} -constraints {
     aqua
 } -setup {
@@ -1811,7 +1811,7 @@ test menu-3.66c {MenuWidgetCmd procedure, "yposition" option, with tearoff} -con
     .m1 yposition 1
 } -cleanup {
 	destroy .m1
-} -result {0}
+} -result 0
 test menu-3.67 {MenuWidgetCmd procedure, bad option} -setup {
 	destroy .m1
 } -body {
@@ -1878,7 +1878,7 @@ test menu-4.2 {TkInvokeMenu: tearoff} -setup {
 	catch {.m1 invoke 0}
 } -cleanup {
     deleteWindows
-} -result {0}
+} -result 0
 test menu-4.3 {TkInvokeMenu: checkbutton -on} -setup {
     destroy .m1
 } -body {
@@ -2139,7 +2139,7 @@ test menu-6.5 {TkDestroyMenu} -setup {
     .m1 clone .m2
     destroy .m1
     winfo exists .m2
-} -result {0}
+} -result 0
 test menu-6.6 {TkDestroyMenu} -setup {
     destroy .m1 .m2
 } -body {
@@ -3375,7 +3375,7 @@ test menu-22.1 {GetIndexFromCoords} -setup {
     .m1 index @5
 } -cleanup {
     deleteWindows
-} -result {0}
+} -result 0
 test menu-22.2 {GetIndexFromCoords} -setup {
     deleteWindows
 } -body {
@@ -3385,7 +3385,7 @@ test menu-22.2 {GetIndexFromCoords} -setup {
     .m1 index @5,5
 } -cleanup {
     deleteWindows
-} -result {0}
+} -result 0
 test menu-22.3 {GetIndexFromCoords: mapped window, y only} -setup {
     deleteWindows
 } -constraints {x11} -body {
@@ -3397,7 +3397,7 @@ test menu-22.3 {GetIndexFromCoords: mapped window, y only} -setup {
     .m1 index @5
 } -cleanup {
     deleteWindows
-} -result {0}
+} -result 0
 test menu-22.4 {GetIndexFromCoords: mapped window x,y} -setup {
     deleteWindows
 } -constraints {x11} -body {
@@ -3411,7 +3411,7 @@ test menu-22.4 {GetIndexFromCoords: mapped window x,y} -setup {
     .m1 index @$x,5
 } -cleanup {
     deleteWindows
-} -result {0}
+} -result 0
 test menu-22.5 {GetIndexFromCoords: mapped wide window} -setup {
     deleteWindows
 } -constraints {x11} -body {
@@ -3426,7 +3426,7 @@ test menu-22.5 {GetIndexFromCoords: mapped wide window} -setup {
     .m1 index @$x,5
 } -cleanup {
     deleteWindows
-} -result {0}
+} -result 0
 
 test menu-23.1 {RecursivelyDeleteMenu} -setup {
     deleteWindows
@@ -3965,7 +3965,7 @@ test menu-38.1 {Can't dismiss ttk::menubutton menu until mouse has hovered over
     winfo ismapped .top.mb.m
 } -cleanup {
     destroy .top.mb.m .top.m .top
-} -result {0}
+} -result 0
 
 
 # cleanup
diff --git a/tests/menubut.test b/tests/menubut.test
index d245fd0..b8a52a9 100644
--- a/tests/menubut.test
+++ b/tests/menubut.test
@@ -71,7 +71,7 @@ test menubutton-1.9 {configuration options} -body {
     .mb cget -bd
 } -cleanup {
     .mb configure -bd [lindex [.mb configure -bd] 3]
-} -result {4}
+} -result 4
 test menubutton-1.10 {configuration options} -body {
     .mb configure -bd badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -98,7 +98,7 @@ test menubutton-1.15 {configuration options} -body {
     .mb cget -borderwidth
 } -cleanup {
     .mb configure -borderwidth [lindex [.mb configure -borderwidth] 3]
-} -result {1}
+} -result 1
 test menubutton-1.16 {configuration options} -body {
     .mb configure -borderwidth badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -158,7 +158,7 @@ test menubutton-1.28 {configuration options} -body {
     .mb cget -height
 } -cleanup {
     .mb configure -height [lindex [.mb configure -height] 3]
-} -result {18}
+} -result 18
 test menubutton-1.29 {configuration options} -body {
     .mb configure -height 20.0
 } -returnCodes error -result {expected integer but got "20.0"}
@@ -185,7 +185,7 @@ test menubutton-1.34 {configuration options} -body {
     .mb cget -highlightthickness
 } -cleanup {
     .mb configure -highlightthickness [lindex [.mb configure -highlightthickness] 3]
-} -result {18}
+} -result 18
 test menubutton-1.35 {configuration options} -body {
     .mb configure -highlightthickness badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -213,7 +213,7 @@ test menubutton-1.38 {configuration options} -body {
     .mb cget -indicatoron
 } -cleanup {
     .mb configure -indicatoron [lindex [.mb configure -indicatoron] 3]
-} -result {1}
+} -result 1
 test menubutton-1.39 {configuration options} -body {
     .mb configure -indicatoron no_way
 } -returnCodes error -result {expected boolean value but got "no_way"}
@@ -237,7 +237,7 @@ test menubutton-1.43 {configuration options} -body {
     .mb cget -padx
 } -cleanup {
     .mb configure -padx [lindex [.mb configure -padx] 3]
-} -result {12}
+} -result 12
 test menubutton-1.44 {configuration options} -body {
     .mb configure -padx 420x
 } -returnCodes error -result {bad screen distance "420x"}
@@ -246,7 +246,7 @@ test menubutton-1.45 {configuration options} -body {
     .mb cget -pady
 } -cleanup {
     .mb configure -pady [lindex [.mb configure -pady] 3]
-} -result {12}
+} -result 12
 test menubutton-1.46 {configuration options} -body {
     .mb configure -pady 420x
 } -returnCodes error -result {bad screen distance "420x"}
@@ -291,7 +291,7 @@ test menubutton-1.54 {configuration options} -body {
     .mb cget -underline
 } -cleanup {
     .mb configure -underline [lindex [.mb configure -underline] 3]
-} -result {5}
+} -result 5
 test menubutton-1.55 {configuration options} -body {
     .mb configure -underline 3p
 } -returnCodes error -result {expected integer but got "3p"}
@@ -300,7 +300,7 @@ test menubutton-1.56 {configuration options} -body {
     .mb cget -width
 } -cleanup {
     .mb configure -width [lindex [.mb configure -width] 3]
-} -result {402}
+} -result 402
 test menubutton-1.57 {configuration options} -body {
     .mb configure -width 3p
 } -returnCodes error -result {expected integer but got "3p"}
@@ -309,7 +309,7 @@ test menubutton-1.58 {configuration options} -body {
     .mb cget -wraplength
 } -cleanup {
     .mb configure -wraplength [lindex [.mb configure -wraplength] 3]
-} -result {100}
+} -result 100
 test menubutton-1.59 {configuration options} -body {
     .mb configure -wraplength 6x
 } -returnCodes error -result {bad screen distance "6x"}
@@ -364,10 +364,10 @@ test menubutton-3.5 {ButtonWidgetCmd procedure, "cget" option} -body {
 test menubutton-3.6 {ButtonWidgetCmd procedure, "cget" option} -body {
     .mb configure -highlightthickness 3
     .mb cget -highlightthickness
-} -result {3}
+} -result 3
 test menubutton-3.7 {ButtonWidgetCmd procedure, "configure" option} -body {
     llength [.mb configure]
-} -result {33}
+} -result 33
 test menubutton-3.8 {ButtonWidgetCmd procedure, "configure" option} -body {
     .mb configure -gorp
 } -returnCodes error -result {unknown option "-gorp"}
diff --git a/tests/message.test b/tests/message.test
index 2ca6921..02c04f4 100644
--- a/tests/message.test
+++ b/tests/message.test
@@ -41,7 +41,7 @@ test message-1.3 {configuration option: "aspect"} -setup {
     .m cget -aspect
 } -cleanup {
     destroy .m
-} -result {3}
+} -result 3
 test message-1.4 {configuration option: "aspect"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .m
@@ -81,7 +81,7 @@ test message-1.7 {configuration option: "bd"} -setup {
     .m cget -bd
 } -cleanup {
     destroy .m
-} -result {4}
+} -result 4
 test message-1.8 {configuration option: "bd"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .m
@@ -121,7 +121,7 @@ test message-1.11 {configuration option: "borderwidth"} -setup {
     .m cget -borderwidth
 } -cleanup {
     destroy .m
-} -result {1}
+} -result 1
 test message-1.12 {configuration option: "borderwidth"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .m
@@ -261,7 +261,7 @@ test message-1.25 {configuration option: "highlightthickness"} -setup {
     .m cget -highlightthickness
 } -cleanup {
     destroy .m
-} -result {2}
+} -result 2
 test message-1.26 {configuration option: "highlightthickness"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .m
@@ -383,7 +383,7 @@ test message-1.37 {configuration option: "width"} -setup {
     .m cget -width
 } -cleanup {
     destroy .m
-} -result {2}
+} -result 2
 test message-1.38 {configuration option: "width"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .m
@@ -452,7 +452,7 @@ test message-3.5 {MessageWidgetObjCmd procedure, "configure"} -setup {
     llength [.m configure]
 } -cleanup {
     destroy .m
-} -result {21}
+} -result 21
 test message-3.6 {MessageWidgetObjCmd procedure, "configure"} -setup {
     message .m
 } -body {
@@ -468,7 +468,7 @@ test message-3.7 {MessageWidgetObjCmd procedure, "configure"} -setup {
     lindex [.m configure -bd] 4
 } -cleanup {
     destroy .m
-} -result {4}
+} -result 4
 
 test message-4.1 {Bug [5d991b822e]} {
     # Want this not to segfault, or write to variable with empty name
diff --git a/tests/pack.test b/tests/pack.test
index 4a41516..c65727e 100644
--- a/tests/pack.test
+++ b/tests/pack.test
@@ -1639,7 +1639,7 @@ test pack-20.1 {<<NoManagedChild>> fires on last pack forget} -setup {
 } -cleanup {
     bind . <<NoManagedChild>> {}
     destroy .1
-} -result {1}
+} -result 1
 test pack-20.2 {<<NoManagedChild>> fires on last packed child destruction} -setup {
     global A
     unset -nocomplain A
@@ -1653,7 +1653,7 @@ test pack-20.2 {<<NoManagedChild>> fires on last packed child destruction} -setu
 } -cleanup {
     bind . <<NoManagedChild>> {}
     destroy .1
-} -result {1}
+} -result 1
 test pack-20.3 {<Configure> does not fire on last pack forget} -setup {
     global A
     unset -nocomplain A
@@ -1667,7 +1667,7 @@ test pack-20.3 {<Configure> does not fire on last pack forget} -setup {
 } -cleanup {
     bind . <Configure> {}
     destroy .1
-} -result {0}
+} -result 0
 test pack-20.4 {<<NoManagedChild>> does not fire on forelast pack forget} -setup {
     global A
     unset -nocomplain A
@@ -1682,7 +1682,7 @@ test pack-20.4 {<<NoManagedChild>> does not fire on forelast pack forget} -setup
 } -cleanup {
     bind . <<NoManagedChild>> {}
     destroy .1 .2
-} -result {0}
+} -result 0
 test pack-20.5 {<Configure> does not fire on last pack forget} -setup {
     global A
     unset -nocomplain A
@@ -1697,7 +1697,7 @@ test pack-20.5 {<Configure> does not fire on last pack forget} -setup {
 } -cleanup {
     bind . <Configure> {}
     destroy .1 .2
-} -result {1}
+} -result 1
 test pack-20.6 {<<NoManagedChild>> does not fire on last pack forget if propagation is off} -setup {
     global A
     unset -nocomplain A
@@ -1712,7 +1712,7 @@ test pack-20.6 {<<NoManagedChild>> does not fire on last pack forget if propagat
 } -cleanup {
     bind . <<NoManagedChild>> {}
     destroy .1
-} -result {0}
+} -result 0
 
 # cleanup
 cleanupTests
diff --git a/tests/panedwindow.test b/tests/panedwindow.test
index ea407a0..3786ef8 100644
--- a/tests/panedwindow.test
+++ b/tests/panedwindow.test
@@ -4562,7 +4562,7 @@ test panedwindow-22.2 {PanedWindowReqProc, react to slave geometry changes} -set
     expr {[lindex $result 1] - [lindex $result 0]}
 } -cleanup {
 	deleteWindows
-} -result {10}
+} -result 10
 
 
 test panedwindow-23.1 {ConfigurePanes, can't add panedwindow to itself} -setup {
@@ -5461,7 +5461,7 @@ test panedwindow-27.2 {destroy the window cleanly on rename [Bug #616589]} -setu
     winfo exists .p
 } -cleanup {
 	deleteWindows
-} -result {0}
+} -result 0
 
 
 test panedwindow-28.1 {resizing width} -setup {
diff --git a/tests/place.test b/tests/place.test
index e04ee0a..975732a 100644
--- a/tests/place.test
+++ b/tests/place.test
@@ -62,7 +62,7 @@ test place-2.2 {ConfigureSlave procedure, -height option} -setup {
     place .t.f2 -in .t.f -height 40
     update
     winfo height .t.f2
-} -result {40}
+} -result 40
 test place-2.3 {ConfigureSlave procedure, -height option} -setup {
     place forget .t.f2
 } -body {
@@ -71,7 +71,7 @@ test place-2.3 {ConfigureSlave procedure, -height option} -setup {
     place .t.f2 -height {}
     update
     winfo height .t.f2
-} -result {60}
+} -result 60
 
 
 test place-3.1 {ConfigureSlave procedure, -relheight option} -body {
@@ -83,7 +83,7 @@ test place-3.2 {ConfigureSlave procedure, -relheight option} -setup {
     place .t.f2 -in .t.f -relheight .5
     update
     winfo height .t.f2
-} -result {40}
+} -result 40
 test place-3.3 {ConfigureSlave procedure, -relheight option} -setup {
     place forget .t.f2
 } -body {
@@ -92,7 +92,7 @@ test place-3.3 {ConfigureSlave procedure, -relheight option} -setup {
     place .t.f2 -relheight {}
     update
     winfo height .t.f2
-} -result {60}
+} -result 60
 
 
 test place-4.1 {ConfigureSlave procedure, bad -in options} -setup {
@@ -148,7 +148,7 @@ test place-5.2 {ConfigureSlave procedure, -relwidth option} -setup {
     place .t.f2 -in .t.f -relwidth .5
     update
     winfo width .t.f2
-} -result {75}
+} -result 75
 test place-5.3 {ConfigureSlave procedure, -relwidth option} -setup {
     place forget .t.f2
 } -body {
@@ -157,7 +157,7 @@ test place-5.3 {ConfigureSlave procedure, -relwidth option} -setup {
     place .t.f2 -relwidth {}
     update
     winfo width .t.f2
-} -result {30}
+} -result 30
 
 test place-6.1 {ConfigureSlave procedure, -width option} -body {
     place .t.f2 -width abcd
@@ -168,7 +168,7 @@ test place-6.2 {ConfigureSlave procedure, -width option} -setup {
     place .t.f2 -in .t.f -width 100
     update
     winfo width .t.f2
-} -result {100}
+} -result 100
 test place-6.3 {ConfigureSlave procedure, -width option} -setup {
     place forget .t.f2
 } -body {
@@ -177,7 +177,7 @@ test place-6.3 {ConfigureSlave procedure, -width option} -setup {
     place .t.f2 -width {}
     update
     winfo width .t.f2
-} -result {30}
+} -result 30
 
 
 test place-7.1 {ReconfigurePlacement procedure, computing position} -setup {
diff --git a/tests/safePrimarySelection.test b/tests/safePrimarySelection.test
index 7cc31f4..7c27c88 100644
--- a/tests/safePrimarySelection.test
+++ b/tests/safePrimarySelection.test
@@ -281,7 +281,7 @@ test safePrimarySelection-1.6 {master interpreter, spinbox spun, no existing sel
 } -cleanup {
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
-} -result {2}
+} -result 2
 
 test safePrimarySelection-1.7 {master interpreter, spinbox spun/selected/spun, no existing selection} -setup {
     catch {interp delete slave2}
@@ -293,7 +293,7 @@ test safePrimarySelection-1.7 {master interpreter, spinbox spun/selected/spun, n
 } -cleanup {
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
-} -result {3}
+} -result 3
 
 test safePrimarySelection-1.8 {master interpreter, ttk::spinbox as entry, no existing selection} -setup {
     catch {interp delete slave2}
@@ -317,7 +317,7 @@ test safePrimarySelection-1.9 {master interpreter, ttk::spinbox spun, no existin
 } -cleanup {
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
-} -result {2}
+} -result 2
 
 test safePrimarySelection-1.10 {master interpreter, ttk::spinbox spun/selected/spun, no existing selection} -setup {
     catch {interp delete slave2}
@@ -329,7 +329,7 @@ test safePrimarySelection-1.10 {master interpreter, ttk::spinbox spun/selected/s
 } -cleanup {
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
-} -result {3}
+} -result 3
 
 test safePrimarySelection-2.1 {unsafe slave interpreter, text, no existing selection} -setup {
     catch {interp delete slave2}
@@ -431,7 +431,7 @@ test safePrimarySelection-2.6 {unsafe slave interpreter, spinbox spun, no existi
     destroy {*}[winfo children .]
     unset int2
     ::_test_tmp::clearPrimarySelection
-} -result {2}
+} -result 2
 
 test safePrimarySelection-2.7 {unsafe slave interpreter, spinbox spun/selected/spun, no existing selection} -setup {
     catch {interp delete slave2}
@@ -448,7 +448,7 @@ test safePrimarySelection-2.7 {unsafe slave interpreter, spinbox spun/selected/s
     destroy {*}[winfo children .]
     unset int2
     ::_test_tmp::clearPrimarySelection
-} -result {3}
+} -result 3
 
 test safePrimarySelection-2.8 {unsafe slave interpreter, ttk::spinbox as entry, no existing selection} -setup {
     catch {interp delete slave2}
@@ -482,7 +482,7 @@ test safePrimarySelection-2.9 {unsafe slave interpreter, ttk::spinbox spun, no e
     destroy {*}[winfo children .]
     unset int2
     ::_test_tmp::clearPrimarySelection
-} -result {2}
+} -result 2
 
 test safePrimarySelection-2.10 {unsafe slave interpreter, ttk::spinbox spun/selected/spun, no existing selection} -setup {
     catch {interp delete slave2}
@@ -499,7 +499,7 @@ test safePrimarySelection-2.10 {unsafe slave interpreter, ttk::spinbox spun/sele
     destroy {*}[winfo children .]
     unset int2
     ::_test_tmp::clearPrimarySelection
-} -result {3}
+} -result 3
 
 test safePrimarySelection-3.1 {IMPORTANT, safe slave interpreter, text, no existing selection} -setup {
     catch {interp delete slave2}
@@ -781,7 +781,7 @@ test safePrimarySelection-4.6 {master interpreter, spinbox spun, existing select
 } -cleanup {
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
-} -result {2}
+} -result 2
 
 test safePrimarySelection-4.7 {master interpreter, spinbox spun/selected/spun, existing selection} -setup {
     catch {interp delete slave2}
@@ -793,7 +793,7 @@ test safePrimarySelection-4.7 {master interpreter, spinbox spun/selected/spun, e
 } -cleanup {
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
-} -result {3}
+} -result 3
 
 test safePrimarySelection-4.8 {master interpreter, ttk::spinbox as entry, existing selection} -setup {
     catch {interp delete slave2}
@@ -817,7 +817,7 @@ test safePrimarySelection-4.9 {master interpreter, ttk::spinbox spun, existing s
 } -cleanup {
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
-} -result {2}
+} -result 2
 
 test safePrimarySelection-4.10 {master interpreter, ttk::spinbox spun/selected/spun, existing selection} -setup {
     catch {interp delete slave2}
@@ -829,7 +829,7 @@ test safePrimarySelection-4.10 {master interpreter, ttk::spinbox spun/selected/s
 } -cleanup {
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
-} -result {3}
+} -result 3
 
 test safePrimarySelection-5.1 {unsafe slave interpreter, text, existing selection} -setup {
     catch {interp delete slave2}
@@ -931,7 +931,7 @@ test safePrimarySelection-5.6 {unsafe slave interpreter, spinbox spun, existing
     destroy {*}[winfo children .]
     unset int2
     ::_test_tmp::clearPrimarySelection
-} -result {2}
+} -result 2
 
 test safePrimarySelection-5.7 {unsafe slave interpreter, spinbox spun/selected/spun, existing selection} -setup {
     catch {interp delete slave2}
@@ -948,7 +948,7 @@ test safePrimarySelection-5.7 {unsafe slave interpreter, spinbox spun/selected/s
     destroy {*}[winfo children .]
     unset int2
     ::_test_tmp::clearPrimarySelection
-} -result {3}
+} -result 3
 
 test safePrimarySelection-5.8 {unsafe slave interpreter, ttk::spinbox as entry, existing selection} -setup {
     catch {interp delete slave2}
@@ -982,7 +982,7 @@ test safePrimarySelection-5.9 {unsafe slave interpreter, ttk::spinbox spun, exis
     destroy {*}[winfo children .]
     unset int2
     ::_test_tmp::clearPrimarySelection
-} -result {2}
+} -result 2
 
 test safePrimarySelection-5.10 {unsafe slave interpreter, ttk::spinbox spun/selected/spun, existing selection} -setup {
     catch {interp delete slave2}
@@ -999,7 +999,7 @@ test safePrimarySelection-5.10 {unsafe slave interpreter, ttk::spinbox spun/sele
     destroy {*}[winfo children .]
     unset int2
     ::_test_tmp::clearPrimarySelection
-} -result {3}
+} -result 3
 
 test safePrimarySelection-6.1 {IMPORTANT, safe slave interpreter, text, existing selection} -setup {
     catch {interp delete slave2}
diff --git a/tests/scale.test b/tests/scale.test
index 955092b..2c3a8c2 100644
--- a/tests/scale.test
+++ b/tests/scale.test
@@ -46,7 +46,7 @@ test scale-1.5 {configuration options} -body {
     .s cget -bd
 } -cleanup {
     .s configure -bd [lindex [.s configure -bd] 3]
-} -result {4}
+} -result 4
 test scale-1.6 {configuration options} -body {
         .s configure -bd badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -73,7 +73,7 @@ test scale-1.11 {configuration options} -body {
     .s cget -borderwidth
 } -cleanup {
     .s configure -borderwidth [lindex [.s configure -borderwidth] 3]
-} -result {1}
+} -result 1
 test scale-1.12 {configuration options} -body {
         .s configure -borderwidth badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -97,7 +97,7 @@ test scale-1.17 {configuration options} -body {
     .s cget -digits
 } -cleanup {
     .s configure -digits [lindex [.s configure -digits] 3]
-} -result {5}
+} -result 5
 test scale-1.18 {configuration options} -body {
         .s configure -digits badValue
 } -returnCodes error -result {expected integer but got "badValue"}
@@ -157,7 +157,7 @@ test scale-1.31 {configuration options} -body {
     .s cget -highlightthickness
 } -cleanup {
     .s configure -highlightthickness [lindex [.s configure -highlightthickness] 3]
-} -result {2}
+} -result 2
 test scale-1.32 {configuration options} -body {
         .s configure -highlightthickness badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -172,7 +172,7 @@ test scale-1.35 {configuration options} -body {
     .s cget -length
 } -cleanup {
     .s configure -length [lindex [.s configure -length] 3]
-} -result {130}
+} -result 130
 test scale-1.36 {configuration options} -body {
         .s configure -length badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -205,7 +205,7 @@ test scale-1.43 {configuration options} -body {
     .s cget -repeatdelay
 } -cleanup {
     .s configure -repeatdelay [lindex [.s configure -repeatdelay] 3]
-} -result {14}
+} -result 14
 test scale-1.44 {configuration options} -body {
         .s configure -repeatdelay bogus
 } -returnCodes error -result {expected integer but got "bogus"}
@@ -214,7 +214,7 @@ test scale-1.45 {configuration options} -body {
     .s cget -repeatinterval
 } -cleanup {
     .s configure -repeatinterval [lindex [.s configure -repeatinterval] 3]
-} -result {14}
+} -result 14
 test scale-1.46 {configuration options} -body {
         .s configure -repeatinterval bogus
 } -returnCodes error -result {expected integer but got "bogus"}
@@ -232,7 +232,7 @@ test scale-1.49 {configuration options} -body {
     .s cget -showvalue
 } -cleanup {
     .s configure -showvalue [lindex [.s configure -showvalue] 3]
-} -result {0}
+} -result 0
 test scale-1.50 {configuration options} -body {
         .s configure -showvalue badValue
 } -returnCodes error -result {expected boolean value but got "badValue"}
@@ -241,7 +241,7 @@ test scale-1.51 {configuration options} -body {
     .s cget -sliderlength
 } -cleanup {
     .s configure -sliderlength [lindex [.s configure -sliderlength] 3]
-} -result {86}
+} -result 86
 test scale-1.52 {configuration options} -body {
         .s configure -sliderlength badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -313,7 +313,7 @@ test scale-1.69 {configuration options} -body {
     .s cget -width
 } -cleanup {
     .s configure -width [lindex [.s configure -width] 3]
-} -result {32}
+} -result 32
 test scale-1.70 {configuration options} -body {
         .s configure -width badValue
 } -returnCodes error -result {bad screen distance "badValue"}
@@ -359,7 +359,7 @@ test scale-3.4 {ScaleWidgetCmd procedure, cget option} -body {
 test scale-3.5 {ScaleWidgetCmd procedure, cget option} -body {
     .s configure -highlightthickness 2
     .s cget -highlightthickness
-} -result {2}
+} -result 2
 test scale-3.6 {ScaleWidgetCmd procedure, configure option} -body {
     list [llength [.s configure]] [lindex [.s configure] 6]
 } -result {33 {-command command Command {} {}}}
@@ -466,7 +466,7 @@ test scale-3.28 {ScaleWidgetCmd procedure, set option} -body {
     .s set 181
     .s configure -state normal
     .s get
-} -result {118}
+} -result 118
 test scale-3.29 {ScaleWidgetCmd procedure} -body {
     .s dumb
 } -returnCodes error -result {bad option "dumb": must be cget, configure, coords, get, identify, or set}
@@ -588,27 +588,27 @@ test scale-6.1 {ComputeFormat procedure} -body {
     .s configure -from 10 -to 100 -resolution 10
     .s set 49.3
     .s get
-} -result {50}
+} -result 50
 test scale-6.2 {ComputeFormat procedure} -body {
     .s configure -from 100 -to 1000 -resolution 100
     .s set 493
     .s get
-} -result {500}
+} -result 500
 test scale-6.3 {ComputeFormat procedure} -body {
     .s configure -from 1000 -to 10000 -resolution 1000
     .s set 4930
     .s get
-} -result {5000}
+} -result 5000
 test scale-6.4 {ComputeFormat procedure} -body {
     .s configure -from 10000 -to 100000 -resolution 10000
     .s set 49000
     .s get
-} -result {50000}
+} -result 50000
 test scale-6.5 {ComputeFormat procedure} -body {
     .s configure -from 100000 -to 1000000 -resolution 100000
     .s set 493000
     .s get
-} -result {500000}
+} -result 500000
 test scale-6.6 {ComputeFormat procedure} -constraints {
 	nonPortable
 } -body {
@@ -617,7 +617,7 @@ test scale-6.6 {ComputeFormat procedure} -constraints {
     .s configure -from 1000000 -to 10000000 -resolution 1000000
     .s set 4930000
     .s get
-} -result {5000000}
+} -result 5000000
 test scale-6.7 {ComputeFormat procedure} -body {
     .s configure -from 1000000000 -to 10000000000 -resolution 1000000000
     .s set 4930000000
@@ -652,7 +652,7 @@ test scale-6.13 {ComputeFormat procedure} -body {
     .s configure -from .000001 -to .00001 -resolution .000001
     .s set .000006
     expr {[.s get] == 6.0e-06}
-} -result {1}
+} -result 1
 test scale-6.14 {ComputeFormat procedure} -body {
     .s configure -to .00001 -from .0001 -resolution .00001
     .s set .00006
@@ -662,17 +662,17 @@ test scale-6.15 {ComputeFormat procedure} -body {
     .s configure -to .000001 -from .00001 -resolution .000001
     .s set .000006
     expr {[.s get] == 6.0e-06}
-} -result {1}
+} -result 1
 test scale-6.16 {ComputeFormat procedure} -body {
     .s configure -from .00001 -to .0001 -resolution .00001 -digits 1
     .s set .00006
     expr {[.s get] == 6e-05}
-} -result {1}
+} -result 1
 test scale-6.17 {ComputeFormat procedure} -body {
     .s configure -from 10000000 -to 100000000 -resolution 10000000 -digits 3
     .s set 49300000
     .s get
-} -result {50000000}
+} -result 50000000
 test scale-6.18 {ComputeFormat procedure} -body {
     .s configure -length 200 -from 0 -to 10 -resolution 0 -digits 0
     .s set .111111111
@@ -1205,7 +1205,7 @@ test scale-14a.1 {RoundValueToResolution, RoundIntervalToResolution procedures}
     .s get 200 0
 } -cleanup {
     destroy .s
-} -result {5}
+} -result 5
 test scale-14a.2 {RoundValueToResolution, RoundIntervalToResolution procedures} -setup {
     pack [scale .s -orient horizontal]
     update
@@ -1344,7 +1344,7 @@ test scale-17.1 {bug fix 1786} -setup {
     return $x
 } -cleanup {
     deleteWindows
-} -result {100}
+} -result 100
 
 
 test scale-18.1 {DestroyScale, -cursor option [Bug: 3897]} -setup {
diff --git a/tests/spinbox.test b/tests/spinbox.test
index 2d03cf1..8856c9e 100644
--- a/tests/spinbox.test
+++ b/tests/spinbox.test
@@ -93,7 +93,7 @@ test spinbox-1.5 {configuration option: "bd"} -setup {
     .e cget -bd
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test spinbox-1.6 {configuration option: "bd" for spinbox} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
@@ -137,7 +137,7 @@ test spinbox-1.9 {configuration option: "borderwidth"} -setup {
     .e cget -borderwidth
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-1.10 {configuration option: "borderwidth" for spinbox} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
@@ -281,7 +281,7 @@ test spinbox-1.22 {configuration option: "exportselection"} -setup {
     .e cget -exportselection
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-1.23 {configuration option: "exportselection" for spinbox} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
@@ -457,7 +457,7 @@ test spinbox-1.38 {configuration option: "highlightthickness"} -setup {
     .e cget -highlightthickness
 } -cleanup {
     destroy .e
-} -result {6}
+} -result 6
 test spinbox-1.39 {configuration option: "highlightthickness" for spinbox} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
@@ -479,7 +479,7 @@ test spinbox-1.40 {configuration option: "highlightthickness"} -setup {
     .e cget -highlightthickness
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 
 test spinbox-1.41 {configuration option: "increment"} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
@@ -535,7 +535,7 @@ test spinbox-1.45 {configuration option: "insertborderwidth"} -setup {
     .e cget -insertborderwidth
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-1.46 {configuration option: "insertborderwidth" for spinbox} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
@@ -557,7 +557,7 @@ test spinbox-1.47 {configuration option: "insertofftime"} -setup {
     .e cget -insertofftime
 } -cleanup {
     destroy .e
-} -result {100}
+} -result 100
 test spinbox-1.48 {configuration option: "insertofftime" for spinbox} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
@@ -579,7 +579,7 @@ test spinbox-1.49 {configuration option: "insertontime"} -setup {
     .e cget -insertontime
 } -cleanup {
     destroy .e
-} -result {100}
+} -result 100
 test spinbox-1.50 {configuration option: "insertontime" for spinbox} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
@@ -691,7 +691,7 @@ test spinbox-1.59 {configuration option: "repeatdelay"} -setup {
     .e cget -repeatdelay
 } -cleanup {
     destroy .e
-} -result {500}
+} -result 500
 test spinbox-1.60 {configuration option: "repeatdelay" for spinbox} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
@@ -757,7 +757,7 @@ test spinbox-1.65 {configuration option: "selectborderwidth"} -setup {
     .e cget -selectborderwidth
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-1.66 {configuration option: "selectborderwidth" for spinbox} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
@@ -937,7 +937,7 @@ test spinbox-1.81 {configuration option: "width"} -setup {
     .e cget -width
 } -cleanup {
     destroy .e
-} -result {402}
+} -result 402
 test spinbox-1.82 {configuration option: "width" for spinbox} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
@@ -959,7 +959,7 @@ test spinbox-1.83 {configuration option: "wrap"} -setup {
     .e cget -wrap
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-1.84 {configuration option: "wrap" for spinbox} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
@@ -1154,7 +1154,7 @@ test spinbox-3.14 {SpinboxWidgetCmd procedure, "cget" widget command} -setup {
     .e cget -bd
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test spinbox-3.15 {SpinboxWidgetCmd procedure, "configure" widget command} -setup {
     spinbox .e
     pack .e
@@ -1163,7 +1163,7 @@ test spinbox-3.15 {SpinboxWidgetCmd procedure, "configure" widget command} -setu
     llength [.e configure]
 } -cleanup {
     destroy .e
-} -result {51}
+} -result 51
 test spinbox-3.16 {SpinboxWidgetCmd procedure, "configure" widget command} -setup {
     spinbox .e
 } -body {
@@ -1179,7 +1179,7 @@ test spinbox-3.17 {SpinboxWidgetCmd procedure, "configure" widget command} -setu
     lindex [.e configure -bd] 4
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test spinbox-3.18 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
     spinbox .e
 } -body {
@@ -1218,7 +1218,7 @@ test spinbox-3.22 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
     .e get
 } -cleanup {
     destroy .e
-} -result {014567890}
+} -result 014567890
 test spinbox-3.23 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
     spinbox .e
 } -body {
@@ -1227,7 +1227,7 @@ test spinbox-3.23 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
     .e get
 } -cleanup {
     destroy .e
-} -result {0123457890}
+} -result 0123457890
 test spinbox-3.24 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
     spinbox .e
     pack .e
@@ -1259,7 +1259,7 @@ test spinbox-3.25 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
     .e get
 } -cleanup {
     destroy .e
-} -result {01234567890}
+} -result 01234567890
 test spinbox-3.26 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
     spinbox .e
     pack .e
@@ -1272,7 +1272,7 @@ test spinbox-3.26 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
     .e get
 } -cleanup {
     destroy .e
-} -result {01234567890}
+} -result 01234567890
 test spinbox-3.26.1 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
     spinbox .e
     pack .e
@@ -1285,7 +1285,7 @@ test spinbox-3.26.1 {SpinboxWidgetCmd procedure, "delete" widget command} -setup
     .e get
 } -cleanup {
     destroy .e
-} -result {01234567890}
+} -result 01234567890
 test spinbox-3.27 {SpinboxWidgetCmd procedure, "get" widget command} -setup {
     spinbox .e
 } -body {
@@ -1315,7 +1315,7 @@ test spinbox-3.30 {SpinboxWidgetCmd procedure, "icursor" widget command} -setup
     .e index insert
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test spinbox-3.31 {SpinboxWidgetCmd procedure, "index" widget command} -setup {
     spinbox .e
 } -body {
@@ -1401,7 +1401,7 @@ test spinbox-3.40 {SpinboxWidgetCmd procedure, "insert" widget command} -setup {
     .e get
 } -cleanup {
     destroy .e
-} -result {01234567890}
+} -result 01234567890
 test spinbox-3.40.1 {SpinboxWidgetCmd procedure, "insert" widget command} -setup {
     spinbox .e
     pack .e
@@ -1414,7 +1414,7 @@ test spinbox-3.40.1 {SpinboxWidgetCmd procedure, "insert" widget command} -setup
     .e get
 } -cleanup {
     destroy .e
-} -result {01234567890}
+} -result 01234567890
 test spinbox-3.41 {SpinboxWidgetCmd procedure, "insert" widget command} -setup {
     spinbox .e
 } -body {
@@ -1474,7 +1474,7 @@ test spinbox-3.46 {SpinboxWidgetCmd procedure, "scan" widget command} -constrain
     .e index @0
 } -cleanup {
     destroy .e
-} -result {2}
+} -result 2
 test spinbox-3.47 {SpinboxWidgetCmd procedure, "select" widget command} -setup {
     spinbox .e
 } -body {
@@ -1543,7 +1543,7 @@ test spinbox-3.52 {SpinboxWidgetCmd procedure, "selection present" widget comman
     .e selection present
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-3.53 {SpinboxWidgetCmd procedure, "selection present" widget command} -setup {
     spinbox .e
     pack .e
@@ -1556,7 +1556,7 @@ test spinbox-3.53 {SpinboxWidgetCmd procedure, "selection present" widget comman
     .e selection present
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-3.54 {SpinboxWidgetCmd procedure, "selection present" widget command} -setup {
     spinbox .e
     pack .e
@@ -1569,7 +1569,7 @@ test spinbox-3.54 {SpinboxWidgetCmd procedure, "selection present" widget comman
     .e selection present
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 test spinbox-3.55 {SpinboxWidgetCmd procedure, "selection adjust" widget command} -setup {
     spinbox .e
 } -body {
@@ -1597,7 +1597,7 @@ test spinbox-3.57 {SpinboxWidgetCmd procedure, "selection adjust" widget command
     selection get
 } -cleanup {
     destroy .e
-} -result {123}
+} -result 123
 test spinbox-3.58 {SpinboxWidgetCmd procedure, "selection adjust" widget command} -setup {
     spinbox .e
     pack .e
@@ -1611,7 +1611,7 @@ test spinbox-3.58 {SpinboxWidgetCmd procedure, "selection adjust" widget command
     selection get
 } -cleanup {
     destroy .e
-} -result {234}
+} -result 234
 test spinbox-3.59 {SpinboxWidgetCmd procedure, "selection from" widget command} -setup {
     spinbox .e
 } -body {
@@ -1825,7 +1825,7 @@ test spinbox-3.75 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {32}
+} -result 32
 test spinbox-3.76 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
@@ -1839,7 +1839,7 @@ test spinbox-3.76 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {29}
+} -result 29
 test spinbox-3.77 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
@@ -1875,7 +1875,7 @@ test spinbox-3.79 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 test spinbox-3.80 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
@@ -1887,7 +1887,7 @@ test spinbox-3.80 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {73}
+} -result 73
 test spinbox-3.81 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
@@ -1926,7 +1926,7 @@ test spinbox-5.1 {ConfigureSpinbox procedure, -textvariable} -body {
     .e get
 } -cleanup {
     destroy .e
-} -result {12345}
+} -result 12345
 test spinbox-5.2 {ConfigureSpinbox procedure, -textvariable} -body {
     set x 12345
     spinbox .e -textvariable x
@@ -2144,7 +2144,7 @@ test spinbox-6.4 {SpinboxComputeGeometry procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {6}
+} -result 6
 test spinbox-6.5 {SpinboxComputeGeometry procedure} -setup {
     spinbox .e -highlightthickness 2
     pack .e
@@ -2156,7 +2156,7 @@ test spinbox-6.5 {SpinboxComputeGeometry procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {6}
+} -result 6
 test spinbox-6.6 {SpinboxComputeGeometry procedure} -constraints {
     fonts
 } -setup {
@@ -2311,7 +2311,7 @@ test spinbox-7.7 {InsertChars procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {7}
+} -result 7
 test spinbox-7.8 {InsertChars procedure} -setup {
     spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2322,7 +2322,7 @@ test spinbox-7.8 {InsertChars procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test spinbox-7.9 {InsertChars procedure} -setup {
     spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2334,7 +2334,7 @@ test spinbox-7.9 {InsertChars procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {7}
+} -result 7
 test spinbox-7.10 {InsertChars procedure} -setup {
     spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2346,7 +2346,7 @@ test spinbox-7.10 {InsertChars procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 
 test spinbox-7.11 {InsertChars procedure} -constraints {
     fonts
@@ -2360,7 +2360,7 @@ test spinbox-7.11 {InsertChars procedure} -constraints {
     winfo reqwidth .e
 } -cleanup {
     destroy .e
-} -result {70}
+} -result 70
 
 test spinbox-8.1 {DeleteChars procedure} -setup {
     unset -nocomplain contents
@@ -2545,7 +2545,7 @@ test spinbox-8.12 {DeleteChars procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-8.13 {DeleteChars procedure} -setup {
     spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2558,7 +2558,7 @@ test spinbox-8.13 {DeleteChars procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-8.14 {DeleteChars procedure} -setup {
     spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2571,7 +2571,7 @@ test spinbox-8.14 {DeleteChars procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test spinbox-8.15 {DeleteChars procedure} -setup {
     spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2584,7 +2584,7 @@ test spinbox-8.15 {DeleteChars procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-8.16 {DeleteChars procedure} -setup {
     spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2597,7 +2597,7 @@ test spinbox-8.16 {DeleteChars procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-8.17 {DeleteChars procedure} -setup {
     spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2610,7 +2610,7 @@ test spinbox-8.17 {DeleteChars procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test spinbox-8.18 {DeleteChars procedure} -setup {
     spinbox .e -width 0 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
@@ -2637,7 +2637,7 @@ test spinbox-8.18 {DeleteChars procedure} -setup {
 } -cleanup {
     destroy .e
     unset XPAD buttonWidth expected
-} -result {1}
+} -result 1
 
 test spinbox-9.1 {SpinboxValueChanged procedure} -setup {
     unset -nocomplain x
@@ -2717,7 +2717,7 @@ test spinbox-10.5 {SpinboxSetValue procedure, updating display position} -setup
     .e index @0
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 test spinbox-10.6 {SpinboxSetValue procedure, updating display position} -setup {
     unset -nocomplain x
     spinbox .e -highlightthickness 2 -bd 2
@@ -2733,7 +2733,7 @@ test spinbox-10.6 {SpinboxSetValue procedure, updating display position} -setup
     .e index @0
 } -cleanup {
     destroy .e
-} -result {10}
+} -result 10
 test spinbox-10.7 {SpinboxSetValue procedure, updating insertion cursor} -setup {
     unset -nocomplain x
     spinbox .e -highlightthickness 2 -bd 2
@@ -2748,7 +2748,7 @@ test spinbox-10.7 {SpinboxSetValue procedure, updating insertion cursor} -setup
     .e index insert
 } -cleanup {
     destroy .e
-} -result {3}
+} -result 3
 test spinbox-10.8 {SpinboxSetValue procedure, updating insertion cursor} -setup {
     unset -nocomplain x
     spinbox .e -highlightthickness 2 -bd 2
@@ -2762,7 +2762,7 @@ test spinbox-10.8 {SpinboxSetValue procedure, updating insertion cursor} -setup
     .e index insert
 } -cleanup {
     destroy .e
-} -result {5}
+} -result 5
 
 test spinbox-11.1 {SpinboxEventProc procedure} -setup {
     spinbox .e -highlightthickness 2 -bd 2 -font {Helvetica -12}
@@ -2806,7 +2806,7 @@ test spinbox-13.1 {GetSpinboxIndex procedure} -setup {
     .e index end
 } -cleanup {
     destroy .e
-} -result {21}
+} -result 21
 test spinbox-13.2 {GetSpinboxIndex procedure} -body {
     spinbox .e
     .e index abogus
@@ -2825,7 +2825,7 @@ test spinbox-13.3 {GetSpinboxIndex procedure} -setup {
     .e index anchor
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-13.4 {GetSpinboxIndex procedure} -setup {
     spinbox .e -font {Courier -12} -width 5 -bd 2 -relief sunken
     pack .e
@@ -2838,7 +2838,7 @@ test spinbox-13.4 {GetSpinboxIndex procedure} -setup {
     .e index anchor
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test spinbox-13.5 {GetSpinboxIndex procedure} -setup {
     spinbox .e -font {Courier -12} -width 5 -bd 2 -relief sunken
     pack .e
@@ -2852,7 +2852,7 @@ test spinbox-13.5 {GetSpinboxIndex procedure} -setup {
     .e index anchor
 } -cleanup {
     destroy .e
-} -result {15}
+} -result 15
 test spinbox-13.6 {GetSpinboxIndex procedure} -setup {
     spinbox .e
 } -body {
@@ -2871,7 +2871,7 @@ test spinbox-13.7 {GetSpinboxIndex procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {2}
+} -result 2
 test spinbox-13.8 {GetSpinboxIndex procedure} -setup {
     spinbox .e
 } -body {
@@ -2931,7 +2931,7 @@ test spinbox-13.11 {GetSpinboxIndex procedure} -constraints aquaOrWin32 -body {
     .e index sel.first
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 
 test spinbox-13.12 {GetSpinboxIndex procedure} -constraints x11 -body {
 # Previous settings:
@@ -3043,7 +3043,7 @@ test spinbox-13.16 {GetSpinboxIndex procedure} -constraints fonts -body {
     .e index @4
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test spinbox-13.17 {GetSpinboxIndex procedure} -constraints fonts -body {
     spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
         -font {Courier -12}
@@ -3054,7 +3054,7 @@ test spinbox-13.17 {GetSpinboxIndex procedure} -constraints fonts -body {
     .e index @11
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test spinbox-13.18 {GetSpinboxIndex procedure} -constraints fonts -body {
     spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
         -font {Courier -12}
@@ -3065,7 +3065,7 @@ test spinbox-13.18 {GetSpinboxIndex procedure} -constraints fonts -body {
     .e index @12
 } -cleanup {
     destroy .e
-} -result {5}
+} -result 5
 test spinbox-13.19 {GetSpinboxIndex procedure} -constraints fonts -body {
     spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
         -font {Courier -12}
@@ -3076,7 +3076,7 @@ test spinbox-13.19 {GetSpinboxIndex procedure} -constraints fonts -body {
     .e index @[expr {[winfo width .e] - 6-11}]
 } -cleanup {
     destroy .e
-} -result {8}
+} -result 8
 test spinbox-13.20 {GetSpinboxIndex procedure} -constraints fonts -body {
     spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
         -font {Courier -12}
@@ -3087,7 +3087,7 @@ test spinbox-13.20 {GetSpinboxIndex procedure} -constraints fonts -body {
     .e index @[expr {[winfo width .e] - 5}]
 } -cleanup {
     destroy .e
-} -result {9}
+} -result 9
 test spinbox-13.21 {GetSpinboxIndex procedure} -body {
     spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
         -font {Courier -12}
@@ -3098,7 +3098,7 @@ test spinbox-13.21 {GetSpinboxIndex procedure} -body {
     .e index @1000
 } -cleanup {
     destroy .e
-} -result {9}
+} -result 9
 test spinbox-13.22 {GetSpinboxIndex procedure} -setup {
     spinbox .e
     pack .e
@@ -3118,7 +3118,7 @@ test spinbox-13.23 {GetSpinboxIndex procedure} -body {
     .e index -10
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 test spinbox-13.24 {GetSpinboxIndex procedure} -body {
     spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
         -font {Courier -12}
@@ -3129,7 +3129,7 @@ test spinbox-13.24 {GetSpinboxIndex procedure} -body {
     .e index 12
 } -cleanup {
     destroy .e
-} -result {12}
+} -result 12
 test spinbox-13.25 {GetSpinboxIndex procedure} -body {
     spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
         -font {Courier -12}
@@ -3140,7 +3140,7 @@ test spinbox-13.25 {GetSpinboxIndex procedure} -body {
     .e index 49
 } -cleanup {
     destroy .e
-} -result {21}
+} -result 21
 
 # XXX Still need to write tests for SpinboxScanTo and SpinboxSelectTo.
 
@@ -3166,7 +3166,7 @@ test spinbox-14.3 {SpinboxFetchSelection procedure} -setup {
     string compare [selection get] $x
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 
 test spinbox-15.1 {SpinboxLostSelection} -body {
     spinbox .e
@@ -3264,7 +3264,7 @@ test spinbox-18.1 {Spinbox widget vs hiding} -setup {
     set res1 [list [winfo children .] [interp hidden]]
     set res2 [list {} $l]
     expr {$res1 == $res2}
-} -result {1}
+} -result 1
 
 ##
 ## Spinbox widget VALIDATION tests
@@ -3805,7 +3805,7 @@ test spinbox-22.1 {spinbox config, -from changes SF bug 559078} -body {
     set val
 } -cleanup {
     destroy .e
-} -result {5}
+} -result 5
 test spinbox-22.2 {spinbox config, -from changes SF bug 559078} -body {
     set val 5
     spinbox .e -from 1 -to 10 -textvariable val
@@ -3813,7 +3813,7 @@ test spinbox-22.2 {spinbox config, -from changes SF bug 559078} -body {
     set val
 } -cleanup {
     destroy .e
-} -result {5}
+} -result 5
 test spinbox-22.3 {spinbox config, -from changes SF bug 559078} -body {
     set val 5
     spinbox .e -from 3 -to 10 -textvariable val
@@ -3821,7 +3821,7 @@ test spinbox-22.3 {spinbox config, -from changes SF bug 559078} -body {
     set val
 } -cleanup {
     destroy .e
-} -result {6}
+} -result 6
 
 test spinbox-23.1 {selection present while disabled, bug 637828} -body {
     spinbox .e
diff --git a/tests/text.test b/tests/text.test
index 7770084..a810387 100644
--- a/tests/text.test
+++ b/tests/text.test
@@ -28,7 +28,7 @@ test text-1.1 {configuration option: "autoseparators"} -setup {
     .t cget -autoseparators
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-1.1b {configuration option: "autoseparators", default} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -37,7 +37,7 @@ test text-1.1b {configuration option: "autoseparators", default} -setup {
     .t cget -autoseparators
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-1.2 {configuration option: "autoseparators"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -75,7 +75,7 @@ test text-1.5 {configuration option: "bd"} -setup {
     .t cget -bd
 } -cleanup {
     destroy .t
-} -result {4}
+} -result 4
 test text-1.6 {configuration option: "bd"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -113,7 +113,7 @@ test text-1.9 {configuration option: "blockcursor"} -setup {
     .t cget -blockcursor
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-1.10 {configuration option: "blockcursor"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -132,7 +132,7 @@ test text-1.11 {configuration option: "borderwidth"} -setup {
     .t cget -borderwidth
 } -cleanup {
     destroy .t
-} -result {7}
+} -result 7
 test text-1.12 {configuration option: "borderwidth"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -170,7 +170,7 @@ test text-1.15 {configuration option: "exportselection"} -setup {
     .t cget -exportselection
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-1.16 {configuration option: "exportselection"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -246,7 +246,7 @@ test text-1.23 {configuration option: "height"} -setup {
     .t cget -height
 } -cleanup {
     destroy .t
-} -result {5}
+} -result 5
 test text-1.24 {configuration option: "height"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -303,7 +303,7 @@ test text-1.29 {configuration option: "highlightthickness"} -setup {
     .t cget -highlightthickness
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-1.30 {configuration option: "highlightthickness"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -360,7 +360,7 @@ test text-1.35 {configuration option: "insertborderwidth"} -setup {
     .t cget -insertborderwidth
 } -cleanup {
     destroy .t
-} -result {45}
+} -result 45
 test text-1.36 {configuration option: "insertborderwidth"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -379,7 +379,7 @@ test text-1.37 {configuration option: "insertofftime"} -setup {
     .t cget -insertofftime
 } -cleanup {
     destroy .t
-} -result {100}
+} -result 100
 test text-1.38 {configuration option: "insertofftime"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -398,7 +398,7 @@ test text-1.39 {configuration option: "insertontime"} -setup {
     .t cget -insertontime
 } -cleanup {
     destroy .t
-} -result {47}
+} -result 47
 test text-1.40 {configuration option: "insertontime"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -417,7 +417,7 @@ test text-1.41 {configuration option: "insertwidth"} -setup {
     .t cget -insertwidth
 } -cleanup {
     destroy .t
-} -result {2}
+} -result 2
 test text-1.42 {configuration option: "insertwidth"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -436,7 +436,7 @@ test text-1.43 {configuration option: "maxundo"} -setup {
     .t cget -maxundo
 } -cleanup {
     destroy .t
-} -result {5}
+} -result 5
 test text-1.43b {configuration option: "maxundo", default} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -445,7 +445,7 @@ test text-1.43b {configuration option: "maxundo", default} -setup {
     .t cget -maxundo
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-1.44 {configuration option: "maxundo"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -464,7 +464,7 @@ test text-1.45 {configuration option: "padx"} -setup {
     .t cget -padx
 } -cleanup {
     destroy .t
-} -result {3}
+} -result 3
 test text-1.46 {configuration option: "padx"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -483,7 +483,7 @@ test text-1.47 {configuration option: "pady"} -setup {
     .t cget -pady
 } -cleanup {
     destroy .t
-} -result {82}
+} -result 82
 test text-1.48 {configuration option: "pady"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -540,7 +540,7 @@ test text-1.53 {configuration option: "selectborderwidth"} -setup {
     .t cget -selectborderwidth
 } -cleanup {
     destroy .t
-} -result {21}
+} -result 21
 test text-1.54 {configuration option: "selectborderwidth"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -578,7 +578,7 @@ test text-1.57 {configuration option: "spacing1"} -setup {
     .t cget -spacing1
 } -cleanup {
     destroy .t
-} -result {20}
+} -result 20
 test text-1.58 {configuration option: "spacing1"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -597,7 +597,7 @@ test text-1.59 {configuration option: "spacing1"} -setup {
     .t cget -spacing1
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-1.60 {configuration option: "spacing1"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -616,7 +616,7 @@ test text-1.61 {configuration option: "spacing2"} -setup {
     .t cget -spacing2
 } -cleanup {
     destroy .t
-} -result {5}
+} -result 5
 test text-1.62 {configuration option: "spacing2"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -635,7 +635,7 @@ test text-1.63 {configuration option: "spacing2"} -setup {
     .t cget -spacing2
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-1.64 {configuration option: "spacing2"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -654,7 +654,7 @@ test text-1.65 {configuration option: "spacing3"} -setup {
     .t cget -spacing3
 } -cleanup {
     destroy .t
-} -result {20}
+} -result 20
 test text-1.66 {configuration option: "spacing3"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -673,7 +673,7 @@ test text-1.67 {configuration option: "spacing3"} -setup {
     .t cget -spacing3
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-1.68 {configuration option: "spacing3"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -749,7 +749,7 @@ test text-1.75 {configuration option: "undo"} -setup {
     .t cget -undo
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-1.75b {configuration option: "undo", default} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -758,7 +758,7 @@ test text-1.75b {configuration option: "undo", default} -setup {
     .t cget -undo
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-1.76 {configuration option: "undo"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -777,7 +777,7 @@ test text-1.77 {configuration option: "width"} -setup {
     .t cget -width
 } -cleanup {
     destroy .t
-} -result {73}
+} -result 73
 test text-1.78 {configuration option: "width"} -setup {
     text .t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold}
     pack .t
@@ -1004,7 +1004,7 @@ test text-5.4 {TextWidgetCmd procedure, "cget" option} -setup {
     .t cget -bd
 } -cleanup {
     destroy .t
-} -result {17}
+} -result 17
 
 
 test text-6.1 {TextWidgetCmd procedure, "compare" option} -setup {
@@ -1198,7 +1198,7 @@ test text-7.3 {TextWidgetCmd procedure, "debug" option} -setup {
     .t deb
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-7.4 {TextWidgetCmd procedure, "debug" option} -setup {
     text .t
 } -body {
@@ -1206,7 +1206,7 @@ test text-7.4 {TextWidgetCmd procedure, "debug" option} -setup {
     .t debug
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 
 
 test text-8.1 {TextWidgetCmd procedure, "delete" option} -setup {
@@ -1458,7 +1458,7 @@ Line 7"
     string equal [.t get 1.0 end-1c] $prevtext
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-8.22 {TextWidgetCmd procedure, "replace" option with undo} -setup {
     text .t
     set res {}
@@ -1521,7 +1521,7 @@ Line 7"
     string equal [.t get 1.0 end-1c] $prevtext
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-8.24 {TextWidgetCmd procedure, "replace" option with peers, undo} -setup {
     text .t
 } -body {
@@ -1548,7 +1548,7 @@ Line 7"
     string equal [.t get 1.0 end-1c] $prevtext
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-8.25 {TextWidgetCmd procedure, "replace" option with peers, undo} -setup {
     text .t
 } -body {
@@ -2117,7 +2117,7 @@ Line 7"
     .t count 5.3 5.5
 } -cleanup {
     destroy .t
-} -result {2}
+} -result 2
 test text-10.8 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2131,7 +2131,7 @@ Line 7"
     .t count 5.3 end
 } -cleanup {
     destroy .t
-} -result {29}
+} -result 29
 test text-10.9 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
     .t insert 1.0 "Line 1
@@ -2145,7 +2145,7 @@ Line 7"
     .t count 5.2 5.7
 } -cleanup {
     destroy .t
-} -result {5}
+} -result 5
 test text-10.10 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
     .t insert 1.0 "Line 1
@@ -2159,7 +2159,7 @@ Line 7"
     .t count 5.2 5.3
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-10.11 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
     .t insert 1.0 "Line 1
@@ -2173,7 +2173,7 @@ Line 7"
     .t count 5.2 5.4
 } -cleanup {
     destroy .t
-} -result {2}
+} -result 2
 test text-10.12 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
     .t insert 1.0 "Line 1
@@ -2203,7 +2203,7 @@ Line 7"
     .t count -displayindices 2.0 3.0
 } -cleanup {
     destroy .t
-} -result {2}
+} -result 2
 test text-10.14 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2219,7 +2219,7 @@ Line 7"
     .t count -displayindices 2.2 3.0
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-10.15 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2236,7 +2236,7 @@ Line 7"
     .t count -displayindices 2.0 4.2
 } -cleanup {
     destroy .t
-} -result {5}
+} -result 5
 test text-10.16 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2259,7 +2259,7 @@ Line 7"
     .t count -displayindices 2.0 3.0
 } -cleanup {
     destroy .t
-} -result {3}
+} -result 3
 test text-10.17 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2282,7 +2282,7 @@ Line 7"
     .t count -displayindices 2.2 3.0
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-10.18 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2307,7 +2307,7 @@ Line 7"
     .t count -displayindices a 3.0
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-10.19 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2331,7 +2331,7 @@ Line 7"
     .t count -displayindices 2.0 4.2
 } -cleanup {
     destroy .t
-} -result {6}
+} -result 6
 test text-10.20 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2355,7 +2355,7 @@ Line 7"
     .t count -displaychars 2.0 3.0
 } -cleanup {
     destroy .t
-} -result {2}
+} -result 2
 test text-10.21 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2379,7 +2379,7 @@ Line 7"
     .t count -displaychars 2.2 3.0
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-10.22 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2404,7 +2404,7 @@ Line 7"
     .t count -displaychars a 3.0
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-10.23 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2428,7 +2428,7 @@ Line 7"
     .t count -displaychars 2.0 4.2
 } -cleanup {
     destroy .t
-} -result {5}
+} -result 5
 test text-10.24 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2503,7 +2503,7 @@ Line 7"
     .t count -indices 2.0 4.2
 } -cleanup {
     destroy .t
-} -result {21}
+} -result 21
 test text-10.27 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2528,7 +2528,7 @@ Line 7"
     .t count -chars 2.2 3.0
 } -cleanup {
     destroy .t
-} -result {10}
+} -result 10
 test text-10.28 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2553,7 +2553,7 @@ Line 7"
     .t count -chars a 3.0
 } -cleanup {
     destroy .t
-} -result {9}
+} -result 9
 test text-10.29 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2578,7 +2578,7 @@ Line 7"
     .t count -chars 2.0 4.2
 } -cleanup {
     destroy .t
-} -result {19}
+} -result 19
 test text-10.30 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2588,7 +2588,7 @@ test text-10.30 {TextWidgetCmd procedure, "count" option} -setup {
     .t count -lines 1.0 end
 } -cleanup {
     destroy .t
-} -result {3}
+} -result 3
 test text-10.31 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2618,7 +2618,7 @@ test text-10.33 {TextWidgetCmd procedure, "count" option} -setup {
     .t count -lines end end
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-10.34 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2628,7 +2628,7 @@ test text-10.34 {TextWidgetCmd procedure, "count" option} -setup {
     .t count -lines 1.5 2.5
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-10.35 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2638,7 +2638,7 @@ test text-10.35 {TextWidgetCmd procedure, "count" option} -setup {
     .t count -lines 2.5 "2.5 lineend"
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-10.36 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2659,7 +2659,7 @@ test text-10.37 {TextWidgetCmd procedure, "count" option} -setup {
     .t count -displaylines 1.0 end
 } -cleanup {
     destroy .t
-} -result {3}
+} -result 3
 test text-10.38 {TextWidgetCmd procedure, "count" option} -setup {
     text .t -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .t -expand 1 -fill both
@@ -2706,7 +2706,7 @@ test text-9.2.45 {TextWidgetCmd procedure, "count" option} -setup {
     set res [.t count -displaylines 2.0 3.0]
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-9.2.46 {TextWidgetCmd procedure, "count" option} -setup {
     toplevel .mytop
     pack [text .mytop.t -font TkFixedFont -bd 0 -padx 0 -wrap char]
@@ -2783,7 +2783,7 @@ test text-11.2 {counting with tag priority eliding} -setup {
     .t count -displaychars 1.0 1.5
 } -cleanup {
     destroy .t
-} -result {5}
+} -result 5
 test text-11.3 {counting with tag priority eliding} -setup {
     text .t -font {Courier -12} -borderwidth 2 -highlightthickness 2
 } -body {
@@ -2796,7 +2796,7 @@ test text-11.3 {counting with tag priority eliding} -setup {
     .t count -displaychars 1.0 1.5
 } -cleanup {
     destroy .t
-} -result {3}
+} -result 3
 test text-11.4 {counting with tag priority eliding}  -setup {
     text .t -font {Courier -12} -borderwidth 2 -highlightthickness 2
     set res {}
@@ -3426,7 +3426,7 @@ test text-14.14 {ConfigureText procedure} -body {
     selection get
 } -cleanup {
     destroy .t .t2
-} -result {1234}
+} -result 1234
 test text-14.15 {ConfigureText procedure} -body {
     text .t
     entry .t.e
@@ -3440,7 +3440,7 @@ test text-14.15 {ConfigureText procedure} -body {
     selection get
 } -cleanup {
     destroy .t2 .t
-} -result {1234}
+} -result 1234
 test text-14.16 {ConfigureText procedure} -body {
     text .t
     entry .t.e
@@ -3469,7 +3469,7 @@ test text-14.17 {ConfigureText procedure} -body {
     return $result
 } -cleanup {
     destroy .t .t2
-} -result {1234}
+} -result 1234
 test text-14.18 {ConfigureText procedure} -constraints fonts -setup {
     toplevel .top
     text .top.t -font {Courier -12} -borderwidth 2 -highlightthickness 2
@@ -3972,7 +3972,7 @@ test text-20.5 {TextFetchSelection procedure, long selections} -setup {
     expr {[selection get] eq "$x\n"}
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 
 
 test text-21.1 {TkTextLostSelection procedure} -constraints {x11} -setup {
@@ -6459,7 +6459,7 @@ test text-25.1 {text widget vs hidden commands} -body {
     destroy .t
     set x [list [winfo children .] [interp hidden]]
     expr {$x eq $y}
-} -result {1}
+} -result 1
 
 
 test text-26.1 {bug fix - 1642} -body {
@@ -6552,7 +6552,7 @@ test text-27.8 {TextEditCmd procedure, modified flag} -body {
     .t edit modified
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-27.9 {TextEditCmd procedure, reset modified flag} -body {
     text .t
     pack .t
@@ -6561,7 +6561,7 @@ test text-27.9 {TextEditCmd procedure, reset modified flag} -body {
     .t edit modified
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test text-27.10 {TextEditCmd procedure, set modified flag} -body {
     text .t
     pack .t
@@ -6569,7 +6569,7 @@ test text-27.10 {TextEditCmd procedure, set modified flag} -body {
     .t edit modified
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-27.11 {TextEditCmd procedure, set modified flag repeat} -setup {
     text .t
     pack .t
@@ -6640,7 +6640,7 @@ test text-27.14a {<<Modified>> virtual event - propagation to peers} -body {
     set ::retval
 } -cleanup {
     destroy .t .tt
-} -result {4}
+} -result 4
 test text-27.15 {<<Selection>> virtual event on sel tagging} -body {
     set ::retval no_selection
     pack [text .t]
@@ -7081,7 +7081,7 @@ test text-29.4 {tabs - must be positive and must be increasing} -body {
     set result 1
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 
 
 test text-30.1 {repeated insert and scroll} -body {
@@ -7094,7 +7094,7 @@ test text-30.1 {repeated insert and scroll} -body {
     set result 1
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-30.2 {repeated insert and scroll} -body {
     pack [text .t]
     for {set i 0} {$i < 30} {incr i} {
@@ -7105,7 +7105,7 @@ test text-30.2 {repeated insert and scroll} -body {
     set result 1
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-30.3 {repeated insert and scroll} -body {
     pack [text .t]
     for {set i 0} {$i < 30} {incr i} {
@@ -7116,7 +7116,7 @@ test text-30.3 {repeated insert and scroll} -body {
     set result 1
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test text-30.4 {repeated insert and scroll} -body {
     pack [text .t]
     for {set i 0} {$i < 30} {incr i} {
@@ -7127,7 +7127,7 @@ test text-30.4 {repeated insert and scroll} -body {
     set result 1
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 
 
 test text-31.1 {peer widgets} -body {
@@ -7217,7 +7217,7 @@ test text-31.7 {peer widgets} -body {
     expr {$p1 eq $p2}
 } -cleanup {
     destroy .t .top
-} -result {1}
+} -result 1
 test text-31.8 {peer widgets} -body {
     toplevel .top
     pack [text .t]
@@ -7444,7 +7444,7 @@ test text-32.1 {line heights on creation} -setup {
     expr {$before eq $after}
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 
 test text-32.2 {peer widget -start, -end and deletion (bug 1630262)} -setup {
     destroy .t .pt
@@ -7474,7 +7474,7 @@ test text-32.2 {peer widget -start, -end and deletion (bug 1630262)} -setup {
     set res 1
 } -cleanup {
     destroy .pt
-} -result {1}
+} -result 1
 
 test text-32.3 {peer widget -start, -end and deletion (bug 1630262)} -setup {
     destroy .t .pt
@@ -7568,7 +7568,7 @@ test text-32.2 {peer widget -start, -end and deletion (bug 1630262)} -setup {
     set res 1
 } -cleanup {
     destroy .pt
-} -result {1}
+} -result 1
 
 test text-32.3 {peer widget -start, -end and deletion (bug 1630262)} -setup {
     destroy .t .pt
diff --git a/tests/textDisp.test b/tests/textDisp.test
index f2d7047..6ab60af 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -4293,7 +4293,7 @@ test textDisp-34.1 {Line heights recalculation problem: bug 2677890} -setup {
     set negative
 } -cleanup {
     destroy .t1
-} -result {0}
+} -result 0
 
 test textDisp-35.1 {Init value of charHeight - Dancing scrollbar bug 1499165} -setup {
     pack [text .t1] -fill both -expand y -side left
diff --git a/tests/textTag.test b/tests/textTag.test
index 04a4b30..2fad125 100644
--- a/tests/textTag.test
+++ b/tests/textTag.test
@@ -78,7 +78,7 @@ test textTag-1.5 {tag configuration options} -body {
     .t tag cget x -borderwidth
 } -cleanup {
     .t tag configure x -borderwidth [lindex [.t tag configure x -borderwidth] 3]
-} -result {2}
+} -result 2
 test textTag-1.6 {configuration options} -body {
     .t tag configure x -borderwidth 46q
 } -cleanup {
@@ -128,7 +128,7 @@ test textTag-1.14 {tag configuration options} -body {
     .t tag cget x -lmargin1
 } -cleanup {
     .t tag configure x -lmargin1 [lindex [.t tag configure x -lmargin1] 3]
-} -result {10}
+} -result 10
 test textTag-1.15 {configuration options} -body {
     .t tag configure x -lmargin1 bad
 } -cleanup {
@@ -139,7 +139,7 @@ test textTag-1.16 {tag configuration options} -body {
     .t tag cget x -lmargin2
 } -cleanup {
     .t tag configure x -lmargin2 [lindex [.t tag configure x -lmargin2] 3]
-} -result {10}
+} -result 10
 test textTag-1.17 {configuration options} -body {
     .t tag configure x -lmargin2 bad
 } -cleanup {
@@ -161,7 +161,7 @@ test textTag-1.18 {tag configuration options} -body {
     .t tag cget x -offset
 } -cleanup {
     .t tag configure x -offset [lindex [.t tag configure x -offset] 3]
-} -result {2}
+} -result 2
 test textTag-1.19 {configuration options} -body {
     .t tag configure x -offset 100xyz
 } -cleanup {
@@ -205,7 +205,7 @@ test textTag-1.24 {tag configuration options} -body {
     .t tag cget x -rmargin
 } -cleanup {
     .t tag configure x -rmargin [lindex [.t tag configure x -rmargin] 3]
-} -result {10}
+} -result 10
 test textTag-1.25 {configuration options} -body {
     .t tag configure x -rmargin bad
 } -cleanup {
@@ -249,7 +249,7 @@ test textTag-1.26 {tag configuration options} -body {
     .t tag cget x -spacing1
 } -cleanup {
     .t tag configure x -spacing1 [lindex [.t tag configure x -spacing1] 3]
-} -result {10}
+} -result 10
 test textTag-1.27 {configuration options} -body {
     .t tag configure x -spacing1 bad
 } -cleanup {
@@ -260,7 +260,7 @@ test textTag-1.28 {tag configuration options} -body {
     .t tag cget x -spacing2
 } -cleanup {
     .t tag configure x -spacing2 [lindex [.t tag configure x -spacing2] 3]
-} -result {10}
+} -result 10
 test textTag-1.29 {configuration options} -body {
     .t tag configure x -spacing2 bad
 } -cleanup {
@@ -271,7 +271,7 @@ test textTag-1.30 {tag configuration options} -body {
     .t tag cget x -spacing3
 } -cleanup {
     .t tag configure x -spacing3 [lindex [.t tag configure x -spacing3] 3]
-} -result {10}
+} -result 10
 test textTag-1.31 {configuration options} -body {
     .t tag configure x -spacing3 bad
 } -cleanup {
@@ -399,7 +399,7 @@ test textTag-2.14 {tag add before -startline - Bug 1615425} -body {
     .tt tag add mytag 1.0 1.end
     destroy .ptt .tt
     set res 1
-} -result {1}
+} -result 1
 
 
 test textTag-3.1 {TkTextTagCmd - "bind" option} -body {
diff --git a/tests/textWind.test b/tests/textWind.test
index 7e2d315..eac4827 100644
--- a/tests/textWind.test
+++ b/tests/textWind.test
@@ -171,7 +171,7 @@ test textWind-2.7 {TkTextWindowCmd procedure, "cget" option} -setup {
     .t window cget .f -pady
 } -cleanup {
     destroy .f
-} -returnCodes ok -result {2}
+} -returnCodes ok -result 2
 test textWind-2.8 {TkTextWindowCmd procedure} -body {
     .t window co
 } -returnCodes error -result {wrong # args: should be ".t window configure index ?-option value ...?"}
@@ -1405,7 +1405,7 @@ test textWind-17.1 {peer widgets and embedded windows} -setup {
     update ; update
     destroy .t .tt
     winfo exists .f
-} -result {0}
+} -result 0
 
 test textWind-17.2 {peer widgets and embedded windows} -setup {
     destroy .t .f .tt
diff --git a/tests/tk.test b/tests/tk.test
index c5c475e..444c9a3 100644
--- a/tests/tk.test
+++ b/tests/tk.test
@@ -30,7 +30,7 @@ test tk-2.2 {tk command: appname} -body {
 test tk-2.3 {tk command: appname} -constraints unix -body {
     tk appname bazfoogarply
     expr {[lsearch -exact [winfo interps] [tk appname]] >= 0}
-} -result {1}
+} -result 1
 test tk-2.4 {tk command: appname} -body {
     tk appname [tk appname]
 } -result [tk appname]
@@ -66,21 +66,21 @@ test tk-3.7 {tk command: scaling: set new} -body {
 test tk-3.8 {tk command: scaling: negative} -body {
     tk scaling -1
     expr {[tk scaling] > 0}
-} -result {1}
+} -result 1
 test tk-3.9 {tk command: scaling: too big} -body {
     tk scaling 1000000
     expr {[tk scaling] < 10000}
-} -result {1}
+} -result 1
 test tk-3.10 {tk command: scaling: widthmm} -body {
     tk scaling 1.25
     expr {int((25.4*[winfo screenwidth .])/(72*1.25) + 0.5) \
         - [winfo screenmmwidth .]}
-} -result {0}
+} -result 0
 test tk-3.11 {tk command: scaling: heightmm} -body {
     tk scaling 1.25
     expr {int((25.4*[winfo screenheight .])/(72*1.25) + 0.5) \
         - [winfo screenmmheight .]}
-} -result {0}
+} -result 0
 tk scaling $scaling
 
 # Value stored to restore default settings after 4.* tests
@@ -139,7 +139,7 @@ test tk-5.5 {tk caret} -body {
 } -result {-height 12 -x 10 -y 11}
 test tk-5.6 {tk caret} -body {
     tk caret . -x 20 -y 25 -h 30; tk caret . -hei
-} -result {30}
+} -result 30
 
 # tk inactive
 test tk-6.1 {tk inactive} -body {
diff --git a/tests/ttk/entry.test b/tests/ttk/entry.test
index 26edca9..a2d6016 100644
--- a/tests/ttk/entry.test
+++ b/tests/ttk/entry.test
@@ -84,7 +84,7 @@ test entry-2.1.1 "Create entry before scrollbar - scrollbar catches up" -body {
     	-expand false -fill x
     update ; # no error
     lappend res [expr [lindex [.tsb get] 1] < 1] ; # scrollbar did update
-} -result {1} -cleanup {destroy .te .tsb}
+} -result 1 -cleanup {destroy .te .tsb}
 
 test entry-2.2 "Initial scroll position" -body {
     ttk::entry .e -font fixed -width 5 -xscrollcommand scroll
@@ -128,28 +128,28 @@ test entry-3.3 "xview" -body {
     .e insert end abcdefghijklmnopqrstuvwxyz
     .e xview end
     set result [.e index @0]
-} -result {7}
+} -result 7
 
 test entry-3.4 "xview" -body {
     .e delete 0 end;
     .e insert end abcdefghijklmnopqrstuvwxyz
     .e xview moveto 1.0
     set result [.e index @0]
-} -result {7}
+} -result 7
 
 test entry-3.5 "xview" -body {
     .e delete 0 end;
     .e insert end abcdefghijklmnopqrstuvwxyz
     .e xview scroll 5 units
     set result [.e index @0]
-} -result {5}
+} -result 5
 
 test entry-3.6 "xview" -body {
     .e delete 0 end;
     .e insert end [string repeat abcdefghijklmnopqrstuvwxyz 5]
     .e xview scroll 2 pages
     set result [.e index @0]
-} -result {40}
+} -result 40
 
 test entry-3.last "Series 3 cleanup" -body {
     destroy .e
diff --git a/tests/ttk/spinbox.test b/tests/ttk/spinbox.test
index 38bae14..951ce59 100644
--- a/tests/ttk/spinbox.test
+++ b/tests/ttk/spinbox.test
@@ -148,7 +148,7 @@ test spinbox-1.8.4 "-validate option: " -setup {
     set ::spinbox_test
 } -cleanup {
     destroy .sb
-} -result {50}
+} -result 50
 
 
 test spinbox-2.0 "current command -- unset should be 0" -constraints nyi -setup {
diff --git a/tests/ttk/treeview.test b/tests/ttk/treeview.test
index 43dd249..4236b01 100644
--- a/tests/ttk/treeview.test
+++ b/tests/ttk/treeview.test
@@ -466,7 +466,7 @@ test treeview-8.6 "Selection - <<TreeviewSelect>> on selection add" -body {
     .tv selection add newnode.n1
     update
     set res
-} -result {1}
+} -result 1
 
 test treeview-8.7 "<<TreeviewSelect>> on selected item deletion" -body {
     .tv selection set {}
@@ -560,7 +560,7 @@ test treeview-9.3 {scrolling on see command, requested item is closed} -setup {
     expr $after < $before
 } -cleanup {
     destroy .top
-} -result {1}
+} -result 1
 
 ### identify tests:
 #
diff --git a/tests/unixEmbed.test b/tests/unixEmbed.test
index c0a5bac..b322ef7 100644
--- a/tests/unixEmbed.test
+++ b/tests/unixEmbed.test
@@ -114,7 +114,7 @@ test unixEmbed-1.3 {TkpUseWindow procedure, inheriting colormap} -constraints {
     colorsFree .x
 } -cleanup {
 	deleteWindows
-} -result {0}
+} -result 0
 test unixEmbed-1.4 {TkpUseWindow procedure, inheriting colormap} -constraints {
 	unix nonPortable
 } -setup {
@@ -127,7 +127,7 @@ test unixEmbed-1.4 {TkpUseWindow procedure, inheriting colormap} -constraints {
     colorsFree .x
 } -cleanup {
 	deleteWindows
-} -result {1}
+} -result 1
 
 test unixEmbed-1.5 {TkpUseWindow procedure, creating Container records} -constraints {
 	unix testembed notAqua
diff --git a/tests/unixSelect.test b/tests/unixSelect.test
index a702587..d3da806 100644
--- a/tests/unixSelect.test
+++ b/tests/unixSelect.test
@@ -121,7 +121,7 @@ test unixSelect-1.1 {TkSelGetSelection procedure: simple i18n text} -constraints
 } -cleanup {
     cleanupbg
     destroy .e
-} -result {4}
+} -result 4
 
 test unixSelect-1.2 {TkSelGetSelection procedure: simple i18n text, iso8859-1} -constraints {
     x11
@@ -331,7 +331,7 @@ test unixSelect-1.13 {TkSelGetSelection procedure: simple i18n text, utf-8} -con
 } -cleanup {
     destroy .e
     cleanupbg
-} -result {5}
+} -result 5
 
 test unixSelect-1.14 {TkSelGetSelection procedure: simple i18n text, utf-8} -constraints {
     x11
diff --git a/tests/util.test b/tests/util.test
index d457b50..ed4a276 100644
--- a/tests/util.test
+++ b/tests/util.test
@@ -39,22 +39,22 @@ test util-1.7 {Tk_GetScrollInfo procedure} -body {
     .l yview 0
     .l yview scroll 2 pages
     .l nearest 0
-} -result {6}
+} -result 6
 test util-1.8 {Tk_GetScrollInfo procedure} -body {
     .l yview 15
     .l yview scroll -2 pages
     .l nearest 0
-} -result {9}
+} -result 9
 test util-1.9 {Tk_GetScrollInfo procedure} -body {
     .l yview 0
     .l yview scroll 2 units
     .l nearest 0
-} -result {2}
+} -result 2
 test util-1.10 {Tk_GetScrollInfo procedure} -body {
     .l yview 15
     .l yview scroll -2 units
     .l nearest 0
-} -result {13}
+} -result 13
 test util-1.11 {Tk_GetScrollInfo procedure} -body {
     .l yview scroll 3 zips
 } -returnCodes error -result {bad argument "zips": must be pages or units}
diff --git a/tests/visual.test b/tests/visual.test
index 13d6fd2..8d63097 100644
--- a/tests/visual.test
+++ b/tests/visual.test
@@ -455,7 +455,7 @@ test visual-7.1 {Tk_GetColormap, "new"} -constraints {
     colorsFree .t2
 } -cleanup {
     deleteWindows
-} -result {0}
+} -result 0
 test visual-7.2 {Tk_GetColormap, "new"} -constraints {
     defaultPseudocolor8 nonPortable
 } -setup {
@@ -468,7 +468,7 @@ test visual-7.2 {Tk_GetColormap, "new"} -constraints {
     colorsFree .t2
 } -cleanup {
     deleteWindows
-} -result {1}
+} -result 1
 test visual-7.3 {Tk_GetColormap, copy from other window} -constraints {
     defaultPseudocolor8 nonPortable
 } -setup {
@@ -484,7 +484,7 @@ test visual-7.3 {Tk_GetColormap, copy from other window} -constraints {
     colorsFree .t2
 } -cleanup {
     deleteWindows
-} -result {1}
+} -result 1
 test visual-7.4 {Tk_GetColormap, copy from other window} -constraints {
     defaultPseudocolor8 nonPortable
 } -setup {
@@ -500,7 +500,7 @@ test visual-7.4 {Tk_GetColormap, copy from other window} -constraints {
     colorsFree .t2
 } -cleanup {
     deleteWindows
-} -result {0}
+} -result 0
 test visual-7.5 {Tk_GetColormap, copy from other window} -constraints {
     defaultPseudocolor8 nonPortable
 } -setup {
diff --git a/tests/winDialog.test b/tests/winDialog.test
index e70ae3f..280d69e 100755
--- a/tests/winDialog.test
+++ b/tests/winDialog.test
@@ -118,7 +118,7 @@ test winDialog-1.1 {Tk_ChooseColorObjCmd} -constraints {
     then {
         Click cancel
     }
-} -result {0}
+} -result 0
 test winDialog-1.2 {Tk_ChooseColorObjCmd} -constraints {
     testwinevent
 } -body {
@@ -229,7 +229,7 @@ test winDialog-5.1 {GetFileName: no arguments} -constraints {
     then {
         Click cancel
     }
-} -result {0}
+} -result 0
 test winDialog-5.2 {GetFileName: one argument} -constraints {
     nt
 } -body {
@@ -242,7 +242,7 @@ test winDialog-5.3 {GetFileName: many arguments} -constraints {
     then {
         Click cancel
     }
-} -result {0}
+} -result 0
 test winDialog-5.4 {GetFileName: Tcl_GetIndexFromObj() != TCL_OK} -constraints {
     nt
 } -body {
@@ -259,7 +259,7 @@ test winDialog-5.5 {GetFileName: Tcl_GetIndexFromObj() == TCL_OK} -constraints {
     # https://core.tcl-lang.org/tk/tktview/4a0451f5291b3c9168cc560747dae9264e1d2ef6
     # $x is expected to be empty
     append x $y
-} -result {0}
+} -result 0
 test winDialog-5.6 {GetFileName: valid option, but missing value} -constraints {
     nt
 } -body {
@@ -726,7 +726,7 @@ test winDialog-5.16 {GetFileName: parent} -constraints {
         destroy .t
     }
     return $x
-} -result {1}
+} -result 1
 test winDialog-5.17 {GetFileName: title} -constraints {
     nt testwinevent
 } -body {
@@ -736,7 +736,7 @@ test winDialog-5.17 {GetFileName: title} -constraints {
     then {
         Click cancel
     }
-} -result {0}
+} -result 0
 if {[vista?]} {
     # In the newer file dialogs, the file type widget does not even exist
     # if no file types specified
@@ -841,7 +841,7 @@ test winDialog-5.24 {GetFileName: file types: MakeFilter() succeeds} -constraint
         Click cancel
     }
     return $x
-} -result {0}
+} -result 0
 test winDialog-5.25 {GetFileName: file types: MakeFilter() succeeds} -constraints {
     nt
 } -body {
@@ -852,7 +852,7 @@ test winDialog-5.25 {GetFileName: file types: MakeFilter() succeeds} -constraint
         Click cancel
     }
     return $x
-} -result {0}
+} -result 0
 
 
 test winDialog-6.1 {MakeFilter} -constraints {emptyTest nt} -body {}
@@ -877,7 +877,7 @@ test winDialog-9.1 {Tk_ChooseDirectoryObjCmd: no arguments} -constraints {
     }]
     # $x should be "" on a Cancel
     append x $y
-} -result {0}
+} -result 0
 test winDialog-9.2 {Tk_ChooseDirectoryObjCmd: one argument} -constraints {
     nt
 } -body {
@@ -892,7 +892,7 @@ test winDialog-9.3 {Tk_ChooseDirectoryObjCmd: many arguments} -constraints {
     then {
         Click cancel
     }
-} -result {0}
+} -result 0
 test winDialog-9.4 {Tk_ChooseDirectoryObjCmd: Tcl_GetIndexFromObj() != TCL_OK} -constraints {
     nt
 } -body {
@@ -905,7 +905,7 @@ test winDialog-9.5 {Tk_ChooseDirectoryObjCmd: Tcl_GetIndexFromObj() == TCL_OK} -
     then {
         Click cancel
     }
-} -result {0}
+} -result 0
 test winDialog-9.6 {Tk_ChooseDirectoryObjCmd: valid option, but missing value} -constraints {
     nt
 } -body {
diff --git a/tests/winFont.test b/tests/winFont.test
index 23c09c9..599b091 100644
--- a/tests/winFont.test
+++ b/tests/winFont.test
@@ -37,12 +37,12 @@ test winfont-2.1 {TkpGetFontFromAttributes procedure: pointsize} -constraints {
     win
 } -body {
     expr {[font actual {-size -10} -size] > 0}
-} -result {1}
+} -result 1
 test winfont-2.2 {TkpGetFontFromAttributes procedure: pointsize} -constraints {
     win
 } -body {
     expr {[font actual {-family Arial} -size] > 0}
-} -result {1}
+} -result 1
 test winfont-2.3 {TkpGetFontFromAttributes procedure: normal weight} -constraints {
     win
 } -body {
@@ -221,7 +221,7 @@ test winfont-5.5 {Tk_MeasureChars procedure: include last partial char} -constra
     .t.c index $t @[expr {int($cx*2.5)}],1
 } -cleanup {
     destroy .t.c
-} -result {2}
+} -result 2
 
 test winfont-5.6 {Tk_MeasureChars procedure: at least one char on line} -constraints {
     win
@@ -337,7 +337,7 @@ test winfont-5.11 {Tk_MeasureChars procedure: check for kerning} -constraints {
     expr {$x < ($width*10)}
 } -cleanup {
     destroy .t.l
-} -result {1}
+} -result 1
 
 
 test winfont-6.1 {Tk_DrawChars procedure: loop test} -constraints win -setup {
@@ -375,12 +375,12 @@ test winfont-7.3 {AllocFont procedure: extract info from textmetric} -constraint
     win
 } -body {
     font metric {arial 10 bold italic underline overstrike} -fixed
-} -result {0}
+} -result 0
 test winfont-7.4 {AllocFont procedure: extract info from textmetric} -constraints {
     win
 } -body {
     font metric systemfixed -fixed
-} -result {1}
+} -result 1
 
 # cleanup
 cleanupTests
diff --git a/tests/winWm.test b/tests/winWm.test
index 0064c5a..705e355 100644
--- a/tests/winWm.test
+++ b/tests/winWm.test
@@ -274,7 +274,7 @@ test winWm-6.2 {wm attributes} -constraints win -setup {
     wm attributes .t -disabled
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test winWm-6.3 {wm attributes} -constraints win -setup {
     destroy .t
 } -body {
diff --git a/tests/winfo.test b/tests/winfo.test
index 49a92a6..d39359b 100644
--- a/tests/winfo.test
+++ b/tests/winfo.test
@@ -174,7 +174,7 @@ test winfo-4.7 {"winfo containing" command} -setup {
     expr {($x == ".") || ($x == "")}
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 
 
 test winfo-5.1 {"winfo interps" command} -body {
@@ -188,10 +188,10 @@ test winfo-5.3 {"winfo interps" command} -body {
 } -returnCodes error -result {bad window path name "geek"}
 test winfo-5.4 {"winfo interps" command} -constraints unix -body {
     expr {[lsearch -exact [winfo interps] [tk appname]] >= 0}
-} -result {1}
+} -result 1
 test winfo-5.5 {"winfo interps" command} -constraints unix -body {
     expr {[lsearch -exact [winfo interps -displayof .] [tk appname]] >= 0}
-} -result {1}
+} -result 1
 
 
 test winfo-6.1 {"winfo exists" command} -body {
@@ -202,10 +202,10 @@ test winfo-6.2 {"winfo exists" command} -body {
 } -returnCodes error -result {wrong # args: should be "winfo exists window"}
 test winfo-6.3 {"winfo exists" command} -body {
     winfo exists gorp
-} -result {0}
+} -result 0
 test winfo-6.4 {"winfo exists" command} -body {
     winfo exists .
-} -result {1}
+} -result 1
 test winfo-6.5 {"winfo exists" command} -setup {
     destroy .b
 } -body {
@@ -290,13 +290,13 @@ test winfo-9.2 {"winfo viewable" command} -body {
 } -returnCodes error -result {bad window path name "foo"}
 test winfo-9.3 {"winfo viewable" command} -body {
     winfo viewable .
-} -result {1}
+} -result 1
 test winfo-9.4 {"winfo viewable" command} -body {
     wm iconify .
     winfo viewable .
 } -cleanup {
     wm deiconify .
-} -result {0}
+} -result 0
 test winfo-9.5 {"winfo viewable" command} -setup {
     deleteWindows
 } -body {
@@ -344,7 +344,7 @@ test winfo-10.2 {"winfo visualid" command} -body {
 } -returnCodes error -result {bad window path name "gorp"}
 test winfo-10.3 {"winfo visualid" command} -body {
     expr {2 + [winfo visualid .] - [winfo visualid .]}
-} -result {2}
+} -result 2
 
 
 test winfo-11.1 {"winfo visualid" command} -body {
@@ -358,14 +358,14 @@ test winfo-11.3 {"winfo visualid" command} -body {
 } -returnCodes error -result {wrong # args: should be "winfo visualsavailable window ?includeids?"}
 test winfo-11.4 {"winfo visualid" command} -body {
     llength [lindex [winfo visualsa .] 0]
-} -result {2}
+} -result 2
 test winfo-11.5 {"winfo visualid" command} -body {
     llength [lindex [winfo visualsa . includeids] 0]
-} -result {3}
+} -result 3
 test winfo-11.6 {"winfo visualid" command} -body {
     set x [lindex [lindex [winfo visualsa . includeids] 0] 2]
     expr {$x + 2 - $x}
-} -result {2}
+} -result 2
 
 
 test winfo-12.1 {GetDisplayOf procedure} -body {
diff --git a/tests/wm.test b/tests/wm.test
index 2978c1b..e9110bc 100644
--- a/tests/wm.test
+++ b/tests/wm.test
@@ -1484,14 +1484,14 @@ test wm-stackorder-4.1 {wm stackorder isabove|isbelow} -body {
     wm stackorder . isabove .t
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test wm-stackorder-4.2 {wm stackorder isabove|isbelow} -body {
     toplevel .t ; update
     raise .t
     wm stackorder . isbelow .t
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 test wm-stackorder-4.3 {wm stackorder isabove|isbelow} -body {
     toplevel .t ; update
     raise .
@@ -1499,7 +1499,7 @@ test wm-stackorder-4.3 {wm stackorder isabove|isbelow} -body {
     wm stackorder .t isa .
 } -cleanup {
     destroy .t
-} -result {0}
+} -result 0
 test wm-stackorder-4.4 {wm stackorder isabove|isbelow} -body {
     toplevel .t ; update
     raise .
@@ -1507,7 +1507,7 @@ test wm-stackorder-4.4 {wm stackorder isabove|isbelow} -body {
     wm stackorder .t isb .
 } -cleanup {
     destroy .t
-} -result {1}
+} -result 1
 deleteWindows
 
 test wm-stackorder-5.1 {a menu is not a toplevel} -body {
@@ -2277,7 +2277,7 @@ test wm-forget-1.1 "bug #2009788: forget toplevel can cause crash" -body {
     winfo exists .parent.child
 } -cleanup {
     deleteWindows
-}  -result {1}
+}  -result 1
 test wm-forget-1.2 "bug #2009788: forget toplevel can cause crash" -body {
     toplevel .parent
     update
@@ -2286,7 +2286,7 @@ test wm-forget-1.2 "bug #2009788: forget toplevel can cause crash" -body {
     winfo exists .parent.child
 } -cleanup {
     deleteWindows
-}  -result {1}
+}  -result 1
 test wm-forget-1.3 "bug #2009788: forget toplevel can cause crash" -body {
     toplevel .parent
     toplevel .parent.child
@@ -2295,7 +2295,7 @@ test wm-forget-1.3 "bug #2009788: forget toplevel can cause crash" -body {
     winfo exists .parent.child
 } -cleanup {
     deleteWindows
-}  -result {1}
+}  -result 1
 test wm-forget-1.4 "pack into unmapped toplevel causes crash" -body {
     toplevel .parent
     toplevel .parent.child
-- 
cgit v0.12


From bd33c4f3a417d27aebd67b95239b3efd2238dac9 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 10 Jun 2020 10:30:39 +0000
Subject: Add NO_DEPRECATED builds to Travis

---
 .travis.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 0a8ab68..fb252e4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,6 +27,13 @@ matrix:
       compiler: gcc
       env:
         - BUILD_DIR=unix
+    - name: "Linux/GCC/Shared: NO_DEPRECATED"
+      os: linux
+      dist: bionic
+      compiler: gcc
+      env:
+        - BUILD_DIR=unix
+        - CFGOPT="CFLAGS=-DTK_NO_DEPRECATED=1"
     - name: "Linux/GCC/Shared/no-xft"
       os: linux
       dist: bionic
@@ -113,6 +120,13 @@ matrix:
       compiler: clang
       env:
         - BUILD_DIR=unix
+    - name: "Linux/Clang/Shared: NO_DEPRECATED"
+      os: linux
+      dist: bionic
+      compiler: clang
+      env:
+        - BUILD_DIR=unix
+        - CFGOPT="CFLAGS=-DTK_NO_DEPRECATED=1"
     - name: "Linux/Clang/Shared/no-xft"
       os: linux
       dist: bionic
-- 
cgit v0.12


From 5a8d8e6147fa2b4101b6dfcb055cb42bcc057f24 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 11 Jun 2020 12:39:45 +0000
Subject: Proposed:
 [https://core.tcl-lang.org/tk/tktview?name=d908f43d17|d908f43d17]: RFE:
 Travis: mac os x versions. Should be done for both Tcl and Tk, but let's try
 Tk first.

---
 .travis.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a3bc25d..63d5320 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -119,44 +119,44 @@ matrix:
       osx_image: xcode11.5
       env:
         - BUILD_DIR=unix
-        - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include"
+        - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.15"
     - name: "macOS/Xcode 11.5/Static"
       os: osx
       osx_image: xcode11.5
       env:
         - BUILD_DIR=unix
-        - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua --disable-shared CFLAGS=-I/usr/local/opt/tcl-tk/include"
+        - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua --disable-shared CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.15"
     - name: "macOS/Xcode 11.5/Debug"
       os: osx
       osx_image: xcode11.5
       env:
         - BUILD_DIR=unix
-        - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua --enable-symbols CFLAGS=-I/usr/local/opt/tcl-tk/include"
+        - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua --enable-symbols CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.15"
     - name: "macOS/Xcode 11.5/Shared/XQuartz"
       os: osx
       osx_image: xcode11.5
       env:
         - BUILD_DIR=unix
-        - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --disable-corefoundation --x-includes=/opt/X11/include --x-libraries=/opt/X11/lib CFLAGS=-I/usr/local/opt/tcl-tk/include"
+        - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --disable-corefoundation --x-includes=/opt/X11/include --x-libraries=/opt/X11/lib CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.15"
 # Older MacOS versions
     - name: "macOS/Xcode 11/Shared"
       os: osx
       osx_image: xcode11
       env:
         - BUILD_DIR=unix
-        - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include"
+        - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.14"
     - name: "macOS/Xcode 10/Shared"
       os: osx
       osx_image: xcode10.3
       env:
         - BUILD_DIR=unix
-        - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include"
+        - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.14"
     - name: "macOS/Xcode 9/Shared"
       os: osx
       osx_image: xcode9.4
       env:
         - BUILD_DIR=unix
-        - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include"
+        - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.13"
 # Test on Windows with MSVC native
 #   - name: "Windows/MSVC/Shared"
 #     os: windows
-- 
cgit v0.12


From 353247a615b7fd61f9d3d0e8b83932117b972cf0 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 11 Jun 2020 15:25:12 +0000
Subject: Fix [4fb812af90]: Build Failure on msys2 with gcc10. Also add more
 __cplusplus-related scope blocks around (internal) MODULE_SCOPE definitions.

---
 generic/tkFileFilter.h | 8 ++++++++
 generic/tkFont.h       | 8 ++++++++
 generic/tkInt.h        | 8 ++++++++
 generic/tkMain.c       | 8 +++++++-
 win/tkWinInt.h         | 7 +++++++
 5 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/generic/tkFileFilter.h b/generic/tkFileFilter.h
index 131e423..22db9e8 100644
--- a/generic/tkFileFilter.h
+++ b/generic/tkFileFilter.h
@@ -13,6 +13,10 @@
 #ifndef _TK_FILE_FILTER
 #define _TK_FILE_FILTER
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define OSType long
 
 typedef struct GlobPattern {
@@ -75,4 +79,8 @@ MODULE_SCOPE int	TkGetFileFilters(Tcl_Interp *interp,
     			    FileFilterList *flistPtr, Tcl_Obj *valuePtr,
 			    int isWindows);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif	/* _TK_FILE_FILTER */
diff --git a/generic/tkFont.h b/generic/tkFont.h
index 50f79d2..ceabee3 100644
--- a/generic/tkFont.h
+++ b/generic/tkFont.h
@@ -14,6 +14,10 @@
 #ifndef _TKFONT
 #define _TKFONT
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * The following structure keeps track of the attributes of a font. It can be
  * used to keep track of either the desired attributes or the actual
@@ -221,4 +225,8 @@ MODULE_SCOPE void	TkpGetFontFamilies(Tcl_Interp *interp,
 			    Tk_Window tkwin);
 MODULE_SCOPE TkFont *	TkpGetNativeFont(Tk_Window tkwin, const char *name);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif	/* _TKFONT */
diff --git a/generic/tkInt.h b/generic/tkInt.h
index ab06435..3158500 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -1111,6 +1111,10 @@ void Tcl_Panic(const char *, ...) __attribute__((analyzer_noreturn));
 
 #include "tkIntDecls.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * Themed widget set init function:
  */
@@ -1440,6 +1444,10 @@ MODULE_SCOPE int	TkOldTestInit(Tcl_Interp *interp);
 MODULE_SCOPE int	TkplatformtestInit(Tcl_Interp *interp);
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _TKINT */
 
 /*
diff --git a/generic/tkMain.c b/generic/tkMain.c
index 879a7c0..b2fa845 100644
--- a/generic/tkMain.c
+++ b/generic/tkMain.c
@@ -32,6 +32,9 @@ static const char DEFAULT_PRIMARY_PROMPT[] = "% ";
  * to strcmp here.
  */
 #ifdef _WIN32
+#ifdef __cplusplus
+extern "C" {
+#endif
 /*  Little hack to eliminate the need for "tclInt.h" here:
     Just copy a small portion of TclIntPlatStubs, just
     enough to make it work. See [600b72bfbc] */
@@ -41,7 +44,10 @@ typedef struct TclIntPlatStubs {
     void (*dummy[16]) (void); /* dummy entries 0-15, not used */
     int (*tclpIsAtty) (int fd); /* 16 */
 } TclIntPlatStubs;
-const TclIntPlatStubs *tclIntPlatStubsPtr;
+extern const TclIntPlatStubs *tclIntPlatStubsPtr;
+#ifdef __cplusplus
+}
+#endif
 #   include "tkWinInt.h"
 #else
 #   define TCHAR char
diff --git a/win/tkWinInt.h b/win/tkWinInt.h
index 7e3119e..92bcc0d 100644
--- a/win/tkWinInt.h
+++ b/win/tkWinInt.h
@@ -142,6 +142,9 @@ MODULE_SCOPE const int tkpWinBltModes[];
 
 #include "tkIntPlatDecls.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 /*
  * Special proc needed as tsd accessor function between
  * tkWinX.c:GenerateXEvent and tkWinClipboard.c:UpdateClipboard
@@ -246,4 +249,8 @@ MODULE_SCOPE Tcl_Obj *	        TkWin32ErrorObj(HRESULT hrError);
 #define GWLP_ID			GWL_ID
 #endif /* !GWLP_WNDPROC */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _TKWININT */
-- 
cgit v0.12


From 7d7b9fba7fb2d97d9aaaf36725c9993edfe3596a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 12 Jun 2020 14:47:18 +0000
Subject: sync tcl.m4 and rules.vc with Tcl

---
 unix/configure |  2 +-
 unix/tcl.m4    |  4 ++--
 win/rules.vc   | 10 +---------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/unix/configure b/unix/configure
index b7e78a7..fe229ad 100755
--- a/unix/configure
+++ b/unix/configure
@@ -6609,7 +6609,7 @@ fi
 	case $system in
 	    AIX-*) ;;
 	    BSD/OS*) ;;
-	    CYGWIN_*|MINGW32_*) ;;
+	    CYGWIN_*) ;;
 	    IRIX*) ;;
 	    NetBSD-*|DragonFly-*|FreeBSD-*|OpenBSD-*) ;;
 	    Darwin-*) ;;
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 7d4185b..24e00cd 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1986,7 +1986,7 @@ dnl # preprocessing tests use only CPPFLAGS.
 	case $system in
 	    AIX-*) ;;
 	    BSD/OS*) ;;
-	    CYGWIN_*|MINGW32_*) ;;
+	    CYGWIN_*) ;;
 	    IRIX*) ;;
 	    NetBSD-*|DragonFly-*|FreeBSD-*|OpenBSD-*) ;;
 	    Darwin-*) ;;
@@ -2114,13 +2114,13 @@ dnl # preprocessing tests use only CPPFLAGS.
 #
 #	Defines some of the following vars:
 #		NO_DIRENT_H
+#		NO_FLOAT_H
 #		NO_VALUES_H
 #		NO_STDLIB_H
 #		NO_STRING_H
 #		NO_SYS_WAIT_H
 #		NO_DLFCN_H
 #		HAVE_SYS_PARAM_H
-#
 #		HAVE_STRING_H ?
 #
 #--------------------------------------------------------------------
diff --git a/win/rules.vc b/win/rules.vc
index 490f9c3..d4765b9 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -730,11 +730,8 @@ MSVCRT		= 0
 !else
 !if [nmakehlp -f $(OPTS) "msvcrt"]
 !message *** Doing msvcrt
-MSVCRT		= 1
-!else
-!if !$(STATIC_BUILD)
-MSVCRT		= 1
 !else
+!if $(STATIC_BUILD)
 MSVCRT		= 0
 !endif
 !endif
@@ -743,17 +740,12 @@ MSVCRT		= 0
 !if [nmakehlp -f $(OPTS) "staticpkg"] && $(STATIC_BUILD)
 !message *** Doing staticpkg
 TCL_USE_STATIC_PACKAGES	= 1
-!else
-TCL_USE_STATIC_PACKAGES	= 0
 !endif
 
 !if [nmakehlp -f $(OPTS) "nothreads"]
 !message *** Compile explicitly for non-threaded tcl
 TCL_THREADS = 0
 USE_THREAD_ALLOC= 0
-!else
-TCL_THREADS    = 1
-USE_THREAD_ALLOC= 1
 !endif
 
 !if "$(TCL_MAJOR_VERSION)" == "8"
-- 
cgit v0.12


From 1d82b1078322a72b9551982472e2e13f7a470ffd Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 14 Jun 2020 16:19:56 +0000
Subject: Rework test bind-35.1 and simplify it a bit, make it fail in
 core-8-6-branch that does not have the fix yet.

---
 generic/tkTest.c      | 78 ---------------------------------------------------
 tests/bind.test       | 49 +++++++++++++++-----------------
 tests/constraints.tcl |  1 -
 3 files changed, 22 insertions(+), 106 deletions(-)

diff --git a/generic/tkTest.c b/generic/tkTest.c
index 1f373ad..a8929b9 100644
--- a/generic/tkTest.c
+++ b/generic/tkTest.c
@@ -206,9 +206,6 @@ static int		TrivialConfigObjCmd(ClientData dummy,
 			    Tcl_Obj * const objv[]);
 static void		TrivialEventProc(ClientData clientData,
 			    XEvent *eventPtr);
-static int		TestgrabObjCmd(ClientData clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
 
 /*
  *----------------------------------------------------------------------
@@ -284,9 +281,6 @@ Tktest_Init(
 	    (ClientData) Tk_MainWindow(interp), NULL);
 #endif /* _WIN32 */
 
-    Tcl_CreateObjCommand(interp, "testgrab", TestgrabObjCmd,
-	    (ClientData) Tk_MainWindow(interp), NULL);
-
     /*
      * Create test image type.
      */
@@ -2084,78 +2078,6 @@ CustomOptionFree(
 }
 
 /*
- *----------------------------------------------------------------------
- *
- * TestgrabObjCmd --
- *
- *	This function implements the "testgrab" command, which is used to test
- *	grabbing of windows.
- *
- *	testgrab grabbed  $win: returns true if $win is currently grabbed
- *	testgrab released $win: returns true if $win is currently not grabbed
- *
- *	This function is useful when one wants to test for a grabbing window
- *	at the moment it is called. [grab current] cannot be used for that
- *	purpose because it returns the window dereferenced by eventualGrabWinPtr
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestgrabObjCmd(
-    ClientData clientData,	/* Main window for application. */
-    Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,			/* Number of arguments. */
-    Tcl_Obj *const objv[])	/* Argument objects. */
-{
-    static const char *const options[] = {"grabbed", "released", NULL};
-    enum option {GRABBED, RELEASED};
-    int index, res = 0;
-    Tk_Window mainWin, tkwin;
-
-    mainWin = (Tk_Window) clientData;
-
-    if (objc < 3) {
-	Tcl_WrongNumArgs(interp, 1, objv, "option window");
-	return TCL_ERROR;
-    }
-
-    if (Tcl_GetIndexFromObjStruct(interp, objv[1], options,
-	    sizeof(char *), "command", 0, &index)!= TCL_OK) {
-	return TCL_ERROR;
-    }
-
-    tkwin = Tk_NameToWindow(interp, Tcl_GetString(objv[2]), mainWin);
-    if (tkwin == NULL) {
-        return TCL_ERROR;
-    }
-    /*printf("TestgrabObjCmd %s, grabWinPtr = %p , tkwin = %p\n", options[index],
-            ((TkWindow *) tkwin)->dispPtr->grabWinPtr, tkwin);fflush(stdout);*/
-
-    switch ((enum option) index) {
-    case GRABBED:
-        if (TkGrabState((TkWindow *) tkwin) != TK_GRAB_NONE) {
-            res = 1;
-        }
-	break;
-    case RELEASED:
-        if (TkGrabState((TkWindow *) tkwin) == TK_GRAB_NONE) {
-            res = 1;
-        }
-	break;
-    }
-
-    Tcl_SetObjResult(interp, Tcl_NewBooleanObj(res));
-    return TCL_OK;
-}
-
-/*
  * Local Variables:
  * mode: c
  * c-basic-offset: 4
diff --git a/tests/bind.test b/tests/bind.test
index e333c6c..33183ca 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -36,12 +36,22 @@ proc unsetBindings {} {
 
 # move the mouse pointer away of the testing area
 # otherwise some spurious events may pollute the tests
-toplevel .top
-wm geometry .top 50x50-50-50
-update
-event generate .top <Button-1> -warp 1
-update
-destroy .top
+# also, this will procure a known grab state at startup
+# for tests mixing grabs and pointer warps
+proc pointerAway {} {
+    toplevel .top
+    wm geometry .top 50x50-50-50
+    update
+    # On KDE/Plasma _with_the_Aurorae_theme_ (at least), setting up the toplevel
+    # will not be finished right after the above 'update'. The WM still
+    # needs some time before the window is fully ready. For me 50 ms is enough,
+    # but let's wait more (it depends on computer performance).
+    after 100 ; update
+    event generate .top <Button-1> -warp 1
+    update
+    destroy .top
+}
+pointerAway
 
 test bind-1.1 {bind command} -body {
     bind
@@ -6709,26 +6719,10 @@ test bind-34.3 {-warp works with null or negative coordinates} -setup {
 } -cleanup {
 } -result {ok ok ok ok}
 
-test bind-35.1 {pointer warp with grab on master, bug [e3888d5820]} -constraints {
-    testgrab
-} -setup {
-    proc waitForGrab {type grabWin} {
-    # process events while $grabWin is not grabbed ($type == "grabbed"),
-    # or while $grabWin is not released ($type == "released"), but don't
-    # spend more than 5 seconds doing this
-        set i 0
-        while {![testgrab $type $grabWin] && $i < 500} {
-            after 10
-            update
-            incr i
-        }
-    }
-    event generate {} <Motion> -warp 1 -x 50 -y 50
-    update idletasks ; # DoWarp is an idle callback
-    after 50         ; # Win specific - wait for SendInput to be executed
+test bind-35.1 {pointer warp with grab on master, bug [e3888d5820]} -setup {
+    pointerAway
     toplevel .top
     grab release .top
-    waitForGrab released .top
     wm geometry .top 200x200+300+300
     label .top.l -height 5 -width 20 -highlightthickness 2 \
             -highlightbackground black -bg yellow -text "My label"
@@ -6741,14 +6735,16 @@ test bind-35.1 {pointer warp with grab on master, bug [e3888d5820]} -constraints
     after 100 ; update
 } -body {
     grab .top  ; # this will queue events
-    waitForGrab grabbed .top
+    after 50
+    update
     event generate .top.l <Motion> -warp 1 -x 10 -y 10
     update idletasks ; after 50
     foreach {x1 y1} [winfo pointerxy .top.l] {}
     event generate {} <Motion> -warp 1 -x 50 -y 50
     update idletasks ; after 50
     grab release .top  ; # this will queue events
-    waitForGrab released .top
+    after 50
+    update
     event generate .top.l <Motion> -warp 1 -x 10 -y 10
     update idletasks ; after 50
     foreach {x2 y2} [winfo pointerxy .top.l] {}
@@ -6759,7 +6755,6 @@ test bind-35.1 {pointer warp with grab on master, bug [e3888d5820]} -constraints
 } -cleanup {
     destroy .top
     unset x1 y1 x2 y2
-    rename waitForGrab {}
 } -result {1}
 
 # cleanup
diff --git a/tests/constraints.tcl b/tests/constraints.tcl
index 49da142..c77fb00 100644
--- a/tests/constraints.tcl
+++ b/tests/constraints.tcl
@@ -207,7 +207,6 @@ testConstraint testcolor     [llength [info commands testcolor]]
 testConstraint testcursor    [llength [info commands testcursor]]
 testConstraint testembed     [llength [info commands testembed]]
 testConstraint testfont      [llength [info commands testfont]]
-testConstraint testgrab      [llength [info commands testgrab]]
 testConstraint testmakeexist [llength [info commands testmakeexist]]
 testConstraint testmenubar   [llength [info commands testmenubar]]
 testConstraint testmetrics   [llength [info commands testmetrics]]
-- 
cgit v0.12


From c62fcfd3b5d1581983a0a9d23567012e2cc8df51 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 14 Jun 2020 21:34:03 +0000
Subject: Fix [40e4bf6198]: Entry: double free when textvariable set in
 validatecommand script

---
 generic/tkEntry.c |  7 ++++---
 tests/entry.test  | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/generic/tkEntry.c b/generic/tkEntry.c
index 468eabe..3f6aa15 100644
--- a/generic/tkEntry.c
+++ b/generic/tkEntry.c
@@ -3297,13 +3297,14 @@ EntryValidateChange(
     }
 
     /*
-     * If we're already validating, then we're hitting a loop condition Return
-     * and set validate to 0 to disallow further validations and prevent
-     * current validation from finishing
+     * If we're already validating, then we're hitting a loop condition. Set
+     * validate to none to disallow further validations, arrange for flags
+     * to prevent current validation from finishing, and return.
      */
 
     if (entryPtr->flags & VALIDATING) {
 	entryPtr->validate = VALIDATE_NONE;
+        entryPtr->flags |= VALIDATE_ABORT;
 	return (varValidate ? TCL_ERROR : TCL_OK);
     }
 
diff --git a/tests/entry.test b/tests/entry.test
index 3c80e07..c7fda8a 100644
--- a/tests/entry.test
+++ b/tests/entry.test
@@ -3384,6 +3384,26 @@ test entry-19.20 {entry widget validation} -setup {
 } -cleanup {
     destroy .e
 } -result {all testdata mydata {.e -1 -1 testdata mydata {} all forced}}
+
+## This leaves validate alone because we trigger validation through the
+## textvar (a write trace), and the write during validation triggers
+## nothing (by definition of avoiding loops on var traces).  This is
+## one of those "dangerous" conditions where the user will have a
+## different value in the entry widget shown as is in the textvar.
+test entry-19.21 {entry widget validation - bug 40e4bf6198} -setup {
+    unset -nocomplain ::e ::vVals
+} -body {
+    entry .e -validate key \
+        -validatecommand [list doval2 %W %d %i %P %s %S %v %V] \
+        -textvariable ::e
+    pack .e
+    set ::e origdata
+    .e insert 0 A
+    list [.e cget -validate] [.e get] $::e $::vVals
+} -cleanup {
+    destroy .e
+} -result {none origdata mydata {.e 1 0 Aorigdata origdata A key key}}
+
 ##
 ## End validation tests
 ##
-- 
cgit v0.12


From 7cc74c617e010821ba81a1f74681f996bc282b6b Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Tue, 16 Jun 2020 22:05:03 +0000
Subject: Add test cases exercising [50ed1eddb0]: ttk::spinbox with -values
 does not loop through all values. These tests are curently duly failing.

---
 tests/ttk/spinbox.test | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/tests/ttk/spinbox.test b/tests/ttk/spinbox.test
index 08f2bda..6a7b883 100644
--- a/tests/ttk/spinbox.test
+++ b/tests/ttk/spinbox.test
@@ -220,6 +220,46 @@ test spinbox-3.0 "textarea should expand to fill widget" -setup {
     unset -nocomplain ::spinbox_test SBV
 } -result {textarea}
 
+test spinbox-4.0 "Increment with duplicates in -values" -setup {
+    ttk::spinbox .sb -values {one two three 4 5 two six} -wrap true
+    set max [expr {[llength [.sb cget -values]] + 2}]
+} -body {
+    set ::spinbox_test [.sb get]
+    for {set i 0} {$i < $max} {incr i} {
+        event generate .sb <<Increment>>
+        lappend ::spinbox_test [.sb get]
+    }
+    for {set i 0} {$i < $max} {incr i} {
+        event generate .sb <<Decrement>>
+        lappend ::spinbox_test [.sb get]
+    }
+    set ::spinbox_test
+} -cleanup {
+    destroy .sb
+    unset -nocomplain ::spinbox_test max
+} -result {one two three 4 5 two six one two one six two 5 4 three two one six}
+
+test spinbox-4.1 "Increment with duplicates in -values, initial value set" -setup {
+    ttk::spinbox .sb -values {one two three 4 5 two six} -wrap true
+    set max [expr {[llength [.sb cget -values]] + 2}]
+} -body {
+    .sb set three
+    set ::spinbox_test [.sb get]
+    for {set i 0} {$i < $max} {incr i} {
+        event generate .sb <<Increment>>
+        lappend ::spinbox_test [.sb get]
+    }
+    .sb set two
+    for {set i 0} {$i < $max} {incr i} {
+        event generate .sb <<Decrement>>
+        lappend ::spinbox_test [.sb get]
+    }
+    set ::spinbox_test
+} -cleanup {
+    destroy .sb
+    unset -nocomplain ::spinbox_test max
+} -result {three 4 5 two six one two three 4 5 one six two 5 4 three two one six}
+
 # nostomp: NB intentional difference between ttk::spinbox and tk::spinbox;
 # see also #1439266
 #
-- 
cgit v0.12


From 136539153502fe4e2a2bb4f8c3868c457ef8b20b Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Tue, 16 Jun 2020 22:23:27 +0000
Subject: Fix [50ed1eddb0]: ttk::spinbox with -values does not loop through all
 values. The two newly added test cases now pass. Patch from Brad Lanam edited
 for optimization.

---
 library/ttk/spinbox.tcl | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/library/ttk/spinbox.tcl b/library/ttk/spinbox.tcl
index 9728755..6dff302 100644
--- a/library/ttk/spinbox.tcl
+++ b/library/ttk/spinbox.tcl
@@ -135,13 +135,27 @@ proc ttk::spinbox::Adjust {w v min max} {
 #	-from, -to, and -increment.
 #
 proc ttk::spinbox::Spin {w dir} {
+    variable State
+
     if {[$w instate disabled]} { return }
-    set nvalues [llength [set values [$w cget -values]]]
-    set value [$w get]
-    if {$nvalues} {
-	set current [lsearch -exact $values $value]
-	set index [Adjust $w [expr {$current + $dir}] 0 [expr {$nvalues - 1}]]
-	$w set [lindex $values $index]
+
+    if {![info exists State(values.length)]} {
+      set State(values.index) -1
+      set State(values.last) {}
+    }
+    set State(values) [$w cget -values]
+    set State(values.length) [llength $State(values)]
+
+    if {$State(values.length) > 0} {
+        set value [$w get]
+        set current $State(values.index)
+        if {$value ne $State(values.last)} {
+            set current [lsearch -exact $State(values) $value]
+        }
+        set State(values.index) [Adjust $w [expr {$current + $dir}] 0 \
+                [expr {$State(values.length) - 1}]]
+        set State(values.last) [lindex $State(values) $State(values.index)]
+        $w set $State(values.last)
     } else {
         if {[catch {
     	    set v [expr {[scan [$w get] %f] + $dir * [$w cget -increment]}]
-- 
cgit v0.12


From fb4bf25105389d2e3c0cae6cf736d3b6b3330a1a Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Tue, 16 Jun 2020 22:24:44 +0000
Subject: Add another non-regression test, this time exercising the -wrap false
 case.

---
 tests/ttk/spinbox.test | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/tests/ttk/spinbox.test b/tests/ttk/spinbox.test
index 6a7b883..5a720ea 100644
--- a/tests/ttk/spinbox.test
+++ b/tests/ttk/spinbox.test
@@ -220,7 +220,7 @@ test spinbox-3.0 "textarea should expand to fill widget" -setup {
     unset -nocomplain ::spinbox_test SBV
 } -result {textarea}
 
-test spinbox-4.0 "Increment with duplicates in -values" -setup {
+test spinbox-4.0 "Increment with duplicates in -values, wrap" -setup {
     ttk::spinbox .sb -values {one two three 4 5 two six} -wrap true
     set max [expr {[llength [.sb cget -values]] + 2}]
 } -body {
@@ -239,7 +239,7 @@ test spinbox-4.0 "Increment with duplicates in -values" -setup {
     unset -nocomplain ::spinbox_test max
 } -result {one two three 4 5 two six one two one six two 5 4 three two one six}
 
-test spinbox-4.1 "Increment with duplicates in -values, initial value set" -setup {
+test spinbox-4.1 "Increment with duplicates in -values, wrap, initial value set" -setup {
     ttk::spinbox .sb -values {one two three 4 5 two six} -wrap true
     set max [expr {[llength [.sb cget -values]] + 2}]
 } -body {
@@ -249,7 +249,7 @@ test spinbox-4.1 "Increment with duplicates in -values, initial value set" -setu
         event generate .sb <<Increment>>
         lappend ::spinbox_test [.sb get]
     }
-    .sb set two
+    .sb set two    ; # the first "two" in the -values list becomes the current value
     for {set i 0} {$i < $max} {incr i} {
         event generate .sb <<Decrement>>
         lappend ::spinbox_test [.sb get]
@@ -259,6 +259,25 @@ test spinbox-4.1 "Increment with duplicates in -values, initial value set" -setu
     destroy .sb
     unset -nocomplain ::spinbox_test max
 } -result {three 4 5 two six one two three 4 5 one six two 5 4 three two one six}
+test spinbox-4.2 "Increment with duplicates in -values, no wrap" -setup {
+    ttk::spinbox .sb -values {one two three 4 5 two six} -wrap false
+    set max [expr {[llength [.sb cget -values]] + 2}]
+} -body {
+    set ::spinbox_test [.sb get]
+    for {set i 0} {$i < $max} {incr i} {
+        event generate .sb <<Increment>>
+        lappend ::spinbox_test [.sb get]
+    }
+    for {set i 0} {$i < $max} {incr i} {
+        event generate .sb <<Decrement>>
+        lappend ::spinbox_test [.sb get]
+    }
+    set ::spinbox_test
+} -cleanup {
+    destroy .sb
+    unset -nocomplain ::spinbox_test max
+} -result {one two three 4 5 two six six six two 5 4 three two one one one one}
+
 
 # nostomp: NB intentional difference between ttk::spinbox and tk::spinbox;
 # see also #1439266
-- 
cgit v0.12


From bbd4aec0a0f06d2dd2c0d12ecfe1356faecbf7dd Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Tue, 16 Jun 2020 22:28:58 +0000
Subject: Spacing between tests

---
 tests/ttk/spinbox.test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/ttk/spinbox.test b/tests/ttk/spinbox.test
index 5a720ea..40cb244 100644
--- a/tests/ttk/spinbox.test
+++ b/tests/ttk/spinbox.test
@@ -259,6 +259,7 @@ test spinbox-4.1 "Increment with duplicates in -values, wrap, initial value set"
     destroy .sb
     unset -nocomplain ::spinbox_test max
 } -result {three 4 5 two six one two three 4 5 one six two 5 4 three two one six}
+
 test spinbox-4.2 "Increment with duplicates in -values, no wrap" -setup {
     ttk::spinbox .sb -values {one two three 4 5 two six} -wrap false
     set max [expr {[llength [.sb cget -values]] + 2}]
-- 
cgit v0.12


From 607906e5cd09e57763093c415d46274f826e6409 Mon Sep 17 00:00:00 2001
From: bll <brad.lanam.comp@gmail.com>
Date: Wed, 17 Jun 2020 05:55:15 +0000
Subject: Fix state variables to be per widget for tracking -values.

---
 library/ttk/spinbox.tcl | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/library/ttk/spinbox.tcl b/library/ttk/spinbox.tcl
index 6dff302..d6a8b19 100644
--- a/library/ttk/spinbox.tcl
+++ b/library/ttk/spinbox.tcl
@@ -139,23 +139,23 @@ proc ttk::spinbox::Spin {w dir} {
 
     if {[$w instate disabled]} { return }
 
-    if {![info exists State(values.length)]} {
-      set State(values.index) -1
-      set State(values.last) {}
+    if {![info exists State($w.values.length)]} {
+      set State($w.values.index) -1
+      set State($w.values.last) {}
     }
-    set State(values) [$w cget -values]
-    set State(values.length) [llength $State(values)]
+    set State($w.values) [$w cget -values]
+    set State($w.values.length) [llength $State($w.values)]
 
-    if {$State(values.length) > 0} {
+    if {$State($w.values.length) > 0} {
         set value [$w get]
-        set current $State(values.index)
-        if {$value ne $State(values.last)} {
-            set current [lsearch -exact $State(values) $value]
+        set current $State($w.values.index)
+        if {$value ne $State($w.values.last)} {
+            set current [lsearch -exact $State($w.values) $value]
         }
-        set State(values.index) [Adjust $w [expr {$current + $dir}] 0 \
-                [expr {$State(values.length) - 1}]]
-        set State(values.last) [lindex $State(values) $State(values.index)]
-        $w set $State(values.last)
+        set State($w.values.index) [Adjust $w [expr {$current + $dir}] 0 \
+                [expr {$State($w.values.length) - 1}]]
+        set State($w.values.last) [lindex $State($w.values) $State($w.values.index)]
+        $w set $State($w.values.last)
     } else {
         if {[catch {
     	    set v [expr {[scan [$w get] %f] + $dir * [$w cget -increment]}]
-- 
cgit v0.12


From c4b734d933418f4ffd61054bc9cd994f4ab2c2be Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Thu, 18 Jun 2020 20:05:06 +0000
Subject: More complete fix: deal with the case the textvariable is set more
 than once in the validatecommand script.

---
 generic/tkEntry.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/generic/tkEntry.c b/generic/tkEntry.c
index 3f6aa15..5fbff40 100644
--- a/generic/tkEntry.c
+++ b/generic/tkEntry.c
@@ -3293,6 +3293,9 @@ EntryValidateChange(
 
     if (entryPtr->validateCmd == NULL ||
 	entryPtr->validate == VALIDATE_NONE) {
+        if (entryPtr->flags & VALIDATING) {
+            entryPtr->flags |= VALIDATE_ABORT;
+        }
 	return (varValidate ? TCL_ERROR : TCL_OK);
     }
 
-- 
cgit v0.12


From 8ffe639903cda423a32d6f724dd3c54ebf42dced Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 19 Jun 2020 14:56:57 +0000
Subject: Use XK_Oslash in stead of XK_Ooblique, since that's the official X11
 name now.

---
 macosx/tkMacOSXKeysyms.h | 2 +-
 unix/tkUnixKey.c         | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/macosx/tkMacOSXKeysyms.h b/macosx/tkMacOSXKeysyms.h
index 726f318..d84d1b9 100644
--- a/macosx/tkMacOSXKeysyms.h
+++ b/macosx/tkMacOSXKeysyms.h
@@ -293,7 +293,7 @@ const KeysymInfo keysymTable[] = {
     {0x00d5, 0x00d5}, /* Otilde */
     {0x00d6, 0x00d6}, /* Odiaeresis */
     {0x00d7, 0x00d7}, /* multiply */
-    {0x00d8, 0x00d8}, /* Ooblique */
+    {0x00d8, 0x00d8}, /* Oslash */
     {0x00d9, 0x00d9}, /* Ugrave */
     {0x00da, 0x00da}, /* Uacute */
     {0x00db, 0x00db}, /* Ucircumflex */
diff --git a/unix/tkUnixKey.c b/unix/tkUnixKey.c
index 3e41626..f6478ef 100644
--- a/unix/tkUnixKey.c
+++ b/unix/tkUnixKey.c
@@ -376,11 +376,15 @@ TkpGetKeySym(
      * alphabetic, then switch back to the unshifted keysym.
      */
 
+#ifndef XK_Oslash
+    /* XK_Oslash is the official name, but might not be present in older X11 headers */
+#   define XK_Oslash XK_Ooblique
+#endif
     if ((index & 1) && !(eventPtr->xkey.state & ShiftMask)
 	    && (dispPtr->lockUsage == LU_CAPS)) {
 	if (!(((sym >= XK_A) && (sym <= XK_Z))
 		|| ((sym >= XK_Agrave) && (sym <= XK_Odiaeresis))
-		|| ((sym >= XK_Ooblique) && (sym <= XK_Thorn)))) {
+		|| ((sym >= XK_Oslash) && (sym <= XK_Thorn)))) {
 	    index &= ~1;
 	    sym = TkKeycodeToKeysym(dispPtr, eventPtr->xkey.keycode,
 		    0, index);
-- 
cgit v0.12


From e7ddd9810833308150fdfd443a3680e6ec0e7c2e Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Fri, 19 Jun 2020 19:48:04 +0000
Subject: Stick to what is done in Tk, i.e. myvar($w, ...) instead of myvar($w.
 ...)

---
 library/ttk/spinbox.tcl | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/library/ttk/spinbox.tcl b/library/ttk/spinbox.tcl
index d6a8b19..344ee60 100644
--- a/library/ttk/spinbox.tcl
+++ b/library/ttk/spinbox.tcl
@@ -139,23 +139,23 @@ proc ttk::spinbox::Spin {w dir} {
 
     if {[$w instate disabled]} { return }
 
-    if {![info exists State($w.values.length)]} {
-      set State($w.values.index) -1
-      set State($w.values.last) {}
+    if {![info exists State($w,values.length)]} {
+      set State($w,values.index) -1
+      set State($w,values.last) {}
     }
-    set State($w.values) [$w cget -values]
-    set State($w.values.length) [llength $State($w.values)]
+    set State($w,values) [$w cget -values]
+    set State($w,values.length) [llength $State($w,values)]
 
-    if {$State($w.values.length) > 0} {
+    if {$State($w,values.length) > 0} {
         set value [$w get]
-        set current $State($w.values.index)
-        if {$value ne $State($w.values.last)} {
-            set current [lsearch -exact $State($w.values) $value]
+        set current $State($w,values.index)
+        if {$value ne $State($w,values.last)} {
+            set current [lsearch -exact $State($w,values) $value]
         }
-        set State($w.values.index) [Adjust $w [expr {$current + $dir}] 0 \
-                [expr {$State($w.values.length) - 1}]]
-        set State($w.values.last) [lindex $State($w.values) $State($w.values.index)]
-        $w set $State($w.values.last)
+        set State($w,values.index) [Adjust $w [expr {$current + $dir}] 0 \
+                [expr {$State($w,values.length) - 1}]]
+        set State($w,values.last) [lindex $State($w,values) $State($w,values.index)]
+        $w set $State($w,values.last)
     } else {
         if {[catch {
     	    set v [expr {[scan [$w get] %f] + $dir * [$w cget -increment]}]
-- 
cgit v0.12


From 96ed56d2bae8f2f7f1f86a1ff4a9a23c1fc3447c Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 21 Jun 2020 15:54:03 +0000
Subject: Add two new tests, bind-33.20 and bind-33.21, exercising bindings to
 mixed types (Key and Button) events as sent by the keyboard (including the
 KeyRelease event) and mouse. These tests currently fail with TIP #532
 implementation but pass with the old implementation with the event ring.

---
 tests/bind.test | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/tests/bind.test b/tests/bind.test
index 7431079..6ad36f1 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -6691,6 +6691,37 @@ test bind-33.19 {simulate use of the keyboard to trigger a pattern sequence with
 } -cleanup {
     destroy .t.f
 } -result {Esc_Key(2)_Control-c}
+test bind-33.20 {simulate use of the keyboard to trigger a pattern sequence with mixed Key and Button types - bug [16ef161925]} -setup {
+    pack [frame .t.f]
+    focus -force .t.f
+    update
+    set x {}
+} -body {
+    bind .t.f <Key-1><Button-1> { lappend x "1_Button1" }
+    event generate .t.f <Key-1>
+    event generate .t.f <KeyRelease-1>
+    event generate .t.f <Button-1>
+    set x
+} -cleanup {
+    destroy .t.f
+} -result {1_Button1}
+test bind-33.21 {simulate use of the keyboard to trigger a pattern sequence with mixed Key and Button types - bug [16ef161925]} -setup {
+    pack [frame .t.f]
+    focus -force .t.f
+    update
+    set x {}
+} -body {
+    bind .t.f <Key-1><Button-1> { lappend x "1_Button1" }
+    bind .t.f <Key-1><Button-1><Key-2> { lappend x "1_Button1_2" }
+    event generate .t.f <Key-1>
+    event generate .t.f <KeyRelease-1>
+    event generate .t.f <Button-1>
+    event generate .t.f <Key-2>
+    event generate .t.f <KeyRelease-2>
+    set x
+} -cleanup {
+    destroy .t.f
+} -result {1_Button1 1_Button1_2}
 
 test bind-34.1 {-warp works relatively to a window} -setup {
     toplevel .top
-- 
cgit v0.12


From aaa7d8f70f164e1ac922dbf1e32c41e02ae09889 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 21 Jun 2020 16:00:11 +0000
Subject: Let tests bind-33.20 and bind-33.21 pass.

---
 generic/tkBind.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/generic/tkBind.c b/generic/tkBind.c
index dbf8d8f..f3e7c4c 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -2830,8 +2830,11 @@ MatchPatterns(
 		    : VirtPatIsBound(bindPtr, psPtr, object, physPtrPtr)) {
 		TkPattern *patPtr = psPtr->pats + patIndex;
 
-                /* ignore modifier key events */
-                psEntry->keepIt = isModKeyOnly;
+                /* ignore modifier key events, and KeyRelease events if the current event
+                 * is of a different type (e.g. a Button event)
+                 */
+                psEntry->keepIt = isModKeyOnly || \
+                        ((patPtr->eventType != (unsigned) curEvent->xev.type) && curEvent->xev.type == KeyRelease);
 
 		if (patPtr->eventType == (unsigned) curEvent->xev.type
 			&& (curEvent->xev.type != CreateNotify
-- 
cgit v0.12


From 9357ce6b4e373d924cd8a0ef4e25982ab6d6f37c Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 21 Jun 2020 19:22:54 +0000
Subject: Fix [cd051b586a]: MouseWheel documentation in bind.n

---
 doc/bind.n | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/bind.n b/doc/bind.n
index 4bd2be0..f3c3d92 100644
--- a/doc/bind.n
+++ b/doc/bind.n
@@ -201,8 +201,8 @@ substitutions you would make when binding to these events.
 Many contemporary mice support a mouse wheel, which is used
 for scrolling documents without using the scrollbars.  By rolling the
 wheel, the system will generate \fBMouseWheel\fR events that the
-application can use to scroll.  Like \fBKey\fR events the event is
-always routed to the window that currently has focus. When the event
+application can use to scroll.  The event is routed to the
+window currently under the mouse pointer. When the event
 is received you can use the \fB%D\fR substitution to get the
 \fIdelta\fR field for the event, which is a integer value describing how
 the mouse wheel has moved.  The smallest value for which the
-- 
cgit v0.12


From a14c1017e3d7dae43070bf5415698952591bfb85 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Mon, 22 Jun 2020 19:55:42 +0000
Subject: Remove obsolete mention of MouseWheel events being directed to the
 windos having the keyboard focus.

---
 library/ttk/utils.tcl | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/library/ttk/utils.tcl b/library/ttk/utils.tcl
index 857f4cd..101162f 100644
--- a/library/ttk/utils.tcl
+++ b/library/ttk/utils.tcl
@@ -278,9 +278,6 @@ proc ttk::copyBindings {from to} {
 # On OSX, Tk generates sensible values for the %D field in <MouseWheel> events.
 #
 # On Windows, %D must be scaled by a factor of 120.
-# In addition, Tk redirects mousewheel events to the window with
-# keyboard focus instead of sending them to the window under the pointer.
-# We do not attempt to fix that here, see also TIP#171.
 #
 # OSX conventionally uses Shift+MouseWheel for horizontal scrolling,
 # and Option+MouseWheel for accelerated scrolling.
-- 
cgit v0.12


From 55165a174e26d263f04f46f24e9b932df9ddc831 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Mon, 22 Jun 2020 20:18:26 +0000
Subject: Document platform differences in vertical scrolling events. Add
 documentation of horizontal scrolling events, also with platform
 specificities.

---
 doc/bind.n | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/doc/bind.n b/doc/bind.n
index f3c3d92..87940e8 100644
--- a/doc/bind.n
+++ b/doc/bind.n
@@ -204,11 +204,24 @@ wheel, the system will generate \fBMouseWheel\fR events that the
 application can use to scroll.  The event is routed to the
 window currently under the mouse pointer. When the event
 is received you can use the \fB%D\fR substitution to get the
-\fIdelta\fR field for the event, which is a integer value describing how
+\fIdelta\fR field for the event, which is an integer value describing how
 the mouse wheel has moved.  The smallest value for which the
-system will report is defined by the OS. The sign of the
+system will report is defined by the OS.  The sign of the
 value determines which direction your widget should scroll.  Positive
 values should scroll up and negative values should scroll down.
+.RS
+.PP
+Horizontal scrolling uses \fBShift-MouseWheel\fR events, with positive
+\fB%D\fR \fIdelta\fR substitution indicating left scrolling and negative
+right scrolling.
+Only Windows and macOS Aqua typically fire \fBMouseWheel\fR and
+\fBShift-MouseWheel\fR events.  On
+X11 vertical scrolling is rather supported through \fBButton-4\fR and
+\fBButton-5\fR events, and horizontal scrolling through \fBShift-Button-4\fR
+and \fBShift-Button-5\fR events.  Horizontal scrolling events may fire from
+many different hardware units such as tilt wheels or touchpads.  Horizontal
+scrolling can also be emulated by holding Shift and scrolling vertically.
+.RE
 .IP "\fBKeyPress\fR, \fBKeyRelease\fR" 5
 The \fBKeyPress\fR and \fBKeyRelease\fR events are generated
 whenever a key is pressed or released.  \fBKeyPress\fR and \fBKeyRelease\fR
-- 
cgit v0.12


From c1617bb90af0cb596871fea41ebc5f36ea1ea89b Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 23 Jun 2020 15:24:13 +0000
Subject: Fix [fc59158961]: Segfault when .text configure

---
 generic/tkText.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tkText.c b/generic/tkText.c
index 3cc901c..119f229 100644
--- a/generic/tkText.c
+++ b/generic/tkText.c
@@ -6787,7 +6787,7 @@ GetLineStartEnd(
     (void)dummy;
     (void)tkwin;
 
-    if ((internalOffset == TCL_INDEX_NONE) || (recordPtr == NULL)) {
+    if (linePtr == NULL) {
 	return Tcl_NewObj();
     }
     return Tcl_NewWideIntObj(1 + TkBTreeLinesTo(NULL, linePtr));
-- 
cgit v0.12


From f11d46a5391bad92ada8f86f1dac44e43f359c28 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 25 Jun 2020 08:57:29 +0000
Subject: Fix [https://core.tcl-lang.org/tcl/info/9080d6a871|9080d6a871]: Build
 fix for tcl on macOS on Apple Silicon. Add manifest.uuid to distribution, so
 we can see exactly what commit-id "make dist" is built from (even when it's
 built from GIT).

---
 .fossil-settings/manifest |  1 +
 .gitattributes            | 39 +++++++++++++++++++++++++++++++
 .gitignore                | 59 +++++++++++++++++++++++++++++++++++++++++++++++
 unix/Makefile.in          |  7 +++++-
 unix/configure            |  1 +
 unix/tcl.m4               |  6 ++++-
 6 files changed, 111 insertions(+), 2 deletions(-)
 create mode 100644 .fossil-settings/manifest
 create mode 100644 .gitattributes
 create mode 100644 .gitignore

diff --git a/.fossil-settings/manifest b/.fossil-settings/manifest
new file mode 100644
index 0000000..4ae8ef0
--- /dev/null
+++ b/.fossil-settings/manifest
@@ -0,0 +1 @@
+u
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..e9a67c8
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,39 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* eol=lf
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.3 text
+*.c text
+*.css text
+*.enc text
+*.h text
+*.htm text
+*.html text
+*.java text
+*.js text
+*.json text
+*.n text
+*.svg text
+*.ts text
+*.tcl text
+*.test text
+
+# Declare files that will always have CRLF line endings on checkout.
+*.bat eol=crlf
+*.sln eol=crlf
+*.vc eol=crlf
+
+# Denote all files that are truly binary and should not be modified.
+*.a binary
+*.dll binary
+*.exe binary
+*.gif binary
+*.gz binary
+*.jpg binary
+*.lib binary
+*.pdf binary
+*.png binary
+*.xlsx binary
+*.zip binary
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9f57b81
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,59 @@
+*.a
+*.bundle
+*.dll
+*.dylib
+*.exe
+*.exp
+*.lib
+*.o
+*.obj
+*.pdb
+*.res
+*.sl
+*.so
+.fslckout
+Makefile
+Tk-Info.plist
+autom4te.cache
+config.cache
+config.log
+config.status
+config.status.lineno
+html
+manifest.uuid
+_FOSSIL_
+*/tkConfig.sh
+*/wish*
+*/tktest*
+*/versions.vc
+*/version.vc
+*/libtcl.vfs
+*/libtcl_*.zip
+libtommath/bn.ilg
+libtommath/bn.ind
+libtommath/pretty.build
+libtommath/tommath.src
+libtommath/*.log
+libtommath/*.pdf
+libtommath/*.pl
+libtommath/*.sh
+libtommath/doc/*
+libtommath/tombc/*
+libtommath/pre_gen/*
+libtommath/pics/*
+libtommath/mtest/*
+libtommath/logs/*
+libtommath/etc/*
+libtommath/demo/*
+libtommath/*.out
+libtommath/*.tex
+macosx/configure
+unix/autoMkindex.tcl
+unix/dltest.marker
+unix/tk.pc
+unix/tclIndex
+win/Debug*
+win/Release*
+win/*.manifest
+win/nmhlp-out.txt
+win/nmakehlp.out
diff --git a/unix/Makefile.in b/unix/Makefile.in
index c917516..c1301e7 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -1504,9 +1504,14 @@ $(MAC_OSX_DIR)/configure: $(MAC_OSX_DIR)/configure.ac $(UNIX_DIR)/configure
 $(UNIX_DIR)/tkConfig.h.in: $(MAC_OSX_DIR)/configure
 	cd $(MAC_OSX_DIR); autoheader; touch $@
 
-dist:   $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(MAC_OSX_DIR)/configure $(TOP_DIR)/doc/man.macros genstubs
+$(TOP_DIR)/manifest.uuid:
+	printf "git." >$(TOP_DIR)/manifest.uuid
+	git rev-parse HEAD >>$(TOP_DIR)/manifest.uuid
+
+dist:   $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(MAC_OSX_DIR)/configure $(TOP_DIR)/doc/man.macros $(TOP_DIR)/manifest.uuid genstubs
 	rm -rf $(DISTDIR)
 	mkdir -p $(DISTDIR)/unix
+	cp -p $(TOP_DIR)/manifest.uuid $(DISTDIR)
 	cp -p $(UNIX_DIR)/*.c $(UNIX_DIR)/*.h $(DISTDIR)/unix
 	cp $(TOP_DIR)/license.terms $(UNIX_DIR)/Makefile.in $(DISTDIR)/unix
 	chmod 664 $(DISTDIR)/unix/Makefile.in
diff --git a/unix/configure b/unix/configure
index c5c8f67..4a68870 100755
--- a/unix/configure
+++ b/unix/configure
@@ -8843,6 +8843,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+		#include <stdlib.h>
 		extern double strtod();
 		int main() {
 		    char *infString="Inf", *nanString="NaN", *spaceString=" ";
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 399215e..f4a3b8a 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -2596,6 +2596,7 @@ AC_DEFUN([SC_BUGGY_STRTOD], [
     if test "$tcl_strtod" = 1; then
 	AC_CACHE_CHECK([for Solaris2.4/Tru64 strtod bugs], tcl_cv_strtod_buggy,[
 	    AC_TRY_RUN([
+		#include <stdlib.h>
 		extern double strtod();
 		int main() {
 		    char *infString="Inf", *nanString="NaN", *spaceString=" ";
@@ -2882,7 +2883,10 @@ AC_DEFUN([SC_TCL_CHECK_BROKEN_FUNC],[
     AC_CHECK_FUNC($1, tcl_ok=1, tcl_ok=0)
     if test ["$tcl_ok"] = 1; then
 	AC_CACHE_CHECK([proper ]$1[ implementation], [tcl_cv_]$1[_unbroken],
-	    AC_TRY_RUN([[int main() {]$2[}]],[tcl_cv_]$1[_unbroken]=ok,
+	    AC_TRY_RUN([[
+#include <stdlib.h>
+#include <string.h>
+int main() {]$2[}]],[tcl_cv_]$1[_unbroken]=ok,
 		[tcl_cv_]$1[_unbroken]=broken,[tcl_cv_]$1[_unbroken]=unknown))
 	if test ["$tcl_cv_]$1[_unbroken"] = "ok"; then
 	    tcl_ok=1
-- 
cgit v0.12


From dc7625ccd3a00dba6a55b37c190b2cae3b58ea4f Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 25 Jun 2020 10:17:53 +0000
Subject: Additional entries in fossil's ignore-glob

---
 .fossil-settings/ignore-glob | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.fossil-settings/ignore-glob b/.fossil-settings/ignore-glob
index 4dad6fc..28ede72 100644
--- a/.fossil-settings/ignore-glob
+++ b/.fossil-settings/ignore-glob
@@ -3,7 +3,9 @@
 *.dylib
 *.exe
 *.exp
+*.la
 *.lib
+*.lo
 *.o
 *.obj
 *.pdb
@@ -11,6 +13,7 @@
 *.sl
 *.so
 */Makefile
+*/autom4te.cache
 */config.cache
 */config.log
 */config.status
@@ -21,6 +24,7 @@
 doc/man.macros
 win/Debug*
 win/Release*
+win/*.manifest
 win/nmhlp-out.txt
 win/nmakehlp.out
 unix/tk.pc
-- 
cgit v0.12


From 89f5a6802f0e3aa56d0f612913683dc432646bd0 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Thu, 25 Jun 2020 21:12:33 +0000
Subject: Aqua: replace [NSApp macMinorVersion] by [NSApp macOSVersion] event
 though the Big Sur (11.1) beta release identifies itself as 10.16.

---
 macosx/tkMacOSXButton.c      |  4 ++--
 macosx/tkMacOSXColor.c       | 12 ++++++------
 macosx/tkMacOSXDialog.c      |  2 +-
 macosx/tkMacOSXInit.c        | 10 +++++++---
 macosx/tkMacOSXMenus.c       |  2 +-
 macosx/tkMacOSXMouseEvent.c  |  2 +-
 macosx/tkMacOSXPrivate.h     |  4 ++--
 macosx/tkMacOSXScrlbr.c      |  4 ++--
 macosx/tkMacOSXTest.c        |  2 +-
 macosx/tkMacOSXWindowEvent.c |  2 +-
 macosx/tkMacOSXWm.c          | 12 ++++++------
 macosx/ttkMacOSXTheme.c      | 32 ++++++++++++++++----------------
 12 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/macosx/tkMacOSXButton.c b/macosx/tkMacOSXButton.c
index 721dd03..5aa8f7d 100644
--- a/macosx/tkMacOSXButton.c
+++ b/macosx/tkMacOSXButton.c
@@ -397,7 +397,7 @@ TkpComputeButtonGeometry(
 
     width += butPtr->inset*2;
     height += butPtr->inset*2;
-    if ([NSApp macMinorVersion] == 6) {
+    if ([NSApp macOSVersion] == 100600) {
 	width += 12;
     }
     if (mbPtr->btnkind == kThemePushButton) {
@@ -1052,7 +1052,7 @@ TkMacOSXComputeButtonParams(
 	 * the button periodically.
 	 */
 
-        if (!mbPtr->defaultPulseHandler && ([NSApp macMinorVersion] <= 9)) {
+        if (!mbPtr->defaultPulseHandler && ([NSApp macOSVersion] <= 100900)) {
             mbPtr->defaultPulseHandler = Tcl_CreateTimerHandler(
                     PULSE_TIMER_MSECS, PulseDefaultButtonProc, butPtr);
         }
diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index 7694b1d..5b59b58 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -308,7 +308,7 @@ SetCGColorComponents(
 	 * windowBackGroundColor.
 	 */
 
-	if ([NSApp macMinorVersion] < 14) {
+	if ([NSApp macOSVersion] < 101400) {
 	    for (int i=0; i<3; i++) {
 		rgba[i] = windowBackground[i];
 	    }
@@ -335,7 +335,7 @@ SetCGColorComponents(
 	    color = [[NSColor selectedTextColor] colorUsingColorSpace:sRGB];
 	    break;
 	case 2:
-	    if ([NSApp macMinorVersion] > 9) {
+	    if ([NSApp macOSVersion] > 100900) {
 #if MAC_OS_X_VERSION_MAX_ALLOWED > 1090
 		color = [[NSColor labelColor] colorUsingColorSpace:sRGB];
 #endif
@@ -351,7 +351,7 @@ SetCGColorComponents(
 			colorUsingColorSpace:sRGB];
 	    break;
 	case 5:
-	    if ([NSApp macMinorVersion] > 6) {
+	    if ([NSApp macOSVersion] > 100600) {
 		color = [[NSColor whiteColor] colorUsingColorSpace:sRGB];
 	    } else {
 		color = [[NSColor blackColor] colorUsingColorSpace:sRGB];
@@ -378,7 +378,7 @@ SetCGColorComponents(
 	    }
 	    break;
 	case 9:
-	    if ([NSApp macMinorVersion] >= 10) {
+	    if ([NSApp macOSVersion] >= 101000) {
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
 		color = [[NSColor linkColor] colorUsingColorSpace:sRGB];
 #endif
@@ -387,7 +387,7 @@ SetCGColorComponents(
 	    }
 	    break;
 	default:
-	    if ([NSApp macMinorVersion] >= 10) {
+	    if ([NSApp macOSVersion] >= 101000) {
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
 		color = [[NSColor labelColor] colorUsingColorSpace:sRGB];
 #endif
@@ -442,7 +442,7 @@ TkMacOSXInDarkMode(Tk_Window tkwin)
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
     static NSAppearanceName darkAqua = @"NSAppearanceNameDarkAqua";
 
-    if ([NSApp macMinorVersion] >= 14) {
+    if ([NSApp macOSVersion] >= 101400) {
         TkWindow *winPtr = (TkWindow*) tkwin;
 	NSView *view = nil;
 	if (winPtr && winPtr->privatePtr) {
diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c
index 76bb742..ceaa2ac 100644
--- a/macosx/tkMacOSXDialog.c
+++ b/macosx/tkMacOSXDialog.c
@@ -725,7 +725,7 @@ Tk_GetOpenFileObjCmd(
 	 * panel.  Prepend the title to the message in this case.
 	 */
 
-	if ([NSApp macMinorVersion] > 10) {
+	if ([NSApp macOSVersion] > 101000) {
 	    if (message) {
 		NSString *fullmessage =
 		    [[NSString alloc] initWithFormat:@"%@\n%@", title, message];
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index e806b24..ab5b2ec 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -32,7 +32,7 @@ static char scriptPath[PATH_MAX + 1] = "";
 
 @implementation TKApplication
 @synthesize poolLock = _poolLock;
-@synthesize macMinorVersion = _macMinorVersion;
+@synthesize macOSVersion = _macOSVersion;
 @synthesize isDrawing = _isDrawing;
 @end
 
@@ -154,15 +154,19 @@ static char scriptPath[PATH_MAX + 1] = "";
     /*
      * Record the OS version we are running on.
      */
-    int minorVersion;
+
+    int minorVersion, majorVersion;
 #if MAC_OS_X_VERSION_MAX_ALLOWED < 101000
     Gestalt(gestaltSystemVersionMinor, (SInt32*)&minorVersion);
+    majorVersion = 10;
 #else
     NSOperatingSystemVersion systemVersion;
     systemVersion = [[NSProcessInfo processInfo] operatingSystemVersion];
+    majorVersion = systemVersion.majorVersion;
     minorVersion = systemVersion.minorVersion;
 #endif
-    [NSApp setMacMinorVersion: minorVersion];
+    printf("Major: %d; Minor: %d\n", majorVersion, minorVersion);
+    [NSApp setMacOSVersion: 10000*majorVersion + 100*minorVersion];
 
     /*
      * We are not drawing right now.
diff --git a/macosx/tkMacOSXMenus.c b/macosx/tkMacOSXMenus.c
index 1c033a4..9b85e7a 100644
--- a/macosx/tkMacOSXMenus.c
+++ b/macosx/tkMacOSXMenus.c
@@ -112,7 +112,7 @@ static Tcl_Obj *	GetWidgetDemoPath(Tcl_Interp *interp);
      * On OS X 10.12 we get duplicate tab control items if we create them here.
      */
 
-    if ([NSApp macMinorVersion] > 12) {
+    if ([NSApp macOSVersion] > 101200) {
 	_defaultWindowsMenuItems = [_defaultWindowsMenuItems
 	     arrayByAddingObjectsFromArray:
 	     [NSArray arrayWithObjects:
diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index 435caf9..e457a96 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -105,7 +105,7 @@ enum {
 
 	if (eventType == NSLeftMouseDown &&
 	    ([eventWindow styleMask] & NSResizableWindowMask) &&
-	    [NSApp macMinorVersion] > 6) {
+	    [NSApp macOSVersion] > 100600) {
 	    NSRect frame = [eventWindow frame];
 	    if (local.x < 3 || local.x > frame.size.width - 3 || local.y < 3) {
 		return theEvent;
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h
index be69fcd..1266c8b 100644
--- a/macosx/tkMacOSXPrivate.h
+++ b/macosx/tkMacOSXPrivate.h
@@ -340,12 +340,12 @@ VISIBILITY_HIDDEN
 #ifdef __i386__
     /* The Objective C runtime used on i386 requires this. */
     int _poolLock;
-    int _macMinorVersion;
+    int _macOSVersion;  /* 10000 * major + 100*minor */
     Bool _isDrawing;
 #endif
 }
 @property int poolLock;
-@property int macMinorVersion;
+@property int macOSVersion;
 @property Bool isDrawing;
 
 @end
diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c
index dff6cc9..8bf2998 100644
--- a/macosx/tkMacOSXScrlbr.c
+++ b/macosx/tkMacOSXScrlbr.c
@@ -316,7 +316,7 @@ TkpDisplayScrollbar(
     if (SNOW_LEOPARD_STYLE) {
 	HIThemeDrawTrack(&msPtr->info, 0, dc.context,
 			 kHIThemeOrientationInverted);
-    } else if ([NSApp macMinorVersion] <= 8) {
+    } else if ([NSApp macOSVersion] <= 100800) {
 	HIThemeDrawTrack(&msPtr->info, 0, dc.context,
 			 kHIThemeOrientationNormal);
     } else {
@@ -377,7 +377,7 @@ TkpComputeScrollbarGeometry(
 	scrollPtr->highlightWidth = 0;
     }
     scrollPtr->inset = scrollPtr->highlightWidth + scrollPtr->borderWidth;
-    if ([NSApp macMinorVersion] == 6) {
+    if ([NSApp macOSVersion] == 100600) {
 	scrollPtr->arrowLength = scrollPtr->width;
     } else {
 	scrollPtr->arrowLength = 0;
diff --git a/macosx/tkMacOSXTest.c b/macosx/tkMacOSXTest.c
index 0a739a1..a5d1d83 100644
--- a/macosx/tkMacOSXTest.c
+++ b/macosx/tkMacOSXTest.c
@@ -119,7 +119,7 @@ DebuggerObjCmd(
  */
 MODULE_SCOPE Bool
 TkTestLogDisplay(void) {
-    if ([NSApp macMinorVersion] >= 14) {
+    if ([NSApp macOSVersion] >= 101400) {
 	return [NSApp isDrawing];
     } else {
 	return ![NSApp isDrawing];
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index ee49541..61b647e 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -966,7 +966,7 @@ RedisplayView(
      */
 
     if ([NSApp isDrawing]) {
-	if ([NSApp macMinorVersion] > 13) {
+	if ([NSApp macOSVersion] > 101300) {
 	    TKLog(@"WARNING: a recursive call to drawRect was aborted.");
 	}
 	return;
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index cab2b9a..d7df594 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -5585,7 +5585,7 @@ TkUnsupported1ObjCmd(
 	}
 	return WmWinStyle(interp, winPtr, objc, objv);
     case TKMWS_TABID:
-	if ([NSApp macMinorVersion] < 12) {
+	if ([NSApp macOSVersion] < 101200) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
                 "Tabbing identifiers did not exist until OSX 10.12.", -1));
 	    Tcl_SetErrorCode(interp, "TK", "WINDOWSTYLE", "TABBINGID", NULL);
@@ -5597,7 +5597,7 @@ TkUnsupported1ObjCmd(
 	}
 	return WmWinTabbingId(interp, winPtr, objc, objv);
     case TKMWS_APPEARANCE:
-	if ([NSApp macMinorVersion] < 9) {
+	if ([NSApp macOSVersion] < 100900) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
                 "Window appearances did not exist until OSX 10.9.", -1));
 	    Tcl_SetErrorCode(interp, "TK", "WINDOWSTYLE", "APPEARANCE", NULL);
@@ -5607,7 +5607,7 @@ TkUnsupported1ObjCmd(
 	    Tcl_WrongNumArgs(interp, 2, objv, "window ?appearancename?");
 	    return TCL_ERROR;
 	}
-	if (objc == 4 && [NSApp macMinorVersion] < 14) {
+	if (objc == 4 && [NSApp macOSVersion] < 101400) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "Window appearances cannot be changed before OSX 10.14.",
 		    -1));
@@ -6886,7 +6886,7 @@ ApplyWindowAttributeFlagChanges(
 		     * window. To work around this we make the max size equal
 		     * to the screen size.  (For 10.11 and up, only)
 		     */
-		    if ([NSApp macMinorVersion] > 10) {
+		    if ([NSApp macOSVersion] > 101000) {
 			[macWindow setMaxFullScreenContentSize:screenSize];
 		    }
 		}
@@ -6970,7 +6970,7 @@ ApplyMasterOverrideChanges(
 	    wmPtr->attributes = macClassAttrs[kSimpleWindowClass].defaultAttrs;
 	}
 	wmPtr->attributes |= kWindowNoActivatesAttribute;
-	if ([NSApp macMinorVersion] == 6) {
+	if ([NSApp macOSVersion] == 100600) {
 	    styleMask = 0;
 	} else {
 	    styleMask &= ~NSTitledWindowMask;
@@ -6983,7 +6983,7 @@ ApplyMasterOverrideChanges(
 		    macClassAttrs[kDocumentWindowClass].defaultAttrs;
 	}
 	wmPtr->attributes &= ~kWindowNoActivatesAttribute;
-	if ([NSApp macMinorVersion] == 6) {
+	if ([NSApp macOSVersion] == 100600) {
 	    styleMask = NSTitledWindowMask         |
 		        NSClosableWindowMask       |
 		        NSMiniaturizableWindowMask |
diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c
index 7e8377e..f1b7b8e 100644
--- a/macosx/ttkMacOSXTheme.c
+++ b/macosx/ttkMacOSXTheme.c
@@ -269,7 +269,7 @@ static void GetBackgroundColor(
 	    rgba[i] = masterPtr->privatePtr->fillRGBA[i];
 	}
     } else {
-	if ([NSApp macMinorVersion] > 13) {
+	if ([NSApp macOSVersion] > 101300) {
 	    NSColorSpace *deviceRGB = [NSColorSpace deviceRGBColorSpace];
 	    NSColor *windowColor = [[NSColor windowBackgroundColor]
 		colorUsingColorSpace: deviceRGB];
@@ -1409,7 +1409,7 @@ static void ButtonElementDraw(
     } else if (info.kind == kThemePushButton &&
 	       (state & TTK_STATE_PRESSED)) {
 	bounds.size.height += 2;
-	if ([NSApp macMinorVersion] > 8) {
+	if ([NSApp macOSVersion] > 100800) {
 	    GradientFillRoundedRectangle(dc.context, bounds, 4,
 					 pressedPushButtonGradient, 2);
 	}
@@ -1603,7 +1603,7 @@ static void PaneElementDraw(
     bounds.origin.y -= kThemeMetricTabFrameOverlap;
     bounds.size.height += kThemeMetricTabFrameOverlap;
     BEGIN_DRAWING(d)
-    if ([NSApp macMinorVersion] > 8) {
+    if ([NSApp macOSVersion] > 100800) {
 	DrawGroupBox(bounds, dc.context, tkwin);
     } else {
 	HIThemeTabPaneDrawInfo info = {
@@ -1662,7 +1662,7 @@ static void GroupElementDraw(
     CGRect bounds = BoxToRect(d, b);
 
     BEGIN_DRAWING(d)
-    if ([NSApp macMinorVersion] > 8) {
+    if ([NSApp macOSVersion] > 100800) {
 	DrawGroupBox(bounds, dc.context, tkwin);
     } else {
 	const HIThemeGroupBoxDrawInfo info = {
@@ -1785,7 +1785,7 @@ static void EntryElementDraw(
 	}
 	BEGIN_DRAWING(d)
 	if (backgroundPtr == NULL) {
-	    if ([NSApp macMinorVersion] > 8) {
+	    if ([NSApp macOSVersion] > 100800) {
 		background = [NSColor textBackgroundColor];
 		CGContextSetFillColorWithColor(dc.context, CGCOLOR(background));
 	    } else {
@@ -1863,7 +1863,7 @@ static void ComboboxElementDraw(
     if (TkMacOSXInDarkMode(tkwin)) {
 	bounds.size.height += 1;
 	DrawDarkButton(bounds, info.kind, state, dc.context);
-    } else if ([NSApp macMinorVersion] > 8) {
+    } else if ([NSApp macOSVersion] > 100800) {
 	if ((state & TTK_STATE_BACKGROUND) &&
 	    !(state & TTK_STATE_DISABLED)) {
 	    NSColor *background = [NSColor textBackgroundColor];
@@ -2309,12 +2309,12 @@ static void TroughElementSize(
     ChkErr(GetThemeMetric, kThemeMetricScrollBarWidth, &thickness);
     if (orientation == TTK_ORIENT_HORIZONTAL) {
 	*minHeight = thickness;
-	if ([NSApp macMinorVersion] > 7) {
+	if ([NSApp macOSVersion] > 100700) {
 	    *paddingPtr = Ttk_MakePadding(4, 4, 4, 3);
 	}
     } else {
 	*minWidth = thickness;
-	if ([NSApp macMinorVersion] > 7) {
+	if ([NSApp macOSVersion] > 100700) {
 	    *paddingPtr = Ttk_MakePadding(4, 4, 3, 4);
 	}
     }
@@ -2359,7 +2359,7 @@ static void TroughElementDraw(
 	components: rgba
 	count: 4];
     BEGIN_DRAWING(d)
-    if ([NSApp macMinorVersion] > 8) {
+    if ([NSApp macOSVersion] > 100800) {
 	CGContextSetFillColorWithColor(dc.context, CGCOLOR(troughColor));
     } else {
 	ChkErr(HIThemeSetFill, kThemeBrushDocumentWindowBackground, NULL,
@@ -2422,7 +2422,7 @@ static void ThumbElementDraw(
      * draw the thumb directly.
      */
 
-    if ([NSApp macMinorVersion] > 8) {
+    if ([NSApp macOSVersion] > 100800) {
 	CGRect thumbBounds = BoxToRect(d, b);
 	NSColorSpace *deviceRGB = [NSColorSpace deviceRGBColorSpace];
 	NSColor *thumbColor;
@@ -2482,7 +2482,7 @@ static void ThumbElementDraw(
 	visibleSize = (thumbSize / trackSize) * factor;
 	info.max = factor - visibleSize;
 	info.trackInfo.scrollbar.viewsize = visibleSize;
-	if ([NSApp macMinorVersion] < 8 ||
+	if ([NSApp macOSVersion] < 100800 ||
 	    orientation == TTK_ORIENT_HORIZONTAL) {
 	    info.value = factor * fraction;
 	} else {
@@ -2520,7 +2520,7 @@ static void ArrowElementSize(
     int *minHeight,
     Ttk_Padding *paddingPtr)
 {
-    if ([NSApp macMinorVersion] < 8) {
+    if ([NSApp macOSVersion] < 100800) {
 	*minHeight = *minWidth = 14;
     } else {
 	*minHeight = *minWidth = -1;
@@ -2704,7 +2704,7 @@ static void FillElementDraw(
 {
     CGRect bounds = BoxToRect(d, b);
 
-    if ([NSApp macMinorVersion] > 8) {
+    if ([NSApp macOSVersion] > 100800) {
 	NSColorSpace *deviceRGB = [NSColorSpace deviceRGBColorSpace];
 	NSColor *bgColor;
 	CGFloat fill[4];
@@ -2876,7 +2876,7 @@ static void TreeAreaElementSize (
      * widget expects the heading to be the same height as a row.
      */
 
-    if ([NSApp macMinorVersion] > 8) {
+    if ([NSApp macOSVersion] > 100800) {
 	paddingPtr->top = 4;
     }
 }
@@ -2896,7 +2896,7 @@ static void TreeHeaderElementSize(
     int *minHeight,
     Ttk_Padding *paddingPtr)
 {
-    if ([NSApp macMinorVersion] > 8) {
+    if ([NSApp macOSVersion] > 100800) {
 	*minHeight = 24;
     } else {
 	ButtonElementSize(clientData, elementRecord, tkwin, minWidth,
@@ -2923,7 +2923,7 @@ static void TreeHeaderElementDraw(
     };
 
     BEGIN_DRAWING(d)
-    if ([NSApp macMinorVersion] > 8) {
+    if ([NSApp macOSVersion] > 100800) {
 
         /*
          * Compensate for the padding added in TreeHeaderElementSize, so
-- 
cgit v0.12


From daa15c7216592a0e0182b38929994cecf60f0ba8 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 26 Jun 2020 11:21:18 +0000
Subject: Remove left-over debugging printf

---
 macosx/tkMacOSXInit.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index ab5b2ec..e75a63c 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -165,7 +165,6 @@ static char scriptPath[PATH_MAX + 1] = "";
     majorVersion = systemVersion.majorVersion;
     minorVersion = systemVersion.minorVersion;
 #endif
-    printf("Major: %d; Minor: %d\n", majorVersion, minorVersion);
     [NSApp setMacOSVersion: 10000*majorVersion + 100*minorVersion];
 
     /*
-- 
cgit v0.12


From 591345a39ec99ca64be83fc071f001dd884a33f2 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 26 Jun 2020 13:33:05 +0000
Subject: Add "make dist" target to Travis build, as regression test. This
 should continue to work.

---
 .travis.yml         | 26 +++++++++++++++++++++++++-
 unix/Makefile.in    |  8 ++++----
 unix/installManPage | 14 +++++++-------
 3 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2d2842e..07de1b5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -120,24 +120,37 @@ matrix:
       env:
         - BUILD_DIR=unix
         - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include"
+      install:
+        - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1)
+      script: &mactest
+        - make binaries libraries tktest
     - name: "macOS/Xcode 11.5/Static"
       os: osx
       osx_image: xcode11.5
       env:
         - BUILD_DIR=unix
         - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua --disable-shared CFLAGS=-I/usr/local/opt/tcl-tk/include"
+      install:
+        - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1)
+      script: *mactest
     - name: "macOS/Xcode 11.5/Debug"
       os: osx
       osx_image: xcode11.5
       env:
         - BUILD_DIR=unix
         - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua --enable-symbols CFLAGS=-I/usr/local/opt/tcl-tk/include"
+      install:
+        - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1)
+      script: *mactest
     - name: "macOS/Xcode 11.5/Shared/XQuartz"
       os: osx
       osx_image: xcode11.5
       env:
         - BUILD_DIR=unix
         - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --disable-corefoundation --x-includes=/opt/X11/include --x-libraries=/opt/X11/lib CFLAGS=-I/usr/local/opt/tcl-tk/include"
+      install:
+        - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1)
+      script: *mactest
 # Older MacOS versions
     - name: "macOS/Xcode 11/Shared"
       os: osx
@@ -145,18 +158,27 @@ matrix:
       env:
         - BUILD_DIR=unix
         - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.14"
+      install:
+        - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1)
+      script: *mactest
     - name: "macOS/Xcode 10/Shared"
       os: osx
       osx_image: xcode10.3
       env:
         - BUILD_DIR=unix
         - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.14"
+      install:
+        - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1)
+      script: *mactest
     - name: "macOS/Xcode 9/Shared"
       os: osx
       osx_image: xcode9.4
       env:
         - BUILD_DIR=unix
         - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.13"
+      install:
+        - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1)
+      script: *mactest
 # Test on Windows with MSVC native
 #   - name: "Windows/MSVC/Shared"
 #     os: windows
@@ -179,11 +201,13 @@ before_install:
       esac
   - cd ${BUILD_DIR}
 install:
-  - ./configure ${CFGOPT} --prefix=$HOME || (cat config.log && exit 1)
+  - mkdir "$HOME/install dir"
+  - ./configure ${CFGOPT} "--prefix=$HOME/install dir" || (cat config.log && exit 1)
 before_script:
   - export ERROR_ON_FAILURES=1
 script:
   - make binaries libraries tktest
+  - make install
 cache:
   directories:
   - $HOME/AppData/Local/Temp/chocolatey
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 8bda152..4e5db6d 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -762,8 +762,8 @@ install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) ${WISH_EXE}
 	fi
 	@EXTRA_INSTALL_BINARIES@
 	@echo "Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/"
-	@$(INSTALL_DATA_DIR) $(LIB_INSTALL_DIR)/pkgconfig
-	@$(INSTALL_DATA) tk.pc $(LIB_INSTALL_DIR)/pkgconfig/tk.pc
+	@$(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)/pkgconfig"
+	@$(INSTALL_DATA) tk.pc "$(LIB_INSTALL_DIR)/pkgconfig/tk.pc"
 
 install-libraries: libraries
 	@for i in "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)/images" \
@@ -1206,7 +1206,7 @@ tkUnixRFont.o: $(UNIX_DIR)/tkUnixRFont.c
 	$(CC) -c $(CC_SWITCHES) $(XFT_CFLAGS) $(UNIX_DIR)/tkUnixRFont.c
 
 tkUnixInit.o: $(UNIX_DIR)/tkUnixInit.c tkConfig.sh
-	$(CC) -c $(CC_SWITCHES) -DTK_LIBRARY=\"${TK_LIBRARY}\" \
+	$(CC) -c $(CC_SWITCHES) \
 	    $(UNIX_DIR)/tkUnixInit.c
 
 tkUnixKey.o: $(UNIX_DIR)/tkUnixKey.c
@@ -1282,7 +1282,7 @@ tkMacOSXImage.o: $(MAC_OSX_DIR)/tkMacOSXImage.c
 	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXImage.c
 
 tkMacOSXInit.o: $(MAC_OSX_DIR)/tkMacOSXInit.c tkConfig.sh
-	$(CC) -c $(CC_SWITCHES) -DTK_LIBRARY=\"${TK_LIBRARY}\" \
+	$(CC) -c $(CC_SWITCHES) \
 	    $(MAC_OSX_DIR)/tkMacOSXInit.c
 
 tkMacOSXKeyboard.o: $(MAC_OSX_DIR)/tkMacOSXKeyboard.c
diff --git a/unix/installManPage b/unix/installManPage
index 935bbcd..00c6cc5 100755
--- a/unix/installManPage
+++ b/unix/installManPage
@@ -43,7 +43,7 @@ if test -f $ManPage ; then : ; else
     echo "source manual page file must exist"
     exit 1
 fi
-if test -d $Dir ; then : ; else
+if test -d "$Dir" ; then : ; else
     echo "target directory must exist"
     exit 1
 fi
@@ -99,7 +99,7 @@ SrcDir=`dirname $ManPage`
 ### Process Page to Create Target Pages
 ###
 
-Specials="FindPhoto FontId MeasureChar"
+Specials="DString Thread Notifier RegExp library packagens pkgMkIndex safesock FindPhoto FontId MeasureChar"
 for n in $Specials; do
     if [ "$Name" = "$n" ] ; then
 	Names="$n $Names"
@@ -109,15 +109,15 @@ done
 First=""
 for Target in $Names; do
     Target=$Target.$Section$Suffix
-    rm -f $Dir/$Target $Dir/$Target.*
+    rm -f "$Dir/$Target" "$Dir/$Target.*"
     if test -z "$First" ; then
 	First=$Target
 	sed -e "/man\.macros/r $SrcDir/man.macros" -e "/man\.macros/d" \
-	    $ManPage > $Dir/$First
-	chmod 644 $Dir/$First
-	$Gzip $Dir/$First
+	    $ManPage > "$Dir/$First"
+	chmod 644 "$Dir/$First"
+	$Gzip "$Dir/$First"
     else
-	ln $SymOrLoc$First$Gz $Dir/$Target$Gz
+	ln "$SymOrLoc$First$Gz" "$Dir/$Target$Gz"
     fi
 done
 
-- 
cgit v0.12


From 2f293a5160de209c563b72b6466efea890f0fd15 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 29 Jun 2020 08:15:56 +0000
Subject: Workaround for missing "man.macros" in Travis' Tcl installation

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index c3a951c..3092b83 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -200,6 +200,7 @@ matrix:
       env:
         - BUILD_DIR=unix
       script:
+        - touch ../doc/man.macros
         - make dist
 before_install:
   - |-
-- 
cgit v0.12


From 7f6f8a4c12e2bdd95b3de313a9fa8e179518631a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 29 Jun 2020 08:21:25 +0000
Subject: Make Travis build labels the same as Tcl

---
 .travis.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3092b83..29a66d8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -114,7 +114,7 @@ matrix:
         - BUILD_DIR=unix
         - CFGOPT="--enable-symbols"
 # Testing on Mac, various styles
-    - name: "macOS/Xcode 11.5/Shared"
+    - name: "macOS/Clang/Xcode 11.5/Shared"
       os: osx
       osx_image: xcode11.5
       env:
@@ -124,7 +124,7 @@ matrix:
         - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1)
       script: &mactest
         - make binaries libraries tktest
-    - name: "macOS/Xcode 11.5/Static"
+    - name: "macOS/Clang/Xcode 11.5/Static"
       os: osx
       osx_image: xcode11.5
       env:
@@ -133,7 +133,7 @@ matrix:
       install:
         - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1)
       script: *mactest
-    - name: "macOS/Xcode 11.5/Debug"
+    - name: "macOS/Clang/Xcode 11.5/Debug"
       os: osx
       osx_image: xcode11.5
       env:
@@ -142,7 +142,7 @@ matrix:
       install:
         - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1)
       script: *mactest
-    - name: "macOS/Xcode 11.5/Shared/XQuartz"
+    - name: "macOS/Clang/Xcode 11.5/Shared/XQuartz"
       os: osx
       osx_image: xcode11.5
       env:
@@ -152,7 +152,7 @@ matrix:
         - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1)
       script: *mactest
 # Older MacOS versions
-    - name: "macOS/Xcode 11/Shared"
+    - name: "macOS/Clang/Xcode 11/Shared"
       os: osx
       osx_image: xcode11
       env:
@@ -161,7 +161,7 @@ matrix:
       install:
         - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1)
       script: *mactest
-    - name: "macOS/Xcode 10/Shared"
+    - name: "macOS/Clang/Xcode 10/Shared"
       os: osx
       osx_image: xcode10.3
       env:
@@ -170,7 +170,7 @@ matrix:
       install:
         - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1)
       script: *mactest
-    - name: "macOS/Xcode 9/Shared"
+    - name: "macOS/Clang/Xcode 9/Shared"
       os: osx
       osx_image: xcode9.4
       env:
-- 
cgit v0.12


From f4d077febd58ce5844e2c02dc514b031312d6ded Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 29 Jun 2020 09:02:20 +0000
Subject: Fix "make dist". Re-generate tkConfig.h.in

---
 unix/Makefile.in   |  4 ++--
 unix/tkConfig.h.in | 42 ++++++++++++++++++++++--------------------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/unix/Makefile.in b/unix/Makefile.in
index 5bd9c34..38496f4 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -1584,10 +1584,10 @@ $(TOP_DIR)/manifest.uuid:
 	printf "git." >$(TOP_DIR)/manifest.uuid
 	git rev-parse HEAD >>$(TOP_DIR)/manifest.uuid
 
-dist:	$(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(MAC_OSX_DIR)/configure $(TOP_DIR)/doc/man.macros $(TOP_DIR)/manifest.uuid genstubs
+dist:	$(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(MAC_OSX_DIR)/configure $(TOP_DIR)/doc/man.macros $(TOP_DIR)/manifest.uuid
 	rm -rf $(DISTDIR)
 	$(INSTALL_DATA_DIR) $(DISTDIR)/unix
-	$(DIST_INSTALL_DATA) $$(TOP_DIR)/manifest.uuid $(DISTDIR)
+	$(DIST_INSTALL_DATA) $(TOP_DIR)/manifest.uuid $(DISTDIR)
 	$(DIST_INSTALL_DATA) $(UNIX_DIR)/*.c $(UNIX_DIR)/*.h $(DISTDIR)/unix
 	$(DIST_INSTALL_DATA) $(TOP_DIR)/license.terms $(UNIX_DIR)/Makefile.in $(DISTDIR)/unix
 	$(DIST_INSTALL_DATA) $(UNIX_DIR)/configure.ac $(UNIX_DIR)/tk.spec \
diff --git a/unix/tkConfig.h.in b/unix/tkConfig.h.in
index 6753fb5..d4150a0 100644
--- a/unix/tkConfig.h.in
+++ b/unix/tkConfig.h.in
@@ -4,6 +4,9 @@
     #ifndef _TKCONFIG
     #define _TKCONFIG
 
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
 /* Define to 1 if you have the <AvailabilityMacros.h> header file. */
 #undef HAVE_AVAILABILITYMACROS_H
 
@@ -37,15 +40,12 @@
 /* Define to 1 if you have the `open64' function. */
 #undef HAVE_OPEN64
 
-/* Define to 1 if you have the `pthread_atfork' function. */
-#undef HAVE_PTHREAD_ATFORK
-
-/* Define to 1 if you have the `pthread_attr_setstacksize' function. */
-#undef HAVE_PTHREAD_ATTR_SETSTACKSIZE
-
 /* Does struct password have a pw_gecos field? */
 #undef HAVE_PW_GECOS
 
+/* Do we have <stdbool.h>? */
+#undef HAVE_STDBOOL_H
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
@@ -112,9 +112,6 @@
 /* Do we have fd_set? */
 #undef NO_FD_SET
 
-/* Do we have <stdlib.h>? */
-#undef NO_STDLIB_H
-
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
 
@@ -127,6 +124,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
@@ -157,7 +157,7 @@
 /* What is the default extension for shared libraries? */
 #undef TCL_SHLIB_EXT
 
-/* Are wide integers to be implemented with C 'long's? */
+/* Do 'long' and 'long long' have the same size (64-bit)? */
 #undef TCL_WIDE_INT_IS_LONG
 
 /* What type should be used to define wide integers? */
@@ -172,12 +172,17 @@
 /* Are TkAqua debug messages enabled? */
 #undef TK_MAC_DEBUG
 
-/* Do we want to use the threaded memory allocator? */
-#undef USE_THREAD_ALLOC
-
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
 
 /* Are Darwin SUSv3 extensions available? */
 #undef _DARWIN_C_SOURCE
@@ -200,9 +205,6 @@
 /* Do we want the reentrant OS API? */
 #undef _REENTRANT
 
-/* Do we want the thread-safe OS API? */
-#undef _THREAD_SAFE
-
 /* Do we want to use the XOPEN network library? */
 #undef _XOPEN_SOURCE
 
@@ -232,7 +234,7 @@
 /* Define to `int' if <sys/types.h> does not define. */
 #undef pid_t
 
-/* Define to `unsigned' if <sys/types.h> does not define. */
+/* Define to `unsigned int' if <sys/types.h> does not define. */
 #undef size_t
 
 /* Define to `int' if <sys/types.h> doesn't define. */
-- 
cgit v0.12


From 54d2d41c0c0653596d3d9156e4960660b683826c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 29 Jun 2020 09:07:35 +0000
Subject: Fix "make dist"

---
 unix/Makefile.in   |  2 +-
 unix/tkConfig.h.in | 22 ++++++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/unix/Makefile.in b/unix/Makefile.in
index 4e5db6d..74c17bb 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -1551,7 +1551,7 @@ $(TOP_DIR)/manifest.uuid:
 	printf "git." >$(TOP_DIR)/manifest.uuid
 	git rev-parse HEAD >>$(TOP_DIR)/manifest.uuid
 
-dist:   $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(MAC_OSX_DIR)/configure $(TOP_DIR)/doc/man.macros $(TOP_DIR)/manifest.uuid genstubs
+dist:   $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(MAC_OSX_DIR)/configure $(TOP_DIR)/doc/man.macros $(TOP_DIR)/manifest.uuid
 	rm -rf $(DISTDIR)
 	mkdir -p $(DISTDIR)/unix
 	cp -p $(TOP_DIR)/manifest.uuid $(DISTDIR)
diff --git a/unix/tkConfig.h.in b/unix/tkConfig.h.in
index 72d97c8..6ffc035 100644
--- a/unix/tkConfig.h.in
+++ b/unix/tkConfig.h.in
@@ -4,6 +4,9 @@
     #ifndef _TKCONFIG
     #define _TKCONFIG
 
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
 /* Define to 1 if you have the <AvailabilityMacros.h> header file. */
 #undef HAVE_AVAILABILITYMACROS_H
 
@@ -130,6 +133,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
@@ -178,9 +184,17 @@
 /* Do we want to use the threaded memory allocator? */
 #undef USE_THREAD_ALLOC
 
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
 
 /* Is XKeycodeToKeysym deprecated? */
 #undef XKEYCODETOKEYSYM_IS_DEPRECATED
@@ -238,7 +252,7 @@
 /* Define to `int' if <sys/types.h> does not define. */
 #undef pid_t
 
-/* Define to `unsigned' if <sys/types.h> does not define. */
+/* Define to `unsigned int' if <sys/types.h> does not define. */
 #undef size_t
 
 /* Define to `int' if <sys/types.h> doesn't define. */
-- 
cgit v0.12


From 02d5a02047bdae94421b5a7d8c0b4e288ca1e2ae Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 29 Jun 2020 12:34:57 +0000
Subject: A few missing entries in .fossil-settings/ignore-glob and .gitignore

---
 .fossil-settings/ignore-glob | 9 ++++++++-
 .gitignore                   | 4 +++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.fossil-settings/ignore-glob b/.fossil-settings/ignore-glob
index 28ede72..c0e62c7 100644
--- a/.fossil-settings/ignore-glob
+++ b/.fossil-settings/ignore-glob
@@ -1,6 +1,7 @@
 *.a
 *.dll
 *.dylib
+*.dylib.E
 *.exe
 *.exp
 *.la
@@ -21,11 +22,17 @@
 */wish*
 */tktest*
 */versions.vc
+*/version.vc
+*/libtk.vfs
+*/libtk_*.zip
 doc/man.macros
+html
+macosx/configure
 win/Debug*
 win/Release*
 win/*.manifest
 win/nmhlp-out.txt
 win/nmakehlp.out
 unix/tk.pc
-html/*
+unix/Tk-Info.plist
+unix/Wish-Info.plist
diff --git a/.gitignore b/.gitignore
index 9f57b81..a49e849 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 *.bundle
 *.dll
 *.dylib
+*.dylib.E
 *.exe
 *.exp
 *.lib
@@ -14,6 +15,7 @@
 .fslckout
 Makefile
 Tk-Info.plist
+Wish-Info.plist
 autom4te.cache
 config.cache
 config.log
@@ -55,5 +57,5 @@ unix/tclIndex
 win/Debug*
 win/Release*
 win/*.manifest
-win/nmhlp-out.txt
 win/nmakehlp.out
+win/nmhlp-out.txt
-- 
cgit v0.12

-- 
cgit v0.12


From 26ed8453a58d338d08ce244adbe5e58b7c5baf69 Mon Sep 17 00:00:00 2001
From: bll <brad.lanam.comp@gmail.com>
Date: Tue, 30 Jun 2020 16:11:14 +0000
Subject: Fix -postoffset to work with the default combobox style.  If -style
 is not set, cget returns an empty string.

---
 library/ttk/combobox.tcl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/library/ttk/combobox.tcl b/library/ttk/combobox.tcl
index 2770142..2378643 100644
--- a/library/ttk/combobox.tcl
+++ b/library/ttk/combobox.tcl
@@ -357,6 +357,9 @@ proc ttk::combobox::PlacePopdown {cb popdown} {
     set w [winfo width $cb]
     set h [winfo height $cb]
     set style [$cb cget -style]
+    if { $style eq {} } {
+      set style TCombobox
+    }
     set postoffset [ttk::style lookup $style -postoffset {} {0 0 0 0}]
     foreach var {x y w h} delta $postoffset {
     	incr $var $delta
-- 
cgit v0.12


From e2ab0fe9d3d4cceee9533e22a3cc5aaf7d2e2f70 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 3 Jul 2020 12:35:33 +0000
Subject: Minor optimizations in ::tk::EntryBackspace and ::tk::EntryTranspose

---
 library/entry.tcl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/library/entry.tcl b/library/entry.tcl
index 9cc9f6f..2f7ea07 100644
--- a/library/entry.tcl
+++ b/library/entry.tcl
@@ -518,9 +518,9 @@ proc ::tk::EntryBackspace w {
     if {[$w selection present]} {
 	$w delete sel.first sel.last
     } else {
-	set x [expr {[$w index insert] - 1}]
-	if {$x >= 0} {
-	    $w delete $x
+	set x [$w index insert]
+	if {$x > 0} {
+	    $w delete [expr {$x - 1}]
 	}
 	if {[$w index @0] >= [$w index insert]} {
 	    set range [$w xview]
@@ -575,10 +575,10 @@ proc ::tk::EntryTranspose w {
     if {$i < [$w index end]} {
 	incr i
     }
-    set first [expr {$i-2}]
-    if {$first < 0} {
+    if {$first < 2} {
 	return
     }
+    set first [expr {$i-2}]
     set data [$w get]
     set new [string index $data [expr {$i-1}]][string index $data $first]
     $w delete $first $i
-- 
cgit v0.12


From c72826964e6f45d8d741cb09fc72dc94f97b7dc4 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 3 Jul 2020 12:53:06 +0000
Subject: Fix bug in previous commit

---
 library/entry.tcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/entry.tcl b/library/entry.tcl
index 2f7ea07..da3f800 100644
--- a/library/entry.tcl
+++ b/library/entry.tcl
@@ -575,7 +575,7 @@ proc ::tk::EntryTranspose w {
     if {$i < [$w index end]} {
 	incr i
     }
-    if {$first < 2} {
+    if {$i < 2} {
 	return
     }
     set first [expr {$i-2}]
-- 
cgit v0.12


From d3006bf180164a7ba6dd6bf5d6cd48b6877e2129 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 5 Jul 2020 10:13:22 +0000
Subject: Simplify various Tk bindings, where 'expr' is not necessary because
 the called function can already handle simple addition and substraction
 (since it's built into index-handling already)

---
 library/bgerror.tcl   |  2 +-
 library/entry.tcl     | 17 ++++-------------
 library/spinbox.tcl   |  6 +++---
 library/tearoff.tcl   |  8 ++++----
 library/ttk/entry.tcl |  2 +-
 5 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/library/bgerror.tcl b/library/bgerror.tcl
index d4d9b21..b000d91 100644
--- a/library/bgerror.tcl
+++ b/library/bgerror.tcl
@@ -130,7 +130,7 @@ proc ::tk::dialog::error::bgerror {err {flag 1}} {
     set maxLine 45
     foreach line [split $err \n] {
 	if { [string length $line] > $maxLine } {
-	    append displayedErr "[string range $line 0 [expr {$maxLine-3}]]..."
+	    append displayedErr "[string range $line 0 $maxLine-3]..."
 	    break
 	}
 	if { $lines > 4 } {
diff --git a/library/entry.tcl b/library/entry.tcl
index 847bffb..a2b4465 100644
--- a/library/entry.tcl
+++ b/library/entry.tcl
@@ -391,10 +391,10 @@ proc ::tk::EntryMouseSelect {w x} {
 	word {
 	    if {$cur < $anchor} {
 		set before [tcl_wordBreakBefore [$w get] $cur]
-		set after [tcl_wordBreakAfter [$w get] [expr {$anchor-1}]]
+		set after [tcl_wordBreakAfter [$w get] $anchor-1]
 	    } elseif {$cur > $anchor} {
 		set before [tcl_wordBreakBefore [$w get] $anchor]
-		set after [tcl_wordBreakAfter [$w get] [expr {$cur - 1}]]
+		set after [tcl_wordBreakAfter [$w get] $cur-1]
 	    } else {
 		if {[$w index @$Priv(pressX)] < $anchor} {
 		      incr anchor -1
@@ -580,7 +580,7 @@ proc ::tk::EntryTranspose w {
     }
     set first [expr {$i-2}]
     set data [$w get]
-    set new [string index $data [expr {$i-1}]][string index $data $first]
+    set new [string index $data $i-1][string index $data $first]
     $w delete $first $i
     $w insert insert $new
     EntrySeeInsert $w
@@ -677,19 +677,10 @@ proc ::tk::EntryScanDrag {w x} {
 
 proc ::tk::EntryGetSelection {w} {
     set entryString [string range [$w get] [$w index sel.first] \
-	    [expr {[$w index sel.last] - 1}]]
+	    [$w index sel.last]-1]
     if {[$w cget -show] ne ""} {
 	return [string repeat [string index [$w cget -show] 0] \
 		[string length $entryString]]
     }
     return $entryString
 }
-
-
-
-
-
-
-
-
-
diff --git a/library/spinbox.tcl b/library/spinbox.tcl
index 909405e..6ba7842 100644
--- a/library/spinbox.tcl
+++ b/library/spinbox.tcl
@@ -483,10 +483,10 @@ proc ::tk::spinbox::MouseSelect {w x {cursor {}}} {
 	word {
 	    if {$cur < [$w index anchor]} {
 		set before [tcl_wordBreakBefore [$w get] $cur]
-		set after [tcl_wordBreakAfter [$w get] [expr {$anchor-1}]]
+		set after [tcl_wordBreakAfter [$w get] $anchor-1]
 	    } else {
 		set before [tcl_wordBreakBefore [$w get] $anchor]
-		set after [tcl_wordBreakAfter [$w get] [expr {$cur - 1}]]
+		set after [tcl_wordBreakAfter [$w get] $cur-1]
 	    }
 	    if {$before < 0} {
 		set before 0
@@ -589,5 +589,5 @@ proc ::tk::spinbox::AutoScan {w} {
 
 proc ::tk::spinbox::GetSelection {w} {
     return [string range [$w get] [$w index sel.first] \
-	    [expr {[$w index sel.last] - 1}]]
+	    [$w index sel.last]-1]
 }
diff --git a/library/tearoff.tcl b/library/tearoff.tcl
index c2d2d6b..7954ba0 100644
--- a/library/tearoff.tcl
+++ b/library/tearoff.tcl
@@ -155,9 +155,9 @@ proc ::tk::MenuDup {src dst type} {
 
     while {[set index [string first $src $tags]] != -1} {
 	if {$index > 0} {
-	    append x [string range $tags 0 [expr {$index - 1}]]$dst
+	    append x [string range $tags 0 $index-1]$dst
 	}
-	set tags [string range $tags [expr {$index + $srcLen}] end]
+	set tags [string range $tags $index+$srcLen end]
     }
     append x $tags
 
@@ -172,10 +172,10 @@ proc ::tk::MenuDup {src dst type} {
 
 	while {[set index [string first $event $script]] != -1} {
 	    if {$index > 0} {
-		append x [string range $script 0 [expr {$index - 1}]]
+		append x [string range $script 0 $index-1]
 	    }
 	    append x $dst
-	    set script [string range $script [expr {$index + $eventLen}] end]
+	    set script [string range $script $index+$eventLen end]
 	}
 	append x $script
 
diff --git a/library/ttk/entry.tcl b/library/ttk/entry.tcl
index 4cdb5ac..2f3c1a6 100644
--- a/library/ttk/entry.tcl
+++ b/library/ttk/entry.tcl
@@ -179,7 +179,7 @@ bind TEntry <<TkAccentBackspace>> {
 #
 proc ttk::entry::EntrySelection {w} {
     set entryString [string range [$w get] [$w index sel.first] \
-	    [expr {[$w index sel.last] - 1}]]
+	    [$w index sel.last]-1]
     if {[$w cget -show] ne ""} {
 	return [string repeat [string index [$w cget -show] 0] \
 		[string length $entryString]]
-- 
cgit v0.12


From 7356205d76079ccd3681eb9ff19f3d75aa86848b Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 5 Jul 2020 20:01:40 +0000
Subject: Bring entry-19.19 and spinbox-19.19 in line with the fix for
 [40e4bf6198]. Validation is now aborted earlier (and more correctly) when a
 validation loop is detected, therefore the widget content does no longer
 change in the process.

---
 tests/entry.test   | 2 +-
 tests/spinbox.test | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/entry.test b/tests/entry.test
index c7fda8a..f9879a2 100644
--- a/tests/entry.test
+++ b/tests/entry.test
@@ -3358,7 +3358,7 @@ test entry-19.19 {entry widget validation} -setup {
     list [.e cget -validate] [.e get] $::vVals
 } -cleanup {
     destroy .e
-} -result {none mydata {.e -1 -1 nextdata nextdata {} all forced}}
+} -result {none nextdata {.e -1 -1 nextdata nextdata {} all forced}}
 
 ## This leaves validate alone because we trigger validation through the
 ## textvar (a write trace), and the write during validation triggers
diff --git a/tests/spinbox.test b/tests/spinbox.test
index ea29f60..7ddff8c 100644
--- a/tests/spinbox.test
+++ b/tests/spinbox.test
@@ -3594,7 +3594,7 @@ test spinbox-19.19 {spinbox widget validation} -setup {
     list [.e cget -validate] [.e get] $::vVals
 } -cleanup {
     destroy .e
-} -result {none mydata {.e -1 -1 nextdata nextdata {} all forced}}
+} -result {none nextdata {.e -1 -1 nextdata nextdata {} all forced}}
 
 ## This leaves validate alone because we trigger validation through the
 ## textvar (a write trace), and the write during validation triggers
-- 
cgit v0.12


From bcf69d36a13c2d0d0dee05c39a08228c6818dd17 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 5 Jul 2020 20:04:55 +0000
Subject: Add test spinbox-19.21 testing for a spinbox the same thing
 entry-19.21 does for an entry widget.

---
 tests/spinbox.test | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/tests/spinbox.test b/tests/spinbox.test
index 7ddff8c..5d79c8e 100644
--- a/tests/spinbox.test
+++ b/tests/spinbox.test
@@ -3620,6 +3620,26 @@ test spinbox-19.20 {spinbox widget validation} -setup {
 } -cleanup {
     destroy .e
 } -result {all testdata mydata {.e -1 -1 testdata mydata {} all forced}}
+
+## This leaves validate alone because we trigger validation through the
+## textvar (a write trace), and the write during validation triggers
+## nothing (by definition of avoiding loops on var traces).  This is
+## one of those "dangerous" conditions where the user will have a
+## different value in the entry widget shown as is in the textvar.
+test spinbox-19.21 {spinbox widget validation - bug 40e4bf6198} -setup {
+    unset -nocomplain ::e ::vVals
+} -body {
+    spinbox .e -validate key \
+        -validatecommand [list doval2 %W %d %i %P %s %S %v %V] \
+        -textvariable ::e
+    pack .e
+    set ::e origdata
+    .e insert 0 A
+    list [.e cget -validate] [.e get] $::e $::vVals
+} -cleanup {
+    destroy .e
+} -result {none origdata mydata {.e 1 0 Aorigdata origdata A key key}}
+
 ##
 ## End validation tests
 ##
-- 
cgit v0.12


From 885c5afec0135384958c33bab6774da2215f8bab Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Tue, 7 Jul 2020 20:33:17 +0000
Subject: Fix [09abd739b5]: bind-13.14 fails on Debian 10.

---
 unix/tkUnixKey.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/unix/tkUnixKey.c b/unix/tkUnixKey.c
index f6478ef..668be15 100644
--- a/unix/tkUnixKey.c
+++ b/unix/tkUnixKey.c
@@ -367,8 +367,18 @@ TkpGetKeySym(
 	index += 1;
     }
 
-    sym = TkKeycodeToKeysym(dispPtr, eventPtr->xkey.keycode, 0,
-	    index);
+    if (eventPtr->xkey.keycode > 0xff) {
+        
+        /*
+         * X11 keycodes always lie in the inclusive range [8,255].
+         */
+
+        sym = NoSymbol;
+        return sym;
+    } else {
+        sym = TkKeycodeToKeysym(dispPtr, eventPtr->xkey.keycode, 0,
+	        index);
+    }
 
     /*
      * Special handling: if the key was shifted because of Lock, but lock is
-- 
cgit v0.12


From 02c0e0f004c8958c75dc94c71943cd4b0f46350c Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Tue, 7 Jul 2020 20:39:19 +0000
Subject: Same fix, code organized differently

---
 unix/tkUnixKey.c | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/unix/tkUnixKey.c b/unix/tkUnixKey.c
index 668be15..757cb0f 100644
--- a/unix/tkUnixKey.c
+++ b/unix/tkUnixKey.c
@@ -320,6 +320,14 @@ TkpGetKeySym(
     TkKeyEvent* kePtr = (TkKeyEvent*) eventPtr;
 
     /*
+     * X11 keycodes always lie in the inclusive range [8,255].
+     */
+
+    if (eventPtr->xkey.keycode > 0xff) {
+        return NoSymbol;
+    }
+
+    /*
      * Refresh the mapping information if it's stale. This must happen before
      * we do any input method processing. [Bug 3599312]
      */
@@ -366,19 +374,9 @@ TkpGetKeySym(
 	    && (eventPtr->xkey.state & LockMask))) {
 	index += 1;
     }
-
-    if (eventPtr->xkey.keycode > 0xff) {
         
-        /*
-         * X11 keycodes always lie in the inclusive range [8,255].
-         */
-
-        sym = NoSymbol;
-        return sym;
-    } else {
-        sym = TkKeycodeToKeysym(dispPtr, eventPtr->xkey.keycode, 0,
-	        index);
-    }
+    sym = TkKeycodeToKeysym(dispPtr, eventPtr->xkey.keycode, 0,
+            index);
 
     /*
      * Special handling: if the key was shifted because of Lock, but lock is
-- 
cgit v0.12


From 47116a3ec3ac7f6442f634b96a926dec2691285b Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Tue, 7 Jul 2020 20:41:31 +0000
Subject: Fix blank space

---
 unix/tkUnixKey.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/unix/tkUnixKey.c b/unix/tkUnixKey.c
index 757cb0f..4e150f7 100644
--- a/unix/tkUnixKey.c
+++ b/unix/tkUnixKey.c
@@ -374,9 +374,9 @@ TkpGetKeySym(
 	    && (eventPtr->xkey.state & LockMask))) {
 	index += 1;
     }
-        
+
     sym = TkKeycodeToKeysym(dispPtr, eventPtr->xkey.keycode, 0,
-            index);
+	    index);
 
     /*
      * Special handling: if the key was shifted because of Lock, but lock is
-- 
cgit v0.12


From 3018d78340026597655745f383e8f4c2e4e9505d Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Wed, 8 Jul 2020 20:36:06 +0000
Subject: Fix [34214bbdae]: typographical fixes in comments. Thanks to
 Christopher Chavez.

---
 generic/tkBind.c             |  2 +-
 generic/tkCanvPs.c           |  2 +-
 generic/tkEntry.c            |  4 ++--
 generic/tkInt.h              |  2 +-
 generic/tkTextDisp.c         |  4 ++--
 generic/tkTextTag.c          |  2 +-
 generic/ttk/ttkEntry.c       |  2 +-
 macosx/tkMacOSXColor.c       |  2 +-
 macosx/tkMacOSXDialog.c      |  2 +-
 macosx/tkMacOSXKeyEvent.c    |  2 +-
 macosx/tkMacOSXKeysyms.h     |  2 +-
 macosx/tkMacOSXMenubutton.c  |  2 +-
 macosx/tkMacOSXMouseEvent.c  |  6 +++---
 macosx/tkMacOSXNotify.c      |  2 +-
 macosx/tkMacOSXSend.c        |  2 +-
 macosx/tkMacOSXSubwindows.c  |  8 ++++----
 macosx/tkMacOSXWindowEvent.c | 18 +++++++++---------
 macosx/tkMacOSXWm.c          |  2 +-
 win/makefile.vc              |  4 ++--
 win/tkWinKey.c               |  2 +-
 win/tkWinWm.c                |  2 +-
 win/tkWinX.c                 |  2 +-
 win/ttkWinTheme.c            |  2 +-
 xlib/X11/Xlib.h              |  8 ++++----
 xlib/X11/keysymdef.h         |  2 +-
 25 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/generic/tkBind.c b/generic/tkBind.c
index eacdf56..b3bddc9 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -3506,7 +3506,7 @@ DeleteVirtualEventTable(
  *	already defined, the new definition augments those that already exist.
  *
  * Results:
- *	The return value is TCL_ERROR if an error occured while creating the
+ *	The return value is TCL_ERROR if an error occurred while creating the
  *	virtual binding. In this case, an error message will be left in the
  *	interp's result. If all went well then the return value is TCL_OK.
  *
diff --git a/generic/tkCanvPs.c b/generic/tkCanvPs.c
index bcd1d13..1a8b3d3 100644
--- a/generic/tkCanvPs.c
+++ b/generic/tkCanvPs.c
@@ -1601,7 +1601,7 @@ Tk_PostscriptPhoto(
 	    /*
 	     * Generate data for image in monochrome mode. No attempt at
 	     * dithering is made--instead, just set a threshold. To handle
-	     * transparecies we need to output two lines: one for the black
+	     * transparencies we need to output two lines: one for the black
 	     * pixels, one for the white ones.
 	     */
 
diff --git a/generic/tkEntry.c b/generic/tkEntry.c
index 5fbff40..8141daf 100644
--- a/generic/tkEntry.c
+++ b/generic/tkEntry.c
@@ -3268,7 +3268,7 @@ EntryValidate(
  *
  * Results:
  *	TCL_OK if the validatecommand accepts the new string, TCL_ERROR if any
- *	problems occured with validatecommand.
+ *	problems occurred with validatecommand.
  *
  * Side effects:
  *	The insertion/deletion may be aborted, and the validatecommand might
@@ -3329,7 +3329,7 @@ EntryValidateChange(
     /*
      * If e->validate has become VALIDATE_NONE during the validation, or we
      * now have VALIDATE_VAR set (from EntrySetValue) and didn't before, it
-     * means that a loop condition almost occured. Do not allow this
+     * means that a loop condition almost occurred. Do not allow this
      * validation result to finish.
      */
 
diff --git a/generic/tkInt.h b/generic/tkInt.h
index 3a8328f..22460fb 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -692,7 +692,7 @@ typedef struct TkWindow {
     Visual *visual;		/* Visual to use for window. If not default,
 				 * MUST be set before X window is created. */
     int depth;			/* Number of bits/pixel. */
-    Window window;		/* X's id for window. NULL means window hasn't
+    Window window;		/* X's id for window. None means window hasn't
 				 * actually been created yet, or it's been
 				 * deleted. */
     struct TkWindow *childList;	/* First in list of child windows, or NULL if
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 93b56aa..6d680f6 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -1367,7 +1367,7 @@ LayoutDLine(
 	 * expectations in the rest of the code, but we are able to skip
 	 * elided portions of the line quickly.
 	 *
-	 * If current chunk is elided and last chunk was too, coalese.
+	 * If current chunk is elided and last chunk was too, coalesce.
 	 *
 	 * This also means that each logical line which is entirely elided
 	 * still gets laid out into a DLine, but with zero height. This isn't
@@ -5275,7 +5275,7 @@ TkTextRelayoutWindow(
 
     /*
      * Invalidate cached scrollbar positions, so that scrollbars sliders will
-     * be udpated.
+     * be updated.
      */
 
     dInfoPtr->xScrollFirst = dInfoPtr->xScrollLast = -1;
diff --git a/generic/tkTextTag.c b/generic/tkTextTag.c
index 0d223fe..f7e4294 100644
--- a/generic/tkTextTag.c
+++ b/generic/tkTextTag.c
@@ -1440,7 +1440,7 @@ ChangeTagPriority(
 
 void
 TkTextBindProc(
-    ClientData clientData,	/* Pointer to canvas structure. */
+    ClientData clientData,	/* Pointer to text widget structure. */
     XEvent *eventPtr)		/* Pointer to X event that just happened. */
 {
     TkText *textPtr = clientData;
diff --git a/generic/ttk/ttkEntry.c b/generic/ttk/ttkEntry.c
index 29f69a1..770d8ff 100644
--- a/generic/ttk/ttkEntry.c
+++ b/generic/ttk/ttkEntry.c
@@ -557,7 +557,7 @@ static int EntryNeedsValidation(VMODE vmode, VREASON reason)
  * Returns:
  *	TCL_OK if the change is accepted
  *	TCL_BREAK if the change is rejected
- *      TCL_ERROR if any errors occured
+ *	TCL_ERROR if any errors occurred
  *
  * The change will be rejected if -validatecommand returns 0,
  * or if -validatecommand or -invalidcommand modifies the value.
diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index 5b59b58..a0eaa84 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -506,7 +506,7 @@ TkSetMacColor(
  * Results:
  *	None resp. retained CGColorRef for CopyCachedColor()
  *
- * Side effects:M
+ * Side effects:
  *	None.
  *
  *----------------------------------------------------------------------
diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c
index ceaa2ac..026439f 100644
--- a/macosx/tkMacOSXDialog.c
+++ b/macosx/tkMacOSXDialog.c
@@ -1680,7 +1680,7 @@ enum FontchooserOption {
  *	None.
  *
  * Side effects:
- *	Additional events may be place on the Tk event queue.
+ *	Additional events may be placed on the Tk event queue.
  *
  *----------------------------------------------------------------------
  */
diff --git a/macosx/tkMacOSXKeyEvent.c b/macosx/tkMacOSXKeyEvent.c
index e0b0094..b0d91ad 100644
--- a/macosx/tkMacOSXKeyEvent.c
+++ b/macosx/tkMacOSXKeyEvent.c
@@ -771,7 +771,7 @@ TkMacOSXGetModalSession(void)
  *	This enables correct placement of the popups used for character
  *      selection by the NSTextInputClient.  It gets called by text entry
  *      widgets whenever the cursor is drawn.  It does nothing if the widget's
- *      NSWindow is not the current KeyWindow.  Otherwise it udpates the
+ *      NSWindow is not the current KeyWindow.  Otherwise it updates the
  *      display's caret structure and records the caret geometry in static
  *      variables for use by the NSTextInputClient implementation.  Any
  *      widget passed to this function will be marked as being able to input
diff --git a/macosx/tkMacOSXKeysyms.h b/macosx/tkMacOSXKeysyms.h
index d84d1b9..da364ea 100644
--- a/macosx/tkMacOSXKeysyms.h
+++ b/macosx/tkMacOSXKeysyms.h
@@ -91,7 +91,7 @@ static const KeyInfo keyArray[] = {
     {114,	XK_Help,	NSHelpFunctionKey},
     {115,	XK_Home,	NSHomeFunctionKey},     /* Fn Left */
     {116,	XK_Page_Up,	NSPageUpFunctionKey},   /* Fn Up */
-    {117,	XK_Delete,	NSDeleteFunctionKey},   /* Fn Deleete */
+    {117,	XK_Delete,	NSDeleteFunctionKey},   /* Fn Delete */
     {118,	XK_F4,		NSF4FunctionKey},
     {119,	XK_End,		NSEndFunctionKey},      /* Fn Right */
     {120,	XK_F2,		NSF2FunctionKey},
diff --git a/macosx/tkMacOSXMenubutton.c b/macosx/tkMacOSXMenubutton.c
index b6603b2..d1f429e 100644
--- a/macosx/tkMacOSXMenubutton.c
+++ b/macosx/tkMacOSXMenubutton.c
@@ -362,7 +362,7 @@ TkpComputeMenuButtonGeometry(butPtr)
  *
  * DrawMenuButtonImageAndText --
  *
- *        Draws the image and text associated witha button or label.
+ *        Draws the image and text associated with a button or label.
  *
  * Results:
  *        None.
diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index 4e0b644..f274a07 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -502,7 +502,7 @@ XQueryPointer(
  *	True if event(s) are generated - false otherwise.
  *
  * Side effects:
- *	Additional events may be place on the Tk event queue. Grab state may
+ *	Additional events may be placed on the Tk event queue. Grab state may
  *	also change.
  *
  *----------------------------------------------------------------------
@@ -540,7 +540,7 @@ TkGenerateButtonEventForXPointer(
  *	True if event(s) are generated, false otherwise.
  *
  * Side effects:
- *	Additional events may be place on the Tk event queue. Grab state may
+ *	Additional events may be placed on the Tk event queue. Grab state may
  *	also change.
  *
  *----------------------------------------------------------------------
@@ -592,7 +592,7 @@ TkGenerateButtonEvent(
  *	True if event(s) are generated - false otherwise.
  *
  * Side effects:
- *	Additional events may be place on the Tk event queue. Grab state may
+ *	Additional events may be placed on the Tk event queue. Grab state may
  *	also change.
  *
  *----------------------------------------------------------------------
diff --git a/macosx/tkMacOSXNotify.c b/macosx/tkMacOSXNotify.c
index 96c9a7a..6120ae5 100644
--- a/macosx/tkMacOSXNotify.c
+++ b/macosx/tkMacOSXNotify.c
@@ -302,7 +302,7 @@ TkMacOSXNotifyExitHandler(
  * TkMacOSXEventsSetupProc --
  *
  *	This procedure implements the setup part of the MacOSX event source. It
- *	is invoked by Tcl_DoOneEvent before calling TkMacOSXEventsProc to
+ *	is invoked by Tcl_DoOneEvent before calling TkMacOSXEventsCheckProc to
  *	process all queued NSEvents.  In our case, all we need to do is to set
  *	the Tcl MaxBlockTime to 0 before starting the loop to process all
  *	queued NSEvents.
diff --git a/macosx/tkMacOSXSend.c b/macosx/tkMacOSXSend.c
index 8b65532..a651bcd 100644
--- a/macosx/tkMacOSXSend.c
+++ b/macosx/tkMacOSXSend.c
@@ -3,7 +3,7 @@
  *
  *	This file provides procedures that implement the "send" command,
  *	allowing commands to be passed from interpreter to interpreter. This
- *	current implementation for the Mac has most functionality stubed out.
+ *	current implementation for the Mac has most functionality stubbed out.
  *
  *	The current plan, which we have not had time to implement, is for the
  *	first Wish app to create a gestalt of type 'WIsH'. This gestalt will
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index 6602564..b085ba4 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -38,7 +38,7 @@ static void		NotifyVisibility(TkWindow *winPtr, XEvent *eventPtr);
  *
  * XDestroyWindow --
  *
- *	Dealocates the given X Window.
+ *	Deallocates the given X Window.
  *
  * Results:
  *	The window id is returned.
@@ -820,7 +820,7 @@ TkMacOSXUpdateClipRgn(
 
 	    /*
 	     * Clip away the area of any windows that may obscure this window.
-	     * For a non-toplevel window, first, clip to the parents visible
+	     * For a non-toplevel window, first, clip to the parent's visible
 	     * clip region. Second, clip away any siblings that are higher in
 	     * the stacking order. For an embedded toplevel, just clip to the
 	     * container's visible clip region. Remember, we only allow one
@@ -1275,7 +1275,7 @@ TkMacOSXInvalClipRgns(
  *
  * TkMacOSXWinBounds --
  *
- *	Given a Tk window this function determines the windows bounds in
+ *	Given a Tk window this function determines the window's bounds in
  *	relation to the Macintosh window's coordinate system. This is also the
  *	same coordinate system as the Tk toplevel window in which this window
  *	is contained.
@@ -1307,7 +1307,7 @@ TkMacOSXWinBounds(
  *
  * TkMacOSXWinCGBounds --
  *
- *	Given a Tk window this function determines the windows bounds in
+ *	Given a Tk window this function determines the window's bounds in
  *	relation to the Macintosh window's coordinate system. This is also the
  *	same coordinate system as the Tk toplevel window in which this window
  *	is contained.
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 61b647e..17f8585 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -424,16 +424,16 @@ TkpWillDrawWidget(Tk_Window tkwin) {
  *
  * GenerateUpdates --
  *
- *	Given a Macintosh update region and a Tk window this function geneates
+ *	Given a Macintosh update region and a Tk window this function generates
  *	an X Expose event for the window if it meets the update region. The
- *	function will then recursivly have each damaged window generate Expose
+ *	function will then recursively have each damaged window generate Expose
  *	events for its child windows.
  *
  * Results:
  *	True if event(s) are generated - false otherwise.
  *
  * Side effects:
- *	Additional events may be place on the Tk event queue.
+ *	Additional events may be placed on the Tk event queue.
  *
  *----------------------------------------------------------------------
  */
@@ -458,7 +458,7 @@ GenerateUpdates(
     }
 
     /*
-     * Compute the bounding box of the area that the damage occured in.
+     * Compute the bounding box of the area that the damage occurred in.
      */
 
     boundsRgn = HIShapeCreateWithRect(&bounds);
@@ -532,7 +532,7 @@ GenerateUpdates(
  *	True if event(s) are generated - false otherwise.
  *
  * Side effects:
- *	Additional events may be place on the Tk event queue.
+ *	Additional events may be placed on the Tk event queue.
  *
  *----------------------------------------------------------------------
  */
@@ -560,7 +560,7 @@ GenerateActivateEvents(
  *	None.
  *
  * Side effects:
- *	Additional events may be place on the Tk event queue.
+ *	Additional events may be placed on the Tk event queue.
  *
  *----------------------------------------------------------------------
  */
@@ -584,7 +584,7 @@ DoWindowActivate(
  *	True if event(s) are generated - false otherwise.
  *
  * Side effects:
- *	Additional events may be place on the Tk event queue.
+ *	Additional events may be placed on the Tk event queue.
  *
  *----------------------------------------------------------------------
  */
@@ -742,7 +742,7 @@ TkGenWMConfigureEvent(
 
     /*
      * Now set up the changes structure. Under X we wait for the
-     * ConfigureNotify to set these values. On the Mac we know imediatly that
+     * ConfigureNotify to set these values. On the Mac we know immediately that
      * this is what we want - so we just set them. However, we need to make
      * sure the windows clipping region is marked invalid so the change is
      * visible to the subwindow.
@@ -934,7 +934,7 @@ RedisplayView(
     NSView *view = (NSView *) clientdata;
 
     /*
-     * Make sure that we are not trying to displaying a view that no longer
+     * Make sure that we are not trying to display a view that no longer
      * exists. Must call [NSApp windows] because [NSApp orderedWindows] excludes
      * floating/utility windows and other window panels.
      */
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index d7df594..8e52278 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -4052,7 +4052,7 @@ TopLevelEventProc(
 	    TkMacOSXDbgMsg("TopLevelEventProc: %s deleted", winPtr->pathName);
 	}
     } else if (eventPtr->type == ReparentNotify) {
-	Tcl_Panic("recieved unwanted reparent event");
+	Tcl_Panic("received unwanted reparent event");
     }
 }
 
diff --git a/win/makefile.vc b/win/makefile.vc
index fda0ff2..84c4e81 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -58,7 +58,7 @@
 # 64-bit compiler, if your SDK has it.
 #
 # Examples:
-# Assumign Tcl sources lie in ../../tcl
+# Assuming Tcl sources lie in ../../tcl
 #       c:\tcl_src\win\>nmake -f makefile.vc release
 # If Tcl sources are not in ../../tcl, use the TCLDIR macro to specify dir
 #       c:\tcl_src\win\>nmake -f makefile.vc release TCLDIR=c:\src\tcl
@@ -66,7 +66,7 @@
 #       c:\tcl_src\win\>nmake -f makefile.vc test
 # Install Tk in location specified by INSTALLDIR macro
 #       c:\tcl_src\win\>nmake -f makefile.vc install INSTALLDIR=c:\progra~1\tcl
-# Build release with PDF files
+# Build release with PDB files
 #       c:\tcl_src\win\>nmake -f makefile.vc release OPTS=pdbs
 # Build debug version
 #       c:\tcl_src\win\>nmake -f makefile.vc release OPTS=symbols
diff --git a/win/tkWinKey.c b/win/tkWinKey.c
index 4451296..0cd086c 100644
--- a/win/tkWinKey.c
+++ b/win/tkWinKey.c
@@ -110,7 +110,7 @@ TkpGetString(
     } else if (keyEv->send_event == -3) {
 
 	/*
-	 * Special case for WM_UNICHAR and win2000 multi-lingal IME input
+	 * Special case for WM_UNICHAR and win2000 multilingual IME input
 	 */
 
 	len = TkUniCharToUtf(keyEv->keycode, buf);
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index 9307503..f7ba611 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.c
@@ -2037,7 +2037,7 @@ UpdateWrapper(
 	 * Pick the decorative frame style. Override redirect windows get
 	 * created as undecorated popups if they have no transient parent,
 	 * otherwise they are children. This allows splash screens to operate
-	 * as an independent window, while having dropdows (like for a
+	 * as an independent window, while having dropdowns (like for a
 	 * combobox) not grab focus away from their parent. Transient windows
 	 * get a modal dialog frame. Neither override, nor transient windows
 	 * appear in the Windows taskbar. Note that a transient window does
diff --git a/win/tkWinX.c b/win/tkWinX.c
index f445fce..8616369 100644
--- a/win/tkWinX.c
+++ b/win/tkWinX.c
@@ -1354,7 +1354,7 @@ GenerateXEvent(
  * GetState --
  *
  *	This function constructs a state mask for the mouse buttons and
- *	modifier keys as they were before the event occured.
+ *	modifier keys as they were before the event occurred.
  *
  * Results:
  *	Returns a composite value of all the modifier and button state flags
diff --git a/win/ttkWinTheme.c b/win/ttkWinTheme.c
index 63e9704..b0468fd 100644
--- a/win/ttkWinTheme.c
+++ b/win/ttkWinTheme.c
@@ -7,7 +7,7 @@
 
 #include <tkWinInt.h>
 
-#ifndef DFCS_HOT	/* Windows 98/Me, Windows 200/XP only */
+#ifndef DFCS_HOT	/* Windows 98/Me, Windows 2000/XP only */
 #define DFCS_HOT 0
 #endif
 
diff --git a/xlib/X11/Xlib.h b/xlib/X11/Xlib.h
index 7969ff5..91aab57 100644
--- a/xlib/X11/Xlib.h
+++ b/xlib/X11/Xlib.h
@@ -541,7 +541,7 @@ typedef struct {
 	Bool send_event;	/* true if this came from a SendEvent request */
 	Display *display;	/* Display the event was read from */
 	Window window;	        /* "event" window it is reported relative to */
-	Window root;	        /* root window that the event occured on */
+	Window root;	        /* root window that the event occurred on */
 	Window subwindow;	/* child window */
 	Time time;		/* milliseconds */
 	int x, y;		/* pointer x, y coordinates in event window */
@@ -559,7 +559,7 @@ typedef struct {
 	Bool send_event;	/* true if this came from a SendEvent request */
 	Display *display;	/* Display the event was read from */
 	Window window;	        /* "event" window it is reported relative to */
-	Window root;	        /* root window that the event occured on */
+	Window root;	        /* root window that the event occurred on */
 	Window subwindow;	/* child window */
 	Time time;		/* milliseconds */
 	int x, y;		/* pointer x, y coordinates in event window */
@@ -577,7 +577,7 @@ typedef struct {
 	Bool send_event;	/* true if this came from a SendEvent request */
 	Display *display;	/* Display the event was read from */
 	Window window;	        /* "event" window reported relative to */
-	Window root;	        /* root window that the event occured on */
+	Window root;	        /* root window that the event occurred on */
 	Window subwindow;	/* child window */
 	Time time;		/* milliseconds */
 	int x, y;		/* pointer x, y coordinates in event window */
@@ -594,7 +594,7 @@ typedef struct {
 	Bool send_event;	/* true if this came from a SendEvent request */
 	Display *display;	/* Display the event was read from */
 	Window window;	        /* "event" window reported relative to */
-	Window root;	        /* root window that the event occured on */
+	Window root;	        /* root window that the event occurred on */
 	Window subwindow;	/* child window */
 	Time time;		/* milliseconds */
 	int x, y;		/* pointer x, y coordinates in event window */
diff --git a/xlib/X11/keysymdef.h b/xlib/X11/keysymdef.h
index 460c72d..d334cf2 100644
--- a/xlib/X11/keysymdef.h
+++ b/xlib/X11/keysymdef.h
@@ -30,7 +30,7 @@ SOFTWARE.
 /*
  * TTY Functions, cleverly chosen to map to ascii, for convenience of
  * programming, but could have been arbitrary (at the cost of lookup
- * tables in client code.
+ * tables in client code).
  */
 
 #define XK_BackSpace		0xFF08	/* back space, back char */
-- 
cgit v0.12


From e5bb2baae8dd7b496cc9a06e0b0191510627e14e Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Wed, 8 Jul 2020 22:07:54 +0000
Subject: Fix [031dfcf1dd]: ttk::treeview -anchor does not work with column #0

---
 generic/ttk/ttkTreeview.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/generic/ttk/ttkTreeview.c b/generic/ttk/ttkTreeview.c
index 358e409..479820a 100644
--- a/generic/ttk/ttkTreeview.c
+++ b/generic/ttk/ttkTreeview.c
@@ -1779,7 +1779,7 @@ static void DrawItem(
 		x+indent, y, colwidth-indent, rowHeight);
 	if (item->textObj) { displayItem.textObj = item->textObj; }
 	if (item->imageObj) { displayItem.imageObj = item->imageObj; }
-	/* ??? displayItem.anchorObj = 0; <<NOTE-ANCHOR>> */
+        displayItem.anchorObj = tv->tree.column0.anchorObj;
 	DisplayLayout(tv->tree.itemLayout, &displayItem, state, parcel, d);
 	x += colwidth;
     }
@@ -3320,8 +3320,8 @@ TTK_LAYOUT("Item",
     TTK_GROUP("Treeitem.padding", TTK_FILL_BOTH,
 	TTK_NODE("Treeitem.indicator", TTK_PACK_LEFT)
 	TTK_NODE("Treeitem.image", TTK_PACK_LEFT)
-	TTK_GROUP("Treeitem.focus", TTK_PACK_LEFT,
-	    TTK_NODE("Treeitem.text", TTK_PACK_LEFT))))
+	TTK_GROUP("Treeitem.focus", TTK_FILL_BOTH,
+	    TTK_NODE("Treeitem.text", TTK_FILL_BOTH))))
 
 TTK_LAYOUT("Cell",
     TTK_GROUP("Treedata.padding", TTK_FILL_BOTH,
-- 
cgit v0.12


From 8a4797c9a16ff548b9d7a02b28ac8df76bdb2ff0 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 10 Jul 2020 07:04:29 +0000
Subject: Minor bindings cleanup. Some removal of "expr" when we can do without
 it. Some KeyPress -> Key changes (which are synonymes). Some implicit
 <Button-1> specifications in stead of simply <1> (making clear this is not a
 binding to the "1" key).

---
 library/bgerror.tcl     | 12 +++++-----
 library/demos/ctext.tcl | 14 +++++------
 library/entry.tcl       | 63 +++++++++++++++++++++----------------------------
 library/tearoff.tcl     | 10 ++++----
 4 files changed, 45 insertions(+), 54 deletions(-)

diff --git a/library/bgerror.tcl b/library/bgerror.tcl
index 8421924..fe8dfe0 100644
--- a/library/bgerror.tcl
+++ b/library/bgerror.tcl
@@ -41,7 +41,7 @@ proc ::tk::dialog::error::Details {} {
     set w .bgerrorDialog
     set caption [option get $w.function text {}]
     set command [option get $w.function command {}]
-    if { ($caption eq "") || ($command eq "") } {
+    if {($caption eq "") || ($command eq "")} {
 	grid forget $w.function
     }
     lappend command [$w.top.info.text get 1.0 end-1c]
@@ -50,7 +50,7 @@ proc ::tk::dialog::error::Details {} {
 }
 
 proc ::tk::dialog::error::SaveToLog {text} {
-    if { $::tcl_platform(platform) eq "windows" } {
+    if {$::tcl_platform(platform) eq "windows"} {
 	set allFiles *.*
     } else {
 	set allFiles *
@@ -129,11 +129,11 @@ proc ::tk::dialog::error::bgerror {err {flag 1}} {
     set lines 0
     set maxLine 45
     foreach line [split $err \n] {
-	if { [string length $line] > $maxLine } {
-	    append displayedErr "[string range $line 0 [expr {$maxLine-3}]]..."
+	if {[string length $line] > $maxLine} {
+	    append displayedErr "[string range $line 0 $maxLine-3]..."
 	    break
 	}
-	if { $lines > 4 } {
+	if {$lines > 4} {
 	    append displayedErr "..."
 	    break
 	} else {
@@ -182,7 +182,7 @@ proc ::tk::dialog::error::bgerror {err {flag 1}} {
     pack $W.text -side left -expand yes -fill both
     $W.text insert 0.0 "$err\n$info"
     $W.text mark set insert 0.0
-    bind $W.text <ButtonPress-1> { focus %W }
+    bind $W.text <Button-1> {focus %W}
     $W.text configure -state disabled
 
     # 2. Fill the top part with bitmap and message
diff --git a/library/demos/ctext.tcl b/library/demos/ctext.tcl
index a3b4e8a..502c9d0 100644
--- a/library/demos/ctext.tcl
+++ b/library/demos/ctext.tcl
@@ -41,16 +41,16 @@ $c create rectangle 245 195 255 205 -outline black -fill red
 # First, create the text item and give it bindings so it can be edited.
 
 $c addtag text withtag [$c create text 250 200 -text "This is just a string of text to demonstrate the text facilities of canvas widgets. Bindings have been defined to support editing (see above)." -width 440 -anchor n -font $textFont -justify left]
-$c bind text <1> "textB1Press $c %x %y"
+$c bind text <Button-1> "textB1Press $c %x %y"
 $c bind text <B1-Motion> "textB1Move $c %x %y"
-$c bind text <Shift-1> "$c select adjust current @%x,%y"
+$c bind text <Shift-Button-1> "$c select adjust current @%x,%y"
 $c bind text <Shift-B1-Motion> "textB1Move $c %x %y"
-$c bind text <KeyPress> "textInsert $c %A"
+$c bind text <Key> "textInsert $c %A"
 $c bind text <Return> "textInsert $c \\n"
 $c bind text <Control-h> "textBs $c"
 $c bind text <BackSpace> "textBs $c"
 $c bind text <Delete> "textDel $c"
-$c bind text <2> "textPaste $c @%x,%y"
+$c bind text <Button-2> "textPaste $c @%x,%y"
 
 # Next, create some items that allow the text's anchor position
 # to be edited.
@@ -58,14 +58,14 @@ $c bind text <2> "textPaste $c @%x,%y"
 proc mkTextConfigBox {w x y option value color} {
     set item [$w create rect $x $y [expr {$x+30}] [expr {$y+30}] \
 	    -outline black -fill $color -width 1]
-    $w bind $item <1> "$w itemconf text $option $value"
+    $w bind $item <Button-1> "$w itemconf text $option $value"
     $w addtag config withtag $item
 }
 proc mkTextConfigPie {w x y a option value color} {
     set item [$w create arc $x $y [expr {$x+90}] [expr {$y+90}] \
 	    -start [expr {$a-15}] -extent 30 -outline black -fill $color \
 	    -width 1]
-    $w bind $item <1> "$w itemconf text $option $value"
+    $w bind $item <Button-1> "$w itemconf text $option $value"
     $w addtag config withtag $item
 }
 
@@ -84,7 +84,7 @@ mkTextConfigBox $c [expr {$x+60}] [expr {$y+60}] -anchor nw     $color
 set item [$c create rect \
 	[expr {$x+40}] [expr {$y+40}] [expr {$x+50}] [expr {$y+50}] \
 	-outline black -fill red]
-$c bind $item <1> "$c itemconf text -anchor center"
+$c bind $item <Button-1> "$c itemconf text -anchor center"
 $c create text [expr {$x+45}] [expr {$y-5}] \
 	-text {Text Position}  -anchor s  -font {Times 20}  -fill brown
 
diff --git a/library/entry.tcl b/library/entry.tcl
index da3f800..6539af7 100644
--- a/library/entry.tcl
+++ b/library/entry.tcl
@@ -58,7 +58,7 @@ bind Entry <<Paste>> {
 }
 bind Entry <<Clear>> {
     # ignore if there is no selection
-    catch { %W delete sel.first sel.last }
+    catch {%W delete sel.first sel.last}
 }
 bind Entry <<PasteSelection>> {
     if {$tk_strictMotif || ![info exists tk::Priv(mouseMoved)]
@@ -74,7 +74,7 @@ bind Entry <<TraverseIn>> {
 
 # Standard Motif bindings:
 
-bind Entry <1> {
+bind Entry <Button-1> {
     tk::EntryButton1 %W %x
     %W selection clear
 }
@@ -82,25 +82,25 @@ bind Entry <B1-Motion> {
     set tk::Priv(x) %x
     tk::EntryMouseSelect %W %x
 }
-bind Entry <Double-1> {
+bind Entry <Double-Button-1> {
     set tk::Priv(selectMode) word
     tk::EntryMouseSelect %W %x
     catch {%W icursor sel.last}
 }
-bind Entry <Triple-1> {
+bind Entry <Triple-Button-1> {
     set tk::Priv(selectMode) line
     tk::EntryMouseSelect %W %x
     catch {%W icursor sel.last}
 }
-bind Entry <Shift-1> {
+bind Entry <Shift-Button-1> {
     set tk::Priv(selectMode) char
     %W selection adjust @%x
 }
-bind Entry <Double-Shift-1>	{
+bind Entry <Double-Shift-Button-1>	{
     set tk::Priv(selectMode) word
     tk::EntryMouseSelect %W %x
 }
-bind Entry <Triple-Shift-1>	{
+bind Entry <Triple-Shift-Button-1>	{
     set tk::Priv(selectMode) line
     tk::EntryMouseSelect %W %x
 }
@@ -114,22 +114,22 @@ bind Entry <B1-Enter> {
 bind Entry <ButtonRelease-1> {
     tk::CancelRepeat
 }
-bind Entry <Control-1> {
+bind Entry <Control-Button-1> {
     %W icursor @%x
 }
 
 bind Entry <<PrevChar>> {
-    tk::EntrySetCursor %W [expr {[%W index insert] - 1}]
+    tk::EntrySetCursor %W [expr {[%W index insert]-1}]
 }
 bind Entry <<NextChar>> {
-    tk::EntrySetCursor %W [expr {[%W index insert] + 1}]
+    tk::EntrySetCursor %W [expr {[%W index insert]+1}]
 }
 bind Entry <<SelectPrevChar>> {
-    tk::EntryKeySelect %W [expr {[%W index insert] - 1}]
+    tk::EntryKeySelect %W [expr {[%W index insert]-1}]
     tk::EntrySeeInsert %W
 }
 bind Entry <<SelectNextChar>> {
-    tk::EntryKeySelect %W [expr {[%W index insert] + 1}]
+    tk::EntryKeySelect %W [expr {[%W index insert]+1}]
     tk::EntrySeeInsert %W
 }
 bind Entry <<PrevWord>> {
@@ -190,19 +190,19 @@ bind Entry <<SelectAll>> {
 bind Entry <<SelectNone>> {
     %W selection clear
 }
-bind Entry <KeyPress> {
+bind Entry <Key> {
     tk::CancelRepeat
     tk::EntryInsert %W %A
 }
 
 # Ignore all Alt, Meta, and Control keypresses unless explicitly bound.
 # Otherwise, if a widget binding for one of these is defined, the
-# <KeyPress> class binding will also fire and insert the character,
+# <Key> class binding will also fire and insert the character,
 # which is wrong.  Ditto for Escape, Return, and Tab.
 
-bind Entry <Alt-KeyPress> {# nothing}
-bind Entry <Meta-KeyPress> {# nothing}
-bind Entry <Control-KeyPress> {# nothing}
+bind Entry <Alt-Key> {# nothing}
+bind Entry <Meta-Key> {# nothing}
+bind Entry <Control-Key> {# nothing}
 bind Entry <Escape> {# nothing}
 bind Entry <Return> {# nothing}
 bind Entry <KP_Enter> {# nothing}
@@ -210,7 +210,7 @@ bind Entry <Tab> {# nothing}
 bind Entry <Prior> {# nothing}
 bind Entry <Next> {# nothing}
 if {[tk windowingsystem] eq "aqua"} {
-    bind Entry <Command-KeyPress> {# nothing}
+    bind Entry <Command-Key> {# nothing}
 }
 # Tk-on-Cocoa generates characters for these two keys. [Bug 2971663]
 bind Entry <<NextLine>> {# nothing}
@@ -278,7 +278,7 @@ bind Entry <<TkStartIMEMarkedText>> {
     dict set ::tk::Priv(IMETextMark) "%W" [%W index insert]
 }
 bind Entry <<TkEndIMEMarkedText>> {
-    if { [catch {dict get $::tk::Priv(IMETextMark) "%W"} mark] } {
+    if {[catch {dict get $::tk::Priv(IMETextMark) "%W"} mark]} {
 	bell
     } else {
 	%W selection range $mark insert
@@ -294,7 +294,7 @@ bind Entry <<TkAccentBackspace>> {
 # A few additional bindings of my own.
 
 if {[tk windowingsystem] ne "aqua"} {
-    bind Entry <2> {
+    bind Entry <Button-2> {
         if {!$tk_strictMotif} {
         ::tk::EntryScanMark %W %x
         }
@@ -305,7 +305,7 @@ if {[tk windowingsystem] ne "aqua"} {
         }
     }
 } else {
-    bind Entry <3> {
+    bind Entry <Button-3> {
         if {!$tk_strictMotif} {
         ::tk::EntryScanMark %W %x
         }
@@ -391,10 +391,10 @@ proc ::tk::EntryMouseSelect {w x} {
 	word {
 	    if {$cur < $anchor} {
 		set before [tcl_wordBreakBefore [$w get] $cur]
-		set after [tcl_wordBreakAfter [$w get] [expr {$anchor-1}]]
+		set after [tcl_wordBreakAfter [$w get] $anchor-1]
 	    } elseif {$cur > $anchor} {
 		set before [tcl_wordBreakBefore [$w get] $anchor]
-		set after [tcl_wordBreakAfter [$w get] [expr {$cur - 1}]]
+		set after [tcl_wordBreakAfter [$w get] $cur-1]
 	    } else {
 		if {[$w index @$Priv(pressX)] < $anchor} {
 		      incr anchor -1
@@ -520,7 +520,7 @@ proc ::tk::EntryBackspace w {
     } else {
 	set x [$w index insert]
 	if {$x > 0} {
-	    $w delete [expr {$x - 1}]
+	    $w delete [expr {$x-1}]
 	}
 	if {[$w index @0] >= [$w index insert]} {
 	    set range [$w xview]
@@ -580,7 +580,7 @@ proc ::tk::EntryTranspose w {
     }
     set first [expr {$i-2}]
     set data [$w get]
-    set new [string index $data [expr {$i-1}]][string index $data $first]
+    set new [string index $data $i-1][string index $data $first]
     $w delete $first $i
     $w insert insert $new
     EntrySeeInsert $w
@@ -660,7 +660,7 @@ proc ::tk::EntryScanMark {w x} {
 proc ::tk::EntryScanDrag {w x} {
     # Make sure these exist, as some weird situations can trigger the
     # motion binding without the initial press.  [Bug #220269]
-    if {![info exists ::tk::Priv(x)]} { set ::tk::Priv(x) $x }
+    if {![info exists ::tk::Priv(x)]} {set ::tk::Priv(x) $x}
     # allow for a delta
     if {abs($x-$::tk::Priv(x)) > 2} {
 	set ::tk::Priv(mouseMoved) 1
@@ -677,19 +677,10 @@ proc ::tk::EntryScanDrag {w x} {
 
 proc ::tk::EntryGetSelection {w} {
     set entryString [string range [$w get] [$w index sel.first] \
-	    [expr {[$w index sel.last] - 1}]]
+	    [$w index sel.last]-1]
     if {[$w cget -show] ne ""} {
 	return [string repeat [string index [$w cget -show] 0] \
 		[string length $entryString]]
     }
     return $entryString
 }
-
-
-
-
-
-
-
-
-
diff --git a/library/tearoff.tcl b/library/tearoff.tcl
index c2d2d6b..4c8b404 100644
--- a/library/tearoff.tcl
+++ b/library/tearoff.tcl
@@ -39,7 +39,7 @@ proc ::tk::TearOffMenu {w {x 0} {y 0}} {
 	    # Shift by height of tearoff entry minus height of window titlebar
 	    catch {incr y [expr {[$w yposition 1] - 16}]}
 	    # Avoid the native menu bar which sits on top of everything.
-	    if {$y < 22} { set y 22 }
+	    if {$y < 22} {set y 22}
 	}
     }
 
@@ -155,9 +155,9 @@ proc ::tk::MenuDup {src dst type} {
 
     while {[set index [string first $src $tags]] != -1} {
 	if {$index > 0} {
-	    append x [string range $tags 0 [expr {$index - 1}]]$dst
+	    append x [string range $tags 0 $index-1]$dst
 	}
-	set tags [string range $tags [expr {$index + $srcLen}] end]
+	set tags [string range $tags $index+$srcLen end]
     }
     append x $tags
 
@@ -172,10 +172,10 @@ proc ::tk::MenuDup {src dst type} {
 
 	while {[set index [string first $event $script]] != -1} {
 	    if {$index > 0} {
-		append x [string range $script 0 [expr {$index - 1}]]
+		append x [string range $script 0 $index-1]
 	    }
 	    append x $dst
-	    set script [string range $script [expr {$index + $eventLen}] end]
+	    set script [string range $script $index+$eventLen end]
 	}
 	append x $script
 
-- 
cgit v0.12


From 55208e8f833e1be79f085fa7cd1519b97fa9cb23 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 12 Jul 2020 09:25:49 +0000
Subject: Fix regression introduced by [f7f8ba2e3e]. Patch by Christopher
 Chavez.

---
 generic/tkFont.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/generic/tkFont.c b/generic/tkFont.c
index 3a06719..ee72d83 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.c
@@ -2339,8 +2339,9 @@ Tk_DrawTextLayout(
 	    lastByte = Tcl_UtfAtIndex(chunkPtr->start, numDisplayChars);
 #if TK_DRAW_IN_CONTEXT
 	    TkpDrawCharsInContext(display, drawable, gc, layoutPtr->tkfont,
-		    chunkPtr->start, chunkPtr->numBytes, firstChar,
-		    numDisplayChars - firstChar, x+chunkPtr->x, y+chunkPtr->y);
+		    chunkPtr->start, chunkPtr->numBytes,
+		    firstByte - chunkPtr->start, lastByte - firstByte,
+		    x+chunkPtr->x, y+chunkPtr->y);
 #else /* !TK_DRAW_IN_CONTEXT */
 	    Tk_DrawChars(display, drawable, gc, layoutPtr->tkfont, firstByte,
 		    lastByte - firstByte, x+chunkPtr->x+drawX, y+chunkPtr->y);
@@ -2412,12 +2413,12 @@ TkDrawAngledTextLayout(
 	    if (angle == 0.0) {
 		TkpDrawCharsInContext(display, drawable, gc,
 			layoutPtr->tkfont, chunkPtr->start, chunkPtr->numBytes,
-			firstChar, numDisplayChars - firstChar,
+			firstByte - chunkPtr->start, lastByte - firstByte,
 			(int)(x + dx), (int)(y + dy));
 	    } else {
 		TkpDrawAngledCharsInContext(display, drawable, gc,
 			layoutPtr->tkfont, chunkPtr->start, chunkPtr->numBytes,
-			firstChar, numDisplayChars - firstChar,
+			firstByte - chunkPtr->start, lastByte - firstByte,
 			x+dx, y+dy, angle);
 	    }
 #else /* !TK_DRAW_IN_CONTEXT */
-- 
cgit v0.12


From a0ad668fc8f8b2ec4dd82126ff7e60706abd0d0d Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 12 Jul 2020 09:33:14 +0000
Subject: The draw-in-context functions on platforms for which
 TK_DRAW_IN_CONTEXT is not defined are unused. Add comments telling this and
 pointing to ticket [7655f65ae7].

---
 generic/tkFont.c   | 4 ++--
 unix/tkUnixFont.c  | 3 +++
 unix/tkUnixRFont.c | 3 +++
 win/tkWinFont.c    | 5 ++++-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/generic/tkFont.c b/generic/tkFont.c
index ee72d83..bdaf971 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.c
@@ -2298,7 +2298,7 @@ Tk_DrawTextLayout(
     int x, int y,		/* Upper-left hand corner of rectangle in
 				 * which to draw (pixels). */
     int firstChar,		/* The index of the first character to draw
-				 * from the given text item. 0 specfies the
+				 * from the given text item. 0 specifies the
 				 * beginning. */
     int lastChar)		/* The index just after the last character to
 				 * draw from the given text item. A number < 0
@@ -2369,7 +2369,7 @@ TkDrawAngledTextLayout(
 				 * which to draw (pixels). */
     double angle,
     int firstChar,		/* The index of the first character to draw
-				 * from the given text item. 0 specfies the
+				 * from the given text item. 0 specifies the
 				 * beginning. */
     int lastChar)		/* The index just after the last character to
 				 * draw from the given text item. A number < 0
diff --git a/unix/tkUnixFont.c b/unix/tkUnixFont.c
index 0963953..d524bfd 100644
--- a/unix/tkUnixFont.c
+++ b/unix/tkUnixFont.c
@@ -1374,6 +1374,9 @@ Tk_DrawChars(
  *	with access to all the characters on the line for context. On X11 this
  *	context isn't consulted, so we just call Tk_DrawChars().
  *
+ *      Note: TK_DRAW_IN_CONTEXT being currently defined only on macOS, this
+ *            function is unused (and possibly unfinished). See [7655f65ae7].
+ *
  * Results:
  *	None.
  *
diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c
index 069598f..cac6f8e 100644
--- a/unix/tkUnixRFont.c
+++ b/unix/tkUnixRFont.c
@@ -1309,6 +1309,9 @@ TkDrawAngledChars(
  *	with access to all the characters on the line for context. On X11 this
  *	context isn't consulted, so we just call Tk_DrawChars().
  *
+ *      Note: TK_DRAW_IN_CONTEXT being currently defined only on macOS, this
+ *            function is unused (and possibly unfinished). See [7655f65ae7].
+ *
  * Results:
  *	None.
  *
diff --git a/win/tkWinFont.c b/win/tkWinFont.c
index 3d38ea4..7967a61 100644
--- a/win/tkWinFont.c
+++ b/win/tkWinFont.c
@@ -1363,7 +1363,10 @@ TkDrawAngledChars(
  *	Draw a string of characters on the screen like Tk_DrawChars(), but
  *	with access to all the characters on the line for context. On Windows
  *	this context isn't consulted, so we just call Tk_DrawChars().
- *
+  *
+ *      Note: TK_DRAW_IN_CONTEXT being currently defined only on macOS, this
+ *            function is unused (and possibly unfinished). See [7655f65ae7].
+*
  * Results:
  *	None.
  *
-- 
cgit v0.12


From 4daf13d8e213797a97952c0147a165acdd260a29 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 12 Jul 2020 09:35:30 +0000
Subject: tkFont.c needs to include tkMacOSXInt.h on macOS, because this is
 where TK_DRAW_IN_CONTEXT is defined.

---
 generic/tkFont.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/generic/tkFont.c b/generic/tkFont.c
index 148ba20..c507371 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.c
@@ -13,6 +13,9 @@
 
 #include "tkInt.h"
 #include "tkFont.h"
+#if defined(MAC_OSX_TK)
+#include "tkMacOSXInt.h"    /* Defines TK_DRAW_IN_CONTEXT */
+#endif
 
 /*
  * The following structure is used to keep track of all the fonts that exist
-- 
cgit v0.12


From 5075064d26591eac73ed4d1995af9a651a51657b Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 12 Jul 2020 10:17:57 +0000
Subject: Add yet another comment about the '#if 0' in tkFont.c

---
 generic/tkFont.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tkFont.c b/generic/tkFont.c
index c507371..cbe885a 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.c
@@ -2306,7 +2306,7 @@ Tk_DrawTextLayout(
 				 * means to draw all characters. */
 {
 #if 0
-    /* Use TkDrawAngledTextLayout() implementation */
+    /* Use TkDrawAngledTextLayout() implementation - testing purposes at this point */
     TkDrawAngledTextLayout(display, drawable, gc, layout, x, y, 0.0, firstChar, lastChar);
 #else
     TextLayout *layoutPtr = (TextLayout *) layout;
-- 
cgit v0.12


From c1b6abf51d0a94a1ef77c7119af5deddd62e1d16 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 12 Jul 2020 14:44:18 +0000
Subject: Fix [2442314]: Fontchooser - use message catalog for font style.

---
 library/fontchooser.tcl | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/library/fontchooser.tcl b/library/fontchooser.tcl
index 5395acb..0510fb9 100644
--- a/library/fontchooser.tcl
+++ b/library/fontchooser.tcl
@@ -14,11 +14,11 @@ namespace eval ::tk::fontchooser {
     set S(W) .__tk__fontchooser
     set S(fonts) [lsort -dictionary [font families]]
     set S(styles) [list \
-                       [::msgcat::mc "Regular"] \
-                       [::msgcat::mc "Italic"] \
-                       [::msgcat::mc "Bold"] \
-                       [::msgcat::mc "Bold Italic"] \
-                      ]
+	[::msgcat::mc "Regular"] \
+	[::msgcat::mc "Italic"] \
+	[::msgcat::mc "Bold"] \
+	[::msgcat::mc "Bold Italic"] \
+    ]
 
     set S(sizes) {8 9 10 11 12 14 16 18 20 22 24 26 28 36 48 72}
     set S(strike) 0
@@ -36,9 +36,9 @@ proc ::tk::fontchooser::Setup {} {
 
     # Canonical versions of font families, styles, etc. for easier searching
     set S(fonts,lcase) {}
-    foreach font $S(fonts) { lappend S(fonts,lcase) [string tolower $font]}
+    foreach font $S(fonts) {lappend S(fonts,lcase) [string tolower $font]}
     set S(styles,lcase) {}
-    foreach style $S(styles) { lappend S(styles,lcase) [string tolower $style]}
+    foreach style $S(styles) {lappend S(styles,lcase) [string tolower $style]}
     set S(sizes,lcase) $S(sizes)
 
     ::ttk::style layout FontchooserFrame {
@@ -145,10 +145,13 @@ proc ::tk::fontchooser::Create {} {
         wm title $S(W) $S(-title)
         wm transient $S(W) [winfo toplevel $S(-parent)]
 
+        set scaling [tk scaling]
+        set sizeWidth [expr {int([string length [::msgcat::mc "&Size:"]] * $scaling)}]
+
         set outer [::ttk::frame $S(W).outer -padding {10 10}]
         ::tk::AmpWidget ::ttk::label $S(W).font -text [::msgcat::mc "&Font:"]
         ::tk::AmpWidget ::ttk::label $S(W).style -text [::msgcat::mc "Font st&yle:"]
-        ::tk::AmpWidget ::ttk::label $S(W).size -text [::msgcat::mc "&Size:"]
+        ::tk::AmpWidget ::ttk::label $S(W).size -text [::msgcat::mc "&Size:"] -width $sizeWidth
         ttk::entry $S(W).efont -width 18 \
             -textvariable [namespace which -variable S](font)
         ttk::entry $S(W).estyle -width 10 \
@@ -199,7 +202,7 @@ proc ::tk::fontchooser::Create {} {
         set minsize(sizes) \
             [expr {[font measure TkDefaultFont "-99"] + $scroll_width}]
         set min [expr {$minsize(gap) * 4}]
-        foreach {what width} [array get minsize] { incr min $width }
+        foreach {what width} [array get minsize] {incr min $width}
         wm minsize $S(W) $min 260
 
         bind $S(W) <Return> [namespace code [list Done 1]]
@@ -327,13 +330,13 @@ proc ::tk::fontchooser::Init {{defaultFont ""}} {
         set S(size) $F(-size)
         set S(strike) $F(-overstrike)
         set S(under) $F(-underline)
-        set S(style) "Regular"
+        set S(style) [::msgcat::mc "Regular"]
         if {$F(-weight) eq "bold" && $F(-slant) eq "italic"} {
-            set S(style) "Bold Italic"
+            set S(style) [::msgcat::mc "Bold Italic"]
         } elseif {$F(-weight) eq "bold"} {
-            set S(style) "Bold"
+            set S(style) [::msgcat::mc "Bold"]
         } elseif {$F(-slant) eq "italic"} {
-            set S(style) "Italic"
+            set S(style) [::msgcat::mc "Italic"]
         }
 
         set S(first) 0
@@ -396,7 +399,7 @@ proc ::tk::fontchooser::Tracer {var1 var2 op} {
         }
         $S(W).l${var}s see $n
     }
-    if {!$bad} { Update }
+    if {!$bad} {Update}
     $S(W).ok configure -state $nstate
 }
 
@@ -408,11 +411,11 @@ proc ::tk::fontchooser::Update {} {
     variable S
 
     set S(result) [list $S(font) $S(size)]
-    if {$S(style) eq "Bold"} { lappend S(result) bold }
-    if {$S(style) eq "Italic"} { lappend S(result) italic }
-    if {$S(style) eq "Bold Italic"} { lappend S(result) bold italic}
-    if {$S(strike)} { lappend S(result) overstrike}
-    if {$S(under)} { lappend S(result) underline}
+    if {$S(style) eq [::msgcat::mc "Bold"]} {lappend S(result) bold}
+    if {$S(style) eq [::msgcat::mc "Italic"]} {lappend S(result) italic}
+    if {$S(style) eq [::msgcat::mc "Bold Italic"]} {lappend S(result) bold italic}
+    if {$S(strike)} {lappend S(result) overstrike}
+    if {$S(under)} {lappend S(result) underline}
 
     $S(sample) configure -font $S(result)
 }
-- 
cgit v0.12


From ce1d35c813ae7774af4bbd3f1cc5d3a1f0c8cac6 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 12 Jul 2020 15:21:10 +0000
Subject: Spurious additional ::

---
 library/fontchooser.tcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/fontchooser.tcl b/library/fontchooser.tcl
index 0510fb9..3e2b6df 100644
--- a/library/fontchooser.tcl
+++ b/library/fontchooser.tcl
@@ -280,7 +280,7 @@ proc ::tk::fontchooser::Create {} {
 # Arguments:
 #       ok              true if user pressed OK
 #
-proc ::tk::::fontchooser::Done {ok} {
+proc ::tk::fontchooser::Done {ok} {
     variable S
 
     if {! $ok} {
-- 
cgit v0.12


From af7543d7737a8987f2a209471913e6bbf4106b78 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Sun, 12 Jul 2020 20:50:12 +0000
Subject: Process timer events as well as idle events in some of the inner
 event loops used by Tk

---
 macosx/tkMacOSXEmbed.c       | 4 +---
 macosx/tkMacOSXEvent.c       | 2 +-
 macosx/tkMacOSXNotify.c      | 2 --
 macosx/tkMacOSXWindowEvent.c | 4 ++--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/macosx/tkMacOSXEmbed.c b/macosx/tkMacOSXEmbed.c
index 6c4ac1f..e58cdd0 100644
--- a/macosx/tkMacOSXEmbed.c
+++ b/macosx/tkMacOSXEmbed.c
@@ -1049,9 +1049,7 @@ EmbedGeometryRequest(
      */
 
     Tk_GeometryRequest((Tk_Window) winPtr, width, height);
-    while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {
-	/* Empty loop body. */
-    }
+    while (Tcl_DoOneEvent(TCL_IDLE_EVENTS|TCL_TIMER_EVENTS|TCL_DONT_WAIT)) {}
     if ((winPtr->changes.width != width)
 	    || (winPtr->changes.height != height)) {
 	EmbedSendConfigure(containerPtr);
diff --git a/macosx/tkMacOSXEvent.c b/macosx/tkMacOSXEvent.c
index b9c9b6a..c543b8d 100644
--- a/macosx/tkMacOSXEvent.c
+++ b/macosx/tkMacOSXEvent.c
@@ -134,7 +134,7 @@ TkMacOSXFlushWindows(void)
     if (Tk_GetNumMainWindows() == 0) {
 	return;
     }
-    while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)){}
+    while (Tcl_DoOneEvent(TCL_IDLE_EVENTS|TCL_TIMER_EVENTS|TCL_DONT_WAIT)){}
     for (NSWindow *w in [NSApp orderedWindows]) {
 	[w display];
     }
diff --git a/macosx/tkMacOSXNotify.c b/macosx/tkMacOSXNotify.c
index a4a1125..00db7d6 100644
--- a/macosx/tkMacOSXNotify.c
+++ b/macosx/tkMacOSXNotify.c
@@ -530,9 +530,7 @@ TkMacOSXEventsCheckProc(
 		 * Generate Xevents.
 		 */
 
-		int oldServiceMode = Tcl_SetServiceMode(TCL_SERVICE_ALL);
 		NSEvent *processedEvent = [NSApp tkProcessEvent:currentEvent];
-		Tcl_SetServiceMode(oldServiceMode);
 		if (processedEvent) {
 		    eventsFound++;
 
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index a169a15..2de1550 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -1078,7 +1078,7 @@ ConfigureRestrictProc(
 	/*
 	 * First process all of the Expose events.
 	 */
-    	while (Tcl_ServiceEvent(TCL_IDLE_EVENTS)) {};
+    	while (Tcl_ServiceEvent(TCL_IDLE_EVENTS|TCL_TIMER_EVENTS|TCL_DONT_WAIT)) {};
 
     	oldProc = Tk_RestrictEvents(ExposeRestrictProc, UINT2PTR(serial), &oldArg);
     	while (Tcl_ServiceEvent(TCL_WINDOW_EVENTS)) {};
@@ -1097,7 +1097,7 @@ ConfigureRestrictProc(
 	 * that were created when the expose events were processed.
 	 */
 
-	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {}
+	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS|TCL_TIMER_EVENTS|TCL_DONT_WAIT)) {}
     }
 }
 
-- 
cgit v0.12


From 5e62075ec23dc8688b0880787a8509deb0b3d7b1 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Sun, 12 Jul 2020 22:20:04 +0000
Subject: Tweak and untweak a couple of tests with race conditions.

---
 tests/textDisp.test | 2 +-
 tests/textWind.test | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/textDisp.test b/tests/textDisp.test
index b4891e4..a017dad 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -4198,7 +4198,7 @@ test textDisp-33.2 {one line longer than fits in the widget} {
     .tt debug 1
     set tk_textHeightCalc ""
     .tt insert 1.0 [string repeat "more wrap + " 1]
-    after 100 ; update idletasks
+    update idletasks
     # Nothing should have been recalculated.
     set tk_textHeightCalc
 } {}
diff --git a/tests/textWind.test b/tests/textWind.test
index 938357b..f2daaca 100644
--- a/tests/textWind.test
+++ b/tests/textWind.test
@@ -751,15 +751,17 @@ test textWind-10.5 {EmbWinLayoutProc procedure, error in creating window} -setup
     destroy .t.f
     proc bgerror args {
         global msg
-	lappend msg $args
+        if {$msg == ""} {
+	    lappend msg $args
+	}
     }
 } -body {
     .t insert 1.0 "Some sample text"
+    set msg {}
     .t window create 1.5 -create {
         frame .t.f
         frame .t.f.f -width 10 -height 20 -bg $color
     }
-    set msg {}
     update idletasks
     lappend msg [winfo exists .t.f.f]
 } -cleanup {
-- 
cgit v0.12


From 1711312fd78e09df1b5f8ee28abab5a0ca2c42c4 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Mon, 13 Jul 2020 14:54:33 +0000
Subject: Do not process timer events in drawRect (Thanks to Nicolas Bats) and
 remove references to ServiceMode since Tcl_ServiceAll is not being called
 anymore.

---
 macosx/tkMacOSXNotify.c      |  1 -
 macosx/tkMacOSXWindowEvent.c | 37 +++++++++++++++----------------------
 tests/textDisp.test          |  8 +++++---
 3 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/macosx/tkMacOSXNotify.c b/macosx/tkMacOSXNotify.c
index 00db7d6..367f3b6 100644
--- a/macosx/tkMacOSXNotify.c
+++ b/macosx/tkMacOSXNotify.c
@@ -261,7 +261,6 @@ Tk_MacOSXSetupTkNotifier(void)
 	    Tcl_CreateEventSource(TkMacOSXEventsSetupProc,
 		    TkMacOSXEventsCheckProc, NULL);
 	    TkCreateExitHandler(TkMacOSXNotifyExitHandler, NULL);
-	    Tcl_SetServiceMode(TCL_SERVICE_ALL);
 	    TclMacOSXNotifierAddRunLoopMode(NSEventTrackingRunLoopMode);
 	    TclMacOSXNotifierAddRunLoopMode(NSModalPanelRunLoopMode);
 	}
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 2de1550..0563ce6 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -91,14 +91,11 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
 	    height = bounds.size.height - wmPtr->yInParent;
 	    flags |= TK_SIZE_CHANGED;
 	}
-	if (Tcl_GetServiceMode() != TCL_SERVICE_NONE) {
-	    /*
-	     * Propagate geometry changes immediately.
-	     */
-
-	    flags |= TK_MACOSX_HANDLE_EVENT_IMMEDIATELY;
-	}
+	/*
+	 * Propagate geometry changes immediately.
+	 */
 
+	flags |= TK_MACOSX_HANDLE_EVENT_IMMEDIATELY;
 	TkGenWMConfigureEvent((Tk_Window) winPtr, x, y, width, height, flags);
     }
 
@@ -116,24 +113,20 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
 	winPtr->wmInfoPtr->hints.initial_state =
 		TkMacOSXIsWindowZoomed(winPtr) ? ZoomState : NormalState;
 	Tk_MapWindow((Tk_Window) winPtr);
-	if (Tcl_GetServiceMode() != TCL_SERVICE_NONE) {
 
-	    /*
-	     * Process all Tk events generated by Tk_MapWindow().
-	     */
+	/*
+	 * Process all Tk events generated by Tk_MapWindow().
+	 */
 
-	    while (Tcl_ServiceEvent(0)) {}
-	    while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {}
+	while (Tcl_ServiceEvent(0)) {}
+	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {}
 
-	    /*
-	     * NSWindowDidDeminiaturizeNotification is received after
-	     * NSWindowDidBecomeKeyNotification, so activate manually
-	     */
+	/*
+	 * NSWindowDidDeminiaturizeNotification is received after
+	 * NSWindowDidBecomeKeyNotification, so activate manually
+	 */
 
-	    GenerateActivateEvents(winPtr, 1);
-	} else {
-	    Tcl_DoWhenIdle(DoWindowActivate, winPtr);
-	}
+	GenerateActivateEvents(winPtr, 1);
     }
 }
 
@@ -1097,7 +1090,7 @@ ConfigureRestrictProc(
 	 * that were created when the expose events were processed.
 	 */
 
-	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS|TCL_TIMER_EVENTS|TCL_DONT_WAIT)) {}
+	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {}
     }
 }
 
diff --git a/tests/textDisp.test b/tests/textDisp.test
index a017dad..796fd92 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -4196,12 +4196,14 @@ test textDisp-33.2 {one line longer than fits in the widget} {
     destroy .tt
     pack [text .tt -wrap char]
     .tt debug 1
+    update idletasks
     set tk_textHeightCalc ""
+    set timer [after 700 lappend tk_textHeightCalc "Timed out"]
     .tt insert 1.0 [string repeat "more wrap + " 1]
-    update idletasks
-    # Nothing should have been recalculated.
+    vwait tk_textHeightCalc
+    after cancel timer
     set tk_textHeightCalc
-} {}
+} {1.0}
 test textDisp-33.3 {one line longer than fits in the widget} {
     destroy .tt
     pack [text .tt -wrap char]
-- 
cgit v0.12


From 3f9e5a8e1a6a5b3a0917e82bed0dc34acf93cf67 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 14 Jul 2020 11:02:35 +0000
Subject: New TIP #580 implementation. Documentation still missing.

---
 generic/tk.decls            | 19 +++++++++++++++++++
 generic/tkBind.c            | 14 +++++++-------
 generic/tkBusy.c            |  2 +-
 generic/tkButton.c          |  2 +-
 generic/tkCanvas.c          |  6 +++---
 generic/tkDecls.h           | 28 ++++++++++++++++++++++++++++
 generic/tkEntry.c           |  8 ++++----
 generic/tkEvent.c           | 10 +++++-----
 generic/tkFocus.c           |  8 ++++----
 generic/tkFrame.c           |  2 +-
 generic/tkGrab.c            |  6 +++---
 generic/tkGrid.c            |  8 ++++----
 generic/tkInt.h             |  9 ---------
 generic/tkListbox.c         |  4 ++--
 generic/tkMenu.c            |  2 +-
 generic/tkMenubutton.c      |  2 +-
 generic/tkMessage.c         |  2 +-
 generic/tkObj.c             |  4 ++--
 generic/tkPack.c            |  6 +++---
 generic/tkPanedWindow.c     |  4 ++--
 generic/tkPlace.c           |  4 ++--
 generic/tkPointer.c         |  2 +-
 generic/tkScale.c           |  2 +-
 generic/tkScrollbar.c       |  2 +-
 generic/tkSelect.c          |  2 +-
 generic/tkStubInit.c        |  5 +++++
 generic/tkText.c            | 12 ++++++------
 generic/tkTextDisp.c        |  4 ++--
 generic/tkTextTag.c         |  2 +-
 generic/tkUtil.c            |  4 ++--
 generic/tkWindow.c          |  4 ++--
 macosx/tkMacOSXDialog.c     |  8 ++++----
 macosx/tkMacOSXKeyEvent.c   | 10 +++++-----
 macosx/tkMacOSXMouseEvent.c |  2 +-
 macosx/tkMacOSXWm.c         |  6 +++---
 tests/text.test             |  2 +-
 unix/tkUnixWm.c             |  4 ++--
 win/tkWinDialog.c           |  8 ++++----
 win/tkWinWm.c               |  8 ++++----
 39 files changed, 140 insertions(+), 97 deletions(-)

diff --git a/generic/tk.decls b/generic/tk.decls
index a77720f..b69df7b 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -1069,6 +1069,25 @@ declare 273 {
     void Tk_CreateOldPhotoImageFormat(const Tk_PhotoImageFormat *formatPtr)
 }
 
+# TIP #???
+declare 274 {
+    int Tk_AlwaysShowSelection(Tk_Window tkwin)
+}
+declare 275 {
+    unsigned Tk_GetButtonMask(unsigned button)
+}
+declare 276 {
+    int Tk_GetDoublePixelsFromObj(Tcl_Interp *interp, Tk_Window tkwin,
+	    Tcl_Obj *objPtr, double *doublePtr)
+}
+declare 277 {
+    Tcl_Obj *Tk_NewWindowObj(Tk_Window tkwin)
+}
+declare 278 {
+    void Tk_SendVirtualEvent(Tk_Window tgtWin, const char *eventName,
+	    Tcl_Obj *detail)
+}
+
 # Define the platform specific public Tk interface.  These functions are
 # only available on the designated platform.
 
diff --git a/generic/tkBind.c b/generic/tkBind.c
index d00fc7c..0e06a43 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -5010,7 +5010,7 @@ ParseEventDescription(
 				"NON_BUTTON");
 		    }
 #if SUPPORT_ADDITIONAL_MOTION_SYNTAX
-		    patPtr->modMask |= TkGetButtonMask(button);
+		    patPtr->modMask |= Tk_GetButtonMask(button);
 		    p = SkipFieldDelims(p);
 		    while (*p && *p != '>') {
 			p = SkipFieldDelims(GetField(p, field, sizeof(field)));
@@ -5020,7 +5020,7 @@ ParseEventDescription(
 				    patPtr, 0,
 				    Tcl_ObjPrintf("bad button number \"%s\"", field), "BUTTON");
 			}
-			patPtr->modMask |= TkGetButtonMask(button);
+			patPtr->modMask |= Tk_GetButtonMask(button);
 		    }
 		    patPtr->info = ButtonNumberFromState(patPtr->modMask);
 #endif
@@ -5199,15 +5199,15 @@ GetPatternObj(
 		case ButtonPress:
 		case ButtonRelease:
 		    assert(patPtr->info <= Button9);
-		    Tcl_AppendPrintfToObj(patternObj, "-%d", (int) patPtr->info);
+		    Tcl_AppendPrintfToObj(patternObj, "-%u", (unsigned) patPtr->info);
 		    break;
 #if PRINT_SHORT_MOTION_SYNTAX
 		case MotionNotify: {
-		    ModMask mask = patPtr->modMask;
+		    unsigned mask = patPtr->modMask;
 		    while (mask & ALL_BUTTONS) {
-			int button = ButtonNumberFromState(mask);
-			Tcl_AppendPrintfToObj(patternObj, "-%d", button);
-			mask &= ~TkGetButtonMask(button);
+			unsigned button = ButtonNumberFromState(mask);
+			Tcl_AppendPrintfToObj(patternObj, "-%u", button);
+			mask &= ~Tk_GetButtonMask(button);
 		    }
 		    break;
 		}
diff --git a/generic/tkBusy.c b/generic/tkBusy.c
index 5014eeb..cad4032 100644
--- a/generic/tkBusy.c
+++ b/generic/tkBusy.c
@@ -900,7 +900,7 @@ Tk_BusyObjCmd(
 	    if (pattern == NULL ||
 		    Tcl_StringCaseMatch(Tk_PathName(busyPtr->tkRef), pattern, 0)) {
 		Tcl_ListObjAppendElement(interp, objPtr,
-			TkNewWindowObj(busyPtr->tkRef));
+			Tk_NewWindowObj(busyPtr->tkRef));
 	    }
 	}
 	Tcl_SetObjResult(interp, objPtr);
diff --git a/generic/tkButton.c b/generic/tkButton.c
index 8056f31..69d4b12 100644
--- a/generic/tkButton.c
+++ b/generic/tkButton.c
@@ -760,7 +760,7 @@ ButtonCreate(
 	return TCL_ERROR;
     }
 
-    Tcl_SetObjResult(interp, TkNewWindowObj(butPtr->tkwin));
+    Tcl_SetObjResult(interp, Tk_NewWindowObj(butPtr->tkwin));
     return TCL_OK;
 }
 
diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c
index 193d877..5322466 100644
--- a/generic/tkCanvas.c
+++ b/generic/tkCanvas.c
@@ -799,7 +799,7 @@ Tk_CanvasObjCmd(
 	goto error;
     }
 
-    Tcl_SetObjResult(interp, TkNewWindowObj(canvasPtr->tkwin));
+    Tcl_SetObjResult(interp, Tk_NewWindowObj(canvasPtr->tkwin));
     return TCL_OK;
 
   error:
@@ -5082,7 +5082,7 @@ CanvasBindProc(
     XEvent *eventPtr)		/* Pointer to X event that just happened. */
 {
     TkCanvas *canvasPtr = (TkCanvas *)clientData;
-    unsigned long mask;
+    unsigned mask;
 
     Tcl_Preserve(canvasPtr);
 
@@ -5095,7 +5095,7 @@ CanvasBindProc(
     switch (eventPtr->type) {
     case ButtonPress:
     case ButtonRelease:
-	mask = TkGetButtonMask(eventPtr->xbutton.button);
+	mask = Tk_GetButtonMask(eventPtr->xbutton.button);
 
 	/*
 	 * For button press events, repick the current item using the button
diff --git a/generic/tkDecls.h b/generic/tkDecls.h
index 8753b2d..f521c09 100644
--- a/generic/tkDecls.h
+++ b/generic/tkDecls.h
@@ -878,6 +878,19 @@ EXTERN void		Tk_CreateOldImageType(const Tk_ImageType *typePtr);
 /* 273 */
 EXTERN void		Tk_CreateOldPhotoImageFormat(
 				const Tk_PhotoImageFormat *formatPtr);
+/* 274 */
+EXTERN int		Tk_AlwaysShowSelection(Tk_Window tkwin);
+/* 275 */
+EXTERN unsigned		Tk_GetButtonMask(unsigned button);
+/* 276 */
+EXTERN int		Tk_GetDoublePixelsFromObj(Tcl_Interp *interp,
+				Tk_Window tkwin, Tcl_Obj *objPtr,
+				double *doublePtr);
+/* 277 */
+EXTERN Tcl_Obj *	Tk_NewWindowObj(Tk_Window tkwin);
+/* 278 */
+EXTERN void		Tk_SendVirtualEvent(Tk_Window tgtWin,
+				const char *eventName, Tcl_Obj *detail);
 
 typedef struct {
     const struct TkPlatStubs *tkPlatStubs;
@@ -1164,6 +1177,11 @@ typedef struct TkStubs {
     Tcl_Interp * (*tk_Interp) (Tk_Window tkwin); /* 271 */
     void (*tk_CreateOldImageType) (const Tk_ImageType *typePtr); /* 272 */
     void (*tk_CreateOldPhotoImageFormat) (const Tk_PhotoImageFormat *formatPtr); /* 273 */
+    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 */
+    Tcl_Obj * (*tk_NewWindowObj) (Tk_Window tkwin); /* 277 */
+    void (*tk_SendVirtualEvent) (Tk_Window tgtWin, const char *eventName, Tcl_Obj *detail); /* 278 */
 } TkStubs;
 
 extern const TkStubs *tkStubsPtr;
@@ -1724,6 +1742,16 @@ extern const TkStubs *tkStubsPtr;
 	(tkStubsPtr->tk_CreateOldImageType) /* 272 */
 #define Tk_CreateOldPhotoImageFormat \
 	(tkStubsPtr->tk_CreateOldPhotoImageFormat) /* 273 */
+#define Tk_AlwaysShowSelection \
+	(tkStubsPtr->tk_AlwaysShowSelection) /* 274 */
+#define Tk_GetButtonMask \
+	(tkStubsPtr->tk_GetButtonMask) /* 275 */
+#define Tk_GetDoublePixelsFromObj \
+	(tkStubsPtr->tk_GetDoublePixelsFromObj) /* 276 */
+#define Tk_NewWindowObj \
+	(tkStubsPtr->tk_NewWindowObj) /* 277 */
+#define Tk_SendVirtualEvent \
+	(tkStubsPtr->tk_SendVirtualEvent) /* 278 */
 
 #endif /* defined(USE_TK_STUBS) */
 
diff --git a/generic/tkEntry.c b/generic/tkEntry.c
index 4c6c65f..1677677 100644
--- a/generic/tkEntry.c
+++ b/generic/tkEntry.c
@@ -574,7 +574,7 @@ Tk_EntryObjCmd(
 	return TCL_ERROR;
     }
 
-    Tcl_SetObjResult(interp, TkNewWindowObj(entryPtr->tkwin));
+    Tcl_SetObjResult(interp, Tk_NewWindowObj(entryPtr->tkwin));
     return TCL_OK;
 }
 
@@ -1684,7 +1684,7 @@ DisplayEntry(
      * Hide the selection whenever we don't have the focus, unless we
      * always want to show selection.
      */
-    if (TkpAlwaysShowSelection(entryPtr->tkwin)) {
+    if (Tk_AlwaysShowSelection(entryPtr->tkwin)) {
 	showSelection = 1;
     } else {
 	showSelection = (entryPtr->flags & GOT_FOCUS);
@@ -2978,7 +2978,7 @@ EntryLostSelection(
      * This is controlled by ::tk::AlwaysShowSelection.
      */
 
-    if (TkpAlwaysShowSelection(entryPtr->tkwin)
+    if (Tk_AlwaysShowSelection(entryPtr->tkwin)
 	    && (entryPtr->selectFirst != TCL_INDEX_NONE) && entryPtr->exportSelection
 	    && (!Tcl_IsSafe(entryPtr->interp))) {
 	entryPtr->selectFirst = TCL_INDEX_NONE;
@@ -3807,7 +3807,7 @@ Tk_SpinboxObjCmd(
 	goto error;
     }
 
-    Tcl_SetObjResult(interp, TkNewWindowObj(entryPtr->tkwin));
+    Tcl_SetObjResult(interp, Tk_NewWindowObj(entryPtr->tkwin));
     return TCL_OK;
 
   error:
diff --git a/generic/tkEvent.c b/generic/tkEvent.c
index bd312ad..c94ad50 100644
--- a/generic/tkEvent.c
+++ b/generic/tkEvent.c
@@ -513,7 +513,7 @@ RefreshKeyboardMappingIfNeeded(
 /*
  *----------------------------------------------------------------------
  *
- * TkGetButtonMask --
+ * Tk_GetButtonMask --
  *
  *	Return the proper Button${n}Mask for the button.
  *
@@ -526,14 +526,14 @@ RefreshKeyboardMappingIfNeeded(
  *----------------------------------------------------------------------
  */
 
-static const unsigned long buttonMasks[] = {
+static const unsigned buttonMasks[] = {
     0, Button1Mask, Button2Mask, Button3Mask, Button4Mask, Button5Mask,
     Button6Mask, Button7Mask, Button8Mask, Button9Mask
 };
 
-unsigned long
-TkGetButtonMask(
-    unsigned int button)
+unsigned
+Tk_GetButtonMask(
+    unsigned button)
 {
     return (button > Button9) ? 0 : buttonMasks[button];
 }
diff --git a/generic/tkFocus.c b/generic/tkFocus.c
index 8066afd..f6afcd8 100644
--- a/generic/tkFocus.c
+++ b/generic/tkFocus.c
@@ -128,7 +128,7 @@ Tk_FocusObjCmd(
 	Tk_Window focusWin = (Tk_Window) TkGetFocusWin(winPtr);
 
 	if (focusWin != NULL) {
-	    Tcl_SetObjResult(interp, TkNewWindowObj(focusWin));
+	    Tcl_SetObjResult(interp, Tk_NewWindowObj(focusWin));
 	}
 	return TCL_OK;
     }
@@ -179,7 +179,7 @@ Tk_FocusObjCmd(
 	}
 	newPtr = TkGetFocusWin(newPtr);
 	if (newPtr != NULL) {
-	    Tcl_SetObjResult(interp, TkNewWindowObj((Tk_Window) newPtr));
+	    Tcl_SetObjResult(interp, Tk_NewWindowObj((Tk_Window) newPtr));
 	}
 	break;
     case 1:			/* -force */
@@ -212,12 +212,12 @@ Tk_FocusObjCmd(
 	    for (tlFocusPtr = newPtr->mainPtr->tlFocusPtr; tlFocusPtr != NULL;
 		    tlFocusPtr = tlFocusPtr->nextPtr) {
 		if (tlFocusPtr->topLevelPtr == topLevelPtr) {
-		    Tcl_SetObjResult(interp, TkNewWindowObj((Tk_Window)
+		    Tcl_SetObjResult(interp, Tk_NewWindowObj((Tk_Window)
 			    tlFocusPtr->focusWinPtr));
 		    return TCL_OK;
 		}
 	    }
-	    Tcl_SetObjResult(interp, TkNewWindowObj((Tk_Window) topLevelPtr));
+	    Tcl_SetObjResult(interp, Tk_NewWindowObj((Tk_Window) topLevelPtr));
 	    return TCL_OK;
 	}
 	break;
diff --git a/generic/tkFrame.c b/generic/tkFrame.c
index df370af..726594a 100644
--- a/generic/tkFrame.c
+++ b/generic/tkFrame.c
@@ -732,7 +732,7 @@ CreateFrame(
     if (type == TYPE_TOPLEVEL) {
 	Tcl_DoWhenIdle(MapFrame, framePtr);
     }
-    Tcl_SetObjResult(interp, TkNewWindowObj(newWin));
+    Tcl_SetObjResult(interp, Tk_NewWindowObj(newWin));
     return TCL_OK;
 
   error:
diff --git a/generic/tkGrab.c b/generic/tkGrab.c
index 3e4d9db..87bfdde 100644
--- a/generic/tkGrab.c
+++ b/generic/tkGrab.c
@@ -270,7 +270,7 @@ Tk_GrabObjCmd(
 	    }
 	    dispPtr = ((TkWindow *) tkwin)->dispPtr;
 	    if (dispPtr->eventualGrabWinPtr != NULL) {
-		Tcl_SetObjResult(interp, TkNewWindowObj((Tk_Window)
+		Tcl_SetObjResult(interp, Tk_NewWindowObj((Tk_Window)
 			dispPtr->eventualGrabWinPtr));
 	    }
 	} else {
@@ -279,7 +279,7 @@ Tk_GrabObjCmd(
 	    for (dispPtr = TkGetDisplayList(); dispPtr != NULL;
 		    dispPtr = dispPtr->nextPtr) {
 		if (dispPtr->eventualGrabWinPtr != NULL) {
-		    Tcl_ListObjAppendElement(NULL, resultObj, TkNewWindowObj(
+		    Tcl_ListObjAppendElement(NULL, resultObj, Tk_NewWindowObj(
 			    (Tk_Window) dispPtr->eventualGrabWinPtr));
 		}
 	    }
@@ -896,7 +896,7 @@ TkPointerEvent(
 	} else {
 	    if (eventPtr->xbutton.button != AnyButton &&
 		    ((eventPtr->xbutton.state & ALL_BUTTONS)
-		    == TkGetButtonMask(eventPtr->xbutton.button))) {
+		    == Tk_GetButtonMask(eventPtr->xbutton.button))) {
 		ReleaseButtonGrab(dispPtr);			/* Note 4. */
 	    }
 	}
diff --git a/generic/tkGrid.c b/generic/tkGrid.c
index 32246ae..6ad77dc 100644
--- a/generic/tkGrid.c
+++ b/generic/tkGrid.c
@@ -739,7 +739,7 @@ GridInfoCommand(
 
     infoObj = Tcl_NewObj();
     Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-in", -1),
-	    TkNewWindowObj(slavePtr->masterPtr->tkwin));
+	    Tk_NewWindowObj(slavePtr->masterPtr->tkwin));
     Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-column", -1),
 	    Tcl_NewWideIntObj(slavePtr->column));
     Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-row", -1),
@@ -1400,7 +1400,7 @@ GridSlavesCommand(
 		slavePtr->row+slavePtr->numRows-1 < row)) {
 	    continue;
 	}
-	Tcl_ListObjAppendElement(interp,res, TkNewWindowObj(slavePtr->tkwin));
+	Tcl_ListObjAppendElement(interp,res, Tk_NewWindowObj(slavePtr->tkwin));
     }
     Tcl_SetObjResult(interp, res);
     return TCL_OK;
@@ -2786,7 +2786,7 @@ Unlink(
     if ((masterPtr->slavePtr == NULL) && (masterPtr->flags & ALLOCED_MASTER)) {
 	TkFreeGeometryMaster(masterPtr->tkwin, "grid");
 	masterPtr->flags &= ~ALLOCED_MASTER;
-	TkSendVirtualEvent(masterPtr->tkwin, "NoManagedChild", NULL);
+	Tk_SendVirtualEvent(masterPtr->tkwin, "NoManagedChild", NULL);
     }
 }
 
@@ -3529,7 +3529,7 @@ ConfigureSlaves(
     if (masterPtr->slavePtr == NULL && masterPtr->flags & ALLOCED_MASTER) {
 	TkFreeGeometryMaster(masterPtr->tkwin, "grid");
 	masterPtr->flags &= ~ALLOCED_MASTER;
-	TkSendVirtualEvent(masterPtr->tkwin, "NoManagedChild", NULL);
+	Tk_SendVirtualEvent(masterPtr->tkwin, "NoManagedChild", NULL);
     }
 
     return TCL_OK;
diff --git a/generic/tkInt.h b/generic/tkInt.h
index 2131110..57d7c69 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -1031,8 +1031,6 @@ typedef struct TkpClipMask {
 		|Button6Mask|Button7Mask|Button8Mask|Button9Mask)
 
 
-MODULE_SCOPE unsigned long TkGetButtonMask(unsigned int);
-
 /*
  * Object types not declared in tkObj.c need to be mentioned here so they can
  * be properly registered with Tcl:
@@ -1264,9 +1262,6 @@ MODULE_SCOPE int	Tk_WinfoObjCmd(ClientData clientData,
 MODULE_SCOPE int	Tk_WmObjCmd(ClientData clientData, Tcl_Interp *interp,
 			    int objc, Tcl_Obj *const objv[]);
 
-MODULE_SCOPE int	Tk_GetDoublePixelsFromObj(Tcl_Interp *interp,
-			    Tk_Window tkwin, Tcl_Obj *objPtr,
-			    double *doublePtr);
 MODULE_SCOPE int	TkSetGeometryMaster(Tcl_Interp *interp,
 			    Tk_Window tkwin, const char *master);
 MODULE_SCOPE void	TkFreeGeometryMaster(Tk_Window tkwin,
@@ -1312,7 +1307,6 @@ MODULE_SCOPE int	TkParsePadAmount(Tcl_Interp *interp,
 			    int *pad1Ptr, int *pad2Ptr);
 MODULE_SCOPE void       TkFocusSplit(TkWindow *winPtr);
 MODULE_SCOPE void       TkFocusJoin(TkWindow *winPtr);
-MODULE_SCOPE int	TkpAlwaysShowSelection(Tk_Window tkwin);
 MODULE_SCOPE void	TkpDrawCharsInContext(Display * display,
 			    Drawable drawable, GC gc, Tk_Font tkfont,
 			    const char *source, int numBytes, int rangeStart,
@@ -1334,7 +1328,6 @@ MODULE_SCOPE void	TkpGetFontAttrsForChar(Tk_Window tkwin, Tk_Font tkfont,
 MODULE_SCOPE void	TkpDrawFrameEx(Tk_Window tkwin, Drawable drawable,
 			    Tk_3DBorder border, int highlightWidth,
 			    int borderWidth, int relief);
-MODULE_SCOPE Tcl_Obj *	TkNewWindowObj(Tk_Window tkwin);
 MODULE_SCOPE void	TkpShowBusyWindow(TkBusy busy);
 MODULE_SCOPE void	TkpHideBusyWindow(TkBusy busy);
 MODULE_SCOPE void	TkpMakeTransparentWindowExist(Tk_Window tkwin,
@@ -1344,8 +1337,6 @@ MODULE_SCOPE void	TkpCreateBusy(Tk_FakeWin *winPtr, Tk_Window tkRef,
 			    TkBusy busy);
 MODULE_SCOPE int	TkBackgroundEvalObjv(Tcl_Interp *interp,
 			    int objc, Tcl_Obj *const *objv, int flags);
-MODULE_SCOPE void	TkSendVirtualEvent(Tk_Window tgtWin,
-			    const char *eventName, Tcl_Obj *detail);
 MODULE_SCOPE Tcl_Command TkMakeEnsemble(Tcl_Interp *interp,
 			    const char *nsname, const char *name,
 			    ClientData clientData, const TkEnsemble *map);
diff --git a/generic/tkListbox.c b/generic/tkListbox.c
index e738155..d8ecdeb 100644
--- a/generic/tkListbox.c
+++ b/generic/tkListbox.c
@@ -579,7 +579,7 @@ Tk_ListboxObjCmd(
 	return TCL_ERROR;
     }
 
-    Tcl_SetObjResult(interp, TkNewWindowObj(listPtr->tkwin));
+    Tcl_SetObjResult(interp, Tk_NewWindowObj(listPtr->tkwin));
     return TCL_OK;
 }
 
@@ -3229,7 +3229,7 @@ static void
 GenerateListboxSelectEvent(
     Listbox *listPtr)		/* Information about widget. */
 {
-    TkSendVirtualEvent(listPtr->tkwin, "ListboxSelect", NULL);
+    Tk_SendVirtualEvent(listPtr->tkwin, "ListboxSelect", NULL);
 }
 
 /*
diff --git a/generic/tkMenu.c b/generic/tkMenu.c
index 776c7e8..ea9d646 100644
--- a/generic/tkMenu.c
+++ b/generic/tkMenu.c
@@ -593,7 +593,7 @@ Tk_MenuObjCmd(
     	}
     }
 
-    Tcl_SetObjResult(interp, TkNewWindowObj(menuPtr->tkwin));
+    Tcl_SetObjResult(interp, Tk_NewWindowObj(menuPtr->tkwin));
     return TCL_OK;
 }
 
diff --git a/generic/tkMenubutton.c b/generic/tkMenubutton.c
index 625766f..b12e0eb 100644
--- a/generic/tkMenubutton.c
+++ b/generic/tkMenubutton.c
@@ -318,7 +318,7 @@ Tk_MenubuttonObjCmd(
 	return TCL_ERROR;
     }
 
-    Tcl_SetObjResult(interp, TkNewWindowObj(mbPtr->tkwin));
+    Tcl_SetObjResult(interp, Tk_NewWindowObj(mbPtr->tkwin));
     return TCL_OK;
 }
 
diff --git a/generic/tkMessage.c b/generic/tkMessage.c
index f7d1a33..8bd8573 100644
--- a/generic/tkMessage.c
+++ b/generic/tkMessage.c
@@ -278,7 +278,7 @@ Tk_MessageObjCmd(
 	return TCL_ERROR;
     }
 
-    Tcl_SetObjResult(interp, TkNewWindowObj(msgPtr->tkwin));
+    Tcl_SetObjResult(interp, Tk_NewWindowObj(msgPtr->tkwin));
     return TCL_OK;
 }
 
diff --git a/generic/tkObj.c b/generic/tkObj.c
index 63c6db7..b47ca92 100644
--- a/generic/tkObj.c
+++ b/generic/tkObj.c
@@ -1057,7 +1057,7 @@ FreeWindowInternalRep(
 /*
  *----------------------------------------------------------------------
  *
- * TkNewWindowObj --
+ * Tk_NewWindowObj --
  *
  *	This function allocates a new Tcl_Obj that refers to a particular to a
  *	particular Tk window.
@@ -1072,7 +1072,7 @@ FreeWindowInternalRep(
  */
 
 Tcl_Obj *
-TkNewWindowObj(
+Tk_NewWindowObj(
     Tk_Window tkwin)
 {
     Tcl_Obj *objPtr = Tcl_NewStringObj(Tk_PathName(tkwin), -1);
diff --git a/generic/tkPack.c b/generic/tkPack.c
index 796530a..2fb3a25 100644
--- a/generic/tkPack.c
+++ b/generic/tkPack.c
@@ -358,7 +358,7 @@ Tk_PackObjCmd(
 
 	infoObj = Tcl_NewObj();
 	Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-in", -1),
-		TkNewWindowObj(slavePtr->masterPtr->tkwin));
+		Tk_NewWindowObj(slavePtr->masterPtr->tkwin));
 	Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-anchor", -1),
 		Tcl_NewStringObj(Tk_NameOfAnchor(slavePtr->anchor), -1));
 	Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-expand", -1),
@@ -462,7 +462,7 @@ Tk_PackObjCmd(
 	for (slavePtr = masterPtr->slavePtr; slavePtr != NULL;
 		slavePtr = slavePtr->nextPtr) {
 	    Tcl_ListObjAppendElement(NULL, resultObj,
-		    TkNewWindowObj(slavePtr->tkwin));
+		    Tk_NewWindowObj(slavePtr->tkwin));
 	}
 	Tcl_SetObjResult(interp, resultObj);
 	break;
@@ -1382,7 +1382,7 @@ Unlink(
     if ((masterPtr->slavePtr == NULL) && (masterPtr->flags & ALLOCED_MASTER)) {
 	TkFreeGeometryMaster(masterPtr->tkwin, "pack");
 	masterPtr->flags &= ~ALLOCED_MASTER;
-	TkSendVirtualEvent(masterPtr->tkwin, "NoManagedChild", NULL);
+	Tk_SendVirtualEvent(masterPtr->tkwin, "NoManagedChild", NULL);
     }
 
 }
diff --git a/generic/tkPanedWindow.c b/generic/tkPanedWindow.c
index f25726e..bef8c52 100644
--- a/generic/tkPanedWindow.c
+++ b/generic/tkPanedWindow.c
@@ -507,7 +507,7 @@ Tk_PanedWindowObjCmd(
 	return TCL_ERROR;
     }
 
-    Tcl_SetObjResult(interp, TkNewWindowObj(pwPtr->tkwin));
+    Tcl_SetObjResult(interp, Tk_NewWindowObj(pwPtr->tkwin));
     return TCL_OK;
 }
 
@@ -730,7 +730,7 @@ PanedWindowWidgetObjCmd(
 	resultObj = Tcl_NewObj();
 	for (i = 0; i < pwPtr->numSlaves; i++) {
 	    Tcl_ListObjAppendElement(NULL, resultObj,
-		    TkNewWindowObj(pwPtr->slaves[i]->tkwin));
+		    Tk_NewWindowObj(pwPtr->slaves[i]->tkwin));
 	}
 	Tcl_SetObjResult(interp, resultObj);
 	break;
diff --git a/generic/tkPlace.c b/generic/tkPlace.c
index 2b5ab2d..66c31d9 100644
--- a/generic/tkPlace.c
+++ b/generic/tkPlace.c
@@ -344,7 +344,7 @@ Tk_PlaceObjCmd(
 	    for (slavePtr = masterPtr->slavePtr; slavePtr != NULL;
 		    slavePtr = slavePtr->nextPtr) {
 		Tcl_ListObjAppendElement(NULL, listPtr,
-			TkNewWindowObj(slavePtr->tkwin));
+			Tk_NewWindowObj(slavePtr->tkwin));
 	    }
 	    Tcl_SetObjResult(interp, listPtr);
 	}
@@ -806,7 +806,7 @@ PlaceInfoCommand(
     if (slavePtr->masterPtr != NULL) {
 	Tcl_AppendToObj(infoObj, "-in", -1);
 	Tcl_ListObjAppendElement(NULL, infoObj,
-		TkNewWindowObj(slavePtr->masterPtr->tkwin));
+		Tk_NewWindowObj(slavePtr->masterPtr->tkwin));
 	Tcl_AppendToObj(infoObj, " ", -1);
     }
     Tcl_AppendPrintfToObj(infoObj,
diff --git a/generic/tkPointer.c b/generic/tkPointer.c
index ece6281..883cf56 100644
--- a/generic/tkPointer.c
+++ b/generic/tkPointer.c
@@ -254,7 +254,7 @@ Tk_UpdatePointer(
      */
 
     for (b = Button1; b <= Button9; b++) {
-	mask = TkGetButtonMask(b);
+	mask = Tk_GetButtonMask(b);
 	if (changes & mask) {
 	    if (state & mask) {
 		type = ButtonPress;
diff --git a/generic/tkScale.c b/generic/tkScale.c
index affea94..82ed70c 100644
--- a/generic/tkScale.c
+++ b/generic/tkScale.c
@@ -357,7 +357,7 @@ Tk_ScaleObjCmd(
 
     scalePtr->flags &= ~INVOKE_COMMAND;
 
-    Tcl_SetObjResult(interp, TkNewWindowObj(scalePtr->tkwin));
+    Tcl_SetObjResult(interp, Tk_NewWindowObj(scalePtr->tkwin));
     return TCL_OK;
 }
 
diff --git a/generic/tkScrollbar.c b/generic/tkScrollbar.c
index 600c7d7..0d31a80 100644
--- a/generic/tkScrollbar.c
+++ b/generic/tkScrollbar.c
@@ -196,7 +196,7 @@ Tk_ScrollbarObjCmd(
 	return TCL_ERROR;
     }
 
-    Tcl_SetObjResult(interp, TkNewWindowObj(scrollPtr->tkwin));
+    Tcl_SetObjResult(interp, Tk_NewWindowObj(scrollPtr->tkwin));
     return TCL_OK;
 }
 
diff --git a/generic/tkSelect.c b/generic/tkSelect.c
index 58c54f5..a45aa4b 100644
--- a/generic/tkSelect.c
+++ b/generic/tkSelect.c
@@ -992,7 +992,7 @@ Tk_SelectionObjCmd(
 
 	    if ((infoPtr != NULL)
 		    && (infoPtr->owner != winPtr->dispPtr->clipWindow)) {
-		Tcl_SetObjResult(interp, TkNewWindowObj(infoPtr->owner));
+		Tcl_SetObjResult(interp, Tk_NewWindowObj(infoPtr->owner));
 	    }
 	    return TCL_OK;
 	}
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 5880d7b..7ba4f1f 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -1322,6 +1322,11 @@ const TkStubs tkStubs = {
     Tk_Interp, /* 271 */
     Tk_CreateOldImageType, /* 272 */
     Tk_CreateOldPhotoImageFormat, /* 273 */
+    Tk_AlwaysShowSelection, /* 274 */
+    Tk_GetButtonMask, /* 275 */
+    Tk_GetDoublePixelsFromObj, /* 276 */
+    Tk_NewWindowObj, /* 277 */
+    Tk_SendVirtualEvent, /* 278 */
 };
 
 /* !END!: Do not edit above this line. */
diff --git a/generic/tkText.c b/generic/tkText.c
index 119f229..ce302a8 100644
--- a/generic/tkText.c
+++ b/generic/tkText.c
@@ -670,7 +670,7 @@ CreateWidget(
 	return TCL_ERROR;
     }
 
-    Tcl_SetObjResult(interp, TkNewWindowObj(textPtr->tkwin));
+    Tcl_SetObjResult(interp, Tk_NewWindowObj(textPtr->tkwin));
     return TCL_OK;
 }
 
@@ -1753,7 +1753,7 @@ TextPeerCmd(
 	while (tPtr != NULL) {
 	    if (tPtr != textPtr) {
 		Tcl_ListObjAppendElement(NULL, peersObj,
-			TkNewWindowObj(tPtr->tkwin));
+			Tk_NewWindowObj(tPtr->tkwin));
 	    }
 	    tPtr = tPtr->next;
 	}
@@ -3557,7 +3557,7 @@ TkTextLostSelection(
 {
     TkText *textPtr = (TkText *)clientData;
 
-    if (TkpAlwaysShowSelection(textPtr->tkwin)) {
+    if (Tk_AlwaysShowSelection(textPtr->tkwin)) {
 	TkTextIndex start, end;
 
 	if ((!textPtr->exportSelection) || Tcl_IsSafe(textPtr->interp)) {
@@ -3615,7 +3615,7 @@ TkTextSelectionEvent(
      *     event generate $textWidget <<Selection>>
      */
 
-    TkSendVirtualEvent(textPtr->tkwin, "Selection", NULL);
+    Tk_SendVirtualEvent(textPtr->tkwin, "Selection", NULL);
 }
 
 /*
@@ -5490,7 +5490,7 @@ GenerateModifiedEvent(
     for (textPtr = textPtr->sharedTextPtr->peers; textPtr != NULL;
 	    textPtr = textPtr->next) {
 	Tk_MakeWindowExist(textPtr->tkwin);
-	TkSendVirtualEvent(textPtr->tkwin, "Modified", NULL);
+	Tk_SendVirtualEvent(textPtr->tkwin, "Modified", NULL);
     }
 }
 
@@ -5520,7 +5520,7 @@ GenerateUndoStackEvent(
     for (textPtr = textPtr->sharedTextPtr->peers; textPtr != NULL;
 	    textPtr = textPtr->next) {
 	Tk_MakeWindowExist(textPtr->tkwin);
-	TkSendVirtualEvent(textPtr->tkwin, "UndoStack", NULL);
+	Tk_SendVirtualEvent(textPtr->tkwin, "UndoStack", NULL);
     }
 }
 
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 847a971..abcd3e3 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -3164,8 +3164,8 @@ GenerateWidgetViewSyncEvent(
 	} else {
 	    textPtr->dInfoPtr->flags |= OUT_OF_SYNC;
 	}
-        TkSendVirtualEvent(textPtr->tkwin, "WidgetViewSync",
-                           Tcl_NewBooleanObj(NewSyncState));
+	Tk_SendVirtualEvent(textPtr->tkwin, "WidgetViewSync",
+		Tcl_NewBooleanObj(NewSyncState));
     }
 }
 
diff --git a/generic/tkTextTag.c b/generic/tkTextTag.c
index 4918a9f..bf74d5f 100644
--- a/generic/tkTextTag.c
+++ b/generic/tkTextTag.c
@@ -1459,7 +1459,7 @@ TkTextBindProc(
     } else if (eventPtr->type == ButtonRelease) {
 	unsigned long mask;
 
-	mask = TkGetButtonMask(eventPtr->xbutton.button);
+	mask = Tk_GetButtonMask(eventPtr->xbutton.button);
 	if ((eventPtr->xbutton.state & ALL_BUTTONS) == mask) {
 	    textPtr->flags &= ~BUTTON_DOWN;
 	    repick = 1;
diff --git a/generic/tkUtil.c b/generic/tkUtil.c
index f7b839a..6ff1ee0 100644
--- a/generic/tkUtil.c
+++ b/generic/tkUtil.c
@@ -1157,7 +1157,7 @@ TkMakeEnsemble(
 /*
  *----------------------------------------------------------------------
  *
- * TkSendVirtualEvent --
+ * Tk_SendVirtualEvent --
  *
  * 	Send a virtual event notification to the specified target window.
  * 	Equivalent to:
@@ -1170,7 +1170,7 @@ TkMakeEnsemble(
  */
 
 void
-TkSendVirtualEvent(
+Tk_SendVirtualEvent(
     Tk_Window target,
     const char *eventName,
     Tcl_Obj *detail)
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index 9d6c1f4..00c881e 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.c
@@ -2692,7 +2692,7 @@ Tk_GetNumMainWindows(void)
 /*
  *----------------------------------------------------------------------
  *
- * TkpAlwaysShowSelection --
+ * Tk_AlwaysShowSelection --
  *
  *	Indicates whether text/entry widgets should always display
  *	their selection, regardless of window focus.
@@ -2710,7 +2710,7 @@ Tk_GetNumMainWindows(void)
  */
 
 int
-TkpAlwaysShowSelection(
+Tk_AlwaysShowSelection(
     Tk_Window tkwin)		/* Window whose application is to be
 				 * checked. */
 {
diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c
index 89c2dbf..1fdb0ec 100644
--- a/macosx/tkMacOSXDialog.c
+++ b/macosx/tkMacOSXDialog.c
@@ -1708,7 +1708,7 @@ FontchooserEvent(
     switch (kind) {
     case FontchooserClosed:
 	if (fcdPtr->parent != None) {
-	    TkSendVirtualEvent(fcdPtr->parent, "TkFontchooserVisibility", NULL);
+	    Tk_SendVirtualEvent(fcdPtr->parent, "TkFontchooserVisibility", NULL);
 	    fontchooserInterp = NULL;
 	}
 	break;
@@ -1731,7 +1731,7 @@ FontchooserEvent(
 		    ckfree(tmpv);
 		}
 	    }
-	    TkSendVirtualEvent(fcdPtr->parent, "TkFontchooserFontChanged", NULL);
+	    Tk_SendVirtualEvent(fcdPtr->parent, "TkFontchooserFontChanged", NULL);
 	}
 	break;
     }
@@ -1940,7 +1940,7 @@ FontchooserConfigureCmd(
 	    [fm setSelectedAttributes:fontPanelFontAttributes
 		    isMultiple:NO];
 	    if ([fp isVisible]) {
-		TkSendVirtualEvent(fcdPtr->parent,
+		Tk_SendVirtualEvent(fcdPtr->parent,
 			"TkFontchooserFontChanged", NULL);
 	    }
 	    break;
@@ -2008,7 +2008,7 @@ FontchooserShowCmd(
     }
     if (![fp isVisible]) {
 	[fm orderFrontFontPanel:NSApp];
-	TkSendVirtualEvent(fcdPtr->parent, "TkFontchooserVisibility", NULL);
+	Tk_SendVirtualEvent(fcdPtr->parent, "TkFontchooserVisibility", NULL);
     }
     fontchooserInterp = interp;
 
diff --git a/macosx/tkMacOSXKeyEvent.c b/macosx/tkMacOSXKeyEvent.c
index 9a6e609..5ed6888 100644
--- a/macosx/tkMacOSXKeyEvent.c
+++ b/macosx/tkMacOSXKeyEvent.c
@@ -330,7 +330,7 @@ static NSUInteger textInputModifiers;
 
     if (repRange.location == 0) {
 	Tk_Window focusWin = (Tk_Window) winPtr->dispPtr->focusPtr;
-	TkSendVirtualEvent(focusWin, "TkAccentBackspace", NULL);
+	Tk_SendVirtualEvent(focusWin, "TkAccentBackspace", NULL);
     }
 
     /*
@@ -439,12 +439,12 @@ static NSUInteger textInputModifiers;
      * Use our insertText method to display the marked text.
      */
 
-    TkSendVirtualEvent(focusWin, "TkStartIMEMarkedText", NULL);
+    Tk_SendVirtualEvent(focusWin, "TkStartIMEMarkedText", NULL);
     processingCompose = YES;
     temp = [str copy];
     [self insertText: temp replacementRange:repRange];
     privateWorkingText = temp;
-    TkSendVirtualEvent(focusWin, "TkEndIMEMarkedText", NULL);
+    Tk_SendVirtualEvent(focusWin, "TkEndIMEMarkedText", NULL);
 }
 
 - (BOOL)hasMarkedText
@@ -513,7 +513,7 @@ static NSUInteger textInputModifiers;
     if (aSelector == @selector (deleteBackward:)) {
 	TkWindow *winPtr = TkMacOSXGetTkWindow([self window]);
 	Tk_Window focusWin = (Tk_Window) winPtr->dispPtr->focusPtr;
-	TkSendVirtualEvent(focusWin, "TkAccentBackspace", NULL);
+	Tk_SendVirtualEvent(focusWin, "TkAccentBackspace", NULL);
     }
 }
 
@@ -588,7 +588,7 @@ static NSUInteger textInputModifiers;
 	privateWorkingText = nil;
 	processingCompose = NO;
 	if (composeWin) {
-	    TkSendVirtualEvent(composeWin, "TkClearIMEMarkedText", NULL);
+	    Tk_SendVirtualEvent(composeWin, "TkClearIMEMarkedText", NULL);
 	}
     }
 }
diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index c3cb951..c4ae2a3 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -229,7 +229,7 @@ enum {
 
     unsigned int state = 0;
     if (button > 0) {
-	state |= TkGetButtonMask(button);
+	state |= Tk_GetButtonMask(button);
     }
 
     NSUInteger modifiers = [theEvent modifierFlags];
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 7eb608b..d81341c 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -1671,7 +1671,7 @@ WmColormapwindowsCmd(
 		break;
 	    }
 	    Tcl_ListObjAppendElement(NULL, resultObj,
-		    TkNewWindowObj((Tk_Window) wmPtr->cmapList[i]));
+		    Tk_NewWindowObj((Tk_Window) wmPtr->cmapList[i]));
 	}
 	Tcl_SetObjResult(interp, resultObj);
 	return TCL_OK;
@@ -2690,7 +2690,7 @@ WmIconwindowCmd(
 
     if (objc == 3) {
 	if (wmPtr->icon != NULL) {
-	    Tcl_SetObjResult(interp, TkNewWindowObj(wmPtr->icon));
+	    Tcl_SetObjResult(interp, Tk_NewWindowObj(wmPtr->icon));
 	}
 	return TCL_OK;
     }
@@ -3336,7 +3336,7 @@ WmStackorderCmd(
 	    resultObj = Tcl_NewObj();
 	    for (windowPtr = windows; *windowPtr ; windowPtr++) {
 		Tcl_ListObjAppendElement(NULL, resultObj,
-		    TkNewWindowObj((Tk_Window) *windowPtr));
+		    Tk_NewWindowObj((Tk_Window) *windowPtr));
 	    }
 	    Tcl_SetObjResult(interp, resultObj);
 	    ckfree(windows);
diff --git a/tests/text.test b/tests/text.test
index a810387..720ada8 100644
--- a/tests/text.test
+++ b/tests/text.test
@@ -3122,7 +3122,7 @@ test text-11a.41 {"sync" "pendingsync" and <<WidgetViewSync>>} -setup {
     destroy .top.yt .top
 } -result {Sync:0 Pending:1 Sync:1 Pending:0}
 
-test text-11a.51 {<<WidgetViewSync>> calls TkSendVirtualEvent(),
+test text-11a.51 {<<WidgetViewSync>> calls Tk_SendVirtualEvent(),
                   NOT Tk_HandleEvent().
                   Bug [b362182e45704dd7bbd6aed91e48122035ea3d16]} -setup {
     destroy .top.t .top
diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c
index 155a988..4dacad9 100644
--- a/unix/tkUnixWm.c
+++ b/unix/tkUnixWm.c
@@ -2617,7 +2617,7 @@ WmIconwindowCmd(
     }
     if (objc == 3) {
 	if (wmPtr->icon != NULL) {
-	    Tcl_SetObjResult(interp, TkNewWindowObj(wmPtr->icon));
+	    Tcl_SetObjResult(interp, Tk_NewWindowObj(wmPtr->icon));
 	}
 	return TCL_OK;
     }
@@ -3565,7 +3565,7 @@ WmTransientCmd(
     }
     if (objc == 3) {
 	if (masterPtr != NULL) {
-	    Tcl_SetObjResult(interp, TkNewWindowObj((Tk_Window) masterPtr));
+	    Tcl_SetObjResult(interp, Tk_NewWindowObj((Tk_Window) masterPtr));
 	}
 	return TCL_OK;
     }
diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c
index 9f53396..4c56760 100644
--- a/win/tkWinDialog.c
+++ b/win/tkWinDialog.c
@@ -3187,13 +3187,13 @@ HookProc(
 	if (IsWindow(hwndCtrl)) {
 	    EnableWindow(hwndCtrl, FALSE);
 	}
-	TkSendVirtualEvent(phd->parent, "TkFontchooserVisibility", NULL);
+	Tk_SendVirtualEvent(phd->parent, "TkFontchooserVisibility", NULL);
 	return 1; /* we handled the message */
     }
 
     if (WM_DESTROY == msg) {
 	phd->hwnd = NULL;
-	TkSendVirtualEvent(phd->parent, "TkFontchooserVisibility", NULL);
+	Tk_SendVirtualEvent(phd->parent, "TkFontchooserVisibility", NULL);
 	return 0;
     }
 
@@ -3211,7 +3211,7 @@ HookProc(
 	    ApplyLogfont(phd->interp, phd->cmdObj, hdc, &lf);
 	}
 	if (phd && phd->parent) {
-	    TkSendVirtualEvent(phd->parent, "TkFontchooserFontChanged", NULL);
+	    Tk_SendVirtualEvent(phd->parent, "TkFontchooserFontChanged", NULL);
 	}
 	return 1;
     }
@@ -3525,7 +3525,7 @@ FontchooserShowCmd(
 		ApplyLogfont(hdPtr->interp, hdPtr->cmdObj, hdc, &lf);
 	    }
 	    if (hdPtr->parent) {
-		TkSendVirtualEvent(hdPtr->parent, "TkFontchooserFontChanged", NULL);
+		Tk_SendVirtualEvent(hdPtr->parent, "TkFontchooserFontChanged", NULL);
 	    }
 	}
 	Tcl_SetServiceMode(oldMode);
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index f7a73f7..b22280a 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.c
@@ -3408,7 +3408,7 @@ WmColormapwindowsCmd(
 		break;
 	    }
 	    Tcl_ListObjAppendElement(NULL, resultObj,
-		    TkNewWindowObj((Tk_Window) wmPtr->cmapList[i]));
+		    Tk_NewWindowObj((Tk_Window) wmPtr->cmapList[i]));
 	}
 	Tcl_SetObjResult(interp, resultObj);
 	return TCL_OK;
@@ -4569,7 +4569,7 @@ WmIconwindowCmd(
     }
     if (objc == 3) {
 	if (wmPtr->icon != NULL) {
-	    Tcl_SetObjResult(interp, TkNewWindowObj(wmPtr->icon));
+	    Tcl_SetObjResult(interp, Tk_NewWindowObj(wmPtr->icon));
 	}
 	return TCL_OK;
     }
@@ -5222,7 +5222,7 @@ WmStackorderCmd(
 	    resultObj = Tcl_NewObj();
 	    for (windowPtr = windows; *windowPtr ; windowPtr++) {
 		Tcl_ListObjAppendElement(NULL, resultObj,
-			TkNewWindowObj((Tk_Window) *windowPtr));
+			Tk_NewWindowObj((Tk_Window) *windowPtr));
 	    }
 	    Tcl_SetObjResult(interp, resultObj);
 	    ckfree(windows);
@@ -5558,7 +5558,7 @@ WmTransientCmd(
     }
     if (objc == 3) {
 	if (masterPtr != NULL) {
-	    Tcl_SetObjResult(interp, TkNewWindowObj((Tk_Window) masterPtr));
+	    Tcl_SetObjResult(interp, Tk_NewWindowObj((Tk_Window) masterPtr));
 	}
 	return TCL_OK;
     }
-- 
cgit v0.12


From 4722f9f501efe0141837f64c3c63cc13705396e5 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Tue, 14 Jul 2020 13:26:49 +0000
Subject: Remove duplicate line in tkMacOSXWindowEvent.c

---
 macosx/tkMacOSXWindowEvent.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 0563ce6..2b2f1a0 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -263,7 +263,6 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
     observe(NSWindowDidResizeNotification, windowBoundsChanged:);
     observe(NSWindowDidDeminiaturizeNotification, windowExpanded:);
     observe(NSWindowDidMiniaturizeNotification, windowCollapsed:);
-    observe(NSWindowDidOrderOnScreenNotification, windowBecameVisible:);
     observe(NSWindowWillOrderOnScreenNotification, windowMapped:);
     observe(NSWindowDidOrderOnScreenNotification, windowBecameVisible:);
 
-- 
cgit v0.12


From b794d17b77c6a6901f129c37b58aed8a5253ff87 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Tue, 14 Jul 2020 16:28:49 +0000
Subject: Fix [de0c219db2]: Use platform placeholder text colors as defaults

---
 macosx/tkMacOSXDefault.h | 4 ++++
 win/tkWinDefault.h       | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/macosx/tkMacOSXDefault.h b/macosx/tkMacOSXDefault.h
index efaaa91..5675e43 100644
--- a/macosx/tkMacOSXDefault.h
+++ b/macosx/tkMacOSXDefault.h
@@ -193,7 +193,11 @@
 #define DEF_ENTRY_INSERT_WIDTH		"1"
 #define DEF_ENTRY_JUSTIFY		"left"
 #define DEF_ENTRY_PLACEHOLDER		""
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
+#define DEF_ENTRY_PLACEHOLDERFG		"placeholderTextColor"
+#else
 #define DEF_ENTRY_PLACEHOLDERFG		"#b3b3b3"
+#endif
 #define DEF_ENTRY_READONLY_BG_COLOR	NORMAL_BG
 #define DEF_ENTRY_READONLY_BG_MONO	WHITE
 #define DEF_ENTRY_RELIEF		"sunken"
diff --git a/win/tkWinDefault.h b/win/tkWinDefault.h
index 33756f8..12af282 100644
--- a/win/tkWinDefault.h
+++ b/win/tkWinDefault.h
@@ -158,7 +158,7 @@
 #define DEF_ENTRY_INSERT_WIDTH		"2"
 #define DEF_ENTRY_JUSTIFY		"left"
 #define DEF_ENTRY_PLACEHOLDER		""
-#define DEF_ENTRY_PLACEHOLDERFG		"#b3b3b3"
+#define DEF_ENTRY_PLACEHOLDERFG		"COLOR_GRAYTEXT"
 #define DEF_ENTRY_READONLY_BG_COLOR	"SystemButtonFace"
 #define DEF_ENTRY_READONLY_BG_MONO	WHITE
 #define DEF_ENTRY_RELIEF		"sunken"
-- 
cgit v0.12


From b0ccde46840d0f2c5fe2b0caa40095bd53e029e0 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Tue, 14 Jul 2020 19:21:57 +0000
Subject: Correctly use a system placeholder color on Windows.

---
 win/tkWinColor.c   | 1 +
 win/tkWinDefault.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/win/tkWinColor.c b/win/tkWinColor.c
index 78e3b6c..ab43304 100644
--- a/win/tkWinColor.c
+++ b/win/tkWinColor.c
@@ -58,6 +58,7 @@ static const SystemColorEntry sysColors[] = {
     {"InfoText",		COLOR_INFOTEXT},
     {"Menu",			COLOR_MENU},
     {"MenuText",		COLOR_MENUTEXT},
+    {"PlaceHolderText",		COLOR_GRAYTEXT},
     {"Scrollbar",		COLOR_SCROLLBAR},
     {"Window",			COLOR_WINDOW},
     {"WindowFrame",		COLOR_WINDOWFRAME},
diff --git a/win/tkWinDefault.h b/win/tkWinDefault.h
index 12af282..eaceb42 100644
--- a/win/tkWinDefault.h
+++ b/win/tkWinDefault.h
@@ -158,7 +158,7 @@
 #define DEF_ENTRY_INSERT_WIDTH		"2"
 #define DEF_ENTRY_JUSTIFY		"left"
 #define DEF_ENTRY_PLACEHOLDER		""
-#define DEF_ENTRY_PLACEHOLDERFG		"COLOR_GRAYTEXT"
+#define DEF_ENTRY_PLACEHOLDERFG		"SystemPlaceHolderText"
 #define DEF_ENTRY_READONLY_BG_COLOR	"SystemButtonFace"
 #define DEF_ENTRY_READONLY_BG_MONO	WHITE
 #define DEF_ENTRY_RELIEF		"sunken"
-- 
cgit v0.12


From 23e453cf42f7b994add57898e672811e97d4e4fd Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Tue, 14 Jul 2020 20:27:14 +0000
Subject: Correctly use a system placeholder color on macOS.

---
 macosx/tkMacOSXColor.c   | 12 +++++++++++-
 macosx/tkMacOSXDefault.h |  6 +-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index 0931d7d..9575940 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -214,10 +214,11 @@ static const struct SystemColorMapEntry systemColorMap[] = {
     /* Apple's SecondaryLabelColor is the same as their LabelColor so we roll our own. */
     { "SecondaryLabelColor",		    ttkBackground, 14 },					    /* 183 */
     { "LinkColor",			    semantic, 9 },						    /* 184 */
+    { "PlaceholderTextColor",		    semantic, 10 },						    /* 185 */
     { NULL,				    0, 0 }
 };
 #define FIRST_SEMANTIC_COLOR 166
-#define MAX_PIXELCODE 184
+#define MAX_PIXELCODE 185
 
 /*
  *----------------------------------------------------------------------
@@ -386,6 +387,15 @@ SetCGColorComponents(
 		color = [[NSColor blueColor] colorUsingColorSpace:sRGB];
 	    }
 	    break;
+	case 10:
+	    if ([NSApp macOSVersion] >= 101000) {
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
+		color = [[NSColor placeholderTextColor] colorUsingColorSpace:sRGB];
+#endif
+	    } else {
+		color = [[NSColor grayColor] colorUsingColorSpace:sRGB];
+	    }
+	    break;
 	default:
 	    if ([NSApp macOSVersion] >= 101000) {
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
diff --git a/macosx/tkMacOSXDefault.h b/macosx/tkMacOSXDefault.h
index 5675e43..c5327db 100644
--- a/macosx/tkMacOSXDefault.h
+++ b/macosx/tkMacOSXDefault.h
@@ -193,11 +193,7 @@
 #define DEF_ENTRY_INSERT_WIDTH		"1"
 #define DEF_ENTRY_JUSTIFY		"left"
 #define DEF_ENTRY_PLACEHOLDER		""
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
-#define DEF_ENTRY_PLACEHOLDERFG		"placeholderTextColor"
-#else
-#define DEF_ENTRY_PLACEHOLDERFG		"#b3b3b3"
-#endif
+#define DEF_ENTRY_PLACEHOLDERFG		"systemPlaceholderTextColor"
 #define DEF_ENTRY_READONLY_BG_COLOR	NORMAL_BG
 #define DEF_ENTRY_READONLY_BG_MONO	WHITE
 #define DEF_ENTRY_RELIEF		"sunken"
-- 
cgit v0.12


From 65889f2f4caa6487479827e559deed01c48ffdba Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Tue, 14 Jul 2020 20:40:53 +0000
Subject: Bring macOS documentation up-to-date with respect to the new semantic
 color systemPlaceholderTextColor.

---
 doc/colors.n  |  1 +
 macosx/README | 23 ++++++++++++-----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/doc/colors.n b/doc/colors.n
index 9234824..4af3a7a 100644
--- a/doc/colors.n
+++ b/doc/colors.n
@@ -945,6 +945,7 @@ systemControlTextColor
 systemDisabledControlTextColor
 systemLabelColor
 systemLinkColor
+systemPlaceholderTextColor
 systemSelectedTextBackgroundColor
 systemSelectedTextColor
 systemTextBackgroundColor
diff --git a/macosx/README b/macosx/README
index a3f10b6..e9d50a4 100644
--- a/macosx/README
+++ b/macosx/README
@@ -275,17 +275,18 @@ but rather refers to the context in which the color should be used.
 Tk now provides the following semantic colors as system colors:
 systemTextColor, systemTextBackgroundColor, systemSelectedTextColor,
 systemSelectedTextBackgroundColor, systemControlTextColor,
-systemDisabledControlTextColor, systemLabelColor, systemLinkColor, and
-systemControlAccentColor.  All of these except the last three were
-present in OSX 10.0 (and those three are simulated in systems where they
-do not exist).  The change in 10.14 was that the RGB color value of
-these colors became dynamic, meaning that the color value can change
-when the application appearance changes.  In particular, when a user
-selects Dark Mode in the system preferences these colors change
-appearance.  For example systemTextColor is dark in Aqua and light in
-DarkAqua.  One additional color, systemSelectedTabTextColor, does not
-exist in macOS but is used by Tk to match the different colors used
-for Notebook tab text in different OS versions.
+systemDisabledControlTextColor, systemLabelColor, systemLinkColor,
+systemControlAccentColor, and systemPlaceholderTextColor.  All of these
+except the last four were present in OSX 10.0 (and those four are
+simulated in systems where they do not exist).  The change in 10.14 was
+that the RGB color value of these colors became dynamic, meaning that
+the color value can change when the application appearance changes.
+In particular, when a user selects Dark Mode in the system preferences
+these colors change appearance.  For example systemTextColor is dark in
+Aqua and light in DarkAqua.  One additional color,
+systemSelectedTabTextColor, does not exist in macOS but is used by Tk
+to match the different colors used for Notebook tab text in different
+OS versions.
 
 The default background and foreground colors of most of the Tk widgets
 have been set to semantic colors, which means that the widgets will change
-- 
cgit v0.12


From d33ec160fcb423ae472eab7f3aeda20006e28d6b Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Tue, 14 Jul 2020 20:50:38 +0000
Subject: Bring Windows documentation up-to-date with respect to the new color
 systemPlaceholderTextColor.

---
 doc/colors.n       | 19 ++++++++++---------
 win/tkWinColor.c   |  2 +-
 win/tkWinDefault.h |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/doc/colors.n b/doc/colors.n
index 4af3a7a..6e3e64e 100644
--- a/doc/colors.n
+++ b/doc/colors.n
@@ -970,19 +970,20 @@ On Windows, the following additional system colors are available
 .RS
 .DS
 .ta 6c
-system3dDarkShadow	systemHighlight
-system3dLight	systemHighlightText
-systemActiveBorder	systemInactiveBorder
-systemActiveCaption	systemInactiveCaption
-systemAppWorkspace	systemInactiveCaptionText
-systemBackground	systemInfoBackground
-systemButtonFace	systemInfoText
-systemButtonHighlight	systemMenu
-systemButtonShadow	systemMenuText
+system3dDarkShadow	systemHighlightText
+system3dLight	systemInactiveBorder
+systemActiveBorder	systemInactiveCaption
+systemActiveCaption	systemInactiveCaptionText
+systemAppWorkspace	systemInfoBackground
+systemBackground	systemInfoText
+systemButtonFace	systemMenu
+systemButtonHighlight	systemMenuText
+systemButtonShadow	systemPlaceholderTextColor
 systemButtonText	systemScrollbar
 systemCaptionText	systemWindow
 systemDisabledText	systemWindowFrame
 systemGrayText	systemWindowText
+systemHighlight
 .DE
 .RE
 .SH "SEE ALSO"
diff --git a/win/tkWinColor.c b/win/tkWinColor.c
index ab43304..bb7d859 100644
--- a/win/tkWinColor.c
+++ b/win/tkWinColor.c
@@ -58,7 +58,7 @@ static const SystemColorEntry sysColors[] = {
     {"InfoText",		COLOR_INFOTEXT},
     {"Menu",			COLOR_MENU},
     {"MenuText",		COLOR_MENUTEXT},
-    {"PlaceHolderText",		COLOR_GRAYTEXT},
+    {"PlaceHolderTextColor",	COLOR_GRAYTEXT},
     {"Scrollbar",		COLOR_SCROLLBAR},
     {"Window",			COLOR_WINDOW},
     {"WindowFrame",		COLOR_WINDOWFRAME},
diff --git a/win/tkWinDefault.h b/win/tkWinDefault.h
index eaceb42..a690a5c 100644
--- a/win/tkWinDefault.h
+++ b/win/tkWinDefault.h
@@ -158,7 +158,7 @@
 #define DEF_ENTRY_INSERT_WIDTH		"2"
 #define DEF_ENTRY_JUSTIFY		"left"
 #define DEF_ENTRY_PLACEHOLDER		""
-#define DEF_ENTRY_PLACEHOLDERFG		"SystemPlaceHolderText"
+#define DEF_ENTRY_PLACEHOLDERFG		"SystemPlaceHolderTextColor"
 #define DEF_ENTRY_READONLY_BG_COLOR	"SystemButtonFace"
 #define DEF_ENTRY_READONLY_BG_MONO	WHITE
 #define DEF_ENTRY_RELIEF		"sunken"
-- 
cgit v0.12


From 21e0598412d86c57af86d200b727a942a31a7dcf Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Tue, 14 Jul 2020 20:58:45 +0000
Subject: Use a symbolic name for the default color for the placeholder text on
 X11.

---
 unix/tkUnixDefault.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/unix/tkUnixDefault.h b/unix/tkUnixDefault.h
index fa1f120..b59f7ae 100644
--- a/unix/tkUnixDefault.h
+++ b/unix/tkUnixDefault.h
@@ -22,6 +22,7 @@
  * TROUGH -		Background color for troughs in scales and scrollbars.
  * INDICATOR -		Color for indicator when button is selected.
  * DISABLED -		Foreground color when widget is disabled.
+ * PLACEHOLDER_FG -	Foreground color for placeholder text.
  */
 
 #define BLACK		"#000000"
@@ -33,6 +34,7 @@
 #define TROUGH		"#b3b3b3"
 #define INDICATOR	WHITE
 #define DISABLED	"#a3a3a3"
+#define PLACEHOLDER_FG	"#b3b3b3"	/* grey70 */
 
 /*
  * Defaults for labels, buttons, checkbuttons, and radiobuttons:
@@ -153,7 +155,7 @@
 #define DEF_ENTRY_INSERT_WIDTH		"2"
 #define DEF_ENTRY_JUSTIFY		"left"
 #define DEF_ENTRY_PLACEHOLDER		""
-#define DEF_ENTRY_PLACEHOLDERFG		"#b3b3b3"
+#define DEF_ENTRY_PLACEHOLDERFG		PLACEHOLDER_FG
 #define DEF_ENTRY_READONLY_BG_COLOR	NORMAL_BG
 #define DEF_ENTRY_READONLY_BG_MONO	WHITE
 #define DEF_ENTRY_RELIEF		"sunken"
-- 
cgit v0.12


From 9880f62f83f872bbe81ba1e687a12143094dc412 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Tue, 14 Jul 2020 21:52:42 +0000
Subject: Revert from 'SystemPlaceHolderTextColor' to 'SystemPlaceHolderText'
 on Windows, and deal with all ttk widgets having -placeholderforeground
 option to let them use the adequate platform default color for
 platform-specific themes.

---
 doc/colors.n               | 2 +-
 library/ttk/aquaTheme.tcl  | 9 ++++++---
 library/ttk/vistaTheme.tcl | 9 ++++++---
 library/ttk/winTheme.tcl   | 9 ++++++---
 library/ttk/xpTheme.tcl    | 9 ++++++---
 win/tkWinColor.c           | 2 +-
 win/tkWinDefault.h         | 2 +-
 7 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/doc/colors.n b/doc/colors.n
index 6e3e64e..3c20e8a 100644
--- a/doc/colors.n
+++ b/doc/colors.n
@@ -978,7 +978,7 @@ systemAppWorkspace	systemInfoBackground
 systemBackground	systemInfoText
 systemButtonFace	systemMenu
 systemButtonHighlight	systemMenuText
-systemButtonShadow	systemPlaceholderTextColor
+systemButtonShadow	systemPlaceholderText
 systemButtonText	systemScrollbar
 systemCaptionText	systemWindow
 systemDisabledText	systemWindowFrame
diff --git a/library/ttk/aquaTheme.tcl b/library/ttk/aquaTheme.tcl
index 8bba226..f5b1026 100644
--- a/library/ttk/aquaTheme.tcl
+++ b/library/ttk/aquaTheme.tcl
@@ -38,7 +38,8 @@ namespace eval ttk::theme::aqua {
 	# Entry
 	ttk::style configure TEntry \
 	    -foreground systemTextColor \
-	    -background systemTextBackgroundColor
+	    -background systemTextBackgroundColor \
+	    -placeholderforeground systemPlaceholderTextColor
 	ttk::style map TEntry \
 	    -foreground {
 		disabled systemDisabledControlTextColor
@@ -70,7 +71,8 @@ namespace eval ttk::theme::aqua {
 	# Combobox:
 	ttk::style configure TCombobox \
 	    -foreground systemTextColor \
-	    -background systemTransparent
+	    -background systemTransparent \
+	    -placeholderforeground systemPlaceholderTextColor
 	ttk::style map TCombobox \
 	    -foreground {
 		disabled systemDisabledControlTextColor
@@ -87,7 +89,8 @@ namespace eval ttk::theme::aqua {
 	    -foreground systemTextColor \
 	    -background systemTextBackgroundColor \
 	    -selectforeground systemSelectedTextColor \
-	    -selectbackground systemSelectedTextBackgroundColor
+	    -selectbackground systemSelectedTextBackgroundColor \
+	    -placeholderforeground systemPlaceholderTextColor
 	ttk::style map TSpinbox \
 	    -foreground {
 		disabled systemDisabledControlTextColor
diff --git a/library/ttk/vistaTheme.tcl b/library/ttk/vistaTheme.tcl
index 165b496..d37cc27 100644
--- a/library/ttk/vistaTheme.tcl
+++ b/library/ttk/vistaTheme.tcl
@@ -58,7 +58,8 @@ namespace eval ttk::theme::vista {
 	ttk::style configure Toolbutton -padding {4 4}
 
         # Combobox
-	ttk::style configure TCombobox -padding 2
+	ttk::style configure TCombobox -padding 2 \
+	    -placeholderforeground SystemPlaceholderText
         ttk::style element create Combobox.border vsapi \
             COMBOBOX 4 {disabled 4 focus 3 active 2 hover 2 {} 1}
         ttk::style element create Combobox.background vsapi \
@@ -97,7 +98,8 @@ namespace eval ttk::theme::vista {
 	    ;
 
         # Entry
-        ttk::style configure TEntry -padding {1 1 1 1} ;# Needs lookup
+        ttk::style configure TEntry -padding {1 1 1 1} \
+            -placeholderforeground SystemPlaceholderText
         ttk::style element create Entry.field vsapi \
             EDIT 6 {disabled 4 focus 3 hover 2 {} 1} -padding {2 2 2 2}
         ttk::style element create Entry.background vsapi \
@@ -117,7 +119,8 @@ namespace eval ttk::theme::vista {
 	    ;
 
         # Spinbox
-        ttk::style configure TSpinbox -padding 0
+        ttk::style configure TSpinbox -padding 0 \
+	    -placeholderforeground SystemPlaceholderText
         ttk::style element create Spinbox.field vsapi \
             EDIT 9 {disabled 4 focus 3 hover 2 {} 1} -padding {1 1 1 2}
         ttk::style element create Spinbox.background vsapi \
diff --git a/library/ttk/winTheme.tcl b/library/ttk/winTheme.tcl
index db05b45..bc81ced 100644
--- a/library/ttk/winTheme.tcl
+++ b/library/ttk/winTheme.tcl
@@ -29,7 +29,8 @@ namespace eval ttk::theme::winnative {
 	ttk::style map TButton -relief {{!disabled pressed} sunken}
 
 	ttk::style configure TEntry \
-	    -padding 2 -selectborderwidth 0 -insertwidth 1
+	    -padding 2 -selectborderwidth 0 -insertwidth 1 \
+            -placeholderforeground SystemPlaceholderText
 	ttk::style map TEntry \
 	    -fieldbackground \
 	    	[list readonly SystemButtonFace disabled SystemButtonFace] \
@@ -37,7 +38,8 @@ namespace eval ttk::theme::winnative {
 	    -selectforeground [list !focus SystemWindowText] \
 	    ;
 
-	ttk::style configure TCombobox -padding 2
+	ttk::style configure TCombobox -padding 2 \
+	    -placeholderforeground SystemPlaceholderText
 	ttk::style map TCombobox \
 	    -selectbackground [list !focus SystemWindow] \
 	    -selectforeground [list !focus SystemWindowText] \
@@ -55,7 +57,8 @@ namespace eval ttk::theme::winnative {
 	ttk::style configure ComboboxPopdownFrame \
 	    -borderwidth 1 -relief solid
 
-        ttk::style configure TSpinbox -padding {2 0 16 0}
+        ttk::style configure TSpinbox -padding {2 0 16 0} \
+	    -placeholderforeground SystemPlaceholderText
 
 	ttk::style configure TLabelframe -borderwidth 2 -relief groove
 
diff --git a/library/ttk/xpTheme.tcl b/library/ttk/xpTheme.tcl
index da7b422..9cfa1ef 100644
--- a/library/ttk/xpTheme.tcl
+++ b/library/ttk/xpTheme.tcl
@@ -31,12 +31,14 @@ namespace eval ttk::theme::xpnative {
 	ttk::style configure TLabelframe.Label -foreground "#0046d5"
 
 	# OR: -padding {3 3 3 6}, which some apps seem to use.
-	ttk::style configure TEntry -padding {2 2 2 4}
+	ttk::style configure TEntry -padding {2 2 2 4} \
+            -placeholderforeground SystemPlaceholderText
 	ttk::style map TEntry \
 	    -selectbackground [list !focus SystemWindow] \
 	    -selectforeground [list !focus SystemWindowText] \
 	    ;
-	ttk::style configure TCombobox -padding 2
+	ttk::style configure TCombobox -padding 2 \
+	    -placeholderforeground SystemPlaceholderText
 	ttk::style map TCombobox \
 	    -selectbackground [list !focus SystemWindow] \
 	    -selectforeground [list !focus SystemWindowText] \
@@ -47,7 +49,8 @@ namespace eval ttk::theme::xpnative {
 	    -focusfill	[list {readonly focus} SystemHighlight] \
 	    ;
 
-	ttk::style configure TSpinbox -padding {2 0 14 0}
+	ttk::style configure TSpinbox -padding {2 0 14 0} \
+	    -placeholderforeground SystemPlaceholderText
 	ttk::style map TSpinbox \
 	    -selectbackground [list !focus SystemWindow] \
 	    -selectforeground [list !focus SystemWindowText] \
diff --git a/win/tkWinColor.c b/win/tkWinColor.c
index bb7d859..ab43304 100644
--- a/win/tkWinColor.c
+++ b/win/tkWinColor.c
@@ -58,7 +58,7 @@ static const SystemColorEntry sysColors[] = {
     {"InfoText",		COLOR_INFOTEXT},
     {"Menu",			COLOR_MENU},
     {"MenuText",		COLOR_MENUTEXT},
-    {"PlaceHolderTextColor",	COLOR_GRAYTEXT},
+    {"PlaceHolderText",		COLOR_GRAYTEXT},
     {"Scrollbar",		COLOR_SCROLLBAR},
     {"Window",			COLOR_WINDOW},
     {"WindowFrame",		COLOR_WINDOWFRAME},
diff --git a/win/tkWinDefault.h b/win/tkWinDefault.h
index a690a5c..eaceb42 100644
--- a/win/tkWinDefault.h
+++ b/win/tkWinDefault.h
@@ -158,7 +158,7 @@
 #define DEF_ENTRY_INSERT_WIDTH		"2"
 #define DEF_ENTRY_JUSTIFY		"left"
 #define DEF_ENTRY_PLACEHOLDER		""
-#define DEF_ENTRY_PLACEHOLDERFG		"SystemPlaceHolderTextColor"
+#define DEF_ENTRY_PLACEHOLDERFG		"SystemPlaceHolderText"
 #define DEF_ENTRY_READONLY_BG_COLOR	"SystemButtonFace"
 #define DEF_ENTRY_READONLY_BG_MONO	WHITE
 #define DEF_ENTRY_RELIEF		"sunken"
-- 
cgit v0.12


From 4658a19f9128ef93ebd4e5052547f4cf2176516e Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 15 Jul 2020 13:54:55 +0000
Subject: Add documentation. Let ttk use the new Tk_SendVirtualEvent

---
 doc/EventHndlr.3             | 17 ++++++++++++++++-
 doc/GetPixels.3              |  8 +++++++-
 doc/WindowId.3               | 12 +++++++++++-
 generic/tk.decls             |  4 ++--
 generic/tkDecls.h            |  4 ++--
 generic/ttk/ttkInit.c        | 22 ----------------------
 generic/ttk/ttkNotebook.c    |  4 ++--
 generic/ttk/ttkPanedwindow.c |  2 +-
 generic/ttk/ttkTreeview.c    |  4 ++--
 generic/ttk/ttkWidget.h      |  5 -----
 10 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/doc/EventHndlr.3 b/doc/EventHndlr.3
index a2cbf8d..cbc5b79 100644
--- a/doc/EventHndlr.3
+++ b/doc/EventHndlr.3
@@ -9,7 +9,7 @@
 .so man.macros
 .BS
 .SH NAME
-Tk_CreateEventHandler, Tk_DeleteEventHandler \- associate procedure callback with an X event
+Tk_CreateEventHandler, Tk_DeleteEventHandler, Tk_GetButtonMask, Tk_SendVirtualEvent \- associate procedure callback with an X event
 .SH SYNOPSIS
 .nf
 \fB#include <tk.h>\fR
@@ -17,8 +17,18 @@ Tk_CreateEventHandler, Tk_DeleteEventHandler \- associate procedure callback wit
 \fBTk_CreateEventHandler\fR(\fItkwin, mask, proc, clientData\fR)
 .sp
 \fBTk_DeleteEventHandler\fR(\fItkwin, mask, proc, clientData\fR)
+.sp
+\fBTk_GetButtonMask\fR(\fIbutton\fR)
+.sp
+\fBTk_SendVirtualEvent\fR(\fItkwin, eventName, detail\fR)
 .SH ARGUMENTS
 .AS "unsigned long" clientData
+.AP unsigned button in
+Button number.
+.AP "const char" *eventName in
+The name of the virtual event.
+.AP Tcl_Obj *detail in
+Detail information for the virtual event.
 .AP Tk_Window tkwin in
 Token for window in which events may occur.
 .AP "unsigned long" mask in
@@ -71,5 +81,10 @@ automatically;  in this case there is no need to call
 If multiple handlers are declared for the same type of X event
 on the same window, then the handlers will be invoked in the
 order they were created.
+.PP
+\fBTk_GetButtonMask\fR returns the button mask corresponding to
+the button. E.g it will return \fIButton1Mask\fR for button \fIButton1\fR.
+.PP
+\fBTk_SendVirtualEvent\fR sends a virtual event to Tk's event queue.
 .SH KEYWORDS
 bind, callback, event, handler
diff --git a/doc/GetPixels.3 b/doc/GetPixels.3
index 6c31af9..568c601 100644
--- a/doc/GetPixels.3
+++ b/doc/GetPixels.3
@@ -9,7 +9,7 @@
 .so man.macros
 .BS
 .SH NAME
-Tk_GetPixelsFromObj, Tk_GetPixels, Tk_GetMMFromObj, Tk_GetScreenMM \- translate between strings and screen units
+Tk_GetPixelsFromObj, Tk_GetPixels, Tk_GetMMFromObj, Tk_GetScreenMM, Tk_GetDoublePixelsFromObj \- translate between strings and screen units
 .SH SYNOPSIS
 .nf
 \fB#include <tk.h>\fR
@@ -18,6 +18,9 @@ int
 \fBTk_GetPixelsFromObj(\fIinterp, tkwin, objPtr, intPtr\fB)\fR
 .sp
 int
+\fBTk_GetDoublePixelsFromObj(\fIinterp, tkwin, objPtr, doublePtr\fB)\fR
+.sp
+int
 \fBTk_GetPixels(\fIinterp, tkwin, string, intPtr\fB)\fR
 .sp
 int
@@ -81,6 +84,9 @@ in \fIinterp\fR's result if \fIinterp\fR is not NULL.
 value in \fIobjPtr\fR, which speeds up future calls to
 \fBTk_GetPixelsFromObj\fR with the same \fIobjPtr\fR.
 .PP
+\fBTk_GetDoublePixelsFromObj\fR is identical to \fBTk_GetPixelsFromObj\fR
+except it returns a double not rounded to the nearest integer.
+.PP
 \fBTk_GetPixels\fR is identical to \fBTk_GetPixelsFromObj\fR except
 that the screen distance is specified with a string instead
 of an object.  This prevents \fBTk_GetPixels\fR from caching the
diff --git a/doc/WindowId.3 b/doc/WindowId.3
index f937963..477efe1 100644
--- a/doc/WindowId.3
+++ b/doc/WindowId.3
@@ -9,7 +9,7 @@
 .so man.macros
 .BS
 .SH NAME
-Tk_WindowId, Tk_Parent, Tk_Display, Tk_DisplayName, Tk_ScreenNumber, Tk_Screen, Tk_X, Tk_Y, Tk_Width, Tk_Height, Tk_Changes, Tk_Attributes, Tk_IsContainer, Tk_IsEmbedded, Tk_IsMapped, Tk_IsTopLevel, Tk_ReqWidth, Tk_ReqHeight, Tk_MinReqWidth, Tk_MinReqHeight, Tk_InternalBorderLeft, Tk_InternalBorderRight, Tk_InternalBorderTop, Tk_InternalBorderBottom, Tk_Visual, Tk_Depth, Tk_Colormap, Tk_Interp  \- retrieve information from Tk's local data structure
+Tk_WindowId, Tk_Parent, Tk_Display, Tk_DisplayName, Tk_ScreenNumber, Tk_AlwaysShowSelection, Tk_Screen, Tk_X, Tk_Y, Tk_Width, Tk_Height, Tk_Changes, Tk_Attributes, Tk_IsContainer, Tk_IsEmbedded, Tk_IsMapped, Tk_IsTopLevel, Tk_ReqWidth, Tk_ReqHeight, Tk_MinReqWidth, Tk_MinReqHeight, Tk_InternalBorderLeft, Tk_InternalBorderRight, Tk_InternalBorderTop, Tk_InternalBorderBottom, Tk_Visual, Tk_Depth, Tk_Colormap, Tk_Interp, Tk_NewWindowObj  \- retrieve information from Tk's local data structure
 .SH SYNOPSIS
 .nf
 \fB#include <tk.h>\fR
@@ -29,6 +29,9 @@ const char *
 int
 \fBTk_ScreenNumber\fR(\fItkwin\fR)
 .sp
+int
+\fBTk_AlwaysShowSelection\fR(\fItkwin\fR)
+.sp
 Screen *
 \fBTk_Screen\fR(\fItkwin\fR)
 .sp
@@ -97,6 +100,9 @@ Colormap
 .sp
 Tcl_Interp *
 \fBTk_Interp\fR(\fItkwin\fR)
+.sp
+Tcl_Obj *
+\fBTk_NewWindowObj\fR(\fItkwin\fR)
 .SH ARGUMENTS
 .AS Tk_Window tkwin
 .AP Tk_Window tkwin in
@@ -127,6 +133,8 @@ ASCII string identifying \fItkwin\fR's display.  \fBTk_ScreenNumber\fR
 returns the index of \fItkwin\fR's screen among all the screens
 of \fItkwin\fR's display.  \fBTk_Screen\fR returns a pointer to
 the Xlib structure corresponding to \fItkwin\fR's screen.
+\fBTk_AlwaysShowSelection\fR indicates whether text/entry widgets
+should always display their selection, regardless of window focus.
 .PP
 \fBTk_X\fR, \fBTk_Y\fR, \fBTk_Width\fR, and \fBTk_Height\fR
 return information about \fItkwin's\fR location within its
@@ -182,6 +190,8 @@ and \fBTk_Colormap\fR returns the current
 colormap for the window.  The visual characteristics are
 normally set from the defaults for the window's screen, but
 they may be overridden by calling \fBTk_SetWindowVisual\fR.
+.PP
+\fBTk_NewWindowObj\fR creates a new \fBTcl_Obj\fR from the window.
 .SH KEYWORDS
 attributes, colormap, depth, display, height, geometry manager,
 identifier, mapped, requested size, screen, top-level,
diff --git a/generic/tk.decls b/generic/tk.decls
index b69df7b..0184f86 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -1069,7 +1069,7 @@ declare 273 {
     void Tk_CreateOldPhotoImageFormat(const Tk_PhotoImageFormat *formatPtr)
 }
 
-# TIP #???
+# TIP#580
 declare 274 {
     int Tk_AlwaysShowSelection(Tk_Window tkwin)
 }
@@ -1084,7 +1084,7 @@ declare 277 {
     Tcl_Obj *Tk_NewWindowObj(Tk_Window tkwin)
 }
 declare 278 {
-    void Tk_SendVirtualEvent(Tk_Window tgtWin, const char *eventName,
+    void Tk_SendVirtualEvent(Tk_Window tkwin, const char *eventName,
 	    Tcl_Obj *detail)
 }
 
diff --git a/generic/tkDecls.h b/generic/tkDecls.h
index f521c09..e55854c 100644
--- a/generic/tkDecls.h
+++ b/generic/tkDecls.h
@@ -889,7 +889,7 @@ EXTERN int		Tk_GetDoublePixelsFromObj(Tcl_Interp *interp,
 /* 277 */
 EXTERN Tcl_Obj *	Tk_NewWindowObj(Tk_Window tkwin);
 /* 278 */
-EXTERN void		Tk_SendVirtualEvent(Tk_Window tgtWin,
+EXTERN void		Tk_SendVirtualEvent(Tk_Window tkwin,
 				const char *eventName, Tcl_Obj *detail);
 
 typedef struct {
@@ -1181,7 +1181,7 @@ typedef struct TkStubs {
     unsigned (*tk_GetButtonMask) (unsigned button); /* 275 */
     int (*tk_GetDoublePixelsFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr, double *doublePtr); /* 276 */
     Tcl_Obj * (*tk_NewWindowObj) (Tk_Window tkwin); /* 277 */
-    void (*tk_SendVirtualEvent) (Tk_Window tgtWin, const char *eventName, Tcl_Obj *detail); /* 278 */
+    void (*tk_SendVirtualEvent) (Tk_Window tkwin, const char *eventName, Tcl_Obj *detail); /* 278 */
 } TkStubs;
 
 extern const TkStubs *tkStubsPtr;
diff --git a/generic/ttk/ttkInit.c b/generic/ttk/ttkInit.c
index f14a2db..4a43253 100644
--- a/generic/ttk/ttkInit.c
+++ b/generic/ttk/ttkInit.c
@@ -124,28 +124,6 @@ void TtkCheckStateOption(WidgetCore *corePtr, Tcl_Obj *objPtr)
 #   undef SETFLAGS
 }
 
-/* TtkSendVirtualEvent --
- * 	Send a virtual event notification to the specified target window.
- * 	Equivalent to "event generate $tgtWindow <<$eventName>>"
- *
- * 	Note that we use Tk_QueueWindowEvent, not Tk_HandleEvent,
- * 	so this routine does not reenter the interpreter.
- */
-void TtkSendVirtualEvent(Tk_Window tgtWin, const char *eventName)
-{
-    union {XEvent general; XVirtualEvent virt;} event;
-
-    memset(&event, 0, sizeof(event));
-    event.general.xany.type = VirtualEvent;
-    event.general.xany.serial = NextRequest(Tk_Display(tgtWin));
-    event.general.xany.send_event = False;
-    event.general.xany.window = Tk_WindowId(tgtWin);
-    event.general.xany.display = Tk_Display(tgtWin);
-    event.virt.name = Tk_GetUid(eventName);
-
-    Tk_QueueWindowEvent(&event.general, TCL_QUEUE_TAIL);
-}
-
 /* TtkEnumerateOptions, TtkGetOptionValue --
  *	Common factors for data accessor commands.
  */
diff --git a/generic/ttk/ttkNotebook.c b/generic/ttk/ttkNotebook.c
index 7ad46a4..d0151f7 100644
--- a/generic/ttk/ttkNotebook.c
+++ b/generic/ttk/ttkNotebook.c
@@ -631,7 +631,7 @@ static void SelectTab(Notebook *nb, TkSizeT index)
     NotebookPlaceSlave(nb, index);
     TtkRedisplayWidget(&nb->core);
 
-    TtkSendVirtualEvent(nb->core.tkwin, "NotebookTabChanged");
+    Tk_SendVirtualEvent(nb->core.tkwin, "NotebookTabChanged", NULL);
 }
 
 /* NextTab --
@@ -683,7 +683,7 @@ static void SelectNearestTab(Notebook *nb)
 	Ttk_UnmapSlave(nb->notebook.mgr, currentIndex);
     }
     if (currentIndex != nextIndex) {
-	TtkSendVirtualEvent(nb->core.tkwin, "NotebookTabChanged");
+	Tk_SendVirtualEvent(nb->core.tkwin, "NotebookTabChanged", NULL);
     }
 
     nb->notebook.currentIndex = nextIndex;
diff --git a/generic/ttk/ttkPanedwindow.c b/generic/ttk/ttkPanedwindow.c
index f44c569..5d925de 100644
--- a/generic/ttk/ttkPanedwindow.c
+++ b/generic/ttk/ttkPanedwindow.c
@@ -486,7 +486,7 @@ static void PanedEventProc(ClientData clientData, XEvent *eventPtr)
     if (   eventPtr->type == LeaveNotify
 	&& eventPtr->xcrossing.detail == NotifyInferior)
     {
-	TtkSendVirtualEvent(corePtr->tkwin, "EnteredChild");
+	Tk_SendVirtualEvent(corePtr->tkwin, "EnteredChild", NULL);
     }
 }
 
diff --git a/generic/ttk/ttkTreeview.c b/generic/ttk/ttkTreeview.c
index b484d1c..cab9c34 100644
--- a/generic/ttk/ttkTreeview.c
+++ b/generic/ttk/ttkTreeview.c
@@ -2730,7 +2730,7 @@ static int TreeviewDeleteCommand(
 
     ckfree(items);
     if (selItemDeleted) {
-        TtkSendVirtualEvent(tv->core.tkwin, "TreeviewSelect");
+        Tk_SendVirtualEvent(tv->core.tkwin, "TreeviewSelect", NULL);
     }
     TtkRedisplayWidget(&tv->core);
     return TCL_OK;
@@ -3011,7 +3011,7 @@ static int TreeviewSelectionCommand(
     }
 
     ckfree(items);
-    TtkSendVirtualEvent(tv->core.tkwin, "TreeviewSelect");
+    Tk_SendVirtualEvent(tv->core.tkwin, "TreeviewSelect", NULL);
     TtkRedisplayWidget(&tv->core);
 
     return TCL_OK;
diff --git a/generic/ttk/ttkWidget.h b/generic/ttk/ttkWidget.h
index 6837d89..2eeab4e 100644
--- a/generic/ttk/ttkWidget.h
+++ b/generic/ttk/ttkWidget.h
@@ -165,11 +165,6 @@ MODULE_SCOPE void Ttk_UntraceVariable(Ttk_TraceHandle *);
 MODULE_SCOPE int Ttk_FireTrace(Ttk_TraceHandle *);
 
 /*
- * Virtual events:
- */
-MODULE_SCOPE void TtkSendVirtualEvent(Tk_Window tgtWin, const char *eventName);
-
-/*
  * Helper routines for data accessor commands:
  */
 MODULE_SCOPE int TtkEnumerateOptions(
-- 
cgit v0.12


From 451fa4203bff3f5e6a0ab5028f900823174b4c83 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 15 Jul 2020 14:33:41 +0000
Subject: Code simplifications: Don't bother the typedefs 'EventMask' and
 'ModMask' for 'unsigned long', since Tk cannot handle more than 32 bits
 anyway. Simply use 'unsigned' everywhere.

---
 generic/tkBind.c    | 59 +++++++++++++++++++++++------------------------------
 generic/tkCanvas.c  |  4 ++--
 generic/tkEvent.c   |  6 +++---
 generic/tkInt.h     |  2 +-
 generic/tkPointer.c |  5 +++--
 5 files changed, 35 insertions(+), 41 deletions(-)

diff --git a/generic/tkBind.c b/generic/tkBind.c
index b3bddc9..bdc1f45 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -137,17 +137,10 @@ typedef struct {
     			 * this count considers the detail (keySym or button). */
 } Event;
 
-/*
- * We need a structure providing a list of pattern sequences.
- */
-
-typedef unsigned EventMask;
-typedef unsigned long ModMask;
-
 struct PatSeq; /* forward declaration */
 
 /* We need this array for bookkeeping the last matching modifier mask per pattern. */
-TK_ARRAY_DEFINE(PSModMaskArr, ModMask);
+TK_ARRAY_DEFINE(PSModMaskArr, unsigned);
 
 typedef struct PSEntry {
     TK_DLIST_LINKS(PSEntry);	/* Makes this struct a double linked list; must be first entry. */
@@ -203,7 +196,7 @@ typedef struct Tk_BindingTable_ {
     				/* Containing the most recent event for every event type. */
     PromArr *promArr;		/* Contains the promoted pattern sequences. */
     Event *curEvent;		/* Pointing to most recent event. */
-    ModMask curModMask;		/* Containing the current modifier mask. */
+    unsigned curModMask;		/* Containing the current modifier mask. */
     LookupTables lookupTables;	/* Containing hash tables for fast lookup. */
     Tcl_HashTable objectTable;	/* Used to map from an object to a list of patterns associated with
     				 * that object. Keys are ClientData, values are (PatSeq *). */
@@ -265,7 +258,7 @@ typedef struct {
 typedef struct {
     unsigned eventType;		/* Type of X event, e.g. ButtonPress. */
     unsigned count;		/* Multi-event count, e.g. double-clicks, triple-clicks, etc. */
-    ModMask modMask;		/* Mask of modifiers that must be present (zero means no modifiers
+    unsigned modMask;		/* Mask of modifiers that must be present (zero means no modifiers
     				 * are required). */
     Info info;			/* Additional information that must match event. Normally this is zero,
     				 * meaning no additional information must match. For KeyPress and
@@ -416,7 +409,7 @@ static Tcl_HashTable nameTable;		/* keyArray hashed by keysym name. */
 
 typedef struct {
     const char *name;	/* Name of modifier. */
-    ModMask mask;	/* Button/modifier mask value, such as Button1Mask. */
+    unsigned mask;	/* Button/modifier mask value, such as Button1Mask. */
     unsigned flags;	/* Various flags; see below for definitions. */
 } ModInfo;
 
@@ -713,7 +706,7 @@ static void		ExpandPercents(TkWindow *winPtr, const char *before, Event *eventPt
 			    unsigned scriptCount, Tcl_DString *dsPtr);
 static PatSeq *		FindSequence(Tcl_Interp *interp, LookupTables *lookupTables,
 			    ClientData object, const char *eventString, int create,
-			    int allowVirtual, EventMask *maskPtr);
+			    int allowVirtual, unsigned *maskPtr);
 static void		GetAllVirtualEvents(Tcl_Interp *interp, VirtualEventTable *vetPtr);
 static const char *	GetField(const char *p, char *copy, unsigned size);
 static Tcl_Obj *	GetPatternObj(const PatSeq *psPtr);
@@ -729,7 +722,7 @@ static PatSeq *		MatchPatterns(TkDisplay *dispPtr, Tk_BindingTable bindPtr, PSLi
 static int		NameToWindow(Tcl_Interp *interp, Tk_Window main,
 			    Tcl_Obj *objPtr, Tk_Window *tkwinPtr);
 static unsigned		ParseEventDescription(Tcl_Interp *interp, const char **eventStringPtr,
-			    TkPattern *patPtr, EventMask *eventMaskPtr);
+			    TkPattern *patPtr, unsigned *eventMaskPtr);
 static void		DoWarp(ClientData clientData);
 static PSList *		GetLookupForEvent(LookupTables* lookupPtr, const Event *eventPtr,
 			    Tcl_Obj *object, int onlyConsiderDetailedEvents);
@@ -761,8 +754,8 @@ static int TestNearbyCoords(int lhs, int rhs) { return Abs(lhs - rhs) <= NEARBY_
 
 static int
 IsSubsetOf(
-    ModMask lhsMask,	/* this is a subset */
-    ModMask rhsMask)	/* of this bit field? */
+    unsigned lhsMask,	/* this is a subset */
+    unsigned rhsMask)	/* of this bit field? */
 {
     return (lhsMask & rhsMask) == lhsMask;
 }
@@ -967,13 +960,13 @@ ResolveModifiers(
 
     if (dispPtr->metaModMask) {
 	if (modMask & META_MASK) {
-	    modMask &= ~(ModMask)META_MASK;
+	    modMask &= ~META_MASK;
 	    modMask |= dispPtr->metaModMask;
 	}
     }
     if (dispPtr->altModMask) {
 	if (modMask & ALT_MASK) {
-	    modMask &= ~(ModMask)ALT_MASK;
+	    modMask &= ~ALT_MASK;
 	    modMask |= dispPtr->altModMask;
 	}
     }
@@ -1634,7 +1627,7 @@ Tk_CreateBinding(
 				 * existing binding will always be replaced. */
 {
     PatSeq *psPtr;
-    EventMask eventMask;
+    unsigned eventMask;
     char *oldStr;
     char *newStr;
 
@@ -2727,8 +2720,8 @@ static int
 CompareModMasks(
     const PSModMaskArr *fstModMaskArr,
     const PSModMaskArr *sndModMaskArr,
-    ModMask fstModMask,
-    ModMask sndModMask)
+    unsigned fstModMask,
+    unsigned sndModMask)
 {
     int fstCount = 0;
     int sndCount = 0;
@@ -2752,8 +2745,8 @@ CompareModMasks(
 	assert(PSModMaskArr_Size(fstModMaskArr) == PSModMaskArr_Size(sndModMaskArr));
 
 	for (i = PSModMaskArr_Size(fstModMaskArr) - 1; i >= 0; --i) {
-	    ModMask fstModMask = *PSModMaskArr_Get(fstModMaskArr, i);
-	    ModMask sndModMask = *PSModMaskArr_Get(sndModMaskArr, i);
+	    unsigned fstModMask = *PSModMaskArr_Get(fstModMaskArr, i);
+	    unsigned sndModMask = *PSModMaskArr_Get(sndModMaskArr, i);
 
 	    if (IsSubsetOf(fstModMask, sndModMask)) { ++sndCount; }
 	    if (IsSubsetOf(sndModMask, fstModMask)) { ++fstCount; }
@@ -2786,7 +2779,7 @@ MatchPatterns(
     PSEntry *psEntry;
     PatSeq *bestPtr;
     PatSeq *bestPhysPtr;
-    ModMask bestModMask;
+    unsigned bestModMask;
     const PSModMaskArr *bestModMaskArr = NULL;
     int i, isModKeyOnly = 0;
 
@@ -2853,8 +2846,8 @@ MatchPatterns(
 		     * cannot be done in ParseEventDescription, otherwise this function would
 		     * be the better place.
 		     */
-		    ModMask modMask = ResolveModifiers(dispPtr, patPtr->modMask);
-		    ModMask curModMask = ResolveModifiers(dispPtr, bindPtr->curModMask);
+		    unsigned modMask = ResolveModifiers(dispPtr, patPtr->modMask);
+		    unsigned curModMask = ResolveModifiers(dispPtr, bindPtr->curModMask);
 
 		    psEntry->expired = 1; /* remove it from promotion list */
                     psEntry->keepIt = 0; /* don't keep matching patterns */
@@ -3850,7 +3843,7 @@ HandleEventGenerate(
     Tk_Window tkwin;
     Tk_Window tkwin2;
     TkWindow *mainPtr;
-    EventMask eventMask;
+    unsigned eventMask;
     Tcl_Obj *userDataObj;
     int synch;
     int warp;
@@ -4622,7 +4615,7 @@ FindSequence(
     				 * 1 means create. */
     int allowVirtual,		/* 0 means that virtual events are not allowed in the sequence.
     				 * 1 otherwise. */
-    EventMask *maskPtr)		/* *maskPtr is filled in with the event types on which this
+    unsigned *maskPtr)		/* *maskPtr is filled in with the event types on which this
     				 * pattern sequence depends. */
 {
     unsigned patsBufSize = 1;
@@ -4636,8 +4629,8 @@ FindSequence(
     int isNew;
     unsigned count;
     unsigned maxCount = 0;
-    EventMask eventMask = 0;
-    ModMask modMask = 0;
+    unsigned eventMask = 0;
+    unsigned modMask = 0;
     PatternTableKey key;
 
     assert(lookupTables);
@@ -4811,10 +4804,10 @@ ParseEventDescription(
     const char **eventStringPtr,/* On input, holds a pointer to start of event string. On exit,
     				 * gets pointer to rest of string after parsed event. */
     TkPattern *patPtr,		/* Filled with the pattern parsed from the event string. */
-    EventMask *eventMaskPtr)	/* Filled with event mask of matched event. */
+    unsigned *eventMaskPtr)	/* Filled with event mask of matched event. */
 {
     const char *p;
-    EventMask eventMask = 0;
+    unsigned eventMask = 0;
     unsigned count = 1;
 
     assert(eventStringPtr);
@@ -5127,7 +5120,7 @@ GetPatternObj(
 	    assert(patPtr->name);
 	    Tcl_AppendPrintfToObj(patternObj, "<<%s>>", patPtr->name);
 	} else {
-	    ModMask modMask;
+	    unsigned modMask;
 	    const ModInfo *modPtr;
 
 	    /*
@@ -5180,7 +5173,7 @@ GetPatternObj(
 		    break;
 #if PRINT_SHORT_MOTION_SYNTAX
 		case MotionNotify: {
-		    ModMask mask = patPtr->modMask;
+		    unsigned mask = patPtr->modMask;
 		    while (mask & ALL_BUTTONS) {
 			unsigned button = ButtonNumberFromState(mask);
 			Tcl_AppendPrintfToObj(patternObj, "-%u", button);
diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c
index 9f661bc..50a88b4 100644
--- a/generic/tkCanvas.c
+++ b/generic/tkCanvas.c
@@ -4759,8 +4759,8 @@ CanvasBindProc(
     ClientData clientData,	/* Pointer to canvas structure. */
     XEvent *eventPtr)		/* Pointer to X event that just happened. */
 {
-    TkCanvas *canvasPtr = clientData;
-    unsigned long mask;
+    TkCanvas *canvasPtr = (TkCanvas *)clientData;
+    unsigned mask;
 
     Tcl_Preserve(canvasPtr);
 
diff --git a/generic/tkEvent.c b/generic/tkEvent.c
index a2fa293..0994a07 100644
--- a/generic/tkEvent.c
+++ b/generic/tkEvent.c
@@ -522,13 +522,13 @@ RefreshKeyboardMappingIfNeeded(
  *----------------------------------------------------------------------
  */
 
-static const unsigned long buttonMasks[] = {
+static const unsigned buttonMasks[] = {
     0, Button1Mask, Button2Mask, Button3Mask, Button4Mask, Button5Mask
 };
 
-unsigned long
+unsigned
 TkGetButtonMask(
-    unsigned int button)
+    unsigned button)
 {
     return (button > Button5) ? 0 : buttonMasks[button];
 }
diff --git a/generic/tkInt.h b/generic/tkInt.h
index b60ab44..6f40078 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -966,7 +966,7 @@ typedef struct TkpClipMask {
 	(Button1Mask|Button2Mask|Button3Mask|Button4Mask|Button5Mask)
 
 
-MODULE_SCOPE unsigned long TkGetButtonMask(unsigned int);
+MODULE_SCOPE unsigned TkGetButtonMask(unsigned);
 
 /*
  * Object types not declared in tkObj.c need to be mentioned here so they can
diff --git a/generic/tkPointer.c b/generic/tkPointer.c
index 06359a9..c17367a 100644
--- a/generic/tkPointer.c
+++ b/generic/tkPointer.c
@@ -225,8 +225,9 @@ Tk_UpdatePointer(
     TkWindow *targetWinPtr;
     XPoint pos;
     XEvent event;
-    int changes = (state ^ tsdPtr->lastState) & ALL_BUTTONS;
-    int type, b, mask;
+    unsigned changes = (state ^ tsdPtr->lastState) & ALL_BUTTONS;
+    int type, b;
+    unsigned mask;
 
     pos.x = x;
     pos.y = y;
-- 
cgit v0.12


From 4819d3849f45e832a8b26c7906c36f66472ef3b9 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Wed, 15 Jul 2020 20:16:47 +0000
Subject: macOS: remove unneeded code observed in [7ebdd17974], remove
 tkMacOSXFlushWindows, make XSync do nothing except process timer events.

---
 generic/ttk/ttkTheme.c       |  8 --------
 macosx/tkMacOSXDraw.c        |  2 +-
 macosx/tkMacOSXEvent.c       | 35 -----------------------------------
 macosx/tkMacOSXEvent.h       |  4 +++-
 macosx/tkMacOSXSubwindows.c  |  3 +++
 macosx/tkMacOSXWindowEvent.c | 36 ++++++------------------------------
 macosx/tkMacOSXXStubs.c      | 15 +++++++++++++--
 tests/listbox.test           | 10 +++++-----
 8 files changed, 31 insertions(+), 82 deletions(-)

diff --git a/generic/ttk/ttkTheme.c b/generic/ttk/ttkTheme.c
index 6bf48a3..7bde80e 100644
--- a/generic/ttk/ttkTheme.c
+++ b/generic/ttk/ttkTheme.c
@@ -15,13 +15,6 @@
 
 #define PKG_ASSOC_KEY "Ttk"
 
-#ifdef MAC_OSX_TK
-    extern void TkMacOSXFlushWindows(void);
-    #define UPDATE_WINDOWS() TkMacOSXFlushWindows()
-#else
-    #define UPDATE_WINDOWS()
-#endif
-
 /*------------------------------------------------------------------------
  * +++ Styles.
  *
@@ -517,7 +510,6 @@ static void ThemeChangedProc(ClientData clientData)
 	Tcl_BackgroundException(pkgPtr->interp, code);
     }
     pkgPtr->themeChangePending = 0;
-    UPDATE_WINDOWS();
 }
 
 /*
diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index f3d6ba4..4973bc2 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -1636,7 +1636,7 @@ TkMacOSXSetupDrawingContext(
 	    HIShapeGetBounds(dc.clipRgn, &clipBounds);
 	    clipBounds = CGRectApplyAffineTransform(clipBounds, t);
 	}
-	if (![NSApp isDrawing] || view != [NSView focusView]) {
+	if (![NSApp isDrawing]) {
 
 	    /*
 	     * We can only draw into the view when the current CGContext is
diff --git a/macosx/tkMacOSXEvent.c b/macosx/tkMacOSXEvent.c
index c543b8d..31a7663 100644
--- a/macosx/tkMacOSXEvent.c
+++ b/macosx/tkMacOSXEvent.c
@@ -104,43 +104,8 @@ enum {
     return processedEvent;
 }
 @end
-
 #pragma mark -
-
-/*
- *----------------------------------------------------------------------
- *
- * TkMacOSXFlushWindows --
- *
- *	This routine is a stub called by XSync, which is called during the Tk
- *      update command.  The language specification does not require that the
- *      update command be synchronous but many of the tests implicitly assume
- *      that it is.  It is definitely asynchronous on macOS since many idle
- *      tasks are run inside of the drawRect method of a window's contentView,
- *      which will not be called until after this function returns.
- *
- * Results:
- *	None.
- *
- * Side effects: Processes all pending idle events then calls the display
- *	method of each visible window.
- *
- *----------------------------------------------------------------------
- */
-
-MODULE_SCOPE void
-TkMacOSXFlushWindows(void)
-{
-    if (Tk_GetNumMainWindows() == 0) {
-	return;
-    }
-    while (Tcl_DoOneEvent(TCL_IDLE_EVENTS|TCL_TIMER_EVENTS|TCL_DONT_WAIT)){}
-    for (NSWindow *w in [NSApp orderedWindows]) {
-	[w display];
-    }
-}
 
-
 /*
  * Local Variables:
  * mode: objc
diff --git a/macosx/tkMacOSXEvent.h b/macosx/tkMacOSXEvent.h
index 46d1585..850e9f6 100644
--- a/macosx/tkMacOSXEvent.h
+++ b/macosx/tkMacOSXEvent.h
@@ -18,6 +18,8 @@
 #include "tkMacOSXInt.h"
 #endif
 
-MODULE_SCOPE void TkMacOSXFlushWindows(void);
+/*
+ * Currently nothing needs to be declared here.
+ */
 
 #endif
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index a5fc097..77402a7 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -136,6 +136,9 @@ XMapWindow(
     Display *display,		/* Display. */
     Window window)		/* Window. */
 {
+    if (!window) {
+	return BadWindow;
+    }
     MacDrawable *macWin = (MacDrawable *) window;
     TkWindow *winPtr = macWin->winPtr;
     NSWindow *win = TkMacOSXDrawableWindow(window);
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 2b2f1a0..36a489b 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -34,7 +34,6 @@ static int		GenerateUpdates(
 			    CGRect *updateBounds, TkWindow *winPtr);
 static int		GenerateActivateEvents(TkWindow *winPtr,
 			    int activeFlag);
-static void		DoWindowActivate(ClientData clientData);
 
 #pragma mark TKApplication(TKWindowEvent)
 
@@ -414,7 +413,7 @@ TkpWillDrawWidget(Tk_Window tkwin) {
 						    winPtr->privatePtr);
 	result = ([NSApp isDrawing] && view == [NSView focusView]);
 #if 0
-	printf("TkAppCanDraw: %s %d  %d \n", Tk_PathName(tkwin),
+	printf("TkpWillDrawWidget: %s %d  %d \n", Tk_PathName(tkwin),
 	       [NSApp isDrawing], (view == [NSView focusView]));
 	if (!result) {
 	    NSRect dirtyRect;
@@ -548,29 +547,6 @@ GenerateActivateEvents(
 /*
  *----------------------------------------------------------------------
  *
- * DoWindowActivate --
- *
- *	Idle handler that calls GenerateActivateEvents().
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Additional events may be placed on the Tk event queue.
- *
- *----------------------------------------------------------------------
- */
-
-void
-DoWindowActivate(
-    ClientData clientData)
-{
-    GenerateActivateEvents(clientData, 1);
-}
-
-/*
- *----------------------------------------------------------------------
- *
  * TkMacOSXGenerateFocusEvent --
  *
  *	Given a Macintosh window activate event this function generates all
@@ -1068,12 +1044,12 @@ ConfigureRestrictProc(
 	serial = LastKnownRequestProcessed(Tk_Display(winPtr));
 
 	/*
-	 * First process all of the Expose events.
+	 * Use the ExposeRestrictProc to process only the expose events.  This
+	 * will create idle drawing tasks, which we handle before we return.
 	 */
-    	while (Tcl_ServiceEvent(TCL_IDLE_EVENTS|TCL_TIMER_EVENTS|TCL_DONT_WAIT)) {};
 
     	oldProc = Tk_RestrictEvents(ExposeRestrictProc, UINT2PTR(serial), &oldArg);
-    	while (Tcl_ServiceEvent(TCL_WINDOW_EVENTS)) {};
+    	while (Tcl_ServiceEvent(TCL_WINDOW_EVENTS|TCL_DONT_WAIT)) {};
     	Tk_RestrictEvents(oldProc, oldArg, &oldArg);
 
 	/*
@@ -1085,8 +1061,8 @@ ConfigureRestrictProc(
 	 * effect.)
 	 *
 	 * Fortunately, Tk schedules all drawing to be done while Tcl is idle.
-	 * So we can do the drawing now by processing all of the idle events
-	 * that were created when the expose events were processed.
+	 * So to run any display procs which were scheduled by the expose
+	 * events we process all idle events before returning.
 	 */
 
 	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {}
diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c
index 6aeec36..107f712 100644
--- a/macosx/tkMacOSXXStubs.c
+++ b/macosx/tkMacOSXXStubs.c
@@ -752,7 +752,18 @@ XSync(
     Display *display,
     Bool discard)
 {
-    TkMacOSXFlushWindows();
+    /*
+     *  The main use of XSync is by the update command, which alternates
+     *  between running an event loop to process all events without waiting and
+     *  calling XSync on all displays until no events are left.  There is
+     *  nothing for the mac to do with respect to syncing its one display but
+     *  it can (and, during regression testing, frequently does) happen that
+     *  timer events fire during the event loop. Processing those here seems
+     *  to make the update command work in a way that is more consistent with
+     *  its behavior on other platforms.
+     */
+
+    while (Tcl_DoOneEvent(TCL_TIMER_EVENTS|TCL_DONT_WAIT)){}
     display->request++;
     return 0;
 }
@@ -945,7 +956,7 @@ XSynchronize(
     Display *display,
     Bool onoff)
 {
-	display->request++;
+    display->request++;
     return NULL;
 }
 
diff --git a/tests/listbox.test b/tests/listbox.test
index 0917e84..01cc397 100644
--- a/tests/listbox.test
+++ b/tests/listbox.test
@@ -2666,7 +2666,7 @@ test listbox-21.9 {ListboxListVarProc, test hscrollbar after listvar mod} -setup
     listbox .l -font $fixed -width 10 -xscrollcommand "record x" -listvar x
     set log {}
     pack .l
-    set timeout [after 500 {set log timeout}]
+    set timeout [after 500 {lappend log timeout1}]
     vwait log
     lappend x "0000000000"
     update
@@ -2684,7 +2684,7 @@ test listbox-21.10 {ListboxListVarProc, test hscrollbar after listvar mod} -setu
     listbox .l -font $fixed -width 10 -xscrollcommand "record x" -listvar x
     set log {}
     pack .l
-    set timeout [after 500 {set log timeout}]
+    set timeout [after 500 {lappend log timeout2}]
     vwait log
     lappend x "0000000000"
     update
@@ -2695,7 +2695,7 @@ test listbox-21.10 {ListboxListVarProc, test hscrollbar after listvar mod} -setu
     set log
 } -cleanup {
     destroy .l
-    after cancel timeout
+    after cancel $timeout
 } -result [list {x 0 1} {x 0 1} {x 0 0.5} {x 0 1}]
 test listbox-21.11 {ListboxListVarProc, bad list} -setup {
     destroy .l
@@ -2764,7 +2764,7 @@ test listbox-21.15 {ListboxListVarProc, update vertical scrollbar} -setup {
     update
     set log {}
     pack .l
-    set timeout [after 500 {set log timeout}]
+    set timeout [after 500 {lappend log timeout3}]
     vwait log
     update
     lappend x a b c d e f
@@ -2804,7 +2804,7 @@ test listbox-22.1 {UpdateHScrollbar} -setup {
     pack .l
     update idletasks
     set log {}
-    set timeout [after 500 {set log timeout}]
+    set timeout [after 500 {lappend log timeout4}]
     .l insert end "0000000000"
     vwait log
     .l insert end "00000000000000000000"
-- 
cgit v0.12


From 3a4dab519f8f01cd8d16d28af150bb2b07894b5f Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Wed, 15 Jul 2020 20:57:08 +0000
Subject: More fixes from [7ebdd17974] (thanks Christopher Chavez): remove the
 needsRedisplay flag, update comments.

---
 macosx/tkMacOSXDraw.c        | 8 ++++----
 macosx/tkMacOSXKeyEvent.c    | 9 ---------
 macosx/tkMacOSXPrivate.h     | 2 --
 macosx/tkMacOSXSubwindows.c  | 2 --
 macosx/tkMacOSXWindowEvent.c | 4 ----
 5 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index 4973bc2..4304a3c 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -1642,13 +1642,13 @@ TkMacOSXSetupDrawingContext(
 	     * We can only draw into the view when the current CGContext is
 	     * valid and belongs to the view.  Validity can only be guaranteed
 	     * inside of a view's drawRect or setFrame methods.  The isDrawing
-	     * attribute tells us whether we are being called from one of those
-	     * methods.  If the CGContext is not valid then we mark our view as
-	     * needing display.
+	     * attribute tells us whether we are being called from drawRect.
+	     * If the CGContext is not valid then we mark our view as needing
+	     * display.
 	     */
 
 	    if (dc.clipRgn) {
-		[view addTkDirtyRect:clipBounds];
+		[view addTkDirtyRect:NSRectFromCGRect(clipBounds)];
 	    } else {
 		[view addTkDirtyRect:[view bounds]];
 	    }
diff --git a/macosx/tkMacOSXKeyEvent.c b/macosx/tkMacOSXKeyEvent.c
index 9c22820..572e318 100644
--- a/macosx/tkMacOSXKeyEvent.c
+++ b/macosx/tkMacOSXKeyEvent.c
@@ -268,14 +268,6 @@ static NSUInteger textInputModifiers;
 
 @implementation TKContentView
 
--(id)init {
-    self = [super init];
-    if (self) {
-        _needsRedisplay = NO;
-    }
-    return self;
-}
-
 /*
  * Implementation of the NSTextInputClient protocol.
  */
@@ -551,7 +543,6 @@ static NSUInteger textInputModifiers;
 }
 /* End of NSTextInputClient implementation. */
 
-@synthesize needsRedisplay = _needsRedisplay;
 @end
 
 
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h
index a884b57..a77282c 100644
--- a/macosx/tkMacOSXPrivate.h
+++ b/macosx/tkMacOSXPrivate.h
@@ -422,11 +422,9 @@ VISIBILITY_HIDDEN
 {
 @private
     NSString *privateWorkingText;
-    Bool _needsRedisplay;
     Bool _tkNeedsDisplay;
     NSRect _tkDirtyRect;
 }
-@property Bool needsRedisplay;
 @property Bool tkNeedsDisplay;
 @property NSRect tkDirtyRect;
 @end
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index 77402a7..e6a6e6e 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -220,7 +220,6 @@ XMapWindow(
 	TKContentView *view = [win contentView];
 	[view addTkDirtyRect:[view bounds]];
     }
-    [[win contentView] setNeedsRedisplay:YES];
 
     /*
      * Generate VisibilityNotify events for window and all mapped children.
@@ -337,7 +336,6 @@ XUnmapWindow(
 	TKContentView *view = [win contentView];
 	[view addTkDirtyRect:[view bounds]];
     }
-    [[win contentView] setNeedsRedisplay:YES];
     return Success;
 }
 
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 36a489b..5f52ea7 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -936,10 +936,6 @@ ConfigureRestrictProc(
     [NSApp setIsDrawing: YES];
     [self clearTkDirtyRect];
     [self generateExposeEvents:rect];
-    if ([self needsRedisplay]) {
-	[self setNeedsRedisplay:NO];
-	[self addTkDirtyRect: [self bounds]];
-    }
     [NSApp setIsDrawing:NO];
 
 #ifdef TK_MAC_DEBUG_DRAWING
-- 
cgit v0.12


From f6c1908879a22fd92cbcd008c9b05bcae14aab7c Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Thu, 16 Jul 2020 14:32:06 +0000
Subject: Fix stupid error with isDrawing - thanks Christopher, Nicolas and
 Kevin.

---
 generic/tkTest.c            |  6 +++---
 macosx/tkMacOSXDraw.c       |  2 +-
 macosx/tkMacOSXInt.h        |  2 +-
 macosx/tkMacOSXSubwindows.c |  8 ++++----
 macosx/tkMacOSXTest.c       | 30 ++++++++++++++++++++++++++----
 5 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/generic/tkTest.c b/generic/tkTest.c
index a8929b9..e80f488 100644
--- a/generic/tkTest.c
+++ b/generic/tkTest.c
@@ -31,9 +31,9 @@
 #if defined(MAC_OSX_TK)
 #include "tkMacOSXInt.h"
 #include "tkScrollbar.h"
-#define LOG_DISPLAY TkTestLogDisplay()
+#define LOG_DISPLAY(drawable) TkTestLogDisplay(drawable)
 #else
-#define LOG_DISPLAY 1
+#define LOG_DISPLAY(drawable) 1
 #endif
 
 #ifdef __UNIX__
@@ -1581,7 +1581,7 @@ ImageDisplay(
      * not just the changed portion.  Tests must account for this.
      */
 
-    if (LOG_DISPLAY) {
+    if (LOG_DISPLAY(drawable)) {
 	sprintf(buffer, "%s display %d %d %d %d",
 		instPtr->masterPtr->imageName, imageX, imageY, width, height);
 	Tcl_SetVar2(instPtr->masterPtr->interp, instPtr->masterPtr->varName,
diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index 4304a3c..7d12a4b 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -1636,7 +1636,7 @@ TkMacOSXSetupDrawingContext(
 	    HIShapeGetBounds(dc.clipRgn, &clipBounds);
 	    clipBounds = CGRectApplyAffineTransform(clipBounds, t);
 	}
-	if (![NSApp isDrawing]) {
+	if (view != [NSView focusView]) {
 
 	    /*
 	     * We can only draw into the view when the current CGContext is
diff --git a/macosx/tkMacOSXInt.h b/macosx/tkMacOSXInt.h
index 58761d5..fbcfffb 100644
--- a/macosx/tkMacOSXInt.h
+++ b/macosx/tkMacOSXInt.h
@@ -200,7 +200,7 @@ MODULE_SCOPE void TkpClipDrawableToRect(Display *display, Drawable d, int x,
 MODULE_SCOPE void TkpRetainRegion(TkRegion r);
 MODULE_SCOPE void TkpReleaseRegion(TkRegion r);
 MODULE_SCOPE void TkpShiftButton(NSButton *button, NSPoint delta);
-MODULE_SCOPE Bool TkTestLogDisplay(void);
+MODULE_SCOPE Bool TkTestLogDisplay(Drawable drawable);
 MODULE_SCOPE Bool TkMacOSXInDarkMode(Tk_Window tkwin);
 
 /*
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index e6a6e6e..8bae8fd 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -216,8 +216,8 @@ XMapWindow(
 	TkMacOSXInvalClipRgns((Tk_Window) winPtr->parentPtr);
     }
 
-    if (![NSApp isDrawing]) {
-	TKContentView *view = [win contentView];
+    TKContentView *view = [win contentView];
+    if (view != [NSView focusView]) {
 	[view addTkDirtyRect:[view bounds]];
     }
 
@@ -332,8 +332,8 @@ XUnmapWindow(
 	TkMacOSXUpdateClipRgn(parentPtr);
     }
     winPtr->flags &= ~TK_MAPPED;
-    if (![NSApp isDrawing]) {
-	TKContentView *view = [win contentView];
+    TKContentView *view = [win contentView];
+    if (view != [NSView focusView]) {
 	[view addTkDirtyRect:[view bounds]];
     }
     return Success;
diff --git a/macosx/tkMacOSXTest.c b/macosx/tkMacOSXTest.c
index a5d1d83..39f50e6 100644
--- a/macosx/tkMacOSXTest.c
+++ b/macosx/tkMacOSXTest.c
@@ -14,6 +14,8 @@
 
 #include "tkMacOSXPrivate.h"
 #include "tkMacOSXConstants.h"
+#include "tkMacOSXWm.h"
+
 
 /*
  * Forward declarations of procedures defined later in this file:
@@ -108,7 +110,8 @@ DebuggerObjCmd(
  *      first call will usually not occur inside of drawRect.
  *
  * Results:
- *      On OSX 10.14 and later, returns true if and only if called from
+ *      On OSX 10.14 and later, returns true if and only if the NSView of the
+ *      drawable is the current focusView, which can only be the case when
  *      within [NSView drawRect].  On earlier systems returns false if
  *      and only if called from with [NSView drawRect].
  *
@@ -118,9 +121,28 @@ DebuggerObjCmd(
  *----------------------------------------------------------------------
  */
 MODULE_SCOPE Bool
-TkTestLogDisplay(void) {
-    if ([NSApp macOSVersion] >= 101400) {
-	return [NSApp isDrawing];
+TkTestLogDisplay(
+    Drawable drawable)
+{
+    MacDrawable *macWin = (MacDrawable *) drawable;
+    NSWindow *win = nil;
+    if (macWin->toplevel && macWin->toplevel->winPtr &&
+	macWin->toplevel->winPtr->wmInfoPtr &&
+	macWin->toplevel->winPtr->wmInfoPtr->window) {
+	win = macWin->toplevel->winPtr->wmInfoPtr->window;
+    } else if (macWin->winPtr && macWin->winPtr->wmInfoPtr &&
+	       macWin->winPtr->wmInfoPtr->window) {
+	win = macWin->winPtr->wmInfoPtr->window;
+    }/*
+    else if (macWin->toplevel && (macWin->toplevel->flags & TK_EMBEDDED)) {
+	TkWindow *contWinPtr = TkpGetOtherWindow(macWin->toplevel->winPtr);
+	if (contWinPtr) {
+	    win = TkMacOSXDrawableWindow((Drawable) contWinPtr->privatePtr);
+	}
+	}*/
+    if (win && [NSApp macOSVersion] >= 101400) {
+	TKContentView *view = [win contentView];
+	return (view == [NSView focusView]);
     } else {
 	return ![NSApp isDrawing];
     }
-- 
cgit v0.12


From c73eda1243fcc00949b8a09a9ee2f2d6209c374f Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Fri, 17 Jul 2020 21:07:22 +0000
Subject: Better formatting for the ttk Geometry man page.

---
 doc/ttk_Geometry.3 | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/doc/ttk_Geometry.3 b/doc/ttk_Geometry.3
index 09d59e0..0118927 100644
--- a/doc/ttk_Geometry.3
+++ b/doc/ttk_Geometry.3
@@ -66,8 +66,9 @@ Extra padding (in pixels) to add uniformly to each side of a region.
 .AP short bottom in
 Extra padding (in pixels) to add to the bottom of a region.
 .AP Ttk_Box box in
-.AP "Ttk_Box *" box_rtn out
 Specifies a rectangular region.
+.AP "Ttk_Box *" box_rtn out
+A rectangular region.
 .AP int height in
 The height in pixels of a region.
 .AP "Tcl_Interp *" interp in
@@ -79,13 +80,14 @@ String value contains a symbolic name
 to be converted to an enumerated value or bitmask.
 Internal rep may be be modified to cache corresponding value.
 .AP Ttk_Padding padding in
-.AP "Ttk_Padding *" padding_rtn out
 Extra padding to add on the inside of a region.
+.AP "Ttk_Padding *" padding_rtn out
+Padding present in the inside of a region.
 .AP Ttk_Box parcel in
 A rectangular region, allocated from a cavity.
 .AP int relief in
 One of the standard Tk relief options
-(TK_RELIEF_RAISED, TK_RELIEF_SUNKEN, etc.).
+(\fBTK_RELIEF_RAISED\fR, \fBTK_RELIEF_SUNKEN\fR, etc.).
 See \fBTk_GetReliefFromObj\fR.
 .AP short right in
 Extra padding (in pixels) to add to the right side of a region.
@@ -95,13 +97,13 @@ One of \fBTTK_SIDE_LEFT\fR, \fBTTK_SIDE_TOP\fR,
 .AP unsigned sticky in
 A bitmask containing one or more of the bits
 \fBTTK_STICK_W\fR (west, or left),
-\fBTTK_STICK_E\fR (east, or right,
+\fBTTK_STICK_E\fR (east, or right),
 \fBTTK_STICK_N\fR (north, or top), and
 \fBTTK_STICK_S\fR (south, or bottom).
-\fBTTK_FILL_X\fR is defined as a synonym for (TTK_STICK_W|TTK_STICK_E),
-\fBTTK_FILL_Y\fR is a synonym for (TTK_STICK_N|TTK_STICK_S),
+\fBTTK_FILL_X\fR is defined as a synonym for (\fBTTK_STICK_W\fR|\fBTTK_STICK_E\fR),
+\fBTTK_FILL_Y\fR is a synonym for (\fBTTK_STICK_N\fR|\fBTTK_STICK_S\fR),
 and  \fBTTK_FILL_BOTH\fR and \fBTTK_STICK_ALL\fR
-are synonyms for (TTK_FILL_X|TTK_FILL_Y).
+are synonyms for (\fBTTK_FILL_X\fR|\fBTTK_FILL_Y\fR).
 See also: \fIgrid(n)\fR.
 .AP Tk_Window tkwin in
 Window whose screen geometry determines
-- 
cgit v0.12


From 132c939d5ab36c6a55d7bc9e1692fd981c9a88ca Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Fri, 17 Jul 2020 22:14:27 +0000
Subject: Fix the display artifacts in the (unneeded)
 withdraw-configure-deiconify cycle.

---
 macosx/tkMacOSXWm.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 9501c85..dca8686 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -3805,10 +3805,6 @@ WmWithdrawCmd(
 
     TkpWmSetState(winPtr, WithdrawnState);
 
-    NSWindow *win = TkMacOSXDrawableWindow(winPtr->window);
-    [win orderOut:NSApp];
-    [win setExcludedFromWindowsMenu:YES];
-
     /*
      * If this window has a transient, the transient must also be withdrawn.
      */
@@ -6413,6 +6409,7 @@ TkpWmSetState(
     if (state == WithdrawnState) {
 	Tk_UnmapWindow((Tk_Window) winPtr);
     } else if (state == IconicState) {
+
 	/*
 	 * The window always gets unmapped. If we can show the icon version of
 	 * the window we also collapse it.
@@ -6425,9 +6422,13 @@ TkpWmSetState(
 	Tk_UnmapWindow((Tk_Window) winPtr);
     } else if (state == NormalState || state == ZoomState) {
 	Tk_MapWindow((Tk_Window) winPtr);
-	if (macWin && ([macWin styleMask] & NSMiniaturizableWindowMask) &&
-		[macWin isMiniaturized]) {
-	    [macWin deminiaturize:NSApp];
+	if (macWin && ([macWin styleMask] & NSMiniaturizableWindowMask)) {
+	    if ([macWin isMiniaturized]) {
+		[macWin deminiaturize:NSApp];
+	    }
+	    else {
+		[macWin orderFront:nil];
+	    }
 	}
 	TkMacOSXZoomToplevel(macWin, state == NormalState ? inZoomIn :
 		inZoomOut);
-- 
cgit v0.12


From 150c5622292b1daa23aaf8d7a43053f9345f9642 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Fri, 17 Jul 2020 22:53:31 +0000
Subject: Document -expand for layouts, and order layout options
 alphabetically.

---
 doc/ttk_style.n | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/doc/ttk_style.n b/doc/ttk_style.n
index db80d95..a67cae6 100644
--- a/doc/ttk_style.n
+++ b/doc/ttk_style.n
@@ -100,17 +100,23 @@ geometry manager: given an initial cavity,
 each element is allocated a parcel.
 Valid options are:
 .TP
+\fB\-children { \fIsublayout... \fB}\fR
+Specifies a list of elements to place inside the element.
+.TP
+\fB\-expand\fR \fIboolean\fR
+Specifies whether the allocated parcel is the entire cavity.
+Defaults to 0.
+.TP
 \fB\-side \fIside\fR
 Specifies which side of the cavity to place the element;
 one of \fBleft\fR, \fBright\fR, \fBtop\fR, or \fBbottom\fR.
-If omitted, the element occupies the entire cavity.
+If omitted, the allocated parcel is the entire cavity (therefore the
+same as \fB\-expand\fR 1).
 .TP
 \fB\-sticky\fR \fB[\fInswe\fB]\fR
 Specifies where the element is placed inside its allocated parcel.
-.TP
-\fB\-children { \fIsublayout... \fB}\fR
-Specifies a list of elements to place inside the element.
-.\" Also: -border, -unit, -expand: may go away.
+Default is \fBnswe\fR.
+.\" Also: -border, -unit: may go away.
 .PP
 For example:
 .CS
-- 
cgit v0.12


From 5c61bcbe7c9f0de02a56e88fcd6253a2b2cfb482 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sat, 18 Jul 2020 10:24:09 +0000
Subject: More detailed documentation of the simplified packing algorithm and
 options used by ttk for layouts.

---
 doc/ttk_style.n | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/doc/ttk_style.n b/doc/ttk_style.n
index a67cae6..931e290 100644
--- a/doc/ttk_style.n
+++ b/doc/ttk_style.n
@@ -98,24 +98,31 @@ by one or more options specifying how to arrange the element.
 The layout mechanism uses a simplified version of the \fBpack\fR
 geometry manager: given an initial cavity,
 each element is allocated a parcel.
+Then the parcel actually used by the element is adjusted within
+the allocated parcel.
 Valid options are:
 .TP
-\fB\-children { \fIsublayout... \fB}\fR
+\fB\-children { \fIsublayout...\fB }\fR
 Specifies a list of elements to place inside the element.
 .TP
 \fB\-expand\fR \fIboolean\fR
-Specifies whether the allocated parcel is the entire cavity.
+Specifies whether the allocated parcel is the entire cavity. If so,
+simultaneous specification of \fB\-side\fR is ignored.
 Defaults to 0.
 .TP
 \fB\-side \fIside\fR
 Specifies which side of the cavity to place the element;
 one of \fBleft\fR, \fBright\fR, \fBtop\fR, or \fBbottom\fR.
-If omitted, the allocated parcel is the entire cavity (therefore the
-same as \fB\-expand\fR 1).
+For instance, \fB\-side top\fR allocates the parcel along the top of
+the cavity having width and height respectively the width of the cavity
+and the height of the element.
+If omitted, the allocated parcel is the entire cavity (same result
+as \fB\-expand\fR 1).
 .TP
 \fB\-sticky\fR \fB[\fInswe\fB]\fR
-Specifies where the element is placed inside its allocated parcel.
-Default is \fBnswe\fR.
+Specifies the actual parcel position and size inside the allocated parcel.
+If specified as an empty string then the actual parcel is centered in
+the allocated parcel. Default is \fBnswe\fR. 
 .\" Also: -border, -unit: may go away.
 .PP
 For example:
-- 
cgit v0.12


From 29dbbc2b98d03faa31105171d49ec5a219dab3a1 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sat, 18 Jul 2020 12:05:24 +0000
Subject: In ttk layouts, when -expand 1 is specified, then -side is ignored.
 Ditto for respectively the TTK_EXPAND and TTK_PACK_* flags. Remove such specs
 that are anyway ignored.

---
 doc/ttk_intro.n               | 2 +-
 generic/ttk/ttkButton.c       | 2 +-
 generic/ttk/ttkClamTheme.c    | 2 +-
 generic/ttk/ttkClassicTheme.c | 2 +-
 generic/ttk/ttkEntry.c        | 2 +-
 generic/ttk/ttkScrollbar.c    | 4 ++--
 win/ttkWinTheme.c             | 4 ++--
 win/ttkWinXPTheme.c           | 4 ++--
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/doc/ttk_intro.n b/doc/ttk_intro.n
index 581cb44..06db167 100644
--- a/doc/ttk_intro.n
+++ b/doc/ttk_intro.n
@@ -86,7 +86,7 @@ ttk::\fBstyle layout\fR Horizontal.TScrollbar {
     Scrollbar.trough \-children {
 	Scrollbar.leftarrow \-side left \-sticky w
 	Scrollbar.rightarrow \-side right \-sticky e
-	Scrollbar.thumb \-side left \-expand true \-sticky ew
+	Scrollbar.thumb \-expand true \-sticky ew
     }
 }
 .CE
diff --git a/generic/ttk/ttkButton.c b/generic/ttk/ttkButton.c
index 43fd95f..216b112 100644
--- a/generic/ttk/ttkButton.c
+++ b/generic/ttk/ttkButton.c
@@ -855,7 +855,7 @@ TTK_BEGIN_LAYOUT(MenubuttonLayout)
     TTK_GROUP("Menubutton.border", TTK_FILL_BOTH,
 	TTK_GROUP("Menubutton.focus", TTK_FILL_BOTH,
 	    TTK_NODE("Menubutton.indicator", TTK_PACK_RIGHT)
-	    TTK_GROUP("Menubutton.padding", TTK_PACK_LEFT|TTK_EXPAND|TTK_FILL_X,
+	    TTK_GROUP("Menubutton.padding", TTK_EXPAND|TTK_FILL_X,
 	        TTK_NODE("Menubutton.label", TTK_PACK_LEFT))))
 TTK_END_LAYOUT
 
diff --git a/generic/ttk/ttkClamTheme.c b/generic/ttk/ttkClamTheme.c
index 299b568..20b4b86 100644
--- a/generic/ttk/ttkClamTheme.c
+++ b/generic/ttk/ttkClamTheme.c
@@ -959,7 +959,7 @@ TTK_BEGIN_LAYOUT_TABLE(LayoutTable)
 
 TTK_LAYOUT("TCombobox",
     TTK_NODE("Combobox.downarrow", TTK_PACK_RIGHT|TTK_FILL_Y)
-    TTK_GROUP("Combobox.field", TTK_PACK_LEFT|TTK_FILL_BOTH|TTK_EXPAND,
+    TTK_GROUP("Combobox.field", TTK_FILL_BOTH|TTK_EXPAND,
 	TTK_GROUP("Combobox.padding", TTK_FILL_BOTH,
 	    TTK_NODE("Combobox.textarea", TTK_FILL_BOTH))))
 
diff --git a/generic/ttk/ttkClassicTheme.c b/generic/ttk/ttkClassicTheme.c
index 4b245c7..228d474 100644
--- a/generic/ttk/ttkClassicTheme.c
+++ b/generic/ttk/ttkClassicTheme.c
@@ -457,7 +457,7 @@ TTK_LAYOUT("TMenubutton",
     TTK_GROUP("Menubutton.highlight", TTK_FILL_BOTH,
         TTK_GROUP("Menubutton.border", TTK_FILL_BOTH,
 	    TTK_NODE("Menubutton.indicator", TTK_PACK_RIGHT)
-	    TTK_GROUP("Menubutton.padding", TTK_PACK_LEFT|TTK_EXPAND|TTK_FILL_X,
+	    TTK_GROUP("Menubutton.padding", TTK_EXPAND|TTK_FILL_X,
 	        TTK_NODE("Menubutton.label", 0)))))
 
 /* "classic" entry, includes highlight border */
diff --git a/generic/ttk/ttkEntry.c b/generic/ttk/ttkEntry.c
index 770d8ff..17287cc 100644
--- a/generic/ttk/ttkEntry.c
+++ b/generic/ttk/ttkEntry.c
@@ -2072,7 +2072,7 @@ TTK_END_LAYOUT
 TTK_BEGIN_LAYOUT(ComboboxLayout)
     TTK_GROUP("Combobox.field", TTK_FILL_BOTH,
 	TTK_NODE("Combobox.downarrow", TTK_PACK_RIGHT|TTK_FILL_Y)
-	TTK_GROUP("Combobox.padding", TTK_FILL_BOTH|TTK_PACK_LEFT|TTK_EXPAND,
+	TTK_GROUP("Combobox.padding", TTK_FILL_BOTH|TTK_EXPAND,
 	    TTK_NODE("Combobox.textarea", TTK_FILL_BOTH)))
 TTK_END_LAYOUT
 
diff --git a/generic/ttk/ttkScrollbar.c b/generic/ttk/ttkScrollbar.c
index 04430ee..08ad56e 100644
--- a/generic/ttk/ttkScrollbar.c
+++ b/generic/ttk/ttkScrollbar.c
@@ -318,7 +318,7 @@ TTK_BEGIN_LAYOUT(VerticalScrollbarLayout)
 	TTK_NODE("Vertical.Scrollbar.uparrow", TTK_PACK_TOP)
 	TTK_NODE("Vertical.Scrollbar.downarrow", TTK_PACK_BOTTOM)
 	TTK_NODE(
-	    "Vertical.Scrollbar.thumb", TTK_PACK_TOP|TTK_EXPAND|TTK_FILL_BOTH))
+	    "Vertical.Scrollbar.thumb", TTK_EXPAND|TTK_FILL_BOTH))
 TTK_END_LAYOUT
 
 TTK_BEGIN_LAYOUT(HorizontalScrollbarLayout)
@@ -326,7 +326,7 @@ TTK_BEGIN_LAYOUT(HorizontalScrollbarLayout)
 	TTK_NODE("Horizontal.Scrollbar.leftarrow", TTK_PACK_LEFT)
 	TTK_NODE("Horizontal.Scrollbar.rightarrow", TTK_PACK_RIGHT)
 	TTK_NODE(
-	"Horizontal.Scrollbar.thumb", TTK_PACK_LEFT|TTK_EXPAND|TTK_FILL_BOTH))
+	"Horizontal.Scrollbar.thumb", TTK_EXPAND|TTK_FILL_BOTH))
 TTK_END_LAYOUT
 
 /*------------------------------------------------------------------------
diff --git a/win/ttkWinTheme.c b/win/ttkWinTheme.c
index b0468fd..fac77aa 100644
--- a/win/ttkWinTheme.c
+++ b/win/ttkWinTheme.c
@@ -686,8 +686,8 @@ TTK_LAYOUT("TButton",
 TTK_LAYOUT("TCombobox",
     TTK_GROUP("Combobox.field", TTK_FILL_BOTH,
 	TTK_NODE("Combobox.downarrow", TTK_PACK_RIGHT|TTK_FILL_Y)
-	TTK_GROUP("Combobox.padding", TTK_PACK_LEFT|TTK_EXPAND|TTK_FILL_BOTH,
-	    TTK_GROUP("Combobox.focus", TTK_PACK_LEFT|TTK_EXPAND|TTK_FILL_BOTH,
+	TTK_GROUP("Combobox.padding", TTK_EXPAND|TTK_FILL_BOTH,
+	    TTK_GROUP("Combobox.focus", TTK_EXPAND|TTK_FILL_BOTH,
 		TTK_NODE("Combobox.textarea", TTK_FILL_BOTH)))))
 
 TTK_END_LAYOUT_TABLE
diff --git a/win/ttkWinXPTheme.c b/win/ttkWinXPTheme.c
index 436fe00..90863b9 100644
--- a/win/ttkWinXPTheme.c
+++ b/win/ttkWinXPTheme.c
@@ -923,8 +923,8 @@ TTK_LAYOUT("TButton",
 
 TTK_LAYOUT("TMenubutton",
     TTK_NODE("Menubutton.dropdown", TTK_PACK_RIGHT|TTK_FILL_Y)
-    TTK_GROUP("Menubutton.button", TTK_PACK_RIGHT|TTK_EXPAND|TTK_FILL_BOTH,
-	    TTK_GROUP("Menubutton.padding", TTK_PACK_LEFT|TTK_EXPAND|TTK_FILL_X,
+    TTK_GROUP("Menubutton.button", TTK_EXPAND|TTK_FILL_BOTH,
+	    TTK_GROUP("Menubutton.padding", TTK_EXPAND|TTK_FILL_X,
 	        TTK_NODE("Menubutton.label", 0))))
 
 TTK_LAYOUT("Horizontal.TScrollbar",
-- 
cgit v0.12


From acc0ba4af690545c19ed138807c702d988839ce7 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sat, 18 Jul 2020 12:10:38 +0000
Subject: Two occurrences leftover in previous commit.

---
 macosx/ttkMacOSXTheme.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c
index f1b7b8e..c181fcb 100644
--- a/macosx/ttkMacOSXTheme.c
+++ b/macosx/ttkMacOSXTheme.c
@@ -3087,15 +3087,13 @@ TTK_LAYOUT("Item",
 
 TTK_LAYOUT("Vertical.TScrollbar",
     TTK_GROUP("Vertical.Scrollbar.trough", TTK_FILL_Y,
-    TTK_NODE("Vertical.Scrollbar.thumb",
-    TTK_PACK_TOP | TTK_EXPAND | TTK_FILL_BOTH)
+    TTK_NODE("Vertical.Scrollbar.thumb", TTK_EXPAND | TTK_FILL_BOTH)
     TTK_NODE("Vertical.Scrollbar.downarrow", TTK_PACK_BOTTOM)
     TTK_NODE("Vertical.Scrollbar.uparrow", TTK_PACK_BOTTOM)))
 
 TTK_LAYOUT("Horizontal.TScrollbar",
     TTK_GROUP("Horizontal.Scrollbar.trough", TTK_FILL_X,
-    TTK_NODE("Horizontal.Scrollbar.thumb",
-    TTK_PACK_LEFT | TTK_EXPAND | TTK_FILL_BOTH)
+    TTK_NODE("Horizontal.Scrollbar.thumb", TTK_EXPAND | TTK_FILL_BOTH)
     TTK_NODE("Horizontal.Scrollbar.rightarrow", TTK_PACK_RIGHT)
     TTK_NODE("Horizontal.Scrollbar.leftarrow", TTK_PACK_RIGHT)))
 
-- 
cgit v0.12


From ac5b7e605129f0a9b06055347b1d1d0074ff1c95 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sat, 18 Jul 2020 12:18:50 +0000
Subject: In ttk layouts, specifying -expand 1 (resp. TTK_EXPAND) is
 superfluous when -side (resp. TTK_PACK_*) is not given. Remove such
 superfluous specifications.

---
 doc/ttk_intro.n               |  2 +-
 generic/ttk/ttkButton.c       |  2 +-
 generic/ttk/ttkClamTheme.c    |  2 +-
 generic/ttk/ttkClassicTheme.c |  2 +-
 generic/ttk/ttkEntry.c        |  2 +-
 generic/ttk/ttkScrollbar.c    |  6 ++----
 library/ttk/vistaTheme.tcl    | 14 +++++++-------
 macosx/ttkMacOSXTheme.c       | 14 +++++++-------
 win/ttkWinTheme.c             |  4 ++--
 win/ttkWinXPTheme.c           | 12 ++++++------
 10 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/doc/ttk_intro.n b/doc/ttk_intro.n
index 06db167..f93cbe3 100644
--- a/doc/ttk_intro.n
+++ b/doc/ttk_intro.n
@@ -86,7 +86,7 @@ ttk::\fBstyle layout\fR Horizontal.TScrollbar {
     Scrollbar.trough \-children {
 	Scrollbar.leftarrow \-side left \-sticky w
 	Scrollbar.rightarrow \-side right \-sticky e
-	Scrollbar.thumb \-expand true \-sticky ew
+	Scrollbar.thumb \-sticky ew
     }
 }
 .CE
diff --git a/generic/ttk/ttkButton.c b/generic/ttk/ttkButton.c
index 216b112..43855b2 100644
--- a/generic/ttk/ttkButton.c
+++ b/generic/ttk/ttkButton.c
@@ -855,7 +855,7 @@ TTK_BEGIN_LAYOUT(MenubuttonLayout)
     TTK_GROUP("Menubutton.border", TTK_FILL_BOTH,
 	TTK_GROUP("Menubutton.focus", TTK_FILL_BOTH,
 	    TTK_NODE("Menubutton.indicator", TTK_PACK_RIGHT)
-	    TTK_GROUP("Menubutton.padding", TTK_EXPAND|TTK_FILL_X,
+	    TTK_GROUP("Menubutton.padding", TTK_FILL_X,
 	        TTK_NODE("Menubutton.label", TTK_PACK_LEFT))))
 TTK_END_LAYOUT
 
diff --git a/generic/ttk/ttkClamTheme.c b/generic/ttk/ttkClamTheme.c
index 20b4b86..41a8f6d 100644
--- a/generic/ttk/ttkClamTheme.c
+++ b/generic/ttk/ttkClamTheme.c
@@ -959,7 +959,7 @@ TTK_BEGIN_LAYOUT_TABLE(LayoutTable)
 
 TTK_LAYOUT("TCombobox",
     TTK_NODE("Combobox.downarrow", TTK_PACK_RIGHT|TTK_FILL_Y)
-    TTK_GROUP("Combobox.field", TTK_FILL_BOTH|TTK_EXPAND,
+    TTK_GROUP("Combobox.field", TTK_FILL_BOTH,
 	TTK_GROUP("Combobox.padding", TTK_FILL_BOTH,
 	    TTK_NODE("Combobox.textarea", TTK_FILL_BOTH))))
 
diff --git a/generic/ttk/ttkClassicTheme.c b/generic/ttk/ttkClassicTheme.c
index 228d474..8436aec 100644
--- a/generic/ttk/ttkClassicTheme.c
+++ b/generic/ttk/ttkClassicTheme.c
@@ -457,7 +457,7 @@ TTK_LAYOUT("TMenubutton",
     TTK_GROUP("Menubutton.highlight", TTK_FILL_BOTH,
         TTK_GROUP("Menubutton.border", TTK_FILL_BOTH,
 	    TTK_NODE("Menubutton.indicator", TTK_PACK_RIGHT)
-	    TTK_GROUP("Menubutton.padding", TTK_EXPAND|TTK_FILL_X,
+	    TTK_GROUP("Menubutton.padding", TTK_FILL_X,
 	        TTK_NODE("Menubutton.label", 0)))))
 
 /* "classic" entry, includes highlight border */
diff --git a/generic/ttk/ttkEntry.c b/generic/ttk/ttkEntry.c
index 17287cc..bae4529 100644
--- a/generic/ttk/ttkEntry.c
+++ b/generic/ttk/ttkEntry.c
@@ -2072,7 +2072,7 @@ TTK_END_LAYOUT
 TTK_BEGIN_LAYOUT(ComboboxLayout)
     TTK_GROUP("Combobox.field", TTK_FILL_BOTH,
 	TTK_NODE("Combobox.downarrow", TTK_PACK_RIGHT|TTK_FILL_Y)
-	TTK_GROUP("Combobox.padding", TTK_FILL_BOTH|TTK_EXPAND,
+	TTK_GROUP("Combobox.padding", TTK_FILL_BOTH,
 	    TTK_NODE("Combobox.textarea", TTK_FILL_BOTH)))
 TTK_END_LAYOUT
 
diff --git a/generic/ttk/ttkScrollbar.c b/generic/ttk/ttkScrollbar.c
index 08ad56e..2c8d195 100644
--- a/generic/ttk/ttkScrollbar.c
+++ b/generic/ttk/ttkScrollbar.c
@@ -317,16 +317,14 @@ TTK_BEGIN_LAYOUT(VerticalScrollbarLayout)
     TTK_GROUP("Vertical.Scrollbar.trough", TTK_FILL_Y,
 	TTK_NODE("Vertical.Scrollbar.uparrow", TTK_PACK_TOP)
 	TTK_NODE("Vertical.Scrollbar.downarrow", TTK_PACK_BOTTOM)
-	TTK_NODE(
-	    "Vertical.Scrollbar.thumb", TTK_EXPAND|TTK_FILL_BOTH))
+	TTK_NODE("Vertical.Scrollbar.thumb", TTK_FILL_BOTH))
 TTK_END_LAYOUT
 
 TTK_BEGIN_LAYOUT(HorizontalScrollbarLayout)
     TTK_GROUP("Horizontal.Scrollbar.trough", TTK_FILL_X,
 	TTK_NODE("Horizontal.Scrollbar.leftarrow", TTK_PACK_LEFT)
 	TTK_NODE("Horizontal.Scrollbar.rightarrow", TTK_PACK_RIGHT)
-	TTK_NODE(
-	"Horizontal.Scrollbar.thumb", TTK_EXPAND|TTK_FILL_BOTH))
+	TTK_NODE("Horizontal.Scrollbar.thumb", TTK_FILL_BOTH))
 TTK_END_LAYOUT
 
 /*------------------------------------------------------------------------
diff --git a/library/ttk/vistaTheme.tcl b/library/ttk/vistaTheme.tcl
index 094288c..06f9361 100644
--- a/library/ttk/vistaTheme.tcl
+++ b/library/ttk/vistaTheme.tcl
@@ -69,9 +69,9 @@ namespace eval ttk::theme::vista {
         ttk::style layout TCombobox {
             Combobox.border -sticky nswe -border 0 -children {
                 Combobox.rightdownarrow -side right -sticky ns
-                Combobox.padding -expand 1 -sticky nswe -children {
+                Combobox.padding -sticky nswe -children {
                     Combobox.background -sticky nswe -children {
-                        Combobox.focus -expand 1 -sticky nswe -children {
+                        Combobox.focus -sticky nswe -children {
                             Combobox.textarea -sticky nswe
                         }
                     }
@@ -138,7 +138,7 @@ namespace eval ttk::theme::vista {
                 Spinbox.background -sticky news -children {
                     Spinbox.padding -sticky news -children {
                         Spinbox.innerbg -sticky news -children {
-                            Spinbox.textarea -expand 1
+                            Spinbox.textarea
                         }
                     }
                     Spinbox.uparrow -side top -sticky ens
@@ -202,8 +202,8 @@ namespace eval ttk::theme::vista {
             TRACKBAR 3 {disabled 5 focus 4 pressed 3 active 2 {} 1} \
             -width 6 -height 12
         ttk::style layout Horizontal.TScale {
-            Scale.focus -expand 1 -sticky nswe -children {
-                Horizontal.Scale.trough -expand 1 -sticky nswe -children {
+            Scale.focus -sticky nswe -children {
+                Horizontal.Scale.trough -sticky nswe -children {
                     Horizontal.Scale.track -sticky we
                     Horizontal.Scale.slider -side left -sticky {}
                 }
@@ -213,8 +213,8 @@ namespace eval ttk::theme::vista {
             TRACKBAR 6 {disabled 5 focus 4 pressed 3 active 2 {} 1} \
             -width 12 -height 6
         ttk::style layout Vertical.TScale {
-            Scale.focus -expand 1 -sticky nswe -children {
-                Vertical.Scale.trough -expand 1 -sticky nswe -children {
+            Scale.focus -sticky nswe -children {
+                Vertical.Scale.trough -sticky nswe -children {
                     Vertical.Scale.track -sticky ns
                     Vertical.Scale.slider -side top -sticky {}
                 }
diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c
index c181fcb..cb2ead1 100644
--- a/macosx/ttkMacOSXTheme.c
+++ b/macosx/ttkMacOSXTheme.c
@@ -3049,20 +3049,20 @@ TTK_LAYOUT("TCombobox",
 /* Notebook tabs -- no focus ring */
 TTK_LAYOUT("Tab",
     TTK_GROUP("Notebook.tab", TTK_FILL_BOTH,
-    TTK_GROUP("Notebook.padding", TTK_EXPAND | TTK_FILL_BOTH,
-    TTK_NODE("Notebook.label", TTK_EXPAND | TTK_FILL_BOTH))))
+    TTK_GROUP("Notebook.padding", TTK_FILL_BOTH,
+    TTK_NODE("Notebook.label", TTK_FILL_BOTH))))
 
 /* Spinbox -- buttons 2px to the right of the field. */
 TTK_LAYOUT("TSpinbox",
     TTK_GROUP("Spinbox.buttons", TTK_PACK_RIGHT,
     TTK_NODE("Spinbox.uparrow", TTK_PACK_TOP | TTK_STICK_E)
     TTK_NODE("Spinbox.downarrow", TTK_PACK_BOTTOM | TTK_STICK_E))
-    TTK_GROUP("Spinbox.field", TTK_EXPAND | TTK_FILL_X,
-    TTK_NODE("Spinbox.textarea", TTK_EXPAND | TTK_FILL_X)))
+    TTK_GROUP("Spinbox.field", TTK_FILL_X,
+    TTK_NODE("Spinbox.textarea", TTK_FILL_X)))
 
 /* Progress bars -- track only */
 TTK_LAYOUT("TProgressbar",
-    TTK_NODE("Progressbar.track", TTK_EXPAND | TTK_FILL_BOTH))
+    TTK_NODE("Progressbar.track", TTK_FILL_BOTH))
 
 /* Treeview -- no border. */
 TTK_LAYOUT("Treeview",
@@ -3087,13 +3087,13 @@ TTK_LAYOUT("Item",
 
 TTK_LAYOUT("Vertical.TScrollbar",
     TTK_GROUP("Vertical.Scrollbar.trough", TTK_FILL_Y,
-    TTK_NODE("Vertical.Scrollbar.thumb", TTK_EXPAND | TTK_FILL_BOTH)
+    TTK_NODE("Vertical.Scrollbar.thumb", TTK_FILL_BOTH)
     TTK_NODE("Vertical.Scrollbar.downarrow", TTK_PACK_BOTTOM)
     TTK_NODE("Vertical.Scrollbar.uparrow", TTK_PACK_BOTTOM)))
 
 TTK_LAYOUT("Horizontal.TScrollbar",
     TTK_GROUP("Horizontal.Scrollbar.trough", TTK_FILL_X,
-    TTK_NODE("Horizontal.Scrollbar.thumb", TTK_EXPAND | TTK_FILL_BOTH)
+    TTK_NODE("Horizontal.Scrollbar.thumb", TTK_FILL_BOTH)
     TTK_NODE("Horizontal.Scrollbar.rightarrow", TTK_PACK_RIGHT)
     TTK_NODE("Horizontal.Scrollbar.leftarrow", TTK_PACK_RIGHT)))
 
diff --git a/win/ttkWinTheme.c b/win/ttkWinTheme.c
index fac77aa..bd066fc 100644
--- a/win/ttkWinTheme.c
+++ b/win/ttkWinTheme.c
@@ -686,8 +686,8 @@ TTK_LAYOUT("TButton",
 TTK_LAYOUT("TCombobox",
     TTK_GROUP("Combobox.field", TTK_FILL_BOTH,
 	TTK_NODE("Combobox.downarrow", TTK_PACK_RIGHT|TTK_FILL_Y)
-	TTK_GROUP("Combobox.padding", TTK_EXPAND|TTK_FILL_BOTH,
-	    TTK_GROUP("Combobox.focus", TTK_EXPAND|TTK_FILL_BOTH,
+	TTK_GROUP("Combobox.padding", TTK_FILL_BOTH,
+	    TTK_GROUP("Combobox.focus", TTK_FILL_BOTH,
 		TTK_NODE("Combobox.textarea", TTK_FILL_BOTH)))))
 
 TTK_END_LAYOUT_TABLE
diff --git a/win/ttkWinXPTheme.c b/win/ttkWinXPTheme.c
index 90863b9..22b371c 100644
--- a/win/ttkWinXPTheme.c
+++ b/win/ttkWinXPTheme.c
@@ -923,8 +923,8 @@ TTK_LAYOUT("TButton",
 
 TTK_LAYOUT("TMenubutton",
     TTK_NODE("Menubutton.dropdown", TTK_PACK_RIGHT|TTK_FILL_Y)
-    TTK_GROUP("Menubutton.button", TTK_EXPAND|TTK_FILL_BOTH,
-	    TTK_GROUP("Menubutton.padding", TTK_EXPAND|TTK_FILL_X,
+    TTK_GROUP("Menubutton.button", TTK_FILL_BOTH,
+	    TTK_GROUP("Menubutton.padding", TTK_FILL_X,
 	        TTK_NODE("Menubutton.label", 0))))
 
 TTK_LAYOUT("Horizontal.TScrollbar",
@@ -942,14 +942,14 @@ TTK_LAYOUT("Vertical.TScrollbar",
 	    TTK_NODE("Vertical.Scrollbar.grip", 0))))
 
 TTK_LAYOUT("Horizontal.TScale",
-    TTK_GROUP("Scale.focus", TTK_EXPAND|TTK_FILL_BOTH,
-	TTK_GROUP("Horizontal.Scale.trough", TTK_EXPAND|TTK_FILL_BOTH,
+    TTK_GROUP("Scale.focus", TTK_FILL_BOTH,
+	TTK_GROUP("Horizontal.Scale.trough", TTK_FILL_BOTH,
 	    TTK_NODE("Horizontal.Scale.track", TTK_FILL_X)
 	    TTK_NODE("Horizontal.Scale.slider", TTK_PACK_LEFT) )))
 
 TTK_LAYOUT("Vertical.TScale",
-    TTK_GROUP("Scale.focus", TTK_EXPAND|TTK_FILL_BOTH,
-	TTK_GROUP("Vertical.Scale.trough", TTK_EXPAND|TTK_FILL_BOTH,
+    TTK_GROUP("Scale.focus", TTK_FILL_BOTH,
+	TTK_GROUP("Vertical.Scale.trough", TTK_FILL_BOTH,
 	    TTK_NODE("Vertical.Scale.track", TTK_FILL_Y)
 	    TTK_NODE("Vertical.Scale.slider", TTK_PACK_TOP) )))
 
-- 
cgit v0.12


From bc28be1c5f445a8cfa92f2d70643a7e99856f677 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sat, 18 Jul 2020 12:38:02 +0000
Subject: Remove documentation of non-implemented TTK_STICK_ALL flag.

---
 doc/ttk_Geometry.3 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/ttk_Geometry.3 b/doc/ttk_Geometry.3
index 0118927..0f8a171 100644
--- a/doc/ttk_Geometry.3
+++ b/doc/ttk_Geometry.3
@@ -102,8 +102,8 @@ A bitmask containing one or more of the bits
 \fBTTK_STICK_S\fR (south, or bottom).
 \fBTTK_FILL_X\fR is defined as a synonym for (\fBTTK_STICK_W\fR|\fBTTK_STICK_E\fR),
 \fBTTK_FILL_Y\fR is a synonym for (\fBTTK_STICK_N\fR|\fBTTK_STICK_S\fR),
-and  \fBTTK_FILL_BOTH\fR and \fBTTK_STICK_ALL\fR
-are synonyms for (\fBTTK_FILL_X\fR|\fBTTK_FILL_Y\fR).
+and  \fBTTK_FILL_BOTH\fR
+is a synonym for (\fBTTK_FILL_X\fR|\fBTTK_FILL_Y\fR).
 See also: \fIgrid(n)\fR.
 .AP Tk_Window tkwin in
 Window whose screen geometry determines
-- 
cgit v0.12


From 3da09c84b4332bce4d4481fdfdd66290d9149b0f Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sat, 18 Jul 2020 13:07:51 +0000
Subject: Document -border and -unit options for ttk layouts.

---
 doc/ttk_style.n         | 8 +++++++-
 generic/ttk/ttkLayout.c | 1 -
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/doc/ttk_style.n b/doc/ttk_style.n
index 931e290..5c7aa63 100644
--- a/doc/ttk_style.n
+++ b/doc/ttk_style.n
@@ -102,6 +102,9 @@ Then the parcel actually used by the element is adjusted within
 the allocated parcel.
 Valid options are:
 .TP
+\fB\-border\fR \fIboolean\fR
+Specifies whether the element is drawn after its children. Defaults to 0.
+.TP
 \fB\-children { \fIsublayout...\fB }\fR
 Specifies a list of elements to place inside the element.
 .TP
@@ -123,7 +126,10 @@ as \fB\-expand\fR 1).
 Specifies the actual parcel position and size inside the allocated parcel.
 If specified as an empty string then the actual parcel is centered in
 the allocated parcel. Default is \fBnswe\fR. 
-.\" Also: -border, -unit: may go away.
+.TP
+\fB\-unit\fR \fIboolean\fR
+Specifies whether the element propagates its state to its children.
+Defaults to 0.
 .PP
 For example:
 .CS
diff --git a/generic/ttk/ttkLayout.c b/generic/ttk/ttkLayout.c
index 2512c4b..4588c01 100644
--- a/generic/ttk/ttkLayout.c
+++ b/generic/ttk/ttkLayout.c
@@ -810,7 +810,6 @@ Tcl_Obj *Ttk_UnparseLayoutTemplate(Ttk_TemplateNode *node)
 	APPENDSTR("-sticky");
 	APPENDOBJ(Ttk_NewStickyObj(flags & _TTK_MASK_STICK));
 
-	/* @@@ Check again: are these necessary? */
 	if (flags & TTK_BORDER)	{ APPENDSTR("-border"); APPENDSTR("1"); }
 	if (flags & TTK_UNIT) 	{ APPENDSTR("-unit"); APPENDSTR("1"); }
 
-- 
cgit v0.12


From d6c8d76f57d05b5e6a2e0216d19e3afd646607bc Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sat, 18 Jul 2020 13:08:37 +0000
Subject: Remove the focus ring of selected items of ttk::treeview.

---
 generic/ttk/ttkTreeview.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/generic/ttk/ttkTreeview.c b/generic/ttk/ttkTreeview.c
index 479820a..0a156a5 100644
--- a/generic/ttk/ttkTreeview.c
+++ b/generic/ttk/ttkTreeview.c
@@ -3320,8 +3320,7 @@ TTK_LAYOUT("Item",
     TTK_GROUP("Treeitem.padding", TTK_FILL_BOTH,
 	TTK_NODE("Treeitem.indicator", TTK_PACK_LEFT)
 	TTK_NODE("Treeitem.image", TTK_PACK_LEFT)
-	TTK_GROUP("Treeitem.focus", TTK_FILL_BOTH,
-	    TTK_NODE("Treeitem.text", TTK_FILL_BOTH))))
+	TTK_NODE("Treeitem.text", TTK_FILL_BOTH)))
 
 TTK_LAYOUT("Cell",
     TTK_GROUP("Treedata.padding", TTK_FILL_BOTH,
-- 
cgit v0.12


From a98e685ef856c63cd31da03cf7463382ad9ceda9 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 19 Jul 2020 17:00:42 +0000
Subject: The semantics of TkpWillDrawWidget was reversed in a previous commit
 in this branch. Propagate this change to platforms other than macOS.

---
 unix/tkUnixPort.h | 2 +-
 win/tkWinPort.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/unix/tkUnixPort.h b/unix/tkUnixPort.h
index 491a339..47a0aad 100644
--- a/unix/tkUnixPort.h
+++ b/unix/tkUnixPort.h
@@ -167,7 +167,7 @@
 
 #define TkpButtonSetDefaults() {}
 #define TkpDestroyButton(butPtr) {}
-#define TkpWillDrawWidget(tkwin) 1
+#define TkpWillDrawWidget(tkwin) 0
 #define TkpRedrawWidget(tkwin)
 #define TkSelUpdateClipboard(a,b) {}
 #ifndef __CYGWIN__
diff --git a/win/tkWinPort.h b/win/tkWinPort.h
index dbde9e1..9829af5 100644
--- a/win/tkWinPort.h
+++ b/win/tkWinPort.h
@@ -129,7 +129,7 @@
  * Other functions not used under Windows
  */
 
-#define TkpWillDrawWidget(tkwin) 1
+#define TkpWillDrawWidget(tkwin) 0
 #define TkpRedrawWidget(tkwin)
 
 #endif /* _WINPORT */
-- 
cgit v0.12


From 548ba29c1738582ff39f1835e715cc933b8bfd20 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Mon, 20 Jul 2020 17:32:31 +0000
Subject: Apple changed the metrics for Courier New in Big Sur, causing many
 textWind tests to fail.

---
 tests/textWind.test | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/textWind.test b/tests/textWind.test
index f2daaca..b453feb 100644
--- a/tests/textWind.test
+++ b/tests/textWind.test
@@ -13,7 +13,11 @@ tcltest::loadTestedCommands
 
 deleteWindows
 
-set fixedFont {"Courier New" -12}
+if {[tk windowingsystem] eq "aqua"} {
+    set fixedFont {"Courier" -12}
+} else {
+    set fixedFont {"Courier New" -12}
+}    
 set fixedHeight [font metrics $fixedFont -linespace]
 set fixedWidth [font measure $fixedFont m]
 set fixedAscent [font metrics $fixedFont -ascent]
-- 
cgit v0.12


From 9f9a5351c3ed97e4a2427e388456f715b95134cd Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Mon, 20 Jul 2020 17:59:17 +0000
Subject: For macOS tests, account for the fact that Big Sur has a larger
 menubar.

---
 macosx/tkMacOSXTest.c | 37 ++++++++++++++++++++++++++++++++++++-
 tests/text.test       |  2 +-
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/macosx/tkMacOSXTest.c b/macosx/tkMacOSXTest.c
index 39f50e6..0a6f4e8 100644
--- a/macosx/tkMacOSXTest.c
+++ b/macosx/tkMacOSXTest.c
@@ -29,6 +29,8 @@ static int		PressButtonObjCmd (ClientData dummy, Tcl_Interp *interp,
 					int objc, Tcl_Obj *const objv[]);
 static int		InjectKeyEventObjCmd (ClientData dummy, Tcl_Interp *interp,
 					int objc, Tcl_Obj *const objv[]);
+static int		MenuBarHeightObjCmd (ClientData dummy, Tcl_Interp *interp,
+					int objc, Tcl_Obj *const objv[]);
 
 
 /*
@@ -61,7 +63,7 @@ TkplatformtestInit(
 #endif
     Tcl_CreateObjCommand(interp, "pressbutton", PressButtonObjCmd, NULL, NULL);
     Tcl_CreateObjCommand(interp, "injectkeyevent", InjectKeyEventObjCmd, NULL, NULL);
-
+    Tcl_CreateObjCommand(interp, "menubarheight", MenuBarHeightObjCmd, NULL, NULL);
     return TCL_OK;
 }
 
@@ -98,6 +100,39 @@ DebuggerObjCmd(
 /*
  *----------------------------------------------------------------------
  *
+ * MenuBarHeightObjCmd --
+ *
+ *	This procedure calls [NSMenu menuBarHeight] and returns the result
+ *      as an integer.  Windows can never be placed to overlap the MenuBar,
+ *      so tests need to be aware of its size.
+ *
+ * Results:
+ *	A standard Tcl result.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int
+MenuBarHeightObjCmd(
+    ClientData clientData,		/* Not used. */
+    Tcl_Interp *interp,			/* Not used. */
+    int objc,				/* Not used. */
+    Tcl_Obj *const objv[])		/* Not used. */
+{
+    static int height = 0;
+    if (height == 0) {
+	height = (int) [[NSApp mainMenu] menuBarHeight];
+    }
+    Tcl_SetObjResult(interp, Tcl_NewIntObj(height));
+    return TCL_OK;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
  * TkTestLogDisplay --
  *
  *      The test image display procedure calls this to determine whether it
diff --git a/tests/text.test b/tests/text.test
index 61a54ab..cd4cf50 100644
--- a/tests/text.test
+++ b/tests/text.test
@@ -3476,7 +3476,7 @@ test text-14.18 {ConfigureText procedure} -constraints fonts -setup {
 # to the appropriate size.
 # On macOS, however, there is no way to make the window overlap the menubar.
 if {[tk windowingsystem] == "aqua"} {
-    set minY 23
+    set minY [expr [menubarheight] + 1]
 } else {
     set minY 0
 }
-- 
cgit v0.12


From a9de5cde4d9e25fecc883152264797d1e3ee622a Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Mon, 20 Jul 2020 19:29:05 +0000
Subject: Aqua: fix unixWm tests broken by the larger menubar in Big Sur

---
 tests/unixWm.test | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/tests/unixWm.test b/tests/unixWm.test
index 28c8159..b6efb42 100644
--- a/tests/unixWm.test
+++ b/tests/unixWm.test
@@ -46,9 +46,10 @@ proc makeToplevels {} {
 # larger than the height of the menubar (normally 23 pixels).
 
 if {[tk windowingsystem] eq "aqua"} {
-    set Y0 23
-    set Y2 25
-    set Y5 28
+    set mb [expr [menubarheight] + 1]
+    set Y0 $mb
+    set Y2 [expr $mb + 2]
+    set Y5 [expr $mb + 5]
 } else {
     set Y0 0
     set Y2 2
@@ -56,7 +57,7 @@ if {[tk windowingsystem] eq "aqua"} {
 }
 
 set i 1
-foreach geom "+23+80 +80+23 +0+$Y0" {
+foreach geom "+$Y0+80 +80+$Y0 +0+$Y0" {
     destroy .t
     test unixWm-1.$i {initial window position} unix {
 	toplevel .t -width 200 -height 150
@@ -82,7 +83,7 @@ update
 scan [wm geom .t] %dx%d+%d+%d width height x y
 set xerr [expr 150-$x]
 set yerr [expr 150-$y]
-foreach geom "+20+80 +80+23 +0+$Y0 -0-0 +0-0 -0+$Y0 -10-5 -10+$Y5 +10-5" {
+foreach geom "+20+80 +80+$Y0 +0+$Y0 -0-0 +0-0 -0+$Y0 -10-5 -10+$Y5 +10-5" {
     test unixWm-2.$i {moving window while mapped} unix {
 	wm geom .t $geom
 	update
@@ -94,7 +95,7 @@ foreach geom "+20+80 +80+23 +0+$Y0 -0-0 +0-0 -0+$Y0 -10-5 -10+$Y5 +10-5" {
 }
 
 set i 1
-foreach geom "+20+80 +80+23 +0+$Y0 -0-0 +0-0 -0+$Y0 -10-5 -10+$Y5 +10-5" {
+foreach geom "+20+80 +80+$Y0 +0+$Y0 -0-0 +0-0 -0+$Y0 -10-5 -10+$Y5 +10-5" {
     test unixWm-3.$i {moving window while iconified} unix {
 	wm iconify .t
 	sleep 200
@@ -194,27 +195,27 @@ test unixWm-5.7 {compounded state changes} {unix nonPortable} {
 
 destroy .t
 toplevel .t -width 200 -height 100
-wm geom .t +10+23
+wm geom .t +10+$Y0
 wm minsize .t 1 1
 update
 test unixWm-6.1 {size changes} unix {
     .t config -width 180 -height 150
     update
     wm geom .t
-} 180x150+10+23
+} 180x150+10+$Y0
 test unixWm-6.2 {size changes} unix {
     wm geom .t 250x60
     .t config -width 170 -height 140
     update
     wm geom .t
-} 250x60+10+23
+} 250x60+10+$Y0
 test unixWm-6.3 {size changes} unix {
     wm geom .t 250x60
     .t config -width 170 -height 140
     wm geom .t {}
     update
     wm geom .t
-} 170x140+10+23
+} 170x140+10+$Y0
 test unixWm-6.4 {size changes} {unix nonPortable userInteraction} {
     wm minsize .t 1 1
     update
@@ -1953,13 +1954,13 @@ test unixWm-50.7 {Tk_CoordsToWindow procedure, more basics} unix {
 test unixWm-50.8 {Tk_CoordsToWindow procedure, more basics} unix {
     destroy .t
     toplevel .t -width 400 -height 300 -bg green
-    wm geom .t +0+0
+    wm geom .t +0+30
     frame .t.f -width 200 -height 100 -bd 2 -relief raised
     place .t.f -x 100 -y 100
     frame .t.f.f -width 200 -height 100 -bd 2 -relief raised
     place .t.f.f -x 100 -y 0
     update
-    set x [winfo rooty .t]
+    set x [winfo rootx .t]
     set y [expr [winfo rooty .t] + 150]
     list [winfo containing [expr $x + 50] $y] \
 	    [winfo containing [expr $x + 150] $y] \
-- 
cgit v0.12


From c160fe8bd880807117acc15040f8f4116ec85418 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Mon, 20 Jul 2020 19:46:37 +0000
Subject: Fix [cf38535396]: Aqua should use pixel-aligned dash pattern for
 non-Retina displays - patch from Christopher Chavez

---
 macosx/tkMacOSXDraw.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index 7d12a4b..68e7ada 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -1763,6 +1763,7 @@ TkMacOSXSetupDrawingContext(
 		int num = 0;
 		char *p = &gc->dashes;
 		CGFloat dashOffset = gc->dash_offset;
+		dashOffset -= (gc->line_width % 2) ? 0.5 : 0.0;
 		CGFloat lengths[10];
 
 		while (p[num] != '\0' && num < 10) {
-- 
cgit v0.12


From 76864c8a9ccb1c3400b2482b6d3c8f9d0d1101f9 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Tue, 21 Jul 2020 18:36:38 +0000
Subject: Improve image testing on macOS.

---
 generic/tkTest.c   | 64 ++++++++++++++++++++++++++++++++----------------------
 tests/canvImg.test | 23 ++++++++++----------
 2 files changed, 49 insertions(+), 38 deletions(-)

diff --git a/generic/tkTest.c b/generic/tkTest.c
index e80f488..c22e649 100644
--- a/generic/tkTest.c
+++ b/generic/tkTest.c
@@ -71,6 +71,8 @@ typedef struct TImageInstance {
     TImageMaster *masterPtr;	/* Pointer to master for image. */
     XColor *fg;			/* Foreground color for drawing in image. */
     GC gc;			/* Graphics context for drawing in image. */
+    Bool displayFailed;         /* macOS display attempted out of drawRect. */
+    char buffer[200 + TCL_INTEGER_SPACE * 6]; /* message to log on display. */
 } TImageInstance;
 
 /*
@@ -1517,6 +1519,7 @@ ImageGet(
     instPtr->fg = Tk_GetColor(timPtr->interp, tkwin, "#ff0000");
     gcValues.foreground = instPtr->fg->pixel;
     instPtr->gc = Tk_GetGC(tkwin, GCForeground, &gcValues);
+    instPtr->displayFailed = False;
     return instPtr;
 }
 
@@ -1551,41 +1554,50 @@ ImageDisplay(
 				 * imageX and imageY. */
 {
     TImageInstance *instPtr = (TImageInstance *) clientData;
-    char buffer[200 + TCL_INTEGER_SPACE * 6];
 
     /*
      * The purpose of the test image type is to track the calls to an image
-     * display proc and record the parameters passed in each call.  On macOS
-     * a display proc must be run inside of the drawRect method of an NSView
-     * in order for the graphics operations to have any effect.  To deal with
+     * display proc and record the parameters passed in each call.  On macOS a
+     * display proc must be run inside of the drawRect method of an NSView in
+     * order for the graphics operations to have any effect.  To deal with
      * this, whenever a display proc is called outside of any drawRect method
-     * it schedules a redraw of the NSView by calling [view setNeedsDisplay:YES].
-     * This will trigger a later call to the view's drawRect method which will
-     * run the display proc a second time.
+     * it schedules a redraw of the NSView.
      *
-     * This complicates testing, since it can result in more calls to the display
-     * proc than are expected by the test.  It can also result in an inconsistent
-     * number of calls unless the test waits until the call to drawRect actually
-     * occurs before validating its results.
-     *
-     * In an attempt to work around this, this display proc only logs those
-     * calls which occur within a drawRect method.  This means that tests must
-     * be written so as to ensure that the drawRect method is run before
-     * results are validated.  In practice it usually suffices to run update
-     * idletasks (to run the display proc the first time) followed by update
-     * (to run the display proc in drawRect).
-     *
-     * This also has the consequence that the image changed command will log
-     * different results on Aqua than on other systems, because when the image
-     * is redisplayed in the drawRect method the entire image will be drawn,
-     * not just the changed portion.  Tests must account for this.
+     * In an attempt to work around this, each image instance maintains it own
+     * copy of the log message which gets written on the first call to the
+     * display proc.  This usually means that the message created on macOS is
+     * the same as that created on other platforms.  However it is possible
+     * for the messages to differ for other reasons, namely differences in
+     * how damage regions are computed.
      */
 
     if (LOG_DISPLAY(drawable)) {
-	sprintf(buffer, "%s display %d %d %d %d",
-		instPtr->masterPtr->imageName, imageX, imageY, width, height);
+	if (instPtr->displayFailed == False) {
+
+	    /*
+	     * Drawing is possible on the first call to DisplayImage.
+	     * Log the message.
+	     */
+
+	    sprintf(instPtr->buffer, "%s display %d %d %d %d",
+	    instPtr->masterPtr->imageName, imageX, imageY, width, height);
+	}
 	Tcl_SetVar2(instPtr->masterPtr->interp, instPtr->masterPtr->varName,
-		    NULL, buffer, TCL_GLOBAL_ONLY|TCL_APPEND_VALUE|TCL_LIST_ELEMENT);
+		    NULL, instPtr->buffer,
+		    TCL_GLOBAL_ONLY|TCL_APPEND_VALUE|TCL_LIST_ELEMENT);
+	instPtr->displayFailed = False;
+    } else {
+
+	/*
+         * Drawing is not possible on the first call to DisplayImage.
+	 * Save the message, but do not log it until the actual display.
+	 */
+	
+	if (instPtr->displayFailed == False) {
+	    sprintf(instPtr->buffer, "%s display %d %d %d %d",
+		    instPtr->masterPtr->imageName, imageX, imageY, width, height);
+	}
+	instPtr->displayFailed = True;
     }
     if (width > (instPtr->masterPtr->width - imageX)) {
 	width = instPtr->masterPtr->width - imageX;
diff --git a/tests/canvImg.test b/tests/canvImg.test
index 1abea78..b57e21d 100644
--- a/tests/canvImg.test
+++ b/tests/canvImg.test
@@ -174,7 +174,7 @@ test canvImg-4.2 {ConfigureImage procedure} -constraints testImageType -setup {
     while {"timed out" ni $y && [lindex $y end 1] ne "display"} {
         vwait y
     }
-    after cancel timer
+    after cancel $timer
     list $x $y [.c bbox i1]
 } -cleanup {
     .c delete all
@@ -739,7 +739,6 @@ test canvImg-10.1 {TranslateImage procedure} -constraints testImageType -setup {
     foo changed 2 4 6 8 30 15
     vwait x
     after cancel $timer
-    update
     return $x
 } -cleanup {
     .c delete all
@@ -756,7 +755,7 @@ test canvImg-11.1 {TranslateImage procedure} -constraints testImageType -setup {
     set x {}
     set timer [after 500 {lappend x "timed out"}]
     foo changed 2 4 6 8 40 50
-        vwait x
+    vwait x
     after cancel $timer
     update
     return $x
@@ -779,17 +778,18 @@ test canvImg-11.2 {ImageChangedProc procedure} -constraints {
 	.c delete all
 	image delete foo
 } -result {30 75 70 125}
-if {[tk windowingsystem] == "aqua" && $tcl_platform(osVersion) > 18} {
-    # Aqua >= 10.14 will redraw the entire image.
+if {[tk windowingsystem] == "aqua"} {
+#     # For this test only the 20x40 upper left corner of foo2 needs
+#     # to be redrawn, but Aqua redraws the entire image.
     set result_11_3 {{foo2 display 0 0 80 60}}
-} else {
-    set result_11_3 {{foo2 display 0 0 20 40}} 
+ } else {
+   set result_11_3 {{foo2 display 0 0 20 40}} 
 }
 test canvImg-11.3 {ImageChangedProc procedure} -constraints {
 	testImageType 
 } -setup {
     .c delete all
-    update
+    update idletasks
 } -body {
     image create test foo -variable x
     image create test foo2 -variable z
@@ -797,16 +797,15 @@ test canvImg-11.3 {ImageChangedProc procedure} -constraints {
     foo2 changed 0 0 0 0 80 60
     .c create image 50 100 -image foo -tags image -anchor nw
     .c create image 70 110 -image foo2 -anchor nw
-    update idletasks
     set z {}
     set timer [after 500 {lappend z "timed out"}]
-    image create test foo -variable x
-    vwait x
+    image delete foo
+    vwait z
     after cancel $timer
     return $z
 } -cleanup {
     .c delete all
-    image delete foo foo2
+    image delete foo2
 } -result $result_11_3
 
 # cleanup
-- 
cgit v0.12


From f8b3a93842b3f805b1a470c0673fe2c1048a32b1 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Wed, 22 Jul 2020 02:09:02 +0000
Subject: Fix some compiler warnings on Sierra.

---
 macosx/tkMacOSXColor.c  | 11 +++++++++++
 macosx/tkMacOSXNotify.c |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index a0eaa84..fd424cd 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -267,6 +267,16 @@ GetEntryFromPixelCode(
  *----------------------------------------------------------------------
  */
 
+/*
+ * Apple claims that linkColor is available in 10.10 but the declaration
+ * does not appear in NSColor.h until later.  Declaring it in a category
+ * appears to be harmless and stops the compiler warnings. 
+ */
+
+@interface NSColor(TkColor)
+@property(class, strong, readonly) NSColor *linkColor;
+@end
+
 static NSColorSpace* sRGB = NULL;
 static CGFloat windowBackground[4] =
     {236.0 / 255, 236.0 / 255, 236.0 / 255, 1.0};
@@ -336,6 +346,7 @@ SetCGColorComponents(
 	    break;
 	case 2:
 	    if ([NSApp macOSVersion] > 100900) {
+
 #if MAC_OS_X_VERSION_MAX_ALLOWED > 1090
 		color = [[NSColor labelColor] colorUsingColorSpace:sRGB];
 #endif
diff --git a/macosx/tkMacOSXNotify.c b/macosx/tkMacOSXNotify.c
index 367f3b6..83b4695 100644
--- a/macosx/tkMacOSXNotify.c
+++ b/macosx/tkMacOSXNotify.c
@@ -156,6 +156,7 @@ void DebugPrintQueue(void)
      * this block should be removed.
      */
 
+# if MAC_OSX_VERSION_MAX_ALLOWED >= 101500
     if ([theEvent type] == NSAppKitDefined) {
 	static Bool aWindowIsMoving = NO;
 	switch([theEvent subtype]) {
@@ -174,6 +175,7 @@ void DebugPrintQueue(void)
 	    break;
 	}
     }
+#endif
     [super sendEvent:theEvent];
     [NSApp tkCheckPasteboard];
 
-- 
cgit v0.12


From 5297b4a5aa961d555081f871afd899f063b37fcc Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Wed, 22 Jul 2020 03:30:07 +0000
Subject: Make image testing work better in the Sierras

---
 macosx/tkMacOSXTest.c | 30 ++++++++----------------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/macosx/tkMacOSXTest.c b/macosx/tkMacOSXTest.c
index 0a6f4e8..e5dcf5e 100644
--- a/macosx/tkMacOSXTest.c
+++ b/macosx/tkMacOSXTest.c
@@ -136,19 +136,12 @@ MenuBarHeightObjCmd(
  * TkTestLogDisplay --
  *
  *      The test image display procedure calls this to determine whether it
- *      should write a log message recording that it has being run.  On OSX
- *      10.14 and later, only calls to the display procedure which occur inside
- *      of the drawRect method should be logged, since those are the only ones
- *      which actually draw anything.  On earlier systems the opposite is true.
- *      The calls from within the drawRect method are redundant, since the
- *      first time the display procedure is run it will do the drawing and that
- *      first call will usually not occur inside of drawRect.
+ *      should write a log message recording that it has being run.
  *
  * Results:
- *      On OSX 10.14 and later, returns true if and only if the NSView of the
- *      drawable is the current focusView, which can only be the case when
- *      within [NSView drawRect].  On earlier systems returns false if
- *      and only if called from with [NSView drawRect].
+ *      Returns true if and only if the NSView of the drawable is the
+ *      current focusView, which on 10.14 and newer systems can only be the
+ *      case when within [NSView drawRect].
  *
  * Side effects:
  *	None
@@ -168,18 +161,11 @@ TkTestLogDisplay(
     } else if (macWin->winPtr && macWin->winPtr->wmInfoPtr &&
 	       macWin->winPtr->wmInfoPtr->window) {
 	win = macWin->winPtr->wmInfoPtr->window;
-    }/*
-    else if (macWin->toplevel && (macWin->toplevel->flags & TK_EMBEDDED)) {
-	TkWindow *contWinPtr = TkpGetOtherWindow(macWin->toplevel->winPtr);
-	if (contWinPtr) {
-	    win = TkMacOSXDrawableWindow((Drawable) contWinPtr->privatePtr);
-	}
-	}*/
-    if (win && [NSApp macOSVersion] >= 101400) {
-	TKContentView *view = [win contentView];
-	return (view == [NSView focusView]);
+    }
+    if (win) {
+	return ([win contentView] == [NSView focusView]);
     } else {
-	return ![NSApp isDrawing];
+	return True;
     }
 }
 
-- 
cgit v0.12


From 06178b77e52e18e6f3bafc4fee9f4049348b1292 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Wed, 22 Jul 2020 18:30:29 +0000
Subject: Fix Yosemite compiler warnings and bugs in tests revealed by testing
 on Yosemite.

---
 macosx/tkMacOSXColor.c |  9 +++++++--
 tests/entry.test       | 27 ++++++++++++++++-----------
 tests/spinbox.test     | 38 +++++++++++++++++++++++++-------------
 tests/ttk/spinbox.test |  9 ++++++---
 4 files changed, 54 insertions(+), 29 deletions(-)

diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index fd424cd..8e60552 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -273,8 +273,13 @@ GetEntryFromPixelCode(
  * appears to be harmless and stops the compiler warnings. 
  */
 
+
 @interface NSColor(TkColor)
+#if MAC_OS_X_VERSION_MAX_ALLOWED > 101100
 @property(class, strong, readonly) NSColor *linkColor;
+#else
+@property(strong, readonly) NSColor *linkColor;
+#endif
 @end
 
 static NSColorSpace* sRGB = NULL;
@@ -389,8 +394,8 @@ SetCGColorComponents(
 	    }
 	    break;
 	case 9:
-	    if ([NSApp macOSVersion] >= 101000) {
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
+	    if ([NSApp macOSVersion] >= 101100) {
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101100
 		color = [[NSColor linkColor] colorUsingColorSpace:sRGB];
 #endif
 	    } else {
diff --git a/tests/entry.test b/tests/entry.test
index f9879a2..8512b3f 100644
--- a/tests/entry.test
+++ b/tests/entry.test
@@ -12,6 +12,7 @@ eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
 # For xscrollcommand
+set scrollInfo {}
 proc scroll args {
         global scrollInfo
         set scrollInfo $args
@@ -1671,9 +1672,10 @@ test entry-5.7 {ConfigureEntry procedure} -setup {
 } -body {
     .e configure -font {Courier -12} -width 4 -xscrollcommand scroll
     .e insert end "01234567890"
-    set timeout [after 500 {set $scrollInfo "timeout"}]
-    vwait scrollInfo
+    update idletasks
+    set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
     .e configure -width 5
+    vwait scrollInfo
     format {%.6f %.6f} {*}$scrollInfo
 } -cleanup {
     destroy .e
@@ -1916,9 +1918,9 @@ test entry-7.1 {InsertChars procedure} -setup {
     focus .e
 } -body {
     .e configure -textvariable contents -xscrollcommand scroll
+    set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
     .e insert 0 abcde
     .e insert 2 XXX
-    set timeout [after 500 {set $scrollInfo "timeout"}]
     vwait scrollInfo
     list [.e get] $contents [format {%.6f %.6f} {*}$scrollInfo]
 } -cleanup {
@@ -1933,9 +1935,9 @@ test entry-7.2 {InsertChars procedure} -setup {
     focus .e
 } -body {
     .e configure -textvariable contents -xscrollcommand scroll
+    set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
     .e insert 0 abcde
     .e insert 500 XXX
-    set timeout [after 500 {set $scrollInfo "timeout"}]
     vwait scrollInfo
     list [.e get] $contents [format {%.6f %.6f} {*}$scrollInfo]
 } -cleanup {
@@ -2067,9 +2069,9 @@ test entry-8.1 {DeleteChars procedure} -setup {
     focus .e
 } -body {
     .e configure -textvariable contents -xscrollcommand scroll
+    set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
     .e insert 0 abcde
     .e delete 2 4
-    set timeout [after 500 {set $scrollInfo "timeout"}]
     vwait scrollInfo
     list [.e get] $contents [format {%.6f %.6f} {*}$scrollInfo]
 } -cleanup {
@@ -2083,9 +2085,9 @@ test entry-8.2 {DeleteChars procedure} -setup {
     focus .e
 } -body {
     .e configure -textvariable contents -xscrollcommand scroll
+    set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
     .e insert 0 abcde
     .e delete -2 2
-    set timeout [after 500 {set $scrollInfo "timeout"}]
     vwait scrollInfo
     list [.e get] $contents [format {%.6f %.6f} {*}$scrollInfo]
 } -cleanup {
@@ -2099,9 +2101,9 @@ test entry-8.3 {DeleteChars procedure} -setup {
     focus .e
 } -body {
     .e configure -textvariable contents -xscrollcommand scroll
+    set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
     .e insert 0 abcde
     .e delete 3 1000
-    set timeout [after 500 {set $scrollInfo "timeout"}]
     vwait scrollInfo
     list [.e get] $contents [format {%.6f %.6f} {*}$scrollInfo]
 } -cleanup {
@@ -2937,9 +2939,10 @@ test entry-16.4 {EntryVisibleRange procedure} -body {
 test entry-17.1 {EntryUpdateScrollbar procedure} -body {
     entry .e -width 10 -xscrollcommand scroll -font {Courier -12}
     pack .e
+    update idletasks
+    set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
     .e delete 0 end
     .e insert 0 123
-    set timeout [after 500 {set $scrollInfo "timeout"}]
     vwait scrollInfo
     format {%.6f %.6f} {*}$scrollInfo
 } -cleanup {
@@ -2949,9 +2952,9 @@ test entry-17.1 {EntryUpdateScrollbar procedure} -body {
 test entry-17.2 {EntryUpdateScrollbar procedure} -body {
     entry .e -width 10 -xscrollcommand scroll -font {Courier -12}
     pack .e
+    set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
     .e insert 0 0123456789abcdef
     .e xview 3
-    set timeout [after 500 {set $scrollInfo "timeout"}]
     vwait scrollInfo
     format {%.6f %.6f} {*}$scrollInfo
 } -cleanup {
@@ -2961,9 +2964,9 @@ test entry-17.2 {EntryUpdateScrollbar procedure} -body {
 test entry-17.3 {EntryUpdateScrollbar procedure} -body {
     entry .e -width 10 -xscrollcommand scroll -font {Courier -12}
     pack .e
+    set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
     .e insert 0 abcdefghijklmnopqrs
     .e xview 6
-    set timeout [after 500 {set $scrollInfo "timeout"}]
     vwait scrollInfo
     format {%.6f %.6f} {*}$scrollInfo
 } -cleanup {
@@ -2976,8 +2979,10 @@ test entry-17.4 {EntryUpdateScrollbar procedure} -setup {
 	set x $msg
 }
 } -body {
-    entry .e -width 5 -xscrollcommand thisisnotacommand
+    entry .e -width 5
     pack .e
+    update idletasks
+    .e configure -xscrollcommand thisisnotacommand
     vwait x
     list $x $errorInfo
 } -cleanup {
diff --git a/tests/spinbox.test b/tests/spinbox.test
index 5d79c8e..3f55d7f 100644
--- a/tests/spinbox.test
+++ b/tests/spinbox.test
@@ -12,6 +12,7 @@ eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
 # For xscrollcommand
+set scrollInfo {}
 proc scroll args {
         global scrollInfo
         set scrollInfo $args
@@ -2013,9 +2014,10 @@ test spinbox-5.7 {ConfigureSpinbox procedure} -setup {
 } -body {
     .e configure -font {Courier -12} -width 4 -xscrollcommand scroll
     .e insert end "01234567890"
-    set timeout [after 500 {set $scrollInfo "timeout"}]
-    vwait scrollInfo
+    update idletasks
+    set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
     .e configure -width 5
+    vwait scrollInfo
     format {%.6f %.6f} {*}$scrollInfo
 } -cleanup {
     destroy .e
@@ -2204,8 +2206,9 @@ test spinbox-7.1 {InsertChars procedure} -setup {
 } -body {
     .e configure -textvariable contents -xscrollcommand scroll
     .e insert 0 abcde
+    update idletasks
+    set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
     .e insert 2 XXX
-    set timeout [after 500 {set $scrollInfo "timeout"}]
     vwait scrollInfo
     list [.e get] $contents [format {%.6f %.6f} {*}$scrollInfo]
 } -cleanup {
@@ -2221,8 +2224,9 @@ test spinbox-7.2 {InsertChars procedure} -setup {
 } -body {
     .e configure -textvariable contents -xscrollcommand scroll
     .e insert 0 abcde
+    update idletasks
+    set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
     .e insert 500 XXX
-    set timeout [after 500 {set $scrollInfo "timeout"}]
     vwait scrollInfo
     list [.e get] $contents [format {%.6f %.6f} {*}$scrollInfo]
 } -cleanup {
@@ -2355,8 +2359,9 @@ test spinbox-8.1 {DeleteChars procedure} -setup {
 } -body {
     .e configure -textvariable contents -xscrollcommand scroll
     .e insert 0 abcde
+    update idletasks
+    set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
     .e delete 2 4
-    set timeout [after 500 {set $scrollInfo "timeout"}]
     vwait scrollInfo
     list [.e get] $contents [format {%.6f %.6f} {*}$scrollInfo]
 } -cleanup {
@@ -2371,8 +2376,9 @@ test spinbox-8.2 {DeleteChars procedure} -setup {
 } -body {
     .e configure -textvariable contents -xscrollcommand scroll
     .e insert 0 abcde
+    update idletasks
+    set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
     .e delete -2 2
-    set timeout [after 500 {set $scrollInfo "timeout"}]
     vwait scrollInfo
     list [.e get] $contents [format {%.6f %.6f} {*}$scrollInfo]
 } -cleanup {
@@ -2387,8 +2393,9 @@ test spinbox-8.3 {DeleteChars procedure} -setup {
 } -body {
     .e configure -textvariable contents -xscrollcommand scroll
     .e insert 0 abcde
+    update idletasks
+    set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
     .e delete 3 1000
-    set timeout [after 500 {set $scrollInfo "timeout"}]
     vwait scrollInfo
     list [.e get] $contents [format {%.6f %.6f} {*}$scrollInfo]
 } -cleanup {
@@ -3173,9 +3180,10 @@ test spinbox-16.2 {SpinboxVisibleRange procedure} -body {
 test spinbox-17.1 {SpinboxUpdateScrollbar procedure} -body {
     spinbox .e -width 10 -xscrollcommand scroll -font {Courier -12}
     pack .e
+    update idletasks
+    set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
     .e delete 0 end
     .e insert 0 123
-    set timeout [after 500 {set $scrollInfo "timeout"}]
     vwait scrollInfo
     format {%.6f %.6f} {*}$scrollInfo
 } -cleanup {
@@ -3186,8 +3194,9 @@ test spinbox-17.2 {SpinboxUpdateScrollbar procedure} -body {
     spinbox .e -width 10 -xscrollcommand scroll -font {Courier -12}
     pack .e
     .e insert 0 0123456789abcdef
+    update idletasks
+    set timeout [after 500 {set $scrollInfo {-1000000 -1000000}}]
     .e xview 3
-    set timeout [after 500 {set $scrollInfo "timeout"}]
     vwait scrollInfo
     format {%.6f %.6f} {*}$scrollInfo
 } -cleanup {
@@ -3197,23 +3206,26 @@ test spinbox-17.2 {SpinboxUpdateScrollbar procedure} -body {
 test spinbox-17.3 {SpinboxUpdateScrollbar procedure} -body {
     spinbox .e -width 10 -xscrollcommand scroll -font {Courier -12}
     pack .e
+    update idletasks
+    set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
     .e insert 0 abcdefghijklmnopqrs
-    .e xview 6
-    set timeout [after 500 {set $scrollInfo "timeout"}]
+    .e xview 
     vwait scrollInfo
     format {%.6f %.6f} {*}$scrollInfo
 } -cleanup {
     destroy .e
     after cancel $timeout
-} -result {0.315789 0.842105}
+} -result {0.000000 0.526316}
 test spinbox-17.4 {SpinboxUpdateScrollbar procedure} -setup {
     proc bgerror msg {
 	global x
 	set x $msg
 }
 } -body {
-    spinbox .e -width 5 -xscrollcommand thisisnotacommand
+    spinbox .e -width 5
     pack .e
+    update idletasks
+    .e configure -xscrollcommand thisisnotacommand
     vwait x
     list $x $errorInfo
 } -cleanup {
diff --git a/tests/ttk/spinbox.test b/tests/ttk/spinbox.test
index 40cb244..b86f053 100644
--- a/tests/ttk/spinbox.test
+++ b/tests/ttk/spinbox.test
@@ -204,16 +204,19 @@ test spinbox-3.0 "textarea should expand to fill widget" -setup {
     set ::spinbox_test {}
     ttk::spinbox .sb -from 0 -to 10 -textvariable SBV
 } -body {
-    grid .sb -sticky ew
     grid columnconfigure . 0 -weight 1
+    update idletasks
+    set timer [after 500 {set ::spinbox_test timedout}]
     bind . <Map> {
         after idle {
             wm geometry . "210x80"
-            after 100 {set ::spinbox_test [.sb identify element 5 5]}
+	    update idletasks
+            set ::spinbox_test [.sb identify element 25 5]
         }
         bind . <Map> {}
     }
-    after 500 {set ::spinbox_wait 1} ; vwait ::spinbox_wait
+    grid .sb -sticky ew
+    vwait ::spinbox_test
     set ::spinbox_test
 } -cleanup {
     destroy .sb
-- 
cgit v0.12


From 8355f067aeedc09f978725b0c5956924ac3542bc Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Wed, 22 Jul 2020 20:52:47 +0000
Subject: Fix issues with mapping and unmapping windows revealed by tests on
 Yosemite.

---
 macosx/tkMacOSXSubwindows.c  |  2 ++
 macosx/tkMacOSXWindowEvent.c |  3 +--
 macosx/tkMacOSXWm.c          | 14 +++-----------
 tests/pack.test              | 19 +++++++++++--------
 4 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index 8bae8fd..030830d 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -206,6 +206,7 @@ XMapWindow(
 	event.xmap.event = window;
 	event.xmap.override_redirect = winPtr->atts.override_redirect;
 	Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
+	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS|TCL_WINDOW_EVENTS|TCL_DONT_WAIT)) {}
     } else {
 
 	/*
@@ -316,6 +317,7 @@ XUnmapWindow(
 	event.xunmap.event = window;
 	event.xunmap.from_configure = false;
 	Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
+	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS|TCL_WINDOW_EVENTS|TCL_DONT_WAIT)) {}
     } else {
 	/*
 	 * Rebuild the visRgn clip region for the parent so it will be allowed
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 5f52ea7..3f0e52f 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -117,8 +117,7 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
 	 * Process all Tk events generated by Tk_MapWindow().
 	 */
 
-	while (Tcl_ServiceEvent(0)) {}
-	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {}
+	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS|TCL_WINDOW_EVENTS|TCL_DONT_WAIT)) {}
 
 	/*
 	 * NSWindowDidDeminiaturizeNotification is received after
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index dca8686..abaf152 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -1807,7 +1807,6 @@ WmDeiconifyCmd(
 	Tcl_WrongNumArgs(interp, 2, objv, "window");
 	return TCL_ERROR;
     }
-
     if (wmPtr->iconFor != NULL) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"can't deiconify %s: it is an icon for %s",
@@ -6422,16 +6421,9 @@ TkpWmSetState(
 	Tk_UnmapWindow((Tk_Window) winPtr);
     } else if (state == NormalState || state == ZoomState) {
 	Tk_MapWindow((Tk_Window) winPtr);
-	if (macWin && ([macWin styleMask] & NSMiniaturizableWindowMask)) {
-	    if ([macWin isMiniaturized]) {
-		[macWin deminiaturize:NSApp];
-	    }
-	    else {
-		[macWin orderFront:nil];
-	    }
-	}
-	TkMacOSXZoomToplevel(macWin, state == NormalState ? inZoomIn :
-		inZoomOut);
+	[macWin deminiaturize:NSApp];
+	[macWin orderFront:NSApp];
+	TkMacOSXZoomToplevel(macWin, state == NormalState ? inZoomIn : inZoomOut);
     }
 }
 
diff --git a/tests/pack.test b/tests/pack.test
index b1c22c7..04e84b9 100644
--- a/tests/pack.test
+++ b/tests/pack.test
@@ -1554,6 +1554,7 @@ test pack-18.1 {unmap slaves when master unmapped} -constraints {
     tempNotPc
 } -setup {
     eval destroy [winfo child .pack]
+    update idletasks
 } -body {
 
     # adjust the position of .pack before test to avoid a screen switch
@@ -1561,25 +1562,27 @@ test pack-18.1 {unmap slaves when master unmapped} -constraints {
     # as the screen (screen switch causes scale and other tests to fail).
 
     wm geometry .pack +100+100
+    update idletasks
 
     # On the PC, when the width/height is configured while the window is
     # unmapped, the changes don't take effect until the window is remapped.
     # Who knows why?
 
     eval destroy [winfo child .pack]
+    update idletasks
     frame .pack.a -width 100 -height 50 -relief raised -bd 2
     pack .pack.a
-    update
+    update idletasks
     set result [winfo ismapped .pack.a]
     wm iconify .pack
-    update
+    update idletasks
     lappend result [winfo ismapped .pack.a]
     .pack.a configure -width 200 -height 75
-    update
+    update idletasks
     lappend result [winfo width .pack.a ] [winfo height .pack.a] \
     [winfo ismapped .pack.a]
     wm deiconify .pack
-    update
+    update idletasks
     lappend result [winfo ismapped .pack.a]
 } -result {1 0 200 75 0 1}
 test pack-18.2 {unmap slaves when master unmapped} -setup {
@@ -1595,17 +1598,17 @@ test pack-18.2 {unmap slaves when master unmapped} -setup {
     frame .pack.b -width 70 -height 30 -relief sunken -bd 2
     pack .pack.a
     pack .pack.b -in .pack.a
-    update
+    update idletasks
     set result [winfo ismapped .pack.b]
     wm iconify .pack
-    update
+    update idletasks
     lappend result [winfo ismapped .pack.b]
     .pack.b configure -width 100 -height 30
-    update
+    update idletasks
     lappend result [winfo width .pack.b ] [winfo height .pack.b] \
     [winfo ismapped .pack.b]
     wm deiconify .pack
-    update
+    update idletasks
     lappend result [winfo ismapped .pack.b]
 } -result {1 0 100 30 0 1}
 
-- 
cgit v0.12


From e9fb55d44123ed3f5db96f308e4143e6efa22205 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Wed, 22 Jul 2020 21:31:41 +0000
Subject: More Yosemite fixes.  Why did it start to hang in
 safePrimarySelection-3.1?

---
 macosx/tkMacOSXWm.c |  4 +++-
 tests/place.test    | 17 +++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index abaf152..3af2ff5 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -6870,7 +6870,6 @@ ApplyWindowAttributeFlagChanges(
 		    b |= (NSWindowCollectionBehaviorCanJoinAllSpaces |
 			    NSWindowCollectionBehaviorFullScreenAuxiliary);
 		} else {
-		    NSSize screenSize = [[macWindow screen] frame].size;
 		    b |= NSWindowCollectionBehaviorFullScreenPrimary;
 
 		    /*
@@ -6881,7 +6880,10 @@ ApplyWindowAttributeFlagChanges(
 		     * to the screen size.  (For 10.11 and up, only)
 		     */
 		    if ([NSApp macOSVersion] > 101000) {
+#if !(MAC_OS_X_VERSION_MAX_ALLOWED > 101000)
+			NSSize screenSize = [[macWindow screen] frame].size;
 			[macWindow setMaxFullScreenContentSize:screenSize];
+#endif
 		    }
 		}
 	    }
diff --git a/tests/place.test b/tests/place.test
index 62e0ed2..56ddde4 100644
--- a/tests/place.test
+++ b/tests/place.test
@@ -264,34 +264,35 @@ test place-8.1 {MasterStructureProc, mapping and unmapping slaves} -setup {
     place forget .t.f
 } -body {
     place .t.f2 -relx 1.0 -rely 1.0 -anchor sw
-    update
+    update idletasks
     set result [winfo ismapped .t.f2]
     wm iconify .t
-    update
+    update idletasks
     lappend result [winfo ismapped .t.f2]
     place .t.f2 -x 40 -y 30 -relx 0 -rely 0 -anchor nw
-    update
+    update idletasks
     lappend result [winfo x .t.f2] [winfo y .t.f2] [winfo ismapped .t.f2]
     wm deiconify .t
-    update
+    update idletasks
     lappend result [winfo ismapped .t.f2]
 } -result {1 0 40 30 0 1}
 test place-8.2 {MasterStructureProc, mapping and unmapping slaves} -setup {
     place forget .t.f2
     place forget .t.f
+    update idletasks
 } -body {
     place .t.f -x 0 -y 0 -width 200 -height 100
     place .t.f2 -in .t.f -relx 1.0 -rely 1.0 -anchor sw -width 50 -height 20
-    update
+    update idletasks
     set result [winfo ismapped .t.f2]
     wm iconify .t
-    update
+    update idletasks
     lappend result [winfo ismapped .t.f2]
     place .t.f2 -x 40 -y 30 -relx 0 -rely 0 -anchor nw
-    update
+    update idletasks
     lappend result [winfo x .t.f2] [winfo y .t.f2] [winfo ismapped .t.f2]
     wm deiconify .t
-    update
+    update idletasks
     lappend result [winfo ismapped .t.f2]
 } -result {1 0 42 32 0 1}
 destroy .t
-- 
cgit v0.12


From 7da497b576c4b2fa5bf3660f84e6984d55b376f1 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Thu, 23 Jul 2020 15:22:33 +0000
Subject: The added event loops work to update the mapped flags for packed and
 placed windows, but they break more than they fix.

---
 macosx/tkMacOSXSubwindows.c  | 2 --
 macosx/tkMacOSXWindowEvent.c | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index 030830d..8bae8fd 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -206,7 +206,6 @@ XMapWindow(
 	event.xmap.event = window;
 	event.xmap.override_redirect = winPtr->atts.override_redirect;
 	Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
-	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS|TCL_WINDOW_EVENTS|TCL_DONT_WAIT)) {}
     } else {
 
 	/*
@@ -317,7 +316,6 @@ XUnmapWindow(
 	event.xunmap.event = window;
 	event.xunmap.from_configure = false;
 	Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
-	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS|TCL_WINDOW_EVENTS|TCL_DONT_WAIT)) {}
     } else {
 	/*
 	 * Rebuild the visRgn clip region for the parent so it will be allowed
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 3f0e52f..5f52ea7 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -117,7 +117,8 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
 	 * Process all Tk events generated by Tk_MapWindow().
 	 */
 
-	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS|TCL_WINDOW_EVENTS|TCL_DONT_WAIT)) {}
+	while (Tcl_ServiceEvent(0)) {}
+	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {}
 
 	/*
 	 * NSWindowDidDeminiaturizeNotification is received after
-- 
cgit v0.12


From 364c3cdadc46755bf53a69063125d5efbe391f0e Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Thu, 23 Jul 2020 16:22:02 +0000
Subject: Deal with mapping/unmapping packed and placed subwindows in a benign
 way.

---
 macosx/tkMacOSXSubwindows.c | 20 ++++++++++++++++++--
 tests/unixWm.test           | 42 ++++++++++++------------------------------
 2 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index 8bae8fd..a58bab4 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -205,7 +205,15 @@ XMapWindow(
 	event.xmap.type = MapNotify;
 	event.xmap.event = window;
 	event.xmap.override_redirect = winPtr->atts.override_redirect;
-	Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
+
+	/*
+	 * To update the mapped status of packed or placed subwindows
+	 * we handle this event immediately and then process the idle
+	 * events that it generates.
+	 */
+	
+	Tk_HandleEvent(&event);
+	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {}
     } else {
 
 	/*
@@ -315,7 +323,15 @@ XUnmapWindow(
 	event.xunmap.window = window;
 	event.xunmap.event = window;
 	event.xunmap.from_configure = false;
-	Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
+
+	/*
+	 * To update the mapped status of packed or placed subwindows
+	 * we handle this event immediately and then process the idle
+	 * events that it generates.
+	 */
+	
+	Tk_HandleEvent(&event);
+	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {}
     } else {
 	/*
 	 * Rebuild the visRgn clip region for the parent so it will be allowed
diff --git a/tests/unixWm.test b/tests/unixWm.test
index b6efb42..bd68511 100644
--- a/tests/unixWm.test
+++ b/tests/unixWm.test
@@ -19,16 +19,6 @@ proc sleep ms {
     vwait x
 }
 
-# The macOS window manager shows an animation when a window is deiconified.
-# Tests which check the geometry of a window after deiconifying it should
-# wait for the animation to finish.
-
- proc animationDelay {} {
-    if {[tk windowingsystem] == "aqua"} {
-    sleep 250
-    }
- }
-
 # Procedure to set up a collection of top-level windows
 
 proc makeToplevels {} {
@@ -98,11 +88,11 @@ set i 1
 foreach geom "+20+80 +80+$Y0 +0+$Y0 -0-0 +0-0 -0+$Y0 -10-5 -10+$Y5 +10-5" {
     test unixWm-3.$i {moving window while iconified} unix {
 	wm iconify .t
-	sleep 200
+	update idletasks
 	wm geom .t $geom
-	update
+	update idletasks
 	wm deiconify .t
-	animationDelay
+	update idletasks
 	scan [wm geom .t] %dx%d%1s%d%1s%d width height xsign x ysign y
 	format "%s%d%s%d" $xsign [eval expr $x$xsign$xerr] $ysign \
 		[eval expr $y$ysign$yerr]
@@ -114,11 +104,11 @@ set i 1
 foreach geom "+20+80 +100+40 +0+$Y0" {
     test unixWm-4.$i {moving window while withdrawn} unix {
 	wm withdraw .t
-	sleep 200
+	update idletasks
 	wm geom .t $geom
-	update
+	update idletasks
 	wm deiconify .t
-	animationDelay
+	update idletasks
 	wm geom .t
     } 100x150$geom
     incr i
@@ -349,7 +339,6 @@ test unixWm-8.8 {icon windows} unix {
     wm geom .t +0+0
     tkwait visibility .t	;# Needed to keep tvtwm happy.
     wm iconwindow .t .icon
-    sleep 500
     lappend result [winfo ismapped .t] [winfo ismapped .icon]
 } {1 1 0}
 test unixWm-8.9 {icon windows} {unix nonPortable} {
@@ -421,12 +410,10 @@ test unixWm-9.3 {TkWmMapWindow procedure, iconic windows} unix {
     toplevel .t -width 100 -height 300 -bg blue
     wm geom .t +0+0
     wm iconify .t
-    sleep 500
     winfo ismapped .t
 } {0}
 test unixWm-9.4 {TkWmMapWindow procedure, icon windows} unix {
     destroy .t
-    sleep 500
     toplevel .t -width 100 -height 50 -bg blue
     tkwait visibility .t
     wm iconwindow . .t
@@ -1385,12 +1372,13 @@ test unixWm-40.2 {Tk_SetGrid procedure, turning on grid when dimensions already
 test unixWm-41.1 {ConfigureEvent procedure, internally generated size changes} unix {
     destroy .t
     toplevel .t -width 400 -height 150
-    wm geometry .t +0+0
     tkwait visibility .t
+    wm geometry .t +0+0
+    update idletasks
     set result {}
     lappend result [winfo width .t] [winfo height .t]
     .t configure -width 200 -height 300
-    sleep 500
+    update idletasks
     lappend result [winfo width .t] [winfo height .t]
 } {400 150 200 300}
 test unixWm-41.2 {ConfigureEvent procedure, menubars} {nonPortable testmenubar} {
@@ -1454,11 +1442,11 @@ test unixWm-42.1 {WrapperEventProc procedure, map and unmap events} unix {
     bind .t <Unmap> {set x "unmapped"}
     set x {no event}
     wm iconify .t
-    animationDelay
+    update idletasks
     lappend result $x [winfo ismapped .t]
     set x {no event}
     wm deiconify .t
-    animationDelay
+    update idletasks
     lappend result $x [winfo ismapped .t]
 } {unmapped 0 mapped 1}
 
@@ -1971,7 +1959,6 @@ test unixWm-50.8 {Tk_CoordsToWindow procedure, more basics} unix {
 test unixWm-50.9 {Tk_CoordsToWindow procedure, unmapped windows} unix {
     destroy .t
     destroy .t2
-    sleep 500		;# Give window manager time to catch up.
     toplevel .t -width 200 -height 200 -bg green
     wm geometry .t +0+0
     tkwait visibility .t
@@ -1980,7 +1967,7 @@ test unixWm-50.9 {Tk_CoordsToWindow procedure, unmapped windows} unix {
     tkwait visibility .t2
     set result [list [winfo containing 100 100]]
     wm iconify .t2
-    animationDelay
+    update idletasks
     lappend result [winfo containing 100 100]
 } {.t2 .t}
 test unixWm-50.10 {Tk_CoordsToWindow procedure, unmapped windows} unix {
@@ -2022,7 +2009,6 @@ test unixWm-51.3 {TkWmRestackToplevel procedure, basic tests} {unix nonPortable}
     set result [winfo containing [winfo rootx .raise1] \
 	    [winfo rooty .raise1]]
     destroy .raise2
-    sleep 500
     list $result [winfo containing [winfo rootx .raise1] \
 	    [winfo rooty .raise1]]
 } {.raise2 .raise1}
@@ -2033,7 +2019,6 @@ test unixWm-51.4 {TkWmRestackToplevel procedure, basic tests} {unix nonPortable}
     lower .raise3 .raise1
     set result [winfo containing 100 100]
     destroy .raise1
-    sleep 500
     lappend result [winfo containing 100 100]
 } {.raise1 .raise3}
 test unixWm-51.5 {TkWmRestackToplevel procedure, basic tests} {unix nonPortable} {
@@ -2048,7 +2033,6 @@ test unixWm-51.5 {TkWmRestackToplevel procedure, basic tests} {unix nonPortable}
     set result [winfo containing [winfo rootx .raise1] \
 	    [winfo rooty .raise1]]
     destroy .raise1
-    sleep 500
     list $result [winfo containing [winfo rootx .raise2] \
 	    [winfo rooty .raise2]]
 } {.raise1 .raise3}
@@ -2071,11 +2055,9 @@ test unixWm-51.7 {TkWmRestackToplevel procedure, other window isn't mapped} unix
 	wm geometry $w +0+0
     }
     raise .t .t2
-    sleep 2000
     update
     set result [list [winfo containing 100 100]]
     lower .t3
-    sleep 2000
     lappend result [winfo containing 100 100]
 } {.t3 .t}
 test unixWm-51.8 {TkWmRestackToplevel procedure, overrideredirect windows} unix {
-- 
cgit v0.12


From c4ee254b9c95c505554f58ca85c20f1ede0a1e52 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Thu, 23 Jul 2020 16:56:13 +0000
Subject: All tests pass on Yosemite now.

---
 macosx/tkMacOSXWm.c |  5 +++++
 tests/unixWm.test   | 14 ++++++++------
 tests/wm.test       | 20 +++++++++++---------
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 3af2ff5..90e4a70 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -6425,6 +6425,11 @@ TkpWmSetState(
 	[macWin orderFront:NSApp];
 	TkMacOSXZoomToplevel(macWin, state == NormalState ? inZoomIn : inZoomOut);
     }
+    /*
+     * Make sure windows are updated after the state change.
+     */
+
+    while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)){}
 }
 
 /*
diff --git a/tests/unixWm.test b/tests/unixWm.test
index bd68511..39a68ae 100644
--- a/tests/unixWm.test
+++ b/tests/unixWm.test
@@ -292,6 +292,7 @@ test unixWm-8.4 {icon windows} unix {
     destroy .icon
     toplevel .t -width 100 -height 30
     wm geom .t +0+0
+    update idletasks
     set result [wm iconwindow .t]
     toplevel .icon -width 50 -height 50 -bg red
     wm iconwindow .t .icon
@@ -301,7 +302,7 @@ test unixWm-8.4 {icon windows} unix {
     update
     lappend result [winfo ismapped .t] [winfo ismapped .icon]
     wm iconify .t
-    update
+    update idletasks
     lappend result [winfo ismapped .t] [winfo ismapped .icon]
 } {.icon icon {} withdrawn 1 0 0 0}
 test unixWm-8.5 {icon windows} unix {
@@ -854,9 +855,9 @@ test unixWm-23.5 {Tk_WmCmd procedure, "iconify" option} unix {
     destroy .t2
     toplevel .t2
     wm geom .t2 +0+0
-    update
+    update idletasks
     wm iconify .t2
-    update
+    update idletasks
     set result [winfo ismapped .t2]
     destroy .t2
     set result
@@ -865,10 +866,10 @@ test unixWm-23.6 {Tk_WmCmd procedure, "iconify" option} unix {
     destroy .t2
     toplevel .t2
     wm geom .t2 -0+0
-    update
+    update idletasks
     set result [winfo ismapped .t2]
     wm iconify .t2
-    update
+    update idletasks
     lappend result [winfo ismapped .t2]
     destroy .t2
     set result
@@ -1977,9 +1978,10 @@ test unixWm-50.10 {Tk_CoordsToWindow procedure, unmapped windows} unix {
     frame .t.f -width 150 -height 150 -bd 2 -relief raised
     place .t.f -x 25 -y 25
     tkwait visibility .t.f
+    update idletasks
     set result [list [winfo containing 100 100]]
     place forget .t.f
-    update
+    update idletasks
     lappend result [winfo containing 100 100]
 } {.t.f .t}
 deleteWindows
diff --git a/tests/wm.test b/tests/wm.test
index 9e6d8ce..fac02fe 100644
--- a/tests/wm.test
+++ b/tests/wm.test
@@ -33,7 +33,9 @@ proc stdWindow {} {
 #
 
 proc raiseDelay {} {
-    after 100; update
+    after 100;
+    update
+    update idletasks
 }
 
 # How to carry out a small delay while processing events
@@ -808,10 +810,10 @@ test wm-iconify-2.4.2 {Misc errors} -constraints !win -setup {
 test wm-iconify-3.1 {iconify behavior} -body {
     toplevel .t2
     wm geom .t2 -0+0
-    update
+    update idletasks
     set result [winfo ismapped .t2]
     wm iconify .t2
-    update
+    update idletasks
     lappend result [winfo ismapped .t2]
 } -cleanup {
     destroy .t2
@@ -1738,11 +1740,11 @@ test wm-transient-4.2 {already mapped transient toplevel
     toplevel .master
     raiseDelay
     wm iconify .master
-    update
+    update idletasks
     toplevel .subject
-    update
+    update idletasks
     wm transient .subject .master
-    update
+    update idletasks
     list [wm state .subject] [winfo ismapped .subject]
 } -cleanup {
     deleteWindows
@@ -1753,13 +1755,13 @@ test wm-transient-4.3 {iconify/deiconify on the master
 } -body {
     toplevel .master
     toplevel .subject
-    update
+    update idletasks
     wm transient .subject .master
     wm iconify .master
-    update
+    update idletasks
     lappend results [wm state .subject] [winfo ismapped .subject]
     wm deiconify .master
-    update
+    update idletasks
     lappend results [wm state .subject] [winfo ismapped .subject]
 } -cleanup {
     deleteWindows
-- 
cgit v0.12


From e0db4c3e05bfcb007efd84b383f9f103d1905cc9 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Thu, 23 Jul 2020 17:13:31 +0000
Subject: See if we can speed up textDisp.test

---
 tests/textDisp.test | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/textDisp.test b/tests/textDisp.test
index 796fd92..8e971f3 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -3961,12 +3961,12 @@ test textDisp-31.3 {line update index shifting} {
     .t insert 1.0 "abc\n"
     .t insert 1.0 "abc\n"
     lappend res [.t count -ypixels 1.0 end]
-    update ; after 1000 ; update
+    update idletasks ; after 100 ; update idletasks
     lappend res [.t count -ypixels 1.0 end]
     .t.f configure -height 100
     .t delete 1.0 3.0
     lappend res [.t count -ypixels 1.0 end]
-    update ; after 1000 ; update
+    update idletasks ; after 100 ; update idletasks
     lappend res [.t count -ypixels 1.0 end]
     set res
 } [list [expr {100 + $fixedHeight * 6}] [expr {100 + $fixedHeight * 8}] [expr {$fixedHeight * 9}] [expr {$fixedHeight * 7}] [expr {100 + $fixedHeight * 6}]]
@@ -4014,12 +4014,12 @@ test textDisp-31.6 {line update index shifting} {
     .t insert 1.0 "abc\n"
     .t insert 1.0 "abc\n"
     lappend res [.t count -ypixels 1.0 end]
-    update ; after 1000 ; update
+    update idletasks ; after 100 ; update idletasks
     lappend res [.t count -ypixels 1.0 end]
     textest configure -height 100
     .t delete 1.0 3.0
     lappend res [.t count -ypixels 1.0 end]
-    update ; after 1000 ; update
+    update idletasks ; after 100 ; update idletasks
     lappend res [.t count -ypixels 1.0 end]
     set res
 } [list [expr {100 + $fixedHeight * 6}] [expr {100 + $fixedHeight * 8}] [expr {$fixedHeight * 9}] [expr {$fixedHeight * 7}] [expr {100 + $fixedHeight * 6}]]
@@ -4036,11 +4036,11 @@ test textDisp-31.7 {line update index shifting, elided} {
     .t tag configure elide -elide 1
     .t tag add elide 1.3 2.1
     lappend res [.t count -ypixels 1.0 end]
-    update ; after 1000 ; update
+    update idletasks ; after 100 ; update idletasks
     lappend res [.t count -ypixels 1.0 end]
     .t delete 1.0 3.0
     lappend res [.t count -ypixels 1.0 end]
-    update ; after 1000 ; update
+    update idletasks ; after 100 ; update idletasks
     lappend res [.t count -ypixels 1.0 end]
     set res
 } [list [expr {$fixedHeight * 1}] [expr {$fixedHeight * 3}] [expr {$fixedHeight * 3}] [expr {$fixedHeight * 2}] [expr {$fixedHeight * 1}] [expr {$fixedHeight * 1}]]
-- 
cgit v0.12


From 80385f2de091d03d59900dc2acf17c23beeac2aa Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Thu, 23 Jul 2020 17:48:52 +0000
Subject: Fix build on Mavericks.

---
 macosx/tkMacOSXDraw.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index 68e7ada..fd8a1eb 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -17,7 +17,7 @@
 #include "tkMacOSXDebug.h"
 #include "tkButton.h"
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
 #define GET_CGCONTEXT [[NSGraphicsContext currentContext] CGContext]
 #else
 #define GET_CGCONTEXT [[NSGraphicsContext currentContext] graphicsPort]
@@ -1666,8 +1666,7 @@ TkMacOSXSetupDrawingContext(
 	     * cycle.
 	     */
 
-	    CGRect currentClip = CGContextGetClipBoundingBox(
-				     [NSGraphicsContext currentContext].CGContext);
+	    CGRect currentClip = CGContextGetClipBoundingBox(GET_CGCONTEXT);
 	    if (!NSContainsRect(currentClip, clipBounds)) {
 		[view addTkDirtyRect:clipBounds];
 	    }
-- 
cgit v0.12


From 4615f0cfbe56b6b931f06600823609452ceae3f2 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Thu, 23 Jul 2020 18:31:06 +0000
Subject: Adjust listbox-21.9

---
 tests/listbox.test | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/tests/listbox.test b/tests/listbox.test
index 01cc397..17b6e6b 100644
--- a/tests/listbox.test
+++ b/tests/listbox.test
@@ -2663,19 +2663,18 @@ test listbox-21.9 {ListboxListVarProc, test hscrollbar after listvar mod} -setup
     destroy .l
 } -body {
     catch {unset x}
-    listbox .l -font $fixed -width 10 -xscrollcommand "record x" -listvar x
     set log {}
+    update idletasks
+    listbox .l -font $fixed -width 10 -xscrollcommand "record x" -listvar x
     pack .l
-    set timeout [after 500 {lappend log timeout1}]
-    vwait log
+    update idletasks
     lappend x "0000000000"
-    update
+    update idletasks
     lappend x "00000000000000000000"
-    update
+    update idletasks
     set log
 } -cleanup {
     destroy .l
-    after cancel $timeout
 } -result [list {x 0 1} {x 0 1} {x 0 0.5}]
 test listbox-21.10 {ListboxListVarProc, test hscrollbar after listvar mod} -setup {
     destroy .l
-- 
cgit v0.12


From 39d44641837b76035b4eff6b6f153ea07720b81f Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Thu, 23 Jul 2020 19:14:17 +0000
Subject: Fix the (re)declaration of linkColor so it works on all systems.

---
 macosx/tkMacOSXColor.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index 8e60552..758c458 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -275,11 +275,7 @@ GetEntryFromPixelCode(
 
 
 @interface NSColor(TkColor)
-#if MAC_OS_X_VERSION_MAX_ALLOWED > 101100
-@property(class, strong, readonly) NSColor *linkColor;
-#else
 @property(strong, readonly) NSColor *linkColor;
-#endif
 @end
 
 static NSColorSpace* sRGB = NULL;
-- 
cgit v0.12


From ef7581bec4c78d6fb07d451dc6da67a333422d83 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Thu, 23 Jul 2020 19:44:17 +0000
Subject: Adjust a couple of textDisp tests for El Capitan

---
 tests/textDisp.test | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/textDisp.test b/tests/textDisp.test
index 8e971f3..b0560d8 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -4175,6 +4175,7 @@ test textDisp-32.3 "NULL undisplayProc problems: #1791052" -setup {
 
 test textDisp-33.0 {one line longer than fits in the widget} {
     pack [text .tt -wrap char]
+    updateText
     .tt insert 1.0 [string repeat "more wrap + " 300]
     updateText
     .tt see 1.0
@@ -4183,6 +4184,7 @@ test textDisp-33.0 {one line longer than fits in the widget} {
 test textDisp-33.1 {one line longer than fits in the widget} {
     destroy .tt
     pack [text .tt -wrap char]
+    updateText
     .tt insert 1.0 [string repeat "more wrap + " 300]
     updateText
     .tt yview "1.0 +1 displaylines"
@@ -4196,12 +4198,12 @@ test textDisp-33.2 {one line longer than fits in the widget} {
     destroy .tt
     pack [text .tt -wrap char]
     .tt debug 1
-    update idletasks
+    updateText
     set tk_textHeightCalc ""
-    set timer [after 700 lappend tk_textHeightCalc "Timed out"]
+    set timer [after 200 lappend tk_textHeightCalc "Timed out"]
     .tt insert 1.0 [string repeat "more wrap + " 1]
     vwait tk_textHeightCalc
-    after cancel timer
+    after cancel $timer
     set tk_textHeightCalc
 } {1.0}
 test textDisp-33.3 {one line longer than fits in the widget} {
-- 
cgit v0.12


From b00f202e7437c114c8c278c65c2ebe18c7bc85f7 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Thu, 23 Jul 2020 19:53:03 +0000
Subject: Commit [4c6a42bd] changed the font used in textWind.test for aqua. It
 appears we can use 'Courier' instead of 'Courier New' on all three platforms
 with no failure (tested on Windows Vista and Linux Debian 10).

---
 tests/textWind.test | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/tests/textWind.test b/tests/textWind.test
index b453feb..8edd825 100644
--- a/tests/textWind.test
+++ b/tests/textWind.test
@@ -13,11 +13,7 @@ tcltest::loadTestedCommands
 
 deleteWindows
 
-if {[tk windowingsystem] eq "aqua"} {
-    set fixedFont {"Courier" -12}
-} else {
-    set fixedFont {"Courier New" -12}
-}    
+set fixedFont {"Courier" -12}
 set fixedHeight [font metrics $fixedFont -linespace]
 set fixedWidth [font measure $fixedFont m]
 set fixedAscent [font metrics $fixedFont -ascent]
-- 
cgit v0.12


From 8ed3b12de30efc4a2770627d32616cd91080a22c Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Thu, 23 Jul 2020 20:32:50 +0000
Subject: Another adjustment to listbox-21.9

---
 tests/listbox.test | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/listbox.test b/tests/listbox.test
index 17b6e6b..84f2d4a 100644
--- a/tests/listbox.test
+++ b/tests/listbox.test
@@ -2662,11 +2662,10 @@ test listbox-21.8 {ListboxListVarProc, test selection after listvar mod} -setup
 test listbox-21.9 {ListboxListVarProc, test hscrollbar after listvar mod} -setup {
     destroy .l
 } -body {
-    catch {unset x}
-    set log {}
-    update idletasks
+    set x {}
     listbox .l -font $fixed -width 10 -xscrollcommand "record x" -listvar x
     pack .l
+    set log {}
     update idletasks
     lappend x "0000000000"
     update idletasks
@@ -2675,7 +2674,7 @@ test listbox-21.9 {ListboxListVarProc, test hscrollbar after listvar mod} -setup
     set log
 } -cleanup {
     destroy .l
-} -result [list {x 0 1} {x 0 1} {x 0 0.5}]
+} -result [list {x 0 1} {x 0 0.5}]
 test listbox-21.10 {ListboxListVarProc, test hscrollbar after listvar mod} -setup {
     destroy .l
 } -body {
-- 
cgit v0.12


From 5508426b3e669226e9da1901ce5cda463d3dee96 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Thu, 23 Jul 2020 20:46:21 +0000
Subject: Still fiddling with listbox-21.9

---
 tests/listbox.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/listbox.test b/tests/listbox.test
index 84f2d4a..806bbe0 100644
--- a/tests/listbox.test
+++ b/tests/listbox.test
@@ -2665,8 +2665,8 @@ test listbox-21.9 {ListboxListVarProc, test hscrollbar after listvar mod} -setup
     set x {}
     listbox .l -font $fixed -width 10 -xscrollcommand "record x" -listvar x
     pack .l
-    set log {}
     update idletasks
+    set log {}
     lappend x "0000000000"
     update idletasks
     lappend x "00000000000000000000"
-- 
cgit v0.12


From 45c939237b9e173457e588379c906a8e82211b78 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Thu, 23 Jul 2020 21:25:10 +0000
Subject: On Sierra the linkColor property must be explicitly declared as a
 class property.

---
 macosx/tkMacOSXColor.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index 758c458..51a28c5 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -274,9 +274,15 @@ GetEntryFromPixelCode(
  */
 
 
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101200
+@interface NSColor(TkColor)
+@property(class, strong, readonly) NSColor *linkColor;
+@end
+#else
 @interface NSColor(TkColor)
 @property(strong, readonly) NSColor *linkColor;
 @end
+#endif
 
 static NSColorSpace* sRGB = NULL;
 static CGFloat windowBackground[4] =
-- 
cgit v0.12


From a965e9c43e2e9889b4cb3581bc91221c087a7c25 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Fri, 24 Jul 2020 15:32:53 +0000
Subject: Fix Windows tests which were affected by the Mac changes.

---
 tests/canvImg.test  | 10 ++--------
 tests/pack.test     | 18 +++++++++++-------
 tests/place.test    | 14 ++++++++++----
 tests/textDisp.test | 22 ++++++++++++++++------
 4 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/tests/canvImg.test b/tests/canvImg.test
index b57e21d..a3524f1 100644
--- a/tests/canvImg.test
+++ b/tests/canvImg.test
@@ -778,13 +778,7 @@ test canvImg-11.2 {ImageChangedProc procedure} -constraints {
 	.c delete all
 	image delete foo
 } -result {30 75 70 125}
-if {[tk windowingsystem] == "aqua"} {
-#     # For this test only the 20x40 upper left corner of foo2 needs
-#     # to be redrawn, but Aqua redraws the entire image.
-    set result_11_3 {{foo2 display 0 0 80 60}}
- } else {
-   set result_11_3 {{foo2 display 0 0 20 40}} 
-}
+
 test canvImg-11.3 {ImageChangedProc procedure} -constraints {
 	testImageType 
 } -setup {
@@ -806,7 +800,7 @@ test canvImg-11.3 {ImageChangedProc procedure} -constraints {
 } -cleanup {
     .c delete all
     image delete foo2
-} -result $result_11_3
+} -result {{foo2 display 0 0 80 60}}
 
 # cleanup
 imageFinish
diff --git a/tests/pack.test b/tests/pack.test
index 04e84b9..86fcad2 100644
--- a/tests/pack.test
+++ b/tests/pack.test
@@ -1549,12 +1549,19 @@ test pack-17.2 {PackLostSlaveProc procedure} -setup {
     pack info .pack.a
 } -returnCodes error -result {window ".pack.a" isn't packed}
 
+if {[tk windowingsystem] == "win32"} {
+    proc packUpdate {} {
+	update
+    }
+} else {
+    proc packUpdate {} {
+    }
+}
 
 test pack-18.1 {unmap slaves when master unmapped} -constraints {
     tempNotPc
 } -setup {
     eval destroy [winfo child .pack]
-    update idletasks
 } -body {
 
     # adjust the position of .pack before test to avoid a screen switch
@@ -1562,29 +1569,27 @@ test pack-18.1 {unmap slaves when master unmapped} -constraints {
     # as the screen (screen switch causes scale and other tests to fail).
 
     wm geometry .pack +100+100
-    update idletasks
 
     # On the PC, when the width/height is configured while the window is
     # unmapped, the changes don't take effect until the window is remapped.
     # Who knows why?
 
     eval destroy [winfo child .pack]
-    update idletasks
     frame .pack.a -width 100 -height 50 -relief raised -bd 2
     pack .pack.a
     update idletasks
     set result [winfo ismapped .pack.a]
     wm iconify .pack
-    update idletasks
     lappend result [winfo ismapped .pack.a]
     .pack.a configure -width 200 -height 75
     update idletasks
     lappend result [winfo width .pack.a ] [winfo height .pack.a] \
     [winfo ismapped .pack.a]
     wm deiconify .pack
-    update idletasks
+    packUpdate
     lappend result [winfo ismapped .pack.a]
 } -result {1 0 200 75 0 1}
+
 test pack-18.2 {unmap slaves when master unmapped} -setup {
     eval destroy [winfo child .pack]
 } -body {
@@ -1601,14 +1606,13 @@ test pack-18.2 {unmap slaves when master unmapped} -setup {
     update idletasks
     set result [winfo ismapped .pack.b]
     wm iconify .pack
-    update idletasks
     lappend result [winfo ismapped .pack.b]
     .pack.b configure -width 100 -height 30
     update idletasks
     lappend result [winfo width .pack.b ] [winfo height .pack.b] \
     [winfo ismapped .pack.b]
     wm deiconify .pack
-    update idletasks
+    packUpdate
     lappend result [winfo ismapped .pack.b]
 } -result {1 0 100 30 0 1}
 
diff --git a/tests/place.test b/tests/place.test
index 56ddde4..0a5e22f 100644
--- a/tests/place.test
+++ b/tests/place.test
@@ -258,6 +258,14 @@ test place-7.10 {ReconfigurePlacement procedure, computing size} -setup {
     list [winfo width .t.f2] [winfo height .t.f2]
 } -result {30 60}
 
+if {[tk windowingsystem] == "win32"} {
+    proc placeUpdate {} {
+	update
+    }
+} else {
+    proc placeUpdate {} {
+    }
+}
 
 test place-8.1 {MasterStructureProc, mapping and unmapping slaves} -setup {
     place forget .t.f2
@@ -267,13 +275,12 @@ test place-8.1 {MasterStructureProc, mapping and unmapping slaves} -setup {
     update idletasks
     set result [winfo ismapped .t.f2]
     wm iconify .t
-    update idletasks
     lappend result [winfo ismapped .t.f2]
     place .t.f2 -x 40 -y 30 -relx 0 -rely 0 -anchor nw
     update idletasks
     lappend result [winfo x .t.f2] [winfo y .t.f2] [winfo ismapped .t.f2]
     wm deiconify .t
-    update idletasks
+    placeUpdate
     lappend result [winfo ismapped .t.f2]
 } -result {1 0 40 30 0 1}
 test place-8.2 {MasterStructureProc, mapping and unmapping slaves} -setup {
@@ -286,13 +293,12 @@ test place-8.2 {MasterStructureProc, mapping and unmapping slaves} -setup {
     update idletasks
     set result [winfo ismapped .t.f2]
     wm iconify .t
-    update idletasks
     lappend result [winfo ismapped .t.f2]
     place .t.f2 -x 40 -y 30 -relx 0 -rely 0 -anchor nw
     update idletasks
     lappend result [winfo x .t.f2] [winfo y .t.f2] [winfo ismapped .t.f2]
     wm deiconify .t
-    update idletasks
+    placeUpdate
     lappend result [winfo ismapped .t.f2]
 } -result {1 0 42 32 0 1}
 destroy .t
diff --git a/tests/textDisp.test b/tests/textDisp.test
index b0560d8..0881102 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -17,10 +17,20 @@ if {[tk windowingsystem] == "aqua"} {
     proc updateText {} {
 	update idletasks
     }
+    proc delay {} {
+	update idletasks
+	after 100
+	update idletasks
+    }
 } else {
     proc updateText {} {
 	update
     }
+    proc delay {} {
+	update
+	after 100
+	update
+    }
 }
 
 # The procedure below is used as the scrolling command for the text;
@@ -3961,12 +3971,12 @@ test textDisp-31.3 {line update index shifting} {
     .t insert 1.0 "abc\n"
     .t insert 1.0 "abc\n"
     lappend res [.t count -ypixels 1.0 end]
-    update idletasks ; after 100 ; update idletasks
+    delay
     lappend res [.t count -ypixels 1.0 end]
     .t.f configure -height 100
     .t delete 1.0 3.0
     lappend res [.t count -ypixels 1.0 end]
-    update idletasks ; after 100 ; update idletasks
+    delay
     lappend res [.t count -ypixels 1.0 end]
     set res
 } [list [expr {100 + $fixedHeight * 6}] [expr {100 + $fixedHeight * 8}] [expr {$fixedHeight * 9}] [expr {$fixedHeight * 7}] [expr {100 + $fixedHeight * 6}]]
@@ -4014,12 +4024,12 @@ test textDisp-31.6 {line update index shifting} {
     .t insert 1.0 "abc\n"
     .t insert 1.0 "abc\n"
     lappend res [.t count -ypixels 1.0 end]
-    update idletasks ; after 100 ; update idletasks
+    delay
     lappend res [.t count -ypixels 1.0 end]
     textest configure -height 100
     .t delete 1.0 3.0
     lappend res [.t count -ypixels 1.0 end]
-    update idletasks ; after 100 ; update idletasks
+    delay
     lappend res [.t count -ypixels 1.0 end]
     set res
 } [list [expr {100 + $fixedHeight * 6}] [expr {100 + $fixedHeight * 8}] [expr {$fixedHeight * 9}] [expr {$fixedHeight * 7}] [expr {100 + $fixedHeight * 6}]]
@@ -4036,11 +4046,11 @@ test textDisp-31.7 {line update index shifting, elided} {
     .t tag configure elide -elide 1
     .t tag add elide 1.3 2.1
     lappend res [.t count -ypixels 1.0 end]
-    update idletasks ; after 100 ; update idletasks
+    delay
     lappend res [.t count -ypixels 1.0 end]
     .t delete 1.0 3.0
     lappend res [.t count -ypixels 1.0 end]
-    update idletasks ; after 100 ; update idletasks
+    delay
     lappend res [.t count -ypixels 1.0 end]
     set res
 } [list [expr {$fixedHeight * 1}] [expr {$fixedHeight * 3}] [expr {$fixedHeight * 3}] [expr {$fixedHeight * 2}] [expr {$fixedHeight * 1}] [expr {$fixedHeight * 1}]]
-- 
cgit v0.12


From 9c3c347b22063ccdb5d7dc9d9bdffd69962f7844 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Fri, 24 Jul 2020 21:21:47 +0000
Subject: Fix the build for Snow Leopard. Fix the fontchooser demo.

---
 library/demos/fontchoose.tcl |  2 +-
 macosx/tkMacOSXColor.c       | 11 +++++------
 macosx/tkMacOSXInit.c        |  1 +
 macosx/tkMacOSXKeyEvent.c    |  2 ++
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/library/demos/fontchoose.tcl b/library/demos/fontchoose.tcl
index 8b34377..b93928d 100644
--- a/library/demos/fontchoose.tcl
+++ b/library/demos/fontchoose.tcl
@@ -57,7 +57,7 @@ grid columnconfigure $f 0 -weight 1
 grid rowconfigure $f 0 -weight 1
 bind $w <Visibility> {
     bind %W <Visibility> {}
-    grid propagate %W.f 0
+    grid propagate %W 0
 }
 
 ## See Code / Dismiss buttons
diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index 51a28c5..5a06c39 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -273,16 +273,15 @@ GetEntryFromPixelCode(
  * appears to be harmless and stops the compiler warnings. 
  */
 
-
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101200
 @interface NSColor(TkColor)
+#if MAC_OS_X_VERSION_MAX_ALLOWED > 101200
 @property(class, strong, readonly) NSColor *linkColor;
-@end
-#else
-@interface NSColor(TkColor)
+#elif MAC_OS_X_VERSION_MAX_ALLOWED > 1080
 @property(strong, readonly) NSColor *linkColor;
-@end
+#else
+@property(assign, readonly) NSColor *linkColor;
 #endif
+@end
 
 static NSColorSpace* sRGB = NULL;
 static CGFloat windowBackground[4] =
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index e75a63c..d3c4a0c 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -34,6 +34,7 @@ static char scriptPath[PATH_MAX + 1] = "";
 @synthesize poolLock = _poolLock;
 @synthesize macOSVersion = _macOSVersion;
 @synthesize isDrawing = _isDrawing;
+@synthesize needsToDraw = _needsToDraw;
 @end
 
 /*
diff --git a/macosx/tkMacOSXKeyEvent.c b/macosx/tkMacOSXKeyEvent.c
index 572e318..014caa9 100644
--- a/macosx/tkMacOSXKeyEvent.c
+++ b/macosx/tkMacOSXKeyEvent.c
@@ -267,6 +267,8 @@ static NSUInteger textInputModifiers;
 
 
 @implementation TKContentView
+@synthesize tkDirtyRect = _tkDirtyRect;
+@synthesize tkNeedsDisplay = _tkNeedsDisplay;;
 
 /*
  * Implementation of the NSTextInputClient protocol.
-- 
cgit v0.12


From 03090437950d662b8892aaaf5238917c8bcca961 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Sat, 25 Jul 2020 14:15:07 +0000
Subject: Fix the fontchooser demo correctly.

---
 library/demos/fontchoose.tcl | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/library/demos/fontchoose.tcl b/library/demos/fontchoose.tcl
index b93928d..446ed34 100644
--- a/library/demos/fontchoose.tcl
+++ b/library/demos/fontchoose.tcl
@@ -55,10 +55,6 @@ grid $f.msg $f.vs -sticky news
 grid $f.font -    -sticky e
 grid columnconfigure $f 0 -weight 1
 grid rowconfigure $f 0 -weight 1
-bind $w <Visibility> {
-    bind %W <Visibility> {}
-    grid propagate %W 0
-}
 
 ## See Code / Dismiss buttons
 set btns [addSeeDismiss $w.buttons $w]
@@ -67,3 +63,5 @@ grid $f -sticky news
 grid $btns -sticky ew
 grid columnconfigure $w 0 -weight 1
 grid rowconfigure $w 0 -weight 1
+update idletasks
+grid propagate $f 0
-- 
cgit v0.12


From 2c481a8b318d561e9941bd5152601d5957f2b443 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Sat, 25 Jul 2020 14:21:28 +0000
Subject: Remove the race condition from listbox-21.10 the same way as for
 listbox-21.9

---
 tests/listbox.test | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/tests/listbox.test b/tests/listbox.test
index 806bbe0..3a6c860 100644
--- a/tests/listbox.test
+++ b/tests/listbox.test
@@ -2680,21 +2680,19 @@ test listbox-21.10 {ListboxListVarProc, test hscrollbar after listvar mod} -setu
 } -body {
     catch {unset x}
     listbox .l -font $fixed -width 10 -xscrollcommand "record x" -listvar x
-    set log {}
     pack .l
-    set timeout [after 500 {lappend log timeout2}]
-    vwait log
+    update idletasks
+    set log {}
     lappend x "0000000000"
-    update
+    update idletasks
     lappend x "00000000000000000000"
-    update
+    update idletasks
     set x [list "0000000000"]
-    update
+    update idletasks
     set log
 } -cleanup {
     destroy .l
-    after cancel $timeout
-} -result [list {x 0 1} {x 0 1} {x 0 0.5} {x 0 1}]
+} -result [list {x 0 1} {x 0 0.5} {x 0 1}]
 test listbox-21.11 {ListboxListVarProc, bad list} -setup {
     destroy .l
 } -body {
-- 
cgit v0.12


From bcbf366541cf894a8abaaea4c684ff551c54981c Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Sat, 25 Jul 2020 14:48:23 +0000
Subject: Fix namespace error in console.tcl - Thanks to Adam Kapos for the
 patch.

---
 library/console.tcl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/console.tcl b/library/console.tcl
index 355a43b..6527607 100644
--- a/library/console.tcl
+++ b/library/console.tcl
@@ -740,9 +740,9 @@ proc ::tk::console::FontchooserToggle {} {
 }
 proc ::tk::console::FontchooserVisibility {index} {
     if {[tk fontchooser configure -visible]} {
-	.menubar.edit entryconfigure $index -label [msgcat::mc "Hide Fonts"]
+	.menubar.edit entryconfigure $index -label [::tk::msgcat::mc "Hide Fonts"]
     } else {
-	.menubar.edit entryconfigure $index -label [msgcat::mc "Show Fonts"]
+	.menubar.edit entryconfigure $index -label [::tk::msgcat::mc "Show Fonts"]
     }
 }
 proc ::tk::console::FontchooserFocus {w isFocusIn} {
-- 
cgit v0.12


From a872071b3c86d4de2e5cb8e9a0d6e876064e561d Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Wed, 29 Jul 2020 03:11:02 +0000
Subject: Clean up tkMacOSXColor.c so it is not so painful to add new colors.

---
 macosx/tkMacOSXColor.c   | 425 ++++++++++++++---------------------------------
 macosx/tkMacOSXDraw.c    |   9 +-
 macosx/tkMacOSXImage.c   |   2 +-
 macosx/tkMacOSXPort.h    |  22 +--
 macosx/tkMacOSXPrivate.h |   5 +-
 macosx/tkMacOSXXStubs.c  |   4 +-
 6 files changed, 139 insertions(+), 328 deletions(-)

diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index 5a06c39..8b193b8 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -16,217 +16,78 @@
 
 #include "tkMacOSXPrivate.h"
 #include "tkColor.h"
+#include "tkMacOSXColor.h"
 
-/*
- * The colorType specifies how the color value should be interpreted.  For the
- * unique rgbColor entry, the RGB values are generated from the pixel value of
- * an XColor.  The ttkBackground and semantic types are dynamic, meaning
- * that they change when dark mode is enabled on OSX 10.13 and later.
- */
-
-enum colorType {
-    clearColor,    /* There should be only one of these. */
-    rgbColor,      /* There should be only one of these. */
-    appearance,    /* There should be only one of these. */
-    HIBrush,       /* The value is a HITheme brush color table index. */
-    HIText,        /* The value is a HITheme text color table index. */
-    HIBackground,  /* The value is a HITheme background color table index. */
-    ttkBackground, /* The value can be used as a parameter.*/
-    semantic, /* The value can be used as a parameter.*/
-};
-
-/*
+static Tcl_HashTable systemColorMap;
+static int systemColorMapSize;
+SystemColorMapEntry **systemColorIndex;
 
- */
-
-struct SystemColorMapEntry {
-    const char *name;
-    enum colorType type;
-    long value;
-};  /* unsigned char pixelCode; */
-
-/*
- * Array of system color definitions: the array index is required to equal the
- * color's (pixelCode - MIN_PIXELCODE), i.e. the array order needs to be kept
- * in sync with the public pixel code values in tkMacOSXPort.h !
- */
+void initColorTable()
+{
+    Tcl_InitHashTable(&systemColorMap, TCL_STRING_KEYS);
+    SystemColorMapEntry *entry;
+    Tcl_HashSearch search;
+    Tcl_HashEntry *hPtr;
+    int newPtr = 0, index = 0;
+    for (entry = systemColorMapData; entry->name != NULL; entry++) {
+	hPtr = Tcl_CreateHashEntry(&systemColorMap, entry->name, &newPtr);
+	if (entry->type == semantic) {
+	    NSString *selector = [[NSString alloc]
+				   initWithCString:entry->macName
+					  encoding:NSUTF8StringEncoding];
+	    if (![NSColor respondsToSelector: NSSelectorFromString(selector)]) {
+		continue;
+	    }
+	    [selector retain];
+	    entry->selector = selector;
+	}
+	if (!newPtr) {
+	    index--;
+	}
+	entry->index = index++;
+	Tcl_SetHashValue(hPtr, entry);
+    }
+    systemColorMapSize = index;
+    systemColorIndex = ckalloc(systemColorMapSize * sizeof(SystemColorMapEntry*));
+    for (hPtr = Tcl_FirstHashEntry(&systemColorMap, &search); hPtr != NULL;
+	 hPtr = Tcl_NextHashEntry(&search)) {
+	entry = (SystemColorMapEntry *) Tcl_GetHashValue(hPtr);
+	systemColorIndex[entry->index] = entry;
+    }
+}
 
-#define MIN_PIXELCODE  30
-static const struct SystemColorMapEntry systemColorMap[] = {
-    { "Transparent",			    clearColor,   0 },						    /*  30: TRANSPARENT_PIXEL */
-    { "Highlight",			    HIBrush,      kThemeBrushPrimaryHighlightColor },		    /*  31 */
-    { "HighlightSecondary",		    HIBrush,      kThemeBrushSecondaryHighlightColor },		    /*  32 */
-    { "HighlightText",			    HIBrush,      kThemeBrushBlack },				    /*  33 */
-    { "HighlightAlternate",		    HIBrush,      kThemeBrushAlternatePrimaryHighlightColor },	    /*  34 */
-    { "ButtonText",			    HIText,       kThemeTextColorPushButtonActive },	       	    /*  35 */
-    { "PrimaryHighlightColor",		    HIBrush,      kThemeBrushPrimaryHighlightColor },		    /*  36 */
-    { "ButtonFace",			    HIBrush,      kThemeBrushButtonFaceActive },	       	    /*  37 */
-    { "SecondaryHighlightColor",	    HIBrush,      kThemeBrushSecondaryHighlightColor },		    /*  38 */
-    { "ButtonFrame",			    HIBrush,      kThemeBrushButtonFrameActive },	       	    /*  39 */
-    { "AlternatePrimaryHighlightColor",	    HIBrush,      kThemeBrushAlternatePrimaryHighlightColor },	    /*  40 */
-    { "WindowBody",			    HIBrush,      kThemeBrushDocumentWindowBackground },       	    /*  41 */
-    { "SheetBackground",		    HIBrush,      kThemeBrushSheetBackground },			    /*  42 */
-    { "MenuActive",			    HIBrush,      kThemeBrushMenuBackgroundSelected },		    /*  43 */
-    { "Black",				    HIBrush,      kThemeBrushBlack },				    /*  44 */
-    { "MenuActiveText",			    HIText,       kThemeTextColorMenuItemSelected },	       	    /*  45 */
-    { "White",				    HIBrush,      kThemeBrushWhite },				    /*  46 */
-    { "Menu",				    HIBrush,      kThemeBrushMenuBackground },			    /*  47 */
-    { "DialogBackgroundActive",		    HIBrush,      kThemeBrushDialogBackgroundActive },		    /*  48 */
-    { "MenuDisabled",			    HIText,       kThemeTextColorMenuItemDisabled },	       	    /*  49 */
-    { "DialogBackgroundInactive",	    HIBrush,      kThemeBrushDialogBackgroundInactive },       	    /*  50 */
-    { "MenuText",			    HIText,       kThemeTextColorMenuItemActive },	       	    /*  51 */
-    { "AppearanceColor",		    appearance,   0 },						    /*  52: APPEARANCE_PIXEL */
-    { "AlertBackgroundActive",		    HIBrush,      kThemeBrushAlertBackgroundActive },		    /*  53 */
-    { "AlertBackgroundInactive",	    HIBrush,      kThemeBrushAlertBackgroundInactive },		    /*  54 */
-    { "ModelessDialogBackgroundActive",	    HIBrush,      kThemeBrushModelessDialogBackgroundActive },	    /*  55 */
-    { "ModelessDialogBackgroundInactive",   HIBrush,      kThemeBrushModelessDialogBackgroundInactive },    /*  56 */
-    { "UtilityWindowBackgroundActive",	    HIBrush,      kThemeBrushUtilityWindowBackgroundActive },	    /*  57 */
-    { "UtilityWindowBackgroundInactive",    HIBrush,      kThemeBrushUtilityWindowBackgroundInactive },	    /*  58 */
-    { "ListViewSortColumnBackground",	    HIBrush,      kThemeBrushListViewSortColumnBackground },	    /*  59 */
-    { "ListViewBackground",		    HIBrush,      kThemeBrushListViewBackground },	       	    /*  60 */
-    { "IconLabelBackground",		    HIBrush,      kThemeBrushIconLabelBackground },    		    /*  61 */
-    { "ListViewSeparator",		    HIBrush,      kThemeBrushListViewSeparator },      		    /*  62 */
-    { "ChasingArrows",			    HIBrush,      kThemeBrushChasingArrows },			    /*  63 */
-    { "DragHilite",			    HIBrush,      kThemeBrushDragHilite },	       		    /*  64 */
-    { "DocumentWindowBackground",	    HIBrush,      kThemeBrushDocumentWindowBackground },       	    /*  65 */
-    { "FinderWindowBackground",		    HIBrush,      kThemeBrushFinderWindowBackground },		    /*  66 */
-    { "ScrollBarDelimiterActive",	    HIBrush,      kThemeBrushScrollBarDelimiterActive },       	    /*  67 */
-    { "ScrollBarDelimiterInactive",	    HIBrush,      kThemeBrushScrollBarDelimiterInactive },     	    /*  68 */
-    { "FocusHighlight",			    HIBrush,      kThemeBrushFocusHighlight },			    /*  69 */
-    { "PopupArrowActive",		    HIBrush,      kThemeBrushPopupArrowActive },	       	    /*  70 */
-    { "PopupArrowPressed",		    HIBrush,      kThemeBrushPopupArrowPressed },	       	    /*  71 */
-    { "PopupArrowInactive",		    HIBrush,      kThemeBrushPopupArrowInactive },	       	    /*  72 */
-    { "AppleGuideCoachmark",		    HIBrush,      kThemeBrushAppleGuideCoachmark },	       	    /*  73 */
-    { "IconLabelBackgroundSelected",	    HIBrush,      kThemeBrushIconLabelBackgroundSelected },    	    /*  74 */
-    { "StaticAreaFill",			    HIBrush,      kThemeBrushStaticAreaFill },			    /*  75 */
-    { "ActiveAreaFill",			    HIBrush,      kThemeBrushActiveAreaFill },			    /*  76 */
-    { "ButtonFrameActive",		    HIBrush,      kThemeBrushButtonFrameActive },		    /*  77 */
-    { "ButtonFrameInactive",		    HIBrush,      kThemeBrushButtonFrameInactive },	       	    /*  78 */
-    { "ButtonFaceActive",		    HIBrush,      kThemeBrushButtonFaceActive },       		    /*  79 */
-    { "ButtonFaceInactive",		    HIBrush,      kThemeBrushButtonFaceInactive },	       	    /*  80 */
-    { "ButtonFacePressed",		    HIBrush,      kThemeBrushButtonFacePressed },	       	    /*  81 */
-    { "ButtonActiveDarkShadow",		    HIBrush,      kThemeBrushButtonActiveDarkShadow },		    /*  82 */
-    { "ButtonActiveDarkHighlight",	    HIBrush,      kThemeBrushButtonActiveDarkHighlight },	    /*  83 */
-    { "ButtonActiveLightShadow",	    HIBrush,      kThemeBrushButtonActiveLightShadow },		    /*  84 */
-    { "ButtonActiveLightHighlight",	    HIBrush,      kThemeBrushButtonActiveLightHighlight },	    /*  85 */
-    { "ButtonInactiveDarkShadow",	    HIBrush,      kThemeBrushButtonInactiveDarkShadow },	    /*  86 */
-    { "ButtonInactiveDarkHighlight",	    HIBrush,      kThemeBrushButtonInactiveDarkHighlight },	    /*  87 */
-    { "ButtonInactiveLightShadow",	    HIBrush,      kThemeBrushButtonInactiveLightShadow },	    /*  88 */
-    { "ButtonInactiveLightHighlight",	    HIBrush,      kThemeBrushButtonInactiveLightHighlight },	    /*  89 */
-    { "ButtonPressedDarkShadow",	    HIBrush,      kThemeBrushButtonPressedDarkShadow },		    /*  90 */
-    { "ButtonPressedDarkHighlight",	    HIBrush,      kThemeBrushButtonPressedDarkHighlight },	    /*  91 */
-    { "ButtonPressedLightShadow",	    HIBrush,      kThemeBrushButtonPressedLightShadow },	    /*  92 */
-    { "ButtonPressedLightHighlight",	    HIBrush,      kThemeBrushButtonPressedLightHighlight },	    /*  93 */
-    { "BevelActiveLight",		    HIBrush,      kThemeBrushBevelActiveLight },		    /*  94 */
-    { "BevelActiveDark",		    HIBrush,      kThemeBrushBevelActiveDark },			    /*  95 */
-    { "BevelInactiveLight",		    HIBrush,      kThemeBrushBevelInactiveLight },		    /*  96 */
-    { "BevelInactiveDark",		    HIBrush,      kThemeBrushBevelInactiveDark },		    /*  97 */
-    { "NotificationWindowBackground",	    HIBrush,      kThemeBrushNotificationWindowBackground },	    /*  98 */
-    { "MovableModalBackground",		    HIBrush,      kThemeBrushMovableModalBackground },		    /*  99 */
-    { "SheetBackgroundOpaque",		    HIBrush,      kThemeBrushSheetBackgroundOpaque },		    /* 100 */
-    { "DrawerBackground",		    HIBrush,      kThemeBrushDrawerBackground },		    /* 101 */
-    { "ToolbarBackground",		    HIBrush,      kThemeBrushToolbarBackground },		    /* 102 */
-    { "SheetBackgroundTransparent",	    HIBrush,      kThemeBrushSheetBackgroundTransparent },	    /* 103 */
-    { "MenuBackground",			    HIBrush,      kThemeBrushMenuBackground },			    /* 104 */
-    { "Pixel",				    rgbColor,     0 },						    /* 105: PIXEL_MAGIC */
-    { "MenuBackgroundSelected",		    HIBrush,      kThemeBrushMenuBackgroundSelected },		    /* 106 */
-    { "ListViewOddRowBackground",	    HIBrush,      kThemeBrushListViewOddRowBackground },	    /* 107 */
-    { "ListViewEvenRowBackground",	    HIBrush,      kThemeBrushListViewEvenRowBackground },	    /* 108 */
-    { "ListViewColumnDivider",		    HIBrush,      kThemeBrushListViewColumnDivider },		    /* 109 */
-    { "BlackText",			    HIText,       kThemeTextColorBlack },			    /* 110 */
-    { "DialogActiveText",		    HIText,       kThemeTextColorDialogActive },		    /* 111 */
-    { "DialogInactiveText",		    HIText,       kThemeTextColorDialogInactive },		    /* 112 */
-    { "AlertActiveText",		    HIText,       kThemeTextColorAlertActive },			    /* 113 */
-    { "AlertInactiveText",		    HIText,       kThemeTextColorAlertInactive },		    /* 114 */
-    { "ModelessDialogActiveText",	    HIText,       kThemeTextColorModelessDialogActive },	    /* 115 */
-    { "ModelessDialogInactiveText",	    HIText,       kThemeTextColorModelessDialogInactive },	    /* 116 */
-    { "WindowHeaderActiveText",		    HIText,       kThemeTextColorWindowHeaderActive },		    /* 117 */
-    { "WindowHeaderInactiveText",	    HIText,       kThemeTextColorWindowHeaderInactive },	    /* 118 */
-    { "PlacardActiveText",		    HIText,       kThemeTextColorPlacardActive },		    /* 119 */
-    { "PlacardInactiveText",		    HIText,       kThemeTextColorPlacardInactive },		    /* 120 */
-    { "PlacardPressedText",		    HIText,       kThemeTextColorPlacardPressed },		    /* 121 */
-    { "PushButtonActiveText",		    HIText,       kThemeTextColorPushButtonActive },		    /* 122 */
-    { "PushButtonInactiveText",		    HIText,       kThemeTextColorPushButtonInactive },		    /* 123 */
-    { "PushButtonPressedText",		    HIText,       kThemeTextColorPushButtonPressed },		    /* 124 */
-    { "BevelButtonActiveText",		    HIText,       kThemeTextColorBevelButtonActive },		    /* 125 */
-    { "BevelButtonInactiveText",	    HIText,       kThemeTextColorBevelButtonInactive },		    /* 126 */
-    { "BevelButtonPressedText",		    HIText,       kThemeTextColorBevelButtonPressed },		    /* 127 */
-    { "PopupButtonActiveText",		    HIText,       kThemeTextColorPopupButtonActive },		    /* 128 */
-    { "PopupButtonInactiveText",	    HIText,       kThemeTextColorPopupButtonInactive },		    /* 129 */
-    { "PopupButtonPressedText",		    HIText,       kThemeTextColorPopupButtonPressed },		    /* 130 */
-    { "IconLabelText",			    HIText,       kThemeTextColorIconLabel },			    /* 131 */
-    { "ListViewText",			    HIText,       kThemeTextColorListView },			    /* 132 */
-    { "DocumentWindowTitleActiveText",	    HIText,       kThemeTextColorDocumentWindowTitleActive },	    /* 133 */
-    { "DocumentWindowTitleInactiveText",    HIText,       kThemeTextColorDocumentWindowTitleInactive },	    /* 134 */
-    { "MovableModalWindowTitleActiveText",  HIText,       kThemeTextColorMovableModalWindowTitleActive },   /* 135 */
-    { "MovableModalWindowTitleInactiveText",HIText,       kThemeTextColorMovableModalWindowTitleInactive }, /* 136 */
-    { "UtilityWindowTitleActiveText",	    HIText,       kThemeTextColorUtilityWindowTitleActive },	    /* 137 */
-    { "UtilityWindowTitleInactiveText",	    HIText,       kThemeTextColorUtilityWindowTitleInactive },	    /* 138 */
-    { "PopupWindowTitleActiveText",	    HIText,       kThemeTextColorPopupWindowTitleActive },	    /* 139 */
-    { "PopupWindowTitleInactiveText",	    HIText,       kThemeTextColorPopupWindowTitleInactive },	    /* 140 */
-    { "RootMenuActiveText",		    HIText,       kThemeTextColorRootMenuActive },		    /* 141 */
-    { "RootMenuSelectedText",		    HIText,       kThemeTextColorRootMenuSelected },		    /* 142 */
-    { "RootMenuDisabledText",		    HIText,       kThemeTextColorRootMenuDisabled },		    /* 143 */
-    { "MenuItemActiveText",		    HIText,       kThemeTextColorMenuItemActive },		    /* 144 */
-    { "MenuItemSelectedText",		    HIText,       kThemeTextColorMenuItemSelected },		    /* 145 */
-    { "MenuItemDisabledText",		    HIText,       kThemeTextColorMenuItemDisabled },		    /* 146 */
-    { "PopupLabelActiveText",		    HIText,       kThemeTextColorPopupLabelActive },		    /* 147 */
-    { "PopupLabelInactiveText",		    HIText,       kThemeTextColorPopupLabelInactive },		    /* 148 */
-    { "TabFrontActiveText",		    HIText,       kThemeTextColorTabFrontActive },		    /* 149 */
-    { "TabNonFrontActiveText",		    HIText,       kThemeTextColorTabNonFrontActive },		    /* 150 */
-    { "TabNonFrontPressedText",		    HIText,       kThemeTextColorTabNonFrontPressed },		    /* 151 */
-    { "TabFrontInactiveText",		    HIText,       kThemeTextColorTabFrontInactive },		    /* 152 */
-    { "TabNonFrontInactiveText",	    HIText,       kThemeTextColorTabNonFrontInactive },		    /* 153 */
-    { "IconLabelSelectedText",		    HIText,       kThemeTextColorIconLabelSelected },		    /* 154 */
-    { "BevelButtonStickyActiveText",	    HIText,       kThemeTextColorBevelButtonStickyActive },	    /* 155 */
-    { "BevelButtonStickyInactiveText",	    HIText,       kThemeTextColorBevelButtonStickyInactive },	    /* 156 */
-    { "NotificationText",		    HIText,       kThemeTextColorNotification },		    /* 157 */
-    { "SystemDetailText",		    HIText,       kThemeTextColorSystemDetail },		    /* 158 */
-    { "WhiteText",			    HIText,       kThemeTextColorWhite },			    /* 159 */
-    { "TabPaneBackground",		    HIBackground, kThemeBackgroundTabPane },			    /* 160 */
-    { "PlacardBackground",		    HIBackground, kThemeBackgroundPlacard },			    /* 161 */
-    { "WindowHeaderBackground",		    HIBackground, kThemeBackgroundWindowHeader },		    /* 162 */
-    { "ListViewWindowHeaderBackground",	    HIBackground, kThemeBackgroundListViewWindowHeader },	    /* 163 */
-    { "SecondaryGroupBoxBackground",	    HIBackground, kThemeBackgroundSecondaryGroupBox },		    /* 164 */
-    { "MetalBackground",		    HIBackground, kThemeBackgroundMetal },			    /* 165 */
+MODULE_SCOPE
+unsigned long TkMacOSXRGBPixel(
+    unsigned int red,
+    unsigned int green,
+    unsigned int blue)
+{
+    MacPixel p;
+    p.pixel.value = (red >> 8) << 16 | (green >> 8) << 8 | (blue >> 8);
+    p.pixel.colortype = rgbColor;
+    return p.ulong;
+}
 
-    /*
-     * Colors based on "semantic" NSColors.
-     */
+MODULE_SCOPE
+unsigned long TkMacOSXClearPixel(
+    void)
+{
+    MacPixel p;
+    p.pixel.value = 0;
+    p.pixel.colortype = clearColor;
+    return p.ulong;
+}
 
-    { "WindowBackgroundColor",		    ttkBackground, 0 },	    					    /* 166 */
-    { "WindowBackgroundColor1",		    ttkBackground, 1 },						    /* 167 */
-    { "WindowBackgroundColor2",		    ttkBackground, 2 },						    /* 168 */
-    { "WindowBackgroundColor3",		    ttkBackground, 3 },						    /* 169 */
-    { "WindowBackgroundColor4",		    ttkBackground, 4 },						    /* 170 */
-    { "WindowBackgroundColor5",		    ttkBackground, 5 },						    /* 171 */
-    { "WindowBackgroundColor6",		    ttkBackground, 6 },						    /* 172 */
-    { "WindowBackgroundColor7",		    ttkBackground, 7 },						    /* 173 */
-    { "TextColor",			    semantic, 0 },						    /* 174 */
-    { "SelectedTextColor",		    semantic, 1 },						    /* 175 */
-    { "LabelColor",			    semantic, 2 },						    /* 176 */
-    { "ControlTextColor",      		    semantic, 3 },						    /* 177 */
-    { "DisabledControlTextColor",	    semantic, 4 },						    /* 178 */
-    { "SelectedTabTextColor",		    semantic, 5 },						    /* 179 */
-    { "TextBackgroundColor",		    semantic, 6 },						    /* 180 */
-    { "SelectedTextBackgroundColor",	    semantic, 7 },						    /* 181 */
-    { "ControlAccentColor",		    semantic, 8 },						    /* 182 */
-    /* Apple's SecondaryLabelColor is the same as their LabelColor so we roll our own. */
-    { "SecondaryLabelColor",		    ttkBackground, 14 },					    /* 183 */
-    { "LinkColor",			    semantic, 9 },						    /* 184 */
-    { NULL,				    0, 0 }
-};
-#define FIRST_SEMANTIC_COLOR 166
-#define MAX_PIXELCODE 184
 
 /*
  *----------------------------------------------------------------------
  *
- * GetEntryFromPixelCode --
+ * GetEntryFromPixel --
  *
  *	Extract a SystemColorMapEntry from the table.
  *
  * Results:
+
  *	Returns false if the code is out of bounds.
  *
  * Side effects:
@@ -236,12 +97,19 @@ static const struct SystemColorMapEntry systemColorMap[] = {
  */
 
 static bool
-GetEntryFromPixelCode(
-    unsigned char code,
-    struct SystemColorMapEntry *entry)
+GetEntryFromPixel(
+    unsigned long pixel,
+    SystemColorMapEntry *entry)
 {
-    if (code >= MIN_PIXELCODE && code <= MAX_PIXELCODE) {
-	*entry = systemColorMap[code - MIN_PIXELCODE];
+    MacPixel p;
+    unsigned int index = 0;  //FIX ME
+
+    p.ulong = pixel;
+    if (p.pixel.colortype != rgbColor) {
+	index = p.pixel.value;
+    }
+    if (index < systemColorMapSize) {
+	*entry = *systemColorIndex[index];
 	return true;
     } else {
 	return false;
@@ -268,6 +136,26 @@ GetEntryFromPixelCode(
  */
 
 /*
+ * Definitions to prevent compiler warnings about nonexistent properties of NSColor.
+ */
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
+ #define LABEL_COLOR labelColor
+#else
+ #define LABEL_COLOR textColor
+#endif
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101200
+ #define LINK_COLOR linkColor
+#else
+ #define LINK_COLOR blueColor
+#endif
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
+ #define CONTROL_ACCENT_COLOR controlAccentColor
+#else
+ #define CONTROL_ACCENT_COLOR colorForControlTint:[NSColor currentControlTint]
+#endif
+
+/*
  * Apple claims that linkColor is available in 10.10 but the declaration
  * does not appear in NSColor.h until later.  Declaring it in a category
  * appears to be harmless and stops the compiler warnings. 
@@ -289,14 +177,15 @@ static CGFloat windowBackground[4] =
 
 static OSStatus
 SetCGColorComponents(
-    struct SystemColorMapEntry entry,
+    SystemColorMapEntry entry,
     unsigned long pixel,
     CGColorRef *c)
 {
     OSStatus err = noErr;
     NSColor *bgColor, *color = nil;
     CGFloat rgba[4] = {0, 0, 0, 1};
-
+    static Bool initialized = 0;
+    NSString *selector;
     if (!sRGB) {
 	sRGB = [NSColorSpace sRGBColorSpace];
     }
@@ -307,7 +196,6 @@ SetCGColorComponents(
      */
 
     NSAutoreleasePool *pool = [NSAutoreleasePool new];
-
     switch (entry.type) {
     case HIBrush:
 	err = ChkErr(HIThemeBrushCreateCGColor, entry.value, c);
@@ -343,76 +231,7 @@ SetCGColorComponents(
 	}
 	break;
     case semantic:
-	switch (entry.value) {
-	case 0:
-	    color = [[NSColor textColor] colorUsingColorSpace:sRGB];
-	    break;
-	case 1:
-	    color = [[NSColor selectedTextColor] colorUsingColorSpace:sRGB];
-	    break;
-	case 2:
-	    if ([NSApp macOSVersion] > 100900) {
-
-#if MAC_OS_X_VERSION_MAX_ALLOWED > 1090
-		color = [[NSColor labelColor] colorUsingColorSpace:sRGB];
-#endif
-	    } else {
-		color = [[NSColor textColor] colorUsingColorSpace:sRGB];
-	    }
-	    break;
-	case 3:
-	    color = [[NSColor controlTextColor] colorUsingColorSpace:sRGB];
-	    break;
-	case 4:
-	    color = [[NSColor disabledControlTextColor]
-			colorUsingColorSpace:sRGB];
-	    break;
-	case 5:
-	    if ([NSApp macOSVersion] > 100600) {
-		color = [[NSColor whiteColor] colorUsingColorSpace:sRGB];
-	    } else {
-		color = [[NSColor blackColor] colorUsingColorSpace:sRGB];
-	    }
-	    break;
-	case 6:
-	    color = [[NSColor textBackgroundColor] colorUsingColorSpace:sRGB];
-	    break;
-	case 7:
-	    color = [[NSColor selectedTextBackgroundColor]
-			colorUsingColorSpace:sRGB];
-	    break;
-	case 8:
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
-	    if (@available(macOS 14, *)) {
-		color = [[NSColor controlAccentColor] colorUsingColorSpace:sRGB];
-#else
-	    if(false) {
-#endif
-	    } else {
-		color = [[NSColor
-			    colorForControlTint:[NSColor currentControlTint]]
-			        colorUsingColorSpace: sRGB];
-	    }
-	    break;
-	case 9:
-	    if ([NSApp macOSVersion] >= 101100) {
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101100
-		color = [[NSColor linkColor] colorUsingColorSpace:sRGB];
-#endif
-	    } else {
-		color = [[NSColor blueColor] colorUsingColorSpace:sRGB];
-	    }
-	    break;
-	default:
-	    if ([NSApp macOSVersion] >= 101000) {
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
-		color = [[NSColor labelColor] colorUsingColorSpace:sRGB];
-#endif
-	    } else {
-		color = [[NSColor textColor] colorUsingColorSpace:sRGB];
-	    }
-	    break;
-	}
+	color = [[NSColor valueForKey:entry.selector] colorUsingColorSpace:sRGB];	
 	[color getComponents: rgba];
 	break;
     case clearColor:
@@ -483,7 +302,7 @@ TkMacOSXInDarkMode(Tk_Window tkwin)
  * TkSetMacColor --
  *
  *	Sets the components of a CGColorRef from an XColor pixel value.
- *      The high order byte of the pixel value is used as an index into
+ *      XXXX The high order byte of the pixel value is used as an index into
  *      the system color table, and then SetCGColorComponents is called
  *      with the table entry and the pixel value.
  *
@@ -505,9 +324,10 @@ TkSetMacColor(
 {
     CGColorRef *color = (CGColorRef*)macColor;
     OSStatus err = -1;
-    struct SystemColorMapEntry entry;
+    SystemColorMapEntry entry;
 
-    if (GetEntryFromPixelCode((pixel >> 24) & 0xff, &entry)) {
+    //    if (GetEntryFromPixelCode((pixel >> 24) & 0xff, &entry)) {
+    if (GetEntryFromPixel(pixel, &entry)) {
 	err = ChkErr(SetCGColorComponents, entry, pixel, color);
     }
     return (err == noErr);
@@ -689,15 +509,14 @@ TkMacOSXSetColorInContext(
 {
     OSStatus err = noErr;
     CGColorRef cgColor = nil;
-    struct SystemColorMapEntry entry;
+    SystemColorMapEntry entry;
     CGRect rect;
-    int code = (pixel >> 24) & 0xff;
     HIThemeBackgroundDrawInfo info = {0, kThemeStateActive, 0};;
 
-    if (code < FIRST_SEMANTIC_COLOR) {
-	cgColor = CopyCachedColor(gc, pixel);
-    }
-    if (!cgColor && GetEntryFromPixelCode(code, &entry)) {
+    // if (code < FIRST_SEMANTIC_COLOR) {
+    // 	cgColor = CopyCachedColor(gc, pixel);
+    // }
+    if (!cgColor && GetEntryFromPixel(pixel, &entry)) {
 	switch (entry.type) {
 	case HIBrush:
 	    err = ChkErr(HIThemeSetFill, entry.value, NULL, context,
@@ -763,6 +582,13 @@ TkpGetColor(
     Colormap colormap = tkwin!= None ? Tk_Colormap(tkwin) : None;
     TkColor *tkColPtr;
     XColor color;
+    static Bool initialized = NO;
+    static NSColorSpace* sRGB = NULL;
+    if (!initialized) {
+	initialized = YES;
+	sRGB = [NSColorSpace sRGBColorSpace];
+	initColorTable();
+    }
 
     /*
      * Check to see if this is a system color. Otherwise, XParseColor
@@ -770,20 +596,18 @@ TkpGetColor(
      */
 
     if (strncasecmp(name, "system", 6) == 0) {
-	Tcl_Obj *strPtr = Tcl_NewStringObj(name+6, -1);
-	int idx, result;
-
-	result = Tcl_GetIndexFromObjStruct(NULL, strPtr, systemColorMap,
-		sizeof(struct SystemColorMapEntry), NULL, TCL_EXACT, &idx);
-	Tcl_DecrRefCount(strPtr);
-	if (result == TCL_OK) {
+	Tcl_HashEntry *hPtr = NULL;
+	SystemColorMapEntry *entry;
+	hPtr = Tcl_FindHashEntry(&systemColorMap, name + 6);
+	if (hPtr != NULL) {
+	    entry = (SystemColorMapEntry *)Tcl_GetHashValue(hPtr);
 	    OSStatus err;
 	    CGColorRef c;
-	    unsigned char pixelCode = idx + MIN_PIXELCODE;
-	    struct SystemColorMapEntry entry = systemColorMap[idx];
-
-	    err = ChkErr(SetCGColorComponents, entry, 0, &c);
+	    unsigned char pixelCode = entry->index;
+	    err = ChkErr(SetCGColorComponents, *entry, 0, &c);
 	    if (err == noErr) {
+		MacPixel p;
+
 		const size_t n = CGColorGetNumberOfComponents(c);
 		const CGFloat *rgba = CGColorGetComponents(c);
 
@@ -799,10 +623,9 @@ TkpGetColor(
 		default:
 		    Tcl_Panic("CGColor with %d components", (int) n);
 		}
-		color.pixel = ((((((pixelCode << 8)
-			| ((color.red   >> 8) & 0xff)) << 8)
-			| ((color.green >> 8) & 0xff)) << 8)
-			| ((color.blue  >> 8) & 0xff));
+		p.pixel.value = pixelCode;
+		p.pixel.colortype = entry->type;
+		color.pixel = p.ulong;
 		CGColorRelease(c);
 		goto validXColor;
 	    }
@@ -854,7 +677,7 @@ TkpGetColorByValue(
     tkColPtr->color.red = colorPtr->red;
     tkColPtr->color.green = colorPtr->green;
     tkColPtr->color.blue = colorPtr->blue;
-    tkColPtr->color.pixel = TkpGetPixel(&tkColPtr->color);
+    tkColPtr->color.pixel = TkpGetPixel(colorPtr);
     return tkColPtr;
 }
 
diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index fd8a1eb..645b72b 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -43,6 +43,7 @@ static int cgAntiAliasLimit = 0;
 
 static int useThemedToplevel = 0;
 static int useThemedFrame = 0;
+static unsigned long transparentColor;
 
 /*
  * Prototypes for functions used only in this file.
@@ -99,6 +100,7 @@ TkMacOSXInitCGDrawing(
 		(char *) &useThemedFrame, TCL_LINK_BOOLEAN) != TCL_OK) {
 	    Tcl_ResetResult(interp);
 	}
+	transparentColor = TkMacOSXClearPixel();
     }
     return TCL_OK;
 }
@@ -545,7 +547,7 @@ TkMacOSXGetNSImageWithBitmap(
 
     unsigned long origBackground = gc->background;
 
-    gc->background = TRANSPARENT_PIXEL << 24;
+    gc->background = transparentColor;
     XSetClipOrigin(display, gc, 0, 0);
     XCopyPlane(display, bitmap, pixmap, gc, 0, 0, width, height, 0, 0, 1);
     gc->background = origBackground;
@@ -664,17 +666,18 @@ TkMacOSXDrawCGImage(
 	dstBounds = CGRectOffset(dstBounds, macDraw->xOff, macDraw->yOff);
 	if (CGImageIsMask(image)) {
 	    if (macDraw->flags & TK_IS_BW_PIXMAP) {
+
 		/*
 		 * Set fill color to black; background comes from the context,
 		 * or is transparent.
 		 */
 
-		if (imageBackground != TRANSPARENT_PIXEL << 24) {
+		if (imageBackground != transparentColor) {
 		    CGContextClearRect(context, dstBounds);
 		}
 		CGContextSetRGBFillColor(context, 0.0, 0.0, 0.0, 1.0);
 	    } else {
-		if (imageBackground != TRANSPARENT_PIXEL << 24) {
+		if (imageBackground != transparentColor) {
 		    TkMacOSXSetColorInContext(gc, imageBackground, context);
 		    CGContextFillRect(context, dstBounds);
 		}
diff --git a/macosx/tkMacOSXImage.c b/macosx/tkMacOSXImage.c
index 2e576a5..4691e41 100644
--- a/macosx/tkMacOSXImage.c
+++ b/macosx/tkMacOSXImage.c
@@ -358,7 +358,7 @@ ImageGetPixel(
 	    break;
 	}
     }
-    return (PIXEL_MAGIC << 24) | (r << 16) | (g << 8) | b;
+    return TkMacOSXRGBPixel(r, g, b);
 }
 
 /*
diff --git a/macosx/tkMacOSXPort.h b/macosx/tkMacOSXPort.h
index 71797b0..b81455c 100644
--- a/macosx/tkMacOSXPort.h
+++ b/macosx/tkMacOSXPort.h
@@ -161,27 +161,9 @@
 #define TK_NO_DOUBLE_BUFFERING 1
 
 /*
- * Magic pixel code values for system colors.
- *
- * NOTE: values must be kept in sync with indices into the
- *	 systemColorMap array in tkMacOSXColor.c !
- */
-
-#define TRANSPARENT_PIXEL		30
-#define APPEARANCE_PIXEL		52
-#define PIXEL_MAGIC ((unsigned char) 0x69)
-
-/*
- * The following macro returns the pixel value that corresponds to the
- * 16-bit RGB values in the given XColor structure.
- * The format is: (PIXEL_MAGIC <<< 24) | (R << 16) | (G << 8) | B
- * where each of R, G and B is the high order byte of a 16-bit component.
+ * Used by xcolor.c
  */
 
-#define TkpGetPixel(p) ((((((PIXEL_MAGIC << 8) \
-	| (((p)->red >> 8) & 0xff)) << 8) \
-	| (((p)->green >> 8) & 0xff)) << 8) \
-	| (((p)->blue >> 8) & 0xff))
-
+#define TkpGetPixel(p) (TkMacOSXRGBPixel(p->red, p->green, p->blue))
 
 #endif /* _TKMACPORT */
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h
index a77282c..8ba7541 100644
--- a/macosx/tkMacOSXPrivate.h
+++ b/macosx/tkMacOSXPrivate.h
@@ -150,7 +150,7 @@ typedef union MacKeycode_t {
   keycode_v v;
   keycode_x x;
 } MacKeycode;
-
+    
 /*
  * Macros used in tkMacOSXKeyboard.c and tkMacOSXKeyEvent.c.
  * Note that 0x7f is del and 0xF8FF is the Apple Logo character.
@@ -310,6 +310,9 @@ MODULE_SCOPE unsigned   TkMacOSXAddVirtual(unsigned int keycode);
 MODULE_SCOPE void       TkMacOSXWinNSBounds(TkWindow *winPtr, NSView *view,
 					    NSRect *bounds);
 MODULE_SCOPE void	TkMacOSXDrawAllViews(ClientData clientData);
+MODULE_SCOPE unsigned long TkMacOSXRGBPixel(unsigned int red, unsigned int green,
+					    unsigned int blue);
+MODULE_SCOPE unsigned long TkMacOSXClearPixel(void);
 
 #pragma mark Private Objective-C Classes
 
diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c
index 107f712..dc9ea32 100644
--- a/macosx/tkMacOSXXStubs.c
+++ b/macosx/tkMacOSXXStubs.c
@@ -250,8 +250,8 @@ TkpOpenDisplay(
      */
     screen->root	= ROOT_ID;
     screen->display	= display;
-    screen->black_pixel = 0x00000000 | PIXEL_MAGIC << 24;
-    screen->white_pixel = 0x00FFFFFF | PIXEL_MAGIC << 24;
+    screen->black_pixel = 0x00000000;
+    screen->white_pixel = 0x00FFFFFF;
     screen->ext_data	= (XExtData *) &maxBounds;
 
     screen->root_visual = ckalloc(sizeof(Visual));
-- 
cgit v0.12


From 18690594d7c9f8a57946fc6d838930b09e104754 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Wed, 29 Jul 2020 03:25:00 +0000
Subject: Add the new header file too.

---
 macosx/tkMacOSXColor.h | 250 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 250 insertions(+)
 create mode 100644 macosx/tkMacOSXColor.h

diff --git a/macosx/tkMacOSXColor.h b/macosx/tkMacOSXColor.h
new file mode 100644
index 0000000..a4acc08
--- /dev/null
+++ b/macosx/tkMacOSXColor.h
@@ -0,0 +1,250 @@
+#ifndef MACOSXCOLOR_H
+#define MACOSXCOLOR_H
+/*
+ * The generic Tk code uses the X11 GC type to describe a graphics context.
+ * (A GC is a pointer to a struct XGCValues).  The foreground and background
+ * colors in a GC are unsigned longs.  These are meant to be used as indexes
+ * into a table of XColors, where an XColor is declared in Xlib.h as:
+ * typedef struct {
+ *       unsigned long pixel; 
+ *       unsigned short red, green, blue;
+ *       char flags;
+ *       char pad;
+ * } XColor;
+ *
+ * The xlib function XParseColor creates XColors from strings.  It recognizes
+ * literal hexadecimal color specifications such as "#RRGGBB" as well as the
+ * standard X11 color names.  When XParseColor creates an XColor it fills in
+ * all of the fields except for the pixel field, and then passes the XColor
+ * to TkpGetPixel to get a value to use for the pixel field. Since TkpGetPixel
+ * is platform specific, each platform is free to choose a value which can
+ * be used to set the foreground or background color in the platform's graphics
+ * context.
+ *
+ * Tk represents a color by a struct TkColor, which extends the XColor struct.
+ * Tk provides a mapping from color names to TkColors which extends the mapping
+ * provided by XParseColor but also allows for platform specific color names.
+ * By convention, these platform specific color names begin with the string
+ * "system".  The mapping from names to TkColors is implemented by the function
+ * TkpGetColor defined for the Macintosh in this file.  The pixel field in the
+ * XColor contained in a TkColor will be stored in the X11 graphics context.
+ * In X11 the pixel field is used as an index into a colormap.  On the Mac
+ * the high order byte of the pixel is used to indicate a color type and
+ * the low 24 bits are either used as an rgb value (if the type is rgbColor)
+ * or as an index into a table of color descriptions.
+ */
+
+enum colorType {
+    rgbColor,      /* The 24 bit value is an rgb color. */
+    clearColor,    /* The unique rgba color with all channels 0. */
+    HIBrush,       /* A HITheme brush color.*/
+    HIText,        /* A HITheme text color. */
+    HIBackground,  /* A HITheme background color. */
+    ttkBackground, /* A background color which indicates nesting level.*/
+    semantic,      /* A semantic NSColor.*/
+};
+
+typedef struct xpixel_t {
+    unsigned value: 24;     /* Either RGB or an index into systemColorMap. */
+    unsigned colortype: 8;
+} xpixel;
+    
+typedef union MacPixel_t {
+    unsigned long ulong;
+    xpixel pixel;
+} MacPixel;
+
+/*
+ * In TkMacOSXColor.c a Tk hash table is constructed from the static data
+ * below to map system color names to CGColors.
+ */ 
+
+typedef struct {
+    const char *name;
+    enum colorType type;
+    long value;
+    char *macName;
+    NSString *selector;  /* Filled in if used. */
+    int index;           /* Filled in when the hash table is constructed. */
+} SystemColorMapEntry;
+
+static SystemColorMapEntry systemColorMapData[] = {
+{"Pixel",				rgbColor, 0 },     /* This must be first. */
+{"Transparent",				clearColor,   0 },
+
+
+{"Highlight",				HIBrush,  kThemeBrushPrimaryHighlightColor },
+{"HighlightSecondary",		    	HIBrush,  kThemeBrushSecondaryHighlightColor },
+{"HighlightText",			HIBrush,  kThemeBrushBlack },
+{"HighlightAlternate",			HIBrush,  kThemeBrushAlternatePrimaryHighlightColor },
+{"PrimaryHighlightColor",		HIBrush,  kThemeBrushPrimaryHighlightColor },
+{"ButtonFace",				HIBrush,  kThemeBrushButtonFaceActive },	       
+{"SecondaryHighlightColor",		HIBrush,  kThemeBrushSecondaryHighlightColor },
+{"ButtonFrame",				HIBrush,  kThemeBrushButtonFrameActive },	       
+{"AlternatePrimaryHighlightColor",      HIBrush,  kThemeBrushAlternatePrimaryHighlightColor },
+{"WindowBody",				HIBrush,  kThemeBrushDocumentWindowBackground },       
+{"SheetBackground",			HIBrush,  kThemeBrushSheetBackground },
+{"MenuActive",				HIBrush,  kThemeBrushMenuBackgroundSelected },
+{"Menu",				HIBrush,  kThemeBrushMenuBackground },
+{"DialogBackgroundInactive",		HIBrush,  kThemeBrushDialogBackgroundInactive },   
+{"DialogBackgroundActive",		HIBrush,  kThemeBrushDialogBackgroundActive },
+{"AlertBackgroundActive",		HIBrush,  kThemeBrushAlertBackgroundActive },
+{"AlertBackgroundInactive",		HIBrush,  kThemeBrushAlertBackgroundInactive },
+{"ModelessDialogBackgroundActive",	HIBrush,  kThemeBrushModelessDialogBackgroundActive },
+{"ModelessDialogBackgroundInactive",	HIBrush,  kThemeBrushModelessDialogBackgroundInactive },
+{"UtilityWindowBackgroundActive",	HIBrush,  kThemeBrushUtilityWindowBackgroundActive },
+{"UtilityWindowBackgroundInactive",	HIBrush,  kThemeBrushUtilityWindowBackgroundInactive },
+{"ListViewSortColumnBackground",	HIBrush,  kThemeBrushListViewSortColumnBackground },
+{"ListViewBackground",			HIBrush,  kThemeBrushListViewBackground },	   
+{"IconLabelBackground",			HIBrush,  kThemeBrushIconLabelBackground },
+{"ListViewSeparator",			HIBrush,  kThemeBrushListViewSeparator },  
+{"ChasingArrows",			HIBrush,  kThemeBrushChasingArrows },
+{"DragHilite",				HIBrush,  kThemeBrushDragHilite },	   
+{"DocumentWindowBackground",		HIBrush,  kThemeBrushDocumentWindowBackground },   
+{"FinderWindowBackground",		HIBrush,  kThemeBrushFinderWindowBackground },
+{"ScrollBarDelimiterActive",		HIBrush,  kThemeBrushScrollBarDelimiterActive },   
+{"ScrollBarDelimiterInactive",		HIBrush,  kThemeBrushScrollBarDelimiterInactive }, 
+{"FocusHighlight",			HIBrush,  kThemeBrushFocusHighlight },
+{"PopupArrowActive",			HIBrush,  kThemeBrushPopupArrowActive },	   
+{"PopupArrowPressed",			HIBrush,  kThemeBrushPopupArrowPressed },	   
+{"PopupArrowInactive",			HIBrush,  kThemeBrushPopupArrowInactive },	   
+{"AppleGuideCoachmark",			HIBrush,  kThemeBrushAppleGuideCoachmark },	   
+{"IconLabelBackgroundSelected",		HIBrush,  kThemeBrushIconLabelBackgroundSelected },
+{"StaticAreaFill",			HIBrush,  kThemeBrushStaticAreaFill },
+{"ActiveAreaFill",			HIBrush,  kThemeBrushActiveAreaFill },
+{"ButtonFrameActive",			HIBrush,  kThemeBrushButtonFrameActive },
+{"ButtonFrameInactive",			HIBrush,  kThemeBrushButtonFrameInactive },	   
+{"ButtonFaceActive",			HIBrush,  kThemeBrushButtonFaceActive },   
+{"ButtonFaceInactive",			HIBrush,  kThemeBrushButtonFaceInactive },	   
+{"ButtonFacePressed",			HIBrush,  kThemeBrushButtonFacePressed },	   
+{"ButtonActiveDarkShadow",		HIBrush,  kThemeBrushButtonActiveDarkShadow },
+{"ButtonActiveDarkHighlight",		HIBrush,  kThemeBrushButtonActiveDarkHighlight },
+{"ButtonActiveLightShadow",		HIBrush,  kThemeBrushButtonActiveLightShadow },
+{"ButtonActiveLightHighlight",		HIBrush,  kThemeBrushButtonActiveLightHighlight },
+{"ButtonInactiveDarkShadow",		HIBrush,  kThemeBrushButtonInactiveDarkShadow },
+{"ButtonInactiveDarkHighlight",		HIBrush,  kThemeBrushButtonInactiveDarkHighlight },
+{"ButtonInactiveLightShadow",		HIBrush,  kThemeBrushButtonInactiveLightShadow },
+{"ButtonInactiveLightHighlight",	HIBrush,  kThemeBrushButtonInactiveLightHighlight },
+{"ButtonPressedDarkShadow",		HIBrush,  kThemeBrushButtonPressedDarkShadow },
+{"ButtonPressedDarkHighlight",		HIBrush,  kThemeBrushButtonPressedDarkHighlight },
+{"ButtonPressedLightShadow",		HIBrush,  kThemeBrushButtonPressedLightShadow },
+{"ButtonPressedLightHighlight",		HIBrush,  kThemeBrushButtonPressedLightHighlight },
+{"BevelActiveLight",			HIBrush,  kThemeBrushBevelActiveLight },
+{"BevelActiveDark",			HIBrush,  kThemeBrushBevelActiveDark },
+{"BevelInactiveLight",			HIBrush,  kThemeBrushBevelInactiveLight },
+{"BevelInactiveDark",			HIBrush,  kThemeBrushBevelInactiveDark },
+{"NotificationWindowBackground",	HIBrush,  kThemeBrushNotificationWindowBackground },
+{"MovableModalBackground",		HIBrush,  kThemeBrushMovableModalBackground },
+{"SheetBackgroundOpaque",		HIBrush,  kThemeBrushSheetBackgroundOpaque },
+{"DrawerBackground",			HIBrush,  kThemeBrushDrawerBackground },
+{"ToolbarBackground",			HIBrush,  kThemeBrushToolbarBackground },
+{"SheetBackgroundTransparent",		HIBrush,  kThemeBrushSheetBackgroundTransparent },
+{"MenuBackground",			HIBrush,  kThemeBrushMenuBackground },
+{"MenuBackgroundSelected",		HIBrush,  kThemeBrushMenuBackgroundSelected },
+{"ListViewOddRowBackground",		HIBrush,  kThemeBrushListViewOddRowBackground },
+{"ListViewEvenRowBackground",		HIBrush,  kThemeBrushListViewEvenRowBackground },
+{"ListViewColumnDivider",		HIBrush,  kThemeBrushListViewColumnDivider },
+
+
+{"ButtonText",				HIText,   kThemeTextColorPushButtonActive },	       
+{"MenuActiveText",			HIText,   kThemeTextColorMenuItemSelected },	       
+{"MenuDisabled",			HIText,   kThemeTextColorMenuItemDisabled },	   
+{"MenuText",				HIText,   kThemeTextColorMenuItemActive },	   
+{"BlackText",				HIText,   kThemeTextColorBlack },
+{"DialogActiveText",			HIText,   kThemeTextColorDialogActive },
+{"DialogInactiveText",			HIText,   kThemeTextColorDialogInactive },
+{"AlertActiveText",			HIText,   kThemeTextColorAlertActive },
+{"AlertInactiveText",			HIText,   kThemeTextColorAlertInactive },
+{"ModelessDialogActiveText",		HIText,   kThemeTextColorModelessDialogActive },
+{"ModelessDialogInactiveText",		HIText,   kThemeTextColorModelessDialogInactive },
+{"WindowHeaderActiveText",		HIText,   kThemeTextColorWindowHeaderActive },
+{"WindowHeaderInactiveText",		HIText,   kThemeTextColorWindowHeaderInactive },
+{"PlacardActiveText",			HIText,   kThemeTextColorPlacardActive },
+{"PlacardInactiveText",			HIText,   kThemeTextColorPlacardInactive },
+{"PlacardPressedText",			HIText,   kThemeTextColorPlacardPressed },
+{"PushButtonActiveText",		HIText,   kThemeTextColorPushButtonActive },
+{"PushButtonInactiveText",		HIText,   kThemeTextColorPushButtonInactive },
+{"PushButtonPressedText",		HIText,   kThemeTextColorPushButtonPressed },
+{"BevelButtonActiveText",		HIText,   kThemeTextColorBevelButtonActive },
+{"BevelButtonInactiveText",		HIText,   kThemeTextColorBevelButtonInactive },
+{"BevelButtonPressedText",		HIText,   kThemeTextColorBevelButtonPressed },
+{"PopupButtonActiveText",		HIText,   kThemeTextColorPopupButtonActive },
+{"PopupButtonInactiveText",		HIText,   kThemeTextColorPopupButtonInactive },
+{"PopupButtonPressedText",		HIText,   kThemeTextColorPopupButtonPressed },
+{"IconLabelText",			HIText,   kThemeTextColorIconLabel },
+{"ListViewText",			HIText,   kThemeTextColorListView },
+{"DocumentWindowTitleActiveText",	HIText,   kThemeTextColorDocumentWindowTitleActive },
+{"DocumentWindowTitleInactiveText",	HIText,   kThemeTextColorDocumentWindowTitleInactive },
+{"MovableModalWindowTitleActiveText",  	HIText,   kThemeTextColorMovableModalWindowTitleActive },   
+{"MovableModalWindowTitleInactiveText",	HIText,   kThemeTextColorMovableModalWindowTitleInactive }, 
+{"UtilityWindowTitleActiveText",	HIText,   kThemeTextColorUtilityWindowTitleActive },
+{"UtilityWindowTitleInactiveText",	HIText,   kThemeTextColorUtilityWindowTitleInactive },
+{"PopupWindowTitleActiveText",		HIText,   kThemeTextColorPopupWindowTitleActive },
+{"PopupWindowTitleInactiveText",	HIText,   kThemeTextColorPopupWindowTitleInactive },
+{"RootMenuActiveText",			HIText,   kThemeTextColorRootMenuActive },
+{"RootMenuSelectedText",		HIText,   kThemeTextColorRootMenuSelected },
+{"RootMenuDisabledText",		HIText,   kThemeTextColorRootMenuDisabled },
+{"MenuItemActiveText",			HIText,   kThemeTextColorMenuItemActive },
+{"MenuItemSelectedText",		HIText,   kThemeTextColorMenuItemSelected },
+{"MenuItemDisabledText",		HIText,   kThemeTextColorMenuItemDisabled },
+{"PopupLabelActiveText",		HIText,   kThemeTextColorPopupLabelActive },
+{"PopupLabelInactiveText",		HIText,   kThemeTextColorPopupLabelInactive },
+{"TabFrontActiveText",			HIText,   kThemeTextColorTabFrontActive },
+{"TabNonFrontActiveText",		HIText,   kThemeTextColorTabNonFrontActive },
+{"TabNonFrontPressedText",		HIText,   kThemeTextColorTabNonFrontPressed },
+{"TabFrontInactiveText",		HIText,   kThemeTextColorTabFrontInactive },
+{"TabNonFrontInactiveText",		HIText,   kThemeTextColorTabNonFrontInactive },
+{"IconLabelSelectedText",		HIText,   kThemeTextColorIconLabelSelected },
+{"BevelButtonStickyActiveText",		HIText,   kThemeTextColorBevelButtonStickyActive },
+{"BevelButtonStickyInactiveText",	HIText,   kThemeTextColorBevelButtonStickyInactive },
+{"NotificationText",			HIText,   kThemeTextColorNotification },
+{"SystemDetailText",			HIText,   kThemeTextColorSystemDetail },
+{"PlacardBackground",			HIBackground, kThemeBackgroundPlacard },
+{"WindowHeaderBackground",		HIBackground, kThemeBackgroundWindowHeader },
+{"ListViewWindowHeaderBackground",	HIBackground, kThemeBackgroundListViewWindowHeader },
+{"MetalBackground",			HIBackground, kThemeBackgroundMetal },
+
+{"SecondaryGroupBoxBackground",		HIBackground, kThemeBackgroundSecondaryGroupBox },
+{"TabPaneBackground",			HIBackground, kThemeBackgroundTabPane },
+{"WhiteText",				HIText,   kThemeTextColorWhite },
+{"Black",				HIBrush,  kThemeBrushBlack },
+{"White",				HIBrush,  kThemeBrushWhite },
+
+    /*
+     * Dynamic Colors
+     */
+
+{"WindowBackgroundColor",	    ttkBackground, 0 },	    
+{"WindowBackgroundColor1",	    ttkBackground, 1 },
+{"WindowBackgroundColor2",	    ttkBackground, 2 },
+{"WindowBackgroundColor3",	    ttkBackground, 3 },
+{"WindowBackgroundColor4",	    ttkBackground, 4 },
+{"WindowBackgroundColor5",	    ttkBackground, 5 },
+{"WindowBackgroundColor6",	    ttkBackground, 6 },
+{"WindowBackgroundColor7",	    ttkBackground, 7 },
+/* Apple's SecondaryLabelColor is the same as their LabelColor so we roll our own. */
+{"SecondaryLabelColor",		    ttkBackground, 14 },
+
+{"TextColor",			    semantic, 0, "textColor" },
+{"SelectedTextColor",		    semantic, 0, "selectedTextColor" },
+{"LabelColor",			    semantic, 0, "labelColor"},
+{"ControlTextColor",      	    semantic, 0, "controlTextColor" },
+{"DisabledControlTextColor",	    semantic, 0, "disabledControlTextColor" },
+#if MAC_OS_X_VERSION_MAX_ALLOWED > 1060
+{"SelectedTabTextColor",	    semantic, 0, "whiteColor" },
+#else
+{"SelectedTabTextColor",	    semantic, 0, "blackColor" },
+#endif
+{"TextBackgroundColor",		    semantic, 0, "textBackgroundColor" },
+{"SelectedTextBackgroundColor",	    semantic, 0, "selectedTextBackgroundColor" },
+{"ControlAccentColor",		    semantic, 0, "controlAccentColor" },
+{"LinkColor",			    semantic, 0, "blueColor" },
+{"LinkColor",			    semantic, 0, "linkColor" },
+{"PlaceholderTextColor",	    semantic, 0, "grayColor" },
+{"PlaceholderTextColor",	    semantic, 0, "placeholderTextColor" },
+{"SeparatorColor",		    semantic, 0, "grayColor" },
+{"SeparatorColor",		    semantic, 0, "separatorColor" },
+{NULL,				    0, 0 }
+};
+
+#endif
-- 
cgit v0.12


From 549b6fe77986ec243d198acfdff6f244249c1ba9 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Wed, 29 Jul 2020 03:51:19 +0000
Subject: Remove lines that were commented out.

---
 macosx/tkMacOSXColor.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index 8b193b8..8e286fa 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -102,7 +102,8 @@ GetEntryFromPixel(
     SystemColorMapEntry *entry)
 {
     MacPixel p;
-    unsigned int index = 0;  //FIX ME
+ // Should make sure this is the rgbColor index, even if the data gets shuffled.
+    unsigned int index = 0;
 
     p.ulong = pixel;
     if (p.pixel.colortype != rgbColor) {
@@ -326,7 +327,6 @@ TkSetMacColor(
     OSStatus err = -1;
     SystemColorMapEntry entry;
 
-    //    if (GetEntryFromPixelCode((pixel >> 24) & 0xff, &entry)) {
     if (GetEntryFromPixel(pixel, &entry)) {
 	err = ChkErr(SetCGColorComponents, entry, pixel, color);
     }
@@ -513,9 +513,6 @@ TkMacOSXSetColorInContext(
     CGRect rect;
     HIThemeBackgroundDrawInfo info = {0, kThemeStateActive, 0};;
 
-    // if (code < FIRST_SEMANTIC_COLOR) {
-    // 	cgColor = CopyCachedColor(gc, pixel);
-    // }
     if (!cgColor && GetEntryFromPixel(pixel, &entry)) {
 	switch (entry.type) {
 	case HIBrush:
-- 
cgit v0.12


From a012b4334ab20bcfd26b43f6f32bca1a1d66b50e Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Wed, 29 Jul 2020 14:48:46 +0000
Subject: Fix the hash table logic and some build issues.

---
 macosx/tkMacOSXColor.c   | 81 +++++++++++++++++++++++++++++++++++++++++-------
 macosx/tkMacOSXPort.h    |  3 +-
 macosx/tkMacOSXPrivate.h |  2 --
 3 files changed, 71 insertions(+), 15 deletions(-)

diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index 8e286fa..dd51a66 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -25,28 +25,44 @@ SystemColorMapEntry **systemColorIndex;
 void initColorTable()
 {
     Tcl_InitHashTable(&systemColorMap, TCL_STRING_KEYS);
-    SystemColorMapEntry *entry;
+    SystemColorMapEntry *entry, *oldEntry;
     Tcl_HashSearch search;
     Tcl_HashEntry *hPtr;
-    int newPtr = 0, index = 0;
+    int newPtr, index = 0;
+
+    /*
+     * Build a hash table for looking up a color by its name.
+     */
+    
     for (entry = systemColorMapData; entry->name != NULL; entry++) {
 	hPtr = Tcl_CreateHashEntry(&systemColorMap, entry->name, &newPtr);
 	if (entry->type == semantic) {
 	    NSString *selector = [[NSString alloc]
 				   initWithCString:entry->macName
 					  encoding:NSUTF8StringEncoding];
+	    /*
+	     * Ignore this entry if NSColor does not recognize it.
+	     */
+	    
 	    if (![NSColor respondsToSelector: NSSelectorFromString(selector)]) {
 		continue;
 	    }
 	    [selector retain];
 	    entry->selector = selector;
 	}
-	if (!newPtr) {
-	    index--;
+	if (newPtr == 0) {
+	    oldEntry = (SystemColorMapEntry *) Tcl_GetHashValue(hPtr);
+	    entry->index = oldEntry->index;
+	} else {
+	    entry->index = index++;
 	}
-	entry->index = index++;
 	Tcl_SetHashValue(hPtr, entry);
     }
+    
+    /*
+     * Build an array for looking up a color by its index.
+     */
+    
     systemColorMapSize = index;
     systemColorIndex = ckalloc(systemColorMapSize * sizeof(SystemColorMapEntry*));
     for (hPtr = Tcl_FirstHashEntry(&systemColorMap, &search); hPtr != NULL;
@@ -56,18 +72,60 @@ void initColorTable()
     }
 }
 
+/*
+ *----------------------------------------------------------------------
+ *
+ * TkMacOSXRGBPixel --
+ *
+ *	Return an unsigned long value suitable for use in the pixel
+ *	field of an XColor with the specified red, green and blue
+ *	intensities.  The inputs are cast as unsigned longs but are
+ *      expected to have values representable by an unsigned short
+ *      as used in the XColor struct.  These values are divided by
+ *      256 tp generate a 24-bit RGB pixel value.
+ *
+ *      This is called by the TkpGetPixel macro, used in xcolor.c.
+ *
+ * Results:
+ *	An unsigned long that can be used as the pixel field of an XColor.
+ *
+ * Side effects:
+ *	None.
+ *----------------------------------------------------------------------
+ */
 MODULE_SCOPE
-unsigned long TkMacOSXRGBPixel(
-    unsigned int red,
-    unsigned int green,
-    unsigned int blue)
+unsigned long
+TkMacOSXRGBPixel(
+    unsigned long red,
+    unsigned long green,
+    unsigned long blue)
 {
     MacPixel p;
-    p.pixel.value = (red >> 8) << 16 | (green >> 8) << 8 | (blue >> 8);
     p.pixel.colortype = rgbColor;
+    p.pixel.value = (((red >> 8) & 0xff) << 16)  |
+	            (((green >> 8) & 0xff) << 8) |
+	            ((blue >> 8) & 0xff);
     return p.ulong;
 }
-
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * TkMacOSXClearPixel --
+ *
+ *	Return the unsigned long value that appears in the pixel
+ *	field of the XColor for systemTransparentColor.
+ *
+ *      This is used in tkMacOSXImage.c.
+ *
+ * Results:
+ *	The unsigned long that appears in the pixel field of the XColor
+ *      for systemTransparentPixel.
+ *
+ * Side effects:
+ *	None.
+ *----------------------------------------------------------------------
+ */
 MODULE_SCOPE
 unsigned long TkMacOSXClearPixel(
     void)
@@ -186,7 +244,6 @@ SetCGColorComponents(
     NSColor *bgColor, *color = nil;
     CGFloat rgba[4] = {0, 0, 0, 1};
     static Bool initialized = 0;
-    NSString *selector;
     if (!sRGB) {
 	sRGB = [NSColorSpace sRGBColorSpace];
     }
diff --git a/macosx/tkMacOSXPort.h b/macosx/tkMacOSXPort.h
index b81455c..8d92601 100644
--- a/macosx/tkMacOSXPort.h
+++ b/macosx/tkMacOSXPort.h
@@ -163,7 +163,8 @@
 /*
  * Used by xcolor.c
  */
-
+MODULE_SCOPE unsigned long TkMacOSXRGBPixel(unsigned long red, unsigned long green,
+					    unsigned long blue);
 #define TkpGetPixel(p) (TkMacOSXRGBPixel(p->red, p->green, p->blue))
 
 #endif /* _TKMACPORT */
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h
index 8ba7541..ceca8f8 100644
--- a/macosx/tkMacOSXPrivate.h
+++ b/macosx/tkMacOSXPrivate.h
@@ -310,8 +310,6 @@ MODULE_SCOPE unsigned   TkMacOSXAddVirtual(unsigned int keycode);
 MODULE_SCOPE void       TkMacOSXWinNSBounds(TkWindow *winPtr, NSView *view,
 					    NSRect *bounds);
 MODULE_SCOPE void	TkMacOSXDrawAllViews(ClientData clientData);
-MODULE_SCOPE unsigned long TkMacOSXRGBPixel(unsigned int red, unsigned int green,
-					    unsigned int blue);
 MODULE_SCOPE unsigned long TkMacOSXClearPixel(void);
 
 #pragma mark Private Objective-C Classes
-- 
cgit v0.12


From c640e7311ee1bb1794a76c03caafc60f8e3a461e Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Wed, 29 Jul 2020 21:20:42 +0000
Subject: Clean up a few more things.

---
 macosx/tkMacOSXColor.c | 181 ++++++++++++++++++++++++-------------------------
 1 file changed, 88 insertions(+), 93 deletions(-)

diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index dd51a66..3e8e065 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -146,18 +146,18 @@ unsigned long TkMacOSXClearPixel(
  *
  * Results:
 
- *	Returns false if the code is out of bounds.
+ *	A pointer to a SystemColorMapEntry, or NULL if the pixel value is
+ *	invalid.
  *
  * Side effects:
- *	None.
+ *	None
  *
  *----------------------------------------------------------------------
  */
 
-static bool
+SystemColorMapEntry*
 GetEntryFromPixel(
-    unsigned long pixel,
-    SystemColorMapEntry *entry)
+    unsigned long pixel)
 {
     MacPixel p;
  // Should make sure this is the rgbColor index, even if the data gets shuffled.
@@ -168,10 +168,9 @@ GetEntryFromPixel(
 	index = p.pixel.value;
     }
     if (index < systemColorMapSize) {
-	*entry = *systemColorIndex[index];
-	return true;
+	return systemColorIndex[index];
     } else {
-	return false;
+	return NULL;
     }
 }
 
@@ -185,8 +184,13 @@ GetEntryFromPixel(
  *      the color is of type rgbColor.  In that case the normalized XColor RGB
  *      values are copied into the CGColorRef.
  *
+ *      In 64 bit macOS systems there are no HITheme functions which convert
+ *      HIText or HIBackground colors to CGColors.  (GetThemeTextColor was
+ *      removed, and it was never possible with backgrounds.)  If we get one of
+ *      these we return black.
+ *
  * Results:
- *	OSStatus
+ *	True if the function succeeds, false otherwise.
  *
  * Side effects:
  *	None.
@@ -194,70 +198,28 @@ GetEntryFromPixel(
  *----------------------------------------------------------------------
  */
 
-/*
- * Definitions to prevent compiler warnings about nonexistent properties of NSColor.
- */
-
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
- #define LABEL_COLOR labelColor
-#else
- #define LABEL_COLOR textColor
-#endif
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101200
- #define LINK_COLOR linkColor
-#else
- #define LINK_COLOR blueColor
-#endif
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
  #define CONTROL_ACCENT_COLOR controlAccentColor
 #else
  #define CONTROL_ACCENT_COLOR colorForControlTint:[NSColor currentControlTint]
 #endif
 
-/*
- * Apple claims that linkColor is available in 10.10 but the declaration
- * does not appear in NSColor.h until later.  Declaring it in a category
- * appears to be harmless and stops the compiler warnings. 
- */
-
-@interface NSColor(TkColor)
-#if MAC_OS_X_VERSION_MAX_ALLOWED > 101200
-@property(class, strong, readonly) NSColor *linkColor;
-#elif MAC_OS_X_VERSION_MAX_ALLOWED > 1080
-@property(strong, readonly) NSColor *linkColor;
-#else
-@property(assign, readonly) NSColor *linkColor;
-#endif
-@end
-
 static NSColorSpace* sRGB = NULL;
 static CGFloat windowBackground[4] =
     {236.0 / 255, 236.0 / 255, 236.0 / 255, 1.0};
 
-static OSStatus
-SetCGColorComponents(
-    SystemColorMapEntry entry,
+static void
+GetRGBA(
+    SystemColorMapEntry *entry,
     unsigned long pixel,
-    CGColorRef *c)
+    CGFloat *rgba)
 {
-    OSStatus err = noErr;
     NSColor *bgColor, *color = nil;
-    CGFloat rgba[4] = {0, 0, 0, 1};
-    static Bool initialized = 0;
+
     if (!sRGB) {
 	sRGB = [NSColorSpace sRGBColorSpace];
     }
-
-    /*
-     * This function is called before our autorelease pool is set up,
-     * so it needs its own pool.
-     */
-
-    NSAutoreleasePool *pool = [NSAutoreleasePool new];
-    switch (entry.type) {
-    case HIBrush:
-	err = ChkErr(HIThemeBrushCreateCGColor, entry.value, c);
-	return err;
+    switch (entry->type) {
     case rgbColor:
 	rgba[0] = ((pixel >> 16) & 0xff) / 255.0;
 	rgba[1] = ((pixel >>  8) & 0xff) / 255.0;
@@ -280,36 +242,48 @@ SetCGColorComponents(
 	}
 	if (rgba[0] + rgba[1] + rgba[2] < 1.5) {
 	    for (int i=0; i<3; i++) {
-		rgba[i] += entry.value*8.0 / 255.0;
+		rgba[i] += entry->value*8.0 / 255.0;
 	    }
 	} else {
 	    for (int i=0; i<3; i++) {
-		rgba[i] -= entry.value*8.0 / 255.0;
+		rgba[i] -= entry->value*8.0 / 255.0;
 	    }
 	}
 	break;
     case semantic:
-	color = [[NSColor valueForKey:entry.selector] colorUsingColorSpace:sRGB];	
+	color = [[NSColor valueForKey:entry->selector] colorUsingColorSpace:sRGB];	
 	[color getComponents: rgba];
 	break;
     case clearColor:
-	rgba[3]	= 0.0;
+	rgba[3] = 0;
+    default:
 	break;
+    }
+}
+	       
+static Bool
+SetCGColorComponents(
+    SystemColorMapEntry *entry,
+    unsigned long pixel,
+    CGColorRef *c)
+{
+    CGFloat rgba[4] = {0, 0, 0, 1};
 
     /*
-     * There are no HITheme functions which convert Text or background colors
-     * to CGColors.  (GetThemeTextColor has been removed, and it was never
-     * possible with backgrounds.)  If we get one of these we return black.
+     * This function is called before our autorelease pool is set up,
+     * so it needs its own pool.
      */
 
-    case HIText:
-    case HIBackground:
-    default:
-	break;
+    NSAutoreleasePool *pool = [NSAutoreleasePool new];
+
+    if (entry->type == HIBrush) {
+     	OSStatus err = ChkErr(HIThemeBrushCreateCGColor, entry->value, c);
+     	return err == noErr;
     }
+    GetRGBA(entry, pixel, rgba);
     *c = CGColorCreate(sRGB.CGColorSpace, rgba);
     [pool drain];
-    return err;
+    return true;
 }
 
 /*
@@ -359,14 +333,13 @@ TkMacOSXInDarkMode(Tk_Window tkwin)
  *
  * TkSetMacColor --
  *
- *	Sets the components of a CGColorRef from an XColor pixel value.
- *      XXXX The high order byte of the pixel value is used as an index into
- *      the system color table, and then SetCGColorComponents is called
- *      with the table entry and the pixel value.
+ *	Sets the components of a CGColorRef from an XColor pixel value.  The
+ *      pixel value is used to look up the color in the system color table, and
+ *      then SetCGColorComponents is called with the table entry and the pixel
+ *      value.
  *
  * Results:
- *      Returns false if the high order byte is not a valid index, true
- *	otherwise.
+ *      Returns false if the color is not found, true otherwise.
  *
  * Side effects:
  *	The variable macColor is set to a new CGColorRef, the caller is
@@ -381,13 +354,13 @@ TkSetMacColor(
     void *macColor)			/* CGColorRef to modify. */
 {
     CGColorRef *color = (CGColorRef*)macColor;
-    OSStatus err = -1;
-    SystemColorMapEntry entry;
+    SystemColorMapEntry *entry = GetEntryFromPixel(pixel);
 
-    if (GetEntryFromPixel(pixel, &entry)) {
-	err = ChkErr(SetCGColorComponents, entry, pixel, color);
+    if (entry) {
+	return SetCGColorComponents(entry, pixel, color);
+    } else {
+	return false;
     }
-    return (err == noErr);
 }
 
 /*
@@ -566,33 +539,32 @@ TkMacOSXSetColorInContext(
 {
     OSStatus err = noErr;
     CGColorRef cgColor = nil;
-    SystemColorMapEntry entry;
+    SystemColorMapEntry *entry = GetEntryFromPixel(pixel);
     CGRect rect;
     HIThemeBackgroundDrawInfo info = {0, kThemeStateActive, 0};;
 
-    if (!cgColor && GetEntryFromPixel(pixel, &entry)) {
-	switch (entry.type) {
+    if (entry) {
+	switch (entry->type) {
 	case HIBrush:
-	    err = ChkErr(HIThemeSetFill, entry.value, NULL, context,
+	    err = ChkErr(HIThemeSetFill, entry->value, NULL, context,
 		    kHIThemeOrientationNormal);
 	    if (err == noErr) {
-		err = ChkErr(HIThemeSetStroke, entry.value, NULL, context,
+		err = ChkErr(HIThemeSetStroke, entry->value, NULL, context,
 			kHIThemeOrientationNormal);
 	    }
 	    break;
 	case HIText:
-	    err = ChkErr(HIThemeSetTextFill, entry.value, NULL, context,
+	    err = ChkErr(HIThemeSetTextFill, entry->value, NULL, context,
 		    kHIThemeOrientationNormal);
 	    break;
 	case HIBackground:
-	    info.kind = entry.value;
+	    info.kind = entry->value;
 	    rect = CGContextGetClipBoundingBox(context);
 	    err = ChkErr(HIThemeApplyBackground, &rect, &info,
 		    context, kHIThemeOrientationNormal);
 	    break;
 	default:
-	    err = ChkErr(SetCGColorComponents, entry, pixel, &cgColor);
-	    if (err == noErr) {
+	    if (SetCGColorComponents(entry, pixel, &cgColor)){
 		SetCachedColor(gc, pixel, cgColor);
 	    }
 	    break;
@@ -608,6 +580,31 @@ TkMacOSXSetColorInContext(
     }
 }
 
+
+/* 
+ * Recompute the red, green and blue values of an XColor from its pixel value.
+ * To do this we need to know which window the color is being used in, so we
+ * can figure out if that window is in dark mode or not.  And we will probably
+ * need to involve drawRect somehow since the correct color values are only
+ * available when a valid graphics context is available.
+ */
+
+MODULE_SCOPE
+void TkMacOSXUpdateXColor(
+    XColor *color,
+    Tk_Window tkwin)
+{
+    MacPixel p;
+    CGFloat rgba[4] = {0, 0, 0, 1};
+    SystemColorMapEntry *entry = GetEntryFromPixel(color->pixel);
+
+    p.ulong = color->pixel;
+    if (p.pixel.colortype == semantic || p.pixel.colortype == ttkBackground) {
+	printf("Updating %s in window %s for %s Mode\n",
+	       entry->name, Tk_PathName(tkwin),
+	       TkMacOSXInDarkMode(tkwin) ? "Dark" : "Light");
+    }
+}
 /*
  *----------------------------------------------------------------------
  *
@@ -655,11 +652,9 @@ TkpGetColor(
 	hPtr = Tcl_FindHashEntry(&systemColorMap, name + 6);
 	if (hPtr != NULL) {
 	    entry = (SystemColorMapEntry *)Tcl_GetHashValue(hPtr);
-	    OSStatus err;
 	    CGColorRef c;
-	    unsigned char pixelCode = entry->index;
-	    err = ChkErr(SetCGColorComponents, *entry, 0, &c);
-	    if (err == noErr) {
+	    unsigned int pixelCode = entry->index;
+	    if (SetCGColorComponents(entry, 0, &c)) {
 		MacPixel p;
 
 		const size_t n = CGColorGetNumberOfComponents(c);
-- 
cgit v0.12


From 52a5bc561398bf552709b4ab92c8588d2d66f800 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Thu, 30 Jul 2020 20:32:44 +0000
Subject: Change terminology.  Keep separate TkColors for light and dark mode.

---
 macosx/tkMacOSXColor.c | 62 ++++++++++++++++++++++++++------------------------
 macosx/tkMacOSXColor.h |  4 ++--
 2 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index 3e8e065..6c43e33 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -18,14 +18,14 @@
 #include "tkColor.h"
 #include "tkMacOSXColor.h"
 
-static Tcl_HashTable systemColorMap;
-static int systemColorMapSize;
-SystemColorMapEntry **systemColorIndex;
+static Tcl_HashTable systemColors;
+static int numSystemColors;
+SystemColorDatum **systemColorIndex;
 
 void initColorTable()
 {
-    Tcl_InitHashTable(&systemColorMap, TCL_STRING_KEYS);
-    SystemColorMapEntry *entry, *oldEntry;
+    Tcl_InitHashTable(&systemColors, TCL_STRING_KEYS);
+    SystemColorDatum *entry, *oldEntry;
     Tcl_HashSearch search;
     Tcl_HashEntry *hPtr;
     int newPtr, index = 0;
@@ -34,8 +34,8 @@ void initColorTable()
      * Build a hash table for looking up a color by its name.
      */
     
-    for (entry = systemColorMapData; entry->name != NULL; entry++) {
-	hPtr = Tcl_CreateHashEntry(&systemColorMap, entry->name, &newPtr);
+    for (entry = systemColorData; entry->name != NULL; entry++) {
+	hPtr = Tcl_CreateHashEntry(&systemColors, entry->name, &newPtr);
 	if (entry->type == semantic) {
 	    NSString *selector = [[NSString alloc]
 				   initWithCString:entry->macName
@@ -51,7 +51,7 @@ void initColorTable()
 	    entry->selector = selector;
 	}
 	if (newPtr == 0) {
-	    oldEntry = (SystemColorMapEntry *) Tcl_GetHashValue(hPtr);
+	    oldEntry = (SystemColorDatum *) Tcl_GetHashValue(hPtr);
 	    entry->index = oldEntry->index;
 	} else {
 	    entry->index = index++;
@@ -63,11 +63,11 @@ void initColorTable()
      * Build an array for looking up a color by its index.
      */
     
-    systemColorMapSize = index;
-    systemColorIndex = ckalloc(systemColorMapSize * sizeof(SystemColorMapEntry*));
-    for (hPtr = Tcl_FirstHashEntry(&systemColorMap, &search); hPtr != NULL;
+    numSystemColors = index;
+    systemColorIndex = ckalloc(numSystemColors * sizeof(SystemColorDatum*));
+    for (hPtr = Tcl_FirstHashEntry(&systemColors, &search); hPtr != NULL;
 	 hPtr = Tcl_NextHashEntry(&search)) {
-	entry = (SystemColorMapEntry *) Tcl_GetHashValue(hPtr);
+	entry = (SystemColorDatum *) Tcl_GetHashValue(hPtr);
 	systemColorIndex[entry->index] = entry;
     }
 }
@@ -142,11 +142,11 @@ unsigned long TkMacOSXClearPixel(
  *
  * GetEntryFromPixel --
  *
- *	Extract a SystemColorMapEntry from the table.
+ *	Extract a SystemColorDatum from the table.
  *
  * Results:
 
- *	A pointer to a SystemColorMapEntry, or NULL if the pixel value is
+ *	A pointer to a SystemColorDatum, or NULL if the pixel value is
  *	invalid.
  *
  * Side effects:
@@ -155,7 +155,7 @@ unsigned long TkMacOSXClearPixel(
  *----------------------------------------------------------------------
  */
 
-SystemColorMapEntry*
+SystemColorDatum*
 GetEntryFromPixel(
     unsigned long pixel)
 {
@@ -167,7 +167,7 @@ GetEntryFromPixel(
     if (p.pixel.colortype != rgbColor) {
 	index = p.pixel.value;
     }
-    if (index < systemColorMapSize) {
+    if (index < numSystemColors) {
 	return systemColorIndex[index];
     } else {
 	return NULL;
@@ -210,7 +210,7 @@ static CGFloat windowBackground[4] =
 
 static void
 GetRGBA(
-    SystemColorMapEntry *entry,
+    SystemColorDatum *entry,
     unsigned long pixel,
     CGFloat *rgba)
 {
@@ -263,7 +263,7 @@ GetRGBA(
 	       
 static Bool
 SetCGColorComponents(
-    SystemColorMapEntry *entry,
+    SystemColorDatum *entry,
     unsigned long pixel,
     CGColorRef *c)
 {
@@ -354,7 +354,7 @@ TkSetMacColor(
     void *macColor)			/* CGColorRef to modify. */
 {
     CGColorRef *color = (CGColorRef*)macColor;
-    SystemColorMapEntry *entry = GetEntryFromPixel(pixel);
+    SystemColorDatum *entry = GetEntryFromPixel(pixel);
 
     if (entry) {
 	return SetCGColorComponents(entry, pixel, color);
@@ -539,7 +539,7 @@ TkMacOSXSetColorInContext(
 {
     OSStatus err = noErr;
     CGColorRef cgColor = nil;
-    SystemColorMapEntry *entry = GetEntryFromPixel(pixel);
+    SystemColorDatum *entry = GetEntryFromPixel(pixel);
     CGRect rect;
     HIThemeBackgroundDrawInfo info = {0, kThemeStateActive, 0};;
 
@@ -595,8 +595,7 @@ void TkMacOSXUpdateXColor(
     Tk_Window tkwin)
 {
     MacPixel p;
-    CGFloat rgba[4] = {0, 0, 0, 1};
-    SystemColorMapEntry *entry = GetEntryFromPixel(color->pixel);
+    SystemColorDatum *entry = GetEntryFromPixel(color->pixel);
 
     p.ulong = color->pixel;
     if (p.pixel.colortype == semantic || p.pixel.colortype == ttkBackground) {
@@ -610,15 +609,18 @@ void TkMacOSXUpdateXColor(
  *
  * TkpGetColor --
  *
- *	Allocate a new TkColor for the color with the given name.
+ *	Create a new TkColor for the color with the given name. The colormap
+ *      field is set to 1 if passed a window with a LightAqua appearance or 2
+ *      if passed a window with a DarkAqua appearance.  These will be managed
+ *      separately in the per-display table of TkColors maintained by Tk.  This
+ *      function is called by Tk_Color.
  *
  * Results:
  *	Returns a newly allocated TkColor, or NULL on failure.
  *
  * Side effects:
- *	May invalidate the colormap cache associated with tkwin upon
- *	allocating a new colormap entry. Allocates a new TkColor
- *	structure.
+ *       
+ *	Allocates memory for the TkColor structure.
  *
  *----------------------------------------------------------------------
  */
@@ -630,7 +632,7 @@ TkpGetColor(
 				 * suitable for passing to XParseColor). */
 {
     Display *display = tkwin != None ? Tk_Display(tkwin) : NULL;
-    Colormap colormap = tkwin!= None ? Tk_Colormap(tkwin) : None;
+    Colormap colormap = tkwin!= None ? 1 + TkMacOSXInDarkMode(tkwin) : None;
     TkColor *tkColPtr;
     XColor color;
     static Bool initialized = NO;
@@ -648,10 +650,10 @@ TkpGetColor(
 
     if (strncasecmp(name, "system", 6) == 0) {
 	Tcl_HashEntry *hPtr = NULL;
-	SystemColorMapEntry *entry;
-	hPtr = Tcl_FindHashEntry(&systemColorMap, name + 6);
+	SystemColorDatum *entry;
+	hPtr = Tcl_FindHashEntry(&systemColors, name + 6);
 	if (hPtr != NULL) {
-	    entry = (SystemColorMapEntry *)Tcl_GetHashValue(hPtr);
+	    entry = (SystemColorDatum *)Tcl_GetHashValue(hPtr);
 	    CGColorRef c;
 	    unsigned int pixelCode = entry->index;
 	    if (SetCGColorComponents(entry, 0, &c)) {
diff --git a/macosx/tkMacOSXColor.h b/macosx/tkMacOSXColor.h
index a4acc08..7675037 100644
--- a/macosx/tkMacOSXColor.h
+++ b/macosx/tkMacOSXColor.h
@@ -66,9 +66,9 @@ typedef struct {
     char *macName;
     NSString *selector;  /* Filled in if used. */
     int index;           /* Filled in when the hash table is constructed. */
-} SystemColorMapEntry;
+} SystemColorDatum;
 
-static SystemColorMapEntry systemColorMapData[] = {
+static SystemColorDatum systemColorData[] = {
 {"Pixel",				rgbColor, 0 },     /* This must be first. */
 {"Transparent",				clearColor,   0 },
 
-- 
cgit v0.12


From 41650692a4d8914df2e78b8bb957e16676cb12e8 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Fri, 31 Jul 2020 15:00:49 +0000
Subject: Make winfo rgb work correctly with the light and dark colormaps

---
 macosx/tkMacOSXColor.c | 95 ++++++++++++++++++++++++++++++++------------------
 macosx/tkMacOSXColor.h | 34 +++++++++++++-----
 2 files changed, 87 insertions(+), 42 deletions(-)

diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index 6c43e33..e67cbf7 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -20,7 +20,10 @@
 
 static Tcl_HashTable systemColors;
 static int numSystemColors;
-SystemColorDatum **systemColorIndex;
+static int rgbColorIndex;
+static SystemColorDatum **systemColorIndex;
+static NSAppearance *darkAqua;
+static NSAppearance *lightAqua;
 
 void initColorTable()
 {
@@ -29,6 +32,8 @@ void initColorTable()
     Tcl_HashSearch search;
     Tcl_HashEntry *hPtr;
     int newPtr, index = 0;
+    darkAqua = [NSAppearance appearanceNamed:NSAppearanceNameDarkAqua];
+    lightAqua = [NSAppearance appearanceNamed:NSAppearanceNameAqua];
 
     /*
      * Build a hash table for looking up a color by its name.
@@ -37,22 +42,19 @@ void initColorTable()
     for (entry = systemColorData; entry->name != NULL; entry++) {
 	hPtr = Tcl_CreateHashEntry(&systemColors, entry->name, &newPtr);
 	if (entry->type == semantic) {
-	    NSString *selector = [[NSString alloc]
+	    NSString *colorName = [[NSString alloc]
 				   initWithCString:entry->macName
 					  encoding:NSUTF8StringEncoding];
-	    /*
-	     * Ignore this entry if NSColor does not recognize it.
-	     */
-	    
-	    if (![NSColor respondsToSelector: NSSelectorFromString(selector)]) {
+	    SEL colorSelector = NSSelectorFromString(colorName);
+	    if (![NSColor respondsToSelector:colorSelector]) {
 		continue;
 	    }
-	    [selector retain];
-	    entry->selector = selector;
+	    entry->selector = [colorName retain];
 	}
 	if (newPtr == 0) {
 	    oldEntry = (SystemColorDatum *) Tcl_GetHashValue(hPtr);
 	    entry->index = oldEntry->index;
+	    [oldEntry->selector release];
 	} else {
 	    entry->index = index++;
 	}
@@ -62,7 +64,7 @@ void initColorTable()
     /*
      * Build an array for looking up a color by its index.
      */
-    
+
     numSystemColors = index;
     systemColorIndex = ckalloc(numSystemColors * sizeof(SystemColorDatum*));
     for (hPtr = Tcl_FirstHashEntry(&systemColors, &search); hPtr != NULL;
@@ -70,6 +72,14 @@ void initColorTable()
 	entry = (SystemColorDatum *) Tcl_GetHashValue(hPtr);
 	systemColorIndex[entry->index] = entry;
     }
+
+    /*
+     * Remember the index of the rgbColor entry,
+     */
+    
+    hPtr = Tcl_FindHashEntry(&systemColors, "Pixel");
+    entry = (SystemColorDatum *) Tcl_GetHashValue(hPtr);
+    rgbColorIndex = entry->index;
 }
 
 /*
@@ -160,8 +170,7 @@ GetEntryFromPixel(
     unsigned long pixel)
 {
     MacPixel p;
- // Should make sure this is the rgbColor index, even if the data gets shuffled.
-    unsigned int index = 0;
+    unsigned int index = rgbColorIndex;
 
     p.ulong = pixel;
     if (p.pixel.colortype != rgbColor) {
@@ -214,7 +223,7 @@ GetRGBA(
     unsigned long pixel,
     CGFloat *rgba)
 {
-    NSColor *bgColor, *color = nil;
+    NSColor *bgColor, *color;
 
     if (!sRGB) {
 	sRGB = [NSColorSpace sRGBColorSpace];
@@ -251,7 +260,7 @@ GetRGBA(
 	}
 	break;
     case semantic:
-	color = [[NSColor valueForKey:entry->selector] colorUsingColorSpace:sRGB];	
+        color = [[NSColor valueForKey:entry->selector] colorUsingColorSpace:sRGB];
 	[color getComponents: rgba];
 	break;
     case clearColor:
@@ -308,7 +317,6 @@ TkMacOSXInDarkMode(Tk_Window tkwin)
     int result = false;
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
-    static NSAppearanceName darkAqua = @"NSAppearanceNameDarkAqua";
 
     if ([NSApp macOSVersion] >= 101400) {
         TkWindow *winPtr = (TkWindow*) tkwin;
@@ -317,10 +325,9 @@ TkMacOSXInDarkMode(Tk_Window tkwin)
 	    view = TkMacOSXDrawableView(winPtr->privatePtr);
 	}
 	if (view) {
-	    result = [view.effectiveAppearance.name isEqualToString:darkAqua];
+	    result = (view.effectiveAppearance.name == NSAppearanceNameDarkAqua); 
 	} else {
-	    result = [[NSAppearance currentAppearance].name
-			 isEqualToString:darkAqua];
+	    result = ([NSAppearance currentAppearance].name == NSAppearanceNameDarkAqua);
 	}
     }
 #endif
@@ -631,34 +638,59 @@ TkpGetColor(
     Tk_Uid name)		/* Name of color to be allocated (in form
 				 * suitable for passing to XParseColor). */
 {
-    Display *display = tkwin != None ? Tk_Display(tkwin) : NULL;
-    Colormap colormap = tkwin!= None ? 1 + TkMacOSXInDarkMode(tkwin) : None;
+    Display *display = NULL;
+    Colormap colormap = noColormap;
     TkColor *tkColPtr;
     XColor color;
     static Bool initialized = NO;
     static NSColorSpace* sRGB = NULL;
+
     if (!initialized) {
 	initialized = YES;
 	sRGB = [NSColorSpace sRGBColorSpace];
 	initColorTable();
     }
 
+    if (tkwin) {
+	display = Tk_Display(tkwin);
+	colormap = TkMacOSXInDarkMode(tkwin) ? darkColormap : lightColormap;
+    }
+
     /*
-     * Check to see if this is a system color. Otherwise, XParseColor
-     * will do all the work.
+     * Check to see if this is a system color. If not, just call XParseColor.
      */
 
     if (strncasecmp(name, "system", 6) == 0) {
-	Tcl_HashEntry *hPtr = NULL;
-	SystemColorDatum *entry;
-	hPtr = Tcl_FindHashEntry(&systemColors, name + 6);
+	Tcl_HashEntry *hPtr = Tcl_FindHashEntry(&systemColors, name + 6);
+	MacPixel p;
+
 	if (hPtr != NULL) {
-	    entry = (SystemColorDatum *)Tcl_GetHashValue(hPtr);
+	    SystemColorDatum *entry = (SystemColorDatum *)Tcl_GetHashValue(hPtr);
 	    CGColorRef c;
-	    unsigned int pixelCode = entry->index;
-	    if (SetCGColorComponents(entry, 0, &c)) {
-		MacPixel p;
 
+	    p.pixel.colortype = entry->type;
+	    p.pixel.value = entry->index;
+	    color.pixel = p.ulong;
+	    if (entry->type == semantic) {
+		CGFloat rgba[4];
+		NSAppearance *savedAppearance = [NSAppearance currentAppearance];
+		switch(colormap) {
+		case lightColormap:
+		    [NSAppearance setCurrentAppearance:lightAqua];
+		    break;
+		case darkColormap:
+		    [NSAppearance setCurrentAppearance:darkAqua];
+		    break;
+		default:
+		    break;
+		}
+		GetRGBA(entry, p.ulong, rgba);
+		color.red   = rgba[0] * 65535.0;
+		color.green = rgba[1] * 65535.0;
+		color.blue  = rgba[2] * 65535.0;
+		[NSAppearance setCurrentAppearance:savedAppearance];
+		goto validXColor;
+	    } else if (SetCGColorComponents(entry, 0, &c)) {
 		const size_t n = CGColorGetNumberOfComponents(c);
 		const CGFloat *rgba = CGColorGetComponents(c);
 
@@ -674,16 +706,12 @@ TkpGetColor(
 		default:
 		    Tcl_Panic("CGColor with %d components", (int) n);
 		}
-		p.pixel.value = pixelCode;
-		p.pixel.colortype = entry->type;
-		color.pixel = p.ulong;
 		CGColorRelease(c);
 		goto validXColor;
 	    }
 	    CGColorRelease(c);
 	}
     }
-
     if (TkParseColor(display, colormap, name, &color) == 0) {
 	return NULL;
     }
@@ -691,7 +719,6 @@ TkpGetColor(
 validXColor:
     tkColPtr = ckalloc(sizeof(TkColor));
     tkColPtr->color = color;
-
     return tkColPtr;
 }
 
diff --git a/macosx/tkMacOSXColor.h b/macosx/tkMacOSXColor.h
index 7675037..9cbe8a3 100644
--- a/macosx/tkMacOSXColor.h
+++ b/macosx/tkMacOSXColor.h
@@ -55,6 +55,17 @@ typedef union MacPixel_t {
 } MacPixel;
 
 /*
+ * We maintain two colormaps, one for the LightAqua appearance and one for the
+ * DarkAqua appearance.
+ */
+
+enum macColormap {
+    noColormap,
+    lightColormap,
+    darkColormap,
+};
+    
+/*
  * In TkMacOSXColor.c a Tk hash table is constructed from the static data
  * below to map system color names to CGColors.
  */ 
@@ -62,17 +73,17 @@ typedef union MacPixel_t {
 typedef struct {
     const char *name;
     enum colorType type;
-    long value;
+    int value;
     char *macName;
-    NSString *selector;  /* Filled in if used. */
-    int index;           /* Filled in when the hash table is constructed. */
+    /* Fields below are filled in after or during construction of the hash table. */
+    int index;
+    NSString *selector;
 } SystemColorDatum;
 
 static SystemColorDatum systemColorData[] = {
-{"Pixel",				rgbColor, 0 },     /* This must be first. */
+{"Pixel",				rgbColor, 0 },
 {"Transparent",				clearColor,   0 },
 
-
 {"Highlight",				HIBrush,  kThemeBrushPrimaryHighlightColor },
 {"HighlightSecondary",		    	HIBrush,  kThemeBrushSecondaryHighlightColor },
 {"HighlightText",			HIBrush,  kThemeBrushBlack },
@@ -145,9 +156,8 @@ static SystemColorDatum systemColorData[] = {
 {"ListViewEvenRowBackground",		HIBrush,  kThemeBrushListViewEvenRowBackground },
 {"ListViewColumnDivider",		HIBrush,  kThemeBrushListViewColumnDivider },
 
-
-{"ButtonText",				HIText,   kThemeTextColorPushButtonActive },	       
-{"MenuActiveText",			HIText,   kThemeTextColorMenuItemSelected },	       
+{"ButtonText",				HIText,   kThemeTextColorPushButtonActive },	      
+{"MenuActiveText",			HIText,   kThemeTextColorMenuItemSelected },	      
 {"MenuDisabled",			HIText,   kThemeTextColorMenuItemDisabled },	   
 {"MenuText",				HIText,   kThemeTextColorMenuItemActive },	   
 {"BlackText",				HIText,   kThemeTextColorBlack },
@@ -248,3 +258,11 @@ static SystemColorDatum systemColorData[] = {
 };
 
 #endif
+/*
+ * Local Variables:
+ * mode: objc
+ * c-basic-offset: 4
+ * fill-column: 79
+ * coding: utf-8
+ * End:
+ */
-- 
cgit v0.12


From ec1fbf2bb9c415c33579658a7a0ebfffcddc19d1 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Fri, 31 Jul 2020 17:09:38 +0000
Subject: Tidying up a few loose ends.

---
 macosx/tkMacOSXColor.c | 105 +++++++++++++++++++++++++++++++++++--------------
 1 file changed, 76 insertions(+), 29 deletions(-)

diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index e67cbf7..e576dd7 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -21,9 +21,14 @@
 static Tcl_HashTable systemColors;
 static int numSystemColors;
 static int rgbColorIndex;
+static int controlAccentIndex;
+static Bool useFakeAccentColor = NO;
 static SystemColorDatum **systemColorIndex;
 static NSAppearance *darkAqua;
 static NSAppearance *lightAqua;
+static NSColorSpace* sRGB = NULL;
+static CGFloat windowBackground[4] =
+    {236.0 / 255, 236.0 / 255, 236.0 / 255, 1.0};
 
 void initColorTable()
 {
@@ -47,7 +52,11 @@ void initColorTable()
 					  encoding:NSUTF8StringEncoding];
 	    SEL colorSelector = NSSelectorFromString(colorName);
 	    if (![NSColor respondsToSelector:colorSelector]) {
-		continue;
+		if ([colorName isEqualToString:@"controlAccentColor"]) {
+		    useFakeAccentColor = YES;
+		} else {
+		    continue;
+		}
 	    }
 	    entry->selector = [colorName retain];
 	}
@@ -74,12 +83,15 @@ void initColorTable()
     }
 
     /*
-     * Remember the index of the rgbColor entry,
+     * Remember the indexes of some special entries.
      */
     
     hPtr = Tcl_FindHashEntry(&systemColors, "Pixel");
     entry = (SystemColorDatum *) Tcl_GetHashValue(hPtr);
     rgbColorIndex = entry->index;
+    hPtr = Tcl_FindHashEntry(&systemColors, "ControlAccentColor");
+    entry = (SystemColorDatum *) Tcl_GetHashValue(hPtr);
+    controlAccentIndex = entry->index;
 }
 
 /*
@@ -155,7 +167,6 @@ unsigned long TkMacOSXClearPixel(
  *	Extract a SystemColorDatum from the table.
  *
  * Results:
-
  *	A pointer to a SystemColorDatum, or NULL if the pixel value is
  *	invalid.
  *
@@ -183,40 +194,27 @@ GetEntryFromPixel(
     }
 }
 
+
 /*
  *----------------------------------------------------------------------
  *
- * SetCGColorComponents --
- *
- *	Set the components of a CGColorRef from an XColor pixel value and a
- *      system color map entry.  The pixel value is only used in the case where
- *      the color is of type rgbColor.  In that case the normalized XColor RGB
- *      values are copied into the CGColorRef.
+ * GetRGB --
  *
- *      In 64 bit macOS systems there are no HITheme functions which convert
- *      HIText or HIBackground colors to CGColors.  (GetThemeTextColor was
- *      removed, and it was never possible with backgrounds.)  If we get one of
- *      these we return black.
+ *	Given a SystemColorDatum and a pointer to an array of 4 CGFloats, store
+ *      the associated RGBA color values in the array.  In the case of the
+ *      RGBColor datum, the unsigned long pixel value containing the RGB values
+ *      must also be provided as the pixel parameter.  Otherwise the pixel
+ *      parameter is ignored.
  *
  * Results:
- *	True if the function succeeds, false otherwise.
+ *	None
  *
  * Side effects:
- *	None.
+ *	The array rgba is filled in.
  *
  *----------------------------------------------------------------------
  */
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
- #define CONTROL_ACCENT_COLOR controlAccentColor
-#else
- #define CONTROL_ACCENT_COLOR colorForControlTint:[NSColor currentControlTint]
-#endif
-
-static NSColorSpace* sRGB = NULL;
-static CGFloat windowBackground[4] =
-    {236.0 / 255, 236.0 / 255, 236.0 / 255, 1.0};
-
 static void
 GetRGBA(
     SystemColorDatum *entry,
@@ -242,7 +240,7 @@ GetRGBA(
 	 */
 
 	if ([NSApp macOSVersion] < 101400) {
-	    for (int i=0; i<3; i++) {
+	    for (int i = 0; i < 3; i++) {
 		rgba[i] = windowBackground[i];
 	    }
 	} else {
@@ -260,15 +258,65 @@ GetRGBA(
 	}
 	break;
     case semantic:
-        color = [[NSColor valueForKey:entry->selector] colorUsingColorSpace:sRGB];
+	if (entry->index == controlAccentIndex && useFakeAccentColor) {
+	    color = [NSColor colorForControlTint: [NSColor currentControlTint]];
+	} else {
+	    color = [[NSColor valueForKey:entry->selector] colorUsingColorSpace:sRGB];
+	}
 	[color getComponents: rgba];
 	break;
     case clearColor:
 	rgba[3] = 0;
+    case HIText:
+#ifdef __LP64__
+	color = [[NSColor textColor] colorUsingColorSpace:sRGB];
+	[color getComponents: rgba];
+#else
+	{
+	    RGBColor rgb;
+	    err = GetThemeTextColor(kThemeTextColorPushButtonActive, 32, 
+                    true, &rgb);
+	    if (err == noErr) {
+		rgba[0] = (CGFLoat) rgb.red / 65535;
+		rgba[1] = (CGFLoat) rgb.green / 65535;
+		rgba[2] = (CGFLoat) rgb.blue / 65535;
+	    }
+	}
+#endif
+	break;
+    case HIBackground:
+	color = [[NSColor windowBackgroundColor] colorUsingColorSpace:sRGB];
+	[color getComponents: rgba];
+	break;
     default:
 	break;
     }
 }
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * SetCGColorComponents --
+ *
+ *	Set the components of a CGColorRef from an XColor pixel value and a
+ *      system color map entry.  The pixel value is only used in the case where
+ *      the color is of type rgbColor.  In that case the normalized XColor RGB
+ *      values are copied into the CGColorRef.
+ *
+ *      In 64 bit macOS systems there are no HITheme functions which convert
+ *      HIText or HIBackground colors to CGColors.  (GetThemeTextColor was
+ *      removed, and it was never possible with backgrounds.)  On 64-bit systems
+ *      we replace all HIText colors by systemTextColor and all HIBackground
+ *      colors by systemWindowBackgroundColor.
+ *
+ * Results:
+ *	True if the function succeeds, false otherwise.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
 	       
 static Bool
 SetCGColorComponents(
@@ -685,10 +733,10 @@ TkpGetColor(
 		    break;
 		}
 		GetRGBA(entry, p.ulong, rgba);
+		[NSAppearance setCurrentAppearance:savedAppearance];
 		color.red   = rgba[0] * 65535.0;
 		color.green = rgba[1] * 65535.0;
 		color.blue  = rgba[2] * 65535.0;
-		[NSAppearance setCurrentAppearance:savedAppearance];
 		goto validXColor;
 	    } else if (SetCGColorComponents(entry, 0, &c)) {
 		const size_t n = CGColorGetNumberOfComponents(c);
@@ -709,7 +757,6 @@ TkpGetColor(
 		CGColorRelease(c);
 		goto validXColor;
 	    }
-	    CGColorRelease(c);
 	}
     }
     if (TkParseColor(display, colormap, name, &color) == 0) {
-- 
cgit v0.12


From 33c01e381216e12ecd1375775ca7ef7cf332b7d5 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Fri, 31 Jul 2020 18:29:50 +0000
Subject: Fix the build for systems without darkAqua.

---
 macosx/tkMacOSXColor.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index e576dd7..276fa68 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -37,7 +37,9 @@ void initColorTable()
     Tcl_HashSearch search;
     Tcl_HashEntry *hPtr;
     int newPtr, index = 0;
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
     darkAqua = [NSAppearance appearanceNamed:NSAppearanceNameDarkAqua];
+#endif
     lightAqua = [NSAppearance appearanceNamed:NSAppearanceNameAqua];
 
     /*
@@ -722,6 +724,7 @@ TkpGetColor(
 	    if (entry->type == semantic) {
 		CGFloat rgba[4];
 		NSAppearance *savedAppearance = [NSAppearance currentAppearance];
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
 		switch(colormap) {
 		case lightColormap:
 		    [NSAppearance setCurrentAppearance:lightAqua];
@@ -732,6 +735,7 @@ TkpGetColor(
 		default:
 		    break;
 		}
+#endif
 		GetRGBA(entry, p.ulong, rgba);
 		[NSAppearance setCurrentAppearance:savedAppearance];
 		color.red   = rgba[0] * 65535.0;
-- 
cgit v0.12


From f75f4370274d507d9b3488cece85d3e49df019e4 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Fri, 31 Jul 2020 18:44:30 +0000
Subject: Prevent a warning on systems without darkAqua.

---
 macosx/tkMacOSXColor.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index 276fa68..370e8a5 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -24,8 +24,10 @@ static int rgbColorIndex;
 static int controlAccentIndex;
 static Bool useFakeAccentColor = NO;
 static SystemColorDatum **systemColorIndex;
-static NSAppearance *darkAqua;
 static NSAppearance *lightAqua;
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
+static NSAppearance *darkAqua;
+#endif
 static NSColorSpace* sRGB = NULL;
 static CGFloat windowBackground[4] =
     {236.0 / 255, 236.0 / 255, 236.0 / 255, 1.0};
-- 
cgit v0.12


From 76f6c8ed20f1b31eb53111b9ad3363f3998c271c Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Fri, 31 Jul 2020 20:34:29 +0000
Subject: Remove an unused function.  Deal with colors which are not supported
 on older systems (10.9)

---
 macosx/tkMacOSXColor.c | 31 ++++++-------------------------
 macosx/tkMacOSXColor.h |  8 ++++++++
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index 370e8a5..b77adf3 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -1,5 +1,5 @@
 /*
- * tkMacOSXColor.c --
+ * TkMacOSXColor.c --
  *
  *	This file maintains a database of color values for the Tk
  *	toolkit, in order to avoid round-trips to the server to
@@ -59,6 +59,8 @@ void initColorTable()
 		if ([colorName isEqualToString:@"controlAccentColor"]) {
 		    useFakeAccentColor = YES;
 		} else {
+		    /* Uncomment to print all unsupported colors:              */
+		    /* printf("Unsupported color %s\n", colorName.UTF8String); */
 		    continue;
 		}
 	    }
@@ -83,6 +85,9 @@ void initColorTable()
     for (hPtr = Tcl_FirstHashEntry(&systemColors, &search); hPtr != NULL;
 	 hPtr = Tcl_NextHashEntry(&search)) {
 	entry = (SystemColorDatum *) Tcl_GetHashValue(hPtr);
+	if (entry == NULL) {
+	    Tcl_Panic("Unsupported semantic color with no supported backup!");
+	}
 	systemColorIndex[entry->index] = entry;
     }
 
@@ -639,30 +644,6 @@ TkMacOSXSetColorInContext(
     }
 }
 
-
-/* 
- * Recompute the red, green and blue values of an XColor from its pixel value.
- * To do this we need to know which window the color is being used in, so we
- * can figure out if that window is in dark mode or not.  And we will probably
- * need to involve drawRect somehow since the correct color values are only
- * available when a valid graphics context is available.
- */
-
-MODULE_SCOPE
-void TkMacOSXUpdateXColor(
-    XColor *color,
-    Tk_Window tkwin)
-{
-    MacPixel p;
-    SystemColorDatum *entry = GetEntryFromPixel(color->pixel);
-
-    p.ulong = color->pixel;
-    if (p.pixel.colortype == semantic || p.pixel.colortype == ttkBackground) {
-	printf("Updating %s in window %s for %s Mode\n",
-	       entry->name, Tk_PathName(tkwin),
-	       TkMacOSXInDarkMode(tkwin) ? "Dark" : "Light");
-    }
-}
 /*
  *----------------------------------------------------------------------
  *
diff --git a/macosx/tkMacOSXColor.h b/macosx/tkMacOSXColor.h
index 9cbe8a3..82c88c9 100644
--- a/macosx/tkMacOSXColor.h
+++ b/macosx/tkMacOSXColor.h
@@ -80,6 +80,13 @@ typedef struct {
     NSString *selector;
 } SystemColorDatum;
 
+/*
+ * WARNING: Semantic colors which are not supported on all systems must be
+ * preceded by a backup color with the same name which *is* supported.  Systems
+ * which do support the color will replace the backup value when the table is
+ * constructed.  Failing to ensure this will result in a Tcl_Panic abort.
+ */
+
 static SystemColorDatum systemColorData[] = {
 {"Pixel",				rgbColor, 0 },
 {"Transparent",				clearColor,   0 },
@@ -237,6 +244,7 @@ static SystemColorDatum systemColorData[] = {
 
 {"TextColor",			    semantic, 0, "textColor" },
 {"SelectedTextColor",		    semantic, 0, "selectedTextColor" },
+{"LabelColor",			    semantic, 0, "textColor"},
 {"LabelColor",			    semantic, 0, "labelColor"},
 {"ControlTextColor",      	    semantic, 0, "controlTextColor" },
 {"DisabledControlTextColor",	    semantic, 0, "disabledControlTextColor" },
-- 
cgit v0.12


From e6d961299e585273d99aa80444ad9237449c512a Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Fri, 31 Jul 2020 21:10:41 +0000
Subject: Adjust some unixEmbed tests which were failing sporadically.

---
 tests/unixEmbed.test | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/unixEmbed.test b/tests/unixEmbed.test
index 2ebf9c2..428e510 100644
--- a/tests/unixEmbed.test
+++ b/tests/unixEmbed.test
@@ -1238,13 +1238,12 @@ test unixEmbed-10.1 {geometry propagation in tkUnixWm.c/UpdateGeometryInfo} -con
 	deleteWindows
 } -body {
     frame .f1 -container 1 -width 200 -height 50
-    update
     pack .f1
-    update
+    update idletasks
     toplevel .t1 -use [winfo id .f1] -width 150 -height 80
-    update
+    update idletasks
     wm geometry .t1 +40+50
-    update
+    update idletasks
     wm geometry .t1
 } -cleanup {
 	deleteWindows
@@ -1256,10 +1255,11 @@ test unixEmbed-10.2 {geometry propagation in tkUnixWm.c/UpdateGeometryInfo} -con
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
+    update idletasks
     toplevel .t1 -use [winfo id .f1] -width 150 -height 80
-    update
+    update idletasks
     wm geometry .t1 70x300+10+20
-    update
+    update idletasks
     wm geometry .t1
 } -cleanup {
 	deleteWindows
-- 
cgit v0.12


From 0266964e830c47c5a6e12654b8e84378dfe97ca5 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Sat, 1 Aug 2020 16:12:43 +0000
Subject: The colormaps do not fix winfo rgb.  Handle that directly.  And deal
 with Big Sur deprecations.

---
 generic/tkCmds.c             | 16 ++++++++++++++++
 macosx/tkMacOSXColor.c       | 38 ++++++++++++++++++++------------------
 macosx/tkMacOSXConstants.h   |  4 +++-
 macosx/tkMacOSXPort.h        |  3 +++
 macosx/tkMacOSXWindowEvent.c |  7 -------
 5 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/generic/tkCmds.c b/generic/tkCmds.c
index 7f4c49b..1bc4f8c 100644
--- a/generic/tkCmds.c
+++ b/generic/tkCmds.c
@@ -1748,7 +1748,23 @@ Tk_WinfoObjCmd(
 	if (TkGetWindowFromObj(interp, tkwin, objv[2], &tkwin) != TCL_OK) {
 	    return TCL_ERROR;
 	}
+#ifdef TK_HAS_DYNAMIC_COLORS
+
+	/*
+	 * Make sure that the TkColor used for the winfo rgb command is
+	 * destroyed when we are through with it, so we do not get stale RGB
+	 * values next time.
+	 */
+	
+	{
+	    Colormap temp = Tk_Colormap(tkwin);
+	    Tk_Colormap(tkwin) = TK_DYNAMIC_COLORMAP;
+	    colorPtr = Tk_GetColor(interp, tkwin, Tcl_GetString(objv[3]));
+	    Tk_Colormap(tkwin) = temp;
+	}
+#else
 	colorPtr = Tk_GetColor(interp, tkwin, Tcl_GetString(objv[3]));
+#endif
 	if (colorPtr == NULL) {
 	    return TCL_ERROR;
 	}
diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index b77adf3..2a78c97 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -24,9 +24,9 @@ static int rgbColorIndex;
 static int controlAccentIndex;
 static Bool useFakeAccentColor = NO;
 static SystemColorDatum **systemColorIndex;
-static NSAppearance *lightAqua;
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
-static NSAppearance *darkAqua;
+static NSAppearance *lightAqua = nil;
+static NSAppearance *darkAqua = nil;
 #endif
 static NSColorSpace* sRGB = NULL;
 static CGFloat windowBackground[4] =
@@ -41,8 +41,8 @@ void initColorTable()
     int newPtr, index = 0;
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
     darkAqua = [NSAppearance appearanceNamed:NSAppearanceNameDarkAqua];
-#endif
     lightAqua = [NSAppearance appearanceNamed:NSAppearanceNameAqua];
+#endif
 
     /*
      * Build a hash table for looking up a color by its name.
@@ -230,7 +230,7 @@ GetRGBA(
     unsigned long pixel,
     CGFloat *rgba)
 {
-    NSColor *bgColor, *color;
+    NSColor *bgColor, *color = nil;
 
     if (!sRGB) {
 	sRGB = [NSColorSpace sRGBColorSpace];
@@ -268,7 +268,9 @@ GetRGBA(
 	break;
     case semantic:
 	if (entry->index == controlAccentIndex && useFakeAccentColor) {
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 101500
 	    color = [NSColor colorForControlTint: [NSColor currentControlTint]];
+#endif
 	} else {
 	    color = [[NSColor valueForKey:entry->selector] colorUsingColorSpace:sRGB];
 	}
@@ -672,9 +674,9 @@ TkpGetColor(
 				 * suitable for passing to XParseColor). */
 {
     Display *display = NULL;
-    Colormap colormap = noColormap;
     TkColor *tkColPtr;
     XColor color;
+    Colormap colormap = tkwin ? Tk_Colormap(tkwin) : noColormap;
     static Bool initialized = NO;
     static NSColorSpace* sRGB = NULL;
 
@@ -683,10 +685,8 @@ TkpGetColor(
 	sRGB = [NSColorSpace sRGBColorSpace];
 	initColorTable();
     }
-
     if (tkwin) {
 	display = Tk_Display(tkwin);
-	colormap = TkMacOSXInDarkMode(tkwin) ? darkColormap : lightColormap;
     }
 
     /*
@@ -706,21 +706,22 @@ TkpGetColor(
 	    color.pixel = p.ulong;
 	    if (entry->type == semantic) {
 		CGFloat rgba[4];
-		NSAppearance *savedAppearance = [NSAppearance currentAppearance];
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
-		switch(colormap) {
-		case lightColormap:
-		    [NSAppearance setCurrentAppearance:lightAqua];
-		    break;
-		case darkColormap:
-		    [NSAppearance setCurrentAppearance:darkAqua];
-		    break;
-		default:
-		    break;
+		NSAppearance *savedAppearance = [NSAppearance currentAppearance];
+		NSAppearance *windowAppearance; 
+		if (TkMacOSXInDarkMode(tkwin)) {
+		    windowAppearance = darkAqua;
+		    colormap = darkColormap;
+		} else {
+		    windowAppearance = lightAqua;
+		    colormap = lightColormap;
 		}
-#endif
+		[NSAppearance setCurrentAppearance:windowAppearance];
 		GetRGBA(entry, p.ulong, rgba);
 		[NSAppearance setCurrentAppearance:savedAppearance];
+#else
+		GetRGBA(entry, p.ulong, rgba);
+#endif		
 		color.red   = rgba[0] * 65535.0;
 		color.green = rgba[1] * 65535.0;
 		color.blue  = rgba[2] * 65535.0;
@@ -752,6 +753,7 @@ TkpGetColor(
 
 validXColor:
     tkColPtr = ckalloc(sizeof(TkColor));
+    tkColPtr->colormap = colormap;
     tkColPtr->color = color;
     return tkColPtr;
 }
diff --git a/macosx/tkMacOSXConstants.h b/macosx/tkMacOSXConstants.h
index e019ea1..19ffd2c 100644
--- a/macosx/tkMacOSXConstants.h
+++ b/macosx/tkMacOSXConstants.h
@@ -106,6 +106,8 @@ typedef NSInteger NSModalResponse;
 #define graphicsContextWithGraphicsPort graphicsContextWithCGContext
 #endif
 
-
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 110000
+#define NSWindowStyleMaskTexturedBackground 0
 #endif
 
+#endif
diff --git a/macosx/tkMacOSXPort.h b/macosx/tkMacOSXPort.h
index 8d92601..f5c3689 100644
--- a/macosx/tkMacOSXPort.h
+++ b/macosx/tkMacOSXPort.h
@@ -159,10 +159,13 @@
  */
 
 #define TK_NO_DOUBLE_BUFFERING 1
+#define TK_HAS_DYNAMIC_COLORS 1
+#define TK_DYNAMIC_COLORMAP 0x0fffffff
 
 /*
  * Used by xcolor.c
  */
+
 MODULE_SCOPE unsigned long TkMacOSXRGBPixel(unsigned long red, unsigned long green,
 					    unsigned long blue);
 #define TkpGetPixel(p) (TkMacOSXRGBPixel(p->red, p->green, p->blue))
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 5f52ea7..a23a6d7 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -1137,13 +1137,6 @@ ConfigureRestrictProc(
     Tk_QueueWindowEvent((XEvent *) &event, TCL_QUEUE_TAIL);
 }
 
-- (BOOL) isOpaque
-{
-    NSWindow *w = [self window];
-    return (w && (([w styleMask] & NSTexturedBackgroundWindowMask) ||
-		  ![w isOpaque]) ? NO : YES);
-}
-
 /*
  * On Catalina this is never called and drawRect clips to the rect that
  * is passed to it by AppKit.
-- 
cgit v0.12


From 78ff00814bd1260e38a3990c46571c8f5ff94c5d Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Sun, 2 Aug 2020 14:13:58 +0000
Subject: Edit comments

---
 macosx/tkMacOSXColor.c | 77 +++++++++++++++++++++++++++-----------------------
 1 file changed, 41 insertions(+), 36 deletions(-)

diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index 2a78c97..b4347b8 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -9,6 +9,7 @@
  * Copyright (c) 1994-1996 Sun Microsystems, Inc.
  * Copyright 2001-2009, Apple Inc.
  * Copyright (c) 2006-2009 Daniel A. Steffen <das@users.sourceforge.net>
+ * Copyright (c) 2020 Marc Culler
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -47,7 +48,7 @@ void initColorTable()
     /*
      * Build a hash table for looking up a color by its name.
      */
-    
+
     for (entry = systemColorData; entry->name != NULL; entry++) {
 	hPtr = Tcl_CreateHashEntry(&systemColors, entry->name, &newPtr);
 	if (entry->type == semantic) {
@@ -75,7 +76,7 @@ void initColorTable()
 	}
 	Tcl_SetHashValue(hPtr, entry);
     }
-    
+
     /*
      * Build an array for looking up a color by its index.
      */
@@ -94,7 +95,7 @@ void initColorTable()
     /*
      * Remember the indexes of some special entries.
      */
-    
+
     hPtr = Tcl_FindHashEntry(&systemColors, "Pixel");
     entry = (SystemColorDatum *) Tcl_GetHashValue(hPtr);
     rgbColorIndex = entry->index;
@@ -113,7 +114,7 @@ void initColorTable()
  *	intensities.  The inputs are cast as unsigned longs but are
  *      expected to have values representable by an unsigned short
  *      as used in the XColor struct.  These values are divided by
- *      256 tp generate a 24-bit RGB pixel value.
+ *      256 to generate a 24-bit RGB pixel value.
  *
  *      This is called by the TkpGetPixel macro, used in xcolor.c.
  *
@@ -173,7 +174,8 @@ unsigned long TkMacOSXClearPixel(
  *
  * GetEntryFromPixel --
  *
- *	Extract a SystemColorDatum from the table.
+ *	Look up a SystemColorDatum which describes the XColor with
+ *      the specified value as its pixel field.
  *
  * Results:
  *	A pointer to a SystemColorDatum, or NULL if the pixel value is
@@ -285,7 +287,7 @@ GetRGBA(
 #else
 	{
 	    RGBColor rgb;
-	    err = GetThemeTextColor(kThemeTextColorPushButtonActive, 32, 
+	    err = GetThemeTextColor(kThemeTextColorPushButtonActive, 32,
                     true, &rgb);
 	    if (err == noErr) {
 		rgba[0] = (CGFLoat) rgb.red / 65535;
@@ -310,9 +312,10 @@ GetRGBA(
  * SetCGColorComponents --
  *
  *	Set the components of a CGColorRef from an XColor pixel value and a
- *      system color map entry.  The pixel value is only used in the case where
+ *      SystemColorDatum.  The pixel value is only used in the case where
  *      the color is of type rgbColor.  In that case the normalized XColor RGB
- *      values are copied into the CGColorRef.
+ *      values are copied into the CGColorRef.  Otherwise the components are
+ *      computed from the SystemColorDatum.
  *
  *      In 64 bit macOS systems there are no HITheme functions which convert
  *      HIText or HIBackground colors to CGColors.  (GetThemeTextColor was
@@ -328,7 +331,7 @@ GetRGBA(
  *
  *----------------------------------------------------------------------
  */
-	       
+
 static Bool
 SetCGColorComponents(
     SystemColorDatum *entry,
@@ -384,7 +387,7 @@ TkMacOSXInDarkMode(Tk_Window tkwin)
 	    view = TkMacOSXDrawableView(winPtr->privatePtr);
 	}
 	if (view) {
-	    result = (view.effectiveAppearance.name == NSAppearanceNameDarkAqua); 
+	    result = (view.effectiveAppearance.name == NSAppearanceNameDarkAqua);
 	} else {
 	    result = ([NSAppearance currentAppearance].name == NSAppearanceNameDarkAqua);
 	}
@@ -547,9 +550,10 @@ TkMacOSXCreateCGColor(
  * TkMacOSXGetNSColor --
  *
  *	Creates an autoreleased NSColor from a X style pixel value.
+ *      The return value is nil if the pixel value is invalid.
  *
  * Results:
- *	Returns nil if not a real pixel, NSColor* otherwise.
+ *	A possibly nil pointer to an NSColor.
  *
  * Side effects:
  *	None
@@ -583,10 +587,9 @@ TkMacOSXGetNSColor(
  *
  * TkMacOSXSetColorInContext --
  *
- *	Sets fill and stroke color in the given CG context from an X
- *	pixel value, or if the pixel code indicates a system color,
- *	sets the corresponding brush, textColor or background via
- *	HITheme APIs if available or Appearance mgr APIs.
+ *	Sets the fill and stroke colors in the given CGContext to the CGColor
+ *	which corresponds to the XColor having the specified value for its pixel
+ *	field.
  *
  * Results:
  *	None.
@@ -651,17 +654,19 @@ TkMacOSXSetColorInContext(
  *
  * TkpGetColor --
  *
- *	Create a new TkColor for the color with the given name. The colormap
- *      field is set to 1 if passed a window with a LightAqua appearance or 2
- *      if passed a window with a DarkAqua appearance.  These will be managed
- *      separately in the per-display table of TkColors maintained by Tk.  This
- *      function is called by Tk_Color.
+ *	Create a new TkColor for the color with the given name, for use in the
+ *      specified window. The colormap field is set to lightColormap if the
+ *      window has a LightAqua appearance, or darkColormap if the window has a
+ *      DarkAqua appearance.  TkColors with different colormaps are managed
+ *      separately in the per-display table of TkColors maintained by Tk.
+ *
+ *      This function is called by Tk_GetColor.
  *
  * Results:
  *	Returns a newly allocated TkColor, or NULL on failure.
  *
  * Side effects:
- *       
+ *
  *	Allocates memory for the TkColor structure.
  *
  *----------------------------------------------------------------------
@@ -708,7 +713,7 @@ TkpGetColor(
 		CGFloat rgba[4];
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
 		NSAppearance *savedAppearance = [NSAppearance currentAppearance];
-		NSAppearance *windowAppearance; 
+		NSAppearance *windowAppearance;
 		if (TkMacOSXInDarkMode(tkwin)) {
 		    windowAppearance = darkAqua;
 		    colormap = darkColormap;
@@ -721,7 +726,7 @@ TkpGetColor(
 		[NSAppearance setCurrentAppearance:savedAppearance];
 #else
 		GetRGBA(entry, p.ulong, rgba);
-#endif		
+#endif
 		color.red   = rgba[0] * 65535.0;
 		color.green = rgba[1] * 65535.0;
 		color.blue  = rgba[2] * 65535.0;
@@ -763,19 +768,19 @@ validXColor:
  *
  * TkpGetColorByValue --
  *
- *	Given a desired set of red-green-blue intensities for a color,
- *	locate a pixel value to use to draw that color in a given
- *	window.
+ *	Given an pointer to an XColor, construct a TkColor whose red, green and
+ *	blue intensities match those of the XColor as closely as possible.  For
+ *	the Macintosh, this means that the colortype bitfield of the pixel
+ *	value will be RGBColor and that the color intensities stored in its
+ *	24-bit value bitfield are computed from the 16-bit red green and blue
+ *	values in the XColor by dividing by 256.
  *
  * Results:
- *	The return value is a pointer to an TkColor structure that
- *	indicates the closest red, blue, and green intensities available
- *	to those specified in colorPtr, and also specifies a pixel
- *	value to use to draw in that color.
+ *	A pointer to a newly allocated TkColor structure.
  *
  * Side effects:
  *	May invalidate the colormap cache for the specified window.
- *	Allocates a new TkColor structure.
+ *	Allocates memory for a TkColor structure.
  *
  *----------------------------------------------------------------------
  */
@@ -830,10 +835,11 @@ XCreateColormap(
     Visual *visual,		/* Not used. */
     int alloc)			/* Not used. */
 {
-    static Colormap index = 1;
+    static Colormap index = 16;
 
     /*
-     * Just return a new value each time.
+     * Just return a new value each time, large enough that it will not
+     * conflict with any value of the macColormap enum.
      */
     return index++;
 }
@@ -855,9 +861,8 @@ XFreeColors(
     unsigned long planes)	/* Number of pixel planes. */
 {
     /*
-     * The Macintosh version of Tk uses TrueColor. Nothing
-     * needs to be done to release colors as there really is
-     * no colormap in the Tk sense.
+     * Nothing needs to be done to release colors as there really is no
+     * colormap in the Tk sense.
      */
     return Success;
 }
-- 
cgit v0.12


From 6adf699f287514c469d4827316e856204f4f84c6 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Mon, 3 Aug 2020 01:28:50 +0000
Subject: Fix [fca13549b6]: TkMacOSXRGBPixel() used incorrectly in
 ImageGetPixel()

---
 macosx/tkMacOSXImage.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/macosx/tkMacOSXImage.c b/macosx/tkMacOSXImage.c
index 4691e41..8a7aac4 100644
--- a/macosx/tkMacOSXImage.c
+++ b/macosx/tkMacOSXImage.c
@@ -314,7 +314,12 @@ ImageGetPixel(
     int x,
     int y)
 {
-    unsigned char r = 0, g = 0, b = 0;
+    unsigned short r = 0, g = 0, b = 0;
+
+    /*
+     * Compute 8 bit red green and blue values, which are multiplied by 256 and
+     * ed as inputs to TkMacOSXRGBPixel.
+     */
 
     if (image && image->data) {
 	unsigned char *srcPtr = ((unsigned char*) image->data)
@@ -322,7 +327,7 @@ ImageGetPixel(
 		+ (((image->xoffset + x) * image->bits_per_pixel) / NBBY);
 
 	switch (image->bits_per_pixel) {
-	case 32:
+	case 32: /* 8 bits per channel */
 	    r = (*((unsigned int*) srcPtr) >> 16) & 0xff;
 	    g = (*((unsigned int*) srcPtr) >>  8) & 0xff;
 	    b = (*((unsigned int*) srcPtr)      ) & 0xff;
@@ -332,12 +337,12 @@ ImageGetPixel(
 		r = srcPtr[1]; g = srcPtr[2]; b = srcPtr[3];
 	    }*/
 	    break;
-	case 16:
+	case 16: /* 5 bits per channel */
 	    r = (*((unsigned short*) srcPtr) >> 7) & 0xf8;
 	    g = (*((unsigned short*) srcPtr) >> 2) & 0xf8;
 	    b = (*((unsigned short*) srcPtr) << 3) & 0xf8;
 	    break;
-	case 8:
+	case 8: /* 2 bits per channel */
 	    r = (*srcPtr << 2) & 0xc0;
 	    g = (*srcPtr << 4) & 0xc0;
 	    b = (*srcPtr << 6) & 0xc0;
@@ -345,7 +350,7 @@ ImageGetPixel(
 	    g |= g >> 2 | g >> 4 | g >> 6;
 	    b |= b >> 2 | b >> 4 | b >> 6;
 	    break;
-	case 4: {
+	case 4: { /* 1 bit per channel */
 	    unsigned char c = (x % 2) ? *srcPtr : (*srcPtr >> 4);
 
 	    r = (c & 0x04) ? 0xff : 0;
@@ -353,12 +358,13 @@ ImageGetPixel(
 	    b = (c & 0x01) ? 0xff : 0;
 	    break;
 	}
-	case 1:
+	case 1: /* Black-white bitmap. */
 	    r = g = b = ((*srcPtr) & (0x80 >> (x % 8))) ? 0xff : 0;
 	    break;
 	}
     }
-    return TkMacOSXRGBPixel(r, g, b);
+
+    return TkMacOSXRGBPixel(r<<8, g<<8, b<<8);
 }
 
 /*
-- 
cgit v0.12


From d67e38a86d79f6df28051611978dcaac8b1be9cc Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Mon, 3 Aug 2020 02:16:07 +0000
Subject: Be a little more efficient.

---
 macosx/tkMacOSXColor.c | 13 ++++++-------
 macosx/tkMacOSXImage.c |  4 ++--
 macosx/tkMacOSXPort.h  |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index b4347b8..ce91520 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -112,11 +112,10 @@ void initColorTable()
  *	Return an unsigned long value suitable for use in the pixel
  *	field of an XColor with the specified red, green and blue
  *	intensities.  The inputs are cast as unsigned longs but are
- *      expected to have values representable by an unsigned short
- *      as used in the XColor struct.  These values are divided by
- *      256 to generate a 24-bit RGB pixel value.
+ *      expected to have values representable by an unsigned char.
  *
- *      This is called by the TkpGetPixel macro, used in xcolor.c.
+ *      This is called in the TkpGetPixel macro, used in xcolor.c,
+ *      and in ImageGetPixel.
  *
  * Results:
  *	An unsigned long that can be used as the pixel field of an XColor.
@@ -134,9 +133,9 @@ TkMacOSXRGBPixel(
 {
     MacPixel p;
     p.pixel.colortype = rgbColor;
-    p.pixel.value = (((red >> 8) & 0xff) << 16)  |
-	            (((green >> 8) & 0xff) << 8) |
-	            ((blue >> 8) & 0xff);
+    p.pixel.value = ((red & 0xff) << 16)  |
+	            ((green & 0xff) << 8) |
+	            (blue & 0xff);
     return p.ulong;
 }
 
diff --git a/macosx/tkMacOSXImage.c b/macosx/tkMacOSXImage.c
index 8a7aac4..2967bb0 100644
--- a/macosx/tkMacOSXImage.c
+++ b/macosx/tkMacOSXImage.c
@@ -314,7 +314,7 @@ ImageGetPixel(
     int x,
     int y)
 {
-    unsigned short r = 0, g = 0, b = 0;
+    unsigned char r = 0, g = 0, b = 0;
 
     /*
      * Compute 8 bit red green and blue values, which are multiplied by 256 and
@@ -364,7 +364,7 @@ ImageGetPixel(
 	}
     }
 
-    return TkMacOSXRGBPixel(r<<8, g<<8, b<<8);
+    return TkMacOSXRGBPixel(r, g, b);
 }
 
 /*
diff --git a/macosx/tkMacOSXPort.h b/macosx/tkMacOSXPort.h
index f5c3689..4347766 100644
--- a/macosx/tkMacOSXPort.h
+++ b/macosx/tkMacOSXPort.h
@@ -168,6 +168,6 @@
 
 MODULE_SCOPE unsigned long TkMacOSXRGBPixel(unsigned long red, unsigned long green,
 					    unsigned long blue);
-#define TkpGetPixel(p) (TkMacOSXRGBPixel(p->red, p->green, p->blue))
+#define TkpGetPixel(p) (TkMacOSXRGBPixel(p->red >> 8, p->green >> 8, p->blue >> 8))
 
 #endif /* _TKMACPORT */
-- 
cgit v0.12


From 2c6e31f7fd99017ab613b39e77357ad91b0be8c7 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Mon, 3 Aug 2020 12:41:10 +0000
Subject: Edit comments.

---
 macosx/tkMacOSXImage.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/macosx/tkMacOSXImage.c b/macosx/tkMacOSXImage.c
index 2967bb0..0e33b23 100644
--- a/macosx/tkMacOSXImage.c
+++ b/macosx/tkMacOSXImage.c
@@ -300,7 +300,11 @@ DestroyImage(
  *	Get a single pixel from an image.
  *
  * Results:
- *	Returns the 32 bit pixel value.
+ *      The XColor structure contains an unsigned long field named pixel which
+ *      identifies the color.  This function returns the unsigned long that
+ *      would be used as the pixel value of an XColor that has the same red
+ *      green and blue components as the XImage pixel at the specified
+ *      location.
  *
  * Side effects:
  *	None.
@@ -317,8 +321,8 @@ ImageGetPixel(
     unsigned char r = 0, g = 0, b = 0;
 
     /*
-     * Compute 8 bit red green and blue values, which are multiplied by 256 and
-     * ed as inputs to TkMacOSXRGBPixel.
+     * Compute 8 bit red green and blue values, which are passed as inputs to
+     * TkMacOSXRGBPixel to produce the pixel value.
      */
 
     if (image && image->data) {
-- 
cgit v0.12


From 35b2870cff97386ce7ea956ee317bec123017d52 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 3 Aug 2020 17:25:02 +0000
Subject: end-of-line spacing cleanup

---
 generic/tkCmds.c            |  2 +-
 generic/tkTest.c            |  2 +-
 macosx/tkMacOSXColor.h      | 58 ++++++++++++++++++++++-----------------------
 macosx/tkMacOSXPrivate.h    |  2 +-
 macosx/tkMacOSXSubwindows.c |  4 ++--
 5 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/generic/tkCmds.c b/generic/tkCmds.c
index 1bc4f8c..89b5254 100644
--- a/generic/tkCmds.c
+++ b/generic/tkCmds.c
@@ -1755,7 +1755,7 @@ Tk_WinfoObjCmd(
 	 * destroyed when we are through with it, so we do not get stale RGB
 	 * values next time.
 	 */
-	
+
 	{
 	    Colormap temp = Tk_Colormap(tkwin);
 	    Tk_Colormap(tkwin) = TK_DYNAMIC_COLORMAP;
diff --git a/generic/tkTest.c b/generic/tkTest.c
index c22e649..26b3fa5 100644
--- a/generic/tkTest.c
+++ b/generic/tkTest.c
@@ -1592,7 +1592,7 @@ ImageDisplay(
          * Drawing is not possible on the first call to DisplayImage.
 	 * Save the message, but do not log it until the actual display.
 	 */
-	
+
 	if (instPtr->displayFailed == False) {
 	    sprintf(instPtr->buffer, "%s display %d %d %d %d",
 		    instPtr->masterPtr->imageName, imageX, imageY, width, height);
diff --git a/macosx/tkMacOSXColor.h b/macosx/tkMacOSXColor.h
index 82c88c9..89d147d 100644
--- a/macosx/tkMacOSXColor.h
+++ b/macosx/tkMacOSXColor.h
@@ -6,7 +6,7 @@
  * colors in a GC are unsigned longs.  These are meant to be used as indexes
  * into a table of XColors, where an XColor is declared in Xlib.h as:
  * typedef struct {
- *       unsigned long pixel; 
+ *       unsigned long pixel;
  *       unsigned short red, green, blue;
  *       char flags;
  *       char pad;
@@ -48,7 +48,7 @@ typedef struct xpixel_t {
     unsigned value: 24;     /* Either RGB or an index into systemColorMap. */
     unsigned colortype: 8;
 } xpixel;
-    
+
 typedef union MacPixel_t {
     unsigned long ulong;
     xpixel pixel;
@@ -64,11 +64,11 @@ enum macColormap {
     lightColormap,
     darkColormap,
 };
-    
+
 /*
  * In TkMacOSXColor.c a Tk hash table is constructed from the static data
  * below to map system color names to CGColors.
- */ 
+ */
 
 typedef struct {
     const char *name;
@@ -96,15 +96,15 @@ static SystemColorDatum systemColorData[] = {
 {"HighlightText",			HIBrush,  kThemeBrushBlack },
 {"HighlightAlternate",			HIBrush,  kThemeBrushAlternatePrimaryHighlightColor },
 {"PrimaryHighlightColor",		HIBrush,  kThemeBrushPrimaryHighlightColor },
-{"ButtonFace",				HIBrush,  kThemeBrushButtonFaceActive },	       
+{"ButtonFace",				HIBrush,  kThemeBrushButtonFaceActive },
 {"SecondaryHighlightColor",		HIBrush,  kThemeBrushSecondaryHighlightColor },
-{"ButtonFrame",				HIBrush,  kThemeBrushButtonFrameActive },	       
+{"ButtonFrame",				HIBrush,  kThemeBrushButtonFrameActive },
 {"AlternatePrimaryHighlightColor",      HIBrush,  kThemeBrushAlternatePrimaryHighlightColor },
-{"WindowBody",				HIBrush,  kThemeBrushDocumentWindowBackground },       
+{"WindowBody",				HIBrush,  kThemeBrushDocumentWindowBackground },
 {"SheetBackground",			HIBrush,  kThemeBrushSheetBackground },
 {"MenuActive",				HIBrush,  kThemeBrushMenuBackgroundSelected },
 {"Menu",				HIBrush,  kThemeBrushMenuBackground },
-{"DialogBackgroundInactive",		HIBrush,  kThemeBrushDialogBackgroundInactive },   
+{"DialogBackgroundInactive",		HIBrush,  kThemeBrushDialogBackgroundInactive },
 {"DialogBackgroundActive",		HIBrush,  kThemeBrushDialogBackgroundActive },
 {"AlertBackgroundActive",		HIBrush,  kThemeBrushAlertBackgroundActive },
 {"AlertBackgroundInactive",		HIBrush,  kThemeBrushAlertBackgroundInactive },
@@ -113,28 +113,28 @@ static SystemColorDatum systemColorData[] = {
 {"UtilityWindowBackgroundActive",	HIBrush,  kThemeBrushUtilityWindowBackgroundActive },
 {"UtilityWindowBackgroundInactive",	HIBrush,  kThemeBrushUtilityWindowBackgroundInactive },
 {"ListViewSortColumnBackground",	HIBrush,  kThemeBrushListViewSortColumnBackground },
-{"ListViewBackground",			HIBrush,  kThemeBrushListViewBackground },	   
+{"ListViewBackground",			HIBrush,  kThemeBrushListViewBackground },
 {"IconLabelBackground",			HIBrush,  kThemeBrushIconLabelBackground },
-{"ListViewSeparator",			HIBrush,  kThemeBrushListViewSeparator },  
+{"ListViewSeparator",			HIBrush,  kThemeBrushListViewSeparator },
 {"ChasingArrows",			HIBrush,  kThemeBrushChasingArrows },
-{"DragHilite",				HIBrush,  kThemeBrushDragHilite },	   
-{"DocumentWindowBackground",		HIBrush,  kThemeBrushDocumentWindowBackground },   
+{"DragHilite",				HIBrush,  kThemeBrushDragHilite },
+{"DocumentWindowBackground",		HIBrush,  kThemeBrushDocumentWindowBackground },
 {"FinderWindowBackground",		HIBrush,  kThemeBrushFinderWindowBackground },
-{"ScrollBarDelimiterActive",		HIBrush,  kThemeBrushScrollBarDelimiterActive },   
-{"ScrollBarDelimiterInactive",		HIBrush,  kThemeBrushScrollBarDelimiterInactive }, 
+{"ScrollBarDelimiterActive",		HIBrush,  kThemeBrushScrollBarDelimiterActive },
+{"ScrollBarDelimiterInactive",		HIBrush,  kThemeBrushScrollBarDelimiterInactive },
 {"FocusHighlight",			HIBrush,  kThemeBrushFocusHighlight },
-{"PopupArrowActive",			HIBrush,  kThemeBrushPopupArrowActive },	   
-{"PopupArrowPressed",			HIBrush,  kThemeBrushPopupArrowPressed },	   
-{"PopupArrowInactive",			HIBrush,  kThemeBrushPopupArrowInactive },	   
-{"AppleGuideCoachmark",			HIBrush,  kThemeBrushAppleGuideCoachmark },	   
+{"PopupArrowActive",			HIBrush,  kThemeBrushPopupArrowActive },
+{"PopupArrowPressed",			HIBrush,  kThemeBrushPopupArrowPressed },
+{"PopupArrowInactive",			HIBrush,  kThemeBrushPopupArrowInactive },
+{"AppleGuideCoachmark",			HIBrush,  kThemeBrushAppleGuideCoachmark },
 {"IconLabelBackgroundSelected",		HIBrush,  kThemeBrushIconLabelBackgroundSelected },
 {"StaticAreaFill",			HIBrush,  kThemeBrushStaticAreaFill },
 {"ActiveAreaFill",			HIBrush,  kThemeBrushActiveAreaFill },
 {"ButtonFrameActive",			HIBrush,  kThemeBrushButtonFrameActive },
-{"ButtonFrameInactive",			HIBrush,  kThemeBrushButtonFrameInactive },	   
-{"ButtonFaceActive",			HIBrush,  kThemeBrushButtonFaceActive },   
-{"ButtonFaceInactive",			HIBrush,  kThemeBrushButtonFaceInactive },	   
-{"ButtonFacePressed",			HIBrush,  kThemeBrushButtonFacePressed },	   
+{"ButtonFrameInactive",			HIBrush,  kThemeBrushButtonFrameInactive },
+{"ButtonFaceActive",			HIBrush,  kThemeBrushButtonFaceActive },
+{"ButtonFaceInactive",			HIBrush,  kThemeBrushButtonFaceInactive },
+{"ButtonFacePressed",			HIBrush,  kThemeBrushButtonFacePressed },
 {"ButtonActiveDarkShadow",		HIBrush,  kThemeBrushButtonActiveDarkShadow },
 {"ButtonActiveDarkHighlight",		HIBrush,  kThemeBrushButtonActiveDarkHighlight },
 {"ButtonActiveLightShadow",		HIBrush,  kThemeBrushButtonActiveLightShadow },
@@ -163,10 +163,10 @@ static SystemColorDatum systemColorData[] = {
 {"ListViewEvenRowBackground",		HIBrush,  kThemeBrushListViewEvenRowBackground },
 {"ListViewColumnDivider",		HIBrush,  kThemeBrushListViewColumnDivider },
 
-{"ButtonText",				HIText,   kThemeTextColorPushButtonActive },	      
-{"MenuActiveText",			HIText,   kThemeTextColorMenuItemSelected },	      
-{"MenuDisabled",			HIText,   kThemeTextColorMenuItemDisabled },	   
-{"MenuText",				HIText,   kThemeTextColorMenuItemActive },	   
+{"ButtonText",				HIText,   kThemeTextColorPushButtonActive },
+{"MenuActiveText",			HIText,   kThemeTextColorMenuItemSelected },
+{"MenuDisabled",			HIText,   kThemeTextColorMenuItemDisabled },
+{"MenuText",				HIText,   kThemeTextColorMenuItemActive },
 {"BlackText",				HIText,   kThemeTextColorBlack },
 {"DialogActiveText",			HIText,   kThemeTextColorDialogActive },
 {"DialogInactiveText",			HIText,   kThemeTextColorDialogInactive },
@@ -192,8 +192,8 @@ static SystemColorDatum systemColorData[] = {
 {"ListViewText",			HIText,   kThemeTextColorListView },
 {"DocumentWindowTitleActiveText",	HIText,   kThemeTextColorDocumentWindowTitleActive },
 {"DocumentWindowTitleInactiveText",	HIText,   kThemeTextColorDocumentWindowTitleInactive },
-{"MovableModalWindowTitleActiveText",  	HIText,   kThemeTextColorMovableModalWindowTitleActive },   
-{"MovableModalWindowTitleInactiveText",	HIText,   kThemeTextColorMovableModalWindowTitleInactive }, 
+{"MovableModalWindowTitleActiveText",  	HIText,   kThemeTextColorMovableModalWindowTitleActive },
+{"MovableModalWindowTitleInactiveText",	HIText,   kThemeTextColorMovableModalWindowTitleInactive },
 {"UtilityWindowTitleActiveText",	HIText,   kThemeTextColorUtilityWindowTitleActive },
 {"UtilityWindowTitleInactiveText",	HIText,   kThemeTextColorUtilityWindowTitleInactive },
 {"PopupWindowTitleActiveText",		HIText,   kThemeTextColorPopupWindowTitleActive },
@@ -231,7 +231,7 @@ static SystemColorDatum systemColorData[] = {
      * Dynamic Colors
      */
 
-{"WindowBackgroundColor",	    ttkBackground, 0 },	    
+{"WindowBackgroundColor",	    ttkBackground, 0 },
 {"WindowBackgroundColor1",	    ttkBackground, 1 },
 {"WindowBackgroundColor2",	    ttkBackground, 2 },
 {"WindowBackgroundColor3",	    ttkBackground, 3 },
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h
index ceca8f8..9005d82 100644
--- a/macosx/tkMacOSXPrivate.h
+++ b/macosx/tkMacOSXPrivate.h
@@ -150,7 +150,7 @@ typedef union MacKeycode_t {
   keycode_v v;
   keycode_x x;
 } MacKeycode;
-    
+
 /*
  * Macros used in tkMacOSXKeyboard.c and tkMacOSXKeyEvent.c.
  * Note that 0x7f is del and 0xF8FF is the Apple Logo character.
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index a58bab4..8b316fa 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -211,7 +211,7 @@ XMapWindow(
 	 * we handle this event immediately and then process the idle
 	 * events that it generates.
 	 */
-	
+
 	Tk_HandleEvent(&event);
 	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {}
     } else {
@@ -329,7 +329,7 @@ XUnmapWindow(
 	 * we handle this event immediately and then process the idle
 	 * events that it generates.
 	 */
-	
+
 	Tk_HandleEvent(&event);
 	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {}
     } else {
-- 
cgit v0.12


From c175e28a9285a80c72f2280d08cf3c6440be73a5 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Mon, 3 Aug 2020 20:07:52 +0000
Subject: Add the backgroundLoop from mac_styles, to allow Tk to run while a
 menu is open.

---
 macosx/tkMacOSXMenu.c    | 70 ++++++++++++++++++++++++++++++++++++++++++++++++
 macosx/tkMacOSXNotify.c  | 12 ++++++---
 macosx/tkMacOSXPrivate.h |  7 +++--
 3 files changed, 84 insertions(+), 5 deletions(-)

diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c
index 735f7d2..dceb051 100644
--- a/macosx/tkMacOSXMenu.c
+++ b/macosx/tkMacOSXMenu.c
@@ -108,6 +108,65 @@ static void	MenuSelectEvent(TkMenu *menuPtr);
 static void	RecursivelyClearActiveMenu(TkMenu *menuPtr);
 static int	ModifierCharWidth(Tk_Font tkfont);
 
+#pragma mark TkBackgroundLoop
+
+/*
+ * The function TkMacOSXEventsCheckProc (in tkMacOSXNotify.c) is the "check
+ * proc" for the macOS event source.  Its job is to remove NSEvents from the
+ * default event queue of the NSApplication.  It does this by calling the
+ * method [NSApp nextEventMatchingMask: untilDate: inMode: dequeue:]. As a
+ * rule, when the untilDate is set to the distant past this method returns
+ * immediately.  An exception to that rule is when the next event is the button
+ * press on a menu button.  In that case, the method starts running a nested
+ * event loop in the mode NSEventTrackingRunLoopMode which does not return
+ * until the menu has been dismissed.  In Tk 8.6.10 and earlier, this meant
+ * that the Tk event loop would block in its call to the check proc as long as
+ * the menu was posted.  For example, opening a menu during the Rube Goldberg
+ * demo would cause the animation to stop.  This was also the case for
+ * menubuttons.
+ * 
+ * The TKBackground object below works around this problem, and allows a Tk
+ * event loop to run while a menu is open.  It is a subclass of NSThread which
+ * inserts requests to call [NSApp _runBackgroundLoop] onto the queue
+ * associated with the NSEventTrackingRunLoopMode.  One of these threads gets
+ * started in the callback [NSApp menuBeginTracking] and cancelled in [NSApp
+ * menuEndTracking].
+ */
+
+@interface TKBackgroundLoop: NSThread
+@end
+
+@implementation TKBackgroundLoop
+- (void) main
+{
+    NSArray *modeArray = [NSArray arrayWithObjects: NSEventTrackingRunLoopMode,
+				  nil];
+    while(1) {
+	
+	/*
+	 * Queue a request to process Tk events during event tracking.
+	 */
+	
+	[NSApp performSelectorOnMainThread:@selector(_runBackgroundLoop) 
+				withObject:nil
+			     waitUntilDone:true 
+				     modes:modeArray];
+	if (self.cancelled) {
+	    [NSThread exit];
+	}
+	
+	/*
+	 * Allow the tracked events to be processed too.
+	 */
+
+	[NSThread sleepForTimeInterval:0.001];
+    }	
+}
+@end
+
+TKBackgroundLoop *backgroundLoop = nil;
+
+
 #pragma mark TKMenu
 
 /*
@@ -395,6 +454,12 @@ static int	ModifierCharWidth(Tk_Font tkfont);
 #ifdef TK_MAC_DEBUG_NOTIFICATIONS
     TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification);
 #endif
+    if (backgroundLoop) {
+	[backgroundLoop cancel];
+	[backgroundLoop release];
+    }
+    backgroundLoop = [[TKBackgroundLoop alloc] init];
+    [backgroundLoop start];
     //TkMacOSXClearMenubarActive();
     //TkMacOSXPreprocessMenu();
 }
@@ -404,6 +469,11 @@ static int	ModifierCharWidth(Tk_Font tkfont);
 #ifdef TK_MAC_DEBUG_NOTIFICATIONS
     TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification);
 #endif
+    if (backgroundLoop) {
+	[backgroundLoop cancel];
+	[backgroundLoop release];
+	backgroundLoop = nil;
+    }
     if (!inPostMenu) {
 	TkMacOSXClearMenubarActive();
     }
diff --git a/macosx/tkMacOSXNotify.c b/macosx/tkMacOSXNotify.c
index 83b4695..5163e21 100644
--- a/macosx/tkMacOSXNotify.c
+++ b/macosx/tkMacOSXNotify.c
@@ -176,6 +176,7 @@ void DebugPrintQueue(void)
 	}
     }
 #endif
+
     [super sendEvent:theEvent];
     [NSApp tkCheckPasteboard];
 
@@ -185,6 +186,13 @@ void DebugPrintQueue(void)
 #endif
 
 }
+
+- (void) _runBackgroundLoop
+{
+    while(Tcl_DoOneEvent(TCL_IDLE_EVENTS|TCL_TIMER_EVENTS|TCL_DONT_WAIT)){
+	TkMacOSXDrawAllViews(NULL);
+    }
+}
 @end
 
 #pragma mark -
@@ -203,15 +211,13 @@ void DebugPrintQueue(void)
  *----------------------------------------------------------------------
  */
 
-NSString *
+static NSString *
 GetRunLoopMode(NSModalSession modalSession)
 {
     NSString *runLoopMode = nil;
 
     if (modalSession) {
 	runLoopMode = NSModalPanelRunLoopMode;
-    } else if (TkMacOSXGetCapture()) {
-	runLoopMode = NSEventTrackingRunLoopMode;
     }
     if (!runLoopMode) {
 	runLoopMode = [[NSRunLoop currentRunLoop] currentMode];
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h
index 9005d82..6109024 100644
--- a/macosx/tkMacOSXPrivate.h
+++ b/macosx/tkMacOSXPrivate.h
@@ -304,8 +304,7 @@ MODULE_SCOPE void       TkMacOSXDrawSolidBorder(Tk_Window tkwin, GC gc,
 			    int inset, int thickness);
 MODULE_SCOPE int 	TkMacOSXServices_Init(Tcl_Interp *interp);
 MODULE_SCOPE int	TkMacOSXRegisterServiceWidgetObjCmd(ClientData clientData,
-			    Tcl_Interp *interp, int objc,
-			    Tcl_Obj *const objv[]);
+			    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
 MODULE_SCOPE unsigned   TkMacOSXAddVirtual(unsigned int keycode);
 MODULE_SCOPE void       TkMacOSXWinNSBounds(TkWindow *winPtr, NSView *view,
 					    NSRect *bounds);
@@ -341,6 +340,8 @@ VISIBILITY_HIDDEN
     NSArray *_defaultApplicationMenuItems, *_defaultWindowsMenuItems;
     NSArray *_defaultHelpMenuItems, *_defaultFileMenuItems;
     NSAutoreleasePool *_mainPool;
+    NSThread *_backgoundLoop;
+
 #ifdef __i386__
     /* The Objective C runtime used on i386 requires this. */
     int _poolLock;
@@ -348,6 +349,7 @@ VISIBILITY_HIDDEN
     Bool _isDrawing;
     Bool _needsToDraw;
 #endif
+
 }
 @property int poolLock;
 @property int macOSVersion;
@@ -378,6 +380,7 @@ VISIBILITY_HIDDEN
 @interface NSApplication(TKNotify)
 /* We need to declare this hidden method. */
 - (void) _modalSession: (NSModalSession) session sendEvent: (NSEvent *) event;
+- (void) _runBackgroundLoop;
 @end
 @interface TKApplication(TKEvent)
 - (NSEvent *)tkProcessEvent:(NSEvent *)theEvent;
-- 
cgit v0.12


From 6115c6c774ebf6d95e16b18fd3378d691f26722d Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Tue, 4 Aug 2020 11:56:44 +0000
Subject: Address compiler warnings about dark mode when building on new
 systems with old targets.

---
 macosx/tkMacOSXColor.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index ce91520..64c9cf2 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -40,9 +40,12 @@ void initColorTable()
     Tcl_HashSearch search;
     Tcl_HashEntry *hPtr;
     int newPtr, index = 0;
+
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
-    darkAqua = [NSAppearance appearanceNamed:NSAppearanceNameDarkAqua];
-    lightAqua = [NSAppearance appearanceNamed:NSAppearanceNameAqua];
+    if (@available(macOS 10.14, *)) {
+	darkAqua = [NSAppearance appearanceNamed:NSAppearanceNameDarkAqua];
+        lightAqua = [NSAppearance appearanceNamed:NSAppearanceNameAqua];
+    }
 #endif
 
     /*
@@ -378,21 +381,19 @@ TkMacOSXInDarkMode(Tk_Window tkwin)
     int result = false;
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
-
-    if ([NSApp macOSVersion] >= 101400) {
+    if (@available(macOS 10.14, *)) {
         TkWindow *winPtr = (TkWindow*) tkwin;
 	NSView *view = nil;
 	if (winPtr && winPtr->privatePtr) {
 	    view = TkMacOSXDrawableView(winPtr->privatePtr);
 	}
 	if (view) {
-	    result = (view.effectiveAppearance.name == NSAppearanceNameDarkAqua);
+	    result = (view.effectiveAppearance == darkAqua);
 	} else {
-	    result = ([NSAppearance currentAppearance].name == NSAppearanceNameDarkAqua);
+	    result = ([NSAppearance currentAppearance] == darkAqua);
 	}
     }
 #endif
-
     return result;
 }
 
-- 
cgit v0.12


From 2fa48e044573693869cc6412efc1aaf4a51917bd Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 4 Aug 2020 14:25:37 +0000
Subject: Make TCL_UNUSED() macro usable in Tk 8.6

---
 generic/tkInt.h         |  23 ++++
 macosx/tkMacOSXColor.c  |  32 ++---
 macosx/tkMacOSXColor.h  | 326 ++++++++++++++++++++++++------------------------
 macosx/tkMacOSXMenu.c   |  14 +--
 macosx/tkMacOSXXStubs.c | 283 +++++++++++++++--------------------------
 5 files changed, 312 insertions(+), 366 deletions(-)

diff --git a/generic/tkInt.h b/generic/tkInt.h
index 6f40078..2f64f99 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -59,6 +59,21 @@
 #   endif
 #endif
 
+#ifndef JOIN
+#  define JOIN(a,b) JOIN1(a,b)
+#  define JOIN1(a,b) a##b
+#endif
+
+#ifndef TCL_UNUSED
+#   if defined(__cplusplus)
+#	define TCL_UNUSED(T) T
+#   elif defined(__GNUC__) && (__GNUC__ > 2)
+#	define TCL_UNUSED(T) T JOIN(dummy, __LINE__) __attribute__((unused))
+#   else
+#	define TCL_UNUSED(T) T JOIN(dummy, __LINE__)
+#   endif
+#endif
+
 #if defined(_WIN32) && (TCL_MAJOR_VERSION < 9) && (TCL_MINOR_VERSION < 7)
 # if TCL_UTF_MAX > 3
 #   define Tcl_WCharToUtfDString(a,b,c) Tcl_WinTCharToUtf((TCHAR *)(a),(b)*sizeof(WCHAR),c)
@@ -1041,6 +1056,10 @@ void Tcl_Panic(const char *, ...) __attribute__((analyzer_noreturn));
 
 #include "tkIntDecls.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * Themed widget set init function:
  */
@@ -1324,6 +1343,10 @@ MODULE_SCOPE int	TkOldTestInit(Tcl_Interp *interp);
 MODULE_SCOPE int	TkplatformtestInit(Tcl_Interp *interp);
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _TKINT */
 
 /*
diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index 64c9cf2..89bddb9 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -194,7 +194,7 @@ GetEntryFromPixel(
     unsigned long pixel)
 {
     MacPixel p;
-    unsigned int index = rgbColorIndex;
+    int index = rgbColorIndex;
 
     p.ulong = pixel;
     if (p.pixel.colortype != rgbColor) {
@@ -757,7 +757,7 @@ TkpGetColor(
     }
 
 validXColor:
-    tkColPtr = ckalloc(sizeof(TkColor));
+    tkColPtr = (TkColor *)ckalloc(sizeof(TkColor));
     tkColPtr->colormap = colormap;
     tkColPtr->color = color;
     return tkColPtr;
@@ -787,11 +787,11 @@ validXColor:
 
 TkColor *
 TkpGetColorByValue(
-    Tk_Window tkwin,		/* Window in which color will be used. */
+    TCL_UNUSED(Tk_Window),		/* Window in which color will be used. */
     XColor *colorPtr)		/* Red, green, and blue fields indicate
 				 * desired color. */
 {
-    TkColor *tkColPtr = ckalloc(sizeof(TkColor));
+    TkColor *tkColPtr = (TkColor *)ckalloc(sizeof(TkColor));
 
     tkColPtr->color.red = colorPtr->red;
     tkColPtr->color.green = colorPtr->green;
@@ -820,7 +820,7 @@ TkpGetColorByValue(
 Status
 XAllocColor(
     Display *display,		/* Display. */
-    Colormap map,		/* Not used. */
+    TCL_UNUSED(Colormap),		/* Not used. */
     XColor *colorPtr)		/* XColor struct to modify. */
 {
     display->request++;
@@ -830,10 +830,10 @@ XAllocColor(
 
 Colormap
 XCreateColormap(
-    Display *display,		/* Display. */
-    Window window,		/* X window. */
-    Visual *visual,		/* Not used. */
-    int alloc)			/* Not used. */
+    TCL_UNUSED(Display *),		/* Display. */
+    TCL_UNUSED(Window),		/* X window. */
+    TCL_UNUSED(Visual *),		/* Not used. */
+    TCL_UNUSED(int))			/* Not used. */
 {
     static Colormap index = 16;
 
@@ -846,19 +846,19 @@ XCreateColormap(
 
 int
 XFreeColormap(
-    Display* display,		/* Display. */
-    Colormap colormap)		/* Colormap. */
+    TCL_UNUSED(Display *),		/* Display. */
+    TCL_UNUSED(Colormap))		/* Colormap. */
 {
     return Success;
 }
 
 int
 XFreeColors(
-    Display* display,		/* Display. */
-    Colormap colormap,		/* Colormap. */
-    unsigned long* pixels,	/* Array of pixels. */
-    int npixels,		/* Number of pixels. */
-    unsigned long planes)	/* Number of pixel planes. */
+    TCL_UNUSED(Display *),		/* Display. */
+    TCL_UNUSED(Colormap),		/* Colormap. */
+    TCL_UNUSED(unsigned long *),	/* Array of pixels. */
+    TCL_UNUSED(int),		/* Number of pixels. */
+    TCL_UNUSED(unsigned long))	/* Number of pixel planes. */
 {
     /*
      * Nothing needs to be done to release colors as there really is no
diff --git a/macosx/tkMacOSXColor.h b/macosx/tkMacOSXColor.h
index 89d147d..535d15d 100644
--- a/macosx/tkMacOSXColor.h
+++ b/macosx/tkMacOSXColor.h
@@ -74,7 +74,7 @@ typedef struct {
     const char *name;
     enum colorType type;
     int value;
-    char *macName;
+    const char *macName;
     /* Fields below are filled in after or during construction of the hash table. */
     int index;
     NSString *selector;
@@ -88,181 +88,181 @@ typedef struct {
  */
 
 static SystemColorDatum systemColorData[] = {
-{"Pixel",				rgbColor, 0 },
-{"Transparent",				clearColor,   0 },
+{"Pixel",				rgbColor, 0, NULL, 0, NULL },
+{"Transparent",				clearColor,   0, NULL, 0, NULL },
 
-{"Highlight",				HIBrush,  kThemeBrushPrimaryHighlightColor },
-{"HighlightSecondary",		    	HIBrush,  kThemeBrushSecondaryHighlightColor },
-{"HighlightText",			HIBrush,  kThemeBrushBlack },
-{"HighlightAlternate",			HIBrush,  kThemeBrushAlternatePrimaryHighlightColor },
-{"PrimaryHighlightColor",		HIBrush,  kThemeBrushPrimaryHighlightColor },
-{"ButtonFace",				HIBrush,  kThemeBrushButtonFaceActive },
-{"SecondaryHighlightColor",		HIBrush,  kThemeBrushSecondaryHighlightColor },
-{"ButtonFrame",				HIBrush,  kThemeBrushButtonFrameActive },
-{"AlternatePrimaryHighlightColor",      HIBrush,  kThemeBrushAlternatePrimaryHighlightColor },
-{"WindowBody",				HIBrush,  kThemeBrushDocumentWindowBackground },
-{"SheetBackground",			HIBrush,  kThemeBrushSheetBackground },
-{"MenuActive",				HIBrush,  kThemeBrushMenuBackgroundSelected },
-{"Menu",				HIBrush,  kThemeBrushMenuBackground },
-{"DialogBackgroundInactive",		HIBrush,  kThemeBrushDialogBackgroundInactive },
-{"DialogBackgroundActive",		HIBrush,  kThemeBrushDialogBackgroundActive },
-{"AlertBackgroundActive",		HIBrush,  kThemeBrushAlertBackgroundActive },
-{"AlertBackgroundInactive",		HIBrush,  kThemeBrushAlertBackgroundInactive },
-{"ModelessDialogBackgroundActive",	HIBrush,  kThemeBrushModelessDialogBackgroundActive },
-{"ModelessDialogBackgroundInactive",	HIBrush,  kThemeBrushModelessDialogBackgroundInactive },
-{"UtilityWindowBackgroundActive",	HIBrush,  kThemeBrushUtilityWindowBackgroundActive },
-{"UtilityWindowBackgroundInactive",	HIBrush,  kThemeBrushUtilityWindowBackgroundInactive },
-{"ListViewSortColumnBackground",	HIBrush,  kThemeBrushListViewSortColumnBackground },
-{"ListViewBackground",			HIBrush,  kThemeBrushListViewBackground },
-{"IconLabelBackground",			HIBrush,  kThemeBrushIconLabelBackground },
-{"ListViewSeparator",			HIBrush,  kThemeBrushListViewSeparator },
-{"ChasingArrows",			HIBrush,  kThemeBrushChasingArrows },
-{"DragHilite",				HIBrush,  kThemeBrushDragHilite },
-{"DocumentWindowBackground",		HIBrush,  kThemeBrushDocumentWindowBackground },
-{"FinderWindowBackground",		HIBrush,  kThemeBrushFinderWindowBackground },
-{"ScrollBarDelimiterActive",		HIBrush,  kThemeBrushScrollBarDelimiterActive },
-{"ScrollBarDelimiterInactive",		HIBrush,  kThemeBrushScrollBarDelimiterInactive },
-{"FocusHighlight",			HIBrush,  kThemeBrushFocusHighlight },
-{"PopupArrowActive",			HIBrush,  kThemeBrushPopupArrowActive },
-{"PopupArrowPressed",			HIBrush,  kThemeBrushPopupArrowPressed },
-{"PopupArrowInactive",			HIBrush,  kThemeBrushPopupArrowInactive },
-{"AppleGuideCoachmark",			HIBrush,  kThemeBrushAppleGuideCoachmark },
-{"IconLabelBackgroundSelected",		HIBrush,  kThemeBrushIconLabelBackgroundSelected },
-{"StaticAreaFill",			HIBrush,  kThemeBrushStaticAreaFill },
-{"ActiveAreaFill",			HIBrush,  kThemeBrushActiveAreaFill },
-{"ButtonFrameActive",			HIBrush,  kThemeBrushButtonFrameActive },
-{"ButtonFrameInactive",			HIBrush,  kThemeBrushButtonFrameInactive },
-{"ButtonFaceActive",			HIBrush,  kThemeBrushButtonFaceActive },
-{"ButtonFaceInactive",			HIBrush,  kThemeBrushButtonFaceInactive },
-{"ButtonFacePressed",			HIBrush,  kThemeBrushButtonFacePressed },
-{"ButtonActiveDarkShadow",		HIBrush,  kThemeBrushButtonActiveDarkShadow },
-{"ButtonActiveDarkHighlight",		HIBrush,  kThemeBrushButtonActiveDarkHighlight },
-{"ButtonActiveLightShadow",		HIBrush,  kThemeBrushButtonActiveLightShadow },
-{"ButtonActiveLightHighlight",		HIBrush,  kThemeBrushButtonActiveLightHighlight },
-{"ButtonInactiveDarkShadow",		HIBrush,  kThemeBrushButtonInactiveDarkShadow },
-{"ButtonInactiveDarkHighlight",		HIBrush,  kThemeBrushButtonInactiveDarkHighlight },
-{"ButtonInactiveLightShadow",		HIBrush,  kThemeBrushButtonInactiveLightShadow },
-{"ButtonInactiveLightHighlight",	HIBrush,  kThemeBrushButtonInactiveLightHighlight },
-{"ButtonPressedDarkShadow",		HIBrush,  kThemeBrushButtonPressedDarkShadow },
-{"ButtonPressedDarkHighlight",		HIBrush,  kThemeBrushButtonPressedDarkHighlight },
-{"ButtonPressedLightShadow",		HIBrush,  kThemeBrushButtonPressedLightShadow },
-{"ButtonPressedLightHighlight",		HIBrush,  kThemeBrushButtonPressedLightHighlight },
-{"BevelActiveLight",			HIBrush,  kThemeBrushBevelActiveLight },
-{"BevelActiveDark",			HIBrush,  kThemeBrushBevelActiveDark },
-{"BevelInactiveLight",			HIBrush,  kThemeBrushBevelInactiveLight },
-{"BevelInactiveDark",			HIBrush,  kThemeBrushBevelInactiveDark },
-{"NotificationWindowBackground",	HIBrush,  kThemeBrushNotificationWindowBackground },
-{"MovableModalBackground",		HIBrush,  kThemeBrushMovableModalBackground },
-{"SheetBackgroundOpaque",		HIBrush,  kThemeBrushSheetBackgroundOpaque },
-{"DrawerBackground",			HIBrush,  kThemeBrushDrawerBackground },
-{"ToolbarBackground",			HIBrush,  kThemeBrushToolbarBackground },
-{"SheetBackgroundTransparent",		HIBrush,  kThemeBrushSheetBackgroundTransparent },
-{"MenuBackground",			HIBrush,  kThemeBrushMenuBackground },
-{"MenuBackgroundSelected",		HIBrush,  kThemeBrushMenuBackgroundSelected },
-{"ListViewOddRowBackground",		HIBrush,  kThemeBrushListViewOddRowBackground },
-{"ListViewEvenRowBackground",		HIBrush,  kThemeBrushListViewEvenRowBackground },
-{"ListViewColumnDivider",		HIBrush,  kThemeBrushListViewColumnDivider },
+{"Highlight",				HIBrush,  kThemeBrushPrimaryHighlightColor, NULL, 0, NULL },
+{"HighlightSecondary",		    	HIBrush,  kThemeBrushSecondaryHighlightColor, NULL, 0, NULL },
+{"HighlightText",			HIBrush,  kThemeBrushBlack, NULL, 0, NULL },
+{"HighlightAlternate",			HIBrush,  kThemeBrushAlternatePrimaryHighlightColor, NULL, 0, NULL },
+{"PrimaryHighlightColor",		HIBrush,  kThemeBrushPrimaryHighlightColor, NULL, 0, NULL },
+{"ButtonFace",				HIBrush,  kThemeBrushButtonFaceActive, NULL, 0, NULL },
+{"SecondaryHighlightColor",		HIBrush,  kThemeBrushSecondaryHighlightColor, NULL, 0, NULL },
+{"ButtonFrame",				HIBrush,  kThemeBrushButtonFrameActive, NULL, 0, NULL },
+{"AlternatePrimaryHighlightColor",      HIBrush,  kThemeBrushAlternatePrimaryHighlightColor, NULL, 0, NULL },
+{"WindowBody",				HIBrush,  kThemeBrushDocumentWindowBackground, NULL, 0, NULL },
+{"SheetBackground",			HIBrush,  kThemeBrushSheetBackground, NULL, 0, NULL },
+{"MenuActive",				HIBrush,  kThemeBrushMenuBackgroundSelected, NULL, 0, NULL },
+{"Menu",				HIBrush,  kThemeBrushMenuBackground, NULL, 0, NULL },
+{"DialogBackgroundInactive",		HIBrush,  kThemeBrushDialogBackgroundInactive, NULL, 0, NULL },
+{"DialogBackgroundActive",		HIBrush,  kThemeBrushDialogBackgroundActive, NULL, 0, NULL },
+{"AlertBackgroundActive",		HIBrush,  kThemeBrushAlertBackgroundActive, NULL, 0, NULL },
+{"AlertBackgroundInactive",		HIBrush,  kThemeBrushAlertBackgroundInactive, NULL, 0, NULL },
+{"ModelessDialogBackgroundActive",	HIBrush,  kThemeBrushModelessDialogBackgroundActive, NULL, 0, NULL },
+{"ModelessDialogBackgroundInactive",	HIBrush,  kThemeBrushModelessDialogBackgroundInactive, NULL, 0, NULL },
+{"UtilityWindowBackgroundActive",	HIBrush,  kThemeBrushUtilityWindowBackgroundActive, NULL, 0, NULL },
+{"UtilityWindowBackgroundInactive",	HIBrush,  kThemeBrushUtilityWindowBackgroundInactive, NULL, 0, NULL },
+{"ListViewSortColumnBackground",	HIBrush,  kThemeBrushListViewSortColumnBackground, NULL, 0, NULL },
+{"ListViewBackground",			HIBrush,  kThemeBrushListViewBackground, NULL, 0, NULL },
+{"IconLabelBackground",			HIBrush,  kThemeBrushIconLabelBackground, NULL, 0, NULL },
+{"ListViewSeparator",			HIBrush,  kThemeBrushListViewSeparator, NULL, 0, NULL },
+{"ChasingArrows",			HIBrush,  kThemeBrushChasingArrows, NULL, 0, NULL },
+{"DragHilite",				HIBrush,  kThemeBrushDragHilite, NULL, 0, NULL },
+{"DocumentWindowBackground",		HIBrush,  kThemeBrushDocumentWindowBackground, NULL, 0, NULL },
+{"FinderWindowBackground",		HIBrush,  kThemeBrushFinderWindowBackground, NULL, 0, NULL },
+{"ScrollBarDelimiterActive",		HIBrush,  kThemeBrushScrollBarDelimiterActive, NULL, 0, NULL },
+{"ScrollBarDelimiterInactive",		HIBrush,  kThemeBrushScrollBarDelimiterInactive, NULL, 0, NULL },
+{"FocusHighlight",			HIBrush,  kThemeBrushFocusHighlight, NULL, 0, NULL },
+{"PopupArrowActive",			HIBrush,  kThemeBrushPopupArrowActive, NULL, 0, NULL },
+{"PopupArrowPressed",			HIBrush,  kThemeBrushPopupArrowPressed, NULL, 0, NULL },
+{"PopupArrowInactive",			HIBrush,  kThemeBrushPopupArrowInactive, NULL, 0, NULL },
+{"AppleGuideCoachmark",			HIBrush,  kThemeBrushAppleGuideCoachmark, NULL, 0, NULL },
+{"IconLabelBackgroundSelected",		HIBrush,  kThemeBrushIconLabelBackgroundSelected, NULL, 0, NULL },
+{"StaticAreaFill",			HIBrush,  kThemeBrushStaticAreaFill, NULL, 0, NULL },
+{"ActiveAreaFill",			HIBrush,  kThemeBrushActiveAreaFill, NULL, 0, NULL },
+{"ButtonFrameActive",			HIBrush,  kThemeBrushButtonFrameActive, NULL, 0, NULL },
+{"ButtonFrameInactive",			HIBrush,  kThemeBrushButtonFrameInactive, NULL, 0, NULL },
+{"ButtonFaceActive",			HIBrush,  kThemeBrushButtonFaceActive, NULL, 0, NULL },
+{"ButtonFaceInactive",			HIBrush,  kThemeBrushButtonFaceInactive, NULL, 0, NULL },
+{"ButtonFacePressed",			HIBrush,  kThemeBrushButtonFacePressed, NULL, 0, NULL },
+{"ButtonActiveDarkShadow",		HIBrush,  kThemeBrushButtonActiveDarkShadow, NULL, 0, NULL },
+{"ButtonActiveDarkHighlight",		HIBrush,  kThemeBrushButtonActiveDarkHighlight, NULL, 0, NULL },
+{"ButtonActiveLightShadow",		HIBrush,  kThemeBrushButtonActiveLightShadow, NULL, 0, NULL },
+{"ButtonActiveLightHighlight",		HIBrush,  kThemeBrushButtonActiveLightHighlight, NULL, 0, NULL },
+{"ButtonInactiveDarkShadow",		HIBrush,  kThemeBrushButtonInactiveDarkShadow, NULL, 0, NULL },
+{"ButtonInactiveDarkHighlight",		HIBrush,  kThemeBrushButtonInactiveDarkHighlight, NULL, 0, NULL },
+{"ButtonInactiveLightShadow",		HIBrush,  kThemeBrushButtonInactiveLightShadow, NULL, 0, NULL },
+{"ButtonInactiveLightHighlight",	HIBrush,  kThemeBrushButtonInactiveLightHighlight, NULL, 0, NULL },
+{"ButtonPressedDarkShadow",		HIBrush,  kThemeBrushButtonPressedDarkShadow, NULL, 0, NULL },
+{"ButtonPressedDarkHighlight",		HIBrush,  kThemeBrushButtonPressedDarkHighlight, NULL, 0, NULL },
+{"ButtonPressedLightShadow",		HIBrush,  kThemeBrushButtonPressedLightShadow, NULL, 0, NULL },
+{"ButtonPressedLightHighlight",		HIBrush,  kThemeBrushButtonPressedLightHighlight, NULL, 0, NULL },
+{"BevelActiveLight",			HIBrush,  kThemeBrushBevelActiveLight, NULL, 0, NULL },
+{"BevelActiveDark",			HIBrush,  kThemeBrushBevelActiveDark, NULL, 0, NULL },
+{"BevelInactiveLight",			HIBrush,  kThemeBrushBevelInactiveLight, NULL, 0, NULL },
+{"BevelInactiveDark",			HIBrush,  kThemeBrushBevelInactiveDark, NULL, 0, NULL },
+{"NotificationWindowBackground",	HIBrush,  kThemeBrushNotificationWindowBackground, NULL, 0, NULL },
+{"MovableModalBackground",		HIBrush,  kThemeBrushMovableModalBackground, NULL, 0, NULL },
+{"SheetBackgroundOpaque",		HIBrush,  kThemeBrushSheetBackgroundOpaque, NULL, 0, NULL },
+{"DrawerBackground",			HIBrush,  kThemeBrushDrawerBackground, NULL, 0, NULL },
+{"ToolbarBackground",			HIBrush,  kThemeBrushToolbarBackground, NULL, 0, NULL },
+{"SheetBackgroundTransparent",		HIBrush,  kThemeBrushSheetBackgroundTransparent, NULL, 0, NULL },
+{"MenuBackground",			HIBrush,  kThemeBrushMenuBackground, NULL, 0, NULL },
+{"MenuBackgroundSelected",		HIBrush,  kThemeBrushMenuBackgroundSelected, NULL, 0, NULL },
+{"ListViewOddRowBackground",		HIBrush,  kThemeBrushListViewOddRowBackground, NULL, 0, NULL },
+{"ListViewEvenRowBackground",		HIBrush,  kThemeBrushListViewEvenRowBackground, NULL, 0, NULL },
+{"ListViewColumnDivider",		HIBrush,  kThemeBrushListViewColumnDivider, NULL, 0, NULL },
 
-{"ButtonText",				HIText,   kThemeTextColorPushButtonActive },
-{"MenuActiveText",			HIText,   kThemeTextColorMenuItemSelected },
-{"MenuDisabled",			HIText,   kThemeTextColorMenuItemDisabled },
-{"MenuText",				HIText,   kThemeTextColorMenuItemActive },
-{"BlackText",				HIText,   kThemeTextColorBlack },
-{"DialogActiveText",			HIText,   kThemeTextColorDialogActive },
-{"DialogInactiveText",			HIText,   kThemeTextColorDialogInactive },
-{"AlertActiveText",			HIText,   kThemeTextColorAlertActive },
-{"AlertInactiveText",			HIText,   kThemeTextColorAlertInactive },
-{"ModelessDialogActiveText",		HIText,   kThemeTextColorModelessDialogActive },
-{"ModelessDialogInactiveText",		HIText,   kThemeTextColorModelessDialogInactive },
-{"WindowHeaderActiveText",		HIText,   kThemeTextColorWindowHeaderActive },
-{"WindowHeaderInactiveText",		HIText,   kThemeTextColorWindowHeaderInactive },
-{"PlacardActiveText",			HIText,   kThemeTextColorPlacardActive },
-{"PlacardInactiveText",			HIText,   kThemeTextColorPlacardInactive },
-{"PlacardPressedText",			HIText,   kThemeTextColorPlacardPressed },
-{"PushButtonActiveText",		HIText,   kThemeTextColorPushButtonActive },
-{"PushButtonInactiveText",		HIText,   kThemeTextColorPushButtonInactive },
-{"PushButtonPressedText",		HIText,   kThemeTextColorPushButtonPressed },
-{"BevelButtonActiveText",		HIText,   kThemeTextColorBevelButtonActive },
-{"BevelButtonInactiveText",		HIText,   kThemeTextColorBevelButtonInactive },
-{"BevelButtonPressedText",		HIText,   kThemeTextColorBevelButtonPressed },
-{"PopupButtonActiveText",		HIText,   kThemeTextColorPopupButtonActive },
-{"PopupButtonInactiveText",		HIText,   kThemeTextColorPopupButtonInactive },
-{"PopupButtonPressedText",		HIText,   kThemeTextColorPopupButtonPressed },
-{"IconLabelText",			HIText,   kThemeTextColorIconLabel },
-{"ListViewText",			HIText,   kThemeTextColorListView },
-{"DocumentWindowTitleActiveText",	HIText,   kThemeTextColorDocumentWindowTitleActive },
-{"DocumentWindowTitleInactiveText",	HIText,   kThemeTextColorDocumentWindowTitleInactive },
-{"MovableModalWindowTitleActiveText",  	HIText,   kThemeTextColorMovableModalWindowTitleActive },
-{"MovableModalWindowTitleInactiveText",	HIText,   kThemeTextColorMovableModalWindowTitleInactive },
-{"UtilityWindowTitleActiveText",	HIText,   kThemeTextColorUtilityWindowTitleActive },
-{"UtilityWindowTitleInactiveText",	HIText,   kThemeTextColorUtilityWindowTitleInactive },
-{"PopupWindowTitleActiveText",		HIText,   kThemeTextColorPopupWindowTitleActive },
-{"PopupWindowTitleInactiveText",	HIText,   kThemeTextColorPopupWindowTitleInactive },
-{"RootMenuActiveText",			HIText,   kThemeTextColorRootMenuActive },
-{"RootMenuSelectedText",		HIText,   kThemeTextColorRootMenuSelected },
-{"RootMenuDisabledText",		HIText,   kThemeTextColorRootMenuDisabled },
-{"MenuItemActiveText",			HIText,   kThemeTextColorMenuItemActive },
-{"MenuItemSelectedText",		HIText,   kThemeTextColorMenuItemSelected },
-{"MenuItemDisabledText",		HIText,   kThemeTextColorMenuItemDisabled },
-{"PopupLabelActiveText",		HIText,   kThemeTextColorPopupLabelActive },
-{"PopupLabelInactiveText",		HIText,   kThemeTextColorPopupLabelInactive },
-{"TabFrontActiveText",			HIText,   kThemeTextColorTabFrontActive },
-{"TabNonFrontActiveText",		HIText,   kThemeTextColorTabNonFrontActive },
-{"TabNonFrontPressedText",		HIText,   kThemeTextColorTabNonFrontPressed },
-{"TabFrontInactiveText",		HIText,   kThemeTextColorTabFrontInactive },
-{"TabNonFrontInactiveText",		HIText,   kThemeTextColorTabNonFrontInactive },
-{"IconLabelSelectedText",		HIText,   kThemeTextColorIconLabelSelected },
-{"BevelButtonStickyActiveText",		HIText,   kThemeTextColorBevelButtonStickyActive },
-{"BevelButtonStickyInactiveText",	HIText,   kThemeTextColorBevelButtonStickyInactive },
-{"NotificationText",			HIText,   kThemeTextColorNotification },
-{"SystemDetailText",			HIText,   kThemeTextColorSystemDetail },
-{"PlacardBackground",			HIBackground, kThemeBackgroundPlacard },
-{"WindowHeaderBackground",		HIBackground, kThemeBackgroundWindowHeader },
-{"ListViewWindowHeaderBackground",	HIBackground, kThemeBackgroundListViewWindowHeader },
-{"MetalBackground",			HIBackground, kThemeBackgroundMetal },
+{"ButtonText",				HIText,   kThemeTextColorPushButtonActive, NULL, 0, NULL },
+{"MenuActiveText",			HIText,   kThemeTextColorMenuItemSelected, NULL, 0, NULL },
+{"MenuDisabled",			HIText,   kThemeTextColorMenuItemDisabled, NULL, 0, NULL },
+{"MenuText",				HIText,   kThemeTextColorMenuItemActive, NULL, 0, NULL },
+{"BlackText",				HIText,   kThemeTextColorBlack, NULL, 0, NULL },
+{"DialogActiveText",			HIText,   kThemeTextColorDialogActive, NULL, 0, NULL },
+{"DialogInactiveText",			HIText,   kThemeTextColorDialogInactive, NULL, 0, NULL },
+{"AlertActiveText",			HIText,   kThemeTextColorAlertActive, NULL, 0, NULL },
+{"AlertInactiveText",			HIText,   kThemeTextColorAlertInactive, NULL, 0, NULL },
+{"ModelessDialogActiveText",		HIText,   kThemeTextColorModelessDialogActive, NULL, 0, NULL },
+{"ModelessDialogInactiveText",		HIText,   kThemeTextColorModelessDialogInactive, NULL, 0, NULL },
+{"WindowHeaderActiveText",		HIText,   kThemeTextColorWindowHeaderActive, NULL, 0, NULL },
+{"WindowHeaderInactiveText",		HIText,   kThemeTextColorWindowHeaderInactive, NULL, 0, NULL },
+{"PlacardActiveText",			HIText,   kThemeTextColorPlacardActive, NULL, 0, NULL },
+{"PlacardInactiveText",			HIText,   kThemeTextColorPlacardInactive, NULL, 0, NULL },
+{"PlacardPressedText",			HIText,   kThemeTextColorPlacardPressed, NULL, 0, NULL },
+{"PushButtonActiveText",		HIText,   kThemeTextColorPushButtonActive, NULL, 0, NULL },
+{"PushButtonInactiveText",		HIText,   kThemeTextColorPushButtonInactive, NULL, 0, NULL },
+{"PushButtonPressedText",		HIText,   kThemeTextColorPushButtonPressed, NULL, 0, NULL },
+{"BevelButtonActiveText",		HIText,   kThemeTextColorBevelButtonActive, NULL, 0, NULL },
+{"BevelButtonInactiveText",		HIText,   kThemeTextColorBevelButtonInactive, NULL, 0, NULL },
+{"BevelButtonPressedText",		HIText,   kThemeTextColorBevelButtonPressed, NULL, 0, NULL },
+{"PopupButtonActiveText",		HIText,   kThemeTextColorPopupButtonActive, NULL, 0, NULL },
+{"PopupButtonInactiveText",		HIText,   kThemeTextColorPopupButtonInactive, NULL, 0, NULL },
+{"PopupButtonPressedText",		HIText,   kThemeTextColorPopupButtonPressed, NULL, 0, NULL },
+{"IconLabelText",			HIText,   kThemeTextColorIconLabel, NULL, 0, NULL },
+{"ListViewText",			HIText,   kThemeTextColorListView, NULL, 0, NULL },
+{"DocumentWindowTitleActiveText",	HIText,   kThemeTextColorDocumentWindowTitleActive, NULL, 0, NULL },
+{"DocumentWindowTitleInactiveText",	HIText,   kThemeTextColorDocumentWindowTitleInactive, NULL, 0, NULL },
+{"MovableModalWindowTitleActiveText",  	HIText,   kThemeTextColorMovableModalWindowTitleActive, NULL, 0, NULL },
+{"MovableModalWindowTitleInactiveText",	HIText,   kThemeTextColorMovableModalWindowTitleInactive, NULL, 0, NULL },
+{"UtilityWindowTitleActiveText",	HIText,   kThemeTextColorUtilityWindowTitleActive, NULL, 0, NULL },
+{"UtilityWindowTitleInactiveText",	HIText,   kThemeTextColorUtilityWindowTitleInactive, NULL, 0, NULL },
+{"PopupWindowTitleActiveText",		HIText,   kThemeTextColorPopupWindowTitleActive, NULL, 0, NULL },
+{"PopupWindowTitleInactiveText",	HIText,   kThemeTextColorPopupWindowTitleInactive, NULL, 0, NULL },
+{"RootMenuActiveText",			HIText,   kThemeTextColorRootMenuActive, NULL, 0, NULL },
+{"RootMenuSelectedText",		HIText,   kThemeTextColorRootMenuSelected, NULL, 0, NULL },
+{"RootMenuDisabledText",		HIText,   kThemeTextColorRootMenuDisabled, NULL, 0, NULL },
+{"MenuItemActiveText",			HIText,   kThemeTextColorMenuItemActive, NULL, 0, NULL },
+{"MenuItemSelectedText",		HIText,   kThemeTextColorMenuItemSelected, NULL, 0, NULL },
+{"MenuItemDisabledText",		HIText,   kThemeTextColorMenuItemDisabled, NULL, 0, NULL },
+{"PopupLabelActiveText",		HIText,   kThemeTextColorPopupLabelActive, NULL, 0, NULL },
+{"PopupLabelInactiveText",		HIText,   kThemeTextColorPopupLabelInactive, NULL, 0, NULL },
+{"TabFrontActiveText",			HIText,   kThemeTextColorTabFrontActive, NULL, 0, NULL },
+{"TabNonFrontActiveText",		HIText,   kThemeTextColorTabNonFrontActive, NULL, 0, NULL },
+{"TabNonFrontPressedText",		HIText,   kThemeTextColorTabNonFrontPressed, NULL, 0, NULL },
+{"TabFrontInactiveText",		HIText,   kThemeTextColorTabFrontInactive, NULL, 0, NULL },
+{"TabNonFrontInactiveText",		HIText,   kThemeTextColorTabNonFrontInactive, NULL, 0, NULL },
+{"IconLabelSelectedText",		HIText,   kThemeTextColorIconLabelSelected, NULL, 0, NULL },
+{"BevelButtonStickyActiveText",		HIText,   kThemeTextColorBevelButtonStickyActive, NULL, 0, NULL },
+{"BevelButtonStickyInactiveText",	HIText,   kThemeTextColorBevelButtonStickyInactive, NULL, 0, NULL },
+{"NotificationText",			HIText,   kThemeTextColorNotification, NULL, 0, NULL },
+{"SystemDetailText",			HIText,   kThemeTextColorSystemDetail, NULL, 0, NULL },
+{"PlacardBackground",			HIBackground, kThemeBackgroundPlacard, NULL, 0, NULL },
+{"WindowHeaderBackground",		HIBackground, kThemeBackgroundWindowHeader, NULL, 0, NULL },
+{"ListViewWindowHeaderBackground",	HIBackground, kThemeBackgroundListViewWindowHeader, NULL, 0, NULL },
+{"MetalBackground",			HIBackground, kThemeBackgroundMetal, NULL, 0, NULL },
 
-{"SecondaryGroupBoxBackground",		HIBackground, kThemeBackgroundSecondaryGroupBox },
-{"TabPaneBackground",			HIBackground, kThemeBackgroundTabPane },
-{"WhiteText",				HIText,   kThemeTextColorWhite },
-{"Black",				HIBrush,  kThemeBrushBlack },
-{"White",				HIBrush,  kThemeBrushWhite },
+{"SecondaryGroupBoxBackground",		HIBackground, kThemeBackgroundSecondaryGroupBox, NULL, 0, NULL },
+{"TabPaneBackground",			HIBackground, kThemeBackgroundTabPane, NULL, 0, NULL },
+{"WhiteText",				HIText,   kThemeTextColorWhite, NULL, 0, NULL },
+{"Black",				HIBrush,  kThemeBrushBlack, NULL, 0, NULL },
+{"White",				HIBrush,  kThemeBrushWhite, NULL, 0, NULL },
 
     /*
      * Dynamic Colors
      */
 
-{"WindowBackgroundColor",	    ttkBackground, 0 },
-{"WindowBackgroundColor1",	    ttkBackground, 1 },
-{"WindowBackgroundColor2",	    ttkBackground, 2 },
-{"WindowBackgroundColor3",	    ttkBackground, 3 },
-{"WindowBackgroundColor4",	    ttkBackground, 4 },
-{"WindowBackgroundColor5",	    ttkBackground, 5 },
-{"WindowBackgroundColor6",	    ttkBackground, 6 },
-{"WindowBackgroundColor7",	    ttkBackground, 7 },
+{"WindowBackgroundColor",	    ttkBackground, 0, NULL, 0, NULL },
+{"WindowBackgroundColor1",	    ttkBackground, 1, NULL, 0, NULL },
+{"WindowBackgroundColor2",	    ttkBackground, 2, NULL, 0, NULL },
+{"WindowBackgroundColor3",	    ttkBackground, 3, NULL, 0, NULL },
+{"WindowBackgroundColor4",	    ttkBackground, 4, NULL, 0, NULL },
+{"WindowBackgroundColor5",	    ttkBackground, 5, NULL, 0, NULL },
+{"WindowBackgroundColor6",	    ttkBackground, 6, NULL, 0, NULL },
+{"WindowBackgroundColor7",	    ttkBackground, 7, NULL, 0, NULL },
 /* Apple's SecondaryLabelColor is the same as their LabelColor so we roll our own. */
-{"SecondaryLabelColor",		    ttkBackground, 14 },
+{"SecondaryLabelColor",		    ttkBackground, 14, NULL, 0, NULL },
 
-{"TextColor",			    semantic, 0, "textColor" },
-{"SelectedTextColor",		    semantic, 0, "selectedTextColor" },
-{"LabelColor",			    semantic, 0, "textColor"},
-{"LabelColor",			    semantic, 0, "labelColor"},
-{"ControlTextColor",      	    semantic, 0, "controlTextColor" },
-{"DisabledControlTextColor",	    semantic, 0, "disabledControlTextColor" },
+{"TextColor",			    semantic, 0, "textColor", 0, NULL },
+{"SelectedTextColor",		    semantic, 0, "selectedTextColor", 0, NULL },
+{"LabelColor",			    semantic, 0, "textColor", 0, NULL },
+{"LabelColor",			    semantic, 0, "labelColor", 0, NULL },
+{"ControlTextColor",      	    semantic, 0, "controlTextColor", 0, NULL },
+{"DisabledControlTextColor",	    semantic, 0, "disabledControlTextColor", 0, NULL },
 #if MAC_OS_X_VERSION_MAX_ALLOWED > 1060
-{"SelectedTabTextColor",	    semantic, 0, "whiteColor" },
+{"SelectedTabTextColor",	    semantic, 0, "whiteColor", 0, NULL },
 #else
-{"SelectedTabTextColor",	    semantic, 0, "blackColor" },
+{"SelectedTabTextColor",	    semantic, 0, "blackColor", 0, NULL },
 #endif
-{"TextBackgroundColor",		    semantic, 0, "textBackgroundColor" },
-{"SelectedTextBackgroundColor",	    semantic, 0, "selectedTextBackgroundColor" },
-{"ControlAccentColor",		    semantic, 0, "controlAccentColor" },
-{"LinkColor",			    semantic, 0, "blueColor" },
-{"LinkColor",			    semantic, 0, "linkColor" },
-{"PlaceholderTextColor",	    semantic, 0, "grayColor" },
-{"PlaceholderTextColor",	    semantic, 0, "placeholderTextColor" },
-{"SeparatorColor",		    semantic, 0, "grayColor" },
-{"SeparatorColor",		    semantic, 0, "separatorColor" },
-{NULL,				    0, 0 }
+{"TextBackgroundColor",		    semantic, 0, "textBackgroundColor", 0, NULL },
+{"SelectedTextBackgroundColor",	    semantic, 0, "selectedTextBackgroundColor", 0, NULL },
+{"ControlAccentColor",		    semantic, 0, "controlAccentColor", 0, NULL },
+{"LinkColor",			    semantic, 0, "blueColor", 0, NULL },
+{"LinkColor",			    semantic, 0, "linkColor", 0, NULL },
+{"PlaceholderTextColor",	    semantic, 0, "grayColor", 0, NULL },
+{"PlaceholderTextColor",	    semantic, 0, "placeholderTextColor", 0, NULL },
+{"SeparatorColor",		    semantic, 0, "grayColor", 0, NULL },
+{"SeparatorColor",		    semantic, 0, "separatorColor", 0, NULL },
+{NULL,				    0, 0, NULL, 0, NULL }
 };
 
 #endif
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c
index dceb051..379e25c 100644
--- a/macosx/tkMacOSXMenu.c
+++ b/macosx/tkMacOSXMenu.c
@@ -124,7 +124,7 @@ static int	ModifierCharWidth(Tk_Font tkfont);
  * the menu was posted.  For example, opening a menu during the Rube Goldberg
  * demo would cause the animation to stop.  This was also the case for
  * menubuttons.
- * 
+ *
  * The TKBackground object below works around this problem, and allows a Tk
  * event loop to run while a menu is open.  It is a subclass of NSThread which
  * inserts requests to call [NSApp _runBackgroundLoop] onto the queue
@@ -142,25 +142,25 @@ static int	ModifierCharWidth(Tk_Font tkfont);
     NSArray *modeArray = [NSArray arrayWithObjects: NSEventTrackingRunLoopMode,
 				  nil];
     while(1) {
-	
+
 	/*
 	 * Queue a request to process Tk events during event tracking.
 	 */
-	
-	[NSApp performSelectorOnMainThread:@selector(_runBackgroundLoop) 
+
+	[NSApp performSelectorOnMainThread:@selector(_runBackgroundLoop)
 				withObject:nil
-			     waitUntilDone:true 
+			     waitUntilDone:true
 				     modes:modeArray];
 	if (self.cancelled) {
 	    [NSThread exit];
 	}
-	
+
 	/*
 	 * Allow the tracked events to be processed too.
 	 */
 
 	[NSThread sleepForTimeInterval:0.001];
-    }	
+    }
 }
 @end
 
diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c
index dc9ea32..e183ca7 100644
--- a/macosx/tkMacOSXXStubs.c
+++ b/macosx/tkMacOSXXStubs.c
@@ -201,8 +201,8 @@ TkpOpenDisplay(
 	}
     }
 
-    display = ckalloc(sizeof(Display));
-    screen  = ckalloc(sizeof(Screen));
+    display = (Display *)ckalloc(sizeof(Display));
+    screen = (Screen *)ckalloc(sizeof(Screen));
     bzero(display, sizeof(Display));
     bzero(screen, sizeof(Screen));
 
@@ -254,7 +254,7 @@ TkpOpenDisplay(
     screen->white_pixel = 0x00FFFFFF;
     screen->ext_data	= (XExtData *) &maxBounds;
 
-    screen->root_visual = ckalloc(sizeof(Visual));
+    screen->root_visual = (Visual *)ckalloc(sizeof(Visual));
     screen->root_visual->visualid     = 0;
     screen->root_visual->c_class      = TrueColor;
     screen->root_visual->red_mask     = 0x00FF0000;
@@ -269,7 +269,7 @@ TkpOpenDisplay(
 
     TkMacOSXDisplayChanged(display);
 
-    gMacDisplay = ckalloc(sizeof(TkDisplay));
+    gMacDisplay = (TkDisplay *)ckalloc(sizeof(TkDisplay));
 
     /*
      * This is the quickest way to make sure that all the *Init flags get
@@ -387,7 +387,7 @@ TkClipCleanup(
 
 static XID
 MacXIdAlloc(
-    Display *display)		/* Display for which to allocate. */
+    TCL_UNUSED(Display *))		/* Display for which to allocate. */
 {
     static long int cur_id = 100;
     /*
@@ -417,8 +417,8 @@ MacXIdAlloc(
 
 static int
 DefaultErrorHandler(
-    Display* display,
-    XErrorEvent* err_evt)
+    TCL_UNUSED(Display *),
+    TCL_UNUSED(XErrorEvent *))
 {
     /*
      * This call should never be called. Tk replaces it with its own error
@@ -431,8 +431,8 @@ DefaultErrorHandler(
 
 char *
 XGetAtomName(
-    Display * display,
-    Atom atom)
+    Display *display,
+    TCL_UNUSED(Atom))
 {
     display->request++;
     return NULL;
@@ -440,7 +440,7 @@ XGetAtomName(
 
 XErrorHandler
 XSetErrorHandler(
-    XErrorHandler handler)
+    TCL_UNUSED(XErrorHandler))
 {
     return DefaultErrorHandler;
 }
@@ -448,7 +448,7 @@ XSetErrorHandler(
 Window
 XRootWindow(
     Display *display,
-    int screen_number)
+    TCL_UNUSED(int))
 {
     display->request++;
     return ROOT_ID;
@@ -491,14 +491,14 @@ XGetGeometry(
 
 int
 XChangeProperty(
-    Display* display,
-    Window w,
-    Atom property,
-    Atom type,
-    int format,
-    int mode,
-    _Xconst unsigned char* data,
-    int nelements)
+    TCL_UNUSED(Display *),
+    TCL_UNUSED(Window),
+    TCL_UNUSED(Atom),
+    TCL_UNUSED(Atom),
+    TCL_UNUSED(int),
+    TCL_UNUSED(int),
+    TCL_UNUSED(_Xconst unsigned char *),
+    TCL_UNUSED(int))
 {
     Debugger();
     return Success;
@@ -506,9 +506,9 @@ XChangeProperty(
 
 int
 XSelectInput(
-    Display* display,
-    Window w,
-    long event_mask)
+    TCL_UNUSED(Display *),
+    TCL_UNUSED(Window),
+    TCL_UNUSED(long))
 {
     Debugger();
     return Success;
@@ -516,40 +516,16 @@ XSelectInput(
 
 int
 XBell(
-    Display* display,
-    int percent)
+    TCL_UNUSED(Display *),
+    TCL_UNUSED(int))
 {
     NSBeep();
     return Success;
 }
 
-#if 0
-void
-XSetWMNormalHints(
-    Display* display,
-    Window w,
-    XSizeHints* hints)
-{
-    /*
-     * Do nothing. Shouldn't even be called.
-     */
-}
-
-XSizeHints *
-XAllocSizeHints(void)
-{
-    /*
-     * Always return NULL. Tk code checks to see if NULL is returned & does
-     * nothing if it is.
-     */
-
-    return NULL;
-}
-#endif
-
 GContext
 XGContextFromGC(
-    GC gc)
+    TCL_UNUSED(GC))
 {
     /*
      * TODO: currently a no-op
@@ -560,11 +536,11 @@ XGContextFromGC(
 
 Status
 XSendEvent(
-    Display* display,
-    Window w,
-    Bool propagate,
-    long event_mask,
-    XEvent* event_send)
+    TCL_UNUSED(Display *),
+    TCL_UNUSED(Window),
+    TCL_UNUSED(Bool),
+    TCL_UNUSED(long),
+    TCL_UNUSED(XEvent *))
 {
     Debugger();
     return 0;
@@ -572,56 +548,31 @@ XSendEvent(
 
 int
 XClearWindow(
-    Display* display,
-    Window w)
-{
-    return Success;
-}
-
-/*
-int
-XDrawPoint(
-    Display* display,
-    Drawable d,
-    GC gc,
-    int x,
-    int y)
-{
-    return Success;
-}
-
-int
-XDrawPoints(
-    Display* display,
-    Drawable d,
-    GC gc,
-    XPoint* points,
-    int npoints,
-    int mode)
+    TCL_UNUSED(Display *),
+    TCL_UNUSED(Window))
 {
     return Success;
 }
-*/
 
 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)
+    TCL_UNUSED(Display *),
+    TCL_UNUSED(Window),
+    TCL_UNUSED(Window),
+    TCL_UNUSED(int),
+    TCL_UNUSED(int),
+    TCL_UNUSED(unsigned int),
+    TCL_UNUSED(unsigned int),
+    TCL_UNUSED(int),
+    TCL_UNUSED(int))
 {
     return Success;
 }
 
 int
 XQueryColor(
-    Display* display,
-    Colormap colormap,
+    TCL_UNUSED(Display *),
+    TCL_UNUSED(Colormap),
     XColor* def_in_out)
 {
     unsigned long p;
@@ -642,8 +593,8 @@ XQueryColor(
 
 int
 XQueryColors(
-    Display* display,
-    Colormap colormap,
+    TCL_UNUSED(Display *),
+    TCL_UNUSED(Colormap),
     XColor* defs_in_out,
     int ncolors)
 {
@@ -667,14 +618,13 @@ XQueryColors(
 }
 
 int
-XQueryTree(display, w, root_return, parent_return, children_return,
-	nchildren_return)
-    Display* display;
-    Window w;
-    Window* root_return;
-    Window* parent_return;
-    Window** children_return;
-    unsigned int* nchildren_return;
+XQueryTree(
+    TCL_UNUSED(Display *),
+    TCL_UNUSED(Window),
+    TCL_UNUSED(Window *),
+    TCL_UNUSED(Window *),
+    TCL_UNUSED(Window **),
+    TCL_UNUSED(unsigned int *))
 {
     return 0;
 }
@@ -683,17 +633,17 @@ XQueryTree(display, w, root_return, parent_return, children_return,
 int
 XGetWindowProperty(
     Display *display,
-    Window w,
-    Atom property,
-    long long_offset,
-    long long_length,
-    Bool delete,
-    Atom req_type,
+    TCL_UNUSED(Window),
+    TCL_UNUSED(Atom),
+    TCL_UNUSED(long),
+    TCL_UNUSED(long),
+    TCL_UNUSED(Bool),
+    TCL_UNUSED(Atom),
     Atom *actual_type_return,
     int *actual_format_return,
     unsigned long *nitems_return,
     unsigned long *bytes_after_return,
-    unsigned char ** prop_return)
+    TCL_UNUSED(unsigned char **))
 {
     display->request++;
     *actual_type_return = None;
@@ -704,7 +654,7 @@ XGetWindowProperty(
 
 int
 XRefreshKeyboardMapping(
-    XMappingEvent *x)
+    TCL_UNUSED(XMappingEvent *))
 {
     /* used by tkXEvent.c */
     Debugger();
@@ -714,8 +664,8 @@ XRefreshKeyboardMapping(
 int
 XSetIconName(
     Display* display,
-    Window w,
-    const char *icon_name)
+    TCL_UNUSED(Window),
+    TCL_UNUSED(const char *))
 {
     /*
      * This is a no-op, no icon name for Macs.
@@ -727,7 +677,7 @@ XSetIconName(
 int
 XForceScreenSaver(
     Display* display,
-    int mode)
+    TCL_UNUSED(int))
 {
     /*
      * This function is just a no-op. It is defined to reset the screen saver.
@@ -741,8 +691,8 @@ XForceScreenSaver(
 
 void
 Tk_FreeXId(
-    Display *display,
-    XID xid)
+    TCL_UNUSED(Display *),
+    TCL_UNUSED(XID))
 {
     /* no-op function needed for stubs implementation. */
 }
@@ -750,7 +700,7 @@ Tk_FreeXId(
 int
 XSync(
     Display *display,
-    Bool discard)
+    TCL_UNUSED(Bool))
 {
     /*
      *  The main use of XSync is by the update command, which alternates
@@ -768,33 +718,6 @@ XSync(
     return 0;
 }
 
-#if 0
-int
-XSetClipRectangles(
-    Display *d,
-    GC gc,
-    int clip_x_origin,
-    int clip_y_origin,
-    XRectangle* rectangles,
-    int n,
-    int ordering)
-{
-    TkRegion clipRgn = TkCreateRegion();
-
-    while (n--) {
-	XRectangle rect = *rectangles;
-
-	rect.x += clip_x_origin;
-	rect.y += clip_y_origin;
-	TkUnionRectWithRegion(&rect, clipRgn, clipRgn);
-	rectangles++;
-    }
-    TkSetRegion(d, gc, clipRgn);
-    TkDestroyRegion(clipRgn);
-    return 1;
-}
-#endif
-
 /*
  *----------------------------------------------------------------------
  *
@@ -853,64 +776,64 @@ TkGetServerInfo(
 
 int
 XChangeWindowAttributes(
-    Display *display,
-    Window w,
-    unsigned long value_mask,
-    XSetWindowAttributes *attributes)
+    TCL_UNUSED(Display *),
+    TCL_UNUSED(Window),
+    TCL_UNUSED(unsigned long),
+    TCL_UNUSED(XSetWindowAttributes *))
 {
     return Success;
 }
 
 int
 XSetWindowBackground(
-    Display *display,
-    Window window,
-    unsigned long value)
+    TCL_UNUSED(Display *),
+    TCL_UNUSED(Window),
+    TCL_UNUSED(unsigned long))
 {
     return Success;
 }
 
 int
 XSetWindowBackgroundPixmap(
-    Display *display,
-    Window w,
-    Pixmap background_pixmap)
+    TCL_UNUSED(Display *),
+    TCL_UNUSED(Window),
+    TCL_UNUSED(Pixmap))
 {
     return Success;
 }
 
 int
 XSetWindowBorder(
-    Display *display,
-    Window w,
-    unsigned long border_pixel)
+    TCL_UNUSED(Display *),
+    TCL_UNUSED(Window),
+    TCL_UNUSED(unsigned long))
 {
     return Success;
 }
 
 int
 XSetWindowBorderPixmap(
-    Display *display,
-    Window w,
-    Pixmap border_pixmap)
+    TCL_UNUSED(Display *),
+    TCL_UNUSED(Window),
+    TCL_UNUSED(Pixmap))
 {
     return Success;
 }
 
 int
 XSetWindowBorderWidth(
-    Display *display,
-    Window w,
-    unsigned int width)
+    TCL_UNUSED(Display *),
+    TCL_UNUSED(Window),
+    TCL_UNUSED(unsigned int))
 {
     return Success;
 }
 
 int
 XSetWindowColormap(
-    Display *display,
-    Window w,
-    Colormap colormap)
+    TCL_UNUSED(Display *),
+    TCL_UNUSED(Window),
+    TCL_UNUSED(Colormap))
 {
     Debugger();
     return Success;
@@ -918,25 +841,25 @@ XSetWindowColormap(
 
 Status
 XStringListToTextProperty(
-    char **list,
-    int count,
-    XTextProperty *text_prop_return)
+    TCL_UNUSED(char **),
+    TCL_UNUSED(int),
+    TCL_UNUSED(XTextProperty *))
 {
     Debugger();
-    return (Status) 0;
+    return Success;
 }
 
 void
 XSetWMClientMachine(
-    Display *display,
-    Window w,
-    XTextProperty *text_prop)
+    TCL_UNUSED(Display *),
+    TCL_UNUSED(Window),
+    TCL_UNUSED(XTextProperty *))
 {
     Debugger();
 }
 
 XIC
-XCreateIC(XIM xim, ...)
+XCreateIC(TCL_UNUSED(XIM), ...)
 {
     Debugger();
     return (XIC) 0;
@@ -954,7 +877,7 @@ XVisualIDFromVisual(
 XAfterFunction
 XSynchronize(
     Display *display,
-    Bool onoff)
+    TCL_UNUSED(Bool))
 {
     display->request++;
     return NULL;
@@ -963,7 +886,7 @@ XSynchronize(
 #undef XUngrabServer
 int
 XUngrabServer(
-    Display *display)
+    TCL_UNUSED(Display *))
 {
     return 0;
 }
@@ -980,7 +903,7 @@ XNoOp(
 #undef XGrabServer
 int
 XGrabServer(
-    Display *display)
+    TCL_UNUSED(Display *))
 {
     return 0;
 }
@@ -998,7 +921,7 @@ XFree(
 #undef XFlush
 int
 XFlush(
-    Display *display)
+    TCL_UNUSED(Display *))
 {
     return 0;
 }
@@ -1022,7 +945,7 @@ XFlush(
 
 const char *
 TkGetDefaultScreenName(
-    Tcl_Interp *interp,		/* Not used. */
+    TCL_UNUSED(Tcl_Interp *),
     const char *screenName)		/* If NULL, use default string. */
 {
     if ((screenName == NULL) || (screenName[0] == '\0')) {
@@ -1049,7 +972,7 @@ TkGetDefaultScreenName(
 
 long
 Tk_GetUserInactiveTime(
-    Display *dpy)
+    TCL_UNUSED(Display *))
 {
     io_registry_entry_t regEntry;
     CFMutableDictionaryRef props = NULL;
@@ -1115,7 +1038,7 @@ Tk_GetUserInactiveTime(
 
 void
 Tk_ResetUserInactiveTime(
-    Display *dpy)
+    TCL_UNUSED(Display *))
 {
     lastInactivityReset = TkpGetMS();
 }
-- 
cgit v0.12


From 7510073a3db80f1dd4261ad1f602d4fc719efdb8 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 4 Aug 2020 14:26:50 +0000
Subject: Minor doc fixes

---
 doc/GetScroll.3  | 4 ++--
 doc/SetOptions.3 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/GetScroll.3 b/doc/GetScroll.3
index a71986d..2615301 100644
--- a/doc/GetScroll.3
+++ b/doc/GetScroll.3
@@ -25,13 +25,13 @@ int
 Interpreter to use for error reporting.
 .AP int objc in
 Number of Tcl_Obj's in \fIobjv\fR array.
-.AP "Tcl_Obj *const" objv[] in
+.AP "Tcl_Obj *const *" objv in
 Argument objects.  These represent the entire widget command, of
 which the first word is typically the widget name and the second
 word is typically \fBxview\fR or \fByview\fR.
 .AP int argc in
 Number of strings in \fIargv\fR array.
-.AP "const char" *argv[] in
+.AP "const char **" argv in
 Argument strings.  These represent the entire widget command, of
 which the first word is typically the widget name and the second
 word is typically \fBxview\fR or \fByview\fR.
diff --git a/doc/SetOptions.3 b/doc/SetOptions.3
index ae6e353..2a37de7 100644
--- a/doc/SetOptions.3
+++ b/doc/SetOptions.3
@@ -63,7 +63,7 @@ no window-dependent options, then a NULL value may be supplied for
 this argument.
 .AP int objc in
 Number of values in \fIobjv\fR.
-.AP Tcl_Obj "*const objv[]" in
+.AP Tcl_Obj "*const *objv" in
 Command-line arguments for setting configuring options.
 .AP Tk_SavedOptions *savePtr out
 If not NULL, the structure pointed to by this argument is filled
-- 
cgit v0.12


From 449cabad4759a1b39036c3ac365942bb60b6a06a Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Tue, 4 Aug 2020 15:30:04 +0000
Subject: Update color documentation.

---
 doc/colors.n | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/doc/colors.n b/doc/colors.n
index c1609b9..847dbaa 100644
--- a/doc/colors.n
+++ b/doc/colors.n
@@ -784,10 +784,11 @@ YellowGreen	154	205 	50
 .TP
 \fBMac OS X\fR
 .
-On macOS, the following additional system colors are available.
-This first group contains all colors available in the HIToolbox library.
-(Note that in some cases the actual color values may depend on the
-current Appearance.)
+On macOS, the following additional system colors are available.  This
+first group contains all of the HIBrush colors available in the
+HIToolbox library. Note that on macOS 10.14 (Mojave) and later these
+colors are unlikely to match the color actually used for the purpose
+suggested by the color name.
 .RS
 .DS
 systemActiveAreaFill
@@ -928,27 +929,25 @@ systemWindowHeaderInactiveText
 .DE
 .RE
 .
-The second group of MacOS colors below are based on Apple's "semantic"
-NScolors.  On OSX 10.14 (Mojave) and later these colors change value
-when Dark Mode is enabled.  However, the change is only observable
-when the Apple window manager is drawing to the screen. So the
-\fBwinfo rgb\fR command will return the color coordinates used in the
-standard Aqua mode, even if Dark Mode has been selected in the system
-preferences.  The numbered systemWindowBackgroundColors are used in
-the \fBttk::notebook\fR and \fBttk::labelframe\fR widgets to provide a
-contrasting background.  Each numbered color constrasts with its
-predecessor.
+The group of MacOS colors below are based on Apple's "semantic"
+NSColors.  On OSX 10.14 (Mojave) and later these colors change value
+when Dark Mode is enabled.  The numbered systemWindowBackgroundColors
+are used in the \fBttk::notebook\fR and \fBttk::labelframe\fR widgets
+to provide a contrasting background.  Each numbered color constrasts
+with its predecessor.
 .RS
 .DS
 systemControlAccentColor
 systemControlTextColor
 systemDisabledControlTextColor
-systemLabelColor  
+systemLabelColor
 systemLinkColor
-systemSelectedTextBackgroundColor  
+systemPlaceholderTextColor
+systemSelectedTextBackgroundColor
 systemSelectedTextColor
+systemSeparatorColor
 systemTextBackgroundColor
-systemTextColor  
+systemTextColor
 systemWindowBackgroundColor
 systemWindowBackgroundColor1
 systemWindowBackgroundColor2
-- 
cgit v0.12


From da9d597e856d8e25317f1a831f0acdcae3b012b5 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 4 Aug 2020 21:34:11 +0000
Subject: Rename references to CrtSlave -> CrtAlias. Some more slave -> child
 changes not affecting the API

---
 doc/loadTk.n                        |  14 +-
 doc/selection.n                     |   2 +-
 generic/tkConsole.c                 |   4 +-
 generic/tkWindow.c                  |  32 ++--
 library/demos/dialog1.tcl           |  14 +-
 library/safetk.tcl                  |  80 ++++-----
 macosx/Tk.xcode/project.pbxproj     |   4 +-
 macosx/Tk.xcodeproj/project.pbxproj |   4 +-
 tests/constraints.tcl               |   2 +-
 tests/safe.test                     |   2 +-
 tests/safePrimarySelection.test     | 328 ++++++++++++++++++------------------
 11 files changed, 243 insertions(+), 243 deletions(-)

diff --git a/doc/loadTk.n b/doc/loadTk.n
index 3673e98..e1c93c8 100644
--- a/doc/loadTk.n
+++ b/doc/loadTk.n
@@ -11,7 +11,7 @@
 .SH NAME
 safe::loadTk \- Load Tk into a safe interpreter.
 .SH SYNOPSIS
-\fBsafe::loadTk \fIslave\fR ?\fB\-use\fR \fIwindowId\fR? ?\fB\-display\fR \fIdisplayName\fR?
+\fBsafe::loadTk \fIchild\fR ?\fB\-use\fR \fIwindowId\fR? ?\fB\-display\fR \fIdisplayName\fR?
 .BE
 .SH DESCRIPTION
 .PP
@@ -43,13 +43,13 @@ the \fBSECURITY ISSUES\fR section below for implementation details.
 Please read the \fBsafe\fR manual page for Tcl to learn about the basic
 security considerations for Safe Tcl.
 .PP
-\fBsafe::loadTk\fR adds the value of \fBtk_library\fR taken from the master
+\fBsafe::loadTk\fR adds the value of \fBtk_library\fR taken from the parent
 interpreter to the virtual access path of the safe interpreter so that
 auto-loading will work in the safe interpreter.
 .PP
-Tk initialization is now safe with respect to not trusting the slave's state
-for startup. \fBsafe::loadTk\fR registers the slave's name so when the Tk
-initialization (\fBTk_SafeInit\fR) is called and in turn calls the master's
+Tk initialization is now safe with respect to not trusting the child's state
+for startup. \fBsafe::loadTk\fR registers the child's name so when the Tk
+initialization (\fBTk_SafeInit\fR) is called and in turn calls the parent's
 \fBsafe::InitTk\fR it will return the desired \fBargv\fR equivalent
 (\fB\-use\fR \fIwindowId\fR, correct \fB\-display\fR, etc.)
 .PP
@@ -62,8 +62,8 @@ fatal X error.
 .SH "SEE ALSO"
 safe(n), interp(n), library(n), load(n), package(n), source(n), unknown(n)
 .SH KEYWORDS
-alias, auto-loading, auto_mkindex, load, master interpreter, safe
-interpreter, slave interpreter, source
+alias, auto-loading, auto_mkindex, load, parent interpreter, safe
+interpreter, child interpreter, source
 '\" Local Variables:
 '\" mode: nroff
 '\" End:
diff --git a/doc/selection.n b/doc/selection.n
index ec678fa..6fc23a5 100644
--- a/doc/selection.n
+++ b/doc/selection.n
@@ -150,7 +150,7 @@ A GUI event, for example \fB<<PasteSelection>>\fR, can copy the \fBPRIMARY\fR se
 .PP
 On X11, the \fBPRIMARY\fR selection is a system-wide feature of the X server, allowing communication between different processes that are X11 clients.
 .PP
-On Windows, the \fBPRIMARY\fR selection is not provided by the system, but only by Tk, and so it is shared only between windows of a master interpreter and its unsafe slave interpreters.  It is not shared between interpreters in different processes or different threads.  Each master interpreter has a separate \fBPRIMARY\fR selection that is shared only with its unsafe slaves.
+On Windows, the \fBPRIMARY\fR selection is not provided by the system, but only by Tk, and so it is shared only between windows of a parent interpreter and its unsafe child interpreters.  It is not shared between interpreters in different processes or different threads.  Each parent interpreter has a separate \fBPRIMARY\fR selection that is shared only with its unsafe slaves.
 .PP
 .SH SECURITY
 .PP
diff --git a/generic/tkConsole.c b/generic/tkConsole.c
index e8f5920..701ce77 100644
--- a/generic/tkConsole.c
+++ b/generic/tkConsole.c
@@ -816,7 +816,7 @@ InterpreterObjCmd(
 
     if ((otherInterp == NULL) || Tcl_InterpDeleted(otherInterp)) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"no active master interp", -1));
+		"no active parent interp", -1));
 	Tcl_SetErrorCode(interp, "TK", "CONSOLE", "NO_INTERP", NULL);
 	return TCL_ERROR;
     }
@@ -939,7 +939,7 @@ ConsoleDeleteProc(
  *
  * ConsoleEventProc --
  *
- *	This event function is registered on the main window of the slave
+ *	This event function is registered on the main window of the child
  *	interpreter. If the user or a running script causes the main window to
  *	be destroyed, then we need to inform the console interpreter by
  *	invoking "::tk::ConsoleExit".
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index 8ec18e2..a67329c 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.c
@@ -2969,7 +2969,7 @@ Tk_SafeInit(
      * Current risks:
      *
      * - No CPU time limit, no memory allocation limits, no color limits.
-     *   CPU time limits can be imposed by an unsafe master interpreter.
+     *   CPU time limits can be imposed by an unsafe parent interpreter.
      *
      * The actual code called is the same as Tk_Init but Tcl_IsSafe() is
      * checked at several places to differentiate the two initialisations.
@@ -3081,23 +3081,23 @@ Initialize(
     if (Tcl_IsSafe(interp)) {
 	/*
 	 * Get the clearance to start Tk and the "argv" parameters from the
-	 * master.
+	 * parent.
 	 */
 
 	/*
-	 * Step 1 : find the master and construct the interp name (could be a
+	 * Step 1 : find the parent and construct the interp name (could be a
 	 * function if new APIs were ok). We could also construct the path
 	 * while walking, but there is no API to get the name of an interp
 	 * either.
 	 */
 
-	Tcl_Interp *master = interp;
+	Tcl_Interp *parent = interp;
 
-	while (Tcl_IsSafe(master)) {
-	    master = Tcl_GetMaster(master);
-	    if (master == NULL) {
+	while (Tcl_IsSafe(parent)) {
+	    parent = Tcl_GetMaster(parent);
+	    if (parent == NULL) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"no controlling master interpreter", -1));
+			"no controlling parent interpreter", -1));
 		Tcl_SetErrorCode(interp, "TK", "SAFE", "NO_MASTER", NULL);
 		return TCL_ERROR;
 	    }
@@ -3107,35 +3107,35 @@ Initialize(
 	 * Construct the name (rewalk...)
 	 */
 
-	code = Tcl_GetInterpPath(master, interp);
+	code = Tcl_GetInterpPath(parent, interp);
 	if (code != TCL_OK) {
 	    Tcl_Panic("Tcl_GetInterpPath broken!");
 	}
 
 	/*
-	 * Build the command to eval in trusted master.
+	 * Build the command to eval in trusted parent.
 	 */
 
 	cmd = Tcl_NewListObj(2, NULL);
 	Tcl_ListObjAppendElement(NULL, cmd,
 		Tcl_NewStringObj("::safe::TkInit", -1));
-	Tcl_ListObjAppendElement(NULL, cmd, Tcl_GetObjResult(master));
+	Tcl_ListObjAppendElement(NULL, cmd, Tcl_GetObjResult(parent));
 
 	/*
-	 * Step 2 : Eval in the master. The argument is the *reversed* interp
-	 * path of the slave.
+	 * Step 2 : Eval in the parent. The argument is the *reversed* interp
+	 * path of the child.
 	 */
 
 	Tcl_IncrRefCount(cmd);
-	code = Tcl_EvalObjEx(master, cmd, 0);
+	code = Tcl_EvalObjEx(parent, cmd, 0);
 	Tcl_DecrRefCount(cmd);
-	Tcl_TransferResult(master, code, interp);
+	Tcl_TransferResult(parent, code, interp);
 	if (code != TCL_OK) {
 	    return code;
 	}
 
 	/*
-	 * Use the master's result as argv. Note: We don't use the Obj
+	 * Use the parent's result as argv. Note: We don't use the Obj
 	 * interfaces to avoid dealing with cross interp refcounting and
 	 * changing the code below.
 	 */
diff --git a/library/demos/dialog1.tcl b/library/demos/dialog1.tcl
index 976e955..66d8c9a 100644
--- a/library/demos/dialog1.tcl
+++ b/library/demos/dialog1.tcl
@@ -2,16 +2,16 @@
 #
 # This demonstration script creates a dialog box with a local grab.
 
-interp create slave
-load {} Tk slave
-slave eval {
-    wm title . slave
+interp create child
+load {} Tk child
+child eval {
+    wm title . child
     wm geometry . +700+30
     pack [text .t -width 30 -height 10]
 }
 
 after idle {.dialog1.msg configure -wraplength 4i}
-set i [tk_dialog .dialog1 "Dialog with local grab" {This is a modal dialog box.  It uses Tk's "grab" command to create a "local grab" on the dialog box.  The grab prevents any mouse or keyboard events from getting to any other windows in the application until you have answered the dialog by invoking one of the buttons below.  However, you can still interact with other applications.  For example, you should be able to edit text in the window named "slave" which was created by a slave interpreter.} \
+set i [tk_dialog .dialog1 "Dialog with local grab" {This is a modal dialog box.  It uses Tk's "grab" command to create a "local grab" on the dialog box.  The grab prevents any mouse or keyboard events from getting to any other windows in the application until you have answered the dialog by invoking one of the buttons below.  However, you can still interact with other applications.  For example, you should be able to edit text in the window named "child" which was created by a child interpreter.} \
 info 0 OK Cancel {Show Code}]
 
 switch $i {
@@ -20,6 +20,6 @@ switch $i {
     2 {showCode .dialog1}
 }
 
-if {[interp exists slave]} {
-    interp delete slave
+if {[interp exists child]} {
+    interp delete child
 }
diff --git a/library/safetk.tcl b/library/safetk.tcl
index 9f8e25d..841a0b6 100644
--- a/library/safetk.tcl
+++ b/library/safetk.tcl
@@ -14,9 +14,9 @@
 # Note: It is now ok to let untrusted code being executed
 #       between the creation of the interp and the actual loading
 #       of Tk in that interp because the C side Tk_Init will
-#       now look up the master interp and ask its safe::TkInit
+#       now look up the parent interp and ask its safe::TkInit
 #       for the actual parameters to use for it's initialization (if allowed),
-#       not relying on the slave state.
+#       not relying on the child state.
 #
 
 # We use opt (optional arguments parsing)
@@ -29,31 +29,31 @@ namespace eval ::safe {
 }
 
 #
-# tkInterpInit : prepare the slave interpreter for tk loading
+# tkInterpInit : prepare the child interpreter for tk loading
 #                most of the real job is done by loadTk
-# returns the slave name (tkInterpInit does)
+# returns the child name (tkInterpInit does)
 #
-proc ::safe::tkInterpInit {slave argv} {
+proc ::safe::tkInterpInit {child argv} {
     global env tk_library
 
     # We have to make sure that the tk_library variable is normalized.
     set tk_library [file normalize $tk_library]
 
     # Clear Tk's access for that interp (path).
-    allowTk $slave $argv
+    allowTk $child $argv
 
     # Ensure tk_library and subdirs (eg, ttk) are on the access path
-    ::interp eval $slave [list set tk_library [::safe::interpAddToAccessPath $slave $tk_library]]
+    ::interp eval $child [list set tk_library [::safe::interpAddToAccessPath $child $tk_library]]
     foreach subdir [::safe::AddSubDirs [list $tk_library]] {
-	::safe::interpAddToAccessPath $slave $subdir
+	::safe::interpAddToAccessPath $child $subdir
     }
-    return $slave
+    return $child
 }
 
 
 # tkInterpLoadTk:
 # Do additional configuration as needed (calling tkInterpInit)
-# and actually load Tk into the slave.
+# and actually load Tk into the child.
 #
 # Either contained in the specified windowId (-use) or
 # creating a decorated toplevel for it.
@@ -62,37 +62,37 @@ proc ::safe::tkInterpInit {slave argv} {
 proc ::safe::loadTk {} {}
 
 ::tcl::OptProc ::safe::loadTk {
-    {slave -interp "name of the slave interpreter"}
+    {child -interp "name of the child interpreter"}
     {-use  -windowId {} "window Id to use (new toplevel otherwise)"}
     {-display -displayName {} "display name to use (current one otherwise)"}
 } {
     set displayGiven [::tcl::OptProcArgGiven "-display"]
     if {!$displayGiven} {
 	# Try to get the current display from "."
-	# (which might not exist if the master is tk-less)
+	# (which might not exist if the parent is tk-less)
 	if {[catch {set display [winfo screen .]}]} {
 	    if {[info exists ::env(DISPLAY)]} {
 		set display $::env(DISPLAY)
 	    } else {
-		Log $slave "no winfo screen . nor env(DISPLAY)" WARNING
+		Log $child "no winfo screen . nor env(DISPLAY)" WARNING
 		set display ":0.0"
 	    }
 	}
     }
 
     # Get state for access to the cleanupHook.
-    namespace upvar ::safe S$slave state
+    namespace upvar ::safe S$child state
 
     if {![::tcl::OptProcArgGiven "-use"]} {
 	# create a decorated toplevel
-	lassign [tkTopLevel $slave $display] w use
+	lassign [tkTopLevel $child $display] w use
 
-	# set our delete hook (slave arg is added by interpDelete)
-	# to clean up both window related code and tkInit(slave)
+	# set our delete hook (child arg is added by interpDelete)
+	# to clean up both window related code and tkInit(child)
 	set state(cleanupHook) [list tkDelete {} $w]
     } else {
-	# set our delete hook (slave arg is added by interpDelete)
-	# to clean up tkInit(slave)
+	# set our delete hook (child arg is added by interpDelete)
+	# to clean up tkInit(child)
 	set state(cleanupHook) [list disallowTk]
 
 	# Let's be nice and also accept tk window names instead of ids
@@ -122,12 +122,12 @@ proc ::safe::loadTk {} {}
 	}
     }
 
-    # Prepares the slave for tk with those parameters
-    tkInterpInit $slave [list "-use" $use "-display" $display]
+    # Prepares the child for tk with those parameters
+    tkInterpInit $child [list "-use" $use "-display" $display]
 
-    load {} Tk $slave
+    load {} Tk $child
 
-    return $slave
+    return $child
 }
 
 proc ::safe::TkInit {interpPath} {
@@ -149,7 +149,7 @@ proc ::safe::TkInit {interpPath} {
 #	safe::TkInit.
 #
 # Arguments:
-#	interpPath	slave interpreter handle
+#	interpPath	child interpreter handle
 #	argv		arguments passed to safe::TkInterpInit
 #
 # Results:
@@ -168,7 +168,7 @@ proc ::safe::allowTk {interpPath argv} {
 #	in safe::TkInit.
 #
 # Arguments:
-#	interpPath	slave interpreter handle
+#	interpPath	child interpreter handle
 #
 # Results:
 #	none.
@@ -188,43 +188,43 @@ proc ::safe::disallowTk {interpPath} {
 #	Clean up the window associated with the interp being deleted.
 #
 # Arguments:
-#	interpPath	slave interpreter handle
+#	interpPath	child interpreter handle
 #
 # Results:
 #	none.
 
-proc ::safe::tkDelete {W window slave} {
+proc ::safe::tkDelete {W window child} {
 
     # we are going to be called for each widget... skip untill it's
     # top level
 
-    Log $slave "Called tkDelete $W $window" NOTICE
-    if {[::interp exists $slave]} {
-	if {[catch {::safe::interpDelete $slave} msg]} {
-	    Log $slave "Deletion error : $msg"
+    Log $child "Called tkDelete $W $window" NOTICE
+    if {[::interp exists $child]} {
+	if {[catch {::safe::interpDelete $child} msg]} {
+	    Log $child "Deletion error : $msg"
 	}
     }
     if {[winfo exists $window]} {
-	Log $slave "Destroy toplevel $window" NOTICE
+	Log $child "Destroy toplevel $window" NOTICE
 	destroy $window
     }
 
-    # clean up tkInit(slave)
-    disallowTk $slave
+    # clean up tkInit(child)
+    disallowTk $child
     return
 }
 
-proc ::safe::tkTopLevel {slave display} {
+proc ::safe::tkTopLevel {child display} {
     variable tkSafeId
     incr tkSafeId
     set w ".safe$tkSafeId"
     if {[catch {toplevel $w -screen $display -class SafeTk} msg]} {
 	return -code error -errorcode {TK TOPLEVEL SAFE} \
-	    "Unable to create toplevel for safe slave \"$slave\" ($msg)"
+	    "Unable to create toplevel for safe child \"$child\" ($msg)"
     }
-    Log $slave "New toplevel $w" NOTICE
+    Log $child "New toplevel $w" NOTICE
 
-    set msg "Untrusted Tcl applet ($slave)"
+    set msg "Untrusted Tcl applet ($child)"
     wm title $w $msg
 
     # Control frame (we must create a style for it)
@@ -236,7 +236,7 @@ proc ::safe::tkTopLevel {slave display} {
 
     # We will destroy the interp when the window is destroyed
     bindtags $wc [concat Safe$wc [bindtags $wc]]
-    bind Safe$wc <Destroy> [list ::safe::tkDelete %W $w $slave]
+    bind Safe$wc <Destroy> [list ::safe::tkDelete %W $w $child]
 
     ttk::label $wc.l -text $msg -anchor w
 
@@ -247,7 +247,7 @@ proc ::safe::tkTopLevel {slave display} {
     # but still have the default background instead of red one from the parent
     ttk::frame  $wc.fb -borderwidth 0
     ttk::button $wc.fb.b -text "Delete" \
-	    -command [list ::safe::tkDelete $w $w $slave]
+	    -command [list ::safe::tkDelete $w $w $child]
     pack $wc.fb.b -side right -fill both
     pack $wc.fb -side right -fill both -expand 1
     pack $wc.l -side left -fill both -expand 1 -ipady 2
diff --git a/macosx/Tk.xcode/project.pbxproj b/macosx/Tk.xcode/project.pbxproj
index 93143f7..c93b15b 100644
--- a/macosx/Tk.xcode/project.pbxproj
+++ b/macosx/Tk.xcode/project.pbxproj
@@ -1411,7 +1411,7 @@
 		F96D3E1F08F272A5004A47F5 /* CrtInterp.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = CrtInterp.3; sourceTree = "<group>"; };
 		F96D3E2008F272A5004A47F5 /* CrtMathFnc.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = CrtMathFnc.3; sourceTree = "<group>"; };
 		F96D3E2108F272A5004A47F5 /* CrtObjCmd.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = CrtObjCmd.3; sourceTree = "<group>"; };
-		F96D3E2208F272A5004A47F5 /* CrtSlave.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = CrtSlave.3; sourceTree = "<group>"; };
+		F96D3E2208F272A5004A47F5 /* CrtAlias.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = CrtAlias.3; sourceTree = "<group>"; };
 		F96D3E2308F272A5004A47F5 /* CrtTimerHdlr.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = CrtTimerHdlr.3; sourceTree = "<group>"; };
 		F96D3E2408F272A5004A47F5 /* CrtTrace.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = CrtTrace.3; sourceTree = "<group>"; };
 		F96D3E2508F272A5004A47F5 /* dde.n */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = dde.n; sourceTree = "<group>"; };
@@ -3078,7 +3078,7 @@
 				F96D3E1F08F272A5004A47F5 /* CrtInterp.3 */,
 				F96D3E2008F272A5004A47F5 /* CrtMathFnc.3 */,
 				F96D3E2108F272A5004A47F5 /* CrtObjCmd.3 */,
-				F96D3E2208F272A5004A47F5 /* CrtSlave.3 */,
+				F96D3E2208F272A5004A47F5 /* CrtAlias.3 */,
 				F96D3E2308F272A5004A47F5 /* CrtTimerHdlr.3 */,
 				F96D3E2408F272A5004A47F5 /* CrtTrace.3 */,
 				F96D3E2508F272A5004A47F5 /* dde.n */,
diff --git a/macosx/Tk.xcodeproj/project.pbxproj b/macosx/Tk.xcodeproj/project.pbxproj
index 53ebe3e..10a9c9a 100644
--- a/macosx/Tk.xcodeproj/project.pbxproj
+++ b/macosx/Tk.xcodeproj/project.pbxproj
@@ -1411,7 +1411,7 @@
 		F96D3E1F08F272A5004A47F5 /* CrtInterp.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = CrtInterp.3; sourceTree = "<group>"; };
 		F96D3E2008F272A5004A47F5 /* CrtMathFnc.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = CrtMathFnc.3; sourceTree = "<group>"; };
 		F96D3E2108F272A5004A47F5 /* CrtObjCmd.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = CrtObjCmd.3; sourceTree = "<group>"; };
-		F96D3E2208F272A5004A47F5 /* CrtSlave.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = CrtSlave.3; sourceTree = "<group>"; };
+		F96D3E2208F272A5004A47F5 /* CrtAlias.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = CrtAlias.3; sourceTree = "<group>"; };
 		F96D3E2308F272A5004A47F5 /* CrtTimerHdlr.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = CrtTimerHdlr.3; sourceTree = "<group>"; };
 		F96D3E2408F272A5004A47F5 /* CrtTrace.3 */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = CrtTrace.3; sourceTree = "<group>"; };
 		F96D3E2508F272A5004A47F5 /* dde.n */ = {isa = PBXFileReference; explicitFileType = text.man; fileEncoding = 4; path = dde.n; sourceTree = "<group>"; };
@@ -3078,7 +3078,7 @@
 				F96D3E1F08F272A5004A47F5 /* CrtInterp.3 */,
 				F96D3E2008F272A5004A47F5 /* CrtMathFnc.3 */,
 				F96D3E2108F272A5004A47F5 /* CrtObjCmd.3 */,
-				F96D3E2208F272A5004A47F5 /* CrtSlave.3 */,
+				F96D3E2208F272A5004A47F5 /* CrtAlias.3 */,
 				F96D3E2308F272A5004A47F5 /* CrtTimerHdlr.3 */,
 				F96D3E2408F272A5004A47F5 /* CrtTrace.3 */,
 				F96D3E2508F272A5004A47F5 /* dde.n */,
diff --git a/tests/constraints.tcl b/tests/constraints.tcl
index c77fb00..ff036f3 100644
--- a/tests/constraints.tcl
+++ b/tests/constraints.tcl
@@ -37,7 +37,7 @@ namespace eval tk {
 
 	namespace eval bg {
 	    # Manage a background process.
-	    # Replace with slave interp or thread?
+	    # Replace with child interp or thread?
 	    namespace import ::tcltest::interpreter
 	    namespace import ::tk::test::loadTkCommand
 	    namespace export setup cleanup do
diff --git a/tests/safe.test b/tests/safe.test
index 475d938..97f6688 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -182,7 +182,7 @@ test safe-4.2 {testing loadTk -use} -setup {
     destroy $w
 } -result {}
 
-test safe-5.1 {loading Tk in safe interps without master's clearance} -body {
+test safe-5.1 {loading Tk in safe interps without parent's clearance} -body {
     set i [safe::interpCreate]
     interp eval $i {load {} Tk}
 } -cleanup {
diff --git a/tests/safePrimarySelection.test b/tests/safePrimarySelection.test
index 7cc31f4..e6ef487 100644
--- a/tests/safePrimarySelection.test
+++ b/tests/safePrimarySelection.test
@@ -16,8 +16,8 @@ tcltest::loadTestedCommands
 # ------------------------------------------------------------------------------
 # - Tests 3.*, 6.* test that the fix for ticket de156e9efe implemented in branch
 #   bug-de156e9efe has been applied and still works.  They test that a Safe Base
-#   slave interpreter cannot write to the PRIMARY selection.
-# - The other tests verify that the master interpreter and an unsafe slave CAN
+#   child interpreter cannot write to the PRIMARY selection.
+# - The other tests verify that the parent interpreter and an unsafe child CAN
 #   write to the PRIMARY selection, and therefore that the test scripts
 #   themselves are valid.
 # - A text, entry, ttk::entry, listbox, spinbox or ttk::spinbox widget can have
@@ -38,7 +38,7 @@ namespace eval ::_test_tmp {}
 #   directory without installing Tk.  In that case the usual auto_path loading
 #   mechanism cannot work because the tk binary is not where pkgIndex.tcl says
 #   it is.
-# - This command is not needed for Safe Base slaves because safe::loadTk does
+# - This command is not needed for Safe Base children because safe::loadTk does
 #   something similar and works correctly.
 # - Based on scripts in winSend.test.
 # ------------------------------------------------------------------------------
@@ -208,11 +208,11 @@ set ::_test_tmp::script {
     }
 }
 
-# Do this once for the master interpreter.
+# Do this once for the parent interpreter.
 eval $::_test_tmp::script
 
-test safePrimarySelection-1.1 {master interpreter, text, no existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-1.1 {parent interpreter, text, no existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
 } -body {
@@ -223,8 +223,8 @@ test safePrimarySelection-1.1 {master interpreter, text, no existing selection}
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-1.2 {master interpreter, entry, no existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-1.2 {parent interpreter, entry, no existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
 } -body {
@@ -235,8 +235,8 @@ test safePrimarySelection-1.2 {master interpreter, entry, no existing selection}
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-1.3 {master interpreter, ttk::entry, no existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-1.3 {parent interpreter, ttk::entry, no existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
 } -body {
@@ -247,8 +247,8 @@ test safePrimarySelection-1.3 {master interpreter, ttk::entry, no existing selec
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-1.4 {master interpreter, listbox, no existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-1.4 {parent interpreter, listbox, no existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
 } -body {
@@ -259,8 +259,8 @@ test safePrimarySelection-1.4 {master interpreter, listbox, no existing selectio
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-1.5 {master interpreter, spinbox as entry, no existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-1.5 {parent interpreter, spinbox as entry, no existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
 } -body {
@@ -271,8 +271,8 @@ test safePrimarySelection-1.5 {master interpreter, spinbox as entry, no existing
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-1.6 {master interpreter, spinbox spun, no existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-1.6 {parent interpreter, spinbox spun, no existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
 } -body {
@@ -283,8 +283,8 @@ test safePrimarySelection-1.6 {master interpreter, spinbox spun, no existing sel
     ::_test_tmp::clearPrimarySelection
 } -result {2}
 
-test safePrimarySelection-1.7 {master interpreter, spinbox spun/selected/spun, no existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-1.7 {parent interpreter, spinbox spun/selected/spun, no existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
 } -body {
@@ -295,8 +295,8 @@ test safePrimarySelection-1.7 {master interpreter, spinbox spun/selected/spun, n
     ::_test_tmp::clearPrimarySelection
 } -result {3}
 
-test safePrimarySelection-1.8 {master interpreter, ttk::spinbox as entry, no existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-1.8 {parent interpreter, ttk::spinbox as entry, no existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
 } -body {
@@ -307,8 +307,8 @@ test safePrimarySelection-1.8 {master interpreter, ttk::spinbox as entry, no exi
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-1.9 {master interpreter, ttk::spinbox spun, no existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-1.9 {parent interpreter, ttk::spinbox spun, no existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
 } -body {
@@ -319,8 +319,8 @@ test safePrimarySelection-1.9 {master interpreter, ttk::spinbox spun, no existin
     ::_test_tmp::clearPrimarySelection
 } -result {2}
 
-test safePrimarySelection-1.10 {master interpreter, ttk::spinbox spun/selected/spun, no existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-1.10 {parent interpreter, ttk::spinbox spun/selected/spun, no existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
 } -body {
@@ -331,12 +331,12 @@ test safePrimarySelection-1.10 {master interpreter, ttk::spinbox spun/selected/s
     ::_test_tmp::clearPrimarySelection
 } -result {3}
 
-test safePrimarySelection-2.1 {unsafe slave interpreter, text, no existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-2.1 {unsafe child interpreter, text, no existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
 } -body {
-    set int2 slave2
+    set int2 child2
     ::_test_tmp::unsafeInterp $int2
     $int2 eval $::_test_tmp::script
     $int2 eval ::_test_tmp::tryText
@@ -348,12 +348,12 @@ test safePrimarySelection-2.1 {unsafe slave interpreter, text, no existing selec
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-2.2 {unsafe slave interpreter, entry, no existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-2.2 {unsafe child interpreter, entry, no existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
 } -body {
-    set int2 slave2
+    set int2 child2
     ::_test_tmp::unsafeInterp $int2
     $int2 eval $::_test_tmp::script
     $int2 eval ::_test_tmp::tryEntry
@@ -365,12 +365,12 @@ test safePrimarySelection-2.2 {unsafe slave interpreter, entry, no existing sele
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-2.3 {unsafe slave interpreter, ttk::entry, no existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-2.3 {unsafe child interpreter, ttk::entry, no existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
 } -body {
-    set int2 slave2
+    set int2 child2
     ::_test_tmp::unsafeInterp $int2
     $int2 eval $::_test_tmp::script
     $int2 eval ::_test_tmp::tryTtkEntry
@@ -382,12 +382,12 @@ test safePrimarySelection-2.3 {unsafe slave interpreter, ttk::entry, no existing
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-2.4 {unsafe slave interpreter, listbox, no existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-2.4 {unsafe child interpreter, listbox, no existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
 } -body {
-    set int2 slave2
+    set int2 child2
     ::_test_tmp::unsafeInterp $int2
     $int2 eval $::_test_tmp::script
     $int2 eval ::_test_tmp::tryListbox
@@ -399,12 +399,12 @@ test safePrimarySelection-2.4 {unsafe slave interpreter, listbox, no existing se
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-2.5 {unsafe slave interpreter, spinbox as entry, no existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-2.5 {unsafe child interpreter, spinbox as entry, no existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
 } -body {
-    set int2 slave2
+    set int2 child2
     ::_test_tmp::unsafeInterp $int2
     $int2 eval $::_test_tmp::script
     $int2 eval ::_test_tmp::trySpinbox 1
@@ -416,12 +416,12 @@ test safePrimarySelection-2.5 {unsafe slave interpreter, spinbox as entry, no ex
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-2.6 {unsafe slave interpreter, spinbox spun, no existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-2.6 {unsafe child interpreter, spinbox spun, no existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
 } -body {
-    set int2 slave2
+    set int2 child2
     ::_test_tmp::unsafeInterp $int2
     $int2 eval $::_test_tmp::script
     $int2 eval ::_test_tmp::trySpinbox 2
@@ -433,12 +433,12 @@ test safePrimarySelection-2.6 {unsafe slave interpreter, spinbox spun, no existi
     ::_test_tmp::clearPrimarySelection
 } -result {2}
 
-test safePrimarySelection-2.7 {unsafe slave interpreter, spinbox spun/selected/spun, no existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-2.7 {unsafe child interpreter, spinbox spun/selected/spun, no existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
 } -body {
-    set int2 slave2
+    set int2 child2
     ::_test_tmp::unsafeInterp $int2
     $int2 eval $::_test_tmp::script
     $int2 eval ::_test_tmp::trySpinbox 3
@@ -450,12 +450,12 @@ test safePrimarySelection-2.7 {unsafe slave interpreter, spinbox spun/selected/s
     ::_test_tmp::clearPrimarySelection
 } -result {3}
 
-test safePrimarySelection-2.8 {unsafe slave interpreter, ttk::spinbox as entry, no existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-2.8 {unsafe child interpreter, ttk::spinbox as entry, no existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
 } -body {
-    set int2 slave2
+    set int2 child2
     ::_test_tmp::unsafeInterp $int2
     $int2 eval $::_test_tmp::script
     $int2 eval ::_test_tmp::tryTtkSpinbox 1
@@ -467,12 +467,12 @@ test safePrimarySelection-2.8 {unsafe slave interpreter, ttk::spinbox as entry,
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-2.9 {unsafe slave interpreter, ttk::spinbox spun, no existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-2.9 {unsafe child interpreter, ttk::spinbox spun, no existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
 } -body {
-    set int2 slave2
+    set int2 child2
     ::_test_tmp::unsafeInterp $int2
     $int2 eval $::_test_tmp::script
     $int2 eval ::_test_tmp::tryTtkSpinbox 2
@@ -484,12 +484,12 @@ test safePrimarySelection-2.9 {unsafe slave interpreter, ttk::spinbox spun, no e
     ::_test_tmp::clearPrimarySelection
 } -result {2}
 
-test safePrimarySelection-2.10 {unsafe slave interpreter, ttk::spinbox spun/selected/spun, no existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-2.10 {unsafe child interpreter, ttk::spinbox spun/selected/spun, no existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
 } -body {
-    set int2 slave2
+    set int2 child2
     ::_test_tmp::unsafeInterp $int2
     $int2 eval $::_test_tmp::script
     $int2 eval ::_test_tmp::tryTtkSpinbox 3
@@ -501,13 +501,13 @@ test safePrimarySelection-2.10 {unsafe slave interpreter, ttk::spinbox spun/sele
     ::_test_tmp::clearPrimarySelection
 } -result {3}
 
-test safePrimarySelection-3.1 {IMPORTANT, safe slave interpreter, text, no existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-3.1 {IMPORTANT, safe child interpreter, text, no existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
 } -body {
     set res0 [::_test_tmp::getPrimarySelection]
-    set int2 slave2
+    set int2 child2
     ::safe::interpCreate $int2
     ::safe::loadTk $int2
     $int2 eval $::_test_tmp::script
@@ -522,13 +522,13 @@ test safePrimarySelection-3.1 {IMPORTANT, safe slave interpreter, text, no exist
     ::_test_tmp::clearPrimarySelection
 } -result {----}
 
-test safePrimarySelection-3.2 {IMPORTANT, safe slave interpreter, entry, no existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-3.2 {IMPORTANT, safe child interpreter, entry, no existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
 } -body {
     set res0 [::_test_tmp::getPrimarySelection]
-    set int2 slave2
+    set int2 child2
     ::safe::interpCreate $int2
     ::safe::loadTk $int2
     $int2 eval $::_test_tmp::script
@@ -543,13 +543,13 @@ test safePrimarySelection-3.2 {IMPORTANT, safe slave interpreter, entry, no exis
     ::_test_tmp::clearPrimarySelection
 } -result {----}
 
-test safePrimarySelection-3.3 {IMPORTANT, safe slave interpreter, ttk::entry, no existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-3.3 {IMPORTANT, safe child interpreter, ttk::entry, no existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
 } -body {
     set res0 [::_test_tmp::getPrimarySelection]
-    set int2 slave2
+    set int2 child2
     ::safe::interpCreate $int2
     ::safe::loadTk $int2
     $int2 eval $::_test_tmp::script
@@ -564,13 +564,13 @@ test safePrimarySelection-3.3 {IMPORTANT, safe slave interpreter, ttk::entry, no
     ::_test_tmp::clearPrimarySelection
 } -result {----}
 
-test safePrimarySelection-3.4 {IMPORTANT, safe slave interpreter, listbox, no existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-3.4 {IMPORTANT, safe child interpreter, listbox, no existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
 } -body {
     set res0 [::_test_tmp::getPrimarySelection]
-    set int2 slave2
+    set int2 child2
     ::safe::interpCreate $int2
     ::safe::loadTk $int2
     $int2 eval $::_test_tmp::script
@@ -585,13 +585,13 @@ test safePrimarySelection-3.4 {IMPORTANT, safe slave interpreter, listbox, no ex
     ::_test_tmp::clearPrimarySelection
 } -result {----}
 
-test safePrimarySelection-3.5 {IMPORTANT, safe slave interpreter, spinbox as entry, no existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-3.5 {IMPORTANT, safe child interpreter, spinbox as entry, no existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
 } -body {
     set res0 [::_test_tmp::getPrimarySelection]
-    set int2 slave2
+    set int2 child2
     ::safe::interpCreate $int2
     ::safe::loadTk $int2
     $int2 eval $::_test_tmp::script
@@ -606,13 +606,13 @@ test safePrimarySelection-3.5 {IMPORTANT, safe slave interpreter, spinbox as ent
     ::_test_tmp::clearPrimarySelection
 } -result {----}
 
-test safePrimarySelection-3.6 {IMPORTANT, safe slave interpreter, spinbox spun, no existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-3.6 {IMPORTANT, safe child interpreter, spinbox spun, no existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
 } -body {
     set res0 [::_test_tmp::getPrimarySelection]
-    set int2 slave2
+    set int2 child2
     ::safe::interpCreate $int2
     ::safe::loadTk $int2
     $int2 eval $::_test_tmp::script
@@ -627,13 +627,13 @@ test safePrimarySelection-3.6 {IMPORTANT, safe slave interpreter, spinbox spun,
     ::_test_tmp::clearPrimarySelection
 } -result {----}
 
-test safePrimarySelection-3.7 {IMPORTANT, safe slave interpreter, spinbox spun/selected/spun, no existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-3.7 {IMPORTANT, safe child interpreter, spinbox spun/selected/spun, no existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
 } -body {
     set res0 [::_test_tmp::getPrimarySelection]
-    set int2 slave2
+    set int2 child2
     ::safe::interpCreate $int2
     ::safe::loadTk $int2
     $int2 eval $::_test_tmp::script
@@ -648,13 +648,13 @@ test safePrimarySelection-3.7 {IMPORTANT, safe slave interpreter, spinbox spun/s
     ::_test_tmp::clearPrimarySelection
 } -result {----}
 
-test safePrimarySelection-3.8 {IMPORTANT, safe slave interpreter, ttk::spinbox as entry, no existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-3.8 {IMPORTANT, safe child interpreter, ttk::spinbox as entry, no existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
 } -body {
     set res0 [::_test_tmp::getPrimarySelection]
-    set int2 slave2
+    set int2 child2
     ::safe::interpCreate $int2
     ::safe::loadTk $int2
     $int2 eval $::_test_tmp::script
@@ -669,13 +669,13 @@ test safePrimarySelection-3.8 {IMPORTANT, safe slave interpreter, ttk::spinbox a
     ::_test_tmp::clearPrimarySelection
 } -result {----}
 
-test safePrimarySelection-3.9 {IMPORTANT, safe slave interpreter, ttk::spinbox spun, no existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-3.9 {IMPORTANT, safe child interpreter, ttk::spinbox spun, no existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
 } -body {
     set res0 [::_test_tmp::getPrimarySelection]
-    set int2 slave2
+    set int2 child2
     ::safe::interpCreate $int2
     ::safe::loadTk $int2
     $int2 eval $::_test_tmp::script
@@ -690,13 +690,13 @@ test safePrimarySelection-3.9 {IMPORTANT, safe slave interpreter, ttk::spinbox s
     ::_test_tmp::clearPrimarySelection
 } -result {----}
 
-test safePrimarySelection-3.10 {IMPORTANT, safe slave interpreter, ttk::spinbox spun/selected/spun, no existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-3.10 {IMPORTANT, safe child interpreter, ttk::spinbox spun/selected/spun, no existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
 } -body {
     set res0 [::_test_tmp::getPrimarySelection]
-    set int2 slave2
+    set int2 child2
     ::safe::interpCreate $int2
     ::safe::loadTk $int2
     $int2 eval $::_test_tmp::script
@@ -711,8 +711,8 @@ test safePrimarySelection-3.10 {IMPORTANT, safe slave interpreter, ttk::spinbox
     ::_test_tmp::clearPrimarySelection
 } -result {----}
 
-test safePrimarySelection-4.1 {master interpreter, text, existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-4.1 {parent interpreter, text, existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
 } -body {
@@ -723,8 +723,8 @@ test safePrimarySelection-4.1 {master interpreter, text, existing selection} -se
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-4.2 {master interpreter, entry, existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-4.2 {parent interpreter, entry, existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
 } -body {
@@ -735,8 +735,8 @@ test safePrimarySelection-4.2 {master interpreter, entry, existing selection} -s
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-4.3 {master interpreter, ttk::entry, existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-4.3 {parent interpreter, ttk::entry, existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
 } -body {
@@ -747,8 +747,8 @@ test safePrimarySelection-4.3 {master interpreter, ttk::entry, existing selectio
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-4.4 {master interpreter, listbox, existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-4.4 {parent interpreter, listbox, existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
 } -body {
@@ -759,8 +759,8 @@ test safePrimarySelection-4.4 {master interpreter, listbox, existing selection}
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-4.5 {master interpreter, spinbox as entry, existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-4.5 {parent interpreter, spinbox as entry, existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
 } -body {
@@ -771,8 +771,8 @@ test safePrimarySelection-4.5 {master interpreter, spinbox as entry, existing se
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-4.6 {master interpreter, spinbox spun, existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-4.6 {parent interpreter, spinbox spun, existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
 } -body {
@@ -783,8 +783,8 @@ test safePrimarySelection-4.6 {master interpreter, spinbox spun, existing select
     ::_test_tmp::clearPrimarySelection
 } -result {2}
 
-test safePrimarySelection-4.7 {master interpreter, spinbox spun/selected/spun, existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-4.7 {parent interpreter, spinbox spun/selected/spun, existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
 } -body {
@@ -795,8 +795,8 @@ test safePrimarySelection-4.7 {master interpreter, spinbox spun/selected/spun, e
     ::_test_tmp::clearPrimarySelection
 } -result {3}
 
-test safePrimarySelection-4.8 {master interpreter, ttk::spinbox as entry, existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-4.8 {parent interpreter, ttk::spinbox as entry, existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
 } -body {
@@ -807,8 +807,8 @@ test safePrimarySelection-4.8 {master interpreter, ttk::spinbox as entry, existi
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-4.9 {master interpreter, ttk::spinbox spun, existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-4.9 {parent interpreter, ttk::spinbox spun, existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
 } -body {
@@ -819,8 +819,8 @@ test safePrimarySelection-4.9 {master interpreter, ttk::spinbox spun, existing s
     ::_test_tmp::clearPrimarySelection
 } -result {2}
 
-test safePrimarySelection-4.10 {master interpreter, ttk::spinbox spun/selected/spun, existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-4.10 {parent interpreter, ttk::spinbox spun/selected/spun, existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
 } -body {
@@ -831,12 +831,12 @@ test safePrimarySelection-4.10 {master interpreter, ttk::spinbox spun/selected/s
     ::_test_tmp::clearPrimarySelection
 } -result {3}
 
-test safePrimarySelection-5.1 {unsafe slave interpreter, text, existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-5.1 {unsafe child interpreter, text, existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
 } -body {
-    set int2 slave2
+    set int2 child2
     ::_test_tmp::unsafeInterp $int2
     $int2 eval $::_test_tmp::script
     $int2 eval ::_test_tmp::tryText
@@ -848,12 +848,12 @@ test safePrimarySelection-5.1 {unsafe slave interpreter, text, existing selectio
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-5.2 {unsafe slave interpreter, entry, existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-5.2 {unsafe child interpreter, entry, existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
 } -body {
-    set int2 slave2
+    set int2 child2
     ::_test_tmp::unsafeInterp $int2
     $int2 eval $::_test_tmp::script
     $int2 eval ::_test_tmp::tryEntry
@@ -865,12 +865,12 @@ test safePrimarySelection-5.2 {unsafe slave interpreter, entry, existing selecti
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-5.3 {unsafe slave interpreter, ttk::entry, existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-5.3 {unsafe child interpreter, ttk::entry, existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
 } -body {
-    set int2 slave2
+    set int2 child2
     ::_test_tmp::unsafeInterp $int2
     $int2 eval $::_test_tmp::script
     $int2 eval ::_test_tmp::tryTtkEntry
@@ -882,12 +882,12 @@ test safePrimarySelection-5.3 {unsafe slave interpreter, ttk::entry, existing se
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-5.4 {unsafe slave interpreter, listbox, existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-5.4 {unsafe child interpreter, listbox, existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
 } -body {
-    set int2 slave2
+    set int2 child2
     ::_test_tmp::unsafeInterp $int2
     $int2 eval $::_test_tmp::script
     $int2 eval ::_test_tmp::tryListbox
@@ -899,12 +899,12 @@ test safePrimarySelection-5.4 {unsafe slave interpreter, listbox, existing selec
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-5.5 {unsafe slave interpreter, spinbox as entry, existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-5.5 {unsafe child interpreter, spinbox as entry, existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
 } -body {
-    set int2 slave2
+    set int2 child2
     ::_test_tmp::unsafeInterp $int2
     $int2 eval $::_test_tmp::script
     $int2 eval ::_test_tmp::trySpinbox 1
@@ -916,12 +916,12 @@ test safePrimarySelection-5.5 {unsafe slave interpreter, spinbox as entry, exist
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-5.6 {unsafe slave interpreter, spinbox spun, existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-5.6 {unsafe child interpreter, spinbox spun, existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
 } -body {
-    set int2 slave2
+    set int2 child2
     ::_test_tmp::unsafeInterp $int2
     $int2 eval $::_test_tmp::script
     $int2 eval ::_test_tmp::trySpinbox 2
@@ -933,12 +933,12 @@ test safePrimarySelection-5.6 {unsafe slave interpreter, spinbox spun, existing
     ::_test_tmp::clearPrimarySelection
 } -result {2}
 
-test safePrimarySelection-5.7 {unsafe slave interpreter, spinbox spun/selected/spun, existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-5.7 {unsafe child interpreter, spinbox spun/selected/spun, existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
 } -body {
-    set int2 slave2
+    set int2 child2
     ::_test_tmp::unsafeInterp $int2
     $int2 eval $::_test_tmp::script
     $int2 eval ::_test_tmp::trySpinbox 3
@@ -950,12 +950,12 @@ test safePrimarySelection-5.7 {unsafe slave interpreter, spinbox spun/selected/s
     ::_test_tmp::clearPrimarySelection
 } -result {3}
 
-test safePrimarySelection-5.8 {unsafe slave interpreter, ttk::spinbox as entry, existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-5.8 {unsafe child interpreter, ttk::spinbox as entry, existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
 } -body {
-    set int2 slave2
+    set int2 child2
     ::_test_tmp::unsafeInterp $int2
     $int2 eval $::_test_tmp::script
     $int2 eval ::_test_tmp::tryTtkSpinbox 1
@@ -967,12 +967,12 @@ test safePrimarySelection-5.8 {unsafe slave interpreter, ttk::spinbox as entry,
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-5.9 {unsafe slave interpreter, ttk::spinbox spun, existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-5.9 {unsafe child interpreter, ttk::spinbox spun, existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
 } -body {
-    set int2 slave2
+    set int2 child2
     ::_test_tmp::unsafeInterp $int2
     $int2 eval $::_test_tmp::script
     $int2 eval ::_test_tmp::tryTtkSpinbox 2
@@ -984,12 +984,12 @@ test safePrimarySelection-5.9 {unsafe slave interpreter, ttk::spinbox spun, exis
     ::_test_tmp::clearPrimarySelection
 } -result {2}
 
-test safePrimarySelection-5.10 {unsafe slave interpreter, ttk::spinbox spun/selected/spun, existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-5.10 {unsafe child interpreter, ttk::spinbox spun/selected/spun, existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
 } -body {
-    set int2 slave2
+    set int2 child2
     ::_test_tmp::unsafeInterp $int2
     $int2 eval $::_test_tmp::script
     $int2 eval ::_test_tmp::tryTtkSpinbox 3
@@ -1001,13 +1001,13 @@ test safePrimarySelection-5.10 {unsafe slave interpreter, ttk::spinbox spun/sele
     ::_test_tmp::clearPrimarySelection
 } -result {3}
 
-test safePrimarySelection-6.1 {IMPORTANT, safe slave interpreter, text, existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-6.1 {IMPORTANT, safe child interpreter, text, existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
 } -body {
     set res0 [::_test_tmp::getPrimarySelection]
-    set int2 slave2
+    set int2 child2
     ::safe::interpCreate $int2
     ::safe::loadTk $int2
     $int2 eval $::_test_tmp::script
@@ -1022,13 +1022,13 @@ test safePrimarySelection-6.1 {IMPORTANT, safe slave interpreter, text, existing
     ::_test_tmp::clearPrimarySelection
 } -result {OLD_VALUE----OLD_VALUE}
 
-test safePrimarySelection-6.2 {IMPORTANT, safe slave interpreter, entry, existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-6.2 {IMPORTANT, safe child interpreter, entry, existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
 } -body {
     set res0 [::_test_tmp::getPrimarySelection]
-    set int2 slave2
+    set int2 child2
     ::safe::interpCreate $int2
     ::safe::loadTk $int2
     $int2 eval $::_test_tmp::script
@@ -1043,13 +1043,13 @@ test safePrimarySelection-6.2 {IMPORTANT, safe slave interpreter, entry, existin
     ::_test_tmp::clearPrimarySelection
 } -result {OLD_VALUE----OLD_VALUE}
 
-test safePrimarySelection-6.3 {IMPORTANT, safe slave interpreter, ttk::entry, existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-6.3 {IMPORTANT, safe child interpreter, ttk::entry, existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
 } -body {
     set res0 [::_test_tmp::getPrimarySelection]
-    set int2 slave2
+    set int2 child2
     ::safe::interpCreate $int2
     ::safe::loadTk $int2
     $int2 eval $::_test_tmp::script
@@ -1064,13 +1064,13 @@ test safePrimarySelection-6.3 {IMPORTANT, safe slave interpreter, ttk::entry, ex
     ::_test_tmp::clearPrimarySelection
 } -result {OLD_VALUE----OLD_VALUE}
 
-test safePrimarySelection-6.4 {IMPORTANT, safe slave interpreter, listbox, existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-6.4 {IMPORTANT, safe child interpreter, listbox, existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
 } -body {
     set res0 [::_test_tmp::getPrimarySelection]
-    set int2 slave2
+    set int2 child2
     ::safe::interpCreate $int2
     ::safe::loadTk $int2
     $int2 eval $::_test_tmp::script
@@ -1085,13 +1085,13 @@ test safePrimarySelection-6.4 {IMPORTANT, safe slave interpreter, listbox, exist
     ::_test_tmp::clearPrimarySelection
 } -result {OLD_VALUE----OLD_VALUE}
 
-test safePrimarySelection-6.5 {IMPORTANT, safe slave interpreter, spinbox as entry, existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-6.5 {IMPORTANT, safe child interpreter, spinbox as entry, existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
 } -body {
     set res0 [::_test_tmp::getPrimarySelection]
-    set int2 slave2
+    set int2 child2
     ::safe::interpCreate $int2
     ::safe::loadTk $int2
     $int2 eval $::_test_tmp::script
@@ -1106,13 +1106,13 @@ test safePrimarySelection-6.5 {IMPORTANT, safe slave interpreter, spinbox as ent
     ::_test_tmp::clearPrimarySelection
 } -result {OLD_VALUE----OLD_VALUE}
 
-test safePrimarySelection-6.6 {IMPORTANT, safe slave interpreter, spinbox spun, existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-6.6 {IMPORTANT, safe child interpreter, spinbox spun, existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
 } -body {
     set res0 [::_test_tmp::getPrimarySelection]
-    set int2 slave2
+    set int2 child2
     ::safe::interpCreate $int2
     ::safe::loadTk $int2
     $int2 eval $::_test_tmp::script
@@ -1127,13 +1127,13 @@ test safePrimarySelection-6.6 {IMPORTANT, safe slave interpreter, spinbox spun,
     ::_test_tmp::clearPrimarySelection
 } -result {OLD_VALUE----OLD_VALUE}
 
-test safePrimarySelection-6.7 {IMPORTANT, safe slave interpreter, spinbox spun/selected/spun, existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-6.7 {IMPORTANT, safe child interpreter, spinbox spun/selected/spun, existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
 } -body {
     set res0 [::_test_tmp::getPrimarySelection]
-    set int2 slave2
+    set int2 child2
     ::safe::interpCreate $int2
     ::safe::loadTk $int2
     $int2 eval $::_test_tmp::script
@@ -1148,13 +1148,13 @@ test safePrimarySelection-6.7 {IMPORTANT, safe slave interpreter, spinbox spun/s
     ::_test_tmp::clearPrimarySelection
 } -result {OLD_VALUE----OLD_VALUE}
 
-test safePrimarySelection-6.8 {IMPORTANT, safe slave interpreter, ttk::spinbox as entry, existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-6.8 {IMPORTANT, safe child interpreter, ttk::spinbox as entry, existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
 } -body {
     set res0 [::_test_tmp::getPrimarySelection]
-    set int2 slave2
+    set int2 child2
     ::safe::interpCreate $int2
     ::safe::loadTk $int2
     $int2 eval $::_test_tmp::script
@@ -1169,13 +1169,13 @@ test safePrimarySelection-6.8 {IMPORTANT, safe slave interpreter, ttk::spinbox a
     ::_test_tmp::clearPrimarySelection
 } -result {OLD_VALUE----OLD_VALUE}
 
-test safePrimarySelection-6.9 {IMPORTANT, safe slave interpreter, ttk::spinbox spun, existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-6.9 {IMPORTANT, safe child interpreter, ttk::spinbox spun, existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
 } -body {
     set res0 [::_test_tmp::getPrimarySelection]
-    set int2 slave2
+    set int2 child2
     ::safe::interpCreate $int2
     ::safe::loadTk $int2
     $int2 eval $::_test_tmp::script
@@ -1190,13 +1190,13 @@ test safePrimarySelection-6.9 {IMPORTANT, safe slave interpreter, ttk::spinbox s
     ::_test_tmp::clearPrimarySelection
 } -result {OLD_VALUE----OLD_VALUE}
 
-test safePrimarySelection-6.10 {IMPORTANT, safe slave interpreter, ttk::spinbox spun/selected/spun, existing selection} -setup {
-    catch {interp delete slave2}
+test safePrimarySelection-6.10 {IMPORTANT, safe child interpreter, ttk::spinbox spun/selected/spun, existing selection} -setup {
+    catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
 } -body {
     set res0 [::_test_tmp::getPrimarySelection]
-    set int2 slave2
+    set int2 child2
     ::safe::interpCreate $int2
     ::safe::loadTk $int2
     $int2 eval $::_test_tmp::script
-- 
cgit v0.12


From 23573be79ad8f44de1fd3445a3ec3ca89b21e3d3 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 6 Aug 2020 11:20:04 +0000
Subject: Remove function TkMacOSXSetUpClippingRgn(), which does nothing. But
 keep its stub entry, just in case

---
 generic/tkEntry.c           |  2 +-
 generic/tkStubInit.c        |  8 ++++++++
 macosx/tkMacOSXButton.c     |  7 -------
 macosx/tkMacOSXDraw.c       | 24 ------------------------
 macosx/tkMacOSXMenubutton.c |  7 -------
 macosx/tkMacOSXScale.c      |  2 --
 6 files changed, 9 insertions(+), 41 deletions(-)

diff --git a/generic/tkEntry.c b/generic/tkEntry.c
index 4c6c65f..f225420 100644
--- a/generic/tkEntry.c
+++ b/generic/tkEntry.c
@@ -1786,7 +1786,7 @@ DisplayEntry(
 	     * Draw the selected and unselected portions separately.
 	     */
 
-	    int selFirst;
+	    TkSizeT selFirst;
 
 	    if (entryPtr->selectFirst + 1 < entryPtr->leftIndex + 1) {
 	        selFirst = entryPtr->leftIndex;
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 3834134..1fbc7b3 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -43,6 +43,7 @@ MODULE_SCOPE const TkStubs tkStubs;
 #undef TkWinGetPlatformId
 #undef TkPutImage
 #undef XPutImage
+#define TkMacOSXSetUpClippingRgn (void (*)(Drawable))(void *)doNothing
 
 #if defined(_WIN32) && !defined(TK_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
 #   define Tk_TranslateWinEvent TkTranslateWinEvent
@@ -71,6 +72,13 @@ static int TkWinGetPlatformId(void) {
 #define Tk_PhotoPutZoomedBlock_Panic 0
 #define Tk_PhotoSetSize_Panic 0
 #define Tk_CreateOldPhotoImageFormat 0
+#ifdef MAC_OSX_TK
+static void
+doNothing(void)
+{
+    /* dummy implementation, no need to do anything */
+}
+#endif
 #else
 static void
 doNothing(void)
diff --git a/macosx/tkMacOSXButton.c b/macosx/tkMacOSXButton.c
index 7ca8c10..cd428b5 100644
--- a/macosx/tkMacOSXButton.c
+++ b/macosx/tkMacOSXButton.c
@@ -194,13 +194,6 @@ TkpDisplayButton(
     }
     pixmap = (Pixmap) Tk_WindowId(tkwin);
 
-    /*
-     * Set up clipping region. Make sure the we are using the port
-     * for this button, or we will set the wrong window's clip.
-     */
-
-    TkMacOSXSetUpClippingRgn(Tk_WindowId(tkwin));
-
     if (TkMacOSXComputeButtonDrawParams(butPtr, dpPtr)) {
 	macButtonPtr->useTkText = 0;
     } else {
diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index ddcbfd7..71acbbc 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -1875,30 +1875,6 @@ TkMacOSXGetClipRgn(
 /*
  *----------------------------------------------------------------------
  *
- * TkMacOSXSetUpClippingRgn --
- *
- *	Set up the clipping region so that drawing only occurs on the specified
- *	X subwindow.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TkMacOSXSetUpClippingRgn(
-    Drawable drawable)		/* Drawable to update. */
-{
-    (void)drawable;
-}
-
-/*
- *----------------------------------------------------------------------
- *
  * TkpClipDrawableToRect --
  *
  *	Clip all drawing into the drawable d to the given rectangle. If width
diff --git a/macosx/tkMacOSXMenubutton.c b/macosx/tkMacOSXMenubutton.c
index 438053e..8eed4f0 100644
--- a/macosx/tkMacOSXMenubutton.c
+++ b/macosx/tkMacOSXMenubutton.c
@@ -181,13 +181,6 @@ TkpDisplayMenuButton(
     TkMacOSXComputeMenuButtonDrawParams(butPtr, dpPtr);
 
     /*
-     * Set up clipping region.  Make sure the we are using the port for this
-     * button, or we will set the wrong window's clip.
-     */
-
-    TkMacOSXSetUpClippingRgn(pixmap);
-
-    /*
      * Draw the native portion of the buttons.
      */
 
diff --git a/macosx/tkMacOSXScale.c b/macosx/tkMacOSXScale.c
index a4c2046..80b1bda 100644
--- a/macosx/tkMacOSXScale.c
+++ b/macosx/tkMacOSXScale.c
@@ -219,7 +219,6 @@ TkpDisplayScale(
     destPort = TkMacOSXGetDrawablePort(Tk_WindowId(tkwin));
     windowRef = TkMacOSXDrawableWindow(Tk_WindowId(tkwin));
     portChanged = QDSwapPort(destPort, &savePort);
-    TkMacOSXSetUpClippingRgn(Tk_WindowId(tkwin));
 
     /*
      * Create Macintosh control.
@@ -416,7 +415,6 @@ MacScaleEventProc(
 
     destPort = TkMacOSXGetDrawablePort(Tk_WindowId(macScalePtr->info.tkwin));
     portChanged = QDSwapPort(destPort, &savePort);
-    TkMacOSXSetUpClippingRgn(Tk_WindowId(macScalePtr->info.tkwin));
 
     TkMacOSXWinBounds((TkWindow *) macScalePtr->info.tkwin, &bounds);
     where.h = eventPtr->xbutton.x + bounds.left;
-- 
cgit v0.12


From c56bbfcace9ceaac2fa36e32d7c9349e7be3e3b5 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 6 Aug 2020 15:34:21 +0000
Subject: More use of TCL_UNUSED() macro

---
 macosx/tkMacOSXButton.c     |  29 +++++-------
 macosx/tkMacOSXMenubutton.c |  28 +++++-------
 macosx/tkMacOSXScale.c      |   4 +-
 macosx/tkMacOSXWm.c         | 107 +++++++++++++++++++++-----------------------
 4 files changed, 76 insertions(+), 92 deletions(-)

diff --git a/macosx/tkMacOSXButton.c b/macosx/tkMacOSXButton.c
index 5aa8f7d..9f60b91 100644
--- a/macosx/tkMacOSXButton.c
+++ b/macosx/tkMacOSXButton.c
@@ -95,6 +95,8 @@ static void	PulseDefaultButtonProc(ClientData clientData);
 const Tk_ClassProcs tkpButtonProcs = {
     sizeof(Tk_ClassProcs),	/* size */
     TkButtonWorldChanged,	/* worldChangedProc */
+    NULL,
+	NULL
 };
 
 static int bCount;
@@ -143,7 +145,7 @@ TkButton *
 TkpCreateButton(
     Tk_Window tkwin)
 {
-    MacButton *macButtonPtr = ckalloc(sizeof(MacButton));
+    MacButton *macButtonPtr = (MacButton *)ckalloc(sizeof(MacButton));
 
     Tk_CreateEventHandler(tkwin, ActivateMask,
 	    ButtonEventProc, macButtonPtr);
@@ -192,13 +194,6 @@ TkpDisplayButton(
     }
     pixmap = (Pixmap) Tk_WindowId(tkwin);
 
-    /*
-     * Set up clipping region. Make sure the we are using the port
-     * for this button, or we will set the wrong window's clip.
-     */
-
-    TkMacOSXSetUpClippingRgn(Tk_WindowId(tkwin));
-
     if (TkMacOSXComputeButtonDrawParams(butPtr, dpPtr)) {
 	macButtonPtr->useTkText = 0;
     } else {
@@ -724,7 +719,7 @@ TkpDestroyButton(
 static void
 TkMacOSXDrawButton(
     MacButton *mbPtr,    /* Mac button. */
-    GC gc,               /* The GC we are drawing into - needed for
+    TCL_UNUSED(GC),      /* The GC we are drawing into - needed for
                           * the bevel button */
     Pixmap pixmap)       /* The pixmap we are drawing into - needed
                           * for the bevel button */
@@ -810,10 +805,10 @@ TkMacOSXDrawButton(
 
 static void
 ButtonBackgroundDrawCB(
-    const HIRect *btnbounds,
+    TCL_UNUSED(const HIRect *),
     MacButton *ptr,
-    SInt16 depth,
-    Boolean isColorDev)
+    TCL_UNUSED(SInt16),
+    TCL_UNUSED(Boolean))
 {
     MacButton *mbPtr = (MacButton *) ptr;
     TkButton *butPtr = (TkButton *) mbPtr;
@@ -862,12 +857,12 @@ ButtonBackgroundDrawCB(
  */
 static void
 ButtonContentDrawCB (
-    const HIRect * btnbounds,
-    ThemeButtonKind kind,
-    const HIThemeButtonDrawInfo *drawinfo,
+    TCL_UNUSED(const HIRect *),
+    TCL_UNUSED(ThemeButtonKind),
+    TCL_UNUSED(const HIThemeButtonDrawInfo *),
     MacButton *ptr,
-    SInt16 depth,
-    Boolean isColorDev)
+    TCL_UNUSED(SInt16),
+    TCL_UNUSED(Boolean))
 {
     TkButton *butPtr = (TkButton *) ptr;
     Tk_Window tkwin = butPtr->tkwin;
diff --git a/macosx/tkMacOSXMenubutton.c b/macosx/tkMacOSXMenubutton.c
index d1f429e..8eed4f0 100644
--- a/macosx/tkMacOSXMenubutton.c
+++ b/macosx/tkMacOSXMenubutton.c
@@ -76,6 +76,8 @@ static void		DrawMenuButtonImageAndText(TkMenuButton *butPtr);
 Tk_ClassProcs tkpMenubuttonClass = {
     sizeof(Tk_ClassProcs),	/* size */
     TkMenuButtonWorldChanged,	/* worldChangedProc */
+	NULL,
+	NULL
 };
 
 /*
@@ -133,7 +135,7 @@ TkMenuButton *
 TkpCreateMenuButton(
     Tk_Window tkwin)
 {
-    MacMenuButton *mbPtr = (MacMenuButton *) ckalloc(sizeof(MacMenuButton));
+    MacMenuButton *mbPtr = (MacMenuButton *)ckalloc(sizeof(MacMenuButton));
 
     Tk_CreateEventHandler(tkwin, ActivateMask, MenuButtonEventProc, mbPtr);
     mbPtr->flags = FIRST_DRAW;
@@ -179,13 +181,6 @@ TkpDisplayMenuButton(
     TkMacOSXComputeMenuButtonDrawParams(butPtr, dpPtr);
 
     /*
-     * Set up clipping region.  Make sure the we are using the port for this
-     * button, or we will set the wrong window's clip.
-     */
-
-    TkMacOSXSetUpClippingRgn(pixmap);
-
-    /*
      * Draw the native portion of the buttons.
      */
 
@@ -222,7 +217,7 @@ TkpDisplayMenuButton(
 
 void
 TkpDestroyMenuButton(
-    TkMenuButton *mbPtr)
+    TCL_UNUSED(TkMenuButton *))
 {
 }
 
@@ -544,8 +539,7 @@ DrawMenuButtonImageAndText(
 static void
 TkMacOSXDrawMenuButton(
     MacMenuButton *mbPtr, /* Mac menubutton. */
-    GC gc,                /* The GC we are drawing into - needed for the bevel
-                           * button */
+    TCL_UNUSED(GC),       /* The GC we are drawing into - not used */
     Pixmap pixmap)        /* The pixmap we are drawing into - needed for the
                            * bevel button */
 {
@@ -625,8 +619,8 @@ TkMacOSXDrawMenuButton(
 static void
 MenuButtonBackgroundDrawCB (
     MacMenuButton *ptr,
-    SInt16 depth,
-    Boolean isColorDev)
+    TCL_UNUSED(SInt16),
+    TCL_UNUSED(Boolean))
 {
     TkMenuButton* butPtr = (TkMenuButton *) ptr;
     Tk_Window tkwin = butPtr->tkwin;
@@ -658,11 +652,11 @@ MenuButtonBackgroundDrawCB (
 
 static void
 MenuButtonContentDrawCB (
-    ThemeButtonKind kind,
-    const HIThemeButtonDrawInfo *drawinfo,
+    TCL_UNUSED(ThemeButtonKind),
+    TCL_UNUSED(const HIThemeButtonDrawInfo *),
     MacMenuButton *ptr,
-    SInt16 depth,
-    Boolean isColorDev)
+    TCL_UNUSED(SInt16),
+    TCL_UNUSED(Boolean))
 {
     TkMenuButton *butPtr = (TkMenuButton *) ptr;
     Tk_Window tkwin = butPtr->tkwin;
diff --git a/macosx/tkMacOSXScale.c b/macosx/tkMacOSXScale.c
index 6ea9f14..80b1bda 100644
--- a/macosx/tkMacOSXScale.c
+++ b/macosx/tkMacOSXScale.c
@@ -76,7 +76,7 @@ TkScale *
 TkpCreateScale(
     Tk_Window tkwin)
 {
-    MacScale *macScalePtr = ckalloc(sizeof(MacScale));
+    MacScale *macScalePtr = (MacScale *)ckalloc(sizeof(MacScale));
 
     macScalePtr->scaleHandle = NULL;
     if (scaleActionProc == NULL) {
@@ -219,7 +219,6 @@ TkpDisplayScale(
     destPort = TkMacOSXGetDrawablePort(Tk_WindowId(tkwin));
     windowRef = TkMacOSXDrawableWindow(Tk_WindowId(tkwin));
     portChanged = QDSwapPort(destPort, &savePort);
-    TkMacOSXSetUpClippingRgn(Tk_WindowId(tkwin));
 
     /*
      * Create Macintosh control.
@@ -416,7 +415,6 @@ MacScaleEventProc(
 
     destPort = TkMacOSXGetDrawablePort(Tk_WindowId(macScalePtr->info.tkwin));
     portChanged = QDSwapPort(destPort, &savePort);
-    TkMacOSXSetUpClippingRgn(Tk_WindowId(macScalePtr->info.tkwin));
 
     TkMacOSXWinBounds((TkWindow *) macScalePtr->info.tkwin, &bounds);
     where.h = eventPtr->xbutton.x + bounds.left;
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 90e4a70..cbe6f08 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -665,7 +665,7 @@ void
 TkWmNewWindow(
     TkWindow *winPtr)		/* Newly-created top-level window. */
 {
-    WmInfo *wmPtr = ckalloc(sizeof(WmInfo));
+    WmInfo *wmPtr = (WmInfo *)ckalloc(sizeof(WmInfo));
 
     wmPtr->winPtr = winPtr;
     wmPtr->reparent = None;
@@ -1065,7 +1065,7 @@ TkWmDeadWindow(
 
 void
 TkWmSetClass(
-    TkWindow *winPtr)		/* Newly-created top-level window. */
+    TCL_UNUSED(TkWindow *))		/* Newly-created top-level window. */
 {
     return;
 }
@@ -1087,7 +1087,6 @@ TkWmSetClass(
  *----------------------------------------------------------------------
  */
 
-/* ARGSUSED */
 int
 Tk_WmObjCmd(
     ClientData clientData,	/* Main window associated with interpreter. */
@@ -1252,7 +1251,7 @@ Tk_WmObjCmd(
 
 static int
 WmAspectCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),		/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
@@ -1520,7 +1519,7 @@ WmGetAttribute(
 
 static int
 WmAttributesCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),		/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
@@ -1592,7 +1591,7 @@ WmAttributesCmd(
 
 static int
 WmClientCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),		/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
@@ -1624,7 +1623,7 @@ WmClientCmd(
     if (wmPtr->clientMachine != NULL) {
 	ckfree(wmPtr->clientMachine);
     }
-    wmPtr->clientMachine = ckalloc(length + 1);
+    wmPtr->clientMachine = (char *)ckalloc(length + 1);
     strcpy(wmPtr->clientMachine, argv3);
     return TCL_OK;
 }
@@ -1681,7 +1680,7 @@ WmColormapwindowsCmd(
 	    != TCL_OK) {
 	return TCL_ERROR;
     }
-    cmapList = ckalloc((windowObjc+1) * sizeof(TkWindow*));
+    cmapList = (TkWindow **)ckalloc((windowObjc+1) * sizeof(TkWindow*));
     for (i = 0; i < windowObjc; i++) {
 	if (TkGetWindowFromObj(interp, tkwin, windowObjv[i],
 		(Tk_Window *) &winPtr2) != TCL_OK) {
@@ -1737,7 +1736,7 @@ WmColormapwindowsCmd(
 
 static int
 WmCommandCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),		/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
@@ -1794,7 +1793,7 @@ WmCommandCmd(
 
 static int
 WmDeiconifyCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),		/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
@@ -1872,7 +1871,7 @@ WmDeiconifyCmd(
 
 static int
 WmFocusmodelCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),	/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
@@ -1926,11 +1925,11 @@ WmFocusmodelCmd(
 
 static int
 WmForgetCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),	/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel or Frame to work with */
-    Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,			/* Number of arguments. */
-    Tcl_Obj *const objv[])	/* Argument objects. */
+    TCL_UNUSED(Tcl_Interp *),	/* Current interpreter. */
+    TCL_UNUSED(int),			/* Number of arguments. */
+    TCL_UNUSED(Tcl_Obj *const *))	/* Argument objects. */
 {
     Tk_Window frameWin = (Tk_Window) winPtr;
 
@@ -1992,7 +1991,7 @@ WmForgetCmd(
 
 static int
 WmFrameCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),	/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
@@ -2034,7 +2033,7 @@ WmFrameCmd(
 
 static int
 WmGeometryCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),	/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
@@ -2105,7 +2104,7 @@ WmGeometryCmd(
 
 static int
 WmGridCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),	/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
@@ -2238,7 +2237,7 @@ WmGroupCmd(
 	}
 	wmPtr->hints.window_group = Tk_WindowId(tkwin2);
 	wmPtr->hints.flags |= WindowGroupHint;
-	wmPtr->leaderName = ckalloc(length + 1);
+	wmPtr->leaderName = (char *)ckalloc(length + 1);
 	strcpy(wmPtr->leaderName, argv3);
     }
     return TCL_OK;
@@ -2263,7 +2262,7 @@ WmGroupCmd(
 
 static int
 WmIconbitmapCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),	/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
@@ -2332,7 +2331,7 @@ WmIconbitmapCmd(
 
 static int
 WmIconifyCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),		/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
@@ -2473,7 +2472,7 @@ WmIconmaskCmd(
 
 static int
 WmIconnameCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),		/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
@@ -2498,7 +2497,7 @@ WmIconnameCmd(
 	ckfree(wmPtr->iconName);
     }
     argv3 = Tcl_GetStringFromObj(objv[3], &length);
-    wmPtr->iconName = ckalloc(length + 1);
+    wmPtr->iconName = (char *)ckalloc(length + 1);
     strcpy(wmPtr->iconName, argv3);
     if (!(wmPtr->flags & WM_NEVER_MAPPED)) {
 	XSetIconName(winPtr->display, winPtr->window, wmPtr->iconName);
@@ -2615,7 +2614,7 @@ WmIconphotoCmd(
 
 static int
 WmIconpositionCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),		/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
@@ -2776,11 +2775,11 @@ WmIconwindowCmd(
 
 static int
 WmManageCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),		/* Main window of the application. */
     TkWindow *winPtr,           /* Toplevel or Frame to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,			/* Number of arguments. */
-    Tcl_Obj *const objv[])	/* Argument objects. */
+    TCL_UNUSED(int),			/* Number of arguments. */
+    TCL_UNUSED(Tcl_Obj *const *))	/* Argument objects. */
 {
     Tk_Window frameWin = (Tk_Window) winPtr;
     WmInfo *wmPtr = winPtr->wmInfoPtr;
@@ -2840,7 +2839,7 @@ WmManageCmd(
 
 static int
 WmMaxsizeCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),	/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
@@ -2894,7 +2893,7 @@ WmMaxsizeCmd(
 
 static int
 WmMinsizeCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),		/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
@@ -2948,7 +2947,7 @@ WmMinsizeCmd(
 
 static int
 WmOverrideredirectCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),		/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
@@ -2997,7 +2996,7 @@ WmOverrideredirectCmd(
 
 static int
 WmPositionfromCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),	/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
@@ -3063,7 +3062,7 @@ WmPositionfromCmd(
 
 static int
 WmProtocolCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),	/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
@@ -3134,12 +3133,12 @@ WmProtocolCmd(
     }
     cmd = Tcl_GetStringFromObj(objv[4], &cmdLength);
     if (cmdLength > 0) {
-	protPtr = ckalloc(sizeof(ProtocolHandler));
+	protPtr = (ProtocolHandler *)ckalloc(sizeof(ProtocolHandler));
 	protPtr->protocol = protocol;
 	protPtr->nextPtr = wmPtr->protPtr;
 	wmPtr->protPtr = protPtr;
 	protPtr->interp = interp;
-	protPtr->command = ckalloc(cmdLength+1);
+	protPtr->command = (char *)ckalloc(cmdLength+1);
 	strcpy(protPtr->command, cmd);
     }
     return TCL_OK;
@@ -3164,7 +3163,7 @@ WmProtocolCmd(
 
 static int
 WmResizableCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),	/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
@@ -3241,7 +3240,7 @@ WmResizableCmd(
 
 static int
 WmSizefromCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),	/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
@@ -3433,7 +3432,7 @@ WmStackorderCmd(
 
 static int
 WmStateCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),	/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
@@ -3553,7 +3552,7 @@ WmStateCmd(
 
 static int
 WmTitleCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),	/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
@@ -3681,7 +3680,7 @@ WmTransientCmd(
 	     transient != NULL && transient->winPtr != winPtr;
 	     transient = transient->nextPtr) {}
 	if (transient == NULL) {
-	    transient = ckalloc(sizeof(Transient));
+	    transient = (Transient *)ckalloc(sizeof(Transient));
 	    transient->winPtr = winPtr;
 	    transient->flags = 0;
 	    transient->nextPtr = wmPtr2->transientPtr;
@@ -3781,7 +3780,7 @@ RemoveTransient(
 
 static int
 WmWithdrawCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),	/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
@@ -4069,10 +4068,9 @@ TopLevelEventProc(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static void
 TopLevelReqProc(
-    ClientData dummy,		/* Not used. */
+    TCL_UNUSED(void *),		/* Not used. */
     Tk_Window tkwin)		/* Information about window. */
 {
     TkWindow *winPtr = (TkWindow *) tkwin;
@@ -5095,7 +5093,7 @@ TkWmAddToColormapWindows(
      * add the toplevel itself as the last element of the list.
      */
 
-    newPtr = ckalloc((count+2) * sizeof(TkWindow *));
+    newPtr = (TkWindow **)ckalloc((count+2) * sizeof(TkWindow *));
     if (count > 0) {
 	memcpy(newPtr, oldPtr, count * sizeof(TkWindow *));
     }
@@ -5207,7 +5205,7 @@ TkWmRemoveFromColormapWindows(
 
 void
 TkGetPointerCoords(
-    Tk_Window tkwin,		/* Toplevel window that identifies screen on
+    TCL_UNUSED(Tk_Window),	/* Toplevel window that identifies screen on
 				 * which lookup is to be done. */
     int *xPtr, int *yPtr)	/* Store pointer coordinates here. */
 {
@@ -5315,8 +5313,8 @@ TkMacOSXResizable(
 
 int
 TkMacOSXGrowToplevel(
-    void *whichWindow,
-    XPoint start)
+    TCL_UNUSED(void *),
+    TCL_UNUSED(XPoint))
 {
     return false;
 }
@@ -5533,7 +5531,6 @@ TkMacOSXZoomToplevel(
  *----------------------------------------------------------------------
  */
 
-/* ARGSUSED */
 int
 TkUnsupported1ObjCmd(
     ClientData clientData,	/* Main window associated with interpreter. */
@@ -5669,14 +5666,14 @@ WmWinStyle(
 	{ "altPlain",		kAltPlainWindowClass			     },
 	{ "simple",		kSimpleWindowClass			     },
 	{ "drawer",		kDrawerWindowClass			     },
-	{ NULL }
+	{ NULL, 0 }
     };
     static const struct StrIntMap compositeAttrMap[] = {
 	{ "none",		kWindowNoAttributes			     },
 	{ "standardDocument",	kWindowStandardDocumentAttributes	     },
 	{ "standardFloating",	kWindowStandardFloatingAttributes	     },
 	{ "fullZoom",		kWindowFullZoomAttribute		     },
-	{ NULL }
+	{ NULL, 0 }
     };
 
     /*
@@ -5713,7 +5710,7 @@ WmWinStyle(
 	{ "moveToActiveSpace",	tkMoveToActiveSpaceAttribute		     },
 	{ "nonActivating",	tkNonactivatingPanelAttribute		     },
 	{ "hud",		tkHUDWindowAttribute			     },
-	{ NULL }
+	{ NULL, 0 }
     };
 
     int index, i;
@@ -6557,10 +6554,10 @@ TkpGetMS(void)
 
 int
 XSetInputFocus(
-    Display* display,
-    Window focus,
-    int revert_to,
-    Time time)
+    TCL_UNUSED(Display *),
+    TCL_UNUSED(Window),
+    TCL_UNUSED(int),
+    TCL_UNUSED(Time))
 {
     /*
      * Don't need to do a thing. Tk manages the focus for us.
@@ -6695,7 +6692,7 @@ TkWmStackorderToplevel(
     NSArray* backToFront = [[macWindows reverseObjectEnumerator] allObjects];
     NSInteger windowCount = [macWindows count];
 
-    windows = windowPtr = ckalloc((windowCount + 1) * sizeof(TkWindow *));
+    windows = windowPtr = (TkWindow **)ckalloc((windowCount + 1) * sizeof(TkWindow *));
     if (windows != NULL) {
 	Tcl_InitHashTable(&table, TCL_ONE_WORD_KEYS);
 	WmStackorderToplevelWrapperMap(parentPtr, parentPtr->display, &table);
-- 
cgit v0.12


From c24b589a6b793f5112cd11f613af9aa7ae10b55f Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 6 Aug 2020 16:16:16 +0000
Subject: Add stub entry for XLowerWindow() on MacOS (no idea why this was
 commented out, windows and X11 already had this) More use of TCL_UNUSED()

---
 generic/tkInt.decls         |  3 +++
 generic/tkIntXlibDecls.h    |  8 +++++---
 generic/tkStubInit.c        |  2 +-
 macosx/tkMacOSXBitmap.c     | 10 +++++-----
 macosx/tkMacOSXClipboard.c  |  8 ++++----
 macosx/tkMacOSXServices.c   | 15 +++++++++------
 macosx/tkMacOSXSubwindows.c | 19 +++++++++----------
 macosx/tkMacOSXTest.c       | 17 ++++++++---------
 macosx/ttkMacOSXTheme.c     |  6 +++---
 9 files changed, 47 insertions(+), 41 deletions(-)

diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index f6e7ea9..37557f5 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -1844,6 +1844,9 @@ declare 112 aqua {
 declare 114 aqua {
     VisualID XVisualIDFromVisual(Visual *visual)
 }
+declare 129 aqua {
+    int XLowerWindow(Display *d, Window w)
+}
 declare 137 aqua {
     int XPutImage(Display *d, Drawable dr, GC gc, XImage *im,
 	    int sx, int sy, int dx, int dy,
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index f1b0018..7626d9d 100644
--- a/generic/tkIntXlibDecls.h
+++ b/generic/tkIntXlibDecls.h
@@ -743,7 +743,8 @@ EXTERN VisualID		XVisualIDFromVisual(Visual *visual);
 /* Slot 126 is reserved */
 /* Slot 127 is reserved */
 /* Slot 128 is reserved */
-/* Slot 129 is reserved */
+/* 129 */
+EXTERN int		XLowerWindow(Display *d, Window w);
 /* Slot 130 is reserved */
 /* Slot 131 is reserved */
 /* Slot 132 is reserved */
@@ -1074,7 +1075,7 @@ typedef struct TkIntXlibStubs {
     void (*reserved126)(void);
     void (*reserved127)(void);
     void (*reserved128)(void);
-    void (*reserved129)(void);
+    int (*xLowerWindow) (Display *d, Window w); /* 129 */
     void (*reserved130)(void);
     void (*reserved131)(void);
     void (*reserved132)(void);
@@ -1636,7 +1637,8 @@ extern const TkIntXlibStubs *tkIntXlibStubsPtr;
 /* Slot 126 is reserved */
 /* Slot 127 is reserved */
 /* Slot 128 is reserved */
-/* Slot 129 is reserved */
+#define XLowerWindow \
+	(tkIntXlibStubsPtr->xLowerWindow) /* 129 */
 /* Slot 130 is reserved */
 /* Slot 131 is reserved */
 /* Slot 132 is reserved */
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 4abc637..836f1d1 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -962,7 +962,7 @@ static const TkIntXlibStubs tkIntXlibStubs = {
     0, /* 126 */
     0, /* 127 */
     0, /* 128 */
-    0, /* 129 */
+    XLowerWindow, /* 129 */
     0, /* 130 */
     0, /* 131 */
     0, /* 132 */
diff --git a/macosx/tkMacOSXBitmap.c b/macosx/tkMacOSXBitmap.c
index 2b08235..c1b325a 100644
--- a/macosx/tkMacOSXBitmap.c
+++ b/macosx/tkMacOSXBitmap.c
@@ -44,7 +44,7 @@ static BuiltInIcon builtInIcons[] = {
     {"stop",		kAlertStopIcon},
     {"note",		kAlertNoteIcon},
     {"caution",		kAlertCautionIcon},
-    {NULL}
+    {NULL,			0}
 };
 
 #define builtInIconSize 32
@@ -100,7 +100,7 @@ TkpDefineNativeBitmaps(void)
 	name = Tk_GetUid(builtInPtr->name);
 	predefHashPtr = Tcl_CreateHashEntry(tablePtr, name, &isNew);
 	if (isNew) {
-	    TkPredefBitmap *predefPtr = ckalloc(sizeof(TkPredefBitmap));
+	    TkPredefBitmap *predefPtr = (TkPredefBitmap *)ckalloc(sizeof(TkPredefBitmap));
 
 	    predefPtr->source = UINT2PTR(builtInPtr->iconType);
 	    predefPtr->width = builtInIconSize;
@@ -343,7 +343,7 @@ TkpGetNativeAppBitmap(
 
 int
 TkMacOSXIconBitmapObjCmd(
-    ClientData clientData,	/* Unused. */
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -398,7 +398,7 @@ TkMacOSXIconBitmapObjCmd(
 	}
     }
 #endif
-    ib.value = ckalloc(len + 1);
+    ib.value = (char *)ckalloc(len + 1);
     strcpy(ib.value, value);
     if (!iconBitmapTable.buckets) {
 	Tcl_InitHashTable(&iconBitmapTable, TCL_STRING_KEYS);
@@ -408,7 +408,7 @@ TkMacOSXIconBitmapObjCmd(
 	iconBitmap = Tcl_GetHashValue(hPtr);
 	ckfree(iconBitmap->value);
     } else {
-	iconBitmap = ckalloc(sizeof(IconBitmap));
+	iconBitmap = (IconBitmap *)ckalloc(sizeof(IconBitmap));
 	Tcl_SetHashValue(hPtr, iconBitmap);
     }
     *iconBitmap = ib;
diff --git a/macosx/tkMacOSXClipboard.c b/macosx/tkMacOSXClipboard.c
index be1f16c..bae2b89 100644
--- a/macosx/tkMacOSXClipboard.c
+++ b/macosx/tkMacOSXClipboard.c
@@ -177,7 +177,7 @@ XSetSelectionOwner(
     Display *display,		/* X Display. */
     Atom selection,		/* What selection to own. */
     Window owner,		/* Window to be the owner. */
-    Time time)			/* The current time? */
+    TCL_UNUSED(Time))			/* The current time? */
 {
     TkDisplay *dispPtr = TkGetDisplayList();
 
@@ -237,8 +237,8 @@ TkMacOSXSelDeadWindow(
 
 void
 TkSelUpdateClipboard(
-    TkWindow *winPtr,		/* Window associated with clipboard. */
-    TkClipboardTarget *targetPtr)
+    TCL_UNUSED(TkWindow *),		/* Window associated with clipboard. */
+    TCL_UNUSED(TkClipboardTarget *))
 				/* Info about the content. */
 {
     NSPasteboard *pb = [NSPasteboard generalPasteboard];
@@ -294,7 +294,7 @@ TkSelEventProc(
 
 void
 TkSelPropProc(
-    XEvent *eventPtr)	/* X PropertyChange event. */
+    TCL_UNUSED(XEvent *))	/* X PropertyChange event. */
 {
 }
 
diff --git a/macosx/tkMacOSXServices.c b/macosx/tkMacOSXServices.c
index 0434f10..59e3439 100644
--- a/macosx/tkMacOSXServices.c
+++ b/macosx/tkMacOSXServices.c
@@ -20,10 +20,11 @@
 
 static int
 ServicesEventProc(
-    Tcl_Event *event,
-    int flags)
+    TCL_UNUSED(Tcl_Event *),
+    TCL_UNUSED(int))
 {
     TkMainInfo *info = TkGetMainInfoList();
+
     Tcl_GlobalEval(info->interp, "::tk::mac::PerformService");
     return 1;
 }
@@ -43,8 +44,8 @@ ServicesEventProc(
 - (void) provideService:(NSPasteboard *)pboard
 	       userData:(NSString *)data
 		  error:(NSString **)error;
-- (BOOL)writeSelectionToPasteboard:(NSPasteboard *)pboard
-			     types:(NSArray *)types;
+- (BOOL) writeSelectionToPasteboard:(NSPasteboard *)pboard
+			      types:(NSArray *)types;
 
 @end
 
@@ -104,6 +105,8 @@ ServicesEventProc(
     NSString *pboardString = nil, *pboardType = nil;
     NSArray *types = [pboard types];
     Tcl_Event *event;
+    (void)data;
+    (void)error;
 
     /*
      * Get a string from the private pasteboard and copy it to the general
@@ -123,7 +126,7 @@ ServicesEventProc(
 	[generalpasteboard declareTypes:[NSArray arrayWithObjects:pboardType, nil]
 				  owner:nil];
 	[generalpasteboard setString:pboardString forType:pboardType];
-	event = ckalloc(sizeof(Tcl_Event));
+	event = (Tcl_Event *)ckalloc(sizeof(Tcl_Event));
 	event->proc = ServicesEventProc;
 	Tcl_QueueEvent((Tcl_Event *)event, TCL_QUEUE_TAIL);
     }
@@ -137,7 +140,7 @@ ServicesEventProc(
 
 int
 TkMacOSXServices_Init(
-    Tcl_Interp *interp)
+    TCL_UNUSED(Tcl_Interp *))
 {
     /*
      * Initialize an instance of TkService and register it with the NSApp.
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index 8b316fa..899832b 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -51,7 +51,7 @@ static void		NotifyVisibility(TkWindow *winPtr, XEvent *eventPtr);
 
 int
 XDestroyWindow(
-    Display *display,		/* Display. */
+    TCL_UNUSED(Display *),		/* Display. */
     Window window)		/* Window. */
 {
     MacDrawable *macWin = (MacDrawable *) window;
@@ -633,7 +633,6 @@ XRaiseWindow(
     return Success;
 }
 
-#if 0
 /*
  *----------------------------------------------------------------------
  *
@@ -650,7 +649,7 @@ XRaiseWindow(
  *----------------------------------------------------------------------
  */
 
-void
+int
 XLowerWindow(
     Display *display,		/* Display. */
     Window window)		/* Window. */
@@ -661,12 +660,12 @@ XLowerWindow(
     if (Tk_IsTopLevel(macWin->winPtr) && !Tk_IsEmbedded(macWin->winPtr)) {
 	TkWmRestackToplevel(macWin->winPtr, Below, NULL);
     } else {
-        /*
+	/*
 	 * TODO: this should generate damage
 	 */
     }
+    return Success;
 }
-#endif
 
 /*
  *----------------------------------------------------------------------
@@ -691,7 +690,7 @@ XConfigureWindow(
     Display *display,		/* Display. */
     Window w,			/* Window. */
     unsigned int value_mask,
-    XWindowChanges *values)
+    TCL_UNUSED(XWindowChanges *))
 {
     MacDrawable *macWin = (MacDrawable *) w;
     TkWindow *winPtr = macWin->winPtr;
@@ -999,7 +998,7 @@ TkMacOSXVisableClipRgn(
 static OSStatus
 InvalViewRect(
     int msg,
-    HIShapeRef rgn,
+    TCL_UNUSED(HIShapeRef),
     const CGRect *rect,
     void *ref)
 {
@@ -1134,7 +1133,7 @@ TkMacOSXDrawable(
 
 void *
 TkMacOSXGetDrawablePort(
-    Drawable drawable)
+    TCL_UNUSED(Drawable))
 {
     return NULL;
 }
@@ -1462,7 +1461,7 @@ UpdateOffsets(
 Pixmap
 Tk_GetPixmap(
     Display *display,	/* Display for new pixmap (can be null). */
-    Drawable d,		/* Drawable where pixmap will be used (ignored). */
+    TCL_UNUSED(Drawable),		/* Drawable where pixmap will be used (ignored). */
     int width,		/* Dimensions of pixmap. */
     int height,
     int depth)		/* Bits per pixel for pixmap. */
@@ -1472,7 +1471,7 @@ Tk_GetPixmap(
     if (display != NULL) {
 	display->request++;
     }
-    macPix = ckalloc(sizeof(MacDrawable));
+    macPix = (MacDrawable *)ckalloc(sizeof(MacDrawable));
     macPix->winPtr = NULL;
     macPix->xOff = 0;
     macPix->yOff = 0;
diff --git a/macosx/tkMacOSXTest.c b/macosx/tkMacOSXTest.c
index e5dcf5e..c70ecd5 100644
--- a/macosx/tkMacOSXTest.c
+++ b/macosx/tkMacOSXTest.c
@@ -26,11 +26,11 @@ static int		DebuggerObjCmd (ClientData dummy, Tcl_Interp *interp,
 					int objc, Tcl_Obj *const objv[]);
 #endif
 static int		PressButtonObjCmd (ClientData dummy, Tcl_Interp *interp,
-					int objc, Tcl_Obj *const objv[]);
+					int objc, Tcl_Obj *const *objv);
 static int		InjectKeyEventObjCmd (ClientData dummy, Tcl_Interp *interp,
-					int objc, Tcl_Obj *const objv[]);
+					int objc, Tcl_Obj *const *objv);
 static int		MenuBarHeightObjCmd (ClientData dummy, Tcl_Interp *interp,
-					int objc, Tcl_Obj *const objv[]);
+					int objc, Tcl_Obj *const *objv);
 
 
 /*
@@ -117,10 +117,10 @@ DebuggerObjCmd(
 
 static int
 MenuBarHeightObjCmd(
-    ClientData clientData,		/* Not used. */
+    TCL_UNUSED(void *),		/* Not used. */
     Tcl_Interp *interp,			/* Not used. */
-    int objc,				/* Not used. */
-    Tcl_Obj *const objv[])		/* Not used. */
+    TCL_UNUSED(int),				/* Not used. */
+    TCL_UNUSED(Tcl_Obj *const *))		/* Not used. */
 {
     static int height = 0;
     if (height == 0) {
@@ -188,10 +188,9 @@ TkTestLogDisplay(
  *----------------------------------------------------------------------
  */
 
-        /* ARGSUSED */
 static int
 PressButtonObjCmd(
-    ClientData clientData,
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
@@ -267,7 +266,7 @@ PressButtonObjCmd(
 
 static int
 InjectKeyEventObjCmd(
-    ClientData clientData,
+    TCL_UNUSED(ClientData),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c
index f1b7b8e..b0be4e9 100644
--- a/macosx/ttkMacOSXTheme.c
+++ b/macosx/ttkMacOSXTheme.c
@@ -250,7 +250,7 @@ static CGFloat blackRGBA[4] = {0.0, 0.0, 0.0, 1.0};
  */
 
 static void GetBackgroundColor(
-    CGContextRef context,
+    TCL_UNUSED(CGContextRef),
     Tk_Window tkwin,
     int contrast,
     CGFloat *rgba)
@@ -1039,7 +1039,7 @@ static void DrawDarkTab(
 static void DrawDarkSeparator(
     CGRect bounds,
     CGContextRef context,
-    Tk_Window tkwin)
+    TCL_UNUSED(Tk_Window))
 {
     static CGFloat fill[4] = {1.0, 1.0, 1.0, 0.3};
     NSColorSpace *deviceRGB = [NSColorSpace deviceRGBColorSpace];
@@ -1165,7 +1165,7 @@ static void DrawDarkFrame(
 static void DrawDarkListHeader(
     CGRect bounds,
     CGContextRef context,
-    Tk_Window tkwin,
+    TCL_UNUSED(Tk_Window),
     int state)
 {
     NSColorSpace *deviceRGB = [NSColorSpace deviceRGBColorSpace];
-- 
cgit v0.12


From 99709b2eabc727f8111c905451de8b65c462e353 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Mon, 10 Aug 2020 21:52:34 +0000
Subject: Fix [315104a5c10] for 8.6: Inappropriate virtual events sent when
 accent color is changed.

---
 macosx/tkMacOSXColor.c       |  2 +-
 macosx/tkMacOSXWindowEvent.c | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index 89bddb9..1dcfdaa 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -211,7 +211,7 @@ GetEntryFromPixel(
 /*
  *----------------------------------------------------------------------
  *
- * GetRGB --
+ * GetRGBA --
  *
  *	Given a SystemColorDatum and a pointer to an array of 4 CGFloats, store
  *      the associated RGBA color values in the array.  In the case of the
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index a23a6d7..db1a406 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -1078,10 +1078,19 @@ ConfigureRestrictProc(
     NSWindow *w = [self window];
     TkWindow *winPtr = TkMacOSXGetTkWindow(w);
     Tk_Window tkwin = (Tk_Window) winPtr;
-
+    static NSAppearanceName lastAppearanceName = nil;
+    NSAppearanceName effectiveAppearanceName = [[self effectiveAppearance] name];
     if (!winPtr) {
 	return;
     }
+    if (!lastAppearanceName) {
+	lastAppearanceName = effectiveAppearanceName;
+	return;
+    }
+    if (lastAppearanceName == effectiveAppearanceName) {
+	return;
+    }
+    lastAppearanceName = effectiveAppearanceName;
     bzero(&event, sizeof(XVirtualEvent));
     event.type = VirtualEvent;
     event.serial = LastKnownRequestProcessed(Tk_Display(tkwin));
@@ -1095,10 +1104,12 @@ ConfigureRestrictProc(
     		  &event.x_root, &event.y_root, &x, &y, &event.state);
     Tk_TopCoordsToWindow(tkwin, x, y, &event.x, &event.y);
     event.same_screen = true;
-    if (TkMacOSXInDarkMode(tkwin)) {
+    if (effectiveAppearanceName == NSAppearanceNameDarkAqua) {
 	event.name = Tk_GetUid("DarkAqua");
-    } else {
+    } else if (effectiveAppearanceName == NSAppearanceNameAqua) {
         event.name = Tk_GetUid("LightAqua");
+    } else {
+	return;
     }
     Tk_QueueWindowEvent((XEvent *) &event, TCL_QUEUE_TAIL);
 }
-- 
cgit v0.12


From c28292a3923e7c09df16322a73d4b53eaff74b79 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 11 Aug 2020 11:40:07 +0000
Subject: Add 3 more stub entries to MacOSX X11 stub table, which win32 already
 has: XDestroyIC(), XCreatePixmapCursor(), XCreateGlyphCursor()

---
 generic/tkInt.decls      |  12 ++
 generic/tkIntXlibDecls.h |  28 ++--
 generic/tkStubInit.c     |   6 +-
 win/stubs.c              | 224 ++++++++++++++++++++++-----
 xlib/xgc.c               | 382 +++++++++++++++++++++++++++++++++++++++++++----
 5 files changed, 571 insertions(+), 81 deletions(-)

diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index 37557f5..14ab250 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -1852,6 +1852,18 @@ declare 137 aqua {
 	    int sx, int sy, int dx, int dy,
 	    unsigned int w, unsigned int h)
 }
+declare 144 aqua {
+    void XDestroyIC(XIC xic)
+}
+declare 145 aqua {
+    Cursor XCreatePixmapCursor(Display *d, Pixmap p1, Pixmap p2,
+	    XColor *x1, XColor *x2, unsigned int ui1, unsigned int ui2)
+}
+declare 146 aqua {
+    Cursor XCreateGlyphCursor(Display *d, Font f1, Font f2,
+	    unsigned int ui1, unsigned int ui2, XColor _Xconst *x1,
+	    XColor _Xconst *x2)
+}
 declare 158 aqua {
     void TkUnusedStubEntry(void)
 }
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index 7626d9d..7c5d815 100644
--- a/generic/tkIntXlibDecls.h
+++ b/generic/tkIntXlibDecls.h
@@ -762,9 +762,16 @@ EXTERN int		XPutImage(Display *d, Drawable dr, GC gc, XImage *im,
 /* Slot 141 is reserved */
 /* Slot 142 is reserved */
 /* Slot 143 is reserved */
-/* Slot 144 is reserved */
-/* Slot 145 is reserved */
-/* Slot 146 is reserved */
+/* 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 147 is reserved */
 /* Slot 148 is reserved */
 /* Slot 149 is reserved */
@@ -1090,9 +1097,9 @@ typedef struct TkIntXlibStubs {
     void (*reserved141)(void);
     void (*reserved142)(void);
     void (*reserved143)(void);
-    void (*reserved144)(void);
-    void (*reserved145)(void);
-    void (*reserved146)(void);
+    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 (*reserved147)(void);
     void (*reserved148)(void);
     void (*reserved149)(void);
@@ -1654,9 +1661,12 @@ extern const TkIntXlibStubs *tkIntXlibStubsPtr;
 /* Slot 141 is reserved */
 /* Slot 142 is reserved */
 /* Slot 143 is reserved */
-/* Slot 144 is reserved */
-/* Slot 145 is reserved */
-/* Slot 146 is reserved */
+#define XDestroyIC \
+	(tkIntXlibStubsPtr->xDestroyIC) /* 144 */
+#define XCreatePixmapCursor \
+	(tkIntXlibStubsPtr->xCreatePixmapCursor) /* 145 */
+#define XCreateGlyphCursor \
+	(tkIntXlibStubsPtr->xCreateGlyphCursor) /* 146 */
 /* Slot 147 is reserved */
 /* Slot 148 is reserved */
 /* Slot 149 is reserved */
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 836f1d1..ab8b675 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -977,9 +977,9 @@ static const TkIntXlibStubs tkIntXlibStubs = {
     0, /* 141 */
     0, /* 142 */
     0, /* 143 */
-    0, /* 144 */
-    0, /* 145 */
-    0, /* 146 */
+    XDestroyIC, /* 144 */
+    XCreatePixmapCursor, /* 145 */
+    XCreateGlyphCursor, /* 146 */
     0, /* 147 */
     0, /* 148 */
     0, /* 149 */
diff --git a/win/stubs.c b/win/stubs.c
index 884186c..faeac08 100644
--- a/win/stubs.c
+++ b/win/stubs.c
@@ -1,4 +1,4 @@
-#include "tk.h"
+#include "tkInt.h"
 
 /*
  * Undocumented Xlib internal function
@@ -8,6 +8,8 @@ int
 _XInitImageFuncPtrs(
     XImage *image)
 {
+    (void)image;
+
     return Success;
 }
 
@@ -21,6 +23,9 @@ XSetWMClientMachine(
     Window w,
     XTextProperty *text_prop)
 {
+	(void)display;
+	(void)w;
+	(void)text_prop;
 }
 
 Status
@@ -29,7 +34,11 @@ XStringListToTextProperty(
     int count,
     XTextProperty *text_prop_return)
 {
-    return (Status) 0;
+    (void)list;
+    (void)count;
+    (void)text_prop_return;
+
+    return Success;
 }
 
 /*
@@ -47,54 +56,36 @@ XChangeProperty(
     _Xconst unsigned char *data,
     int nelements)
 {
-    return Success;
-}
+    (void)display;
+    (void)w;
+    (void)property;
+    (void)type;
+    (void)format;
+    (void)mode;
+    (void)data;
+    (void)nelements;
 
-Cursor
-XCreateGlyphCursor(
-    Display *display,
-    Font source_font,
-    Font mask_font,
-    unsigned int source_char,
-    unsigned int mask_char,
-    XColor _Xconst *foreground_color,
-    XColor _Xconst *background_color)
-{
-    return 1;
+    return Success;
 }
 
 XIC
 XCreateIC(XIM xim, ...)
 {
+    (void)xim;
     return NULL;
 }
 
-Cursor
-XCreatePixmapCursor(
-    Display *display,
-    Pixmap source,
-    Pixmap mask,
-    XColor *foreground_color,
-    XColor *background_color,
-    unsigned int x,
-    unsigned int y)
-{
-    return (Cursor) NULL;
-}
-
 int
 XDeleteProperty(
     Display *display,
     Window w,
     Atom property)
 {
-    return Success;
-}
+    (void)display;
+    (void)w;
+    (void)property;
 
-void
-XDestroyIC(
-    XIC ic)
-{
+    return Success;
 }
 
 Bool
@@ -102,6 +93,9 @@ XFilterEvent(
     XEvent *event,
     Window window)
 {
+    (void)event;
+    (void)window;
+
     return 0;
 }
 
@@ -110,6 +104,9 @@ XForceScreenSaver(
     Display *display,
     int mode)
 {
+    (void)display;
+    (void)mode;
+
     return Success;
 }
 
@@ -118,6 +115,9 @@ XFreeCursor(
     Display *display,
     Cursor cursor)
 {
+    (void)display;
+    (void)cursor;
+
     return Success;
 }
 
@@ -125,6 +125,8 @@ GContext
 XGContextFromGC(
     GC gc)
 {
+    (void)gc;
+
     return (GContext) NULL;
 }
 
@@ -133,6 +135,9 @@ XGetAtomName(
     Display *display,
     Atom atom)
 {
+    (void)display;
+    (void)atom;
+
     return NULL;
 }
 
@@ -142,6 +147,10 @@ XGetWindowAttributes(
     Window w,
     XWindowAttributes *window_attributes_return)
 {
+    (void)display;
+    (void)w;
+    (void)window_attributes_return;
+
     return Success;
 }
 
@@ -152,7 +161,12 @@ XGetWMColormapWindows(
     Window **windows_return,
     int *count_return)
 {
-    return (Status) 0;
+    (void)display;
+    (void)w;
+    (void)windows_return;
+    (void)count_return;
+
+    return Success;
 }
 
 int
@@ -161,6 +175,10 @@ XIconifyWindow(
     Window w,
     int screen_number)
 {
+    (void)display;
+    (void)w;
+    (void)screen_number;
+
     return Success;
 }
 
@@ -170,6 +188,10 @@ XListHosts(
     int *nhosts_return,
     Bool *state_return)
 {
+    (void)display;
+    (void)nhosts_return;
+    (void)state_return;
+
     return NULL;
 }
 
@@ -181,6 +203,12 @@ XLookupColor(
     XColor *exact_def_return,
     XColor *screen_def_return)
 {
+    (void)display;
+    (void)colormap;
+    (void)color_name;
+    (void)exact_def_return;
+    (void)screen_def_return;
+
     return Success;
 }
 
@@ -189,6 +217,9 @@ XNextEvent(
     Display *display,
     XEvent *event_return)
 {
+    (void)display;
+    (void)event_return;
+
     return Success;
 }
 
@@ -197,6 +228,9 @@ XPutBackEvent(
     Display *display,
     XEvent *event)
 {
+    (void)display;
+    (void)event;
+
     return Success;
 }
 
@@ -207,6 +241,11 @@ XQueryColors(
     XColor *defs_in_out,
     int ncolors)
 {
+    (void)display;
+    (void)colormap;
+    (void)defs_in_out;
+    (void)ncolors;
+
     return Success;
 }
 
@@ -219,6 +258,13 @@ XQueryTree(
     Window **children_return,
     unsigned int *nchildren_return)
 {
+    (void)display;
+    (void)w;
+    (void)root_return;
+    (void)parent_return;
+    (void)children_return;
+    (void)nchildren_return;
+
     return Success;
 }
 
@@ -226,6 +272,8 @@ int
 XRefreshKeyboardMapping(
     XMappingEvent *event_map)
 {
+    (void)event_map;
+
     return Success;
 }
 
@@ -234,6 +282,9 @@ XRootWindow(
     Display *display,
     int screen_number)
 {
+    (void)display;
+    (void)screen_number;
+
     return (Window) NULL;
 }
 
@@ -243,6 +294,10 @@ XSelectInput(
     Window w,
     long event_mask)
 {
+    (void)display;
+    (void)w;
+    (void)event_mask;
+
     return Success;
 }
 
@@ -254,6 +309,12 @@ XSendEvent(
     long event_mask,
     XEvent *event_send)
 {
+    (void)display;
+    (void)w;
+    (void)propagate;
+    (void)event_mask;
+    (void)event_send;
+
     return Success;
 }
 
@@ -264,6 +325,11 @@ XSetCommand(
     char **argv,
     int argc)
 {
+    (void)display;
+    (void)w;
+    (void)argv;
+    (void)argc;
+
     return Success;
 }
 
@@ -271,6 +337,8 @@ XErrorHandler
 XSetErrorHandler(
     XErrorHandler handler)
 {
+    (void)handler;
+
     return NULL;
 }
 
@@ -280,6 +348,10 @@ XSetIconName(
     Window w,
     _Xconst char *icon_name)
 {
+    (void)display;
+    (void)w;
+    (void)icon_name;
+
     return Success;
 }
 
@@ -289,6 +361,10 @@ XSetWindowBackground(
     Window w,
     unsigned long background_pixel)
 {
+    (void)display;
+    (void)w;
+    (void)background_pixel;
+
     return Success;
 }
 
@@ -298,6 +374,10 @@ XSetWindowBackgroundPixmap(
     Window w,
     Pixmap background_pixmap)
 {
+    (void)display;
+    (void)w;
+    (void)background_pixmap;
+
     return Success;
 }
 
@@ -307,6 +387,10 @@ XSetWindowBorder(
     Window w,
     unsigned long border_pixel)
 {
+    (void)display;
+    (void)w;
+    (void)border_pixel;
+
     return Success;
 }
 
@@ -316,6 +400,10 @@ XSetWindowBorderPixmap(
     Window w,
     Pixmap border_pixmap)
 {
+    (void)display;
+    (void)w;
+    (void)border_pixmap;
+
     return Success;
 }
 
@@ -325,6 +413,10 @@ XSetWindowBorderWidth(
     Window w,
     unsigned int width)
 {
+    (void)display;
+    (void)w;
+    (void)width;
+
     return Success;
 }
 
@@ -334,6 +426,10 @@ XSetWindowColormap(
     Window w,
     Colormap colormap)
 {
+    (void)display;
+    (void)w;
+    (void)colormap;
+
     return Success;
 }
 
@@ -348,6 +444,15 @@ XTranslateCoordinates(
     int *dest_y_return,
     Window *child_return)
 {
+    (void)display;
+    (void)src_w;
+    (void)dest_w;
+    (void)src_x;
+    (void)src_y;
+    (void)dest_x_return;
+    (void)dest_y_return;
+    (void)child_return;
+
     return 0;
 }
 
@@ -358,6 +463,11 @@ XWindowEvent(
     long event_mask,
     XEvent *event_return)
 {
+    (void)display;
+    (void)w;
+    (void)event_mask;
+    (void)event_return;
+
     return Success;
 }
 
@@ -367,6 +477,10 @@ XWithdrawWindow(
     Window w,
     int screen_number)
 {
+    (void)display;
+    (void)w;
+    (void)screen_number;
+
     return Success;
 }
 
@@ -379,6 +493,13 @@ XmbLookupString(
     KeySym *keysym_return,
     Status *status_return)
 {
+    (void)ic;
+    (void)event;
+    (void)buffer_return;
+    (void)bytes_buffer;
+    (void)keysym_return;
+    (void)status_return;
+
     return Success;
 }
 
@@ -389,7 +510,7 @@ XGetWindowProperty(
     Atom property,
     long long_offset,
     long long_length,
-    Bool delete,
+    Bool del,
     Atom req_type,
     Atom *actual_type_return,
     int *actual_format_return,
@@ -397,6 +518,14 @@ XGetWindowProperty(
     unsigned long *bytes_after_return,
     unsigned char **prop_return)
 {
+    (void)display;
+    (void)w;
+    (void)property;
+    (void)long_offset;
+    (void)long_length;
+    (void)del;
+    (void)req_type;
+
     *actual_type_return = None;
     *actual_format_return = 0;
     *nitems_return = 0;
@@ -413,6 +542,8 @@ int
 XFlush(
     Display *display)
 {
+    (void)display;
+
     return 0;
 }
 
@@ -420,6 +551,8 @@ int
 XGrabServer(
     Display *display)
 {
+    (void)display;
+
     return 0;
 }
 
@@ -427,6 +560,8 @@ int
 XUngrabServer(
     Display *display)
 {
+    (void)display;
+
     return 0;
 }
 
@@ -453,6 +588,8 @@ XSynchronize(
     Display *display,
     Bool onoff)
 {
+    (void)onoff;
+
     display->request++;
     return NULL;
 }
@@ -462,6 +599,8 @@ XSync(
     Display *display,
     Bool discard)
 {
+    (void)discard;
+
     display->request++;
     return 0;
 }
@@ -472,3 +611,16 @@ XVisualIDFromVisual(
 {
     return visual->visualid;
 }
+
+int
+XOffsetRegion(
+    Region rgn,
+	int dx,
+	int dy)
+{
+    (void)rgn;
+    (void)dx;
+    (void)dy;
+
+	return 0;
+}
diff --git a/xlib/xgc.c b/xlib/xgc.c
index e2fdf52..013ee63 100644
--- a/xlib/xgc.c
+++ b/xlib/xgc.c
@@ -51,7 +51,7 @@ static TkpClipMask *AllocClipMask(GC gc) {
     TkpClipMask *clip_mask = (TkpClipMask*) gc->clip_mask;
 
     if (clip_mask == NULL) {
-	clip_mask = ckalloc(sizeof(TkpClipMask));
+	clip_mask = (TkpClipMask *)ckalloc(sizeof(TkpClipMask));
 	gc->clip_mask = (Pixmap) clip_mask;
 #ifdef MAC_OSX_TK
     } else if (clip_mask->type == TKP_CLIP_REGION) {
@@ -84,7 +84,7 @@ static void FreeClipMask(GC gc) {
 	    TkpReleaseRegion(((TkpClipMask*) gc->clip_mask)->value.region);
 	}
 #endif
-	ckfree(gc->clip_mask);
+	ckfree((char *)gc->clip_mask);
 	gc->clip_mask = None;
     }
 }
@@ -113,6 +113,7 @@ XCreateGC(
     XGCValues *values)
 {
     GC gp;
+    (void)d;
 
     /*
      * In order to have room for a dash list, MAX_DASH_LIST_SIZE extra chars
@@ -123,7 +124,7 @@ XCreateGC(
 
 #define MAX_DASH_LIST_SIZE 10
 
-    gp = ckalloc(sizeof(XGCValues) + MAX_DASH_LIST_SIZE + gcCacheSize);
+    gp = (GC)ckalloc(sizeof(XGCValues) + MAX_DASH_LIST_SIZE + gcCacheSize);
     if (!gp) {
 	return NULL;
     }
@@ -144,11 +145,11 @@ XCreateGC(
     InitField(fill_style,	  GCFillStyle,		FillSolid);
     InitField(fill_rule,	  GCFillRule,		WindingRule);
     InitField(arc_mode,		  GCArcMode,		ArcPieSlice);
-    InitField(tile,		  GCTile,		None);
-    InitField(stipple,		  GCStipple,		None);
+    InitField(tile,		  GCTile,		0);
+    InitField(stipple,		  GCStipple,		0);
     InitField(ts_x_origin,	  GCTileStipXOrigin,	0);
     InitField(ts_y_origin,	  GCTileStipYOrigin,	0);
-    InitField(font,		  GCFont,		None);
+    InitField(font,		  GCFont,		0);
     InitField(subwindow_mode,	  GCSubwindowMode,	ClipByChildren);
     InitField(graphics_exposures, GCGraphicsExposures,	True);
     InitField(clip_x_origin,	  GCClipXOrigin,	0);
@@ -268,6 +269,8 @@ int XFreeGC(
     Display *d,
     GC gc)
 {
+    (void)d;
+
     if (gc != NULL) {
 	FreeClipMask(gc);
 	TkpFreeGCCache(gc);
@@ -299,6 +302,8 @@ XSetForeground(
     GC gc,
     unsigned long foreground)
 {
+    (void)display;
+
     gc->foreground = foreground;
     return Success;
 }
@@ -309,6 +314,8 @@ XSetBackground(
     GC gc,
     unsigned long background)
 {
+    (void)display;
+
     gc->background = background;
     return Success;
 }
@@ -322,6 +329,7 @@ XSetDashes(
     int n)
 {
     char *p = &(gc->dashes);
+    (void)display;
 
 #ifdef TkWinDeleteBrush
     TkWinDeleteBrush(gc->fgBrush);
@@ -344,6 +352,8 @@ XSetFunction(
     GC gc,
     int function)
 {
+    (void)display;
+
     gc->function = function;
     return Success;
 }
@@ -354,6 +364,8 @@ XSetFillRule(
     GC gc,
     int fill_rule)
 {
+    (void)display;
+
     gc->fill_rule = fill_rule;
     return Success;
 }
@@ -364,6 +376,8 @@ XSetFillStyle(
     GC gc,
     int fill_style)
 {
+    (void)display;
+
     gc->fill_style = fill_style;
     return Success;
 }
@@ -374,6 +388,8 @@ XSetTSOrigin(
     GC gc,
     int x, int y)
 {
+    (void)display;
+
     gc->ts_x_origin = x;
     gc->ts_y_origin = y;
     return Success;
@@ -385,6 +401,8 @@ XSetFont(
     GC gc,
     Font font)
 {
+    (void)display;
+
     gc->font = font;
     return Success;
 }
@@ -395,6 +413,8 @@ XSetArcMode(
     GC gc,
     int arc_mode)
 {
+    (void)display;
+
     gc->arc_mode = arc_mode;
     return Success;
 }
@@ -405,6 +425,8 @@ XSetStipple(
     GC gc,
     Pixmap stipple)
 {
+    (void)display;
+
     gc->stipple = stipple;
     return Success;
 }
@@ -418,6 +440,8 @@ XSetLineAttributes(
     int cap_style,
     int join_style)
 {
+    (void)display;
+
     gc->line_width = line_width;
     gc->line_style = line_style;
     gc->cap_style = cap_style;
@@ -432,6 +456,8 @@ XSetClipOrigin(
     int clip_x_origin,
     int clip_y_origin)
 {
+    (void)display;
+
     gc->clip_x_origin = clip_x_origin;
     gc->clip_y_origin = clip_y_origin;
     return Success;
@@ -464,6 +490,8 @@ TkSetRegion(
     GC gc,
     TkRegion r)
 {
+    (void)display;
+
     if (r == NULL) {
 	Tcl_Panic("must not pass NULL to TkSetRegion for compatibility with X11; use XSetClipMask instead");
     } else {
@@ -484,6 +512,8 @@ XSetClipMask(
     GC gc,
     Pixmap pixmap)
 {
+    (void)display;
+
     if (pixmap == None) {
 	FreeClipMask(gc);
     } else {
@@ -542,6 +572,7 @@ XDrawPoints(
     int mode)
 {
     int res = Success;
+    (void)mode;
 
     while (npoints-- > 0) {
 	res = XDrawLine(display, d, gc,
@@ -561,6 +592,12 @@ XDrawSegments(
     XSegment *segments,
     int nsegments)
 {
+    (void)display;
+    (void)d;
+    (void)gc;
+    (void)segments;
+    (void)nsegments;
+
     return BadDrawable;
 }
 #endif
@@ -572,6 +609,10 @@ XFetchBuffer(
     int *nbytes_return,
     int buffer)
 {
+    (void)display;
+    (void)nbytes_return;
+    (void)buffer;
+
     return (char *) 0;
 }
 
@@ -581,7 +622,11 @@ XFetchName(
     Window w,
     char **window_name_return)
 {
-    return (Status) 0;
+    (void)display;
+    (void)w;
+    (void)window_name_return;
+
+    return Success;
 }
 
 Atom *
@@ -590,32 +635,25 @@ XListProperties(
     Window w,
     int *num_prop_return)
 {
+    (void)display;
+    (void)w;
+    (void)num_prop_return;
+
     return (Atom *) 0;
 }
 
-void
+int
 XMapRaised(
     Display *display,
     Window w)
 {
-}
+    (void)display;
+    (void)w;
 
-void
-XPutImage(
-    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)
-{
+    return Success;
 }
 
-void
+int
 XQueryTextExtents(
     Display *display,
     XID font_ID,
@@ -626,9 +664,19 @@ XQueryTextExtents(
     int *font_descent_return,
     XCharStruct *overall_return)
 {
+    (void)display;
+    (void)font_ID;
+    (void)string;
+    (void)nchars;
+    (void)direction_return;
+    (void)font_ascent_return;
+    (void)font_descent_return;
+    (void)overall_return;
+
+    return Success;
 }
 
-void
+int
 XReparentWindow(
     Display *display,
     Window w,
@@ -636,29 +684,297 @@ XReparentWindow(
     int x,
     int y)
 {
+    (void)display;
+    (void)w;
+    (void)parent;
+    (void)x;
+    (void)y;
+
+    return BadWindow;
 }
 
-void
-XRotateBuffers(
+int
+XUndefineCursor(
     Display *display,
-    int rotate)
+    Window w)
 {
+    (void)display;
+    (void)w;
+
+    return Success;
+}
+
+XVaNestedList
+XVaCreateNestedList(
+    int unused, ...)
+{
+    (void)unused;
+    return NULL;
+}
+
+char *
+XSetICValues(
+    XIC xic, ...)
+{
+    (void)xic;
+    return NULL;
+}
+
+char *
+XGetICValues(
+    XIC xic, ...)
+{
+    (void)xic;
+    return NULL;
 }
 
 void
-XStoreBuffer(
+XSetICFocus(
+    XIC xic)
+{
+    (void)xic;
+}
+
+Window
+XCreateWindow(
     Display *display,
-    _Xconst char *bytes,
-    int nbytes,
-    int buffer)
+	Window parent,
+	int x,
+	int y,
+    unsigned int width,
+	unsigned int height,
+    unsigned int border_width,
+	int depth,
+	unsigned int clazz,
+    Visual *visual,
+	unsigned long value_mask,
+    XSetWindowAttributes *attributes)
+{
+    (void)display;
+    (void)parent;
+    (void)x;
+    (void)y;
+    (void)width;
+    (void)height;
+    (void)border_width;
+    (void)depth;
+    (void)clazz;
+    (void)visual;
+    (void)value_mask;
+    (void)attributes;
+
+	return 0;
+}
+
+int
+XPointInRegion(
+    Region rgn,
+	int x,
+	int y)
 {
+    (void)rgn;
+    (void)x;
+    (void)y;
+
+	return 0;
 }
 
+int
+XUnionRegion(
+    Region srca,
+	Region srcb,
+	Region dr_return)
+{
+    (void)srca;
+    (void)srcb;
+    (void)dr_return;
+
+	return 0;
+}
+
+Region
+XPolygonRegion(
+    XPoint *pts,
+	int n,
+	int rule)
+{
+    (void)pts;
+    (void)n;
+    (void)rule;
+
+    return 0;
+}
+#endif
+
 void
-XUndefineCursor(
+XDestroyIC(
+    XIC ic)
+{
+    (void)ic;
+}
+
+Cursor
+XCreatePixmapCursor(
     Display *display,
-    Window w)
+    Pixmap source,
+    Pixmap mask,
+    XColor *foreground_color,
+    XColor *background_color,
+    unsigned int x,
+    unsigned int y)
+{
+    (void)display;
+    (void)source;
+    (void)mask;
+    (void)foreground_color;
+    (void)background_color;
+    (void)x;
+    (void)y;
+
+    return (Cursor) NULL;
+}
+
+Cursor
+XCreateGlyphCursor(
+    Display *display,
+    Font source_font,
+    Font mask_font,
+    unsigned int source_char,
+    unsigned int mask_char,
+    XColor _Xconst *foreground_color,
+    XColor _Xconst *background_color)
 {
+    (void)display;
+    (void)source_font;
+    (void)mask_font;
+    (void)source_char;
+    (void)mask_char;
+    (void)foreground_color;
+    (void)background_color;
+
+    return (Cursor) NULL;
+}
+
+#if 0
+XFontSet
+XCreateFontSet(
+    Display *display		/* display */,
+    _Xconst char *base_font_name_list	/* base_font_name_list */,
+    char ***missing_charset_list		/* missing_charset_list */,
+    int *missing_charset_count		/* missing_charset_count */,
+    char **def_string		/* def_string */
+) {
+    (void)display;
+    (void)base_font_name_list;
+    (void)missing_charset_list;
+    (void)missing_charset_count;
+    (void)def_string;
+
+    return (XFontSet)0;
+}
+
+void
+XFreeFontSet(
+    Display *display,		/* display */
+    XFontSet fontset		/* font_set */
+) {
+    (void)display;
+    (void)fontset;
+}
+
+void
+XFreeStringList(
+    char **list		/* list */
+) {
+    (void)list;
+}
+
+Status
+XCloseIM(
+    XIM im /* im */
+) {
+    (void)im;
+
+    return Success;
+}
+
+Bool
+XRegisterIMInstantiateCallback(
+    Display *dpy			/* dpy */,
+    struct _XrmHashBucketRec *rdb	/* rdb */,
+    char *res_name			/* res_name */,
+    char *res_class			/* res_class */,
+    XIDProc callback			/* callback */,
+    XPointer client_data			/* client_data */
+) {
+    (void)dpy;
+    (void)rdb;
+    (void)res_name;
+    (void)res_class;
+    (void)callback;
+    (void)client_data;
+
+    return False;
+}
+
+Bool
+XUnregisterIMInstantiateCallback(
+    Display *dpy			/* dpy */,
+    struct _XrmHashBucketRec *rdb	/* rdb */,
+    char *res_name			/* res_name */,
+    char *res_class			/* res_class */,
+    XIDProc callback			/* callback */,
+    XPointer client_data			/* client_data */
+) {
+    (void)dpy;
+    (void)rdb;
+    (void)res_name;
+    (void)res_class;
+    (void)callback;
+    (void)client_data;
+
+    return False;
+}
+
+char *
+XSetLocaleModifiers(
+    const char *modifier_list		/* modifier_list */
+) {
+    (void)modifier_list;
+
+    return NULL;
+}
+
+XIM XOpenIM(
+    Display *dpy			/* dpy */,
+    struct _XrmHashBucketRec *rdb	/* rdb */,
+    char *res_name			/* res_name */,
+    char *res_class			/* res_class */
+) {
+    (void)dpy;
+    (void)rdb;
+    (void)res_name;
+    (void)res_class;
+
+    return NULL;
+}
+
+char *
+XGetIMValues(
+    XIM im /* im */, ...
+) {
+    (void)im;
+
+    return NULL;
+}
+
+char *
+XSetIMValues(
+    XIM im /* im */, ...
+) {
+    (void)im;
+
+    return NULL;
 }
 #endif
 
-- 
cgit v0.12


From 152923a55c9a178ccaed5eec573c03271eae1967 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Tue, 11 Aug 2020 17:56:33 +0000
Subject: Generate a virtual event <<NewAccentColor>> when the accent or
 highlight colors are changed in Preferences.

---
 macosx/tkMacOSXWindowEvent.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index db1a406..8c7561a 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -1080,16 +1080,23 @@ ConfigureRestrictProc(
     Tk_Window tkwin = (Tk_Window) winPtr;
     static NSAppearanceName lastAppearanceName = nil;
     NSAppearanceName effectiveAppearanceName = [[self effectiveAppearance] name];
+    Tk_Uid eventName = NULL;
     if (!winPtr) {
 	return;
     }
     if (!lastAppearanceName) {
 	lastAppearanceName = effectiveAppearanceName;
-	return;
     }
     if (lastAppearanceName == effectiveAppearanceName) {
+	eventName = Tk_GetUid("NewAccentColor");
+    } else if (effectiveAppearanceName == NSAppearanceNameDarkAqua) {
+	eventName = Tk_GetUid("DarkAqua");
+    } else if (effectiveAppearanceName == NSAppearanceNameAqua) {
+        eventName = Tk_GetUid("LightAqua");
+    } else {
 	return;
     }
+
     lastAppearanceName = effectiveAppearanceName;
     bzero(&event, sizeof(XVirtualEvent));
     event.type = VirtualEvent;
@@ -1104,13 +1111,7 @@ ConfigureRestrictProc(
     		  &event.x_root, &event.y_root, &x, &y, &event.state);
     Tk_TopCoordsToWindow(tkwin, x, y, &event.x, &event.y);
     event.same_screen = true;
-    if (effectiveAppearanceName == NSAppearanceNameDarkAqua) {
-	event.name = Tk_GetUid("DarkAqua");
-    } else if (effectiveAppearanceName == NSAppearanceNameAqua) {
-        event.name = Tk_GetUid("LightAqua");
-    } else {
-	return;
-    }
+    event.name = eventName;
     Tk_QueueWindowEvent((XEvent *) &event, TCL_QUEUE_TAIL);
 }
 
-- 
cgit v0.12


From 8ac846412241e0914a4bb279bf586c53835e34ab Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Tue, 11 Aug 2020 21:25:17 +0000
Subject: Fix the first event reporting a change in effective appearance

---
 macosx/tkMacOSXColor.c       | 12 ++++++++----
 macosx/tkMacOSXWindowEvent.c |  4 +++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index 1dcfdaa..fe0cc2a 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -682,6 +682,7 @@ TkpGetColor(
     TkColor *tkColPtr;
     XColor color;
     Colormap colormap = tkwin ? Tk_Colormap(tkwin) : noColormap;
+    NSView *view = nil;
     static Bool initialized = NO;
     static NSColorSpace* sRGB = NULL;
 
@@ -692,6 +693,8 @@ TkpGetColor(
     }
     if (tkwin) {
 	display = Tk_Display(tkwin);
+	MacDrawable *macWin = (MacDrawable *) Tk_WindowId(tkwin);
+	view = TkMacOSXDrawableView(macWin);
     }
 
     /*
@@ -713,12 +716,13 @@ TkpGetColor(
 		CGFloat rgba[4];
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
 		NSAppearance *savedAppearance = [NSAppearance currentAppearance];
-		NSAppearance *windowAppearance;
-		if (TkMacOSXInDarkMode(tkwin)) {
-		    windowAppearance = darkAqua;
+		NSAppearance *windowAppearance = savedAppearance;
+		if (view) {
+		    windowAppearance = [view effectiveAppearance];
+		}
+		if ([windowAppearance name] == NSAppearanceNameDarkAqua) {
 		    colormap = darkColormap;
 		} else {
-		    windowAppearance = lightAqua;
 		    colormap = lightColormap;
 		}
 		[NSAppearance setCurrentAppearance:windowAppearance];
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 8c7561a..8214731 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -207,6 +207,7 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
     TkWindow *winPtr = TkMacOSXGetTkWindow(window);
     if (winPtr) {
 	TKContentView *view = [window contentView];
+	[view viewDidChangeEffectiveAppearance];
 	[view addTkDirtyRect:[view bounds]];
 	Tcl_CancelIdleCall(TkMacOSXDrawAllViews, NULL);
 	Tcl_DoWhenIdle(TkMacOSXDrawAllViews, NULL);
@@ -1085,7 +1086,8 @@ ConfigureRestrictProc(
 	return;
     }
     if (!lastAppearanceName) {
-	lastAppearanceName = effectiveAppearanceName;
+	lastAppearanceName = [[NSAppearance currentAppearance] name];
+	return;
     }
     if (lastAppearanceName == effectiveAppearanceName) {
 	eventName = Tk_GetUid("NewAccentColor");
-- 
cgit v0.12


From 589d0dde98f21d4046bf3fa2fb4112c90863b8ad Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 12 Aug 2020 07:24:55 +0000
Subject: Rename (internal) MAASTER_MENU to MAIN_MENU, but keep the original,
 just to be sure

---
 generic/tkMenu.c  | 40 ++++++++++++++++++++--------------------
 generic/tkMenu.h  | 13 +++++++------
 tests/menu.test   |  2 +-
 unix/tkUnixMenu.c |  4 ++--
 win/tkWinMenu.c   |  4 ++--
 5 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/generic/tkMenu.c b/generic/tkMenu.c
index f43bbe0..638139a 100644
--- a/generic/tkMenu.c
+++ b/generic/tkMenu.c
@@ -39,12 +39,12 @@
  * right; they have a Tk window and pathname associated with them; they have a
  * TkMenu structure and array of entries. However, they are linked with the
  * original menu that they were cloned from. The reflect the attributes of the
- * original, or "master", menu. So if an item is added to a menu, and that
+ * original, or "main", menu. So if an item is added to a menu, and that
  * menu has clones, then the item must be added to all of its clones also.
  * Menus are cloned when a menu is torn-off or when a menu is assigned as a
  * menubar using the "-menu" option of the toplevel's pathname configure
  * subcommand. When a clone is destroyed, only the clone is destroyed, but
- * when the master menu is destroyed, all clones are also destroyed. This
+ * when the main menu is destroyed, all clones are also destroyed. This
  * allows the developer to just deal with one set of menus when creating and
  * destroying.
  *
@@ -513,7 +513,7 @@ Tk_MenuObjCmd(
 	    nextCascadePtr = cascadeListPtr->nextCascadePtr;
 
      	    /*
-	     * If we have a new master menu, and an existing cloned menu
+	     * If we have a new main menu, and an existing cloned menu
 	     * points to this menu in a cascade entry, we have to clone the
 	     * new menu and point the entry to the clone instead of the menu
 	     * we are creating. Otherwise, ConfigureMenuEntry will hook up the
@@ -1100,8 +1100,8 @@ DestroyMenuInstance(
     TkMenu *menuInstancePtr;
     TkMenuEntry *cascadePtr, *nextCascadePtr;
     Tcl_Obj *newObjv[2];
-    TkMenu *parentMasterMenuPtr;
-    TkMenuEntry *parentMasterEntryPtr;
+    TkMenu *parentMainMenuPtr;
+    TkMenuEntry *parentMainEntryPtr;
     ThreadSpecificData *tsdPtr =
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
@@ -1110,11 +1110,11 @@ DestroyMenuInstance(
      * entries need to be told that the menu is going away. We need to clear
      * the menu ptr field in the menu reference at this point in the code so
      * that everything else can forget about this menu properly. We also need
-     * to reset -menu field of all entries that are not master menus back to
-     * this entry name if this is a master menu pointed to by another master
+     * to reset -menu field of all entries that are not main menus back to
+     * this entry name if this is a main menu pointed to by another main
      * menu. If there is a clone menu that points to this menu, then this menu
      * is itself a clone, so when this menu goes away, the -menu field of the
-     * pointing entry must be set back to this menu's master menu name so that
+     * pointing entry must be set back to this menu's main menu name so that
      * later if another menu is created the cascade hierarchy can be
      * maintained.
      */
@@ -1135,11 +1135,11 @@ DestroyMenuInstance(
     	if (menuPtr->masterMenuPtr != menuPtr) {
 	    Tcl_Obj *menuNamePtr = Tcl_NewStringObj("-menu", -1);
 
-	    parentMasterMenuPtr = cascadePtr->menuPtr->masterMenuPtr;
-	    parentMasterEntryPtr =
-		    parentMasterMenuPtr->entries[cascadePtr->index];
+	    parentMainMenuPtr = cascadePtr->menuPtr->masterMenuPtr;
+	    parentMainEntryPtr =
+		    parentMainMenuPtr->entries[cascadePtr->index];
 	    newObjv[0] = menuNamePtr;
-	    newObjv[1] = parentMasterEntryPtr->namePtr;
+	    newObjv[1] = parentMainEntryPtr->namePtr;
 
 	    /*
 	     * It is possible that the menu info is out of sync, and these
@@ -1169,7 +1169,7 @@ DestroyMenuInstance(
 	    }
 	}
     } else if (menuPtr->nextInstancePtr != NULL) {
-	Tcl_Panic("Attempting to delete master menu when there are still clones");
+	Tcl_Panic("Attempting to delete main menu when there are still clones");
     }
 
     /*
@@ -1209,8 +1209,8 @@ DestroyMenuInstance(
  *
  *	This function is invoked by Tcl_EventuallyFree or Tcl_Release to clean
  *	up the internal structure of a menu at a safe time (when no-one is
- *	using it anymore). If called on a master instance, destroys all of the
- *	slave instances. If called on a non-master instance, just destroys
+ *	using it anymore). If called on a main instance, destroys all of the
+ *	instances. If called on a non-main instance, just destroys
  *	that instance.
  *
  * Results:
@@ -1571,7 +1571,7 @@ ConfigureMenu(
 	     * menuTypeName field to tell that this is a menu bar.
 	     */
 
-	    if (menuListPtr->menuType == MASTER_MENU) {
+	    if (menuListPtr->menuType == MAIN_MENU) {
 		int typeFlag = TK_MAKE_MENU_POPUP;
 		Tk_Window tkwin = menuPtr->tkwin;
 
@@ -1982,7 +1982,7 @@ ConfigureMenuCloneEntries(
 
     /*
      * Cascades are kind of tricky here. This is special case #3 in the
-     * comment at the top of this file. Basically, if a menu is the master
+     * comment at the top of this file. Basically, if a menu is the main
      * menu of a clone chain, and has an entry with a cascade menu, the clones
      * of the menu will point to clones of the cascade menu. We have to
      * destroy the clones of the cascades, clone the new cascade menu, and
@@ -2416,7 +2416,7 @@ MenuAddOrInsert(
 	 * If a menu has cascades, then every instance of the menu has to have
 	 * its own parallel cascade structure. So adding an entry to a menu
 	 * with clones means that the menu that the entry points to has to be
-	 * cloned for every clone the master menu has. This is special case #2
+	 * cloned for every clone the main menu has. This is special case #2
 	 * in the comment at the top of this file.
     	 */
 
@@ -2697,7 +2697,7 @@ CloneMenu(
     Tcl_Obj *menuDupCommandArray[4];
 
     if (newMenuTypePtr == NULL) {
-	menuType = MASTER_MENU;
+	menuType = MAIN_MENU;
     } else {
 	if (Tcl_GetIndexFromObjStruct(menuPtr->interp, newMenuTypePtr,
 		menuTypeStrings, sizeof(char *), "menu type", 0, &menuType) != TCL_OK) {
@@ -2752,7 +2752,7 @@ CloneMenu(
 	}
 
 	/*
-	 * Add the master menu's window to the bind tags for this window after
+	 * Add the main menu's window to the bind tags for this window after
 	 * this window's tag. This is so the user can bind to either this
 	 * clone (which may not be easy to do) or the entire menu clone
 	 * structure.
diff --git a/generic/tkMenu.h b/generic/tkMenu.h
index a0fa7ab..386b204 100644
--- a/generic/tkMenu.h
+++ b/generic/tkMenu.h
@@ -185,7 +185,7 @@ typedef struct TkMenuEntry {
     				 * the menu. */
 
     /*
-     * Bookeeping for master menus and cascade menus.
+     * Bookeeping for main menus and cascade menus.
      */
 
     struct TkMenuReferences *childMenuRefPtr;
@@ -266,7 +266,7 @@ typedef struct TkMenu {
     int numEntries;		/* Number of elements in entries. */
     int active;			/* Index of active entry. -1 means nothing
 				 * active. */
-    int menuType;		/* MASTER_MENU, TEAROFF_MENU, or MENUBAR. See
+    int menuType;		/* MAIN_MENU, TEAROFF_MENU, or MENUBAR. See
     				 * below for definitions. */
     Tcl_Obj *menuTypePtr;	/* Used to control whether created tkwin is a
 				 * toplevel or not. "normal", "menubar", or
@@ -354,7 +354,7 @@ typedef struct TkMenu {
     struct TkMenu *masterMenuPtr;
     				/* A pointer to the original menu for this
     				 * clone chain. Points back to this structure
-    				 * if this menu is a master menu. */
+    				 * if this menu is a main menu. */
     void *reserved1; /* not used any more. */
     Tk_Window parentTopLevelPtr;/* If this menu is a menubar, this is the
     				 * toplevel that owns the menu. Only
@@ -433,7 +433,7 @@ typedef struct TkMenuReferences {
  * MENU_DELETION_PENDING	Non-zero means that we are currently
  *				destroying this menu's internal structures.
  *				This is useful when we are in the middle of
- *				cleaning this master menu's chain of menus up
+ *				cleaning this main menu's chain of menus up
  *				when TkDestroyMenu was called again on this
  *				menu (via a destroy binding or somesuch).
  * MENU_WIN_DESTRUCTION_PENDING Non-zero means we are in the middle of
@@ -451,15 +451,16 @@ typedef struct TkMenuReferences {
 #define MENU_PLATFORM_FLAG3	(1 << 28)
 
 /*
- * Each menu created by the user is a MASTER_MENU. When a menu is torn off, a
+ * Each menu created by the user is a MAIN_MENU. When a menu is torn off, a
  * TEAROFF_MENU instance is created. When a menu is assigned to a toplevel as
  * a menu bar, a MENUBAR instance is created. All instances have the same
- * configuration information. If the master instance is deleted, all instances
+ * configuration information. If the main instance is deleted, all instances
  * are deleted. If one of the other instances is deleted, only that instance
  * is deleted.
  */
 
 #define UNKNOWN_TYPE		-1
+#define MAIN_MENU 		0
 #define MASTER_MENU 		0
 #define TEAROFF_MENU 		1
 #define MENUBAR 		2
diff --git a/tests/menu.test b/tests/menu.test
index a7f5956..6a3c6fe 100644
--- a/tests/menu.test
+++ b/tests/menu.test
@@ -2052,7 +2052,7 @@ test menu-5.8 {DestroyMenuInstance - multiple clones} -setup {
     set tearoff2 [tk::TearOffMenu .m1]
     list [destroy $tearoff1] [destroy .m1]
 } -returnCodes ok -result {{} {}}
-test menu-5.9 {DestroyMenuInstace - master menu} -setup {
+test menu-5.9 {DestroyMenuInstace - main menu} -setup {
     destroy .m1
 } -body {
     menu .m1
diff --git a/unix/tkUnixMenu.c b/unix/tkUnixMenu.c
index aa54897..fc8b4f2 100644
--- a/unix/tkUnixMenu.c
+++ b/unix/tkUnixMenu.c
@@ -1057,7 +1057,7 @@ GetTearoffEntryGeometry(
     int *widthPtr,		/* The resulting width */
     int *heightPtr)		/* The resulting height */
 {
-    if (menuPtr->menuType != MASTER_MENU) {
+    if (menuPtr->menuType != MAIN_MENU) {
 	*heightPtr = 0;
 	*widthPtr = 0;
     } else {
@@ -1281,7 +1281,7 @@ DrawTearoffEntry(
     int segmentWidth, maxX;
     Tk_3DBorder border;
 
-    if (menuPtr->menuType != MASTER_MENU) {
+    if (menuPtr->menuType != MAIN_MENU) {
 	return;
     }
 
diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c
index 6c55164..67894c7 100644
--- a/win/tkWinMenu.c
+++ b/win/tkWinMenu.c
@@ -1689,7 +1689,7 @@ GetTearoffEntryGeometry(
     (void)mePtr;
     (void)tkfont;
 
-    if (menuPtr->menuType != MASTER_MENU) {
+    if (menuPtr->menuType != MAIN_MENU) {
 	*heightPtr = 0;
     } else {
 	*heightPtr = fmPtr->linespace;
@@ -2597,7 +2597,7 @@ DrawTearoffEntry(
     (void)tkfont;
     (void)fmPtr;
 
-    if (menuPtr->menuType != MASTER_MENU) {
+    if (menuPtr->menuType != MAIN_MENU) {
 	return;
     }
 
-- 
cgit v0.12


From 9353f4752d719dabcbfd4794332748dfe1537423 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 12 Aug 2020 09:44:56 +0000
Subject: Implementation ofr TIP #581 for Tk

---
 doc/CrtImgType.3         | 15 ++++++++++++++-
 doc/ImgChanged.3         |  4 ++++
 doc/NameOfImg.3          |  4 ++++
 generic/tk.h             |  1 +
 generic/tkDecls.h        |  1 +
 generic/tkGrid.c         |  9 +++++----
 generic/tkInt.h          |  6 ++++++
 generic/tkIntPlatDecls.h |  2 ++
 generic/tkPack.c         |  9 +++++----
 generic/tkPlace.c        |  5 +++--
 generic/tkWindow.c       |  2 +-
 tests/grid.test          |  2 +-
 tests/oldpack.test       |  4 ++--
 tests/pack.test          |  2 +-
 tests/place.test         |  2 +-
 15 files changed, 51 insertions(+), 17 deletions(-)

diff --git a/doc/CrtImgType.3 b/doc/CrtImgType.3
index cbbc11e..8e6b826 100644
--- a/doc/CrtImgType.3
+++ b/doc/CrtImgType.3
@@ -9,7 +9,7 @@
 .so man.macros
 .BS
 .SH NAME
-Tk_CreateImageType, Tk_GetImageMasterData, Tk_InitImageArgs \- define new kind of image
+Tk_CreateImageType, Tk_GetImageMasterData, Tk_GetImageModelData, Tk_InitImageArgs \- define new kind of image
 .SH SYNOPSIS
 .nf
 \fB#include <tk.h>\fR
@@ -19,6 +19,11 @@ Tk_CreateImageType, Tk_GetImageMasterData, Tk_InitImageArgs \- define new kind o
 ClientData
 \fBTk_GetImageMasterData\fR(\fIinterp, name, typePtrPtr\fR)
 .sp
+.VS "TIP 581"
+ClientData
+\fBTk_GetImageModelData\fR(\fIinterp, name, typePtrPtr\fR)
+.VE "TIP 581"
+.sp
 \fBTk_InitImageArgs\fR(\fIinterp, argc, argvPtr\fR)
 .SH ARGUMENTS
 .AS "const Tk_ImageType" *typePtrPtr
@@ -241,6 +246,10 @@ and the return value is the ClientData value returned by the
 \fIcreateProc\fR when the image was created (this is typically a
 pointer to the image master data structure).  If no such image exists
 then NULL is returned and NULL is stored at \fI*typePtrPtr\fR.
+.PP
+.VS "TIP 581"
+\fBTk_GetImageModelData\fR is synonym for \fBTk_GetImageMasterData\fR
+.VE "TIP 581"
 .SH "LEGACY INTERFACE SUPPORT"
 .PP
 In Tk 8.2 and earlier, the definition of \fBTk_ImageCreateProc\fR
@@ -261,6 +270,10 @@ interface.  The Tk header file will still support this legacy
 interface if the code is compiled with the macro \fBUSE_OLD_IMAGE\fR
 defined.
 .PP
+.VS "TIP 581"
+\fITk_ImageModel\fR is synonym for \fITk_ImageMaster\fR
+.VE "TIP 581"
+.PP
 When the \fBUSE_OLD_IMAGE\fR legacy support is enabled, you may
 see the routine \fBTk_InitImageArgs\fR in use.  This was a migration
 tool used to create stub-enabled extensions that could be loaded
diff --git a/doc/ImgChanged.3 b/doc/ImgChanged.3
index f4d2c04..aa56548 100644
--- a/doc/ImgChanged.3
+++ b/doc/ImgChanged.3
@@ -48,6 +48,10 @@ specify a rectangular region within the image that needs to
 be redrawn.
 \fIimageWidth\fR and \fIimageHeight\fR specify the image's (new) size.
 .PP
+.VS "TIP 581"
+\fITk_ImageModel\fR is synonym for \fITk_ImageMaster\fR
+.VE "TIP 581"
+.PP
 An image manager should call \fBTk_ImageChanged\fR during
 its \fIcreateProc\fR to specify the image's initial size and to
 force redisplay if there are existing instances for the image.
diff --git a/doc/NameOfImg.3 b/doc/NameOfImg.3
index 8c191ce..484e479 100644
--- a/doc/NameOfImg.3
+++ b/doc/NameOfImg.3
@@ -26,5 +26,9 @@ the image was created.
 This procedure is invoked by image managers to find out the name
 of an image.  Given the token for the image, it returns the
 string name for the image.
+.PP
+.VS "TIP 581"
+\fITk_ImageModel\fR is synonym for \fITk_ImageMaster\fR
+.VE "TIP 581"
 .SH KEYWORDS
 image manager, image name
diff --git a/generic/tk.h b/generic/tk.h
index 01f3657..116f6d8 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -137,6 +137,7 @@ typedef struct Tk_3DBorder_ *Tk_3DBorder;
 typedef struct Tk_Style_ *Tk_Style;
 typedef struct Tk_StyleEngine_ *Tk_StyleEngine;
 typedef struct Tk_StyledElement_ *Tk_StyledElement;
+#define Tk_ImageModel Tk_ImageMaster
 
 /*
  * Additional types exported to clients.
diff --git a/generic/tkDecls.h b/generic/tkDecls.h
index 64c32cd..b02f286 100644
--- a/generic/tkDecls.h
+++ b/generic/tkDecls.h
@@ -1720,6 +1720,7 @@ extern const TkStubs *tkStubsPtr;
 #undef Tk_Init
 #undef Tk_SafeInit
 #undef Tk_CreateConsoleWindow
+#define Tk_GetImageModelData Tk_GetImageMasterData
 
 #if defined(_WIN32) && defined(UNICODE)
 #   define Tk_MainEx Tk_MainExW
diff --git a/generic/tkGrid.c b/generic/tkGrid.c
index be15c14..835971d 100644
--- a/generic/tkGrid.c
+++ b/generic/tkGrid.c
@@ -338,13 +338,13 @@ Tk_GridObjCmd(
     Tk_Window tkwin = clientData;
     static const char *const optionStrings[] = {
 	"anchor", "bbox", "columnconfigure", "configure",
-	"forget", "info", "location", "propagate", "remove",
-	"rowconfigure", "size",	"slaves", NULL
+	"content", "forget", "info", "location", "propagate",
+	"remove", "rowconfigure", "size",	"slaves", NULL
     };
     enum options {
 	GRID_ANCHOR, GRID_BBOX, GRID_COLUMNCONFIGURE, GRID_CONFIGURE,
-	GRID_FORGET, GRID_INFO, GRID_LOCATION, GRID_PROPAGATE, GRID_REMOVE,
-	GRID_ROWCONFIGURE, GRID_SIZE, GRID_SLAVES
+	GRID_CONTENT, GRID_FORGET, GRID_INFO, GRID_LOCATION, GRID_PROPAGATE,
+	GRID_REMOVE, GRID_ROWCONFIGURE, GRID_SIZE, GRID_SLAVES
     };
     int index;
 
@@ -384,6 +384,7 @@ Tk_GridObjCmd(
 	return GridPropagateCommand(tkwin, interp, objc, objv);
     case GRID_SIZE:
 	return GridSizeCommand(tkwin, interp, objc, objv);
+    case GRID_CONTENT:
     case GRID_SLAVES:
 	return GridSlavesCommand(tkwin, interp, objc, objv);
 
diff --git a/generic/tkInt.h b/generic/tkInt.h
index 2f64f99..9735c32 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -84,6 +84,11 @@
 # endif
 #endif
 
+
+#ifndef Tcl_GetParent
+#   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
@@ -360,6 +365,7 @@ typedef struct TkDisplay {
 
 #define TkGetGeomMaster(tkwin) (((TkWindow *)tkwin)->maintainerPtr != NULL ? \
     ((TkWindow *)tkwin)->maintainerPtr : ((TkWindow *)tkwin)->parentPtr)
+#define TkGetGeomContainer TkGetGeomMaster
 
     /*
      * Information used by tkGet.c only:
diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h
index 8221d7a..02bb9ae 100644
--- a/generic/tkIntPlatDecls.h
+++ b/generic/tkIntPlatDecls.h
@@ -799,6 +799,8 @@ extern const TkIntPlatStubs *tkIntPlatStubsPtr;
 #undef TkpTestsendCmd_
 #undef TkGenerateActivateEvents_
 
+#define TkGetTransientContainer TkGetTransientMaster
+
 #undef TCL_STORAGE_CLASS
 #define TCL_STORAGE_CLASS DLLIMPORT
 
diff --git a/generic/tkPack.c b/generic/tkPack.c
index 9005d7f..245c6a4 100644
--- a/generic/tkPack.c
+++ b/generic/tkPack.c
@@ -198,11 +198,11 @@ Tk_PackObjCmd(
     const char *argv2;
     static const char *const optionStrings[] = {
 	/* after, append, before and unpack are deprecated */
-	"after", "append", "before", "unpack",
-	"configure", "forget", "info", "propagate", "slaves", NULL };
+	"after", "append", "before", "unpack", "configure",
+	"content", "forget", "info", "propagate", "slaves", NULL };
     enum options {
-	PACK_AFTER, PACK_APPEND, PACK_BEFORE, PACK_UNPACK,
-	PACK_CONFIGURE, PACK_FORGET, PACK_INFO, PACK_PROPAGATE, PACK_SLAVES };
+	PACK_AFTER, PACK_APPEND, PACK_BEFORE, PACK_UNPACK, PACK_CONFIGURE,
+	PACK_CONTENT, PACK_FORGET, PACK_INFO, PACK_PROPAGATE, PACK_SLAVES };
     int index;
 
     if (objc >= 2) {
@@ -436,6 +436,7 @@ Tk_PackObjCmd(
 	}
 	break;
     }
+    case PACK_CONTENT:
     case PACK_SLAVES: {
 	Tk_Window master;
 	Packer *masterPtr, *slavePtr;
diff --git a/generic/tkPlace.c b/generic/tkPlace.c
index 59b8a2b..f5afa38 100644
--- a/generic/tkPlace.c
+++ b/generic/tkPlace.c
@@ -214,9 +214,9 @@ Tk_PlaceObjCmd(
     TkDisplay *dispPtr;
     Tk_OptionTable optionTable;
     static const char *const optionStrings[] = {
-	"configure", "forget", "info", "slaves", NULL
+	"configure", "content", "forget", "info", "slaves", NULL
     };
-    enum options { PLACE_CONFIGURE, PLACE_FORGET, PLACE_INFO, PLACE_SLAVES };
+    enum options { PLACE_CONFIGURE, PLACE_CONTENT, PLACE_FORGET, PLACE_INFO, PLACE_SLAVES };
     int index;
 
     if (objc < 3) {
@@ -330,6 +330,7 @@ Tk_PlaceObjCmd(
 	}
 	return PlaceInfoCommand(interp, tkwin);
 
+    case PLACE_CONTENT:
     case PLACE_SLAVES: {
 	Master *masterPtr;
 
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index a67329c..5e5e836 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.c
@@ -3094,7 +3094,7 @@ Initialize(
 	Tcl_Interp *parent = interp;
 
 	while (Tcl_IsSafe(parent)) {
-	    parent = Tcl_GetMaster(parent);
+	    parent = Tcl_GetParent(parent);
 	    if (parent == NULL) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			"no controlling parent interpreter", -1));
diff --git a/tests/grid.test b/tests/grid.test
index 62474ff..eef42e1 100644
--- a/tests/grid.test
+++ b/tests/grid.test
@@ -45,7 +45,7 @@ test grid-1.1 {basic argument checking} -body {
 } -returnCodes error -result {wrong # args: should be "grid option arg ?arg ...?"}
 test grid-1.2 {basic argument checking} -body {
     grid foo bar
-} -returnCodes error -result {bad option "foo": must be anchor, bbox, columnconfigure, configure, forget, info, location, propagate, remove, rowconfigure, size, or slaves}
+} -returnCodes error -result {bad option "foo": must be anchor, bbox, columnconfigure, configure, content, forget, info, location, propagate, remove, rowconfigure, size, or slaves}
 test grid-1.3 {basic argument checking} -body {
     button .b
     grid .b -row 0 -column
diff --git a/tests/oldpack.test b/tests/oldpack.test
index 72ec065..92c411d 100644
--- a/tests/oldpack.test
+++ b/tests/oldpack.test
@@ -452,10 +452,10 @@ test oldpack-8.2 {syntax errors} -body {
 } -returnCodes error -result {wrong # args: should be "pack option arg ?arg ...?"}
 test oldpack-8.3 {syntax errors} -body {
     pack gorp foo
-} -returnCodes error -result {bad option "gorp": must be configure, forget, info, propagate, or slaves}
+} -returnCodes error -result {bad option "gorp": must be configure, content, forget, info, propagate, or slaves}
 test oldpack-8.4 {syntax errors} -body {
     pack a .pack
-} -returnCodes error -result {bad option "a": must be configure, forget, info, propagate, or slaves}
+} -returnCodes error -result {bad option "a": must be configure, content, forget, info, propagate, or slaves}
 test oldpack-8.5 {syntax errors} -body {
     pack after foobar
 } -returnCodes error -result {bad window path name "foobar"}
diff --git a/tests/pack.test b/tests/pack.test
index 86fcad2..7b75363 100644
--- a/tests/pack.test
+++ b/tests/pack.test
@@ -1373,7 +1373,7 @@ test pack-12.46 {command options and errors} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack lousy .pack
-} -returnCodes error -result {bad option "lousy": must be configure, forget, info, propagate, or slaves}
+} -returnCodes error -result {bad option "lousy": must be configure, content, forget, info, propagate, or slaves}
 
 
 test pack-13.1 {window deletion} -setup {
diff --git a/tests/place.test b/tests/place.test
index 0a5e22f..e7cf5ff 100644
--- a/tests/place.test
+++ b/tests/place.test
@@ -329,7 +329,7 @@ test place-9.5 {PlaceObjCmd} -setup {
     place badopt .foo
 } -cleanup {
     destroy .foo
-} -returnCodes error -result {bad option "badopt": must be configure, forget, info, or slaves}
+} -returnCodes error -result {bad option "badopt": must be configure, content, forget, info, or slaves}
 test place-9.6 {PlaceObjCmd, configure errors} -setup {
     destroy .foo
 } -body {
-- 
cgit v0.12


From b80a12fe1ac29d3ba04737c7cd7b698db23d38f0 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Wed, 12 Aug 2020 13:20:55 +0000
Subject: Aqua - automatically support all NSColors in the System ColorList.

---
 doc/colors.n           | 89 ++++++++++++--------------------------------------
 macosx/tkMacOSXColor.c | 31 +++++++++++++++++-
 macosx/tkMacOSXColor.h | 15 ++-------
 3 files changed, 52 insertions(+), 83 deletions(-)

diff --git a/doc/colors.n b/doc/colors.n
index 847dbaa..1e938bb 100644
--- a/doc/colors.n
+++ b/doc/colors.n
@@ -792,23 +792,15 @@ suggested by the color name.
 .RS
 .DS
 systemActiveAreaFill
-systemAlertActiveText
 systemAlertBackgroundActive
 systemAlertBackgroundInactive
-systemAlertInactiveText
 systemAlternatePrimaryHighlightColor
 systemAppleGuideCoachmark
 systemBevelActiveDark
 systemBevelActiveLight
-systemBevelButtonActiveText
-systemBevelButtonInactiveText
-systemBevelButtonPressedText
-systemBevelButtonStickyActiveText
-systemBevelButtonStickyInactiveText
 systemBevelInactiveDark
 systemBevelInactiveLight
 systemBlack
-systemBlackText
 systemButtonActiveDarkHighlight
 systemButtonActiveDarkShadow
 systemButtonActiveLightHighlight
@@ -828,15 +820,10 @@ systemButtonPressedDarkHighlight
 systemButtonPressedDarkShadow
 systemButtonPressedLightHighlight
 systemButtonPressedLightShadow
-systemButtonText
 systemChasingArrows
-systemDialogActiveText
 systemDialogBackgroundActive
 systemDialogBackgroundInactive
-systemDialogInactiveText
 systemDocumentWindowBackground
-systemDocumentWindowTitleActiveText
-systemDocumentWindowTitleInactiveText
 systemDragHilite
 systemDrawerBackground
 systemFinderWindowBackground
@@ -844,97 +831,53 @@ systemFocusHighlight
 systemHighlight
 systemHighlightAlternate
 systemHighlightSecondary
-systemHighlightText
 systemIconLabelBackground
 systemIconLabelBackgroundSelected
-systemIconLabelSelectedText
-systemIconLabelText
 systemListViewBackground
 systemListViewColumnDivider
 systemListViewEvenRowBackground
 systemListViewOddRowBackground
 systemListViewSeparator
 systemListViewSortColumnBackground
-systemListViewText
-systemListViewWindowHeaderBackground
 systemMenu
 systemMenuActive
-systemMenuActiveText
 systemMenuBackground
 systemMenuBackgroundSelected
-systemMenuDisabled
-systemMenuItemActiveText
-systemMenuItemDisabledText
-systemMenuItemSelectedText
-systemMenuText
-systemMetalBackground
-systemModelessDialogActiveText
 systemModelessDialogBackgroundActive
 systemModelessDialogBackgroundInactive
-systemModelessDialogInactiveText
 systemMovableModalBackground
-systemMovableModalWindowTitleActiveText
-systemMovableModalWindowTitleInactiveText
-systemNotificationText
 systemNotificationWindowBackground
-systemPlacardActiveText
-systemPlacardBackground
-systemPlacardInactiveText
-systemPlacardPressedText
 systemPopupArrowActive
 systemPopupArrowInactive
 systemPopupArrowPressed
-systemPopupButtonActiveText
-systemPopupButtonInactiveText
-systemPopupButtonPressedText
-systemPopupLabelActiveText
-systemPopupLabelInactiveText
-systemPopupWindowTitleActiveText
-systemPopupWindowTitleInactiveText
 systemPrimaryHighlightColor
-systemPushButtonActiveText
-systemPushButtonInactiveText
-systemPushButtonPressedText
-systemRootMenuActiveText
-systemRootMenuDisabledText
-systemRootMenuSelectedText
 systemScrollBarDelimiterActive
 systemScrollBarDelimiterInactive
-systemSecondaryGroupBoxBackground
 systemSecondaryHighlightColor
-systemSelectedTabTextColor
+systemSelectedTabTextColor    
 systemSheetBackground
 systemSheetBackgroundOpaque
 systemSheetBackgroundTransparent
 systemStaticAreaFill
-systemSystemDetailText
-systemTabFrontActiveText
-systemTabFrontInactiveText
-systemTabNonFrontActiveText
-systemTabNonFrontInactiveText
-systemTabNonFrontPressedText
-systemTabPaneBackground
 systemToolbarBackground
 systemTransparent
 systemUtilityWindowBackgroundActive
 systemUtilityWindowBackgroundInactive
-systemUtilityWindowTitleActiveText
-systemUtilityWindowTitleInactiveText
 systemWhite
-systemWhiteText
 systemWindowBody
-systemWindowHeaderActiveText
-systemWindowHeaderBackground
-systemWindowHeaderInactiveText
 .DE
 .RE
 .
-The group of MacOS colors below are based on Apple's "semantic"
-NSColors.  On OSX 10.14 (Mojave) and later these colors change value
-when Dark Mode is enabled.  The numbered systemWindowBackgroundColors
-are used in the \fBttk::notebook\fR and \fBttk::labelframe\fR widgets
-to provide a contrasting background.  Each numbered color constrasts
-with its predecessor.
+Tk supports all of the NSColors in the macOS System ColorList.  The
+convention for naming these colors is that the Tk name is generated by
+capitalizing the macOS name and adding the prefix "system".  On OSX
+10.14 (Mojave) and later many of these "semantic" colors will appear
+differently depending on whether the NSWindow in which they are used has
+the Aqua or DarkAqua appearance.  The System ColorList differs between
+releases of macOS and some colors, such as systemLinkColor and
+systemControlAccentColor, are simulated on older systems which did not
+provide them.  All of the colors below are available on all supported
+macOS releases, but newer systems will support additional colors.
 .RS
 .DS
 systemControlAccentColor
@@ -948,6 +891,15 @@ systemSelectedTextColor
 systemSeparatorColor
 systemTextBackgroundColor
 systemTextColor
+.DE
+.RE
+.
+The numbered systemWindowBackgroundColors below
+are used in the \fBttk::notebook\fR and \fBttk::labelframe\fR widgets
+to provide a contrasting background.  Each numbered color constrasts
+with its predecessor.
+.RS
+.DS
 systemWindowBackgroundColor
 systemWindowBackgroundColor1
 systemWindowBackgroundColor2
@@ -960,7 +912,6 @@ systemWindowBackgroundColor7
 .RE
 .TP
 
-
 \fBWindows\fR
 .
 On Windows, the following additional system colors are available
diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index 89bddb9..e65bf35 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -40,6 +40,8 @@ void initColorTable()
     Tcl_HashSearch search;
     Tcl_HashEntry *hPtr;
     int newPtr, index = 0;
+    NSColorList *systemColorList = [NSColorList colorListNamed:@"System"];
+    NSString *key;
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
     if (@available(macOS 10.14, *)) {
@@ -50,6 +52,7 @@ void initColorTable()
 
     /*
      * Build a hash table for looking up a color by its name.
+     * First add all of the static entries from tkMacOSXColor.h
      */
 
     for (entry = systemColorData; entry->name != NULL; entry++) {
@@ -81,6 +84,32 @@ void initColorTable()
     }
 
     /*
+     * Add all of the colors in the System ColorList.
+     */
+ 
+    for (key in [systemColorList allKeys]) {
+	int length = [key lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
+	char *name;
+	entry = ckalloc(sizeof(SystemColorDatum));
+	bzero(entry, sizeof(SystemColorDatum));
+	name = ckalloc(length + 1);
+	strcpy(name, key.UTF8String);
+	name[0] = toupper(name[0]);
+	entry->type=semantic;
+	entry->name = name;
+	entry->selector = [key retain];
+	hPtr = Tcl_CreateHashEntry(&systemColors, entry->name, &newPtr);
+	if (newPtr == 0) {
+	    oldEntry = (SystemColorDatum *) Tcl_GetHashValue(hPtr);
+	    entry->index = oldEntry->index;
+	    [oldEntry->selector release];
+	} else {
+	    entry->index = index++;
+	}
+	Tcl_SetHashValue(hPtr, entry);
+    }
+
+    /*
      * Build an array for looking up a color by its index.
      */
 
@@ -211,7 +240,7 @@ GetEntryFromPixel(
 /*
  *----------------------------------------------------------------------
  *
- * GetRGB --
+ * GetRGBA --
  *
  *	Given a SystemColorDatum and a pointer to an array of 4 CGFloats, store
  *      the associated RGBA color values in the array.  In the case of the
diff --git a/macosx/tkMacOSXColor.h b/macosx/tkMacOSXColor.h
index 535d15d..da62955 100644
--- a/macosx/tkMacOSXColor.h
+++ b/macosx/tkMacOSXColor.h
@@ -241,27 +241,16 @@ static SystemColorDatum systemColorData[] = {
 {"WindowBackgroundColor7",	    ttkBackground, 7, NULL, 0, NULL },
 /* Apple's SecondaryLabelColor is the same as their LabelColor so we roll our own. */
 {"SecondaryLabelColor",		    ttkBackground, 14, NULL, 0, NULL },
-
-{"TextColor",			    semantic, 0, "textColor", 0, NULL },
-{"SelectedTextColor",		    semantic, 0, "selectedTextColor", 0, NULL },
-{"LabelColor",			    semantic, 0, "textColor", 0, NULL },
-{"LabelColor",			    semantic, 0, "labelColor", 0, NULL },
-{"ControlTextColor",      	    semantic, 0, "controlTextColor", 0, NULL },
-{"DisabledControlTextColor",	    semantic, 0, "disabledControlTextColor", 0, NULL },
+/* Color to use for notebook tab labels. */
 #if MAC_OS_X_VERSION_MAX_ALLOWED > 1060
 {"SelectedTabTextColor",	    semantic, 0, "whiteColor", 0, NULL },
 #else
 {"SelectedTabTextColor",	    semantic, 0, "blackColor", 0, NULL },
 #endif
-{"TextBackgroundColor",		    semantic, 0, "textBackgroundColor", 0, NULL },
-{"SelectedTextBackgroundColor",	    semantic, 0, "selectedTextBackgroundColor", 0, NULL },
-{"ControlAccentColor",		    semantic, 0, "controlAccentColor", 0, NULL },
+/* Semantic colors that we simulate on older systems which don't supoort them. */
 {"LinkColor",			    semantic, 0, "blueColor", 0, NULL },
-{"LinkColor",			    semantic, 0, "linkColor", 0, NULL },
 {"PlaceholderTextColor",	    semantic, 0, "grayColor", 0, NULL },
-{"PlaceholderTextColor",	    semantic, 0, "placeholderTextColor", 0, NULL },
 {"SeparatorColor",		    semantic, 0, "grayColor", 0, NULL },
-{"SeparatorColor",		    semantic, 0, "separatorColor", 0, NULL },
 {NULL,				    0, 0, NULL, 0, NULL }
 };
 
-- 
cgit v0.12


From 439d2b630bdbd573b5046781faca5166ea652f56 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Wed, 12 Aug 2020 13:29:20 +0000
Subject: Remove extra whitespace.

---
 doc/colors.n | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/colors.n b/doc/colors.n
index 1e938bb..3747ee8 100644
--- a/doc/colors.n
+++ b/doc/colors.n
@@ -854,7 +854,7 @@ systemPrimaryHighlightColor
 systemScrollBarDelimiterActive
 systemScrollBarDelimiterInactive
 systemSecondaryHighlightColor
-systemSelectedTabTextColor    
+systemSelectedTabTextColor
 systemSheetBackground
 systemSheetBackgroundOpaque
 systemSheetBackgroundTransparent
-- 
cgit v0.12


From f558e5ec4e15ff534f53df5f46c85c6f80a552c6 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 12 Aug 2020 14:07:30 +0000
Subject: .travis.yml update for newer tags

---
 .travis.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9c8a9dc..cc9f339 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,3 @@
-sudo: required
 language: c
 addons:
   apt:
@@ -17,8 +16,7 @@ addons:
       - tcl-tk
     casks:
       - xquartz
-    update: true
-matrix:
+jobs:
   include:
 # Testing on Linux with various compilers
     - name: "Linux/GCC/Shared"
-- 
cgit v0.12


From 12d683ceaacf4fff94e6e25ba528c29b000fa90b Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Wed, 12 Aug 2020 15:21:52 +0000
Subject: Fix some issues with 10.6

---
 macosx/tkMacOSXColor.c | 12 +++++++++++-
 macosx/tkMacOSXColor.h |  2 ++
 macosx/tkMacOSXMenu.c  |  4 +++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index e65bf35..b5b0e4b 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -35,6 +35,7 @@ static CGFloat windowBackground[4] =
 
 void initColorTable()
 {
+    NSAutoreleasePool *pool = [NSAutoreleasePool new];
     Tcl_InitHashTable(&systemColors, TCL_STRING_KEYS);
     SystemColorDatum *entry, *oldEntry;
     Tcl_HashSearch search;
@@ -86,7 +87,7 @@ void initColorTable()
     /*
      * Add all of the colors in the System ColorList.
      */
- 
+
     for (key in [systemColorList allKeys]) {
 	int length = [key lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
 	char *name;
@@ -95,6 +96,14 @@ void initColorTable()
 	name = ckalloc(length + 1);
 	strcpy(name, key.UTF8String);
 	name[0] = toupper(name[0]);
+        if (!strcmp(name, "WindowBackgroundColor")) {
+
+	    /*
+	     * Avoid black windows on old systems.
+	     */
+
+	    continue;
+	}
 	entry->type=semantic;
 	entry->name = name;
 	entry->selector = [key retain];
@@ -134,6 +143,7 @@ void initColorTable()
     hPtr = Tcl_FindHashEntry(&systemColors, "ControlAccentColor");
     entry = (SystemColorDatum *) Tcl_GetHashValue(hPtr);
     controlAccentIndex = entry->index;
+    [pool drain];
 }
 
 /*
diff --git a/macosx/tkMacOSXColor.h b/macosx/tkMacOSXColor.h
index da62955..0ff7aee 100644
--- a/macosx/tkMacOSXColor.h
+++ b/macosx/tkMacOSXColor.h
@@ -248,6 +248,8 @@ static SystemColorDatum systemColorData[] = {
 {"SelectedTabTextColor",	    semantic, 0, "blackColor", 0, NULL },
 #endif
 /* Semantic colors that we simulate on older systems which don't supoort them. */
+{"ControlAccentColor",		    semantic, 0, "controlAccentColor", 0, NULL },
+{"LabelColor",                      semantic, 0, "blackColor", 0, NULL },
 {"LinkColor",			    semantic, 0, "blueColor", 0, NULL },
 {"PlaceholderTextColor",	    semantic, 0, "grayColor", 0, NULL },
 {"SeparatorColor",		    semantic, 0, "grayColor", 0, NULL },
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c
index 379e25c..a77ea59 100644
--- a/macosx/tkMacOSXMenu.c
+++ b/macosx/tkMacOSXMenu.c
@@ -139,6 +139,7 @@ static int	ModifierCharWidth(Tk_Font tkfont);
 @implementation TKBackgroundLoop
 - (void) main
 {
+    NSAutoreleasePool *pool = [NSAutoreleasePool new];
     NSArray *modeArray = [NSArray arrayWithObjects: NSEventTrackingRunLoopMode,
 				  nil];
     while(1) {
@@ -151,7 +152,7 @@ static int	ModifierCharWidth(Tk_Font tkfont);
 				withObject:nil
 			     waitUntilDone:true
 				     modes:modeArray];
-	if (self.cancelled) {
+	if ([self isCancelled]) {
 	    [NSThread exit];
 	}
 
@@ -161,6 +162,7 @@ static int	ModifierCharWidth(Tk_Font tkfont);
 
 	[NSThread sleepForTimeInterval:0.001];
     }
+    [pool drain];
 }
 @end
 
-- 
cgit v0.12


From 34874a19507ce2fbd97192eec38717cddb43cbd5 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Wed, 12 Aug 2020 16:16:05 +0000
Subject: Fix an issue with 10.9

---
 macosx/tkMacOSXColor.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index b5b0e4b..7b517e7 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -312,7 +312,8 @@ GetRGBA(
     case semantic:
 	if (entry->index == controlAccentIndex && useFakeAccentColor) {
 #if MAC_OS_X_VERSION_MAX_ALLOWED < 101500
-	    color = [NSColor colorForControlTint: [NSColor currentControlTint]];
+	    color = [[NSColor colorForControlTint: [NSColor currentControlTint]]
+			      colorUsingColorSpace:sRGB];
 #endif
 	} else {
 	    color = [[NSColor valueForKey:entry->selector] colorUsingColorSpace:sRGB];
-- 
cgit v0.12


From 230306c11427bcefce870aa2c4f9e896ea76245b Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 13 Aug 2020 09:59:28 +0000
Subject: testcase cleanup

---
 tests/entry.test       | 188 ++++++++++----------
 tests/listbox.test     | 126 +++++++-------
 tests/spinbox.test     | 454 ++++++++++++++++++++++++-------------------------
 tests/ttk/entry.test   |  10 +-
 tests/ttk/spinbox.test |   6 +-
 5 files changed, 392 insertions(+), 392 deletions(-)

diff --git a/tests/entry.test b/tests/entry.test
index 8512b3f..2f09f92 100644
--- a/tests/entry.test
+++ b/tests/entry.test
@@ -17,7 +17,7 @@ proc scroll args {
         global scrollInfo
         set scrollInfo $args
 }
-# For trace variable 
+# For trace variable
 proc override args {
         global x
         set x 12345
@@ -70,7 +70,7 @@ test entry-1.3 {configuration option: "bd" for entry} -setup {
     .e cget -bd
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test entry-1.4 {configuration option: "bd" for entry} -setup {
     entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .e
@@ -107,10 +107,10 @@ test entry-1.7 {configuration option: "borderwidth" for entry} -setup {
     update
 } -body {
     .e configure -borderwidth 1.3
-    .e cget -borderwidth 
+    .e cget -borderwidth
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test entry-1.8 {configuration option: "borderwidth" for entry} -setup {
     entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .e
@@ -190,7 +190,7 @@ test entry-1.15 {configuration option: "exportselection" for entry} -setup {
     .e cget -exportselection
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test entry-1.16 {configuration option: "exportselection" for entry} -setup {
     entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .e
@@ -310,7 +310,7 @@ test entry-1.27 {configuration option: "highlightthickness" for entry} -setup {
     .e cget -highlightthickness
 } -cleanup {
     destroy .e
-} -result {6}
+} -result 6
 test entry-1.28 {configuration option: "highlightthickness" for entry} -setup {
     entry .e -borderwidth 2 -font {Helvetica -12 bold}
     pack .e
@@ -320,7 +320,7 @@ test entry-1.28 {configuration option: "highlightthickness" for entry} -setup {
     .e cget -highlightthickness
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 test entry-1.29 {configuration option: "highlightthickness" for entry} -setup {
     entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .e
@@ -360,7 +360,7 @@ test entry-1.32 {configuration option: "insertborderwidth" for entry} -setup {
     .e cget -insertborderwidth
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test entry-1.33 {configuration option: "insertborderwidth" for entry} -setup {
     entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .e
@@ -380,7 +380,7 @@ test entry-1.34 {configuration option: "insertofftime" for entry} -setup {
     .e cget -insertofftime
 } -cleanup {
     destroy .e
-} -result {100}
+} -result 100
 test entry-1.35 {configuration option: "insertofftime" for entry} -setup {
     entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .e
@@ -400,7 +400,7 @@ test entry-1.36 {configuration option: "insertontime" for entry} -setup {
     .e cget -insertontime
 } -cleanup {
     destroy .e
-} -result {100}
+} -result 100
 test entry-1.37 {configuration option: "insertontime" for entry} -setup {
     entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .e
@@ -513,7 +513,7 @@ test entry-1.47 {configuration option: "selectborderwidth" for entry} -setup {
     .e cget -selectborderwidth
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test entry-1.48 {configuration option: "selectborderwidth" for entry} -setup {
     entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .e
@@ -606,7 +606,7 @@ test entry-1.56 {configuration option: "width" for entry} -setup {
     .e cget -width
 } -cleanup {
     destroy .e
-} -result {402}
+} -result 402
 test entry-1.57 {configuration option: "width" for entry} -setup {
     entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .e
@@ -800,7 +800,7 @@ test entry-3.14 {EntryWidgetCmd procedure, "cget" widget command} -setup {
     .e cget -bd
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test entry-3.15 {EntryWidgetCmd procedure, "configure" widget command} -setup {
     entry .e 
     pack .e
@@ -809,7 +809,7 @@ test entry-3.15 {EntryWidgetCmd procedure, "configure" widget command} -setup {
     llength [.e configure]
 } -cleanup {
     destroy .e
-} -result {36}
+} -result 36
 test entry-3.16 {EntryWidgetCmd procedure, "configure" widget command} -setup {
     entry .e 
 } -body {
@@ -825,7 +825,7 @@ test entry-3.17 {EntryWidgetCmd procedure, "configure" widget command} -setup {
     lindex [.e configure -bd] 4
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test entry-3.18 {EntryWidgetCmd procedure, "delete" widget command} -setup {
     entry .e 
 } -body {
@@ -864,7 +864,7 @@ test entry-3.22 {EntryWidgetCmd procedure, "delete" widget command} -setup {
     .e get
 } -cleanup {
     destroy .e
-} -result {014567890}
+} -result 014567890
 test entry-3.23 {EntryWidgetCmd procedure, "delete" widget command} -setup {
     entry .e 
 } -body {
@@ -873,7 +873,7 @@ test entry-3.23 {EntryWidgetCmd procedure, "delete" widget command} -setup {
     .e get
 } -cleanup {
     destroy .e
-} -result {0123457890}
+} -result 0123457890
 test entry-3.24 {EntryWidgetCmd procedure, "delete" widget command} -setup {
     entry .e
     pack .e
@@ -905,7 +905,7 @@ test entry-3.25 {EntryWidgetCmd procedure, "delete" widget command} -setup {
     .e get
 } -cleanup {
     destroy .e
-} -result {01234567890}
+} -result 01234567890
 test entry-3.26 {EntryWidgetCmd procedure, "delete" widget command} -setup {
     entry .e
     pack .e
@@ -918,7 +918,7 @@ test entry-3.26 {EntryWidgetCmd procedure, "delete" widget command} -setup {
     .e get
 } -cleanup {
     destroy .e
-} -result {01234567890}
+} -result 01234567890
 test entry-3.26a {EntryWidgetCmd procedure, "delete" widget command} -setup {
     entry .e
     pack .e
@@ -931,7 +931,7 @@ test entry-3.26a {EntryWidgetCmd procedure, "delete" widget command} -setup {
     .e get
 } -cleanup {
     destroy .e
-} -result {01234567890}
+} -result 01234567890
 test entry-3.27 {EntryWidgetCmd procedure, "get" widget command} -setup {
     entry .e 
 } -body {
@@ -961,7 +961,7 @@ test entry-3.30 {EntryWidgetCmd procedure, "icursor" widget command} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test entry-3.31 {EntryWidgetCmd procedure, "index" widget command} -setup {
     entry .e 
 } -body {
@@ -1047,7 +1047,7 @@ test entry-3.40 {EntryWidgetCmd procedure, "insert" widget command} -setup {
     .e get
 } -cleanup {
     destroy .e
-} -result {01234567890}
+} -result 01234567890
 test entry-3.40a {EntryWidgetCmd procedure, "insert" widget command} -setup {
     entry .e
     pack .e
@@ -1060,7 +1060,7 @@ test entry-3.40a {EntryWidgetCmd procedure, "insert" widget command} -setup {
     .e get
 } -cleanup {
     destroy .e
-} -result {01234567890}
+} -result 01234567890
 test entry-3.41 {EntryWidgetCmd procedure, "insert" widget command} -setup {
     entry .e 
 } -body {
@@ -1120,7 +1120,7 @@ test entry-3.46 {EntryWidgetCmd procedure, "scan" widget command} -constraints {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {2}
+} -result 2
 test entry-3.47 {EntryWidgetCmd procedure, "select" widget command} -setup {
     entry .e 
 } -body {
@@ -1189,7 +1189,7 @@ test entry-3.52 {EntryWidgetCmd procedure, "selection present" widget command} -
     .e selection present
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test entry-3.53 {EntryWidgetCmd procedure, "selection present" widget command} -setup {
     entry .e
     pack .e
@@ -1202,7 +1202,7 @@ test entry-3.53 {EntryWidgetCmd procedure, "selection present" widget command} -
     .e selection present
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test entry-3.54 {EntryWidgetCmd procedure, "selection present" widget command} -setup {
     entry .e
     pack .e
@@ -1215,7 +1215,7 @@ test entry-3.54 {EntryWidgetCmd procedure, "selection present" widget command} -
     .e selection present
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 test entry-3.55 {EntryWidgetCmd procedure, "selection adjust" widget command} -setup {
     entry .e
 } -body {
@@ -1243,7 +1243,7 @@ test entry-3.57 {EntryWidgetCmd procedure, "selection adjust" widget command} -s
     selection get
 } -cleanup {
     destroy .e
-} -result {123}
+} -result 123
 test entry-3.58 {EntryWidgetCmd procedure, "selection adjust" widget command} -setup {
     entry .e
     pack .e
@@ -1257,7 +1257,7 @@ test entry-3.58 {EntryWidgetCmd procedure, "selection adjust" widget command} -s
     selection get
 } -cleanup {
     destroy .e
-} -result {234}
+} -result 234
 test entry-3.59 {EntryWidgetCmd procedure, "selection from" widget command} -setup {
     entry .e
 } -body {
@@ -1471,7 +1471,7 @@ test entry-3.75 {EntryWidgetCmd procedure, "xview" widget command} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {32}
+} -result 32
 test entry-3.76 {EntryWidgetCmd procedure, "xview" widget command} -setup {
     entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
     pack .e
@@ -1485,7 +1485,7 @@ test entry-3.76 {EntryWidgetCmd procedure, "xview" widget command} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {29}
+} -result 29
 test entry-3.77 {EntryWidgetCmd procedure, "xview" widget command} -setup {
     entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
     pack .e
@@ -1517,11 +1517,11 @@ test entry-3.79 {EntryWidgetCmd procedure, "xview" widget command} -setup {
     .e insert end "runs off the end of the window quite a bit."
     .e xview 0
     update
-    .e xview -4
+    .e xview -1
     .e index @0
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 test entry-3.80 {EntryWidgetCmd procedure, "xview" widget command} -setup {
     entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
     pack .e
@@ -1533,7 +1533,7 @@ test entry-3.80 {EntryWidgetCmd procedure, "xview" widget command} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {73}
+} -result 73
 test entry-3.86 {EntryWidgetCmd procedure, "xview" widget command} -setup {
     entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
     pack .e
@@ -1584,7 +1584,7 @@ test entry-5.1 {ConfigureEntry procedure, -textvariable} -body {
     .e get
 } -cleanup {
     destroy .e
-} -result {12345}
+} -result 12345
 test entry-5.2 {ConfigureEntry procedure, -textvariable} -body {
     set x 12345
     entry .e -textvariable x
@@ -1601,7 +1601,7 @@ test entry-5.3 {ConfigureEntry procedure, -textvariable} -setup {
 } -body {
     .e insert 0 "Some text"
     .e configure -textvariable x
-    return $x
+    set x
 } -cleanup {
     destroy .e
 } -result {Some text}
@@ -1636,7 +1636,7 @@ test entry-5.5 {ConfigureEntry procedure} -setup {
     lappend x [selection get]
     .e1 configure -exportselection 1
     lappend x [selection get]
-    return $x
+    set x
 } -cleanup {
     destroy .e1 .e2
 } -result {{This is so} {This is so} 1234}
@@ -1791,7 +1791,7 @@ test entry-6.4 {EntryComputeGeometry procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {6}
+} -result 6
 test entry-6.5 {EntryComputeGeometry procedure} -setup {
     entry .e -highlightthickness 2
     pack .e
@@ -1803,7 +1803,7 @@ test entry-6.5 {EntryComputeGeometry procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {6}
+} -result 6
 test entry-6.6 {EntryComputeGeometry procedure} -constraints {
     fonts
 } -setup {
@@ -2011,7 +2011,7 @@ test entry-7.7 {InsertChars procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {7}
+} -result 7
 test entry-7.8 {InsertChars procedure} -setup {
     entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
     pack .e
@@ -2022,7 +2022,7 @@ test entry-7.8 {InsertChars procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test entry-7.9 {InsertChars procedure} -setup {
     entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
     pack .e
@@ -2034,7 +2034,7 @@ test entry-7.9 {InsertChars procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {7}
+} -result 7
 test entry-7.10 {InsertChars procedure} -setup {
     entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
     pack .e
@@ -2046,7 +2046,7 @@ test entry-7.10 {InsertChars procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 
 test entry-7.11 {InsertChars procedure} -constraints {
     fonts
@@ -2060,7 +2060,7 @@ test entry-7.11 {InsertChars procedure} -constraints {
     winfo reqwidth .e
 } -cleanup {
     destroy .e
-} -result {59}
+} -result 59
 
 test entry-8.1 {DeleteChars procedure} -setup {
     unset -nocomplain contents
@@ -2087,7 +2087,7 @@ test entry-8.2 {DeleteChars procedure} -setup {
     .e configure -textvariable contents -xscrollcommand scroll
     set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
     .e insert 0 abcde
-    .e delete -2 2
+    .e delete -1 2
     vwait scrollInfo
     list [.e get] $contents [format {%.6f %.6f} {*}$scrollInfo]
 } -cleanup {
@@ -2245,7 +2245,7 @@ test entry-8.12 {DeleteChars procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test entry-8.13 {DeleteChars procedure} -setup {
     entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
     pack .e
@@ -2258,7 +2258,7 @@ test entry-8.13 {DeleteChars procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test entry-8.14 {DeleteChars procedure} -setup {
     entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
     pack .e
@@ -2271,7 +2271,7 @@ test entry-8.14 {DeleteChars procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test entry-8.15 {DeleteChars procedure} -setup {
     entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
     pack .e
@@ -2284,7 +2284,7 @@ test entry-8.15 {DeleteChars procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test entry-8.16 {DeleteChars procedure} -setup {
     entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
     pack .e
@@ -2297,7 +2297,7 @@ test entry-8.16 {DeleteChars procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test entry-8.17 {DeleteChars procedure} -setup {
     entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
     pack .e
@@ -2310,7 +2310,7 @@ test entry-8.17 {DeleteChars procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test entry-8.18 {DeleteChars procedure} -setup {
     entry .e -width 0 -font {Courier -12} -highlightthickness 2 -bd 2 
     pack .e
@@ -2322,7 +2322,7 @@ test entry-8.18 {DeleteChars procedure} -setup {
     winfo reqwidth .e
 } -cleanup {
     destroy .e
-} -result {31}
+} -result 31
 
 test entry-9.1 {EntryValueChanged procedure} -setup {
     unset -nocomplain x
@@ -2403,7 +2403,7 @@ test entry-10.5 {EntrySetValue procedure, updating display position} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 test entry-10.6 {EntrySetValue procedure, updating display position} -setup {
     unset -nocomplain x
     entry .e -highlightthickness 2 -bd 2 
@@ -2419,7 +2419,7 @@ test entry-10.6 {EntrySetValue procedure, updating display position} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {10}
+} -result 10
 test entry-10.7 {EntrySetValue procedure, updating insertion cursor} -setup {
     unset -nocomplain x
     entry .e -highlightthickness 2 -bd 2 
@@ -2434,7 +2434,7 @@ test entry-10.7 {EntrySetValue procedure, updating insertion cursor} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {3}
+} -result 3
 test entry-10.8 {EntrySetValue procedure, updating insertion cursor} -setup {
     unset -nocomplain x
     entry .e -highlightthickness 2 -bd 2 
@@ -2448,7 +2448,7 @@ test entry-10.8 {EntrySetValue procedure, updating insertion cursor} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {5}
+} -result 5
 
 test entry-11.1 {EntryEventProc procedure} -setup {
     entry .e -highlightthickness 2 -bd 2 -font {Helvetica -12}
@@ -2492,7 +2492,7 @@ test entry-13.1 {GetEntryIndex procedure} -setup {
     .e index end
 } -cleanup {
     destroy .e
-} -result {21}
+} -result 21
 test entry-13.2 {GetEntryIndex procedure} -body {
     entry .e 
     .e index abogus
@@ -2511,7 +2511,7 @@ test entry-13.3 {GetEntryIndex procedure} -setup {
     .e index anchor
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test entry-13.4 {GetEntryIndex procedure} -setup {
     entry .e -font {Courier -12} -width 5 -bd 2 -relief sunken
     pack .e
@@ -2524,7 +2524,7 @@ test entry-13.4 {GetEntryIndex procedure} -setup {
     .e index anchor
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test entry-13.5 {GetEntryIndex procedure} -setup {
     entry .e -font {Courier -12} -width 5 -bd 2 -relief sunken
     pack .e
@@ -2538,7 +2538,7 @@ test entry-13.5 {GetEntryIndex procedure} -setup {
     .e index anchor
 } -cleanup {
     destroy .e
-} -result {15}
+} -result 15
 test entry-13.6 {GetEntryIndex procedure} -setup {
     entry .e
 } -body {
@@ -2557,7 +2557,7 @@ test entry-13.7 {GetEntryIndex procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {2}
+} -result 2
 test entry-13.8 {GetEntryIndex procedure} -setup {
     entry .e
 } -body {
@@ -2622,7 +2622,7 @@ test entry-13.11 {GetEntryIndex procedure} -constraints aquaOrWin32 -body {
     .e index sel.first
 } -cleanup {
     destroy .e
-} -result {1}           
+} -result 1
 
 test entry-13.12 {GetEntryIndex procedure} -constraints x11 -body {
 # Previous settings:
@@ -2736,7 +2736,7 @@ test entry-13.16 {GetEntryIndex procedure} -constraints fonts -body {
     .e index @4
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test entry-13.17 {GetEntryIndex procedure} -constraints fonts -body {
     entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
         -font {Courier -12}
@@ -2747,7 +2747,7 @@ test entry-13.17 {GetEntryIndex procedure} -constraints fonts -body {
     .e index @11
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test entry-13.18 {GetEntryIndex procedure} -constraints fonts -body {
     entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
         -font {Courier -12}
@@ -2758,7 +2758,7 @@ test entry-13.18 {GetEntryIndex procedure} -constraints fonts -body {
     .e index @12
 } -cleanup {
     destroy .e
-} -result {5}
+} -result 5
 test entry-13.19 {GetEntryIndex procedure} -constraints fonts -body {
     entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
         -font {Courier -12} 
@@ -2769,7 +2769,7 @@ test entry-13.19 {GetEntryIndex procedure} -constraints fonts -body {
     .e index @[expr {[winfo width .e] - 6}]
 } -cleanup {
     destroy .e
-} -result {8}
+} -result 8
 test entry-13.20 {GetEntryIndex procedure} -constraints fonts -body {
     entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
         -font {Courier -12}
@@ -2780,7 +2780,7 @@ test entry-13.20 {GetEntryIndex procedure} -constraints fonts -body {
     .e index @[expr {[winfo width .e] - 5}]
 } -cleanup {
     destroy .e
-} -result {9}
+} -result 9
 test entry-13.21 {GetEntryIndex procedure} -body {
     entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
         -font {Courier -12}
@@ -2791,7 +2791,7 @@ test entry-13.21 {GetEntryIndex procedure} -body {
     .e index @1000
 } -cleanup {
     destroy .e
-} -result {9}
+} -result 9
 test entry-13.22 {GetEntryIndex procedure} -setup {
     entry .e 
     pack .e
@@ -2808,10 +2808,10 @@ test entry-13.23 {GetEntryIndex procedure} -body {
     .e insert 0 012345678901234567890
     .e xview 4
     update
-    .e index -10
+    .e index -1
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 test entry-13.24 {GetEntryIndex procedure} -body {
     entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
         -font {Courier -12} 
@@ -2822,7 +2822,7 @@ test entry-13.24 {GetEntryIndex procedure} -body {
     .e index 12
 } -cleanup {
     destroy .e
-} -result {12}
+} -result 12
 test entry-13.25 {GetEntryIndex procedure} -body {
     entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
         -font {Courier -12} 
@@ -2833,7 +2833,7 @@ test entry-13.25 {GetEntryIndex procedure} -body {
     .e index 49
 } -cleanup {
     destroy .e
-} -result {21}
+} -result 21
 test entry-13.26 {GetEntryIndex procedure} -constraints fonts -body {
     entry .e -highlightthickness 2 -bd 2 -font {Helvetica -12}
     selection clear .e
@@ -2880,7 +2880,7 @@ test entry-14.3 {EntryFetchSelection procedure} -setup {
     string compare [selection get] $x
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 
 test entry-15.1 {EntryLostSelection} -body {
     entry .e
@@ -3003,7 +3003,7 @@ test entry-18.1 {Entry widget vs hiding} -setup {
     set res1 [list [winfo children .] [interp hidden]]
     set res2 [list {} $l]
     expr {$res1 == $res2}
-} -result {1} 
+} -result 1
 
 ##
 ## Entry widget VALIDATION tests
@@ -3025,7 +3025,7 @@ test entry-19.1 {entry widget validation} -setup {
         -background red -foreground white
     pack .e
     .e insert 0 a
-    return $::vVals
+    set ::vVals
 } -cleanup {
     destroy .e
 } -result {.e 1 0 a {} a all key}
@@ -3057,7 +3057,7 @@ test entry-19.3 {entry widget validation} -setup {
     pack .e
     .e insert 0 ab   ;# previous settings
     .e insert end c
-    return $::vVals
+    set ::vVals
 } -cleanup {
     destroy .e
 } -result {.e 1 2 abc ab c all key}
@@ -3089,7 +3089,7 @@ test entry-19.5 {entry widget validation} -setup {
     pack .e
     .e insert 0 a123bc   ;# previous settings
     .e delete 2
-    return $::vVals
+    set ::vVals
 } -cleanup {
     destroy .e
 } -result {.e 0 2 a13bc a123bc 2 all key}
@@ -3106,7 +3106,7 @@ test entry-19.6 {entry widget validation} -setup {
     .e insert 0 a13bc   ;# previous settings
     .e configure -validate key
     .e delete 1 3
-    return $::vVals
+    set ::vVals
 } -cleanup {
     destroy .e
 } -result {.e 0 1 abc a13bc 13 key key}
@@ -3123,7 +3123,7 @@ test entry-19.7 {entry widget validation} -setup {
     .e insert end abc                 ;# previous settings
     set ::vVals {}
     .e insert end d
-    return $::vVals
+    set ::vVals
 } -cleanup {
     destroy .e
 } -result {}
@@ -3142,7 +3142,7 @@ test entry-19.8 {entry widget validation} -setup {
     focus -force .e
 # update necessary to process FocusIn event
     update
-    return $::vVals
+    set ::vVals
 } -cleanup {
     destroy .e
 } -result {.e -1 -1 abcd abcd {} focus focusin}
@@ -3163,7 +3163,7 @@ test entry-19.9 {entry widget validation} -setup {
     focus -force .
 # update necessary to process FocusOut event
     update
-    return $::vVals
+    set ::vVals
 } -cleanup {
     destroy .e
 } -result {.e -1 -1 abcd abcd {} focus focusout}
@@ -3181,7 +3181,7 @@ test entry-19.10 {entry widget validation} -setup {
     focus -force .e
 # update necessary to process FocusIn event
     update
-    return $::vVals
+    set ::vVals
 } -cleanup {
     destroy .e
 } -result {.e -1 -1 abcd abcd {} all focusin}
@@ -3202,7 +3202,7 @@ test entry-19.11 {entry widget validation} -setup {
     focus -force .
 # update necessary to process FocusOut event
     update
-    return $::vVals
+    set ::vVals
 } -cleanup {
     destroy .e
 } -result {.e -1 -1 abcd abcd {} all focusout}
@@ -3220,7 +3220,7 @@ test entry-19.12 {entry widget validation} -setup {
     focus -force .e
 # update necessary to process FocusIn event
     update
-    return $::vVals
+    set ::vVals
 } -cleanup {
     destroy .e
 } -result {.e -1 -1 abcd abcd {} focusin focusin}
@@ -3239,7 +3239,7 @@ test entry-19.13 {entry widget validation} -setup {
     focus -force .
 # update necessary to process FocusOut event
     update
-    return $::vVals
+    set ::vVals
 } -cleanup {
     destroy .e
 } -result {}
@@ -3258,7 +3258,7 @@ test entry-19.14 {entry widget validation} -setup {
     focus -force .e
 # update necessary to process FocusIn event
     update
-    return $::vVals
+    set ::vVals
 } -cleanup {
     destroy .e
 } -result {}
@@ -3280,7 +3280,7 @@ test entry-19.15 {entry widget validation} -setup {
     focus -force .
 # update necessary to process FocusOut event
     update
-    return $::vVals
+    set ::vVals
 } -cleanup {
     destroy .e
 } -result {.e -1 -1 abcd abcd {} focusout focusout}
@@ -3422,7 +3422,7 @@ test entry-20.1 {widget deletion while active} -body {
     winfo exists .e
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 
 test entry-20.2 {widget deletion while active} -body {
     entry .e -validate all \
@@ -3432,7 +3432,7 @@ test entry-20.2 {widget deletion while active} -body {
     winfo exists .e
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 
 test entry-20.3 {widget deletion while active} -body {
     entry .e -validate all \
@@ -3441,7 +3441,7 @@ test entry-20.3 {widget deletion while active} -body {
     winfo exists .e
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 
 test entry-20.4 {widget deletion while active} -body {
     entry .e -validate all \
@@ -3451,7 +3451,7 @@ test entry-20.4 {widget deletion while active} -body {
     winfo exists .e
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 
 test entry-20.5 {widget deletion while active} -body {
     entry .e -validatecommand { destroy .e ; return 0 }
@@ -3459,7 +3459,7 @@ test entry-20.5 {widget deletion while active} -body {
     winfo exists .e
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 
 test entry-20.6 {widget deletion while active} -body {
     pack [entry .e]
@@ -3469,7 +3469,7 @@ test entry-20.6 {widget deletion while active} -body {
     winfo exists .e
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 
 test entry-20.7 {widget deletion with textvariable active} -body {
 # SF bugs 607390 and 617446
@@ -3481,7 +3481,7 @@ test entry-20.7 {widget deletion with textvariable active} -body {
     winfo exists .e
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 
 
 test entry-21.1 {selection present while disabled, bug 637828} -body {
diff --git a/tests/listbox.test b/tests/listbox.test
index 3a6c860..42dc327 100644
--- a/tests/listbox.test
+++ b/tests/listbox.test
@@ -376,15 +376,15 @@ test listbox-3.5 {ListboxWidgetCmd procedure, "activate" option} -body {
 test listbox-3.6 {ListboxWidgetCmd procedure, "activate" option} -body {
     .l activate -1
     .l index active
-} -result {0}
+} -result 0
 test listbox-3.7 {ListboxWidgetCmd procedure, "activate" option} -body {
     .l activate 30
     .l index active
-} -result {17}
+} -result 17
 test listbox-3.8 {ListboxWidgetCmd procedure, "activate" option} -body {
     .l activate end
     .l index active
-} -result {17}
+} -result 17
 test listbox-3.9 {ListboxWidgetCmd procedure, "bbox" option} -body {
     .l bbox
 } -returnCodes error -result {wrong # args: should be ".l bbox index"}
@@ -508,7 +508,7 @@ test listbox-3.18b {ListboxWidgetCmd procedure, "bbox" option, justified, non-de
 } -cleanup {
     destroy .top.l .top
     unset -nocomplain lres res
-} -result {1}
+} -result 1
 test listbox-3.19 {ListboxWidgetCmd procedure, "cget" option} -body {
     .l cget
 } -returnCodes error -result {wrong # args: should be ".l cget option"}
@@ -520,10 +520,10 @@ test listbox-3.21 {ListboxWidgetCmd procedure, "cget" option} -body {
 } -returnCodes error -result {unknown option "-gorp"}
 test listbox-3.22 {ListboxWidgetCmd procedure, "cget" option} -body {
     .l cget -setgrid
-} -result {0}
+} -result 0
 test listbox-3.23 {ListboxWidgetCmd procedure, "configure" option} -body {
     llength [.l configure]
-} -result {28}
+} -result 28
 test listbox-3.24 {ListboxWidgetCmd procedure, "configure" option} -body {
     .l configure -gorp
 } -returnCodes error -result {unknown option "-gorp"}
@@ -587,7 +587,7 @@ test listbox-3.36 {ListboxWidgetCmd procedure, "delete" option} -setup {
 } -body {
     listbox .l2
     .l2 insert 0 el0 el1 el2 el3 el4 el5 el6 el7
-    .l2 delete -3 2
+    .l2 delete -1 2
     .l2 get 0 end
 } -cleanup {
     destroy .l2
@@ -597,7 +597,7 @@ test listbox-3.37 {ListboxWidgetCmd procedure, "delete" option} -setup {
 } -body {
     listbox .l2
     .l2 insert 0 el0 el1 el2 el3 el4 el5 el6 el7
-    .l2 delete -3 -1
+    .l2 delete -1 -1
     .l2 get 0 end
 } -cleanup {
     destroy .l2
@@ -684,10 +684,10 @@ test listbox-3.49 {ListboxWidgetCmd procedure, "get" option} -body {
     .l get -1
 } -result {}
 test listbox-3.50 {ListboxWidgetCmd procedure, "get" option} -body {
-    .l get -2 -1
+    .l get -1 -1
 } -result {}
 test listbox-3.51 {ListboxWidgetCmd procedure, "get" option} -body {
-    .l get -2 3
+    .l get -1 3
 } -result {el0 el1 el2 el3}
 test listbox-3.52 {ListboxWidgetCmd procedure, "get" option} -body {
     .l get 12 end
@@ -783,7 +783,7 @@ test listbox-3.72 {ListboxWidgetCmd procedure, "nearest" option} -body {
 test listbox-3.73 {ListboxWidgetCmd procedure, "nearest" option} -body {
     .l yview 3
     .l nearest 1000
-} -result {7}
+} -result 7
 test listbox-3.74 {ListboxWidgetCmd procedure, "scan" option} -body {
     .l scan a b
 } -returnCodes error -result {wrong # args: should be ".l scan mark|dragto x y"}
@@ -830,52 +830,52 @@ test listbox-3.83 {ListboxWidgetCmd procedure, "see" option} -body {
     .l yview 7
     .l see 7
     .l index @0,0
-} -result {7}
+} -result 7
 test listbox-3.84 {ListboxWidgetCmd procedure, "see" option} -body {
     .l yview 7
     .l see 11
     .l index @0,0
-} -result {7}
+} -result 7
 test listbox-3.85 {ListboxWidgetCmd procedure, "see" option} -body {
     .l yview 7
     .l see 6
     .l index @0,0
-} -result {6}
+} -result 6
 test listbox-3.86 {ListboxWidgetCmd procedure, "see" option} -body {
     .l yview 7
     .l see 5
     .l index @0,0
-} -result {3}
+} -result 3
 test listbox-3.87 {ListboxWidgetCmd procedure, "see" option} -body {
     .l yview 7
     .l see 12
     .l index @0,0
-} -result {8}
+} -result 8
 test listbox-3.88 {ListboxWidgetCmd procedure, "see" option} -body {
     .l yview 7
     .l see 13
     .l index @0,0
-} -result {11}
+} -result 11
 test listbox-3.89 {ListboxWidgetCmd procedure, "see" option} -body {
     .l yview 7
     .l see -1
     .l index @0,0
-} -result {0}
+} -result 0
 test listbox-3.90 {ListboxWidgetCmd procedure, "see" option} -body {
     .l yview 7
     .l see end
     .l index @0,0
-} -result {13}
+} -result 13
 test listbox-3.91 {ListboxWidgetCmd procedure, "see" option} -body {
     .l yview 7
     .l see 322
     .l index @0,0
-} -result {13}
+} -result 13
 test listbox-3.92 {ListboxWidgetCmd procedure, "see" option, partial last line} -body {
     mkPartial
     .partial.l see 4
     .partial.l index @0,0
-} -result {1}
+} -result 1
 test listbox-3.93 {ListboxWidgetCmd procedure, "selection" option} -body {
     .l select a
 } -returnCodes error -result {wrong # args: should be ".l selection option index ?index?"}
@@ -898,15 +898,15 @@ test listbox-3.98 {ListboxWidgetCmd procedure, "selection" option} -body {
 test listbox-3.99 {ListboxWidgetCmd procedure, "selection" option} -body {
     .l selection anchor -1
     .l index anchor
-} -result {0}
+} -result 0
 test listbox-3.100 {ListboxWidgetCmd procedure, "selection" option} -body {
     .l selection anchor end
     .l index anchor
-} -result {17}
+} -result 17
 test listbox-3.101 {ListboxWidgetCmd procedure, "selection" option} -body {
     .l selection anchor 44
     .l index anchor
-} -result {17}
+} -result 17
 test listbox-3.102 {ListboxWidgetCmd procedure, "selection" option} -body {
     .l selection clear 0 end
     .l selection set 2 8
@@ -926,16 +926,16 @@ test listbox-3.104 {ListboxWidgetCmd procedure, "selection" option} -body {
 test listbox-3.105 {ListboxWidgetCmd procedure, "selection" option} -body {
     .l selection set 0 end
     .l selection includes -1
-} -result {0}
+} -result 0
 test listbox-3.106 {ListboxWidgetCmd procedure, "selection" option} -body {
     .l selection clear 0 end
     .l selection set end
     .l selection includes end
-} -result {1}
+} -result 1
 test listbox-3.107 {ListboxWidgetCmd procedure, "selection" option} -body {
     .l selection set 0 end
     .l selection includes 44
-} -result {0}
+} -result 0
 test listbox-3.108 {ListboxWidgetCmd procedure, "selection" option} -setup {
     destroy .l2
 } -body {
@@ -943,7 +943,7 @@ test listbox-3.108 {ListboxWidgetCmd procedure, "selection" option} -setup {
     .l2 selection includes 0
 } -cleanup {
     destroy .l2
-} -result {0}
+} -result 0
 test listbox-3.109 {ListboxWidgetCmd procedure, "selection" option} -body {
     .l selection clear 0 end
     .l selection set 2
@@ -965,7 +965,7 @@ test listbox-3.112 {ListboxWidgetCmd procedure, "size" option} -body {
 } -returnCodes error -result {wrong # args: should be ".l size"}
 test listbox-3.113 {ListboxWidgetCmd procedure, "size" option} -body {
     .l size
-} -result {18}
+} -result 18
 test listbox-3.114 {ListboxWidgetCmd procedure, "xview" option} -setup {
     destroy .l2
 } -body {
@@ -1242,7 +1242,7 @@ test listbox-4.2 {ConfigureListbox procedure} -setup {
     .l cget -highlightthickness
 } -cleanup {
     deleteWindows
-} -result {0}
+} -result 0
 test listbox-4.3 {ConfigureListbox procedure} -setup {
     deleteWindows
     destroy .l
@@ -1573,14 +1573,14 @@ test listbox-6.2 {InsertEls procedure} -body {
     .l selection anchor 2
     .l insert 2 A B
     .l index anchor
-} -result {4}
+} -result 4
 test listbox-6.3 {InsertEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
     .l selection anchor 2
     .l insert 3 A B
     .l index anchor
-} -result {2}
+} -result 2
 test listbox-6.4 {InsertEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
@@ -1588,7 +1588,7 @@ test listbox-6.4 {InsertEls procedure} -body {
     update
     .l insert 2 A B
     .l index @0,0
-} -result {5}
+} -result 5
 test listbox-6.5 {InsertEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
@@ -1596,31 +1596,31 @@ test listbox-6.5 {InsertEls procedure} -body {
     update
     .l insert 3 A B
     .l index @0,0
-} -result {3}
+} -result 3
 test listbox-6.6 {InsertEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
     .l activate 5
     .l insert 5 A B
     .l index active
-} -result {7}
+} -result 7
 test listbox-6.7 {InsertEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
     .l activate 5
     .l insert 6 A B
     .l index active
-} -result {5}
+} -result 5
 test listbox-6.8 {InsertEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c
     .l index active
-} -result {2}
+} -result 2
 test listbox-6.9 {InsertEls procedure} -body {
     .l delete 0 end
     .l insert 0
     .l index active
-} -result {0}
+} -result 0
 test listbox-6.10 {InsertEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b "two words"  c d e f g h i j
@@ -1728,28 +1728,28 @@ test listbox-7.5 {DeleteEls procedure} -body {
     .l selection anchor 2
     .l delete 0 1
     .l index anchor
-} -result {0}
+} -result 0
 test listbox-7.6 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
     .l selection anchor 2
     .l delete 2
     .l index anchor
-} -result {2}
+} -result 2
 test listbox-7.7 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
     .l selection anchor 4
     .l delete 2 5
     .l index anchor
-} -result {2}
+} -result 2
 test listbox-7.8 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
     .l selection anchor 3
     .l delete 4 5
     .l index anchor
-} -result {3}
+} -result 3
 test listbox-7.9 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
@@ -1757,7 +1757,7 @@ test listbox-7.9 {DeleteEls procedure} -body {
     update
     .l delete 1 2
     .l index @0,0
-} -result {1}
+} -result 1
 test listbox-7.10 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
@@ -1765,7 +1765,7 @@ test listbox-7.10 {DeleteEls procedure} -body {
     update
     .l delete 3 4
     .l index @0,0
-} -result {3}
+} -result 3
 test listbox-7.11 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
@@ -1773,7 +1773,7 @@ test listbox-7.11 {DeleteEls procedure} -body {
     update
     .l delete 4 6
     .l index @0,0
-} -result {3}
+} -result 3
 test listbox-7.12 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
@@ -1781,42 +1781,42 @@ test listbox-7.12 {DeleteEls procedure} -body {
     update
     .l delete 3 end
     .l index @0,0
-} -result {1}
+} -result 1
 test listbox-7.13 {DeleteEls procedure, updating view with partial last line} -body {
     mkPartial
     .partial.l yview 8
     update
     .partial.l delete 10 13
     .partial.l index @0,0
-} -result {7}
+} -result 7
 test listbox-7.14 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
     .l activate 6
     .l delete 3 4
     .l index active
-} -result {4}
+} -result 4
 test listbox-7.15 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
     .l activate 6
     .l delete 5 7
     .l index active
-} -result {5}
+} -result 5
 test listbox-7.16 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
     .l activate 6
     .l delete 5 end
     .l index active
-} -result {4}
+} -result 4
 test listbox-7.17 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c d e f g h i j
     .l activate 6
     .l delete 0 end
     .l index active
-} -result {0}
+} -result 0
 test listbox-7.18 {DeleteEls procedure} -body {
     .l delete 0 end
     .l insert 0 a b c "two words" d e f g h i j
@@ -1987,7 +1987,7 @@ test listbox-10.5 {GetListboxIndex procedure} -setup {
     .l index end
 } -cleanup {
     destroy .l
-} -result {12}
+} -result 12
 test listbox-10.6 {GetListboxIndex procedure} -setup {
     destroy .l
 } -body {
@@ -2102,7 +2102,7 @@ test listbox-10.16 {GetListboxIndex procedure} -setup {
     .l index 3
 } -cleanup {
     destroy .l
-} -result {3}
+} -result 3
 test listbox-10.17 {GetListboxIndex procedure} -setup {
     destroy .l
 } -body {
@@ -2112,7 +2112,7 @@ test listbox-10.17 {GetListboxIndex procedure} -setup {
     .l index 20
 } -cleanup {
     destroy .l
-} -result {20}
+} -result 20
 test listbox-10.18 {GetListboxIndex procedure} -setup {
     destroy .l
 } -body {
@@ -2129,10 +2129,10 @@ test listbox-10.19 {GetListboxIndex procedure} -setup {
     pack [listbox .l]
     .l insert 0 el0 el1 el2 el3 el4 el5 el6 el7 el8 el9 el10 el11
     update
-    .l index -2
+    .l index -1
 } -cleanup {
     destroy .l
-} -result  -2
+} -result  -1
 test listbox-10.20 {GetListboxIndex procedure} -setup {
     destroy .l
 } -body {
@@ -2226,7 +2226,7 @@ test listbox-11.6 {ChangeListboxView procedure, partial last line} -body {
     .partial.l index @0,0
 } -cleanup {
     destroy .l
-} -result {11}
+} -result 11
 
 
 # Listbox used in 12.* tests
@@ -2314,7 +2314,7 @@ test listbox-13.3 {ListboxScanTo procedure} -constraints {
 test listbox-14.1 {NearestListboxElement procedure, partial last line} -body {
     mkPartial
     .partial.l nearest [winfo height .partial.l]
-} -result {4}
+} -result 4
 # Listbox used in 14.* tests
 destroy .l
 listbox .l -font $fixed -width 20 -height 10
@@ -2326,7 +2326,7 @@ test listbox-14.2 {NearestListboxElement procedure} -constraints {
 	fonts
 } -body {
     .l index @50,0
-} -result {4}
+} -result 4
 test listbox-14.3 {NearestListboxElement procedure} -constraints {
 	fonts
 } -body {
@@ -2336,7 +2336,7 @@ test listbox-14.4 {NearestListboxElement procedure} -constraints {
 	fonts
 } -body {
     .l index @50,200
-} -result {13}
+} -result 13
 
 
 # Listbox used in 15.* 16.* and 17.* tests
@@ -2378,7 +2378,7 @@ test listbox-15.4 {ListboxSelect procedure, boundary conditions for indices} -bo
     .l delete 0 end
     .l insert 0 a b c d e f
     .l select clear 0 end
-    .l select set -2 -1
+    .l select set -1 -1
     .l curselection
 } -result {}
 test listbox-15.5 {ListboxSelect procedure, boundary conditions for indices} -body {
@@ -2415,7 +2415,7 @@ test listbox-15.9 {ListboxSelect procedure, boundary conditions for indices} -bo
     .l select clear 0 end
     .l select set end 30
     .l curselection
-} -result {5}
+} -result 5
 test listbox-15.10 {ListboxSelect procedure, boundary conditions for indices} -body {
     .l delete 0 end
     .l insert 0 a b c d e f
@@ -2451,7 +2451,7 @@ test listbox-16.3 {ListboxFetchSelection procedure, retrieve in several parts} -
     string compare 1$long\n2$long\n3$long\n4$long\n5$long $sel
 } -cleanup {
     catch {unset long sel}
-} -result {0}
+} -result 0
 
 
 test listbox-17.1 {ListboxLostSelection procedure} -setup {
diff --git a/tests/spinbox.test b/tests/spinbox.test
index 3f55d7f..8d19a7e 100644
--- a/tests/spinbox.test
+++ b/tests/spinbox.test
@@ -17,7 +17,7 @@ proc scroll args {
         global scrollInfo
         set scrollInfo $args
 }
-# For trace variable 
+# For trace variable
 proc override args {
         global x
         set x 12345
@@ -94,7 +94,7 @@ test spinbox-1.5 {configuration option: "bd"} -setup {
     .e cget -bd
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test spinbox-1.6 {configuration option: "bd" for spinbox} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
@@ -138,7 +138,7 @@ test spinbox-1.9 {configuration option: "borderwidth"} -setup {
     .e cget -borderwidth
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-1.10 {configuration option: "borderwidth" for spinbox} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
@@ -282,7 +282,7 @@ test spinbox-1.22 {configuration option: "exportselection"} -setup {
     .e cget -exportselection
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-1.23 {configuration option: "exportselection" for spinbox} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
@@ -458,7 +458,7 @@ test spinbox-1.38 {configuration option: "highlightthickness"} -setup {
     .e cget -highlightthickness
 } -cleanup {
     destroy .e
-} -result {6}
+} -result 6
 test spinbox-1.39 {configuration option: "highlightthickness" for spinbox} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
@@ -480,7 +480,7 @@ test spinbox-1.40 {configuration option: "highlightthickness"} -setup {
     .e cget -highlightthickness
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 
 test spinbox-1.41 {configuration option: "increment"} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
@@ -536,7 +536,7 @@ test spinbox-1.45 {configuration option: "insertborderwidth"} -setup {
     .e cget -insertborderwidth
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-1.46 {configuration option: "insertborderwidth" for spinbox} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
@@ -558,7 +558,7 @@ test spinbox-1.47 {configuration option: "insertofftime"} -setup {
     .e cget -insertofftime
 } -cleanup {
     destroy .e
-} -result {100}
+} -result 100
 test spinbox-1.48 {configuration option: "insertofftime" for spinbox} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
@@ -580,7 +580,7 @@ test spinbox-1.49 {configuration option: "insertontime"} -setup {
     .e cget -insertontime
 } -cleanup {
     destroy .e
-} -result {100}
+} -result 100
 test spinbox-1.50 {configuration option: "insertontime" for spinbox} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
@@ -692,7 +692,7 @@ test spinbox-1.59 {configuration option: "repeatdelay"} -setup {
     .e cget -repeatdelay
 } -cleanup {
     destroy .e
-} -result {500}
+} -result 500
 test spinbox-1.60 {configuration option: "repeatdelay" for spinbox} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
@@ -758,7 +758,7 @@ test spinbox-1.65 {configuration option: "selectborderwidth"} -setup {
     .e cget -selectborderwidth
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-1.66 {configuration option: "selectborderwidth" for spinbox} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
@@ -938,7 +938,7 @@ test spinbox-1.81 {configuration option: "width"} -setup {
     .e cget -width
 } -cleanup {
     destroy .e
-} -result {402}
+} -result 402
 test spinbox-1.82 {configuration option: "width" for spinbox} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
@@ -960,7 +960,7 @@ test spinbox-1.83 {configuration option: "wrap"} -setup {
     .e cget -wrap
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-1.84 {configuration option: "wrap" for spinbox} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
@@ -1018,7 +1018,7 @@ test spinbox-2.5 {Tk_SpinboxCmd procedure} -body {
 
 
 test spinbox-3.1 {SpinboxWidgetCmd procedure} -setup {
-    spinbox .e 
+    spinbox .e
     pack .e
     update
 } -body {
@@ -1027,7 +1027,7 @@ test spinbox-3.1 {SpinboxWidgetCmd procedure} -setup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e option ?arg ...?"}
 test spinbox-3.2 {SpinboxWidgetCmd procedure, "bbox" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
@@ -1036,7 +1036,7 @@ test spinbox-3.2 {SpinboxWidgetCmd procedure, "bbox" widget command} -setup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e bbox index"}
 test spinbox-3.3 {SpinboxWidgetCmd procedure, "bbox" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
@@ -1045,7 +1045,7 @@ test spinbox-3.3 {SpinboxWidgetCmd procedure, "bbox" widget command} -setup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e bbox index"}
 test spinbox-3.4 {SpinboxWidgetCmd procedure, "bbox" widget command} -setup {
-    spinbox .e 
+    spinbox .e
     pack .e
     update
 } -body {
@@ -1054,7 +1054,7 @@ test spinbox-3.4 {SpinboxWidgetCmd procedure, "bbox" widget command} -setup {
     destroy .e
 } -returnCodes error -result {bad spinbox index "bogus"}
 test spinbox-3.5 {SpinboxWidgetCmd procedure, "bbox" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
@@ -1063,7 +1063,7 @@ test spinbox-3.5 {SpinboxWidgetCmd procedure, "bbox" widget command} -setup {
     destroy .e
 } -result [list 5 5 0 $cy]
 
-# Oryginaly the result was count using measurements 
+# Oryginaly the result was count using measurements
 # and metrics. It was changed to less verbose solution - the result is the one
 # that passes fonts constraint (this concerns tests 3.6, 3.7, 3.8, 3.10)
 test spinbox-3.6 {SpinboxWidgetCmd procedure, "bbox" widget command} -constraints {
@@ -1082,7 +1082,7 @@ test spinbox-3.6 {SpinboxWidgetCmd procedure, "bbox" widget command} -constraint
 test spinbox-3.7 {SpinboxWidgetCmd procedure, "bbox" widget command} -constraints {
 	fonts
 } -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
@@ -1095,7 +1095,7 @@ test spinbox-3.7 {SpinboxWidgetCmd procedure, "bbox" widget command} -constraint
 test spinbox-3.8 {SpinboxWidgetCmd procedure, "bbox" widget command} -constraints {
 	fonts
 } -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
@@ -1106,7 +1106,7 @@ test spinbox-3.8 {SpinboxWidgetCmd procedure, "bbox" widget command} -constraint
     destroy .e
 } -result {31 5 7 13}
 test spinbox-3.9 {SpinboxWidgetCmd procedure, "bbox" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
@@ -1118,7 +1118,7 @@ test spinbox-3.9 {SpinboxWidgetCmd procedure, "bbox" widget command} -setup {
 test spinbox-3.10 {SpinboxWidgetCmd procedure, "bbox" widget command} -constraints {
 	fonts
 } -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
@@ -1128,82 +1128,82 @@ test spinbox-3.10 {SpinboxWidgetCmd procedure, "bbox" widget command} -constrain
     destroy .e
 } -result {{5 5 7 13} {12 5 7 13} {75 5 12 13} {122 5 7 13}}
 test spinbox-3.11 {SpinboxWidgetCmd procedure, "cget" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e cget
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e cget option"}
 test spinbox-3.12 {SpinboxWidgetCmd procedure, "cget" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e cget a b
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e cget option"}
 test spinbox-3.13 {SpinboxWidgetCmd procedure, "cget" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e cget -gorp
 } -cleanup {
     destroy .e
 } -returnCodes error -result {unknown option "-gorp"}
 test spinbox-3.14 {SpinboxWidgetCmd procedure, "cget" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e configure -bd 4
     .e cget -bd
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test spinbox-3.15 {SpinboxWidgetCmd procedure, "configure" widget command} -setup {
-    spinbox .e 
+    spinbox .e
     pack .e
     update
 } -body {
     llength [.e configure]
 } -cleanup {
     destroy .e
-} -result {49}
+} -result 49
 test spinbox-3.16 {SpinboxWidgetCmd procedure, "configure" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e configure -foo
 } -cleanup {
     destroy .e
 } -returnCodes error -result {unknown option "-foo"}
 test spinbox-3.17 {SpinboxWidgetCmd procedure, "configure" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e configure -bd 4
     .e configure -bg #ffffff
     lindex [.e configure -bd] 4
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test spinbox-3.18 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e delete
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e delete firstIndex ?lastIndex?"}
 test spinbox-3.19 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e delete a b c
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e delete firstIndex ?lastIndex?"}
 test spinbox-3.20 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e delete foo
 } -cleanup {
     destroy .e
 } -returnCodes error -result {bad spinbox index "foo"}
 test spinbox-3.21 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e delete 0 bar
 } -cleanup {
@@ -1212,27 +1212,27 @@ test spinbox-3.21 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
 test spinbox-3.22 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
     spinbox .e
     pack .e
-    update 
+    update
 } -body {
     .e insert end "01234567890"
     .e delete 2 4
     .e get
 } -cleanup {
     destroy .e
-} -result {014567890}
+} -result 014567890
 test spinbox-3.23 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e insert end "01234567890"
     .e delete 6
     .e get
 } -cleanup {
     destroy .e
-} -result {0123457890}
+} -result 0123457890
 test spinbox-3.24 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
     spinbox .e
     pack .e
-    update 
+    update
     set x {}
 } -body {
 # UTF
@@ -1253,18 +1253,18 @@ test spinbox-3.24 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
 test spinbox-3.25 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
     spinbox .e
     pack .e
-    update  
+    update
 } -body {
     .e insert end "01234567890"
     .e delete 6 5
     .e get
 } -cleanup {
     destroy .e
-} -result {01234567890}
+} -result 01234567890
 test spinbox-3.26 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
     spinbox .e
     pack .e
-    update  
+    update
 } -body {
     .e insert end "01234567890"
     .e configure -state disabled
@@ -1273,11 +1273,11 @@ test spinbox-3.26 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
     .e get
 } -cleanup {
     destroy .e
-} -result {01234567890}
+} -result 01234567890
 test spinbox-3.26.1 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
     spinbox .e
     pack .e
-    update  
+    update
 } -body {
     .e insert end "01234567890"
     .e configure -state readonly
@@ -1286,53 +1286,53 @@ test spinbox-3.26.1 {SpinboxWidgetCmd procedure, "delete" widget command} -setup
     .e get
 } -cleanup {
     destroy .e
-} -result {01234567890}
+} -result 01234567890
 test spinbox-3.27 {SpinboxWidgetCmd procedure, "get" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e get foo
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e get"}
 test spinbox-3.28 {SpinboxWidgetCmd procedure, "icursor" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e icursor
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e icursor pos"}
 test spinbox-3.29 {SpinboxWidgetCmd procedure, "icursor" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e icursor foo
 } -cleanup {
     destroy .e
 } -returnCodes error -result {bad spinbox index "foo"}
 test spinbox-3.30 {SpinboxWidgetCmd procedure, "icursor" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e insert end "01234567890"
     .e icursor 4
     .e index insert
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test spinbox-3.31 {SpinboxWidgetCmd procedure, "index" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e in
 } -cleanup {
     destroy .e
 } -returnCodes error -result {ambiguous option "in": must be bbox, cget, configure, delete, get, icursor, identify, index, insert, invoke, scan, selection, set, validate, or xview}
 test spinbox-3.32 {SpinboxWidgetCmd procedure, "index" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e index
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e index string"}
 test spinbox-3.33 {SpinboxWidgetCmd procedure, "index" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e index foo
 } -cleanup {
@@ -1341,7 +1341,7 @@ test spinbox-3.33 {SpinboxWidgetCmd procedure, "index" widget command} -setup {
 test spinbox-3.34 {SpinboxWidgetCmd procedure, "index" widget command} -setup {
     spinbox .e
     pack .e
-    update  
+    update
 } -body {
     .e index 0
 } -cleanup {
@@ -1350,7 +1350,7 @@ test spinbox-3.34 {SpinboxWidgetCmd procedure, "index" widget command} -setup {
 test spinbox-3.35 {SpinboxWidgetCmd procedure, "index" widget command} -setup {
     spinbox .e
     pack .e
-    update  
+    update
 } -body {
 # UTF
     .e insert 0 abc\u4e4e\u0153def
@@ -1359,21 +1359,21 @@ test spinbox-3.35 {SpinboxWidgetCmd procedure, "index" widget command} -setup {
     destroy .e
 } -result {3 4 8}
 test spinbox-3.36 {SpinboxWidgetCmd procedure, "insert" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e insert a
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e insert index text"}
 test spinbox-3.37 {SpinboxWidgetCmd procedure, "insert" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e insert a b c
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e insert index text"}
 test spinbox-3.38 {SpinboxWidgetCmd procedure, "insert" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e insert foo Text
 } -cleanup {
@@ -1382,7 +1382,7 @@ test spinbox-3.38 {SpinboxWidgetCmd procedure, "insert" widget command} -setup {
 test spinbox-3.39 {SpinboxWidgetCmd procedure, "insert" widget command} -setup {
     spinbox .e
     pack .e
-    update  
+    update
 } -body {
     .e insert end "01234567890"
     .e insert 3 xxx
@@ -1393,7 +1393,7 @@ test spinbox-3.39 {SpinboxWidgetCmd procedure, "insert" widget command} -setup {
 test spinbox-3.40 {SpinboxWidgetCmd procedure, "insert" widget command} -setup {
     spinbox .e
     pack .e
-    update  
+    update
 } -body {
     .e insert end "01234567890"
     .e configure -state disabled
@@ -1402,11 +1402,11 @@ test spinbox-3.40 {SpinboxWidgetCmd procedure, "insert" widget command} -setup {
     .e get
 } -cleanup {
     destroy .e
-} -result {01234567890}
+} -result 01234567890
 test spinbox-3.40.1 {SpinboxWidgetCmd procedure, "insert" widget command} -setup {
     spinbox .e
     pack .e
-    update  
+    update
 } -body {
     .e insert end "01234567890"
     .e configure -state readonly
@@ -1415,16 +1415,16 @@ test spinbox-3.40.1 {SpinboxWidgetCmd procedure, "insert" widget command} -setup
     .e get
 } -cleanup {
     destroy .e
-} -result {01234567890}
+} -result 01234567890
 test spinbox-3.41 {SpinboxWidgetCmd procedure, "insert" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e insert a b c
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e insert index text"}
 test spinbox-3.42 {SpinboxWidgetCmd procedure, "scan" widget command} -setup {
-    spinbox .e 
+    spinbox .e
     pack .e
     update
 } -body {
@@ -1435,7 +1435,7 @@ test spinbox-3.42 {SpinboxWidgetCmd procedure, "scan" widget command} -setup {
 test spinbox-3.43 {SpinboxWidgetCmd procedure, "scan" widget command} -setup {
     spinbox .e
     pack .e
-    update 
+    update
 } -body {
     .e scan a b c
 } -cleanup {
@@ -1444,7 +1444,7 @@ test spinbox-3.43 {SpinboxWidgetCmd procedure, "scan" widget command} -setup {
 test spinbox-3.44 {SpinboxWidgetCmd procedure, "scan" widget command} -setup {
     spinbox .e
     pack .e
-    update 
+    update
 } -body {
     .e scan foobar 20
 } -cleanup {
@@ -1453,7 +1453,7 @@ test spinbox-3.44 {SpinboxWidgetCmd procedure, "scan" widget command} -setup {
 test spinbox-3.45 {SpinboxWidgetCmd procedure, "scan" widget command} -setup {
     spinbox .e
     pack .e
-    update 
+    update
 } -body {
     .e scan mark 20.1
 } -cleanup {
@@ -1464,7 +1464,7 @@ test spinbox-3.45 {SpinboxWidgetCmd procedure, "scan" widget command} -setup {
 test spinbox-3.46 {SpinboxWidgetCmd procedure, "scan" widget command} -constraints {
     fonts
 } -setup {
-    spinbox .e -font {Helvetica -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Helvetica -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
@@ -1475,16 +1475,16 @@ test spinbox-3.46 {SpinboxWidgetCmd procedure, "scan" widget command} -constrain
     .e index @0
 } -cleanup {
     destroy .e
-} -result {2}
+} -result 2
 test spinbox-3.47 {SpinboxWidgetCmd procedure, "select" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e select
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e selection option ?index?"}
 test spinbox-3.48 {SpinboxWidgetCmd procedure, "select" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e select foo
 } -cleanup {
@@ -1492,28 +1492,28 @@ test spinbox-3.48 {SpinboxWidgetCmd procedure, "select" widget command} -setup {
 } -returnCodes error -result {bad selection option "foo": must be adjust, clear, element, from, present, range, or to}
 
 test spinbox-3.49 {SpinboxWidgetCmd procedure, "select clear" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e select clear gorp
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e selection clear"}
 test spinbox-3.50 {SpinboxWidgetCmd procedure, "select clear" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e insert end "0123456789"
     .e select from 1
     .e select to 4
     update
     .e select clear
-    selection get 
+    selection get
 } -cleanup {
     destroy .e
 } -returnCodes error -result {PRIMARY selection doesn't exist or form "STRING" not defined}
 test spinbox-3.50.1 {SpinboxWidgetCmd procedure, "select clear" widget command} -setup {
     spinbox .e
     pack .e
-    update  
+    update
 } -body {
     .e insert end "0123456789"
     .e select from 1
@@ -1527,7 +1527,7 @@ test spinbox-3.50.1 {SpinboxWidgetCmd procedure, "select clear" widget command}
 } -result {.e}
 
 test spinbox-3.51 {SpinboxWidgetCmd procedure, "selection present" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e selection present foo
 } -cleanup {
@@ -1536,7 +1536,7 @@ test spinbox-3.51 {SpinboxWidgetCmd procedure, "selection present" widget comman
 test spinbox-3.52 {SpinboxWidgetCmd procedure, "selection present" widget command} -setup {
     spinbox .e
     pack .e
-    update  
+    update
 } -body {
     .e insert end 0123456789
     .e select from 3
@@ -1544,11 +1544,11 @@ test spinbox-3.52 {SpinboxWidgetCmd procedure, "selection present" widget comman
     .e selection present
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-3.53 {SpinboxWidgetCmd procedure, "selection present" widget command} -setup {
     spinbox .e
     pack .e
-    update  
+    update
 } -body {
     .e insert end 0123456789
     .e select from 3
@@ -1557,11 +1557,11 @@ test spinbox-3.53 {SpinboxWidgetCmd procedure, "selection present" widget comman
     .e selection present
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-3.54 {SpinboxWidgetCmd procedure, "selection present" widget command} -setup {
     spinbox .e
     pack .e
-    update 
+    update
 } -body {
     .e insert end 0123456789
     .e select from 3
@@ -1570,7 +1570,7 @@ test spinbox-3.54 {SpinboxWidgetCmd procedure, "selection present" widget comman
     .e selection present
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 test spinbox-3.55 {SpinboxWidgetCmd procedure, "selection adjust" widget command} -setup {
     spinbox .e
 } -body {
@@ -1598,7 +1598,7 @@ test spinbox-3.57 {SpinboxWidgetCmd procedure, "selection adjust" widget command
     selection get
 } -cleanup {
     destroy .e
-} -result {123}
+} -result 123
 test spinbox-3.58 {SpinboxWidgetCmd procedure, "selection adjust" widget command} -setup {
     spinbox .e
     pack .e
@@ -1612,7 +1612,7 @@ test spinbox-3.58 {SpinboxWidgetCmd procedure, "selection adjust" widget command
     selection get
 } -cleanup {
     destroy .e
-} -result {234}
+} -result 234
 test spinbox-3.59 {SpinboxWidgetCmd procedure, "selection from" widget command} -setup {
     spinbox .e
 } -body {
@@ -1700,7 +1700,7 @@ test spinbox-3.64.2 {SpinboxWidgetCmd procedure, "selection" widget command} -se
 } -result {2 4}
 
 test spinbox-3.65 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
@@ -1712,7 +1712,7 @@ test spinbox-3.65 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     destroy .e
 } -result {0.053763 0.268817}
 test spinbox-3.66 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
@@ -1721,7 +1721,7 @@ test spinbox-3.66 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     destroy .e
 } -returnCodes error -result {bad spinbox index "gorp"}
 test spinbox-3.67 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
@@ -1735,7 +1735,7 @@ test spinbox-3.67 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     destroy .e
 } -result {0.107527 0.322581}
 test spinbox-3.68 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
@@ -1744,7 +1744,7 @@ test spinbox-3.68 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e xview moveto fraction"}
 test spinbox-3.69 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
@@ -1753,7 +1753,7 @@ test spinbox-3.69 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     destroy .e
 } -returnCodes error -result {expected floating-point number but got "foo"}
 test spinbox-3.70 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
@@ -1765,7 +1765,7 @@ test spinbox-3.70 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     destroy .e
 } -result {0.505376 0.720430}
 test spinbox-3.71 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
@@ -1776,7 +1776,7 @@ test spinbox-3.71 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e xview scroll number units|pages"}
 test spinbox-3.72 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
 } -body {
     .e insert end "This is quite a long text string, so long that it "
@@ -1787,7 +1787,7 @@ test spinbox-3.72 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     destroy .e
 } -returnCodes error -result {expected integer but got "gorp"}
 test spinbox-3.73 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
 } -body {
     .e insert end "This is quite a long text string, so long that it "
@@ -1800,7 +1800,7 @@ test spinbox-3.73 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     destroy .e
 } -result {0.193548 0.408602}
 test spinbox-3.74 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
@@ -1814,7 +1814,7 @@ test spinbox-3.74 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     destroy .e
 } -result {0.397849 0.612903}
 test spinbox-3.75 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
 } -body {
     .e insert end "This is quite a long text string, so long that it "
@@ -1822,13 +1822,13 @@ test spinbox-3.75 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     update
     .e xview 30
     update
-    .e xview scroll 2 units 
+    .e xview scroll 2 units
     .e index @0
 } -cleanup {
     destroy .e
-} -result {32}
+} -result 32
 test spinbox-3.76 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
 } -body {
     .e insert end "This is quite a long text string, so long that it "
@@ -1836,13 +1836,13 @@ test spinbox-3.76 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     update
     .e xview 30
     update
-    .e xview scroll -1 units 
+    .e xview scroll -1 units
     .e index @0
 } -cleanup {
     destroy .e
-} -result {29}
+} -result 29
 test spinbox-3.77 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
 } -body {
     .e insert end "This is quite a long text string, so long that it "
@@ -1853,7 +1853,7 @@ test spinbox-3.77 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     destroy .e
 } -returnCodes error -result {bad argument "foobars": must be units or pages}
 test spinbox-3.78 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
 } -body {
     .e insert end "This is quite a long text string, so long that it "
@@ -1864,7 +1864,7 @@ test spinbox-3.78 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     destroy .e
 } -returnCodes error -result {unknown option "eat": must be moveto or scroll}
 test spinbox-3.79 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
@@ -1872,13 +1872,13 @@ test spinbox-3.79 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     .e insert end "runs off the end of the window quite a bit."
     .e xview 0
     update
-    .e xview -4
+    .e xview -1
     .e index @0
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 test spinbox-3.80 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
 } -body {
     .e insert end "This is quite a long text string, so long that it "
@@ -1888,9 +1888,9 @@ test spinbox-3.80 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {73}
+} -result 73
 test spinbox-3.81 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
 } -body {
     .e insert end "This is quite a long text string, so long that it "
@@ -1912,7 +1912,7 @@ test spinbox-3.81 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
 } -result {0.095745 0.106383 0.117021}
 
 test spinbox-3.82 {SpinboxWidgetCmd procedure} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
@@ -1927,7 +1927,7 @@ test spinbox-5.1 {ConfigureSpinbox procedure, -textvariable} -body {
     .e get
 } -cleanup {
     destroy .e
-} -result {12345}
+} -result 12345
 test spinbox-5.2 {ConfigureSpinbox procedure, -textvariable} -body {
     set x 12345
     spinbox .e -textvariable x
@@ -1983,14 +1983,14 @@ test spinbox-5.5 {ConfigureSpinbox procedure} -setup {
     destroy .e1 .e2
 } -result {{This is so} {This is so} 1234}
 test spinbox-5.6 {ConfigureSpinbox procedure} -setup {
-    spinbox .e 
+    spinbox .e
     pack .e
 } -body {
     .e insert end "0123456789"
     .e select from 1
     .e select to 5
     .e configure -exportselection 0
-    selection get 
+    selection get
 } -cleanup {
     destroy .e
 } -returnCodes error -result {PRIMARY selection doesn't exist or form "STRING" not defined}
@@ -2002,14 +2002,14 @@ test spinbox-5.6.1 {ConfigureSpinbox procedure} -setup {
     .e select from 1
     .e select to 5
     .e configure -exportselection 0
-    catch {selection get} 
+    catch {selection get}
     list [.e index sel.first] [.e index sel.last]
 } -cleanup {
     destroy .e
 } -result {1 5}
 
 test spinbox-5.7 {ConfigureSpinbox procedure} -setup {
-    spinbox .e -font {Helvetica -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Helvetica -12} -borderwidth 2 -highlightthickness 2
     pack .e
 } -body {
     .e configure -font {Courier -12} -width 4 -xscrollcommand scroll
@@ -2027,7 +2027,7 @@ test spinbox-5.7 {ConfigureSpinbox procedure} -setup {
 test spinbox-5.8 {ConfigureSpinbox procedure} -constraints {
     fonts
 } -setup {
-    spinbox .e -borderwidth 2 -highlightthickness 2 
+    spinbox .e -borderwidth 2 -highlightthickness 2
     pack .e
 } -body {
     .e configure -width 0 -font {Helvetica -12}
@@ -2082,7 +2082,7 @@ test spinbox-5.11 {ConfigureSpinbox procedure} -setup {
 test spinbox-6.1 {SpinboxComputeGeometry procedure} -constraints {
     fonts
 } -setup {
-    spinbox .e 
+    spinbox .e
     pack .e
 } -body {
     .e configure -font {Courier -12} -bd 2 -relief raised -width 20 -highlightthickness 3
@@ -2095,7 +2095,7 @@ test spinbox-6.1 {SpinboxComputeGeometry procedure} -constraints {
 test spinbox-6.2 {SpinboxComputeGeometry procedure} -constraints {
     fonts
 } -setup {
-    spinbox .e 
+    spinbox .e
     pack .e
 } -body {
     .e configure -font {Courier -12} -bd 2 -relief raised -width 20 -justify center \
@@ -2109,7 +2109,7 @@ test spinbox-6.2 {SpinboxComputeGeometry procedure} -constraints {
 test spinbox-6.3 {SpinboxComputeGeometry procedure} -constraints {
     fonts
 } -setup {
-    spinbox .e 
+    spinbox .e
     pack .e
 } -body {
     .e configure -font {Courier -12} -bd 2 -relief raised -width 20 -justify right \
@@ -2121,7 +2121,7 @@ test spinbox-6.3 {SpinboxComputeGeometry procedure} -constraints {
     destroy .e
 } -result {3 4}
 test spinbox-6.4 {SpinboxComputeGeometry procedure} -setup {
-    spinbox .e 
+    spinbox .e
     pack .e
 } -body {
     .e configure -font {Courier -12} -bd 2 -relief raised -width 5
@@ -2131,26 +2131,26 @@ test spinbox-6.4 {SpinboxComputeGeometry procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {6}
+} -result 6
 test spinbox-6.5 {SpinboxComputeGeometry procedure} -setup {
     spinbox .e -highlightthickness 2
     pack .e
 } -body {
-    .e configure -font {Courier -12} -bd 2 -relief raised -width 5 	    
+    .e configure -font {Courier -12} -bd 2 -relief raised -width 5
     .e insert end "01234567890"
     update
     .e xview 7
     .e index @0
 } -cleanup {
     destroy .e
-} -result {6}
+} -result 6
 test spinbox-6.6 {SpinboxComputeGeometry procedure} -constraints {
     fonts
 } -setup {
     spinbox .e -highlightthickness 2
     pack .e
 } -body {
-    .e configure -font {Courier -12} -bd 2 -relief raised -width 10 
+    .e configure -font {Courier -12} -bd 2 -relief raised -width 10
     .e insert end "01234\t67890"
     update
     .e xview 3
@@ -2190,7 +2190,7 @@ test spinbox-6.9 {SpinboxComputeGeometry procedure} -constraints {
     spinbox .e -highlightthickness 2
     pack .e
 } -body {
-    .e configure -font {Helvetica -24} -bd 3 -relief raised -width 0 
+    .e configure -font {Helvetica -24} -bd 3 -relief raised -width 0
     update
     list [winfo reqwidth .e] [winfo reqheight .e]
 } -cleanup {
@@ -2199,7 +2199,7 @@ test spinbox-6.9 {SpinboxComputeGeometry procedure} -constraints {
 
 
 test spinbox-7.1 {InsertChars procedure} -setup {
-    unset -nocomplain contents 
+    unset -nocomplain contents
     spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
@@ -2217,8 +2217,8 @@ test spinbox-7.1 {InsertChars procedure} -setup {
 } -result {abXXXcde abXXXcde {0.000000 1.000000}}
 
 test spinbox-7.2 {InsertChars procedure} -setup {
-    unset -nocomplain contents 
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    unset -nocomplain contents
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
@@ -2290,7 +2290,7 @@ test spinbox-7.6 {InsertChars procedure} -setup {
     destroy .e
 } -result {2 6 2 5}
 test spinbox-7.7 {InsertChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e configure -xscrollcommand scroll
@@ -2300,9 +2300,9 @@ test spinbox-7.7 {InsertChars procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {7}
+} -result 7
 test spinbox-7.8 {InsertChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e insert 0 0123456789
@@ -2311,9 +2311,9 @@ test spinbox-7.8 {InsertChars procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test spinbox-7.9 {InsertChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e insert 0 "This is a very long string"
@@ -2323,9 +2323,9 @@ test spinbox-7.9 {InsertChars procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {7}
+} -result 7
 test spinbox-7.10 {InsertChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e insert 0 "This is a very long string"
@@ -2335,12 +2335,12 @@ test spinbox-7.10 {InsertChars procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 
 test spinbox-7.11 {InsertChars procedure} -constraints {
     fonts
 } -setup {
-    spinbox .e -width 0 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 0 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e insert 0 "xyzzy"
@@ -2349,11 +2349,11 @@ test spinbox-7.11 {InsertChars procedure} -constraints {
     winfo reqwidth .e
 } -cleanup {
     destroy .e
-} -result {70}
+} -result 70
 
 test spinbox-8.1 {DeleteChars procedure} -setup {
-    unset -nocomplain contents 
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    unset -nocomplain contents
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
@@ -2369,8 +2369,8 @@ test spinbox-8.1 {DeleteChars procedure} -setup {
     after cancel $timeout
 } -result {abe abe {0.000000 1.000000}}
 test spinbox-8.2 {DeleteChars procedure} -setup {
-    unset -nocomplain contents 
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    unset -nocomplain contents
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
@@ -2378,7 +2378,7 @@ test spinbox-8.2 {DeleteChars procedure} -setup {
     .e insert 0 abcde
     update idletasks
     set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
-    .e delete -2 2
+    .e delete -1 2
     vwait scrollInfo
     list [.e get] $contents [format {%.6f %.6f} {*}$scrollInfo]
 } -cleanup {
@@ -2386,8 +2386,8 @@ test spinbox-8.2 {DeleteChars procedure} -setup {
     after cancel $timeout
 } -result {cde cde {0.000000 1.000000}}
 test spinbox-8.3 {DeleteChars procedure} -setup {
-    unset -nocomplain contents 
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    unset -nocomplain contents
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
@@ -2403,7 +2403,7 @@ test spinbox-8.3 {DeleteChars procedure} -setup {
     after cancel $timeout
 } -result {abc abc {0.000000 1.000000}}
 test spinbox-8.4 {DeleteChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
@@ -2419,7 +2419,7 @@ test spinbox-8.4 {DeleteChars procedure} -setup {
     destroy .e
 } -result {1 6 1 5}
 test spinbox-8.5 {DeleteChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
@@ -2435,7 +2435,7 @@ test spinbox-8.5 {DeleteChars procedure} -setup {
     destroy .e
 } -result {1 5 1 4}
 test spinbox-8.6 {DeleteChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
@@ -2451,7 +2451,7 @@ test spinbox-8.6 {DeleteChars procedure} -setup {
     destroy .e
 } -result {1 2 1 5}
 test spinbox-8.7 {DeleteChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
@@ -2465,7 +2465,7 @@ test spinbox-8.7 {DeleteChars procedure} -setup {
     destroy .e
 } -returnCodes error -result {selection isn't in widget .e}
 test spinbox-8.8 {DeleteChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
@@ -2481,7 +2481,7 @@ test spinbox-8.8 {DeleteChars procedure} -setup {
     destroy .e
 } -result {3 4 3 8}
 test spinbox-8.9 {DeleteChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e insert 0 0123456789abcde
@@ -2494,7 +2494,7 @@ test spinbox-8.9 {DeleteChars procedure} -setup {
     destroy .e
 } -returnCodes error -result {selection isn't in widget .e}
 test spinbox-8.10 {DeleteChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
@@ -2510,7 +2510,7 @@ test spinbox-8.10 {DeleteChars procedure} -setup {
     destroy .e
 } -result {3 5 5 8}
 test spinbox-8.11 {DeleteChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
@@ -2526,7 +2526,7 @@ test spinbox-8.11 {DeleteChars procedure} -setup {
     destroy .e
 } -result {3 8 4 8}
 test spinbox-8.12 {DeleteChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
@@ -2537,9 +2537,9 @@ test spinbox-8.12 {DeleteChars procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-8.13 {DeleteChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
@@ -2550,9 +2550,9 @@ test spinbox-8.13 {DeleteChars procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-8.14 {DeleteChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
@@ -2563,9 +2563,9 @@ test spinbox-8.14 {DeleteChars procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test spinbox-8.15 {DeleteChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
@@ -2576,9 +2576,9 @@ test spinbox-8.15 {DeleteChars procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-8.16 {DeleteChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
@@ -2589,9 +2589,9 @@ test spinbox-8.16 {DeleteChars procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-8.17 {DeleteChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
@@ -2602,9 +2602,9 @@ test spinbox-8.17 {DeleteChars procedure} -setup {
     .e index @0
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test spinbox-8.18 {DeleteChars procedure} -setup {
-    spinbox .e -width 0 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 0 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
@@ -2614,7 +2614,7 @@ test spinbox-8.18 {DeleteChars procedure} -setup {
     winfo reqwidth .e
 } -cleanup {
     destroy .e
-} -result {42}
+} -result 42
 
 test spinbox-9.1 {SpinboxValueChanged procedure} -setup {
     unset -nocomplain x
@@ -2634,7 +2634,7 @@ test spinbox-10.1 {SpinboxSetValue procedure} -constraints fonts -body {
     set y ab
     spinbox .e  -font {Helvetica -12} -highlightthickness 2 -bd 2  -width 0
     pack .e
-    .e configure -textvariable x 
+    .e configure -textvariable x
     .e configure -textvariable y
     update
     list [.e get] [winfo reqwidth .e]
@@ -2643,7 +2643,7 @@ test spinbox-10.1 {SpinboxSetValue procedure} -constraints fonts -body {
 } -result {ab 35}
 test spinbox-10.2 {SpinboxSetValue procedure, updating selection} -setup {
     unset -nocomplain x
-    spinbox .e -font {Helvetica -12} -highlightthickness 2 -bd 2 
+    spinbox .e -font {Helvetica -12} -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e configure -textvariable x
@@ -2656,7 +2656,7 @@ test spinbox-10.2 {SpinboxSetValue procedure, updating selection} -setup {
 } -returnCodes error -result {selection isn't in widget .e}
 test spinbox-10.3 {SpinboxSetValue procedure, updating selection} -setup {
     unset -nocomplain x
-    spinbox .e -font {Helvetica -12} -highlightthickness 2 -bd 2 
+    spinbox .e -font {Helvetica -12} -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e configure -textvariable x
@@ -2669,7 +2669,7 @@ test spinbox-10.3 {SpinboxSetValue procedure, updating selection} -setup {
 } -result {4 7}
 test spinbox-10.4 {SpinboxSetValue procedure, updating selection} -setup {
     unset -nocomplain x
-    spinbox .e -font {Helvetica -12} -highlightthickness 2 -bd 2 
+    spinbox .e -font {Helvetica -12} -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e configure -textvariable x
@@ -2682,7 +2682,7 @@ test spinbox-10.4 {SpinboxSetValue procedure, updating selection} -setup {
 } -result {4 10}
 test spinbox-10.5 {SpinboxSetValue procedure, updating display position} -setup {
     unset -nocomplain x
-    spinbox .e -highlightthickness 2 -bd 2 
+    spinbox .e -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e configure -width 10 -font {Courier -12} -textvariable x
@@ -2694,10 +2694,10 @@ test spinbox-10.5 {SpinboxSetValue procedure, updating display position} -setup
     .e index @0
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 test spinbox-10.6 {SpinboxSetValue procedure, updating display position} -setup {
     unset -nocomplain x
-    spinbox .e -highlightthickness 2 -bd 2 
+    spinbox .e -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e configure -width 10 -font {Courier -12} -textvariable x
@@ -2710,10 +2710,10 @@ test spinbox-10.6 {SpinboxSetValue procedure, updating display position} -setup
     .e index @0
 } -cleanup {
     destroy .e
-} -result {10}
+} -result 10
 test spinbox-10.7 {SpinboxSetValue procedure, updating insertion cursor} -setup {
     unset -nocomplain x
-    spinbox .e -highlightthickness 2 -bd 2 
+    spinbox .e -highlightthickness 2 -bd 2
     pack .e
     update
 } -body {
@@ -2725,10 +2725,10 @@ test spinbox-10.7 {SpinboxSetValue procedure, updating insertion cursor} -setup
     .e index insert
 } -cleanup {
     destroy .e
-} -result {3}
+} -result 3
 test spinbox-10.8 {SpinboxSetValue procedure, updating insertion cursor} -setup {
     unset -nocomplain x
-    spinbox .e -highlightthickness 2 -bd 2 
+    spinbox .e -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e configure -width 10 -font {Courier -12} -textvariable x
@@ -2739,7 +2739,7 @@ test spinbox-10.8 {SpinboxSetValue procedure, updating insertion cursor} -setup
     .e index insert
 } -cleanup {
     destroy .e
-} -result {5}
+} -result 5
 
 test spinbox-11.1 {SpinboxEventProc procedure} -setup {
     spinbox .e -highlightthickness 2 -bd 2 -font {Helvetica -12}
@@ -2783,9 +2783,9 @@ test spinbox-13.1 {GetSpinboxIndex procedure} -setup {
     .e index end
 } -cleanup {
     destroy .e
-} -result {21}
+} -result 21
 test spinbox-13.2 {GetSpinboxIndex procedure} -body {
-    spinbox .e 
+    spinbox .e
     .e index abogus
 } -cleanup {
     destroy .e
@@ -2802,7 +2802,7 @@ test spinbox-13.3 {GetSpinboxIndex procedure} -setup {
     .e index anchor
 } -cleanup {
     destroy .e
-} -result {1}
+} -result 1
 test spinbox-13.4 {GetSpinboxIndex procedure} -setup {
     spinbox .e -font {Courier -12} -width 5 -bd 2 -relief sunken
     pack .e
@@ -2815,7 +2815,7 @@ test spinbox-13.4 {GetSpinboxIndex procedure} -setup {
     .e index anchor
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test spinbox-13.5 {GetSpinboxIndex procedure} -setup {
     spinbox .e -font {Courier -12} -width 5 -bd 2 -relief sunken
     pack .e
@@ -2829,7 +2829,7 @@ test spinbox-13.5 {GetSpinboxIndex procedure} -setup {
     .e index anchor
 } -cleanup {
     destroy .e
-} -result {15}
+} -result 15
 test spinbox-13.6 {GetSpinboxIndex procedure} -setup {
     spinbox .e
 } -body {
@@ -2848,7 +2848,7 @@ test spinbox-13.7 {GetSpinboxIndex procedure} -setup {
     .e index insert
 } -cleanup {
     destroy .e
-} -result {2}
+} -result 2
 test spinbox-13.8 {GetSpinboxIndex procedure} -setup {
     spinbox .e
 } -body {
@@ -2871,7 +2871,7 @@ test spinbox-13.9 {GetSpinboxIndex procedure} -setup {
 } -result {1 6}
 
 test spinbox-13.10 {GetSpinboxIndex procedure} -constraints x11 -body {
-# On unix, when selection is cleared, spinbox widget's internal 
+# On unix, when selection is cleared, spinbox widget's internal
 # selection range is reset.
 # Previous settings:
 	spinbox .e -font {Courier -12} -width 5 -bd 2 -relief sunken
@@ -2891,7 +2891,7 @@ test spinbox-13.10 {GetSpinboxIndex procedure} -constraints x11 -body {
 
 test spinbox-13.11 {GetSpinboxIndex procedure} -constraints aquaOrWin32 -body {
 # On mac and pc, when selection is cleared, spinbox widget remembers
-# last selected range.  When selection ownership is restored to 
+# last selected range.  When selection ownership is restored to
 # spinbox, the old range will be rehighlighted.
 # Previous settings:
 	spinbox .e -font {Courier -12} -width 5 -bd 2 -relief sunken
@@ -2908,7 +2908,7 @@ test spinbox-13.11 {GetSpinboxIndex procedure} -constraints aquaOrWin32 -body {
     .e index sel.first
 } -cleanup {
     destroy .e
-} -result {1}           
+} -result 1
 
 test spinbox-13.12 {GetSpinboxIndex procedure} -constraints x11 -body {
 # Previous settings:
@@ -2963,7 +2963,7 @@ test spinbox-13.13 {GetSpinboxIndex procedure} -constraints win -body {
 
 test spinbox-13.14 {GetSpinboxIndex procedure} -constraints win -body {
 # On mac and pc, when selection is cleared, spinbox widget remembers
-# last selected range.  When selection ownership is restored to 
+# last selected range.  When selection ownership is restored to
 # spinbox, the old range will be rehighlighted.
 # Previous settings:
 	spinbox .e -font {Courier -12} -width 5 -bd 2 -relief sunken
@@ -2976,14 +2976,14 @@ test spinbox-13.14 {GetSpinboxIndex procedure} -constraints win -body {
     list [.e index sel.first] [.e index sel.last]
 # Testing:
     selection clear .e
-    selection get 
+    selection get
 } -cleanup {
     destroy .e
 } -returnCodes error -match glob -result {*}
 
 test spinbox-13.14.1 {GetSpinboxIndex procedure} -constraints win -body {
 # On mac and pc, when selection is cleared, spinbox widget remembers
-# last selected range.  When selection ownership is restored to 
+# last selected range.  When selection ownership is restored to
 # spinbox, the old range will be rehighlighted.
 # Previous settings:
 	spinbox .e -font {Courier -12} -width 5 -bd 2 -relief sunken
@@ -2995,9 +2995,9 @@ test spinbox-13.14.1 {GetSpinboxIndex procedure} -constraints win -body {
     .e select to 6
     list [.e index sel.first] [.e index sel.last]
 # Testing:
-    selection clear .e  
-    catch {selection get} 
-    .e index sbogus      
+    selection clear .e
+    catch {selection get}
+    .e index sbogus
 } -cleanup {
     destroy .e
 } -returnCodes error -match glob -result {*}
@@ -3012,7 +3012,7 @@ test spinbox-13.15 {GetSpinboxIndex procedure} -body {
 
 test spinbox-13.16 {GetSpinboxIndex procedure} -constraints fonts -body {
     spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
-        -font {Courier -12} 
+        -font {Courier -12}
     pack .e
     .e insert 0 012345678901234567890
     .e xview 4
@@ -3020,10 +3020,10 @@ test spinbox-13.16 {GetSpinboxIndex procedure} -constraints fonts -body {
     .e index @4
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test spinbox-13.17 {GetSpinboxIndex procedure} -constraints fonts -body {
     spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
-        -font {Courier -12} 
+        -font {Courier -12}
     pack .e
     .e insert 0 012345678901234567890
     .e xview 4
@@ -3031,10 +3031,10 @@ test spinbox-13.17 {GetSpinboxIndex procedure} -constraints fonts -body {
     .e index @11
 } -cleanup {
     destroy .e
-} -result {4}
+} -result 4
 test spinbox-13.18 {GetSpinboxIndex procedure} -constraints fonts -body {
     spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
-        -font {Courier -12} 
+        -font {Courier -12}
     pack .e
     .e insert 0 012345678901234567890
     .e xview 4
@@ -3042,10 +3042,10 @@ test spinbox-13.18 {GetSpinboxIndex procedure} -constraints fonts -body {
     .e index @12
 } -cleanup {
     destroy .e
-} -result {5}
+} -result 5
 test spinbox-13.19 {GetSpinboxIndex procedure} -constraints fonts -body {
     spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
-        -font {Courier -12} 
+        -font {Courier -12}
     pack .e
     .e insert 0 012345678901234567890
     .e xview 4
@@ -3053,10 +3053,10 @@ test spinbox-13.19 {GetSpinboxIndex procedure} -constraints fonts -body {
     .e index @[expr {[winfo width .e] - 6-11}]
 } -cleanup {
     destroy .e
-} -result {8}
+} -result 8
 test spinbox-13.20 {GetSpinboxIndex procedure} -constraints fonts -body {
     spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
-        -font {Courier -12} 
+        -font {Courier -12}
     pack .e
     .e insert 0 012345678901234567890
     .e xview 4
@@ -3064,10 +3064,10 @@ test spinbox-13.20 {GetSpinboxIndex procedure} -constraints fonts -body {
     .e index @[expr {[winfo width .e] - 5}]
 } -cleanup {
     destroy .e
-} -result {9}
+} -result 9
 test spinbox-13.21 {GetSpinboxIndex procedure} -body {
     spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
-        -font {Courier -12} 
+        -font {Courier -12}
     pack .e
     .e insert 0 012345678901234567890
     .e xview 4
@@ -3075,9 +3075,9 @@ test spinbox-13.21 {GetSpinboxIndex procedure} -body {
     .e index @1000
 } -cleanup {
     destroy .e
-} -result {9}
+} -result 9
 test spinbox-13.22 {GetSpinboxIndex procedure} -setup {
-    spinbox .e 
+    spinbox .e
     pack .e
     update
 } -body {
@@ -3087,18 +3087,18 @@ test spinbox-13.22 {GetSpinboxIndex procedure} -setup {
 } -returnCodes error -result {bad spinbox index "1xyz"}
 test spinbox-13.23 {GetSpinboxIndex procedure} -body {
     spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
-        -font {Courier -12} 
+        -font {Courier -12}
     pack .e
     .e insert 0 012345678901234567890
     .e xview 4
     update
-    .e index -10
+    .e index -1
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 test spinbox-13.24 {GetSpinboxIndex procedure} -body {
     spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
-        -font {Courier -12} 
+        -font {Courier -12}
     pack .e
     .e insert 0 012345678901234567890
     .e xview 4
@@ -3106,10 +3106,10 @@ test spinbox-13.24 {GetSpinboxIndex procedure} -body {
     .e index 12
 } -cleanup {
     destroy .e
-} -result {12}
+} -result 12
 test spinbox-13.25 {GetSpinboxIndex procedure} -body {
     spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
-        -font {Courier -12} 
+        -font {Courier -12}
     pack .e
     .e insert 0 012345678901234567890
     .e xview 4
@@ -3117,7 +3117,7 @@ test spinbox-13.25 {GetSpinboxIndex procedure} -body {
     .e index 49
 } -cleanup {
     destroy .e
-} -result {21}
+} -result 21
 
 # XXX Still need to write tests for SpinboxScanTo and SpinboxSelectTo.
 
@@ -3137,13 +3137,13 @@ test spinbox-14.3 {SpinboxFetchSelection procedure} -setup {
 }
 } -body {
     spinbox .e
-    .e insert end $x    
+    .e insert end $x
     .e select from 0
     .e select to end
     string compare [selection get] $x
 } -cleanup {
     destroy .e
-} -result {0}
+} -result 0
 
 test spinbox-15.1 {SpinboxLostSelection} -body {
     spinbox .e
@@ -3164,7 +3164,7 @@ test spinbox-16.1 {SpinboxVisibleRange procedure} -constraints fonts  -body {
     spinbox .e -width 10 -font {Helvetica -12}
     pack .e
     update
-    .e insert 0 "............................." 
+    .e insert 0 "............................."
     format {%.6f %.6f} {*}[.e xview]
 } -cleanup {
     destroy .e
@@ -3209,7 +3209,7 @@ test spinbox-17.3 {SpinboxUpdateScrollbar procedure} -body {
     update idletasks
     set timeout [after 500 {set scrollInfo {-1000000 -1000000}}]
     .e insert 0 abcdefghijklmnopqrs
-    .e xview 
+    .e xview
     vwait scrollInfo
     format {%.6f %.6f} {*}$scrollInfo
 } -cleanup {
@@ -3246,7 +3246,7 @@ test spinbox-18.1 {Spinbox widget vs hiding} -setup {
     set res1 [list [winfo children .] [interp hidden]]
     set res2 [list {} $l]
     expr {$res1 == $res2}
-} -result {1} 
+} -result 1
 
 ##
 ## Spinbox widget VALIDATION tests
@@ -3600,7 +3600,7 @@ test spinbox-19.19 {spinbox widget validation} -setup {
         -background red -foreground white
     pack .e
     set ::e nextdata                 ;# previous settings
-    
+
     .e configure -validatecommand [list doval2 %W %d %i %P %s %S %v %V]
     .e validate
     list [.e cget -validate] [.e get] $::vVals
@@ -3625,7 +3625,7 @@ test spinbox-19.20 {spinbox widget validation} -setup {
     set ::e nextdata                 ;# previous settings
     .e configure -validatecommand [list doval2 %W %d %i %P %s %S %v %V] ;# prev
     .e validate                     ;# previous settings
-    
+
     .e configure -validate all
     set ::e testdata
     list [.e cget -validate] [.e get] $::e $::vVals
@@ -3807,7 +3807,7 @@ test spinbox-22.1 {spinbox config, -from changes SF bug 559078} -body {
     set val
 } -cleanup {
     destroy .e
-} -result {5}
+} -result 5
 test spinbox-22.2 {spinbox config, -from changes SF bug 559078} -body {
     set val 5
     spinbox .e -from 1 -to 10 -textvariable val
@@ -3815,7 +3815,7 @@ test spinbox-22.2 {spinbox config, -from changes SF bug 559078} -body {
     set val
 } -cleanup {
     destroy .e
-} -result {5}
+} -result 5
 test spinbox-22.3 {spinbox config, -from changes SF bug 559078} -body {
     set val 5
     spinbox .e -from 3 -to 10 -textvariable val
@@ -3823,7 +3823,7 @@ test spinbox-22.3 {spinbox config, -from changes SF bug 559078} -body {
     set val
 } -cleanup {
     destroy .e
-} -result {6}
+} -result 6
 
 test spinbox-23.1 {selection present while disabled, bug 637828} -body {
     spinbox .e
diff --git a/tests/ttk/entry.test b/tests/ttk/entry.test
index 2e5f43c..d5bcf45 100644
--- a/tests/ttk/entry.test
+++ b/tests/ttk/entry.test
@@ -84,7 +84,7 @@ test entry-2.1.1 "Create entry before scrollbar - scrollbar catches up" -body {
     	-expand false -fill x
     update ; # no error
     lappend res [expr [lindex [.tsb get] 1] < 1] ; # scrollbar did update
-} -result {1} -cleanup {destroy .te .tsb}
+} -result 1 -cleanup {destroy .te .tsb}
 
 test entry-2.2 "Initial scroll position" -body {
     ttk::entry .e -font fixed -width 5 -xscrollcommand scroll
@@ -128,28 +128,28 @@ test entry-3.3 "xview" -body {
     .e insert end abcdefghijklmnopqrstuvwxyz
     .e xview end
     set result [.e index @0]
-} -result {7}
+} -result 7
 
 test entry-3.4 "xview" -body {
     .e delete 0 end;
     .e insert end abcdefghijklmnopqrstuvwxyz
     .e xview moveto 1.0
     set result [.e index @0]
-} -result {7}
+} -result 7
 
 test entry-3.5 "xview" -body {
     .e delete 0 end;
     .e insert end abcdefghijklmnopqrstuvwxyz
     .e xview scroll 5 units
     set result [.e index @0]
-} -result {5}
+} -result 5
 
 test entry-3.6 "xview" -body {
     .e delete 0 end;
     .e insert end [string repeat abcdefghijklmnopqrstuvwxyz 5]
     .e xview scroll 2 pages
     set result [.e index @0]
-} -result {40}
+} -result 40
 
 test entry-3.last "Series 3 cleanup" -body {
     destroy .e
diff --git a/tests/ttk/spinbox.test b/tests/ttk/spinbox.test
index b86f053..4bdabee 100644
--- a/tests/ttk/spinbox.test
+++ b/tests/ttk/spinbox.test
@@ -148,7 +148,7 @@ test spinbox-1.8.4 "-validate option: " -setup {
     set ::spinbox_test
 } -cleanup {
     destroy .sb
-} -result {50}
+} -result 50
 
 
 test spinbox-2.0 "current command -- unset should be 0" -constraints nyi -setup {
@@ -316,7 +316,7 @@ test spinbox-nostomp-3 "don't stomp on -variable (configure; -from/to)" -body {
 
 test spinbox-nostomp-4 "don't stomp on -variable (configure; -values)" -body {
     set SBV Apr
-    ttk::spinbox .sb 
+    ttk::spinbox .sb
     .sb configure -textvariable SBV -values {Jan Feb Mar Apr May Jun Jul Aug}
     list $SBV [.sb get]
 } -cleanup {
@@ -341,7 +341,7 @@ test spinbox-dieoctaldie-1 "Cope with leading zeros" -body {
     event generate .sb <<Decrement>>; lappend result $secs
 
     set result
-} -result [list 07 08 09 10 11 10 09 08 07] -cleanup { 
+} -result [list 07 08 09 10 11 10 09 08 07] -cleanup {
     destroy .sb
     unset secs
 }
-- 
cgit v0.12


From acf3c7b15812de591a890158d17e497bcd1a16a4 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Thu, 13 Aug 2020 16:36:47 +0000
Subject: Use the TkMacOSXInDarkMode from  bug-315104a5c10

---
 macosx/tkMacOSXColor.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index 7b517e7..b5ca43f 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -418,23 +418,24 @@ SetCGColorComponents(
 MODULE_SCOPE Bool
 TkMacOSXInDarkMode(Tk_Window tkwin)
 {
-    int result = false;
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
     if (@available(macOS 10.14, *)) {
         TkWindow *winPtr = (TkWindow*) tkwin;
+	NSAppearanceName name;
 	NSView *view = nil;
 	if (winPtr && winPtr->privatePtr) {
 	    view = TkMacOSXDrawableView(winPtr->privatePtr);
 	}
 	if (view) {
-	    result = (view.effectiveAppearance == darkAqua);
+	    name = [[view effectiveAppearance] name];
 	} else {
-	    result = ([NSAppearance currentAppearance] == darkAqua);
+	    name = [[NSAppearance currentAppearance] name];
 	}
+	return (name == NSAppearanceNameDarkAqua);
     }
 #endif
-    return result;
+    return false;
 }
 
 /*
-- 
cgit v0.12


From e2d1a86cc98b5486f5a0aa3d7a945aca12a36dcb Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Thu, 13 Aug 2020 19:52:17 +0000
Subject: Use tkMacOSXColor.c and tkMacOSXColor.h from [38138883]; these
 include systemPlaceholderTextColor along with all other colors in Apple's
 system ColorList.

---
 macosx/tkMacOSXColor.c | 813 +++++++++++++++++++++++--------------------------
 macosx/tkMacOSXColor.h | 202 ++++++++++++
 2 files changed, 576 insertions(+), 439 deletions(-)
 create mode 100644 macosx/tkMacOSXColor.h

diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index 9575940..01732c0 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -1,5 +1,5 @@
 /*
- * tkMacOSXColor.c --
+ * TkMacOSXColor.c --
  *
  *	This file maintains a database of color values for the Tk
  *	toolkit, in order to avoid round-trips to the server to
@@ -9,6 +9,7 @@
  * Copyright (c) 1994-1996 Sun Microsystems, Inc.
  * Copyright 2001-2009, Apple Inc.
  * Copyright (c) 2006-2009 Daniel A. Steffen <das@users.sourceforge.net>
+ * Copyright (c) 2020 Marc Culler
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -16,287 +17,268 @@
 
 #include "tkMacOSXPrivate.h"
 #include "tkColor.h"
+#include "tkMacOSXColor.h"
+
+static Tcl_HashTable systemColors;
+static int numSystemColors;
+static int rgbColorIndex;
+static int controlAccentIndex;
+static Bool useFakeAccentColor = NO;
+static SystemColorDatum **systemColorIndex;
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
+static NSAppearance *lightAqua = nil;
+static NSAppearance *darkAqua = nil;
+#endif
+static NSColorSpace* sRGB = NULL;
+static CGFloat windowBackground[4] =
+    {236.0 / 255, 236.0 / 255, 236.0 / 255, 1.0};
 
-/*
- * The colorType specifies how the color value should be interpreted.  For the
- * unique rgbColor entry, the RGB values are generated from the pixel value of
- * an XColor.  The ttkBackground and semantic types are dynamic, meaning
- * that they change when dark mode is enabled on OSX 10.13 and later.
- */
+void initColorTable()
+{
+    NSAutoreleasePool *pool = [NSAutoreleasePool new];
+    Tcl_InitHashTable(&systemColors, TCL_STRING_KEYS);
+    SystemColorDatum *entry, *oldEntry;
+    Tcl_HashSearch search;
+    Tcl_HashEntry *hPtr;
+    int newPtr, index = 0;
+    NSColorList *systemColorList = [NSColorList colorListNamed:@"System"];
+    NSString *key;
 
-enum colorType {
-    clearColor,    /* There should be only one of these. */
-    rgbColor,      /* There should be only one of these. */
-    appearance,    /* There should be only one of these. */
-    HIBrush,       /* The value is a HITheme brush color table index. */
-    HIText,        /* The value is a HITheme text color table index. */
-    HIBackground,  /* The value is a HITheme background color table index. */
-    ttkBackground, /* The value can be used as a parameter.*/
-    semantic, /* The value can be used as a parameter.*/
-};
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
+    if (@available(macOS 10.14, *)) {
+	darkAqua = [NSAppearance appearanceNamed:NSAppearanceNameDarkAqua];
+        lightAqua = [NSAppearance appearanceNamed:NSAppearanceNameAqua];
+    }
+#endif
 
-/*
+    /*
+     * Build a hash table for looking up a color by its name.
+     * First add all of the static entries from tkMacOSXColor.h
+     */
 
- */
+    for (entry = systemColorData; entry->name != NULL; entry++) {
+	hPtr = Tcl_CreateHashEntry(&systemColors, entry->name, &newPtr);
+	if (entry->type == semantic) {
+	    NSString *colorName = [[NSString alloc]
+				   initWithCString:entry->macName
+					  encoding:NSUTF8StringEncoding];
+	    SEL colorSelector = NSSelectorFromString(colorName);
+	    if (![NSColor respondsToSelector:colorSelector]) {
+		if ([colorName isEqualToString:@"controlAccentColor"]) {
+		    useFakeAccentColor = YES;
+		} else {
+		    /* Uncomment to print all unsupported colors:              */
+		    /* printf("Unsupported color %s\n", colorName.UTF8String); */
+		    continue;
+		}
+	    }
+	    entry->selector = [colorName retain];
+	}
+	if (newPtr == 0) {
+	    oldEntry = (SystemColorDatum *) Tcl_GetHashValue(hPtr);
+	    entry->index = oldEntry->index;
+	    [oldEntry->selector release];
+	} else {
+	    entry->index = index++;
+	}
+	Tcl_SetHashValue(hPtr, entry);
+    }
+
+    /*
+     * Add all of the colors in the System ColorList.
+     */
 
-struct SystemColorMapEntry {
-    const char *name;
-    enum colorType type;
-    long value;
-};  /* unsigned char pixelCode; */
+    for (key in [systemColorList allKeys]) {
+	int length = [key lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
+	char *name;
+	entry = ckalloc(sizeof(SystemColorDatum));
+	bzero(entry, sizeof(SystemColorDatum));
+	name = ckalloc(length + 1);
+	strcpy(name, key.UTF8String);
+	name[0] = toupper(name[0]);
+        if (!strcmp(name, "WindowBackgroundColor")) {
+
+	    /*
+	     * Avoid black windows on old systems.
+	     */
+
+	    continue;
+	}
+	entry->type=semantic;
+	entry->name = name;
+	entry->selector = [key retain];
+	hPtr = Tcl_CreateHashEntry(&systemColors, entry->name, &newPtr);
+	if (newPtr == 0) {
+	    oldEntry = (SystemColorDatum *) Tcl_GetHashValue(hPtr);
+	    entry->index = oldEntry->index;
+	    [oldEntry->selector release];
+	} else {
+	    entry->index = index++;
+	}
+	Tcl_SetHashValue(hPtr, entry);
+    }
 
-/*
- * Array of system color definitions: the array index is required to equal the
- * color's (pixelCode - MIN_PIXELCODE), i.e. the array order needs to be kept
- * in sync with the public pixel code values in tkMacOSXPort.h !
- */
+    /*
+     * Build an array for looking up a color by its index.
+     */
 
-#define MIN_PIXELCODE  30
-static const struct SystemColorMapEntry systemColorMap[] = {
-    { "Transparent",			    clearColor,   0 },						    /*  30: TRANSPARENT_PIXEL */
-    { "Highlight",			    HIBrush,      kThemeBrushPrimaryHighlightColor },		    /*  31 */
-    { "HighlightSecondary",		    HIBrush,      kThemeBrushSecondaryHighlightColor },		    /*  32 */
-    { "HighlightText",			    HIBrush,      kThemeBrushBlack },				    /*  33 */
-    { "HighlightAlternate",		    HIBrush,      kThemeBrushAlternatePrimaryHighlightColor },	    /*  34 */
-    { "ButtonText",			    HIText,       kThemeTextColorPushButtonActive },	       	    /*  35 */
-    { "PrimaryHighlightColor",		    HIBrush,      kThemeBrushPrimaryHighlightColor },		    /*  36 */
-    { "ButtonFace",			    HIBrush,      kThemeBrushButtonFaceActive },	       	    /*  37 */
-    { "SecondaryHighlightColor",	    HIBrush,      kThemeBrushSecondaryHighlightColor },		    /*  38 */
-    { "ButtonFrame",			    HIBrush,      kThemeBrushButtonFrameActive },	       	    /*  39 */
-    { "AlternatePrimaryHighlightColor",	    HIBrush,      kThemeBrushAlternatePrimaryHighlightColor },	    /*  40 */
-    { "WindowBody",			    HIBrush,      kThemeBrushDocumentWindowBackground },       	    /*  41 */
-    { "SheetBackground",		    HIBrush,      kThemeBrushSheetBackground },			    /*  42 */
-    { "MenuActive",			    HIBrush,      kThemeBrushMenuBackgroundSelected },		    /*  43 */
-    { "Black",				    HIBrush,      kThemeBrushBlack },				    /*  44 */
-    { "MenuActiveText",			    HIText,       kThemeTextColorMenuItemSelected },	       	    /*  45 */
-    { "White",				    HIBrush,      kThemeBrushWhite },				    /*  46 */
-    { "Menu",				    HIBrush,      kThemeBrushMenuBackground },			    /*  47 */
-    { "DialogBackgroundActive",		    HIBrush,      kThemeBrushDialogBackgroundActive },		    /*  48 */
-    { "MenuDisabled",			    HIText,       kThemeTextColorMenuItemDisabled },	       	    /*  49 */
-    { "DialogBackgroundInactive",	    HIBrush,      kThemeBrushDialogBackgroundInactive },       	    /*  50 */
-    { "MenuText",			    HIText,       kThemeTextColorMenuItemActive },	       	    /*  51 */
-    { "AppearanceColor",		    appearance,   0 },						    /*  52: APPEARANCE_PIXEL */
-    { "AlertBackgroundActive",		    HIBrush,      kThemeBrushAlertBackgroundActive },		    /*  53 */
-    { "AlertBackgroundInactive",	    HIBrush,      kThemeBrushAlertBackgroundInactive },		    /*  54 */
-    { "ModelessDialogBackgroundActive",	    HIBrush,      kThemeBrushModelessDialogBackgroundActive },	    /*  55 */
-    { "ModelessDialogBackgroundInactive",   HIBrush,      kThemeBrushModelessDialogBackgroundInactive },    /*  56 */
-    { "UtilityWindowBackgroundActive",	    HIBrush,      kThemeBrushUtilityWindowBackgroundActive },	    /*  57 */
-    { "UtilityWindowBackgroundInactive",    HIBrush,      kThemeBrushUtilityWindowBackgroundInactive },	    /*  58 */
-    { "ListViewSortColumnBackground",	    HIBrush,      kThemeBrushListViewSortColumnBackground },	    /*  59 */
-    { "ListViewBackground",		    HIBrush,      kThemeBrushListViewBackground },	       	    /*  60 */
-    { "IconLabelBackground",		    HIBrush,      kThemeBrushIconLabelBackground },    		    /*  61 */
-    { "ListViewSeparator",		    HIBrush,      kThemeBrushListViewSeparator },      		    /*  62 */
-    { "ChasingArrows",			    HIBrush,      kThemeBrushChasingArrows },			    /*  63 */
-    { "DragHilite",			    HIBrush,      kThemeBrushDragHilite },	       		    /*  64 */
-    { "DocumentWindowBackground",	    HIBrush,      kThemeBrushDocumentWindowBackground },       	    /*  65 */
-    { "FinderWindowBackground",		    HIBrush,      kThemeBrushFinderWindowBackground },		    /*  66 */
-    { "ScrollBarDelimiterActive",	    HIBrush,      kThemeBrushScrollBarDelimiterActive },       	    /*  67 */
-    { "ScrollBarDelimiterInactive",	    HIBrush,      kThemeBrushScrollBarDelimiterInactive },     	    /*  68 */
-    { "FocusHighlight",			    HIBrush,      kThemeBrushFocusHighlight },			    /*  69 */
-    { "PopupArrowActive",		    HIBrush,      kThemeBrushPopupArrowActive },	       	    /*  70 */
-    { "PopupArrowPressed",		    HIBrush,      kThemeBrushPopupArrowPressed },	       	    /*  71 */
-    { "PopupArrowInactive",		    HIBrush,      kThemeBrushPopupArrowInactive },	       	    /*  72 */
-    { "AppleGuideCoachmark",		    HIBrush,      kThemeBrushAppleGuideCoachmark },	       	    /*  73 */
-    { "IconLabelBackgroundSelected",	    HIBrush,      kThemeBrushIconLabelBackgroundSelected },    	    /*  74 */
-    { "StaticAreaFill",			    HIBrush,      kThemeBrushStaticAreaFill },			    /*  75 */
-    { "ActiveAreaFill",			    HIBrush,      kThemeBrushActiveAreaFill },			    /*  76 */
-    { "ButtonFrameActive",		    HIBrush,      kThemeBrushButtonFrameActive },		    /*  77 */
-    { "ButtonFrameInactive",		    HIBrush,      kThemeBrushButtonFrameInactive },	       	    /*  78 */
-    { "ButtonFaceActive",		    HIBrush,      kThemeBrushButtonFaceActive },       		    /*  79 */
-    { "ButtonFaceInactive",		    HIBrush,      kThemeBrushButtonFaceInactive },	       	    /*  80 */
-    { "ButtonFacePressed",		    HIBrush,      kThemeBrushButtonFacePressed },	       	    /*  81 */
-    { "ButtonActiveDarkShadow",		    HIBrush,      kThemeBrushButtonActiveDarkShadow },		    /*  82 */
-    { "ButtonActiveDarkHighlight",	    HIBrush,      kThemeBrushButtonActiveDarkHighlight },	    /*  83 */
-    { "ButtonActiveLightShadow",	    HIBrush,      kThemeBrushButtonActiveLightShadow },		    /*  84 */
-    { "ButtonActiveLightHighlight",	    HIBrush,      kThemeBrushButtonActiveLightHighlight },	    /*  85 */
-    { "ButtonInactiveDarkShadow",	    HIBrush,      kThemeBrushButtonInactiveDarkShadow },	    /*  86 */
-    { "ButtonInactiveDarkHighlight",	    HIBrush,      kThemeBrushButtonInactiveDarkHighlight },	    /*  87 */
-    { "ButtonInactiveLightShadow",	    HIBrush,      kThemeBrushButtonInactiveLightShadow },	    /*  88 */
-    { "ButtonInactiveLightHighlight",	    HIBrush,      kThemeBrushButtonInactiveLightHighlight },	    /*  89 */
-    { "ButtonPressedDarkShadow",	    HIBrush,      kThemeBrushButtonPressedDarkShadow },		    /*  90 */
-    { "ButtonPressedDarkHighlight",	    HIBrush,      kThemeBrushButtonPressedDarkHighlight },	    /*  91 */
-    { "ButtonPressedLightShadow",	    HIBrush,      kThemeBrushButtonPressedLightShadow },	    /*  92 */
-    { "ButtonPressedLightHighlight",	    HIBrush,      kThemeBrushButtonPressedLightHighlight },	    /*  93 */
-    { "BevelActiveLight",		    HIBrush,      kThemeBrushBevelActiveLight },		    /*  94 */
-    { "BevelActiveDark",		    HIBrush,      kThemeBrushBevelActiveDark },			    /*  95 */
-    { "BevelInactiveLight",		    HIBrush,      kThemeBrushBevelInactiveLight },		    /*  96 */
-    { "BevelInactiveDark",		    HIBrush,      kThemeBrushBevelInactiveDark },		    /*  97 */
-    { "NotificationWindowBackground",	    HIBrush,      kThemeBrushNotificationWindowBackground },	    /*  98 */
-    { "MovableModalBackground",		    HIBrush,      kThemeBrushMovableModalBackground },		    /*  99 */
-    { "SheetBackgroundOpaque",		    HIBrush,      kThemeBrushSheetBackgroundOpaque },		    /* 100 */
-    { "DrawerBackground",		    HIBrush,      kThemeBrushDrawerBackground },		    /* 101 */
-    { "ToolbarBackground",		    HIBrush,      kThemeBrushToolbarBackground },		    /* 102 */
-    { "SheetBackgroundTransparent",	    HIBrush,      kThemeBrushSheetBackgroundTransparent },	    /* 103 */
-    { "MenuBackground",			    HIBrush,      kThemeBrushMenuBackground },			    /* 104 */
-    { "Pixel",				    rgbColor,     0 },						    /* 105: PIXEL_MAGIC */
-    { "MenuBackgroundSelected",		    HIBrush,      kThemeBrushMenuBackgroundSelected },		    /* 106 */
-    { "ListViewOddRowBackground",	    HIBrush,      kThemeBrushListViewOddRowBackground },	    /* 107 */
-    { "ListViewEvenRowBackground",	    HIBrush,      kThemeBrushListViewEvenRowBackground },	    /* 108 */
-    { "ListViewColumnDivider",		    HIBrush,      kThemeBrushListViewColumnDivider },		    /* 109 */
-    { "BlackText",			    HIText,       kThemeTextColorBlack },			    /* 110 */
-    { "DialogActiveText",		    HIText,       kThemeTextColorDialogActive },		    /* 111 */
-    { "DialogInactiveText",		    HIText,       kThemeTextColorDialogInactive },		    /* 112 */
-    { "AlertActiveText",		    HIText,       kThemeTextColorAlertActive },			    /* 113 */
-    { "AlertInactiveText",		    HIText,       kThemeTextColorAlertInactive },		    /* 114 */
-    { "ModelessDialogActiveText",	    HIText,       kThemeTextColorModelessDialogActive },	    /* 115 */
-    { "ModelessDialogInactiveText",	    HIText,       kThemeTextColorModelessDialogInactive },	    /* 116 */
-    { "WindowHeaderActiveText",		    HIText,       kThemeTextColorWindowHeaderActive },		    /* 117 */
-    { "WindowHeaderInactiveText",	    HIText,       kThemeTextColorWindowHeaderInactive },	    /* 118 */
-    { "PlacardActiveText",		    HIText,       kThemeTextColorPlacardActive },		    /* 119 */
-    { "PlacardInactiveText",		    HIText,       kThemeTextColorPlacardInactive },		    /* 120 */
-    { "PlacardPressedText",		    HIText,       kThemeTextColorPlacardPressed },		    /* 121 */
-    { "PushButtonActiveText",		    HIText,       kThemeTextColorPushButtonActive },		    /* 122 */
-    { "PushButtonInactiveText",		    HIText,       kThemeTextColorPushButtonInactive },		    /* 123 */
-    { "PushButtonPressedText",		    HIText,       kThemeTextColorPushButtonPressed },		    /* 124 */
-    { "BevelButtonActiveText",		    HIText,       kThemeTextColorBevelButtonActive },		    /* 125 */
-    { "BevelButtonInactiveText",	    HIText,       kThemeTextColorBevelButtonInactive },		    /* 126 */
-    { "BevelButtonPressedText",		    HIText,       kThemeTextColorBevelButtonPressed },		    /* 127 */
-    { "PopupButtonActiveText",		    HIText,       kThemeTextColorPopupButtonActive },		    /* 128 */
-    { "PopupButtonInactiveText",	    HIText,       kThemeTextColorPopupButtonInactive },		    /* 129 */
-    { "PopupButtonPressedText",		    HIText,       kThemeTextColorPopupButtonPressed },		    /* 130 */
-    { "IconLabelText",			    HIText,       kThemeTextColorIconLabel },			    /* 131 */
-    { "ListViewText",			    HIText,       kThemeTextColorListView },			    /* 132 */
-    { "DocumentWindowTitleActiveText",	    HIText,       kThemeTextColorDocumentWindowTitleActive },	    /* 133 */
-    { "DocumentWindowTitleInactiveText",    HIText,       kThemeTextColorDocumentWindowTitleInactive },	    /* 134 */
-    { "MovableModalWindowTitleActiveText",  HIText,       kThemeTextColorMovableModalWindowTitleActive },   /* 135 */
-    { "MovableModalWindowTitleInactiveText",HIText,       kThemeTextColorMovableModalWindowTitleInactive }, /* 136 */
-    { "UtilityWindowTitleActiveText",	    HIText,       kThemeTextColorUtilityWindowTitleActive },	    /* 137 */
-    { "UtilityWindowTitleInactiveText",	    HIText,       kThemeTextColorUtilityWindowTitleInactive },	    /* 138 */
-    { "PopupWindowTitleActiveText",	    HIText,       kThemeTextColorPopupWindowTitleActive },	    /* 139 */
-    { "PopupWindowTitleInactiveText",	    HIText,       kThemeTextColorPopupWindowTitleInactive },	    /* 140 */
-    { "RootMenuActiveText",		    HIText,       kThemeTextColorRootMenuActive },		    /* 141 */
-    { "RootMenuSelectedText",		    HIText,       kThemeTextColorRootMenuSelected },		    /* 142 */
-    { "RootMenuDisabledText",		    HIText,       kThemeTextColorRootMenuDisabled },		    /* 143 */
-    { "MenuItemActiveText",		    HIText,       kThemeTextColorMenuItemActive },		    /* 144 */
-    { "MenuItemSelectedText",		    HIText,       kThemeTextColorMenuItemSelected },		    /* 145 */
-    { "MenuItemDisabledText",		    HIText,       kThemeTextColorMenuItemDisabled },		    /* 146 */
-    { "PopupLabelActiveText",		    HIText,       kThemeTextColorPopupLabelActive },		    /* 147 */
-    { "PopupLabelInactiveText",		    HIText,       kThemeTextColorPopupLabelInactive },		    /* 148 */
-    { "TabFrontActiveText",		    HIText,       kThemeTextColorTabFrontActive },		    /* 149 */
-    { "TabNonFrontActiveText",		    HIText,       kThemeTextColorTabNonFrontActive },		    /* 150 */
-    { "TabNonFrontPressedText",		    HIText,       kThemeTextColorTabNonFrontPressed },		    /* 151 */
-    { "TabFrontInactiveText",		    HIText,       kThemeTextColorTabFrontInactive },		    /* 152 */
-    { "TabNonFrontInactiveText",	    HIText,       kThemeTextColorTabNonFrontInactive },		    /* 153 */
-    { "IconLabelSelectedText",		    HIText,       kThemeTextColorIconLabelSelected },		    /* 154 */
-    { "BevelButtonStickyActiveText",	    HIText,       kThemeTextColorBevelButtonStickyActive },	    /* 155 */
-    { "BevelButtonStickyInactiveText",	    HIText,       kThemeTextColorBevelButtonStickyInactive },	    /* 156 */
-    { "NotificationText",		    HIText,       kThemeTextColorNotification },		    /* 157 */
-    { "SystemDetailText",		    HIText,       kThemeTextColorSystemDetail },		    /* 158 */
-    { "WhiteText",			    HIText,       kThemeTextColorWhite },			    /* 159 */
-    { "TabPaneBackground",		    HIBackground, kThemeBackgroundTabPane },			    /* 160 */
-    { "PlacardBackground",		    HIBackground, kThemeBackgroundPlacard },			    /* 161 */
-    { "WindowHeaderBackground",		    HIBackground, kThemeBackgroundWindowHeader },		    /* 162 */
-    { "ListViewWindowHeaderBackground",	    HIBackground, kThemeBackgroundListViewWindowHeader },	    /* 163 */
-    { "SecondaryGroupBoxBackground",	    HIBackground, kThemeBackgroundSecondaryGroupBox },		    /* 164 */
-    { "MetalBackground",		    HIBackground, kThemeBackgroundMetal },			    /* 165 */
+    numSystemColors = index;
+    systemColorIndex = ckalloc(numSystemColors * sizeof(SystemColorDatum*));
+    for (hPtr = Tcl_FirstHashEntry(&systemColors, &search); hPtr != NULL;
+	 hPtr = Tcl_NextHashEntry(&search)) {
+	entry = (SystemColorDatum *) Tcl_GetHashValue(hPtr);
+	if (entry == NULL) {
+	    Tcl_Panic("Unsupported semantic color with no supported backup!");
+	}
+	systemColorIndex[entry->index] = entry;
+    }
 
     /*
-     * Colors based on "semantic" NSColors.
+     * Remember the indexes of some special entries.
      */
 
-    { "WindowBackgroundColor",		    ttkBackground, 0 },	    					    /* 166 */
-    { "WindowBackgroundColor1",		    ttkBackground, 1 },						    /* 167 */
-    { "WindowBackgroundColor2",		    ttkBackground, 2 },						    /* 168 */
-    { "WindowBackgroundColor3",		    ttkBackground, 3 },						    /* 169 */
-    { "WindowBackgroundColor4",		    ttkBackground, 4 },						    /* 170 */
-    { "WindowBackgroundColor5",		    ttkBackground, 5 },						    /* 171 */
-    { "WindowBackgroundColor6",		    ttkBackground, 6 },						    /* 172 */
-    { "WindowBackgroundColor7",		    ttkBackground, 7 },						    /* 173 */
-    { "TextColor",			    semantic, 0 },						    /* 174 */
-    { "SelectedTextColor",		    semantic, 1 },						    /* 175 */
-    { "LabelColor",			    semantic, 2 },						    /* 176 */
-    { "ControlTextColor",      		    semantic, 3 },						    /* 177 */
-    { "DisabledControlTextColor",	    semantic, 4 },						    /* 178 */
-    { "SelectedTabTextColor",		    semantic, 5 },						    /* 179 */
-    { "TextBackgroundColor",		    semantic, 6 },						    /* 180 */
-    { "SelectedTextBackgroundColor",	    semantic, 7 },						    /* 181 */
-    { "ControlAccentColor",		    semantic, 8 },						    /* 182 */
-    /* Apple's SecondaryLabelColor is the same as their LabelColor so we roll our own. */
-    { "SecondaryLabelColor",		    ttkBackground, 14 },					    /* 183 */
-    { "LinkColor",			    semantic, 9 },						    /* 184 */
-    { "PlaceholderTextColor",		    semantic, 10 },						    /* 185 */
-    { NULL,				    0, 0 }
-};
-#define FIRST_SEMANTIC_COLOR 166
-#define MAX_PIXELCODE 185
+    hPtr = Tcl_FindHashEntry(&systemColors, "Pixel");
+    entry = (SystemColorDatum *) Tcl_GetHashValue(hPtr);
+    rgbColorIndex = entry->index;
+    hPtr = Tcl_FindHashEntry(&systemColors, "ControlAccentColor");
+    entry = (SystemColorDatum *) Tcl_GetHashValue(hPtr);
+    controlAccentIndex = entry->index;
+    [pool drain];
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * TkMacOSXRGBPixel --
+ *
+ *	Return an unsigned long value suitable for use in the pixel
+ *	field of an XColor with the specified red, green and blue
+ *	intensities.  The inputs are cast as unsigned longs but are
+ *      expected to have values representable by an unsigned char.
+ *
+ *      This is called in the TkpGetPixel macro, used in xcolor.c,
+ *      and in ImageGetPixel.
+ *
+ * Results:
+ *	An unsigned long that can be used as the pixel field of an XColor.
+ *
+ * Side effects:
+ *	None.
+ *----------------------------------------------------------------------
+ */
+MODULE_SCOPE
+unsigned long
+TkMacOSXRGBPixel(
+    unsigned long red,
+    unsigned long green,
+    unsigned long blue)
+{
+    MacPixel p;
+    p.pixel.colortype = rgbColor;
+    p.pixel.value = ((red & 0xff) << 16)  |
+	            ((green & 0xff) << 8) |
+	            (blue & 0xff);
+    return p.ulong;
+}
 
 /*
  *----------------------------------------------------------------------
  *
- * GetEntryFromPixelCode --
+ * TkMacOSXClearPixel --
  *
- *	Extract a SystemColorMapEntry from the table.
+ *	Return the unsigned long value that appears in the pixel
+ *	field of the XColor for systemTransparentColor.
+ *
+ *      This is used in tkMacOSXImage.c.
  *
  * Results:
- *	Returns false if the code is out of bounds.
+ *	The unsigned long that appears in the pixel field of the XColor
+ *      for systemTransparentPixel.
  *
  * Side effects:
  *	None.
+ *----------------------------------------------------------------------
+ */
+MODULE_SCOPE
+unsigned long TkMacOSXClearPixel(
+    void)
+{
+    MacPixel p;
+    p.pixel.value = 0;
+    p.pixel.colortype = clearColor;
+    return p.ulong;
+}
+
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * GetEntryFromPixel --
+ *
+ *	Look up a SystemColorDatum which describes the XColor with
+ *      the specified value as its pixel field.
+ *
+ * Results:
+ *	A pointer to a SystemColorDatum, or NULL if the pixel value is
+ *	invalid.
+ *
+ * Side effects:
+ *	None
  *
  *----------------------------------------------------------------------
  */
 
-static bool
-GetEntryFromPixelCode(
-    unsigned char code,
-    struct SystemColorMapEntry *entry)
+SystemColorDatum*
+GetEntryFromPixel(
+    unsigned long pixel)
 {
-    if (code >= MIN_PIXELCODE && code <= MAX_PIXELCODE) {
-	*entry = systemColorMap[code - MIN_PIXELCODE];
-	return true;
+    MacPixel p;
+    int index = rgbColorIndex;
+
+    p.ulong = pixel;
+    if (p.pixel.colortype != rgbColor) {
+	index = p.pixel.value;
+    }
+    if (index < numSystemColors) {
+	return systemColorIndex[index];
     } else {
-	return false;
+	return NULL;
     }
 }
 
+
 /*
  *----------------------------------------------------------------------
  *
- * SetCGColorComponents --
+ * GetRGBA --
  *
- *	Set the components of a CGColorRef from an XColor pixel value and a
- *      system color map entry.  The pixel value is only used in the case where
- *      the color is of type rgbColor.  In that case the normalized XColor RGB
- *      values are copied into the CGColorRef.
+ *	Given a SystemColorDatum and a pointer to an array of 4 CGFloats, store
+ *      the associated RGBA color values in the array.  In the case of the
+ *      RGBColor datum, the unsigned long pixel value containing the RGB values
+ *      must also be provided as the pixel parameter.  Otherwise the pixel
+ *      parameter is ignored.
  *
  * Results:
- *	OSStatus
+ *	None
  *
  * Side effects:
- *	None.
+ *	The array rgba is filled in.
  *
  *----------------------------------------------------------------------
  */
 
-static NSColorSpace* sRGB = NULL;
-static CGFloat windowBackground[4] =
-    {236.0 / 255, 236.0 / 255, 236.0 / 255, 1.0};
-
-static OSStatus
-SetCGColorComponents(
-    struct SystemColorMapEntry entry,
+static void
+GetRGBA(
+    SystemColorDatum *entry,
     unsigned long pixel,
-    CGColorRef *c)
+    CGFloat *rgba)
 {
-    OSStatus err = noErr;
     NSColor *bgColor, *color = nil;
-    CGFloat rgba[4] = {0, 0, 0, 1};
 
     if (!sRGB) {
 	sRGB = [NSColorSpace sRGBColorSpace];
     }
-
-    /*
-     * This function is called before our autorelease pool is set up,
-     * so it needs its own pool.
-     */
-
-    NSAutoreleasePool *pool = [NSAutoreleasePool new];
-
-    switch (entry.type) {
-    case HIBrush:
-	err = ChkErr(HIThemeBrushCreateCGColor, entry.value, c);
-	return err;
+    switch (entry->type) {
     case rgbColor:
 	rgba[0] = ((pixel >> 16) & 0xff) / 255.0;
 	rgba[1] = ((pixel >>  8) & 0xff) / 255.0;
@@ -310,7 +292,7 @@ SetCGColorComponents(
 	 */
 
 	if ([NSApp macOSVersion] < 101400) {
-	    for (int i=0; i<3; i++) {
+	    for (int i = 0; i < 3; i++) {
 		rgba[i] = windowBackground[i];
 	    }
 	} else {
@@ -319,113 +301,75 @@ SetCGColorComponents(
 	}
 	if (rgba[0] + rgba[1] + rgba[2] < 1.5) {
 	    for (int i=0; i<3; i++) {
-		rgba[i] += entry.value*8.0 / 255.0;
+		rgba[i] += entry->value*8.0 / 255.0;
 	    }
 	} else {
 	    for (int i=0; i<3; i++) {
-		rgba[i] -= entry.value*8.0 / 255.0;
+		rgba[i] -= entry->value*8.0 / 255.0;
 	    }
 	}
 	break;
     case semantic:
-	switch (entry.value) {
-	case 0:
-	    color = [[NSColor textColor] colorUsingColorSpace:sRGB];
-	    break;
-	case 1:
-	    color = [[NSColor selectedTextColor] colorUsingColorSpace:sRGB];
-	    break;
-	case 2:
-	    if ([NSApp macOSVersion] > 100900) {
-#if MAC_OS_X_VERSION_MAX_ALLOWED > 1090
-		color = [[NSColor labelColor] colorUsingColorSpace:sRGB];
-#endif
-	    } else {
-		color = [[NSColor textColor] colorUsingColorSpace:sRGB];
-	    }
-	    break;
-	case 3:
-	    color = [[NSColor controlTextColor] colorUsingColorSpace:sRGB];
-	    break;
-	case 4:
-	    color = [[NSColor disabledControlTextColor]
-			colorUsingColorSpace:sRGB];
-	    break;
-	case 5:
-	    if ([NSApp macOSVersion] > 100600) {
-		color = [[NSColor whiteColor] colorUsingColorSpace:sRGB];
-	    } else {
-		color = [[NSColor blackColor] colorUsingColorSpace:sRGB];
-	    }
-	    break;
-	case 6:
-	    color = [[NSColor textBackgroundColor] colorUsingColorSpace:sRGB];
-	    break;
-	case 7:
-	    color = [[NSColor selectedTextBackgroundColor]
-			colorUsingColorSpace:sRGB];
-	    break;
-	case 8:
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
-	    if (@available(macOS 14, *)) {
-		color = [[NSColor controlAccentColor] colorUsingColorSpace:sRGB];
-#else
-	    if(false) {
-#endif
-	    } else {
-		color = [[NSColor
-			    colorForControlTint:[NSColor currentControlTint]]
-			        colorUsingColorSpace: sRGB];
-	    }
-	    break;
-	case 9:
-	    if ([NSApp macOSVersion] >= 101000) {
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
-		color = [[NSColor linkColor] colorUsingColorSpace:sRGB];
-#endif
-	    } else {
-		color = [[NSColor blueColor] colorUsingColorSpace:sRGB];
-	    }
-	    break;
-	case 10:
-	    if ([NSApp macOSVersion] >= 101000) {
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
-		color = [[NSColor placeholderTextColor] colorUsingColorSpace:sRGB];
-#endif
-	    } else {
-		color = [[NSColor grayColor] colorUsingColorSpace:sRGB];
-	    }
-	    break;
-	default:
-	    if ([NSApp macOSVersion] >= 101000) {
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
-		color = [[NSColor labelColor] colorUsingColorSpace:sRGB];
+	if (entry->index == controlAccentIndex && useFakeAccentColor) {
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 101500
+	    color = [[NSColor colorForControlTint: [NSColor currentControlTint]]
+			      colorUsingColorSpace:sRGB];
 #endif
-	    } else {
-		color = [[NSColor textColor] colorUsingColorSpace:sRGB];
-	    }
-	    break;
+	} else {
+	    color = [[NSColor valueForKey:entry->selector] colorUsingColorSpace:sRGB];
 	}
 	[color getComponents: rgba];
 	break;
     case clearColor:
-	rgba[3]	= 0.0;
+	rgba[3] = 0;
+    default:
 	break;
+    }
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * SetCGColorComponents --
+ *
+ *	Set the components of a CGColorRef from an XColor pixel value and a
+ *      SystemColorDatum.  The pixel value is only used in the case where
+ *      the color is of type rgbColor.  In that case the normalized XColor RGB
+ *      values are copied into the CGColorRef.  Otherwise the components are
+ *      computed from the SystemColorDatum.
+ *
+ * Results:
+ *	True if the function succeeds, false otherwise.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static Bool
+SetCGColorComponents(
+    SystemColorDatum *entry,
+    unsigned long pixel,
+    CGColorRef *c)
+{
+    CGFloat rgba[4] = {0, 0, 0, 1};
 
     /*
-     * There are no HITheme functions which convert Text or background colors
-     * to CGColors.  (GetThemeTextColor has been removed, and it was never
-     * possible with backgrounds.)  If we get one of these we return black.
+     * This function is called before our autorelease pool is set up,
+     * so it needs its own pool.
      */
 
-    case HIText:
-    case HIBackground:
-    default:
-	break;
+    NSAutoreleasePool *pool = [NSAutoreleasePool new];
+
+    if (entry->type == HIBrush) {
+     	OSStatus err = ChkErr(HIThemeBrushCreateCGColor, entry->value, c);
+     	return err == noErr;
     }
+    GetRGBA(entry, pixel, rgba);
     *c = CGColorCreate(sRGB.CGColorSpace, rgba);
     [pool drain];
-    return err;
+    return true;
 }
 
 /*
@@ -447,27 +391,24 @@ SetCGColorComponents(
 MODULE_SCOPE Bool
 TkMacOSXInDarkMode(Tk_Window tkwin)
 {
-    int result = false;
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
-    static NSAppearanceName darkAqua = @"NSAppearanceNameDarkAqua";
-
-    if ([NSApp macOSVersion] >= 101400) {
+    if (@available(macOS 10.14, *)) {
         TkWindow *winPtr = (TkWindow*) tkwin;
+	NSAppearanceName name;
 	NSView *view = nil;
 	if (winPtr && winPtr->privatePtr) {
 	    view = TkMacOSXDrawableView(winPtr->privatePtr);
 	}
 	if (view) {
-	    result = [view.effectiveAppearance.name isEqualToString:darkAqua];
+	    name = [[view effectiveAppearance] name];
 	} else {
-	    result = [[NSAppearance currentAppearance].name
-			 isEqualToString:darkAqua];
+	    name = [[NSAppearance currentAppearance] name];
 	}
+	return (name == NSAppearanceNameDarkAqua);
     }
 #endif
-
-    return result;
+    return false;
 }
 
 /*
@@ -475,14 +416,13 @@ TkMacOSXInDarkMode(Tk_Window tkwin)
  *
  * TkSetMacColor --
  *
- *	Sets the components of a CGColorRef from an XColor pixel value.
- *      The high order byte of the pixel value is used as an index into
- *      the system color table, and then SetCGColorComponents is called
- *      with the table entry and the pixel value.
+ *	Sets the components of a CGColorRef from an XColor pixel value.  The
+ *      pixel value is used to look up the color in the system color table, and
+ *      then SetCGColorComponents is called with the table entry and the pixel
+ *      value.
  *
  * Results:
- *      Returns false if the high order byte is not a valid index, true
- *	otherwise.
+ *      Returns false if the color is not found, true otherwise.
  *
  * Side effects:
  *	The variable macColor is set to a new CGColorRef, the caller is
@@ -497,13 +437,13 @@ TkSetMacColor(
     void *macColor)			/* CGColorRef to modify. */
 {
     CGColorRef *color = (CGColorRef*)macColor;
-    OSStatus err = -1;
-    struct SystemColorMapEntry entry;
+    SystemColorDatum *entry = GetEntryFromPixel(pixel);
 
-    if (GetEntryFromPixelCode((pixel >> 24) & 0xff, &entry)) {
-	err = ChkErr(SetCGColorComponents, entry, pixel, color);
+    if (entry) {
+	return SetCGColorComponents(entry, pixel, color);
+    } else {
+	return false;
     }
-    return (err == noErr);
 }
 
 /*
@@ -624,9 +564,10 @@ TkMacOSXCreateCGColor(
  * TkMacOSXGetNSColor --
  *
  *	Creates an autoreleased NSColor from a X style pixel value.
+ *      The return value is nil if the pixel value is invalid.
  *
  * Results:
- *	Returns nil if not a real pixel, NSColor* otherwise.
+ *	A possibly nil pointer to an NSColor.
  *
  * Side effects:
  *	None
@@ -660,10 +601,9 @@ TkMacOSXGetNSColor(
  *
  * TkMacOSXSetColorInContext --
  *
- *	Sets fill and stroke color in the given CG context from an X
- *	pixel value, or if the pixel code indicates a system color,
- *	sets the corresponding brush, textColor or background via
- *	HITheme APIs if available or Appearance mgr APIs.
+ *	Sets the fill and stroke colors in the given CGContext to the CGColor
+ *	which corresponds to the XColor having the specified value for its pixel
+ *	field.
  *
  * Results:
  *	None.
@@ -682,37 +622,20 @@ TkMacOSXSetColorInContext(
 {
     OSStatus err = noErr;
     CGColorRef cgColor = nil;
-    struct SystemColorMapEntry entry;
-    CGRect rect;
-    int code = (pixel >> 24) & 0xff;
-    HIThemeBackgroundDrawInfo info = {0, kThemeStateActive, 0};;
+    SystemColorDatum *entry = GetEntryFromPixel(pixel);
 
-    if (code < FIRST_SEMANTIC_COLOR) {
-	cgColor = CopyCachedColor(gc, pixel);
-    }
-    if (!cgColor && GetEntryFromPixelCode(code, &entry)) {
-	switch (entry.type) {
+    if (entry) {
+	switch (entry->type) {
 	case HIBrush:
-	    err = ChkErr(HIThemeSetFill, entry.value, NULL, context,
+	    err = ChkErr(HIThemeSetFill, entry->value, NULL, context,
 		    kHIThemeOrientationNormal);
 	    if (err == noErr) {
-		err = ChkErr(HIThemeSetStroke, entry.value, NULL, context,
+		err = ChkErr(HIThemeSetStroke, entry->value, NULL, context,
 			kHIThemeOrientationNormal);
 	    }
 	    break;
-	case HIText:
-	    err = ChkErr(HIThemeSetTextFill, entry.value, NULL, context,
-		    kHIThemeOrientationNormal);
-	    break;
-	case HIBackground:
-	    info.kind = entry.value;
-	    rect = CGContextGetClipBoundingBox(context);
-	    err = ChkErr(HIThemeApplyBackground, &rect, &info,
-		    context, kHIThemeOrientationNormal);
-	    break;
 	default:
-	    err = ChkErr(SetCGColorComponents, entry, pixel, &cgColor);
-	    if (err == noErr) {
+	    if (SetCGColorComponents(entry, pixel, &cgColor)){
 		SetCachedColor(gc, pixel, cgColor);
 	    }
 	    break;
@@ -733,15 +656,20 @@ TkMacOSXSetColorInContext(
  *
  * TkpGetColor --
  *
- *	Allocate a new TkColor for the color with the given name.
+ *	Create a new TkColor for the color with the given name, for use in the
+ *      specified window. The colormap field is set to lightColormap if the
+ *      window has a LightAqua appearance, or darkColormap if the window has a
+ *      DarkAqua appearance.  TkColors with different colormaps are managed
+ *      separately in the per-display table of TkColors maintained by Tk.
+ *
+ *      This function is called by Tk_GetColor.
  *
  * Results:
  *	Returns a newly allocated TkColor, or NULL on failure.
  *
  * Side effects:
- *	May invalidate the colormap cache associated with tkwin upon
- *	allocating a new colormap entry. Allocates a new TkColor
- *	structure.
+ *
+ *	Allocates memory for the TkColor structure.
  *
  *----------------------------------------------------------------------
  */
@@ -752,31 +680,60 @@ TkpGetColor(
     Tk_Uid name)		/* Name of color to be allocated (in form
 				 * suitable for passing to XParseColor). */
 {
-    Display *display = tkwin != None ? Tk_Display(tkwin) : NULL;
-    Colormap colormap = tkwin!= None ? Tk_Colormap(tkwin) : None;
+    Display *display = NULL;
     TkColor *tkColPtr;
     XColor color;
+    Colormap colormap = tkwin ? Tk_Colormap(tkwin) : noColormap;
+    static Bool initialized = NO;
+    static NSColorSpace* sRGB = NULL;
+
+    if (!initialized) {
+	initialized = YES;
+	sRGB = [NSColorSpace sRGBColorSpace];
+	initColorTable();
+    }
+    if (tkwin) {
+	display = Tk_Display(tkwin);
+    }
 
     /*
-     * Check to see if this is a system color. Otherwise, XParseColor
-     * will do all the work.
+     * Check to see if this is a system color. If not, just call XParseColor.
      */
 
     if (strncasecmp(name, "system", 6) == 0) {
-	Tcl_Obj *strPtr = Tcl_NewStringObj(name+6, -1);
-	int idx, result;
-
-	result = Tcl_GetIndexFromObjStruct(NULL, strPtr, systemColorMap,
-		sizeof(struct SystemColorMapEntry), NULL, TCL_EXACT, &idx);
-	Tcl_DecrRefCount(strPtr);
-	if (result == TCL_OK) {
-	    OSStatus err;
+	Tcl_HashEntry *hPtr = Tcl_FindHashEntry(&systemColors, name + 6);
+	MacPixel p;
+
+	if (hPtr != NULL) {
+	    SystemColorDatum *entry = (SystemColorDatum *)Tcl_GetHashValue(hPtr);
 	    CGColorRef c;
-	    unsigned char pixelCode = idx + MIN_PIXELCODE;
-	    struct SystemColorMapEntry entry = systemColorMap[idx];
 
-	    err = ChkErr(SetCGColorComponents, entry, 0, &c);
-	    if (err == noErr) {
+	    p.pixel.colortype = entry->type;
+	    p.pixel.value = entry->index;
+	    color.pixel = p.ulong;
+	    if (entry->type == semantic) {
+		CGFloat rgba[4];
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
+		NSAppearance *savedAppearance = [NSAppearance currentAppearance];
+		NSAppearance *windowAppearance;
+		if (TkMacOSXInDarkMode(tkwin)) {
+		    windowAppearance = darkAqua;
+		    colormap = darkColormap;
+		} else {
+		    windowAppearance = lightAqua;
+		    colormap = lightColormap;
+		}
+		[NSAppearance setCurrentAppearance:windowAppearance];
+		GetRGBA(entry, p.ulong, rgba);
+		[NSAppearance setCurrentAppearance:savedAppearance];
+#else
+		GetRGBA(entry, p.ulong, rgba);
+#endif
+		color.red   = rgba[0] * 65535.0;
+		color.green = rgba[1] * 65535.0;
+		color.blue  = rgba[2] * 65535.0;
+		goto validXColor;
+	    } else if (SetCGColorComponents(entry, 0, &c)) {
 		const size_t n = CGColorGetNumberOfComponents(c);
 		const CGFloat *rgba = CGColorGetComponents(c);
 
@@ -792,25 +749,19 @@ TkpGetColor(
 		default:
 		    Tcl_Panic("CGColor with %d components", (int) n);
 		}
-		color.pixel = ((((((pixelCode << 8)
-			| ((color.red   >> 8) & 0xff)) << 8)
-			| ((color.green >> 8) & 0xff)) << 8)
-			| ((color.blue  >> 8) & 0xff));
 		CGColorRelease(c);
 		goto validXColor;
 	    }
-	    CGColorRelease(c);
 	}
     }
-
     if (TkParseColor(display, colormap, name, &color) == 0) {
 	return NULL;
     }
 
 validXColor:
     tkColPtr = (TkColor *)ckalloc(sizeof(TkColor));
+    tkColPtr->colormap = colormap;
     tkColPtr->color = color;
-
     return tkColPtr;
 }
 
@@ -819,36 +770,35 @@ validXColor:
  *
  * TkpGetColorByValue --
  *
- *	Given a desired set of red-green-blue intensities for a color,
- *	locate a pixel value to use to draw that color in a given
- *	window.
+ *	Given an pointer to an XColor, construct a TkColor whose red, green and
+ *	blue intensities match those of the XColor as closely as possible.  For
+ *	the Macintosh, this means that the colortype bitfield of the pixel
+ *	value will be RGBColor and that the color intensities stored in its
+ *	24-bit value bitfield are computed from the 16-bit red green and blue
+ *	values in the XColor by dividing by 256.
  *
  * Results:
- *	The return value is a pointer to an TkColor structure that
- *	indicates the closest red, blue, and green intensities available
- *	to those specified in colorPtr, and also specifies a pixel
- *	value to use to draw in that color.
+ *	A pointer to a newly allocated TkColor structure.
  *
  * Side effects:
  *	May invalidate the colormap cache for the specified window.
- *	Allocates a new TkColor structure.
+ *	Allocates memory for a TkColor structure.
  *
  *----------------------------------------------------------------------
  */
 
 TkColor *
 TkpGetColorByValue(
-    Tk_Window tkwin,		/* Window in which color will be used. */
+    TCL_UNUSED(Tk_Window),		/* Window in which color will be used. */
     XColor *colorPtr)		/* Red, green, and blue fields indicate
 				 * desired color. */
 {
     TkColor *tkColPtr = (TkColor *)ckalloc(sizeof(TkColor));
-    (void)tkwin;
 
     tkColPtr->color.red = colorPtr->red;
     tkColPtr->color.green = colorPtr->green;
     tkColPtr->color.blue = colorPtr->blue;
-    tkColPtr->color.pixel = TkpGetPixel(&tkColPtr->color);
+    tkColPtr->color.pixel = TkpGetPixel(colorPtr);
     return tkColPtr;
 }
 
@@ -872,11 +822,9 @@ TkpGetColorByValue(
 Status
 XAllocColor(
     Display *display,		/* Display. */
-    Colormap map,		/* Not used. */
+    TCL_UNUSED(Colormap),		/* Not used. */
     XColor *colorPtr)		/* XColor struct to modify. */
 {
-    (void)map;
-
     display->request++;
     colorPtr->pixel = TkpGetPixel(colorPtr);
     return 1;
@@ -884,52 +832,39 @@ XAllocColor(
 
 Colormap
 XCreateColormap(
-    Display *display,		/* Display. */
-    Window window,		/* X window. */
-    Visual *visual,		/* Not used. */
-    int alloc)			/* Not used. */
+    TCL_UNUSED(Display *),		/* Display. */
+    TCL_UNUSED(Window),		/* X window. */
+    TCL_UNUSED(Visual *),		/* Not used. */
+    TCL_UNUSED(int))			/* Not used. */
 {
-    static Colormap index = 1;
-    (void)display;
-    (void)window;
-    (void)visual;
-    (void)alloc;
+    static Colormap index = 16;
 
     /*
-     * Just return a new value each time.
+     * Just return a new value each time, large enough that it will not
+     * conflict with any value of the macColormap enum.
      */
     return index++;
 }
 
 int
 XFreeColormap(
-    Display* display,		/* Display. */
-    Colormap colormap)		/* Colormap. */
+    TCL_UNUSED(Display *),		/* Display. */
+    TCL_UNUSED(Colormap))		/* Colormap. */
 {
-    (void)display;
-    (void)colormap;
-
     return Success;
 }
 
 int
 XFreeColors(
-    Display* display,		/* Display. */
-    Colormap colormap,		/* Colormap. */
-    unsigned long* pixels,	/* Array of pixels. */
-    int npixels,		/* Number of pixels. */
-    unsigned long planes)	/* Number of pixel planes. */
+    TCL_UNUSED(Display *),		/* Display. */
+    TCL_UNUSED(Colormap),		/* Colormap. */
+    TCL_UNUSED(unsigned long *),	/* Array of pixels. */
+    TCL_UNUSED(int),		/* Number of pixels. */
+    TCL_UNUSED(unsigned long))	/* Number of pixel planes. */
 {
-    (void)display;
-    (void)colormap;
-    (void)pixels;
-    (void)npixels;
-    (void)planes;
-
     /*
-     * The Macintosh version of Tk uses TrueColor. Nothing
-     * needs to be done to release colors as there really is
-     * no colormap in the Tk sense.
+     * Nothing needs to be done to release colors as there really is no
+     * colormap in the Tk sense.
      */
     return Success;
 }
diff --git a/macosx/tkMacOSXColor.h b/macosx/tkMacOSXColor.h
new file mode 100644
index 0000000..58f8060
--- /dev/null
+++ b/macosx/tkMacOSXColor.h
@@ -0,0 +1,202 @@
+#ifndef MACOSXCOLOR_H
+#define MACOSXCOLOR_H
+/*
+ * The generic Tk code uses the X11 GC type to describe a graphics context.
+ * (A GC is a pointer to a struct XGCValues).  The foreground and background
+ * colors in a GC are unsigned longs.  These are meant to be used as indexes
+ * into a table of XColors, where an XColor is declared in Xlib.h as:
+ * typedef struct {
+ *       unsigned long pixel;
+ *       unsigned short red, green, blue;
+ *       char flags;
+ *       char pad;
+ * } XColor;
+ *
+ * The xlib function XParseColor creates XColors from strings.  It recognizes
+ * literal hexadecimal color specifications such as "#RRGGBB" as well as the
+ * standard X11 color names.  When XParseColor creates an XColor it fills in
+ * all of the fields except for the pixel field, and then passes the XColor
+ * to TkpGetPixel to get a value to use for the pixel field. Since TkpGetPixel
+ * is platform specific, each platform is free to choose a value which can
+ * be used to set the foreground or background color in the platform's graphics
+ * context.
+ *
+ * Tk represents a color by a struct TkColor, which extends the XColor struct.
+ * Tk provides a mapping from color names to TkColors which extends the mapping
+ * provided by XParseColor but also allows for platform specific color names.
+ * By convention, these platform specific color names begin with the string
+ * "system".  The mapping from names to TkColors is implemented by the function
+ * TkpGetColor defined for the Macintosh in this file.  The pixel field in the
+ * XColor contained in a TkColor will be stored in the X11 graphics context.
+ * In X11 the pixel field is used as an index into a colormap.  On the Mac
+ * the high order byte of the pixel is used to indicate a color type and
+ * the low 24 bits are either used as an rgb value (if the type is rgbColor)
+ * or as an index into a table of color descriptions.
+ */
+
+enum colorType {
+    rgbColor,      /* The 24 bit value is an rgb color. */
+    clearColor,    /* The unique rgba color with all channels 0. */
+    HIBrush,       /* A HITheme brush color.*/
+    ttkBackground, /* A background color which indicates nesting level.*/
+    semantic,      /* A semantic NSColor.*/
+};
+
+typedef struct xpixel_t {
+    unsigned value: 24;     /* Either RGB or an index into systemColorData. */
+    unsigned colortype: 8;
+} xpixel;
+
+typedef union MacPixel_t {
+    unsigned long ulong;
+    xpixel pixel;
+} MacPixel;
+
+/*
+ * We maintain two colormaps, one for the LightAqua appearance and one for the
+ * DarkAqua appearance.
+ */
+
+enum macColormap {
+    noColormap,
+    lightColormap,
+    darkColormap,
+};
+
+/*
+ * In TkMacOSXColor.c a Tk hash table is constructed from the static data
+ * below to map system color names to CGColors.
+ */
+
+typedef struct {
+    const char *name;
+    enum colorType type;
+    int value;
+    const char *macName;
+    /* Fields below are filled in after or during construction of the hash table. */
+    int index;
+    NSString *selector;
+} SystemColorDatum;
+
+/*
+ * WARNING: Semantic colors which are not supported on all systems must be
+ * preceded by a backup color with the same name which *is* supported.  Systems
+ * which do support the color will replace the backup value when the table is
+ * constructed.  Failing to ensure this will result in a Tcl_Panic abort.
+ */
+
+static SystemColorDatum systemColorData[] = {
+{"Pixel",				rgbColor, 0, NULL, 0, NULL },
+{"Transparent",				clearColor,   0, NULL, 0, NULL },
+
+{"Highlight",				HIBrush,  kThemeBrushPrimaryHighlightColor, NULL, 0, NULL },
+{"HighlightSecondary",		    	HIBrush,  kThemeBrushSecondaryHighlightColor, NULL, 0, NULL },
+{"HighlightText",			HIBrush,  kThemeBrushBlack, NULL, 0, NULL },
+{"HighlightAlternate",			HIBrush,  kThemeBrushAlternatePrimaryHighlightColor, NULL, 0, NULL },
+{"PrimaryHighlightColor",		HIBrush,  kThemeBrushPrimaryHighlightColor, NULL, 0, NULL },
+{"ButtonFace",				HIBrush,  kThemeBrushButtonFaceActive, NULL, 0, NULL },
+{"SecondaryHighlightColor",		HIBrush,  kThemeBrushSecondaryHighlightColor, NULL, 0, NULL },
+{"ButtonFrame",				HIBrush,  kThemeBrushButtonFrameActive, NULL, 0, NULL },
+{"AlternatePrimaryHighlightColor",      HIBrush,  kThemeBrushAlternatePrimaryHighlightColor, NULL, 0, NULL },
+{"WindowBody",				HIBrush,  kThemeBrushDocumentWindowBackground, NULL, 0, NULL },
+{"SheetBackground",			HIBrush,  kThemeBrushSheetBackground, NULL, 0, NULL },
+{"MenuActive",				HIBrush,  kThemeBrushMenuBackgroundSelected, NULL, 0, NULL },
+{"Menu",				HIBrush,  kThemeBrushMenuBackground, NULL, 0, NULL },
+{"DialogBackgroundInactive",		HIBrush,  kThemeBrushDialogBackgroundInactive, NULL, 0, NULL },
+{"DialogBackgroundActive",		HIBrush,  kThemeBrushDialogBackgroundActive, NULL, 0, NULL },
+{"AlertBackgroundActive",		HIBrush,  kThemeBrushAlertBackgroundActive, NULL, 0, NULL },
+{"AlertBackgroundInactive",		HIBrush,  kThemeBrushAlertBackgroundInactive, NULL, 0, NULL },
+{"ModelessDialogBackgroundActive",	HIBrush,  kThemeBrushModelessDialogBackgroundActive, NULL, 0, NULL },
+{"ModelessDialogBackgroundInactive",	HIBrush,  kThemeBrushModelessDialogBackgroundInactive, NULL, 0, NULL },
+{"UtilityWindowBackgroundActive",	HIBrush,  kThemeBrushUtilityWindowBackgroundActive, NULL, 0, NULL },
+{"UtilityWindowBackgroundInactive",	HIBrush,  kThemeBrushUtilityWindowBackgroundInactive, NULL, 0, NULL },
+{"ListViewSortColumnBackground",	HIBrush,  kThemeBrushListViewSortColumnBackground, NULL, 0, NULL },
+{"ListViewBackground",			HIBrush,  kThemeBrushListViewBackground, NULL, 0, NULL },
+{"IconLabelBackground",			HIBrush,  kThemeBrushIconLabelBackground, NULL, 0, NULL },
+{"ListViewSeparator",			HIBrush,  kThemeBrushListViewSeparator, NULL, 0, NULL },
+{"ChasingArrows",			HIBrush,  kThemeBrushChasingArrows, NULL, 0, NULL },
+{"DragHilite",				HIBrush,  kThemeBrushDragHilite, NULL, 0, NULL },
+{"DocumentWindowBackground",		HIBrush,  kThemeBrushDocumentWindowBackground, NULL, 0, NULL },
+{"FinderWindowBackground",		HIBrush,  kThemeBrushFinderWindowBackground, NULL, 0, NULL },
+{"ScrollBarDelimiterActive",		HIBrush,  kThemeBrushScrollBarDelimiterActive, NULL, 0, NULL },
+{"ScrollBarDelimiterInactive",		HIBrush,  kThemeBrushScrollBarDelimiterInactive, NULL, 0, NULL },
+{"FocusHighlight",			HIBrush,  kThemeBrushFocusHighlight, NULL, 0, NULL },
+{"PopupArrowActive",			HIBrush,  kThemeBrushPopupArrowActive, NULL, 0, NULL },
+{"PopupArrowPressed",			HIBrush,  kThemeBrushPopupArrowPressed, NULL, 0, NULL },
+{"PopupArrowInactive",			HIBrush,  kThemeBrushPopupArrowInactive, NULL, 0, NULL },
+{"AppleGuideCoachmark",			HIBrush,  kThemeBrushAppleGuideCoachmark, NULL, 0, NULL },
+{"IconLabelBackgroundSelected",		HIBrush,  kThemeBrushIconLabelBackgroundSelected, NULL, 0, NULL },
+{"StaticAreaFill",			HIBrush,  kThemeBrushStaticAreaFill, NULL, 0, NULL },
+{"ActiveAreaFill",			HIBrush,  kThemeBrushActiveAreaFill, NULL, 0, NULL },
+{"ButtonFrameActive",			HIBrush,  kThemeBrushButtonFrameActive, NULL, 0, NULL },
+{"ButtonFrameInactive",			HIBrush,  kThemeBrushButtonFrameInactive, NULL, 0, NULL },
+{"ButtonFaceActive",			HIBrush,  kThemeBrushButtonFaceActive, NULL, 0, NULL },
+{"ButtonFaceInactive",			HIBrush,  kThemeBrushButtonFaceInactive, NULL, 0, NULL },
+{"ButtonFacePressed",			HIBrush,  kThemeBrushButtonFacePressed, NULL, 0, NULL },
+{"ButtonActiveDarkShadow",		HIBrush,  kThemeBrushButtonActiveDarkShadow, NULL, 0, NULL },
+{"ButtonActiveDarkHighlight",		HIBrush,  kThemeBrushButtonActiveDarkHighlight, NULL, 0, NULL },
+{"ButtonActiveLightShadow",		HIBrush,  kThemeBrushButtonActiveLightShadow, NULL, 0, NULL },
+{"ButtonActiveLightHighlight",		HIBrush,  kThemeBrushButtonActiveLightHighlight, NULL, 0, NULL },
+{"ButtonInactiveDarkShadow",		HIBrush,  kThemeBrushButtonInactiveDarkShadow, NULL, 0, NULL },
+{"ButtonInactiveDarkHighlight",		HIBrush,  kThemeBrushButtonInactiveDarkHighlight, NULL, 0, NULL },
+{"ButtonInactiveLightShadow",		HIBrush,  kThemeBrushButtonInactiveLightShadow, NULL, 0, NULL },
+{"ButtonInactiveLightHighlight",	HIBrush,  kThemeBrushButtonInactiveLightHighlight, NULL, 0, NULL },
+{"ButtonPressedDarkShadow",		HIBrush,  kThemeBrushButtonPressedDarkShadow, NULL, 0, NULL },
+{"ButtonPressedDarkHighlight",		HIBrush,  kThemeBrushButtonPressedDarkHighlight, NULL, 0, NULL },
+{"ButtonPressedLightShadow",		HIBrush,  kThemeBrushButtonPressedLightShadow, NULL, 0, NULL },
+{"ButtonPressedLightHighlight",		HIBrush,  kThemeBrushButtonPressedLightHighlight, NULL, 0, NULL },
+{"BevelActiveLight",			HIBrush,  kThemeBrushBevelActiveLight, NULL, 0, NULL },
+{"BevelActiveDark",			HIBrush,  kThemeBrushBevelActiveDark, NULL, 0, NULL },
+{"BevelInactiveLight",			HIBrush,  kThemeBrushBevelInactiveLight, NULL, 0, NULL },
+{"BevelInactiveDark",			HIBrush,  kThemeBrushBevelInactiveDark, NULL, 0, NULL },
+{"NotificationWindowBackground",	HIBrush,  kThemeBrushNotificationWindowBackground, NULL, 0, NULL },
+{"MovableModalBackground",		HIBrush,  kThemeBrushMovableModalBackground, NULL, 0, NULL },
+{"SheetBackgroundOpaque",		HIBrush,  kThemeBrushSheetBackgroundOpaque, NULL, 0, NULL },
+{"DrawerBackground",			HIBrush,  kThemeBrushDrawerBackground, NULL, 0, NULL },
+{"ToolbarBackground",			HIBrush,  kThemeBrushToolbarBackground, NULL, 0, NULL },
+{"SheetBackgroundTransparent",		HIBrush,  kThemeBrushSheetBackgroundTransparent, NULL, 0, NULL },
+{"MenuBackground",			HIBrush,  kThemeBrushMenuBackground, NULL, 0, NULL },
+{"MenuBackgroundSelected",		HIBrush,  kThemeBrushMenuBackgroundSelected, NULL, 0, NULL },
+{"ListViewOddRowBackground",		HIBrush,  kThemeBrushListViewOddRowBackground, NULL, 0, NULL },
+{"ListViewEvenRowBackground",		HIBrush,  kThemeBrushListViewEvenRowBackground, NULL, 0, NULL },
+{"ListViewColumnDivider",		HIBrush,  kThemeBrushListViewColumnDivider, NULL, 0, NULL },
+
+    /*
+     * Dynamic Colors
+     */
+
+{"WindowBackgroundColor",	    ttkBackground, 0, NULL, 0, NULL },
+{"WindowBackgroundColor1",	    ttkBackground, 1, NULL, 0, NULL },
+{"WindowBackgroundColor2",	    ttkBackground, 2, NULL, 0, NULL },
+{"WindowBackgroundColor3",	    ttkBackground, 3, NULL, 0, NULL },
+{"WindowBackgroundColor4",	    ttkBackground, 4, NULL, 0, NULL },
+{"WindowBackgroundColor5",	    ttkBackground, 5, NULL, 0, NULL },
+{"WindowBackgroundColor6",	    ttkBackground, 6, NULL, 0, NULL },
+{"WindowBackgroundColor7",	    ttkBackground, 7, NULL, 0, NULL },
+/* Apple's SecondaryLabelColor is the same as their LabelColor so we roll our own. */
+{"SecondaryLabelColor",		    ttkBackground, 14, NULL, 0, NULL },
+/* Color to use for notebook tab labels. */
+#if MAC_OS_X_VERSION_MAX_ALLOWED > 1060
+{"SelectedTabTextColor",	    semantic, 0, "whiteColor", 0, NULL },
+#else
+{"SelectedTabTextColor",	    semantic, 0, "blackColor", 0, NULL },
+#endif
+/* Semantic colors that we simulate on older systems which don't supoort them. */
+{"SelectedMenuItemTextColor",       semantic, 0, "selectedMenuItemTextColor", 0, NULL },
+{"ControlAccentColor",		    semantic, 0, "controlAccentColor", 0, NULL },
+{"LabelColor",                      semantic, 0, "blackColor", 0, NULL },
+{"LinkColor",			    semantic, 0, "blueColor", 0, NULL },
+{"PlaceholderTextColor",	    semantic, 0, "grayColor", 0, NULL },
+{"SeparatorColor",		    semantic, 0, "grayColor", 0, NULL },
+{NULL,				    0, 0, NULL, 0, NULL }
+};
+
+#endif
+/*
+ * Local Variables:
+ * mode: objc
+ * c-basic-offset: 4
+ * fill-column: 79
+ * coding: utf-8
+ * End:
+ */
-- 
cgit v0.12


From 9e7ea957b3c08bb06ba7a98956bfc39fca90f3cb Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 14 Aug 2020 06:47:57 +0000
Subject: Use "?-option" in stead of "?option" consistantly in WrongNumArgs
 error-messages (backported from revised_text)

---
 generic/tkBusy.c          |  6 +++---
 generic/tkFont.c          |  4 ++--
 generic/tkPanedWindow.c   |  2 +-
 generic/ttk/ttkTreeview.c |  2 +-
 tests/busy.test           |  4 ++--
 tests/font.test           | 10 +++++-----
 tests/textMark.test       |  2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/generic/tkBusy.c b/generic/tkBusy.c
index 5014eeb..8bbf764 100644
--- a/generic/tkBusy.c
+++ b/generic/tkBusy.c
@@ -819,7 +819,7 @@ Tk_BusyObjCmd(
 
     if (Tcl_GetString(objv[1])[0] == '.') {
 	if (objc%2 == 1) {
-	    Tcl_WrongNumArgs(interp, 1, objv, "window ?option value ...?");
+	    Tcl_WrongNumArgs(interp, 1, objv, "window ?-option value ...?");
 	    return TCL_ERROR;
 	}
 	return HoldBusy(busyTablePtr, interp, objv[1], objc-2, objv+2);
@@ -865,7 +865,7 @@ Tk_BusyObjCmd(
 
     case BUSY_CONFIGURE:
 	if (objc < 3) {
-	    Tcl_WrongNumArgs(interp, 2, objv, "window ?option? ?value ...?");
+	    Tcl_WrongNumArgs(interp, 2, objv, "window ?-option? ?value ...?");
 	    return TCL_ERROR;
 	}
 	busyPtr = GetBusy(interp, busyTablePtr, objv[2]);
@@ -922,7 +922,7 @@ Tk_BusyObjCmd(
 
     case BUSY_HOLD:
 	if (objc < 3 || objc%2 != 1) {
-	    Tcl_WrongNumArgs(interp, 2, objv, "window ?option value ...?");
+	    Tcl_WrongNumArgs(interp, 2, objv, "window ?-option value ...?");
 	    return TCL_ERROR;
 	}
 	return HoldBusy(busyTablePtr, interp, objv[2], objc-3, objv+3);
diff --git a/generic/tkFont.c b/generic/tkFont.c
index dbc00e4..d2aa6d2 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.c
@@ -556,7 +556,7 @@ Tk_FontObjCmd(
 
 	if (objc < 3 || n < objc) {
 	    Tcl_WrongNumArgs(interp, 2, objv,
-		    "font ?-displayof window? ?option? ?--? ?char?");
+		    "font ?-displayof window? ?-option? ?--? ?char?");
 	    return TCL_ERROR;
 	}
 
@@ -753,7 +753,7 @@ Tk_FontObjCmd(
 	}
 	if ((objc < 3) || ((objc - skip) > 4)) {
 	    Tcl_WrongNumArgs(interp, 2, objv,
-		    "font ?-displayof window? ?option?");
+		    "font ?-displayof window? ?-option?");
 	    return TCL_ERROR;
 	}
 	tkfont = Tk_AllocFontFromObj(interp, tkwin, objv[2]);
diff --git a/generic/tkPanedWindow.c b/generic/tkPanedWindow.c
index f25726e..b1eb8c2 100644
--- a/generic/tkPanedWindow.c
+++ b/generic/tkPanedWindow.c
@@ -690,7 +690,7 @@ PanedWindowWidgetObjCmd(
     case PW_PANECONFIGURE:
 	if (objc < 3) {
 	    Tcl_WrongNumArgs(interp, 2, objv,
-		    "pane ?option? ?value option value ...?");
+		    "pane ?-option? ?value -option value ...?");
 	    result = TCL_ERROR;
 	    break;
 	}
diff --git a/generic/ttk/ttkTreeview.c b/generic/ttk/ttkTreeview.c
index b484d1c..ac6107b 100644
--- a/generic/ttk/ttkTreeview.c
+++ b/generic/ttk/ttkTreeview.c
@@ -2377,7 +2377,7 @@ static int TreeviewItemCommand(
     TreeItem *item;
 
     if (objc < 3) {
-	Tcl_WrongNumArgs(interp, 2, objv, "item ?option ?value??...");
+	Tcl_WrongNumArgs(interp, 2, objv, "item ?-option ?value??...");
 	return TCL_ERROR;
     }
     if (!(item = FindItem(interp, tv, objv[2]))) {
diff --git a/tests/busy.test b/tests/busy.test
index 6a1263f..c743cec 100644
--- a/tests/busy.test
+++ b/tests/busy.test
@@ -21,7 +21,7 @@ test busy-1.1 {Tk_BusyObjCmd} -returnCodes error -body {
 
 test busy-2.1 {tk busy hold} -returnCodes error -body {
     tk busy hold
-} -result {wrong # args: should be "tk busy hold window ?option value ...?"}
+} -result {wrong # args: should be "tk busy hold window ?-option value ...?"}
 test busy-2.2 {tk busy hold root window} -body {
     set res [tk busy hold .]
     update
@@ -182,7 +182,7 @@ test busy-3.7 {tk busy cget unix} -setup {
 
 test busy-4.1 {tk busy configure no window} -returnCodes error -body {
     tk busy configure
-} -result {wrong # args: should be "tk busy configure window ?option? ?value ...?"}
+} -result {wrong # args: should be "tk busy configure window ?-option? ?value ...?"}
 
 test busy-4.2 {tk busy configure invalid window} -body {
     tk busy configure .f
diff --git a/tests/font.test b/tests/font.test
index 92894d1..aa7137a 100644
--- a/tests/font.test
+++ b/tests/font.test
@@ -114,11 +114,11 @@ test font-4.1 {font command: actual: arguments} -body {
 test font-4.2 {font command: actual: arguments} -body {
     # (objc < 3)
     font actual
-} -returnCodes error -result {wrong # args: should be "font actual font ?-displayof window? ?option? ?--? ?char?"}
+} -returnCodes error -result {wrong # args: should be "font actual font ?-displayof window? ?-option? ?--? ?char?"}
 test font-4.3 {font command: actual: arguments} -body {
     # (objc - skip > 4) when skip == 0
     font actual xyz abc def
-} -returnCodes error -result {wrong # args: should be "font actual font ?-displayof window? ?option? ?--? ?char?"}
+} -returnCodes error -result {wrong # args: should be "font actual font ?-displayof window? ?-option? ?--? ?char?"}
 test font-4.4 {font command: actual: displayof specified, so skip to next} -body {
     catch {font actual xyz -displayof . -size}
 } -result 0
@@ -128,7 +128,7 @@ test font-4.5 {font command: actual: displayof specified, so skip to next} -body
 test font-4.6 {font command: actual: arguments} -body {
     # (objc - skip > 4) when skip == 2
     font actual xyz -displayof . abc def
-} -returnCodes error -result {wrong # args: should be "font actual font ?-displayof window? ?option? ?--? ?char?"}
+} -returnCodes error -result {wrong # args: should be "font actual font ?-displayof window? ?-option? ?--? ?char?"}
 test font-4.7 {font command: actual: arguments} -constraints noExceed -body {
     # (tkfont == NULL)
     font actual "\{xyz"
@@ -430,11 +430,11 @@ test font-10.2 {font command: metrics: arguments} -body {
 test font-10.3 {font command: metrics: arguments} -body {
     # (objc < 3)
     font metrics
-} -returnCodes error -result {wrong # args: should be "font metrics font ?-displayof window? ?option?"}
+} -returnCodes error -result {wrong # args: should be "font metrics font ?-displayof window? ?-option?"}
 test font-10.4 {font command: metrics: arguments} -body {
     # (objc - skip) > 4) when skip == 0
     font metrics xyz abc def
-} -returnCodes error -result {wrong # args: should be "font metrics font ?-displayof window? ?option?"}
+} -returnCodes error -result {wrong # args: should be "font metrics font ?-displayof window? ?-option?"}
 test font-10.5 {font command: metrics: arguments} -body {
     # (objc - skip) > 4) when skip == 2
     font metrics xyz -displayof . abc
diff --git a/tests/textMark.test b/tests/textMark.test
index 043ff82..b4b781c 100644
--- a/tests/textMark.test
+++ b/tests/textMark.test
@@ -52,7 +52,7 @@ test textMark-1.4 {TkTextMarkCmd - "gravity" option} -body {
 } -result {right 1.4}
 test textMark-1.5 {TkTextMarkCmd - "gravity" option} -body {
     .t mark set x 1.3
-    .t mark g x left
+    .t mark gr x left
     .t insert 1.3 x
     list [.t mark gravity x] [.t index x]
 } -result {left 1.3}
-- 
cgit v0.12


From e4bdb863a0201c96d5114bd18b4468c9e7f7dcc9 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 14 Aug 2020 09:26:24 +0000
Subject: doc fixes

---
 doc/canvas.n     | 2 +-
 doc/frame.n      | 4 ++--
 doc/labelframe.n | 2 +-
 doc/text.n       | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/canvas.n b/doc/canvas.n
index cd9f56c..4641c1c 100644
--- a/doc/canvas.n
+++ b/doc/canvas.n
@@ -1123,7 +1123,7 @@ becomes visible; if it is positive then information farther to the right
 becomes visible.
 .RE
 .TP
-\fIpathName \fByview \fI?args\fR?
+\fIpathName \fByview ?\fIargs\fR?
 .
 This command is used to query and change the vertical position of the
 information displayed in the canvas's window.
diff --git a/doc/frame.n b/doc/frame.n
index f2fbd96..4800461 100644
--- a/doc/frame.n
+++ b/doc/frame.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH frame n 8.4 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
@@ -116,7 +116,7 @@ by \fIoption\fR.
 \fIOption\fR may have any of the values accepted by the \fBframe\fR
 command.
 .TP
-\fIpathName \fBconfigure\fR ?\fIoption\fR? \fI?value option value ...\fR?
+\fIpathName \fBconfigure\fR ?\fIoption\fR? ?\fIvalue option value ...\fR?
 .
 Query or modify the configuration options of the widget.
 If no \fIoption\fR is specified, returns a list describing all of
diff --git a/doc/labelframe.n b/doc/labelframe.n
index 857208e..5ca5ad7 100644
--- a/doc/labelframe.n
+++ b/doc/labelframe.n
@@ -108,7 +108,7 @@ by \fIoption\fR.
 \fIOption\fR may have any of the values accepted by the \fBlabelframe\fR
 command.
 .TP
-\fIpathName \fBconfigure\fR ?\fIoption\fR? \fI?value option value ...\fR?
+\fIpathName \fBconfigure\fR ?\fIoption\fR? ?\fIvalue option value ...\fR?
 Query or modify the configuration options of the widget.
 If no \fIoption\fR is specified, returns a list describing all of
 the available options for \fIpathName\fR (see \fBTk_ConfigureInfo\fR for
diff --git a/doc/text.n b/doc/text.n
index f08ed9e..ca46ee2 100644
--- a/doc/text.n
+++ b/doc/text.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH text n 8.5 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
@@ -1082,7 +1082,7 @@ satisfied and 0 if it is not. \fIOp\fR must be one of the operators <, <=, ==,
 the same character, if \fIop\fR is < then 1 is returned if \fIindex1\fR refers
 to an earlier character in the text than \fIindex2\fR, and so on.
 .TP
-\fIpathName \fBconfigure\fR ?\fIoption\fR? \fI?value option value ...\fR?
+\fIpathName \fBconfigure\fR ?\fIoption\fR? ?\fIvalue option value ...\fR?
 .
 Query or modify the configuration options of the widget. If no \fIoption\fR is
 specified, returns a list describing all of the available options for
@@ -1095,7 +1095,7 @@ command modifies the given widget option(s) to have the given value(s); in
 this case the command returns an empty string. \fIOption\fR may have any of
 the values accepted by the \fBtext\fR command.
 .TP
-\fIpathName \fBcount\fR \fI?options\fR? \fIindex1 index2\fR
+\fIpathName \fBcount\fR ?\fIoptions\fR? \fIindex1 index2\fR
 .
 Counts the number of relevant things between the two indices. If \fIindex1\fR
 is after \fIindex2\fR, the result will be a negative number (and this holds
-- 
cgit v0.12


From c9bb96468f1ed1e24b9aaa8df6f69cbba9665680 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 14 Aug 2020 13:07:38 +0000
Subject: tkConfig.c: protect usage of internalPtr when offset is
 TCL_INDEX_NONE. Backported from revised_text. Various minor changes in
 error-messages, also inspired by revised_text

---
 generic/tkConfig.c        | 168 +++++++++++++++++++++++-----------------------
 generic/tkText.c          |   2 +-
 generic/ttk/ttkLayout.c   |   8 +--
 generic/ttk/ttkProgress.c |   2 +-
 generic/ttk/ttkScale.c    |   4 +-
 generic/ttk/ttkTreeview.c |   2 +-
 macosx/tkMacOSXTest.c     |   2 +-
 tests/text.test           |   4 +-
 8 files changed, 95 insertions(+), 97 deletions(-)

diff --git a/generic/tkConfig.c b/generic/tkConfig.c
index d4ffa7c..859f2d0 100644
--- a/generic/tkConfig.c
+++ b/generic/tkConfig.c
@@ -1405,8 +1405,6 @@ Tk_RestoreSavedOptions(
 	    CLANG_ASSERT(internalPtr);
 	    switch (specPtr->type) {
 	    case TK_OPTION_BOOLEAN:
-		*((int *) internalPtr) = *((int *) ptr);
-		break;
 	    case TK_OPTION_INT:
 		*((int *) internalPtr) = *((int *) ptr);
 		break;
@@ -1874,106 +1872,106 @@ GetObjectForOption(
     void *internalPtr;		/* Points to internal value of option in
 				 * record. */
 
-    internalPtr = (char *)recordPtr + optionPtr->specPtr->internalOffset;
     objPtr = NULL;
-    switch (optionPtr->specPtr->type) {
-    case TK_OPTION_BOOLEAN:
-	objPtr = Tcl_NewWideIntObj(*((int *) internalPtr));
-	break;
-    case TK_OPTION_INT:
-	objPtr = Tcl_NewWideIntObj(*((int *) internalPtr));
-	break;
-    case TK_OPTION_DOUBLE:
-	objPtr = Tcl_NewDoubleObj(*((double *) internalPtr));
-	break;
-    case TK_OPTION_STRING:
-	objPtr = Tcl_NewStringObj(*((char **) internalPtr), -1);
-	break;
-    case TK_OPTION_STRING_TABLE:
-	objPtr = Tcl_NewStringObj(((char **) optionPtr->specPtr->clientData)[
-		*((int *) internalPtr)], -1);
-	break;
-    case TK_OPTION_COLOR: {
-	XColor *colorPtr = *((XColor **) internalPtr);
+    if (optionPtr->specPtr->internalOffset != TCL_INDEX_NONE) {
+	internalPtr = (char *)recordPtr + optionPtr->specPtr->internalOffset;
+	switch (optionPtr->specPtr->type) {
+	case TK_OPTION_BOOLEAN:
+	case TK_OPTION_INT:
+	    objPtr = Tcl_NewWideIntObj(*((int *) internalPtr));
+	    break;
+	case TK_OPTION_DOUBLE:
+	    objPtr = Tcl_NewDoubleObj(*((double *) internalPtr));
+	    break;
+	case TK_OPTION_STRING:
+	    objPtr = Tcl_NewStringObj(*((char **) internalPtr), -1);
+	    break;
+	case TK_OPTION_STRING_TABLE:
+	    objPtr = Tcl_NewStringObj(((char **) optionPtr->specPtr->clientData)[
+		    *((int *) internalPtr)], -1);
+	    break;
+	case TK_OPTION_COLOR: {
+	    XColor *colorPtr = *((XColor **) internalPtr);
 
-	if (colorPtr != NULL) {
-	    objPtr = Tcl_NewStringObj(Tk_NameOfColor(colorPtr), -1);
+	    if (colorPtr != NULL) {
+		objPtr = Tcl_NewStringObj(Tk_NameOfColor(colorPtr), -1);
+	    }
+	    break;
 	}
-	break;
-    }
-    case TK_OPTION_FONT: {
-	Tk_Font tkfont = *((Tk_Font *) internalPtr);
+	case TK_OPTION_FONT: {
+	    Tk_Font tkfont = *((Tk_Font *) internalPtr);
 
-	if (tkfont != NULL) {
-	    objPtr = Tcl_NewStringObj(Tk_NameOfFont(tkfont), -1);
+	    if (tkfont != NULL) {
+		objPtr = Tcl_NewStringObj(Tk_NameOfFont(tkfont), -1);
+	    }
+	    break;
 	}
-	break;
-    }
-    case TK_OPTION_STYLE: {
-	Tk_Style style = *((Tk_Style *) internalPtr);
+	case TK_OPTION_STYLE: {
+	    Tk_Style style = *((Tk_Style *) internalPtr);
 
-	if (style != NULL) {
-	    objPtr = Tcl_NewStringObj(Tk_NameOfStyle(style), -1);
+	    if (style != NULL) {
+		objPtr = Tcl_NewStringObj(Tk_NameOfStyle(style), -1);
+	    }
+	    break;
 	}
-	break;
-    }
-    case TK_OPTION_BITMAP: {
-	Pixmap pixmap = *((Pixmap *) internalPtr);
+	case TK_OPTION_BITMAP: {
+	    Pixmap pixmap = *((Pixmap *) internalPtr);
 
-	if (pixmap != None) {
-	    objPtr = Tcl_NewStringObj(
+	    if (pixmap != None) {
+		objPtr = Tcl_NewStringObj(
 		    Tk_NameOfBitmap(Tk_Display(tkwin), pixmap), -1);
+	    }
+	    break;
 	}
-	break;
-    }
-    case TK_OPTION_BORDER: {
-	Tk_3DBorder border = *((Tk_3DBorder *) internalPtr);
+	case TK_OPTION_BORDER: {
+	    Tk_3DBorder border = *((Tk_3DBorder *) internalPtr);
 
-	if (border != NULL) {
-	    objPtr = Tcl_NewStringObj(Tk_NameOf3DBorder(border), -1);
+	    if (border != NULL) {
+		objPtr = Tcl_NewStringObj(Tk_NameOf3DBorder(border), -1);
+	    }
+	    break;
 	}
-	break;
-    }
-    case TK_OPTION_RELIEF:
-	objPtr = Tcl_NewStringObj(Tk_NameOfRelief(*((int *) internalPtr)), -1);
-	break;
-    case TK_OPTION_CURSOR: {
-	Tk_Cursor cursor = *((Tk_Cursor *) internalPtr);
+	case TK_OPTION_RELIEF:
+	    objPtr = Tcl_NewStringObj(Tk_NameOfRelief(*((int *) internalPtr)), -1);
+	    break;
+	case TK_OPTION_CURSOR: {
+	    Tk_Cursor cursor = *((Tk_Cursor *) internalPtr);
 
-	if (cursor != NULL) {
-	    objPtr = Tcl_NewStringObj(
-		    Tk_NameOfCursor(Tk_Display(tkwin), cursor), -1);
+	    if (cursor != NULL) {
+		objPtr = Tcl_NewStringObj(
+		Tk_NameOfCursor(Tk_Display(tkwin), cursor), -1);
+	    }
+	    break;
 	}
-	break;
-    }
-    case TK_OPTION_JUSTIFY:
-	objPtr = Tcl_NewStringObj(Tk_NameOfJustify(
-		*((Tk_Justify *) internalPtr)), -1);
-	break;
-    case TK_OPTION_ANCHOR:
-	objPtr = Tcl_NewStringObj(Tk_NameOfAnchor(
-		*((Tk_Anchor *) internalPtr)), -1);
-	break;
-    case TK_OPTION_PIXELS:
-	objPtr = Tcl_NewWideIntObj(*((int *) internalPtr));
-	break;
-    case TK_OPTION_WINDOW: {
-	Tk_Window tkwin = *((Tk_Window *) internalPtr);
+	case TK_OPTION_JUSTIFY:
+	    objPtr = Tcl_NewStringObj(Tk_NameOfJustify(
+		    *((Tk_Justify *) internalPtr)), -1);
+	    break;
+	case TK_OPTION_ANCHOR:
+	    objPtr = Tcl_NewStringObj(Tk_NameOfAnchor(
+		    *((Tk_Anchor *) internalPtr)), -1);
+	    break;
+	case TK_OPTION_PIXELS:
+	    objPtr = Tcl_NewWideIntObj(*((int *) internalPtr));
+	    break;
+	case TK_OPTION_WINDOW: {
+	    Tk_Window tkwin = *((Tk_Window *) internalPtr);
 
-	if (tkwin != NULL) {
-	    objPtr = Tcl_NewStringObj(Tk_PathName(tkwin), -1);
+	    if (tkwin != NULL) {
+		objPtr = Tcl_NewStringObj(Tk_PathName(tkwin), -1);
+	    }
+	    break;
 	}
-	break;
-    }
-    case TK_OPTION_CUSTOM: {
-	const Tk_ObjCustomOption *custom = optionPtr->extra.custom;
+	case TK_OPTION_CUSTOM: {
+	    const Tk_ObjCustomOption *custom = optionPtr->extra.custom;
 
-	objPtr = custom->getProc(custom->clientData, tkwin, (char *)recordPtr,
-		optionPtr->specPtr->internalOffset);
-	break;
-    }
-    default:
-	Tcl_Panic("bad option type in GetObjectForOption");
+	    objPtr = custom->getProc(custom->clientData, tkwin, (char *)recordPtr,
+		    optionPtr->specPtr->internalOffset);
+	    break;
+        }
+        default:
+	    Tcl_Panic("bad option type in GetObjectForOption");
+	}
     }
     if (objPtr == NULL) {
 	objPtr = Tcl_NewObj();
diff --git a/generic/tkText.c b/generic/tkText.c
index 119f229..d7d7102 100644
--- a/generic/tkText.c
+++ b/generic/tkText.c
@@ -1051,7 +1051,7 @@ TextWidgetObjCmd(
 
     badOption:
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		"bad option \"%s\" must be -chars, -displaychars, "
+		"bad option \"%s\": must be -chars, -displaychars, "
 		"-displayindices, -displaylines, -indices, -lines, -update, "
 		"-xpixels, or -ypixels", Tcl_GetString(objv[i])));
 	Tcl_SetErrorCode(interp, "TK", "TEXT", "INDEX_OPTION", NULL);
diff --git a/generic/ttk/ttkLayout.c b/generic/ttk/ttkLayout.c
index 5e8c69c..a39ae2b 100644
--- a/generic/ttk/ttkLayout.c
+++ b/generic/ttk/ttkLayout.c
@@ -36,10 +36,10 @@ Ttk_NewBoxObj(Ttk_Box box)
 {
     Tcl_Obj *result[4];
 
-    result[0] = Tcl_NewIntObj(box.x);
-    result[1] = Tcl_NewIntObj(box.y);
-    result[2] = Tcl_NewIntObj(box.width);
-    result[3] = Tcl_NewIntObj(box.height);
+    result[0] = Tcl_NewWideIntObj(box.x);
+    result[1] = Tcl_NewWideIntObj(box.y);
+    result[2] = Tcl_NewWideIntObj(box.width);
+    result[3] = Tcl_NewWideIntObj(box.height);
 
     return Tcl_NewListObj(4, result);
 }
diff --git a/generic/ttk/ttkProgress.c b/generic/ttk/ttkProgress.c
index 6e5875e..505748b 100644
--- a/generic/ttk/ttkProgress.c
+++ b/generic/ttk/ttkProgress.c
@@ -137,7 +137,7 @@ static void AnimateProgressProc(ClientData clientData)
 	if (pb->progress.maxPhase)
 	    phase %= pb->progress.maxPhase;
 	Tcl_DecrRefCount(pb->progress.phaseObj);
-	pb->progress.phaseObj = Tcl_NewIntObj(phase);
+	pb->progress.phaseObj = Tcl_NewWideIntObj(phase);
 	Tcl_IncrRefCount(pb->progress.phaseObj);
 
 	/*
diff --git a/generic/ttk/ttkScale.c b/generic/ttk/ttkScale.c
index a6bde9a..a2c5d59 100644
--- a/generic/ttk/ttkScale.c
+++ b/generic/ttk/ttkScale.c
@@ -376,8 +376,8 @@ ScaleCoordsCommand(
     if (r == TCL_OK) {
 	Tcl_Obj *point[2];
 	XPoint pt = ValueToPoint(scalePtr, value);
-	point[0] = Tcl_NewIntObj(pt.x);
-	point[1] = Tcl_NewIntObj(pt.y);
+	point[0] = Tcl_NewWideIntObj(pt.x);
+	point[1] = Tcl_NewWideIntObj(pt.y);
 	Tcl_SetObjResult(interp, Tcl_NewListObj(2, point));
     }
     return r;
diff --git a/generic/ttk/ttkTreeview.c b/generic/ttk/ttkTreeview.c
index ac6107b..d48a510 100644
--- a/generic/ttk/ttkTreeview.c
+++ b/generic/ttk/ttkTreeview.c
@@ -2125,7 +2125,7 @@ static int TreeviewIndexCommand(
 	item = item->prev;
     }
 
-    Tcl_SetObjResult(interp, Tcl_NewIntObj(index));
+    Tcl_SetObjResult(interp, Tcl_NewWideIntObj(index));
     return TCL_OK;
 }
 
diff --git a/macosx/tkMacOSXTest.c b/macosx/tkMacOSXTest.c
index 434504f..6cb0a13 100644
--- a/macosx/tkMacOSXTest.c
+++ b/macosx/tkMacOSXTest.c
@@ -126,7 +126,7 @@ MenuBarHeightObjCmd(
     if (height == 0) {
 	height = (int) [[NSApp mainMenu] menuBarHeight];
     }
-    Tcl_SetObjResult(interp, Tcl_NewIntObj(height));
+    Tcl_SetObjResult(interp, Tcl_NewWideIntObj(height));
     return TCL_OK;
 }
 
diff --git a/tests/text.test b/tests/text.test
index 6d8e9bf..4a5c1b3 100644
--- a/tests/text.test
+++ b/tests/text.test
@@ -2068,7 +2068,7 @@ test text-10.2 {TextWidgetCmd procedure, "count" option} -setup {
     .t count blah 1.0 2.0
 } -cleanup {
     destroy .t
-} -returnCodes {error} -result {bad option "blah" must be -chars, -displaychars, -displayindices, -displaylines, -indices, -lines, -update, -xpixels, or -ypixels}
+} -returnCodes {error} -result {bad option "blah": must be -chars, -displaychars, -displayindices, -displaylines, -indices, -lines, -update, -xpixels, or -ypixels}
 test text-10.3 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2608,7 +2608,7 @@ test text-10.32 {TextWidgetCmd procedure, "count" option} -setup {
     .t count -lines 1.0 2.0 3.0
 } -cleanup {
     destroy .t
-} -returnCodes {error} -result {bad option "1.0" must be -chars, -displaychars, -displayindices, -displaylines, -indices, -lines, -update, -xpixels, or -ypixels}
+} -returnCodes {error} -result {bad option "1.0": must be -chars, -displaychars, -displayindices, -displaylines, -indices, -lines, -update, -xpixels, or -ypixels}
 test text-10.33 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
-- 
cgit v0.12


From e6279912ba852370baf9d434e5985b355430daad Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 14 Aug 2020 15:05:29 +0000
Subject: New function Tk_FontGetDescription()

---
 doc/GetFont.3        |  8 +++++++-
 generic/tk.decls     |  3 +++
 generic/tkDecls.h    |  5 +++++
 generic/tkFont.c     | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 generic/tkStubInit.c |  1 +
 5 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/doc/GetFont.3 b/doc/GetFont.3
index 0504916..9497556 100644
--- a/doc/GetFont.3
+++ b/doc/GetFont.3
@@ -9,7 +9,7 @@
 .so man.macros
 .BS
 .SH NAME
-Tk_AllocFontFromObj, Tk_GetFont, Tk_GetFontFromObj, Tk_NameOfFont, Tk_FreeFontFromObj, Tk_FreeFont \- maintain database of fonts
+Tk_AllocFontFromObj, Tk_GetFont, Tk_GetFontFromObj, Tk_NameOfFont, Tk_FontGetDescription, Tk_FreeFontFromObj, Tk_FreeFont \- maintain database of fonts
 .SH SYNOPSIS
 .nf
 \fB#include <tk.h>\fR
@@ -23,6 +23,9 @@ Tk_Font
 Tk_Font
 \fBTk_GetFontFromObj(\fItkwin, objPtr\fB)\fR
 .sp
+Tcl_Obj *
+\fBTk_FontGetDescription(\fItkfont\fB)\fR
+.sp
 const char *
 \fBTk_NameOfFont(\fItkfont\fB)\fR
 .sp
@@ -88,6 +91,9 @@ windows or for different purposes), then a single Tk_Font will be
 shared for all uses.  The underlying resources will be freed automatically
 when no-one is using the font anymore.
 .PP
+The procedure \fBTk_FontGetDescription\fR returns information about the font
+description as a Tcl list. One possible result is "{{DejaVu Sans} -16 bold underline}".
+.PP
 The procedure \fBTk_NameOfFont\fR is roughly the inverse of
 \fBTk_GetFont\fR.  Given a \fItkfont\fR that was created by
 \fBTk_GetFont\fR (or \fBTk_AllocFontFromObj\fR), the return value is
diff --git a/generic/tk.decls b/generic/tk.decls
index 0184f86..c885e9b 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -1087,6 +1087,9 @@ declare 278 {
     void Tk_SendVirtualEvent(Tk_Window tkwin, const char *eventName,
 	    Tcl_Obj *detail)
 }
+declare 279 {
+    Tcl_Obj *Tk_FontGetDescription(Tk_Font tkfont)
+}
 
 # Define the platform specific public Tk interface.  These functions are
 # only available on the designated platform.
diff --git a/generic/tkDecls.h b/generic/tkDecls.h
index e55854c..bb2fdd4 100644
--- a/generic/tkDecls.h
+++ b/generic/tkDecls.h
@@ -891,6 +891,8 @@ EXTERN Tcl_Obj *	Tk_NewWindowObj(Tk_Window tkwin);
 /* 278 */
 EXTERN void		Tk_SendVirtualEvent(Tk_Window tkwin,
 				const char *eventName, Tcl_Obj *detail);
+/* 279 */
+EXTERN Tcl_Obj *	Tk_FontGetDescription(Tk_Font tkfont);
 
 typedef struct {
     const struct TkPlatStubs *tkPlatStubs;
@@ -1182,6 +1184,7 @@ typedef struct TkStubs {
     int (*tk_GetDoublePixelsFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr, double *doublePtr); /* 276 */
     Tcl_Obj * (*tk_NewWindowObj) (Tk_Window tkwin); /* 277 */
     void (*tk_SendVirtualEvent) (Tk_Window tkwin, const char *eventName, Tcl_Obj *detail); /* 278 */
+    Tcl_Obj * (*tk_FontGetDescription) (Tk_Font tkfont); /* 279 */
 } TkStubs;
 
 extern const TkStubs *tkStubsPtr;
@@ -1752,6 +1755,8 @@ extern const TkStubs *tkStubsPtr;
 	(tkStubsPtr->tk_NewWindowObj) /* 277 */
 #define Tk_SendVirtualEvent \
 	(tkStubsPtr->tk_SendVirtualEvent) /* 278 */
+#define Tk_FontGetDescription \
+	(tkStubsPtr->tk_FontGetDescription) /* 279 */
 
 #endif /* defined(USE_TK_STUBS) */
 
diff --git a/generic/tkFont.c b/generic/tkFont.c
index d2aa6d2..6659025 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.c
@@ -3577,6 +3577,57 @@ GetAttributeInfoObj(
 /*
  *---------------------------------------------------------------------------
  *
+ * Tk_FontGetDescription --
+ *
+ *	Return information about the font description as a Tcl list. One
+ *	possible result is "{{DejaVu Sans} -16 bold underline}".
+ *
+ * Results:
+ *	The list of descriptions.
+ *
+ * Side effects:
+ *	None.
+ *
+ *---------------------------------------------------------------------------
+ */
+
+Tcl_Obj *
+Tk_FontGetDescription(
+    Tk_Font tkfont)		/* Font whose description is desired. */
+{
+    const TkFontAttributes *faPtr = GetFontAttributes(tkfont);
+    Tcl_Obj *resultPtr = Tcl_NewObj();
+    const char *str;
+
+    str = faPtr->family;
+    Tcl_ListObjAppendElement(NULL, resultPtr, Tcl_NewStringObj(str, str ? -1 : 0));
+    if (faPtr->size >= 0.0) {
+    	Tcl_ListObjAppendElement(NULL, resultPtr, Tcl_NewWideIntObj((int)(faPtr->size + 0.5)));
+    } else {
+    	Tcl_ListObjAppendElement(NULL, resultPtr, Tcl_NewWideIntObj(-(int)(-faPtr->size + 0.5)));
+    }
+    if (faPtr->weight != TK_FW_NORMAL) {
+	str = TkFindStateString(weightMap, faPtr->weight);
+	Tcl_ListObjAppendElement(NULL, resultPtr, Tcl_NewStringObj(str, -1));
+    }
+    if (faPtr->slant != TK_FS_ROMAN) {
+	str = TkFindStateString(slantMap, faPtr->slant);
+	Tcl_ListObjAppendElement(NULL, resultPtr, Tcl_NewStringObj(str, -1));
+    }
+    if (faPtr->underline) {
+	str = TkFindStateString(underlineMap, faPtr->underline);
+	Tcl_ListObjAppendElement(NULL, resultPtr, Tcl_NewStringObj(str, -1));
+    }
+    if (faPtr->overstrike) {
+	str = TkFindStateString(overstrikeMap, faPtr->overstrike);
+	Tcl_ListObjAppendElement(NULL, resultPtr, Tcl_NewStringObj(str, -1));
+    }
+    return resultPtr;
+}
+
+/*
+ *---------------------------------------------------------------------------
+ *
  * ParseFontNameObj --
  *
  *	Converts a object into a set of font attributes that can be used to
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 8c27797..eb2dd47 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -1335,6 +1335,7 @@ const TkStubs tkStubs = {
     Tk_GetDoublePixelsFromObj, /* 276 */
     Tk_NewWindowObj, /* 277 */
     Tk_SendVirtualEvent, /* 278 */
+    Tk_FontGetDescription, /* 279 */
 };
 
 /* !END!: Do not edit above this line. */
-- 
cgit v0.12


From 1678ee86a5cb010c439daa5e4945949f6a378506 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Sat, 15 Aug 2020 01:15:06 +0000
Subject: Update macosx/README

---
 macosx/README | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/macosx/README b/macosx/README
index e9d50a4..6f3926f 100644
--- a/macosx/README
+++ b/macosx/README
@@ -272,21 +272,24 @@ appearance.  Part of the implementation of the Dark Mode was to make
 some of the named NSColors have dynamic values.  Apple calls these
 "semantic colors" because the name does not specify a specific color,
 but rather refers to the context in which the color should be used.
-Tk now provides the following semantic colors as system colors:
-systemTextColor, systemTextBackgroundColor, systemSelectedTextColor,
-systemSelectedTextBackgroundColor, systemControlTextColor,
-systemDisabledControlTextColor, systemLabelColor, systemLinkColor,
-systemControlAccentColor, and systemPlaceholderTextColor.  All of these
-except the last four were present in OSX 10.0 (and those four are
-simulated in systems where they do not exist).  The change in 10.14 was
-that the RGB color value of these colors became dynamic, meaning that
-the color value can change when the application appearance changes.
 In particular, when a user selects Dark Mode in the system preferences
 these colors change appearance.  For example systemTextColor is dark in
-Aqua and light in DarkAqua.  One additional color,
-systemSelectedTabTextColor, does not exist in macOS but is used by Tk
-to match the different colors used for Notebook tab text in different
-OS versions.
+Aqua and light in DarkAqua.
+
+Tk now provides colors corresonding to all of the NSColors in Apple's System
+ColorList.  The convention for naming these colors is that the Tk name is
+generated by capitalizing the macOS name and adding the prefix "system". The
+System ColorList differs between releases of macOS and some colors, such as
+systemLinkColor and systemControlAccentColor, are simulated on older systems
+which did not provide them.  The following colors are available on all
+supported macOS releases, although newer systems will support additional
+colors: systemControlAccentColor, systemControlTextColor,
+systemDisabledControlTextColor, systemLabelColor, systemLinkColor,
+systemPlaceholderTextColor, systemSelectedTextBackgroundColor,
+systemSelectedTextColor, systemSeparatorColor, systemTextBackgroundColor, and
+systemTextColor.  One additional color, systemSelectedTabTextColor, does not
+exist in macOS but is used by Tk to match the different colors used for
+Notebook tab titles in different OS versions.
 
 The default background and foreground colors of most of the Tk widgets
 have been set to semantic colors, which means that the widgets will change
-- 
cgit v0.12


From 3d92c41865ade11888687209d780bb1a4c0d1a42 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sat, 15 Aug 2020 06:56:18 +0000
Subject: typo

---
 macosx/README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/macosx/README b/macosx/README
index 6f3926f..e34c78a 100644
--- a/macosx/README
+++ b/macosx/README
@@ -276,7 +276,7 @@ In particular, when a user selects Dark Mode in the system preferences
 these colors change appearance.  For example systemTextColor is dark in
 Aqua and light in DarkAqua.
 
-Tk now provides colors corresonding to all of the NSColors in Apple's System
+Tk now provides colors corresponding to all of the NSColors in Apple's System
 ColorList.  The convention for naming these colors is that the Tk name is
 generated by capitalizing the macOS name and adding the prefix "system". The
 System ColorList differs between releases of macOS and some colors, such as
-- 
cgit v0.12


From dc5285d3aa6bf6ebcdcfe8447c33ff9cd03436a8 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sat, 15 Aug 2020 07:12:37 +0000
Subject: Update documentation of -placeholderforeground regarding its default.
 Also remove mention of the empty string there, which was an error.

---
 doc/options.n | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/options.n b/doc/options.n
index 56e65dd..b1af80d 100644
--- a/doc/options.n
+++ b/doc/options.n
@@ -230,8 +230,7 @@ that is when the widget is empty. The placeholder text is displayed using
 the values of the \fB\-font\fR and \fB\-justify\fR options.
 .OP \-placeholderforeground placeholderForeground PlaceholderForeground
 Specifies the foreground color to use when the placeholder text is
-displayed. If this option is the empty string, the default color gray70
-is used.
+displayed. The default color is platform-specific.
 .OP \-relief relief Relief
 Specifies the 3-D effect desired for the widget.  Acceptable
 values are \fBraised\fR, \fBsunken\fR, \fBflat\fR, \fBridge\fR,
-- 
cgit v0.12


From b89467a2e9cae5230886e26ff47a29b78078f2cc Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sat, 15 Aug 2020 07:27:35 +0000
Subject: Fix formatting of colors.n in the Portability/Windows section.

---
 doc/colors.n | 2 --
 1 file changed, 2 deletions(-)

diff --git a/doc/colors.n b/doc/colors.n
index 3c20e8a..cd59ed3 100644
--- a/doc/colors.n
+++ b/doc/colors.n
@@ -961,8 +961,6 @@ systemWindowBackgroundColor7
 .DE
 .RE
 .TP
-
-
 \fBWindows\fR
 .
 On Windows, the following additional system colors are available
-- 
cgit v0.12


From 8b6c8e84302179205f43165ff8e1ce15d2c8860a Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Sat, 15 Aug 2020 10:22:15 +0000
Subject: sync with bug-315104a5c10

---
 macosx/README                |  36 +++++++++++----
 macosx/tkMacOSXColor.c       |   9 ++--
 macosx/tkMacOSXWindowEvent.c | 105 +++++++++++++++++++++++++++----------------
 3 files changed, 100 insertions(+), 50 deletions(-)

diff --git a/macosx/README b/macosx/README
index 79025f1..0a02999 100644
--- a/macosx/README
+++ b/macosx/README
@@ -662,15 +662,35 @@ source and destination rectangles for the scrolling.  The embedded
 windows are redrawn within the DisplayText function by some
 conditional code which is only used for macOS.
 
-6.0 Virtual events on 10.14
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
+6.0 Virtual events on macOS 10.14 and later
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The 10.14 release added support for system appearance changes,
+including a "Dark Mode" that renders all window frames and menus in
+dark colors. Tk 8.6.11 provides three virtual events <<LightAqua>>,
+<<DarkAqua>> and <<AppearanceChanged>>, to allow you to update your Tk
+app's appearance when the system appearance changes.  These events are
+generated in [NSView effectiveAppearanceChanged], which is called by
+the Apple window manager when the General Preferences is changed
+either by switching between Light Mode and Dark Mode or by changing
+the Accent Color or Highlight Color.
+
+The <<AppearanceChanged>> virtual event has a data string which can be
+accessed with the %d substitution.  The format of the data string is
+that it consists of 6 words:
+  "Appearance XXXX Accent YYYY Highlight ZZZZ"
+For example, the following code will print the current appearance
+name, accent color and highlight color when the <<AppearanceChanged>>
+virtual event fires:
+
+bind . <<AppearanceChanged>> {
+    array set data [split %d]
+    puts "  Appearance: $data(Appearance)"
+    puts "  Accent: $data(Accent)"
+    puts "  Highlight: $data(Highlight)\n"
+}
+
 
-10.14 supports system appearance changes, and has added a "Dark Mode"
-that casts all window frames and menus as black. Tk 8.6.9 has added two
-virtual events, <<LightAqua>> and <<DarkAqua>>, to allow you to update
-your Tk app's appearance when the system appearance changes. Just bind
-your appearance-updating code to these virtual events and you will see
-it triggered when the system appearance toggles between dark and light.
 
 7.0 Mac Services
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index fe0cc2a..974978f 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -378,23 +378,24 @@ SetCGColorComponents(
 MODULE_SCOPE Bool
 TkMacOSXInDarkMode(Tk_Window tkwin)
 {
-    int result = false;
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
     if (@available(macOS 10.14, *)) {
         TkWindow *winPtr = (TkWindow*) tkwin;
+	NSAppearanceName name;
 	NSView *view = nil;
 	if (winPtr && winPtr->privatePtr) {
 	    view = TkMacOSXDrawableView(winPtr->privatePtr);
 	}
 	if (view) {
-	    result = (view.effectiveAppearance == darkAqua);
+	    name = [[view effectiveAppearance] name];
 	} else {
-	    result = ([NSAppearance currentAppearance] == darkAqua);
+	    name = [[NSAppearance currentAppearance] name];
 	}
+	return (name == NSAppearanceNameDarkAqua);
     }
 #endif
-    return result;
+    return false;
 }
 
 /*
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 8214731..35b1b49 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -1067,54 +1067,83 @@ ConfigureRestrictProc(
 }
 
 /*
- * This method is called when a user changes between light and dark mode. The
- * implementation here generates a Tk virtual event which can be bound to a
- * function that redraws the window in an appropriate style.
+ * In macOS 10.14 and later his method is called when a user changes between
+ * light and dark mode or changes the accent color. The implementation
+ * generates two virtual events.  The first is either <<LightAqua>> or
+ * <<DarkAqua>>, depending on the view's current effective appearance.  The
+ * second is <<AppearnceChanged>> and has a data string describing the
+ * effective appearance of the view and the current accent and highlight
+ * colors.
  */
 
+static char *accentNames[] = {
+    "Graphite",
+    "Red",
+    "Orange",
+    "Yellow",
+    "Green",
+    "Blue",
+    "Purple",
+    "Pink",
+};
+
 - (void) viewDidChangeEffectiveAppearance
 {
-    XVirtualEvent event;
-    int x, y;
-    NSWindow *w = [self window];
-    TkWindow *winPtr = TkMacOSXGetTkWindow(w);
-    Tk_Window tkwin = (Tk_Window) winPtr;
-    static NSAppearanceName lastAppearanceName = nil;
-    NSAppearanceName effectiveAppearanceName = [[self effectiveAppearance] name];
-    Tk_Uid eventName = NULL;
-    if (!winPtr) {
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
+
+    Tk_Window tkwin = (Tk_Window) TkMacOSXGetTkWindow([self window]);
+    if (!tkwin) {
 	return;
     }
-    if (!lastAppearanceName) {
-	lastAppearanceName = [[NSAppearance currentAppearance] name];
-	return;
+    NSAppearanceName effectiveAppearanceName = [[self effectiveAppearance] name];
+    const char *accentName, *highlightName;
+    NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults];
+    NSString *accent = [preferences stringForKey:@"AppleAccentColor"];
+    NSString *highlight = [[[preferences stringForKey:@"AppleHighlightColor"]
+			        componentsSeparatedByString: @" "]
+			        objectAtIndex:3];
+    static char *defaultColor = NULL;
+
+    if (!defaultColor) {
+	defaultColor = [NSApp macOSVersion] < 110000 ? "Blue" : "Multicolor";
+
+	/*
+	 * AppKit calls this method when the user changes the Accent Color
+	 * but not when the user changes the Highlight Color.  So we register
+	 * to receive KVO notifications for Highlight Color as well.
+	 */
+
+	[preferences addObserver:self
+		      forKeyPath:@"AppleHighlightColor"
+			 options:NSKeyValueObservingOptionNew
+			 context:NULL];
     }
-    if (lastAppearanceName == effectiveAppearanceName) {
-	eventName = Tk_GetUid("NewAccentColor");
+    accentName = accent ? accentNames[1 + accent.intValue] : defaultColor;
+    highlightName = highlight ? highlight.UTF8String: defaultColor;
+
+    char data[256];
+    snprintf(data, 256, "Appearance %s Accent %s Highlight %s",
+	     effectiveAppearanceName.UTF8String, accentName,
+	     highlightName);
+    TkSendVirtualEvent(tkwin, "AppearanceChanged", Tcl_NewStringObj(data, -1));
+    if (effectiveAppearanceName == NSAppearanceNameAqua) {
+	TkSendVirtualEvent(tkwin, "LightAqua", NULL);
     } else if (effectiveAppearanceName == NSAppearanceNameDarkAqua) {
-	eventName = Tk_GetUid("DarkAqua");
-    } else if (effectiveAppearanceName == NSAppearanceNameAqua) {
-        eventName = Tk_GetUid("LightAqua");
-    } else {
-	return;
+	TkSendVirtualEvent(tkwin, "DarkAqua", NULL);
     }
 
-    lastAppearanceName = effectiveAppearanceName;
-    bzero(&event, sizeof(XVirtualEvent));
-    event.type = VirtualEvent;
-    event.serial = LastKnownRequestProcessed(Tk_Display(tkwin));
-    event.send_event = false;
-    event.display = Tk_Display(tkwin);
-    event.event = Tk_WindowId(tkwin);
-    event.root = XRootWindow(Tk_Display(tkwin), 0);
-    event.subwindow = None;
-    event.time = TkpGetMS();
-    XQueryPointer(NULL, winPtr->window, NULL, NULL,
-    		  &event.x_root, &event.y_root, &x, &y, &event.state);
-    Tk_TopCoordsToWindow(tkwin, x, y, &event.x, &event.y);
-    event.same_screen = true;
-    event.name = eventName;
-    Tk_QueueWindowEvent((XEvent *) &event, TCL_QUEUE_TAIL);
+#endif
+}
+
+- (void)observeValueForKeyPath:(NSString *)keyPath
+		      ofObject:(id)object
+			change:(NSDictionary *)change
+		       context:(void *)context
+{
+    NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults];
+    if (object == preferences && [keyPath isEqualToString:@"AppleHighlightColor"]) {
+	[self viewDidChangeEffectiveAppearance];
+    }
 }
 
 /*
-- 
cgit v0.12


From 8688346cc826e351a4b296686b1b1c0be5712ddc Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Sat, 15 Aug 2020 10:37:37 +0000
Subject: Adjustments for 10.6

---
 macosx/tkMacOSXWindowEvent.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 35b1b49..8606d84 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -207,7 +207,9 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
     TkWindow *winPtr = TkMacOSXGetTkWindow(window);
     if (winPtr) {
 	TKContentView *view = [window contentView];
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
 	[view viewDidChangeEffectiveAppearance];
+#endif
 	[view addTkDirtyRect:[view bounds]];
 	Tcl_CancelIdleCall(TkMacOSXDrawAllViews, NULL);
 	Tcl_DoWhenIdle(TkMacOSXDrawAllViews, NULL);
@@ -1076,6 +1078,8 @@ ConfigureRestrictProc(
  * colors.
  */
 
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
+
 static char *accentNames[] = {
     "Graphite",
     "Red",
@@ -1089,8 +1093,6 @@ static char *accentNames[] = {
 
 - (void) viewDidChangeEffectiveAppearance
 {
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
-
     Tk_Window tkwin = (Tk_Window) TkMacOSXGetTkWindow([self window]);
     if (!tkwin) {
 	return;
@@ -1131,9 +1133,9 @@ static char *accentNames[] = {
     } else if (effectiveAppearanceName == NSAppearanceNameDarkAqua) {
 	TkSendVirtualEvent(tkwin, "DarkAqua", NULL);
     }
+}
 
 #endif
-}
 
 - (void)observeValueForKeyPath:(NSString *)keyPath
 		      ofObject:(id)object
-- 
cgit v0.12


From 03dc2a80af3462e288ad3d46ff9ea29be67e0a4c Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Sat, 15 Aug 2020 11:56:01 +0000
Subject: misplaced #endif

---
 macosx/tkMacOSXWindowEvent.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 8606d84..585589e 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -1135,8 +1135,6 @@ static char *accentNames[] = {
     }
 }
 
-#endif
-
 - (void)observeValueForKeyPath:(NSString *)keyPath
 		      ofObject:(id)object
 			change:(NSDictionary *)change
@@ -1148,6 +1146,8 @@ static char *accentNames[] = {
     }
 }
 
+#endif
+
 /*
  * This is no-op on 10.7 and up because Apple has removed this widget, but we
  * are leaving it here for backwards compatibility.
-- 
cgit v0.12


From 08ea9c49500bc7adc443804d2c8ae91fa7b500b4 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 16 Aug 2020 18:56:18 +0000
Subject: Backport [7510e5a9b9] and add corresponding documentation in
 ttk_widget.n so that -font and -foreground are now documented in 8.6 in
 addition to 8.7. See request in [ddac78bd5e].

---
 doc/ttk_entry.n  | 6 +++---
 doc/ttk_widget.n | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/doc/ttk_entry.n b/doc/ttk_entry.n
index 0da60d1..4eb67cc 100644
--- a/doc/ttk_entry.n
+++ b/doc/ttk_entry.n
@@ -23,7 +23,9 @@ with the \fB\-textvariable\fR option.
 Entry widgets support horizontal scrolling with the
 standard \fB\-xscrollcommand\fR option and \fBxview\fR widget command.
 .SO ttk_widget
-\-class	\-cursor	\-style
+\-class	\-cursor
+\-font	\-foreground
+\-style
 \-takefocus	\-xscrollcommand
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
@@ -34,8 +36,6 @@ If the selection is exported, then selecting in the widget deselects
 the current X selection, selecting outside the widget deselects any
 widget selection, and the widget will respond to selection retrieval
 requests when it has a selection.
-.\" MAYBE: .OP \-font font Font
-.\" MAYBE: .OP \-foreground foreground Foreground
 .\" MAYBE: .OP \-insertbackground insertBackground Foreground
 .\" MAYBE: .OP \-insertwidth insertWidth InsertWidth
 .OP \-invalidcommand invalidCommand InvalidCommand
diff --git a/doc/ttk_widget.n b/doc/ttk_widget.n
index 51c0dbd..82a1520 100644
--- a/doc/ttk_widget.n
+++ b/doc/ttk_widget.n
@@ -93,6 +93,11 @@ Display image above, below, left of, or right of the text, respectively.
 .IP none
 Display the image if present, otherwise the text.
 .RE
+.OP \-font font Font
+Font to use for the text displayed by the widget.
+.OP \-foreground textColor TextColor
+The widget's foreground color.
+If unspecified, the theme default is used.
 .OP \-image image Image
 Specifies an image to display.
 This is a list of 1 or more elements.
-- 
cgit v0.12


From 4f9bff583b0e119243a0ebf254e1a3bb6f55714d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 17 Aug 2020 06:08:18 +0000
Subject: Disable warnings C4146 and C4305 (last one for 32-bit only) on
 Microsoft compilers. Tcl already does this, but this was never taken over by
 Tk

---
 win/tkWinPort.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/win/tkWinPort.h b/win/tkWinPort.h
index 9829af5..1ef90ff 100644
--- a/win/tkWinPort.h
+++ b/win/tkWinPort.h
@@ -91,11 +91,15 @@
  * See ticket [916c1095438eae56]: GetVersionExW triggers warnings
  */
 #if defined(_MSC_VER)
+#   pragma warning(disable:4146)
 #   pragma warning(disable:4267)
 #   pragma warning(disable:4244)
 #   pragma warning(disable:4311)
 #   pragma warning(disable:4312)
 #   pragma warning(disable:4996)
+#if !defined(_WIN64)
+#   pragma warning(disable:4305)
+#endif
 #endif
 
 /*
-- 
cgit v0.12


From 2b8057be0d39502e63636e8376ff4fb85ee8ae8d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 17 Aug 2020 06:28:33 +0000
Subject: const usage

---
 macosx/tkMacOSXWindowEvent.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 585589e..08147be 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -1080,7 +1080,7 @@ ConfigureRestrictProc(
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
 
-static char *accentNames[] = {
+static const char *accentNames[] = {
     "Graphite",
     "Red",
     "Orange",
@@ -1088,7 +1088,7 @@ static char *accentNames[] = {
     "Green",
     "Blue",
     "Purple",
-    "Pink",
+    "Pink"
 };
 
 - (void) viewDidChangeEffectiveAppearance
@@ -1104,7 +1104,7 @@ static char *accentNames[] = {
     NSString *highlight = [[[preferences stringForKey:@"AppleHighlightColor"]
 			        componentsSeparatedByString: @" "]
 			        objectAtIndex:3];
-    static char *defaultColor = NULL;
+    static const char *defaultColor = NULL;
 
     if (!defaultColor) {
 	defaultColor = [NSApp macOSVersion] < 110000 ? "Blue" : "Multicolor";
-- 
cgit v0.12


From 3d9d9c5309da06693a010b3936c6be0aa9e33599 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 17 Aug 2020 06:34:47 +0000
Subject: one more "const"

---
 macosx/tkMacOSXWindowEvent.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 08147be..acea6f0 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -1080,7 +1080,7 @@ ConfigureRestrictProc(
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
 
-static const char *accentNames[] = {
+static const char *const accentNames[] = {
     "Graphite",
     "Red",
     "Orange",
-- 
cgit v0.12


From 68e290fdc0f4ae976acc38fe78754df0481b6acb Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 17 Aug 2020 12:10:28 +0000
Subject: Xcode 9 and 10 builds are failing. Let's see if this helps.

---
 .travis.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 7b1cac1..47eba63 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -162,6 +162,11 @@ jobs:
     - name: "macOS/Clang/Xcode 10/Shared"
       os: osx
       osx_image: xcode10.3
+      addons:
+        homebrew:
+          packages:
+            - tcl-tk
+          update: true
       env:
         - BUILD_DIR=unix
         - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.14"
@@ -171,6 +176,11 @@ jobs:
     - name: "macOS/Clang/Xcode 9/Shared"
       os: osx
       osx_image: xcode9.4
+      addons:
+        homebrew:
+          packages:
+            - tcl-tk
+          update: true
       env:
         - BUILD_DIR=unix
         - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.13"
-- 
cgit v0.12


From ba1d2d6a1b366d9ab02e863d9eb93a70e8e4d0e7 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 17 Aug 2020 13:14:23 +0000
Subject: Update Xcode from 11.5 to 11.6. Make "make install" and "make dist"
 part of the Travis build.

---
 .travis.yml      | 17 ++++++++++++++---
 unix/Makefile.in |  2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cc9f339..b0a78e0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -112,9 +112,9 @@ jobs:
         - BUILD_DIR=unix
         - CFGOPT="--enable-symbols"
 # Testing on Mac, various styles
-    - name: "macOS/Xcode 11.5/Shared/XQuartz"
+    - name: "macOS/Clang/Xcode 11.6/Shared/XQuartz"
       os: osx
-      osx_image: xcode11.5
+      osx_image: xcode11.6
       env:
         - BUILD_DIR=unix
         - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --disable-corefoundation --x-includes=/opt/X11/include --x-libraries=/opt/X11/lib CFLAGS=-I/usr/local/opt/tcl-tk/include"
@@ -130,7 +130,17 @@ jobs:
 #       - cd ${BUILD_DIR}
 #     install: []
 #     script:
-#       - cmd.exe //C vcvarsall.bat x64 '&&' nmake '-f' makefile.vc all tcltest
+#       - cmd.exe //C vcvarsall.bat x64 '&&' nmake '-f' makefile.vc all tktest
+# "make dist" only
+    - name: "Linux: make dist"
+      os: linux
+      dist: bionic
+      compiler: gcc
+      env:
+        - BUILD_DIR=unix
+      script:
+        - touch ../doc/man.macros
+        - make dist
 before_install:
   - |-
       case $TRAVIS_OS_NAME in
@@ -145,6 +155,7 @@ before_script:
   - export ERROR_ON_FAILURES=1
 script:
   - make binaries libraries tktest
+  - make install
 cache:
   directories:
   - $HOME/AppData/Local/Temp/chocolatey
diff --git a/unix/Makefile.in b/unix/Makefile.in
index c1301e7..1e2d67a 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -1508,7 +1508,7 @@ $(TOP_DIR)/manifest.uuid:
 	printf "git." >$(TOP_DIR)/manifest.uuid
 	git rev-parse HEAD >>$(TOP_DIR)/manifest.uuid
 
-dist:   $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(MAC_OSX_DIR)/configure $(TOP_DIR)/doc/man.macros $(TOP_DIR)/manifest.uuid genstubs
+dist:   $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(MAC_OSX_DIR)/configure $(TOP_DIR)/doc/man.macros $(TOP_DIR)/manifest.uuid
 	rm -rf $(DISTDIR)
 	mkdir -p $(DISTDIR)/unix
 	cp -p $(TOP_DIR)/manifest.uuid $(DISTDIR)
-- 
cgit v0.12


From 4897bedc54dcd46849d2288ad10bf6b457dfcdad Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Mon, 17 Aug 2020 21:11:08 +0000
Subject: Remove comment relic.

---
 generic/tkScale.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/generic/tkScale.c b/generic/tkScale.c
index 979d39d..fd2f870 100644
--- a/generic/tkScale.c
+++ b/generic/tkScale.c
@@ -615,11 +615,6 @@ ConfigureScale(
 	    }
 	}
 
-	/*
-	 * Several options need special processing, such as parsing the
-	 * orientation and creating GCs.
-	 */
-
 	scalePtr->fromValue = TkRoundValueToResolution(scalePtr,
 		scalePtr->fromValue);
 	scalePtr->toValue = TkRoundValueToResolution(scalePtr, scalePtr->toValue);
-- 
cgit v0.12


From 69ce8a993ddb35eab3f80ad353471e43db57bd1e Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Mon, 17 Aug 2020 21:15:28 +0000
Subject: Remove rounding of the fromValue to the resolution (which is a
 no-op).

---
 generic/tkScale.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/generic/tkScale.c b/generic/tkScale.c
index fd2f870..c5237be 100644
--- a/generic/tkScale.c
+++ b/generic/tkScale.c
@@ -615,8 +615,11 @@ ConfigureScale(
 	    }
 	}
 
-	scalePtr->fromValue = TkRoundValueToResolution(scalePtr,
-		scalePtr->fromValue);
+        /*
+         * The fromValue shall not be rounded to the resolution, but the
+         * toValue and tickInterval do.
+         */
+
 	scalePtr->toValue = TkRoundValueToResolution(scalePtr, scalePtr->toValue);
 	scalePtr->tickInterval = TkRoundIntervalToResolution(scalePtr,
 		scalePtr->tickInterval);
-- 
cgit v0.12


From ac29dc484022e95b598290946ebecaff9dc401d3 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Tue, 18 Aug 2020 16:36:05 +0000
Subject: Test using XSetClipRectangles on macOS.

---
 generic/tkInt.decls      |  5 +++++
 generic/tkIntXlibDecls.h | 10 +++++++---
 generic/tkStubInit.c     |  2 +-
 macosx/tkMacOSXXStubs.c  | 25 +++++++++++++++++++++++++
 4 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index c39cd16..d6de4a7 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -1823,6 +1823,11 @@ declare 90 aqua {
 declare 91 aqua {
     int XSync(Display *display, Bool discard)
 }
+declare 92 aqua {
+    int XSetClipRectangles(Display *display, GC gc, int clip_x_origin,
+       int clip_y_origin, XRectangle rectangles[], int n, int ordering)
+}
+
 declare 107 aqua {
     int XFlush(Display *display)
 }
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index 5d8f00e..8549880 100644
--- a/generic/tkIntXlibDecls.h
+++ b/generic/tkIntXlibDecls.h
@@ -699,7 +699,10 @@ EXTERN Status		XQueryTree(Display *d, Window w1, Window *w2,
 				Window *w3, Window **w4, unsigned int *ui);
 /* 91 */
 EXTERN int		XSync(Display *display, Bool discard);
-/* Slot 92 is reserved */
+/* 92 */
+EXTERN int		XSetClipRectangles(Display *display, GC gc,
+				int clip_x_origin, int clip_y_origin,
+				XRectangle rectangles[], int n, int ordering);
 /* Slot 93 is reserved */
 /* Slot 94 is reserved */
 /* Slot 95 is reserved */
@@ -1048,7 +1051,7 @@ typedef struct TkIntXlibStubs {
     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 */
-    void (*reserved92)(void);
+    int (*xSetClipRectangles) (Display *display, GC gc, int clip_x_origin, int clip_y_origin, XRectangle rectangles[], int n, int ordering); /* 92 */
     void (*reserved93)(void);
     void (*reserved94)(void);
     void (*reserved95)(void);
@@ -1603,7 +1606,8 @@ extern const TkIntXlibStubs *tkIntXlibStubsPtr;
 	(tkIntXlibStubsPtr->xQueryTree) /* 90 */
 #define XSync \
 	(tkIntXlibStubsPtr->xSync) /* 91 */
-/* Slot 92 is reserved */
+#define XSetClipRectangles \
+	(tkIntXlibStubsPtr->xSetClipRectangles) /* 92 */
 /* Slot 93 is reserved */
 /* Slot 94 is reserved */
 /* Slot 95 is reserved */
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 9a6a0e8..14d9a8b 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -925,7 +925,7 @@ static const TkIntXlibStubs tkIntXlibStubs = {
     XQueryColors, /* 89 */
     XQueryTree, /* 90 */
     XSync, /* 91 */
-    0, /* 92 */
+    XSetClipRectangles, /* 92 */
     0, /* 93 */
     0, /* 94 */
     0, /* 95 */
diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c
index e183ca7..00dc028 100644
--- a/macosx/tkMacOSXXStubs.c
+++ b/macosx/tkMacOSXXStubs.c
@@ -718,6 +718,31 @@ XSync(
     return 0;
 }
 
+int
+XSetClipRectangles(
+    Display *d,
+    GC gc,
+    int clip_x_origin,
+    int clip_y_origin,
+    XRectangle* rectangles,
+    int n,
+    int ordering)
+{
+    TkRegion clipRgn = TkCreateRegion();
+    XSetClipMask(d, gc, None);
+
+    while (n--) {
+    	XRectangle rect = *rectangles;
+
+    	rect.x += clip_x_origin;
+    	rect.y += clip_y_origin;
+    	TkUnionRectWithRegion(&rect, clipRgn, clipRgn);
+    	rectangles++;
+    }
+    TkSetRegion(d, gc, clipRgn);
+    TkDestroyRegion(clipRgn);
+    return 1;
+}
 /*
  *----------------------------------------------------------------------
  *
-- 
cgit v0.12


From 296af77a42b7efdc14a3244bac9647f000eab062 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Tue, 18 Aug 2020 22:27:14 +0000
Subject: Yet another cleanup of TkMacOSXSetupDrawingContext

---
 macosx/tkMacOSXDraw.c | 96 ++++++++++++++++++++++++---------------------------
 1 file changed, 46 insertions(+), 50 deletions(-)

diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index a31819a..bda3529 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -1596,9 +1596,8 @@ TkMacOSXSetupDrawingContext(
 {
     MacDrawable *macDraw = (MacDrawable *) d;
     Bool canDraw = true;
-    NSWindow *win = NULL;
+    TKContentView *view = nil;
     TkMacOSXDrawingContext dc = {};
-    CGRect clipBounds;
 
     /*
      * If the drawable is not a pixmap and it has an associated NSWindow then
@@ -1606,7 +1605,14 @@ TkMacOSXSetupDrawingContext(
      */
 
     if (!(macDraw->flags & TK_IS_PIXMAP)) {
-	win = TkMacOSXDrawableWindow(d);
+	NSWindow *win = TkMacOSXDrawableWindow(d);
+	if (win) {
+	    view = (TKContentView *)[win contentView];
+	}
+	if (!view) {
+	    Tcl_Panic("TkMacOSXSetupDrawingContext(): "
+		    "no NSView to draw into !");
+	}
     }
 
     /*
@@ -1627,65 +1633,54 @@ TkMacOSXSetupDrawingContext(
 
     dc.context = TkMacOSXGetCGContextForDrawable(d);
     if (dc.context) {
-	dc.portBounds = clipBounds = CGContextGetClipBoundingBox(dc.context);
-    } else if (win) {
-	TKContentView *view = (TKContentView *)TkMacOSXDrawableView(macDraw);
+	dc.portBounds = CGContextGetClipBoundingBox(dc.context);
+    } else {
+	NSRect drawingBounds, currentBounds;
 
 	if (!view) {
-	    Tcl_Panic("TkMacOSXSetupDrawingContext(): "
-		    "no NSView to draw into !");
+	    Tcl_Panic("TkMacOSXSetupDrawingContext(): no context to draw into !");
 	}
+	dc.portBounds = NSRectToCGRect([view bounds]);
+	dc.context = GET_CGCONTEXT;
+	dc.view = view;
 	if (dc.clipRgn) {
+	    CGRect clipBounds;
 	    CGAffineTransform t = { .a = 1, .b = 0, .c = 0, .d = -1, .tx = 0,
 				    .ty = [view bounds].size.height};
 	    HIShapeGetBounds(dc.clipRgn, &clipBounds);
 	    clipBounds = CGRectApplyAffineTransform(clipBounds, t);
+	    drawingBounds = NSRectFromCGRect(clipBounds);
+	} else {
+	    drawingBounds = [view bounds];
 	}
-	if (view != [NSView focusView]) {
 
-	    /*
-	     * We can only draw into the view when the current CGContext is
-	     * valid and belongs to the view.  Validity can only be guaranteed
-	     * inside of a view's drawRect or setFrame methods.  The isDrawing
-	     * attribute tells us whether we are being called from drawRect.
-	     * If the CGContext is not valid then we mark our view as needing
-	     * display.
-	     */
+	/*
+	 * We can only draw into the view when the current CGContext is valid
+	 * and belongs to the view.  Validity can only be guaranteed inside of
+	 * a view's drawRect or setFrame methods.  The isDrawing attribute
+	 * tells us whether we are being called from drawRect.  If the
+	 * CGContext is not valid then we mark our view as needing display.
+	 */
 
-	    if (dc.clipRgn) {
-		[view addTkDirtyRect:NSRectFromCGRect(clipBounds)];
-	    } else {
-		[view addTkDirtyRect:[view bounds]];
-	    }
+	if (view != [NSView focusView]) {
+	    [view addTkDirtyRect:drawingBounds];
 	    canDraw = false;
 	    goto end;
-	} else if (dc.clipRgn) {
-
-	    /*
-	     * Drawing will also fail if we are being called from drawRect but
-	     * the clipping rectangle set by drawRect does not contain the
-	     * clipping region of our drawing context.  See bug [2a61eca3a8].
-	     * If we can't draw all of the clipping region of the drawing
-	     * context then we draw whatever we can, but we also add a dirty
-	     * rectangle so the entire widget will get redrawn in the next
-	     * cycle.
-	     */
-
-	    CGRect currentClip = CGContextGetClipBoundingBox(GET_CGCONTEXT);
-	    if (!NSContainsRect(currentClip, clipBounds)) {
-		[view addTkDirtyRect:clipBounds];
-	    }
 	}
 
-	dc.view = view;
-	dc.context = GET_CGCONTEXT;
-	dc.portBounds = NSRectToCGRect([view bounds]);
-	if (dc.clipRgn) {
-	    clipBounds = CGContextGetClipBoundingBox(dc.context);
+	/*
+	 * Drawing will also fail if we are being called from drawRect but the
+	 * clipping rectangle set by drawRect does not contain the clipping
+	 * region of our drawing context.  See bug [2a61eca3a8].  If we can't
+	 * draw all of the clipping region of the drawing context then we draw
+	 * whatever we can, but we also add a dirty rectangle so the entire
+	 * widget will get redrawn in the next cycle.
+	 */
+
+	currentBounds = CGContextGetClipBoundingBox(dc.context);
+	if (!NSContainsRect(currentBounds, drawingBounds)) {
+	    [view addTkDirtyRect:drawingBounds];
 	}
-    } else {
-	Tcl_Panic("TkMacOSXSetupDrawingContext(): "
-		"no context to draw into !");
     }
 
     /*
@@ -1715,11 +1710,12 @@ TkMacOSXSetupDrawingContext(
 	    CGContextRestoreGState(dc.context);
 #endif /* TK_MAC_DEBUG_DRAWING */
 
+	    CGRect b = CGRectApplyAffineTransform(
+		CGContextGetClipBoundingBox(dc.context), t);
 	    CGRect r;
 
-	    if (!HIShapeIsRectangular(dc.clipRgn) || !CGRectContainsRect(
-		*HIShapeGetBounds(dc.clipRgn, &r),
-		CGRectApplyAffineTransform(clipBounds, t))) {
+	    if (!HIShapeIsRectangular(dc.clipRgn) ||
+		!CGRectContainsRect(*HIShapeGetBounds(dc.clipRgn, &r), b)) {
 	    	ChkErr(HIShapeReplacePathInCGContext, dc.clipRgn, dc.context);
 	    	CGContextEOClip(dc.context);
 	    }
@@ -1740,7 +1736,7 @@ TkMacOSXSetupDrawingContext(
 	    double w = gc->line_width;
 
 	    TkMacOSXSetColorInContext(gc, gc->foreground, dc.context);
-	    if (win) {
+	    if (view) {
 		CGContextSetPatternPhase(dc.context, CGSizeMake(
 			dc.portBounds.size.width, dc.portBounds.size.height));
 	    }
-- 
cgit v0.12


From 7cdbb6ae499b0cb38c23d528ff89bba646c52c14 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 19 Aug 2020 08:16:21 +0000
Subject: Move stub entry for XSetClipRectangles to 106, since 92 is already
 filled in Tk 8.7

---
 generic/tkInt.decls      |  2 +-
 generic/tkIntXlibDecls.h | 20 ++++++++++----------
 generic/tkStubInit.c     |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index d6de4a7..a160541 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -1823,7 +1823,7 @@ declare 90 aqua {
 declare 91 aqua {
     int XSync(Display *display, Bool discard)
 }
-declare 92 aqua {
+declare 106 aqua {
     int XSetClipRectangles(Display *display, GC gc, int clip_x_origin,
        int clip_y_origin, XRectangle rectangles[], int n, int ordering)
 }
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index 8549880..9d4200a 100644
--- a/generic/tkIntXlibDecls.h
+++ b/generic/tkIntXlibDecls.h
@@ -699,10 +699,7 @@ 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 int		XSetClipRectangles(Display *display, GC gc,
-				int clip_x_origin, int clip_y_origin,
-				XRectangle rectangles[], int n, int ordering);
+/* Slot 92 is reserved */
 /* Slot 93 is reserved */
 /* Slot 94 is reserved */
 /* Slot 95 is reserved */
@@ -716,7 +713,10 @@ EXTERN int		XSetClipRectangles(Display *display, GC gc,
 /* Slot 103 is reserved */
 /* Slot 104 is reserved */
 /* Slot 105 is reserved */
-/* Slot 106 is reserved */
+/* 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 */
@@ -1051,7 +1051,7 @@ typedef struct TkIntXlibStubs {
     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 */
-    int (*xSetClipRectangles) (Display *display, GC gc, int clip_x_origin, int clip_y_origin, XRectangle rectangles[], int n, int ordering); /* 92 */
+    void (*reserved92)(void);
     void (*reserved93)(void);
     void (*reserved94)(void);
     void (*reserved95)(void);
@@ -1065,7 +1065,7 @@ typedef struct TkIntXlibStubs {
     void (*reserved103)(void);
     void (*reserved104)(void);
     void (*reserved105)(void);
-    void (*reserved106)(void);
+    int (*xSetClipRectangles) (Display *display, GC gc, int clip_x_origin, int clip_y_origin, XRectangle rectangles[], int n, int ordering); /* 106 */
     int (*xFlush) (Display *display); /* 107 */
     int (*xGrabServer) (Display *display); /* 108 */
     int (*xUngrabServer) (Display *display); /* 109 */
@@ -1606,8 +1606,7 @@ extern const TkIntXlibStubs *tkIntXlibStubsPtr;
 	(tkIntXlibStubsPtr->xQueryTree) /* 90 */
 #define XSync \
 	(tkIntXlibStubsPtr->xSync) /* 91 */
-#define XSetClipRectangles \
-	(tkIntXlibStubsPtr->xSetClipRectangles) /* 92 */
+/* Slot 92 is reserved */
 /* Slot 93 is reserved */
 /* Slot 94 is reserved */
 /* Slot 95 is reserved */
@@ -1621,7 +1620,8 @@ extern const TkIntXlibStubs *tkIntXlibStubsPtr;
 /* Slot 103 is reserved */
 /* Slot 104 is reserved */
 /* Slot 105 is reserved */
-/* Slot 106 is reserved */
+#define XSetClipRectangles \
+	(tkIntXlibStubsPtr->xSetClipRectangles) /* 106 */
 #define XFlush \
 	(tkIntXlibStubsPtr->xFlush) /* 107 */
 #define XGrabServer \
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 14d9a8b..0020fac 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -925,7 +925,7 @@ static const TkIntXlibStubs tkIntXlibStubs = {
     XQueryColors, /* 89 */
     XQueryTree, /* 90 */
     XSync, /* 91 */
-    XSetClipRectangles, /* 92 */
+    0, /* 92 */
     0, /* 93 */
     0, /* 94 */
     0, /* 95 */
@@ -939,7 +939,7 @@ static const TkIntXlibStubs tkIntXlibStubs = {
     0, /* 103 */
     0, /* 104 */
     0, /* 105 */
-    0, /* 106 */
+    XSetClipRectangles, /* 106 */
     XFlush, /* 107 */
     XGrabServer, /* 108 */
     XUngrabServer, /* 109 */
-- 
cgit v0.12


From cb769c1f19e1347424a4f97d6ab4dd535c409e6f Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Wed, 19 Aug 2020 13:56:47 +0000
Subject: Adapt systemSelectedTabTextColor to Big Sur.

---
 macosx/tkMacOSXColor.c | 19 ++++++++++++++++---
 macosx/tkMacOSXColor.h |  8 ++------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index 671583b..e9dbfec 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -23,6 +23,7 @@ static Tcl_HashTable systemColors;
 static int numSystemColors;
 static int rgbColorIndex;
 static int controlAccentIndex;
+static int selectedTabTextIndex;
 static Bool useFakeAccentColor = NO;
 static SystemColorDatum **systemColorIndex;
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
@@ -66,7 +67,7 @@ void initColorTable()
 	    if (![NSColor respondsToSelector:colorSelector]) {
 		if ([colorName isEqualToString:@"controlAccentColor"]) {
 		    useFakeAccentColor = YES;
-		} else {
+		} else if (![colorName isEqualToString:@"selectedTabTextColor"]) {
 		    /* Uncomment to print all unsupported colors:              */
 		    /* printf("Unsupported color %s\n", colorName.UTF8String); */
 		    continue;
@@ -143,6 +144,9 @@ void initColorTable()
     hPtr = Tcl_FindHashEntry(&systemColors, "ControlAccentColor");
     entry = (SystemColorDatum *) Tcl_GetHashValue(hPtr);
     controlAccentIndex = entry->index;
+    hPtr = Tcl_FindHashEntry(&systemColors, "SelectedTabTextColor");
+    entry = (SystemColorDatum *) Tcl_GetHashValue(hPtr);
+    selectedTabTextIndex = entry->index;
     [pool drain];
 }
 
@@ -314,10 +318,19 @@ GetRGBA(
 #if MAC_OS_X_VERSION_MAX_ALLOWED < 101500
 	    color = [[NSColor colorForControlTint: [NSColor currentControlTint]]
 			      colorUsingColorSpace:sRGB];
+	    [color getComponents: rgba];
 #endif
-	} else {
-	    color = [[NSColor valueForKey:entry->selector] colorUsingColorSpace:sRGB];
+	    break;
+	}
+	if (entry->index == selectedTabTextIndex) {
+	    int OSVersion = [NSApp macOSVersion];
+	    if (OSVersion > 100600 && OSVersion < 110000) {
+		color = [NSColor whiteColor];
+		[color getComponents: rgba];
+		break;
+	    }
 	}
+	color = [[NSColor valueForKey:entry->selector] colorUsingColorSpace:sRGB];
 	[color getComponents: rgba];
 	break;
     case clearColor:
diff --git a/macosx/tkMacOSXColor.h b/macosx/tkMacOSXColor.h
index 0ff7aee..e27500d 100644
--- a/macosx/tkMacOSXColor.h
+++ b/macosx/tkMacOSXColor.h
@@ -241,12 +241,8 @@ static SystemColorDatum systemColorData[] = {
 {"WindowBackgroundColor7",	    ttkBackground, 7, NULL, 0, NULL },
 /* Apple's SecondaryLabelColor is the same as their LabelColor so we roll our own. */
 {"SecondaryLabelColor",		    ttkBackground, 14, NULL, 0, NULL },
-/* Color to use for notebook tab labels. */
-#if MAC_OS_X_VERSION_MAX_ALLOWED > 1060
-{"SelectedTabTextColor",	    semantic, 0, "whiteColor", 0, NULL },
-#else
-{"SelectedTabTextColor",	    semantic, 0, "blackColor", 0, NULL },
-#endif
+/* Color to use for notebook tab labels -- depends on OS version. */
+{"SelectedTabTextColor",	    semantic, 0, "textColor", 0, NULL },
 /* Semantic colors that we simulate on older systems which don't supoort them. */
 {"ControlAccentColor",		    semantic, 0, "controlAccentColor", 0, NULL },
 {"LabelColor",                      semantic, 0, "blackColor", 0, NULL },
-- 
cgit v0.12


From 682f94fbcea40aea5bdba7feda99af154d48c25a Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Wed, 19 Aug 2020 16:15:22 +0000
Subject: Make TkpReleaseRegion and TkpRetainRegion static; remove mac-specific
 code from xgc.c; remove call to XSetClipMask; add debug logging

---
 macosx/tkMacOSXInt.h        |  2 --
 macosx/tkMacOSXRegion.c     | 32 ++++++++++++++++++++++++--------
 macosx/tkMacOSXSubwindows.c |  2 +-
 macosx/tkMacOSXXStubs.c     |  1 -
 xlib/xgc.c                  | 12 ------------
 5 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/macosx/tkMacOSXInt.h b/macosx/tkMacOSXInt.h
index 89d76ce..6f44014 100644
--- a/macosx/tkMacOSXInt.h
+++ b/macosx/tkMacOSXInt.h
@@ -197,8 +197,6 @@ MODULE_SCOPE int XSetClipRectangles(Display *d, GC gc, int clip_x_origin,
 #endif
 MODULE_SCOPE void TkpClipDrawableToRect(Display *display, Drawable d, int x,
 	int y, int width, int height);
-MODULE_SCOPE void TkpRetainRegion(TkRegion r);
-MODULE_SCOPE void TkpReleaseRegion(TkRegion r);
 MODULE_SCOPE void TkpShiftButton(NSButton *button, NSPoint delta);
 MODULE_SCOPE Bool TkTestLogDisplay(Drawable drawable);
 MODULE_SCOPE Bool TkMacOSXInDarkMode(Tk_Window tkwin);
diff --git a/macosx/tkMacOSXRegion.c b/macosx/tkMacOSXRegion.c
index 4baa3e8..00521e8 100644
--- a/macosx/tkMacOSXRegion.c
+++ b/macosx/tkMacOSXRegion.c
@@ -12,6 +12,16 @@
  */
 
 #include "tkMacOSXPrivate.h"
+static void RetainRegion(TkRegion r);
+static void ReleaseRegion(TkRegion r);
+
+#ifdef DEBUG
+static int totalRegions = 0;
+static int totalRegionRetainCount = 0;
+#define DebugLog(msg, ...) fprintf(stderr, (msg), ##__VA_ARGS__)
+#else
+#define DebugLog(msg, ...)
+#endif
 
 
 /*
@@ -34,7 +44,10 @@
 TkRegion
 TkCreateRegion(void)
 {
-    return (TkRegion) HIShapeCreateMutable();
+    TkRegion region = (TkRegion) HIShapeCreateMutable();
+    DebugLog("Created region: total regions = %d\n", ++totalRegions);
+    RetainRegion(region);
+    return region;
 }
 
 /*
@@ -59,7 +72,8 @@ TkDestroyRegion(
     TkRegion r)
 {
     if (r) {
-	CFRelease(r);
+	DebugLog("Destroyed region: total regions = %d\n", --totalRegions);
+	ReleaseRegion(r);
     }
     return Success;
 }
@@ -320,7 +334,7 @@ TkpBuildRegionFromAlphaData(
 /*
  *----------------------------------------------------------------------
  *
- * TkpRetainRegion --
+ * RetainRegion --
  *
  *	Increases reference count of region.
  *
@@ -333,17 +347,18 @@ TkpBuildRegionFromAlphaData(
  *----------------------------------------------------------------------
  */
 
-void
-TkpRetainRegion(
+static void
+RetainRegion(
     TkRegion r)
 {
     CFRetain(r);
+    DebugLog("Retained region: total count is %d\n", ++totalRegionRetainCount);
 }
 
 /*
  *----------------------------------------------------------------------
  *
- * TkpReleaseRegion --
+ * ReleaseRegion --
  *
  *	Decreases reference count of region.
  *
@@ -356,11 +371,12 @@ TkpRetainRegion(
  *----------------------------------------------------------------------
  */
 
-void
-TkpReleaseRegion(
+static void
+ReleaseRegion(
     TkRegion r)
 {
     CFRelease(r);
+    DebugLog("Released region: total count is %d\n", --totalRegionRetainCount);
 }
 
 /*
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index 899832b..64db1b1 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -874,7 +874,7 @@ TkMacOSXUpdateClipRgn(
 		    visRgn = TkMacOSXGetNativeRegion(r);
 		    ChkErr(HIShapeIntersect, visRgn, rgn, rgn);
 		    CFRelease(visRgn);
-		    TkpReleaseRegion(r);
+		    TkDestroyRegion(r);
 		}
 
 		/*
diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c
index 00dc028..e685e9f 100644
--- a/macosx/tkMacOSXXStubs.c
+++ b/macosx/tkMacOSXXStubs.c
@@ -729,7 +729,6 @@ XSetClipRectangles(
     int ordering)
 {
     TkRegion clipRgn = TkCreateRegion();
-    XSetClipMask(d, gc, None);
 
     while (n--) {
     	XRectangle rect = *rectangles;
diff --git a/xlib/xgc.c b/xlib/xgc.c
index 013ee63..b145395 100644
--- a/xlib/xgc.c
+++ b/xlib/xgc.c
@@ -53,10 +53,6 @@ static TkpClipMask *AllocClipMask(GC gc) {
     if (clip_mask == NULL) {
 	clip_mask = (TkpClipMask *)ckalloc(sizeof(TkpClipMask));
 	gc->clip_mask = (Pixmap) clip_mask;
-#ifdef MAC_OSX_TK
-    } else if (clip_mask->type == TKP_CLIP_REGION) {
-	TkpReleaseRegion(clip_mask->value.region);
-#endif
     }
     return clip_mask;
 }
@@ -79,11 +75,6 @@ static TkpClipMask *AllocClipMask(GC gc) {
 
 static void FreeClipMask(GC gc) {
     if (gc->clip_mask != None) {
-#ifdef MAC_OSX_TK
-	if (((TkpClipMask*) gc->clip_mask)->type == TKP_CLIP_REGION) {
-	    TkpReleaseRegion(((TkpClipMask*) gc->clip_mask)->value.region);
-	}
-#endif
 	ckfree((char *)gc->clip_mask);
 	gc->clip_mask = None;
     }
@@ -499,9 +490,6 @@ TkSetRegion(
 
 	clip_mask->type = TKP_CLIP_REGION;
 	clip_mask->value.region = r;
-#ifdef MAC_OSX_TK
-	TkpRetainRegion(r);
-#endif
     }
     return Success;
 }
-- 
cgit v0.12


From acea84f433c2b5120598536b28215c84c4a74f31 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Wed, 19 Aug 2020 16:32:12 +0000
Subject: More cleanup in TkMacOSXSetupDrawingContext - thanks to Christopher
 Chavez.

---
 macosx/tkMacOSXDraw.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index bda3529..a5c087b 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -1605,10 +1605,7 @@ TkMacOSXSetupDrawingContext(
      */
 
     if (!(macDraw->flags & TK_IS_PIXMAP)) {
-	NSWindow *win = TkMacOSXDrawableWindow(d);
-	if (win) {
-	    view = (TKContentView *)[win contentView];
-	}
+	view = (TKContentView *) TkMacOSXDrawableView(macDraw);
 	if (!view) {
 	    Tcl_Panic("TkMacOSXSetupDrawingContext(): "
 		    "no NSView to draw into !");
@@ -1637,9 +1634,6 @@ TkMacOSXSetupDrawingContext(
     } else {
 	NSRect drawingBounds, currentBounds;
 
-	if (!view) {
-	    Tcl_Panic("TkMacOSXSetupDrawingContext(): no context to draw into !");
-	}
 	dc.portBounds = NSRectToCGRect([view bounds]);
 	dc.context = GET_CGCONTEXT;
 	dc.view = view;
-- 
cgit v0.12


From 8a379f340b71d82c193842252a85172c788248a6 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Wed, 19 Aug 2020 20:19:26 +0000
Subject: Comment out documentation of -border and -unit as layout options.

---
 doc/ttk_style.n         | 18 ++++++++++--------
 generic/ttk/ttkLayout.c |  1 +
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/doc/ttk_style.n b/doc/ttk_style.n
index 5c7aa63..3c0f9ce 100644
--- a/doc/ttk_style.n
+++ b/doc/ttk_style.n
@@ -101,9 +101,10 @@ each element is allocated a parcel.
 Then the parcel actually used by the element is adjusted within
 the allocated parcel.
 Valid options are:
-.TP
-\fB\-border\fR \fIboolean\fR
-Specifies whether the element is drawn after its children. Defaults to 0.
+.\" -border should remain undocumented for now (dubious usefulness)
+.\" .TP
+.\" \fB\-border\fR \fIboolean\fR
+.\" Specifies whether the element is drawn after its children. Defaults to 0.
 .TP
 \fB\-children { \fIsublayout...\fB }\fR
 Specifies a list of elements to place inside the element.
@@ -119,17 +120,18 @@ one of \fBleft\fR, \fBright\fR, \fBtop\fR, or \fBbottom\fR.
 For instance, \fB\-side top\fR allocates the parcel along the top of
 the cavity having width and height respectively the width of the cavity
 and the height of the element.
-If omitted, the allocated parcel is the entire cavity (same result
+If omitted, the allocated parcel is the entire cavity (same effect
 as \fB\-expand\fR 1).
 .TP
 \fB\-sticky\fR \fB[\fInswe\fB]\fR
 Specifies the actual parcel position and size inside the allocated parcel.
 If specified as an empty string then the actual parcel is centered in
 the allocated parcel. Default is \fBnswe\fR. 
-.TP
-\fB\-unit\fR \fIboolean\fR
-Specifies whether the element propagates its state to its children.
-Defaults to 0.
+.\" -unit should remain undocumented for now (dubious usefulness)
+.\" .TP
+.\" \fB\-unit\fR \fIboolean\fR
+.\" Specifies whether the element propagates its state to its children.
+.\" Defaults to 0.
 .PP
 For example:
 .CS
diff --git a/generic/ttk/ttkLayout.c b/generic/ttk/ttkLayout.c
index 4588c01..fdbeacf 100644
--- a/generic/ttk/ttkLayout.c
+++ b/generic/ttk/ttkLayout.c
@@ -810,6 +810,7 @@ Tcl_Obj *Ttk_UnparseLayoutTemplate(Ttk_TemplateNode *node)
 	APPENDSTR("-sticky");
 	APPENDOBJ(Ttk_NewStickyObj(flags & _TTK_MASK_STICK));
 
+	/* @@@ Check again: are these necessary? Can't see any effect! */
 	if (flags & TTK_BORDER)	{ APPENDSTR("-border"); APPENDSTR("1"); }
 	if (flags & TTK_UNIT) 	{ APPENDSTR("-unit"); APPENDSTR("1"); }
 
-- 
cgit v0.12


From db413098ea545ba44bf7d982f1b62d82985acf2b Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Wed, 19 Aug 2020 21:06:54 +0000
Subject: Partially revert [2fa30303] since there is no need to give
 -placeholderforeground by specifying its default value (even if this default
 is platform-specific).

---
 library/ttk/aquaTheme.tcl  | 9 +++------
 library/ttk/vistaTheme.tcl | 9 +++------
 library/ttk/xpTheme.tcl    | 9 +++------
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/library/ttk/aquaTheme.tcl b/library/ttk/aquaTheme.tcl
index f5b1026..8bba226 100644
--- a/library/ttk/aquaTheme.tcl
+++ b/library/ttk/aquaTheme.tcl
@@ -38,8 +38,7 @@ namespace eval ttk::theme::aqua {
 	# Entry
 	ttk::style configure TEntry \
 	    -foreground systemTextColor \
-	    -background systemTextBackgroundColor \
-	    -placeholderforeground systemPlaceholderTextColor
+	    -background systemTextBackgroundColor
 	ttk::style map TEntry \
 	    -foreground {
 		disabled systemDisabledControlTextColor
@@ -71,8 +70,7 @@ namespace eval ttk::theme::aqua {
 	# Combobox:
 	ttk::style configure TCombobox \
 	    -foreground systemTextColor \
-	    -background systemTransparent \
-	    -placeholderforeground systemPlaceholderTextColor
+	    -background systemTransparent
 	ttk::style map TCombobox \
 	    -foreground {
 		disabled systemDisabledControlTextColor
@@ -89,8 +87,7 @@ namespace eval ttk::theme::aqua {
 	    -foreground systemTextColor \
 	    -background systemTextBackgroundColor \
 	    -selectforeground systemSelectedTextColor \
-	    -selectbackground systemSelectedTextBackgroundColor \
-	    -placeholderforeground systemPlaceholderTextColor
+	    -selectbackground systemSelectedTextBackgroundColor
 	ttk::style map TSpinbox \
 	    -foreground {
 		disabled systemDisabledControlTextColor
diff --git a/library/ttk/vistaTheme.tcl b/library/ttk/vistaTheme.tcl
index d37cc27..165b496 100644
--- a/library/ttk/vistaTheme.tcl
+++ b/library/ttk/vistaTheme.tcl
@@ -58,8 +58,7 @@ namespace eval ttk::theme::vista {
 	ttk::style configure Toolbutton -padding {4 4}
 
         # Combobox
-	ttk::style configure TCombobox -padding 2 \
-	    -placeholderforeground SystemPlaceholderText
+	ttk::style configure TCombobox -padding 2
         ttk::style element create Combobox.border vsapi \
             COMBOBOX 4 {disabled 4 focus 3 active 2 hover 2 {} 1}
         ttk::style element create Combobox.background vsapi \
@@ -98,8 +97,7 @@ namespace eval ttk::theme::vista {
 	    ;
 
         # Entry
-        ttk::style configure TEntry -padding {1 1 1 1} \
-            -placeholderforeground SystemPlaceholderText
+        ttk::style configure TEntry -padding {1 1 1 1} ;# Needs lookup
         ttk::style element create Entry.field vsapi \
             EDIT 6 {disabled 4 focus 3 hover 2 {} 1} -padding {2 2 2 2}
         ttk::style element create Entry.background vsapi \
@@ -119,8 +117,7 @@ namespace eval ttk::theme::vista {
 	    ;
 
         # Spinbox
-        ttk::style configure TSpinbox -padding 0 \
-	    -placeholderforeground SystemPlaceholderText
+        ttk::style configure TSpinbox -padding 0
         ttk::style element create Spinbox.field vsapi \
             EDIT 9 {disabled 4 focus 3 hover 2 {} 1} -padding {1 1 1 2}
         ttk::style element create Spinbox.background vsapi \
diff --git a/library/ttk/xpTheme.tcl b/library/ttk/xpTheme.tcl
index 9cfa1ef..da7b422 100644
--- a/library/ttk/xpTheme.tcl
+++ b/library/ttk/xpTheme.tcl
@@ -31,14 +31,12 @@ namespace eval ttk::theme::xpnative {
 	ttk::style configure TLabelframe.Label -foreground "#0046d5"
 
 	# OR: -padding {3 3 3 6}, which some apps seem to use.
-	ttk::style configure TEntry -padding {2 2 2 4} \
-            -placeholderforeground SystemPlaceholderText
+	ttk::style configure TEntry -padding {2 2 2 4}
 	ttk::style map TEntry \
 	    -selectbackground [list !focus SystemWindow] \
 	    -selectforeground [list !focus SystemWindowText] \
 	    ;
-	ttk::style configure TCombobox -padding 2 \
-	    -placeholderforeground SystemPlaceholderText
+	ttk::style configure TCombobox -padding 2
 	ttk::style map TCombobox \
 	    -selectbackground [list !focus SystemWindow] \
 	    -selectforeground [list !focus SystemWindowText] \
@@ -49,8 +47,7 @@ namespace eval ttk::theme::xpnative {
 	    -focusfill	[list {readonly focus} SystemHighlight] \
 	    ;
 
-	ttk::style configure TSpinbox -padding {2 0 14 0} \
-	    -placeholderforeground SystemPlaceholderText
+	ttk::style configure TSpinbox -padding {2 0 14 0}
 	ttk::style map TSpinbox \
 	    -selectbackground [list !focus SystemWindow] \
 	    -selectforeground [list !focus SystemWindowText] \
-- 
cgit v0.12


From 8a755bc3f0d29d9d844aef6a3ca00e71b6733c69 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Wed, 19 Aug 2020 21:10:24 +0000
Subject: Ditto for winTheme.tcl (forgotten in previous commit).

---
 library/ttk/winTheme.tcl | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/library/ttk/winTheme.tcl b/library/ttk/winTheme.tcl
index bc81ced..db05b45 100644
--- a/library/ttk/winTheme.tcl
+++ b/library/ttk/winTheme.tcl
@@ -29,8 +29,7 @@ namespace eval ttk::theme::winnative {
 	ttk::style map TButton -relief {{!disabled pressed} sunken}
 
 	ttk::style configure TEntry \
-	    -padding 2 -selectborderwidth 0 -insertwidth 1 \
-            -placeholderforeground SystemPlaceholderText
+	    -padding 2 -selectborderwidth 0 -insertwidth 1
 	ttk::style map TEntry \
 	    -fieldbackground \
 	    	[list readonly SystemButtonFace disabled SystemButtonFace] \
@@ -38,8 +37,7 @@ namespace eval ttk::theme::winnative {
 	    -selectforeground [list !focus SystemWindowText] \
 	    ;
 
-	ttk::style configure TCombobox -padding 2 \
-	    -placeholderforeground SystemPlaceholderText
+	ttk::style configure TCombobox -padding 2
 	ttk::style map TCombobox \
 	    -selectbackground [list !focus SystemWindow] \
 	    -selectforeground [list !focus SystemWindowText] \
@@ -57,8 +55,7 @@ namespace eval ttk::theme::winnative {
 	ttk::style configure ComboboxPopdownFrame \
 	    -borderwidth 1 -relief solid
 
-        ttk::style configure TSpinbox -padding {2 0 16 0} \
-	    -placeholderforeground SystemPlaceholderText
+        ttk::style configure TSpinbox -padding {2 0 16 0}
 
 	ttk::style configure TLabelframe -borderwidth 2 -relief groove
 
-- 
cgit v0.12


From 914c191b92ad40942ff18e343bddb6b6baca72d5 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Wed, 19 Aug 2020 21:46:13 +0000
Subject: As it is currently implemented (more or less copied from
 -foreground), -placeholderforeground for ttk widget is both a widget option
 and a styling option. Document this, and add a test for the styling option.

---
 doc/ttk_combobox.n   |  4 +++-
 doc/ttk_entry.n      |  4 +++-
 doc/ttk_spinbox.n    |  4 +++-
 doc/ttk_widget.n     |  9 +++++----
 tests/ttk/entry.test | 12 ++++++++++++
 5 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/doc/ttk_combobox.n b/doc/ttk_combobox.n
index 3ec3e77..3ece362 100644
--- a/doc/ttk_combobox.n
+++ b/doc/ttk_combobox.n
@@ -19,7 +19,7 @@ the user may select the value of the text field from among the
 values in the list.
 .SO ttk_widget
 \-class	\-cursor	\-takefocus
-\-style	\-placeholder
+\-style	\-placeholder	\-placeholderforeground
 .SE
 .\" ALSO: Other entry widget options
 .SH "WIDGET-SPECIFIC OPTIONS"
@@ -148,6 +148,8 @@ Can only be changed when using non-native and non-graphical themes.
 .br
 \fB\-padding\fP \fIpadding\fP
 .br
+\fB\-placeholderforeground\fP \fIcolor\fP
+.br
 \fB\-postoffset\fP \fIpadding\fP
 .br
 \fB\-selectbackground\fP \fIcolor\fP
diff --git a/doc/ttk_entry.n b/doc/ttk_entry.n
index 552700a..62b9951 100644
--- a/doc/ttk_entry.n
+++ b/doc/ttk_entry.n
@@ -26,7 +26,7 @@ standard \fB\-xscrollcommand\fR option and \fBxview\fR widget command.
 \-class	\-cursor
 \-font	\-foreground
 \-style
-\-takefocus	\-xscrollcommand	\-placeholder
+\-takefocus	\-xscrollcommand	\-placeholder	\-placeholderforeground
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-exportselection exportSelection ExportSelection
@@ -454,6 +454,8 @@ Some themes use a graphical background and their field background colors cannot
 .br
 \fB\-padding\fP \fIpadding\fP
 .br
+\fB\-placeholderforeground\fP \fIcolor\fP
+.br
 \fB\-relief\fP \fIrelief\fP
 .br
 \fB\-selectbackground\fP \fIcolor\fP
diff --git a/doc/ttk_spinbox.n b/doc/ttk_spinbox.n
index c18f987..b8f3ca2 100644
--- a/doc/ttk_spinbox.n
+++ b/doc/ttk_spinbox.n
@@ -22,7 +22,7 @@ of the \fBttk::entry\fR widget including support of the
 to a Tcl variable.
 .SO ttk_widget
 \-class	\-cursor	\-state	\-style
-\-takefocus	\-xscrollcommand	\-placeholder
+\-takefocus	\-xscrollcommand	\-placeholder	\-placeholderforeground
 .SE
 .SO ttk_entry
 \-validate	\-validatecommand
@@ -111,6 +111,8 @@ value is specified for \fB\-fieldbackground\fP. Otherwise it is ignored.
 .br
 \fB\-padding\fP \fIpadding\fP
 .br
+\fB\-placeholderforeground\fP \fIcolor\fP
+.br
 \fB\-selectbackground\fP \fIcolor\fP
 .br
 \fB\-selectforeground\fP \fIcolor\fP
diff --git a/doc/ttk_widget.n b/doc/ttk_widget.n
index 73affdd..17f1d88 100644
--- a/doc/ttk_widget.n
+++ b/doc/ttk_widget.n
@@ -152,13 +152,14 @@ to zero, then automatic wrapping is not performed; otherwise
 the text is split into lines such that no line is longer
 than the specified value.
 .SH "ENTRY OPTIONS"
-The following option is supported by entry, spinbox and combobox:
+The following options are supported by entry, spinbox and combobox:
 .OP \-placeholder placeHolder PlaceHolder
 Specifies a help text string to display if no text is otherwise displayed,
 that is when the widget is empty. The placeholder text is displayed using
-the values of the \fB\-font\fR and \fB\-justify\fR options. The foreground
-color of the placeholder text can be changed using the
-\fB\-placeholderforeground\fR style option.
+the values of the \fB\-font\fR, \fB\-justify\fR and
+\fB\-placeholderforeground\fR options.
+.OP \-placeholderforeground placeHolderForeground PlaceHolderForeground
+Specifies the foreground color of the placeholder text.
 .SH "COMPATIBILITY OPTIONS"
 This option is only available for themed widgets that have
 .QW corresponding
diff --git a/tests/ttk/entry.test b/tests/ttk/entry.test
index a2d6016..f3174ae 100644
--- a/tests/ttk/entry.test
+++ b/tests/ttk/entry.test
@@ -342,6 +342,18 @@ test entry-10.2 {configuration option: "-placeholderforeground"} -setup {
     destroy .e
 } -result {red}
 
+test entry-10.3 {styling option: "-placeholderforeground"} -setup {
+    pack [ttk::entry .e]
+} -body {
+    set current [ttk::style configure TEntry -placeholderforeground]
+    ttk::style configure TEntry -placeholderforeground blue
+    set res [ttk::style configure TEntry -placeholderforeground]
+    ttk::style configure TEntry -placeholderforeground $current
+    set res
+} -cleanup {
+    destroy .e
+} -result {blue}
+
 test entry-11.1 {Bug [2830360fff] - Don't loose invalid at focus events} -setup {
     pack [ttk::entry .e]
     update
-- 
cgit v0.12


From 06b5ea26625d50fb3cf48c115b4efa0115f20d9e Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 20 Aug 2020 07:49:01 +0000
Subject: New macro TkNewIndexObj(), which handled indices >= 2147483648
 correctly when compiled against Tcl 9.0 headers.

---
 generic/tkEntry.c         |  4 ++--
 generic/tkInt.h           |  1 +
 generic/tkMenu.c          |  5 ++---
 generic/ttk/ttkEntry.c    | 14 +++++++-------
 generic/ttk/ttkNotebook.c | 12 ++++++------
 generic/ttk/ttkTreeview.c | 31 +++++++++++++------------------
 6 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/generic/tkEntry.c b/generic/tkEntry.c
index f225420..f8db7e5 100644
--- a/generic/tkEntry.c
+++ b/generic/tkEntry.c
@@ -737,7 +737,7 @@ EntryWidgetObjCmd(
 		&index) != TCL_OK) {
 	    goto error;
 	}
-	Tcl_SetObjResult(interp, Tcl_NewWideIntObj(index));
+	Tcl_SetObjResult(interp, TkNewIndexObj(index));
 	break;
     }
 
@@ -3995,7 +3995,7 @@ SpinboxWidgetObjCmd(
 		&index) != TCL_OK) {
 	    goto error;
 	}
-	Tcl_SetObjResult(interp, Tcl_NewWideIntObj((int)index));
+	Tcl_SetObjResult(interp, TkNewIndexObj(index));
 	break;
     }
 
diff --git a/generic/tkInt.h b/generic/tkInt.h
index 7174866..91277b7 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -1365,6 +1365,7 @@ MODULE_SCOPE void	TkRotatePoint(double originX, double originY,
 			    double *yPtr);
 MODULE_SCOPE int TkGetIntForIndex(Tcl_Obj *, TkSizeT, int lastOK, TkSizeT*);
 
+#define TkNewIndexObj(value) Tcl_NewWideIntObj((Tcl_WideInt)(value + 1) - 1)
 
 #ifdef _WIN32
 #define TkParseColor XParseColor
diff --git a/generic/tkMenu.c b/generic/tkMenu.c
index 60f9eac..6ba569e 100644
--- a/generic/tkMenu.c
+++ b/generic/tkMenu.c
@@ -845,9 +845,8 @@ MenuWidgetObjCmd(
 	}
 	if (index == TCL_INDEX_NONE) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj("none", -1));
-	} else {
-	    Tcl_SetObjResult(interp, Tcl_NewWideIntObj(index));
-	}
+	} else
+	Tcl_SetObjResult(interp, TkNewIndexObj(index));
 	break;
     }
     case MENU_INSERT:
diff --git a/generic/ttk/ttkEntry.c b/generic/ttk/ttkEntry.c
index add27c2..f82c701 100644
--- a/generic/ttk/ttkEntry.c
+++ b/generic/ttk/ttkEntry.c
@@ -600,9 +600,9 @@ EntryValidateChange(
     VMODE vmode = entryPtr->entry.validate;
     int code, change_ok;
 
-    if (   (entryPtr->entry.validateCmd == NULL)
+    if ((entryPtr->entry.validateCmd == NULL)
 	|| (entryPtr->core.flags & VALIDATING)
-	|| !EntryNeedsValidation(vmode, reason) )
+	|| !EntryNeedsValidation(vmode, reason))
     {
 	return TCL_OK;
     }
@@ -1393,7 +1393,7 @@ EntryIndex(
     const char *string;
 
     if (TCL_OK == TkGetIntForIndex(indexObj, entryPtr->entry.numChars - 1, 1, &idx)) {
-    	if (idx + 1 > entryPtr->entry.numChars + 1) {
+    	if ((idx != TCL_INDEX_NONE) && (idx > entryPtr->entry.numChars)) {
     	    idx = entryPtr->entry.numChars;
     	}
     	*indexPtr = idx;
@@ -1577,7 +1577,7 @@ EntryIndexCommand(
     if (EntryIndex(interp, entryPtr, objv[2], &index) != TCL_OK) {
 	return TCL_ERROR;
     }
-    Tcl_SetObjResult(interp, Tcl_NewWideIntObj(index));
+    Tcl_SetObjResult(interp, TkNewIndexObj(index));
     return TCL_OK;
 }
 
@@ -1650,7 +1650,7 @@ static int EntrySelectionRangeCommand(
 	Tcl_WrongNumArgs(interp, 3, objv, "start end");
 	return TCL_ERROR;
     }
-    if (    EntryIndex(interp, entryPtr, objv[3], &start) != TCL_OK
+    if (EntryIndex(interp, entryPtr, objv[3], &start) != TCL_OK
          || EntryIndex(interp, entryPtr, objv[4], &end) != TCL_OK) {
 	return TCL_ERROR;
     }
@@ -1849,7 +1849,7 @@ static int ComboboxCurrentCommand(
     if (objc == 2) {
 	/* Check if currentIndex still valid:
 	 */
-	if (    currentIndex == TCL_INDEX_NONE
+	if (currentIndex == TCL_INDEX_NONE
 	     || currentIndex >= (TkSizeT)nValues
 	     || strcmp(currentValue,Tcl_GetString(values[currentIndex]))
 	   )
@@ -1867,7 +1867,7 @@ static int ComboboxCurrentCommand(
 	    }
 	}
 	cbPtr->combobox.currentIndex = currentIndex;
-	Tcl_SetObjResult(interp, Tcl_NewWideIntObj((int)currentIndex));
+	Tcl_SetObjResult(interp, TkNewIndexObj(currentIndex));
 	return TCL_OK;
     } else if (objc == 3) {
 	TkSizeT idx;
diff --git a/generic/ttk/ttkNotebook.c b/generic/ttk/ttkNotebook.c
index 7ad46a4..784a38e 100644
--- a/generic/ttk/ttkNotebook.c
+++ b/generic/ttk/ttkNotebook.c
@@ -1079,7 +1079,7 @@ static int NotebookIdentifyCommand(
 	return TCL_ERROR;
     }
 
-    if (   Tcl_GetIntFromObj(interp, objv[objc-2], &x) != TCL_OK
+    if (Tcl_GetIntFromObj(interp, objv[objc-2], &x) != TCL_OK
 	|| Tcl_GetIntFromObj(interp, objv[objc-1], &y) != TCL_OK
 	|| (objc == 5 && Tcl_GetIndexFromObjStruct(interp, objv[2], whatTable,
 		sizeof(char *), "option", 0, &what) != TCL_OK)
@@ -1108,9 +1108,8 @@ static int NotebookIdentifyCommand(
 	    }
 	    break;
 	case IDENTIFY_TAB:
-	    if (tabIndex != TCL_INDEX_NONE) {
-		Tcl_SetObjResult(interp, Tcl_NewWideIntObj(tabIndex));
-	    }
+	    if (tabIndex != TCL_INDEX_NONE)
+	    Tcl_SetObjResult(interp, TkNewIndexObj(tabIndex));
 	    break;
     }
     return TCL_OK;
@@ -1134,8 +1133,9 @@ static int NotebookIndexCommand(
     }
 
     status = FindTabIndex(interp, nb, objv[2], &index);
-    if (status == TCL_OK && index != TCL_INDEX_NONE) {
-	Tcl_SetObjResult(interp, Tcl_NewWideIntObj(index));
+	if (status == TCL_OK) {
+	if (index != TCL_INDEX_NONE)
+	Tcl_SetObjResult(interp, TkNewIndexObj(index));
     }
 
     return status;
diff --git a/generic/ttk/ttkTreeview.c b/generic/ttk/ttkTreeview.c
index 76a9e6f..33c3466 100644
--- a/generic/ttk/ttkTreeview.c
+++ b/generic/ttk/ttkTreeview.c
@@ -792,9 +792,8 @@ static int PickupSlack(Treeview *tv, int extra)
 {
     int newSlack = tv->tree.slack + extra;
 
-    if (   (newSlack < 0 && 0 <= tv->tree.slack)
-	|| (newSlack > 0 && 0 >= tv->tree.slack))
-    {
+    if ((newSlack < 0 && 0 <= tv->tree.slack)
+	    || (newSlack > 0 && 0 >= tv->tree.slack)) {
 	tv->tree.slack = 0;
 	return newSlack;
     } else {
@@ -1101,10 +1100,9 @@ TreeviewConfigure(Tcl_Interp *interp, void *recordPtr, int mask)
 	TtkScrollbarUpdateRequired(tv->tree.xscrollHandle);
 	TtkScrollbarUpdateRequired(tv->tree.yscrollHandle);
     }
-    if (  (mask & SHOW_CHANGED)
-	&& GetEnumSetFromObj(
-		    interp,tv->tree.showObj,showStrings,&showFlags) != TCL_OK)
-    {
+    if ((mask & SHOW_CHANGED)
+	    && GetEnumSetFromObj(
+		    interp,tv->tree.showObj,showStrings,&showFlags) != TCL_OK) {
 	return TCL_ERROR;
     }
 
@@ -2109,7 +2107,7 @@ static int TreeviewIndexCommand(
 {
     Treeview *tv = (Treeview *)recordPtr;
     TreeItem *item;
-    int index = 0;
+    TkSizeT index = 0;
 
     if (objc != 3) {
 	Tcl_WrongNumArgs(interp, 2, objv, "item");
@@ -2125,7 +2123,7 @@ static int TreeviewIndexCommand(
 	item = item->prev;
     }
 
-    Tcl_SetObjResult(interp, Tcl_NewWideIntObj(index));
+    Tcl_SetObjResult(interp, TkNewIndexObj(index));
     return TCL_OK;
 }
 
@@ -2201,9 +2199,8 @@ static int TreeviewHorribleIdentify(
 
     /* ASSERT: objc == 4 */
 
-    if (   Tcl_GetIntFromObj(interp, objv[2], &x) != TCL_OK
-	|| Tcl_GetIntFromObj(interp, objv[3], &y) != TCL_OK
-    ) {
+    if (Tcl_GetIntFromObj(interp, objv[2], &x) != TCL_OK
+	    || Tcl_GetIntFromObj(interp, objv[3], &y) != TCL_OK) {
 	return TCL_ERROR;
     }
 
@@ -2750,9 +2747,8 @@ static int TreeviewMoveCommand(
 	Tcl_WrongNumArgs(interp, 2, objv, "item parent index");
 	return TCL_ERROR;
     }
-    if (   (item = FindItem(interp, tv, objv[2])) == 0
-	|| (parent = FindItem(interp, tv, objv[3])) == 0)
-    {
+    if ((item = FindItem(interp, tv, objv[2])) == 0
+	    || (parent = FindItem(interp, tv, objv[3])) == 0) {
 	return TCL_ERROR;
     }
 
@@ -2879,9 +2875,8 @@ static int TreeviewDragCommand(
 	return TCL_ERROR;
     }
 
-    if (  (column = FindColumn(interp, tv, objv[2])) == 0
-        || Tcl_GetIntFromObj(interp, objv[3], &newx) != TCL_OK)
-    {
+    if ((column = FindColumn(interp, tv, objv[2])) == 0
+	    || Tcl_GetIntFromObj(interp, objv[3], &newx) != TCL_OK) {
 	return TCL_ERROR;
     }
 
-- 
cgit v0.12


From 22a9bc4bd75e5479537768884f7ead683e5e51d9 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 20 Aug 2020 14:02:42 +0000
Subject: One more use of TkNewIndexObj() macro. More code cleanup

---
 generic/tkFont.c        | 3 +--
 generic/tkListbox.c     | 4 ++--
 generic/tkObj.c         | 2 +-
 generic/ttk/ttkEntry.c  | 2 +-
 macosx/tkMacOSXNotify.c | 2 +-
 tests/dialog.test       | 2 +-
 tests/font.test         | 4 ++--
 tests/grab.test         | 2 +-
 tests/listbox.test      | 4 ++--
 tests/menuDraw.test     | 2 +-
 tests/text.test         | 2 +-
 tests/textDisp.test     | 4 ++--
 tests/ttk/spinbox.test  | 2 +-
 win/tkWinMenu.c         | 5 +++--
 14 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/generic/tkFont.c b/generic/tkFont.c
index d2aa6d2..d132c0f 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.c
@@ -2738,7 +2738,7 @@ Tk_CharBbox(
 				 * index, if non-NULL. */
 {
     TextLayout *layoutPtr = (TextLayout *) layout;
-    LayoutChunk *chunkPtr;
+    LayoutChunk *chunkPtr = layoutPtr->chunks;
     int i, x = 0, w;
     Tk_Font tkfont;
     TkFont *fontPtr;
@@ -2748,7 +2748,6 @@ Tk_CharBbox(
 	return 0;
     }
 
-    chunkPtr = layoutPtr->chunks;
     tkfont = layoutPtr->tkfont;
     fontPtr = (TkFont *) tkfont;
 
diff --git a/generic/tkListbox.c b/generic/tkListbox.c
index e738155..a9eee94 100644
--- a/generic/tkListbox.c
+++ b/generic/tkListbox.c
@@ -842,7 +842,7 @@ ListboxWidgetObjCmd(
 	if (result != TCL_OK) {
 	    break;
 	}
-	Tcl_SetObjResult(interp, Tcl_NewWideIntObj(index));
+	Tcl_SetObjResult(interp, TkNewIndexObj(index));
 	result = TCL_OK;
 	break;
 
@@ -2742,7 +2742,7 @@ GetListboxIndex(
 
     result = TkGetIntForIndex(indexObj, listPtr->nElements - 1, lastOK, &idx);
     if (result == TCL_OK) {
-    	if (idx + 1 > (TkSizeT)listPtr->nElements + 1) {
+    	if ((idx != TCL_INDEX_NONE) && (idx > (TkSizeT)listPtr->nElements)) {
     	    idx = listPtr->nElements;
     	}
     	*indexPtr = (int)idx;
diff --git a/generic/tkObj.c b/generic/tkObj.c
index 63c6db7..80338ee 100644
--- a/generic/tkObj.c
+++ b/generic/tkObj.c
@@ -117,7 +117,7 @@ extern const struct TclIntStubs *tclIntStubsPtr;
 	tclIntStubsPtr->tclGetIntForIndex((interp), (obj), (max), (ptr)))
 #elif TCL_MINOR_VERSION < 7
 extern int TclGetIntForIndex(Tcl_Interp*,  Tcl_Obj *, int, int*);
-# define Tcl_GetIntForIndex TclGetIntForIndex
+# define Tcl_GetIntForIndex(interp, obj, max, ptr) TclGetIntForIndex(interp, obj, max, ptr)
 #endif
 #endif
 
diff --git a/generic/ttk/ttkEntry.c b/generic/ttk/ttkEntry.c
index f82c701..81f490c 100644
--- a/generic/ttk/ttkEntry.c
+++ b/generic/ttk/ttkEntry.c
@@ -1711,7 +1711,7 @@ static int EntryValidateCommand(
     if (code == TCL_ERROR)
 	return code;
 
-    Tcl_SetObjResult(interp, Tcl_NewWideIntObj(code == TCL_OK));
+    Tcl_SetObjResult(interp, Tcl_NewBooleanObj(code == TCL_OK));
     return TCL_OK;
 }
 
diff --git a/macosx/tkMacOSXNotify.c b/macosx/tkMacOSXNotify.c
index a4f971f..3247ade 100644
--- a/macosx/tkMacOSXNotify.c
+++ b/macosx/tkMacOSXNotify.c
@@ -13,10 +13,10 @@
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
+#include <tclInt.h>
 #include "tkMacOSXPrivate.h"
 #include "tkMacOSXInt.h"
 #include "tkMacOSXConstants.h"
-#include <tclInt.h>
 #import <objc/objc-auto.h>
 
 /* This is not used for anything at the moment. */
diff --git a/tests/dialog.test b/tests/dialog.test
index 3ca5146..692d928 100644
--- a/tests/dialog.test
+++ b/tests/dialog.test
@@ -60,7 +60,7 @@ test dialog-2.3 {tk_dialog operation} -body {
     return $res
 } -cleanup {
     destroy .b
-} -result {-1}
+} -result -1
 
 cleanupTests
 return
diff --git a/tests/font.test b/tests/font.test
index aa7137a..28ac799 100644
--- a/tests/font.test
+++ b/tests/font.test
@@ -1681,14 +1681,14 @@ destroy .t.f
 pack [label .t.f]
 update
 test font-27.1 {Tk_UnderlineTextLayout procedure: no underline chosen} -body {
-    .t.f config -text "foo" -under -1
+    .t.f config -text "foo" -underline -1
 } -result {}
 test font-27.2 {Tk_UnderlineTextLayout procedure: underline not visible} -body {
     .t.f config -text "000          00000" -wrap [expr $ax*7] -under 10
 } -result {}
 test font-27.3 {Tk_UnderlineTextLayout procedure: underline is visible} -body {
     .t.f config -text "000          00000" -wrap [expr $ax*7] -under 5
-    .t.f config -wrap -1 -under -1
+    .t.f config -wrap -1 -underline -1
 } -result {}
 destroy .t.f
 
diff --git a/tests/grab.test b/tests/grab.test
index 653d756..0be5b61 100644
--- a/tests/grab.test
+++ b/tests/grab.test
@@ -107,7 +107,7 @@ test grab-2.1 {Tk_GrabObjCmd, grab status gives correct status} -body {
     grab status .
 } -cleanup {
     grab release .
-} -result {none}
+} -result none
 test grab-2.2 {Tk_GrabObjCmd, grab status gives correct status} -body {
     set curr [grab current .]
     if { [string length $curr] > 0 } {
diff --git a/tests/listbox.test b/tests/listbox.test
index 3520f99..9b667cd 100644
--- a/tests/listbox.test
+++ b/tests/listbox.test
@@ -718,7 +718,7 @@ test listbox-3.60 {ListboxWidgetCmd procedure, "index" option} -body {
 } -result 2
 test listbox-3.61 {ListboxWidgetCmd procedure, "index" option} -body {
     .l index -1
-} -result {-1}
+} -result -1
 test listbox-3.62 {ListboxWidgetCmd procedure, "index" option} -body {
     .l index end
 } -result 18
@@ -2132,7 +2132,7 @@ test listbox-10.19 {GetListboxIndex procedure} -setup {
     .l index -1
 } -cleanup {
     destroy .l
-} -result  -1
+} -result -1
 test listbox-10.20 {GetListboxIndex procedure} -setup {
     destroy .l
 } -body {
diff --git a/tests/menuDraw.test b/tests/menuDraw.test
index 9382974..bf15f25 100644
--- a/tests/menuDraw.test
+++ b/tests/menuDraw.test
@@ -561,7 +561,7 @@ test menuDraw-15.2 {TkPostTearoffMenu - Deactivation} -setup {
     $tearoff index active
 } -cleanup {
     deleteWindows
-} -result {none}
+} -result none
 test menuDraw-15.3 {TkPostTearoffMenu - post command} -setup {
     deleteWindows
 } -body {
diff --git a/tests/text.test b/tests/text.test
index 4a5c1b3..1fbb9d8 100644
--- a/tests/text.test
+++ b/tests/text.test
@@ -2648,7 +2648,7 @@ test text-10.36 {TextWidgetCmd procedure, "count" option} -setup {
     .t count -lines 2.7 "1.0 lineend"
 } -cleanup {
     destroy .t
-} -result {-1}
+} -result -1
 test text-10.37 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
diff --git a/tests/textDisp.test b/tests/textDisp.test
index aeb1a70..4050823 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -1346,11 +1346,11 @@ test textDisp-9.10 {TkTextRedrawTag} {
     .t insert 1.0 "Line 1\nLine 2 is long enough to wrap\nLine 3 is also long enough to wrap\nLine 4"
     .t tag add big 1.0 2.0
     updateText
-    set tk_textRedraw {none}
+    set tk_textRedraw none
     .t tag add big 1.3 1.5
     updateText
     set tk_textRedraw
-} {none}
+} none
 test textDisp-9.11 {TkTextRedrawTag} {
     .t configure -wrap char
     .t delete 1.0 end
diff --git a/tests/ttk/spinbox.test b/tests/ttk/spinbox.test
index 4bdabee..b5a9ab5 100644
--- a/tests/ttk/spinbox.test
+++ b/tests/ttk/spinbox.test
@@ -126,7 +126,7 @@ test spinbox-1.8.2 "option -validate" -setup {
     .sb cget -validate
 } -cleanup {
     destroy .sb
-} -result {none}
+} -result none
 
 test spinbox-1.8.3 "option -validate" -setup {
     ttk::spinbox .sb -from 0 -to 100
diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c
index c64bd9c..ee377e2 100644
--- a/win/tkWinMenu.c
+++ b/win/tkWinMenu.c
@@ -1252,7 +1252,8 @@ TkWinHandleMenuEvent(
 	hashEntryPtr = Tcl_FindHashEntry(&tsdPtr->winMenuTable,
 		*plParam);
 	if (hashEntryPtr != NULL) {
-	    TkSizeT i, len, underline;
+	    TkSizeT i, len;
+	    int underline;
 	    Tcl_Obj *labelPtr;
 	    WCHAR *wlabel;
 	    int menuChar;
@@ -1270,7 +1271,7 @@ TkWinHandleMenuEvent(
 	    for (i = 0; i < menuPtr->numEntries; i++) {
 		underline = menuPtr->entries[i]->underline;
 		labelPtr = menuPtr->entries[i]->labelPtr;
-		if ((underline != TCL_INDEX_NONE) && (labelPtr != NULL)) {
+		if ((underline >= 0) && (labelPtr != NULL)) {
 		    /*
 		     * Ensure we don't exceed the label length, then check
 		     */
-- 
cgit v0.12


From 42a4fa0070a3233c88471707a85217caa0257c6b Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Thu, 20 Aug 2020 21:13:16 +0000
Subject: Improve formatting of ttk::style man page, and respect alphabetical
 order of commands.

---
 doc/ttk_style.n | 58 ++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/doc/ttk_style.n b/doc/ttk_style.n
index 3c0f9ce..0de3311 100644
--- a/doc/ttk_style.n
+++ b/doc/ttk_style.n
@@ -34,28 +34,8 @@ The \fBttk::style\fR command takes the following arguments:
 \fBttk::style configure \fIstyle\fR ?\fI\-option\fR ?\fIvalue option value...\fR? ?
 Sets the default value of the specified option(s) in \fIstyle\fR.
 .TP
-\fBttk::style map \fIstyle\fR ?\fI\-option\fB { \fIstatespec value...\fB }\fR?
-Sets dynamic values of the specified option(s) in \fIstyle\fR.
-Each \fIstatespec / value\fR pair is examined in order;
-the value corresponding to the first matching \fIstatespec\fR
-is used.
-.TP
-\fBttk::style lookup \fIstyle\fR \fI\-option \fR?\fIstate \fR?\fIdefault\fR??
-Returns the value specified for \fI\-option\fR in style \fIstyle\fR
-in state \fIstate\fR, using the standard lookup rules for element options.
-\fIstate\fR is a list of state names; if omitted,
-it defaults to all bits off (the
-.QW normal
-state).
-If the \fIdefault\fR argument is present, it is used as a fallback
-value in case no specification for \fI\-option\fR is found.
-.\" Otherwise -- signal error? return empty string? Leave unspecified for now.
-.TP
-\fBttk::style layout \fIstyle\fR ?\fIlayoutSpec\fR?
-Define the widget layout for style \fIstyle\fR.
-See \fBLAYOUTS\fR below for the format of \fIlayoutSpec\fR.
-If \fIlayoutSpec\fR is omitted, return the layout specification
-for style \fIstyle\fR.
+\fBttk::style element\fR \fIargs\fR
+.RS
 .TP
 \fBttk::style element create\fR \fIelementName\fR \fItype\fR ?\fIargs...\fR?
 Creates a new element in the current theme of type \fItype\fR.
@@ -70,6 +50,33 @@ Returns the list of elements defined in the current theme.
 .TP
 \fBttk::style element options \fIelement\fR
 Returns the list of \fIelement\fR's options.
+.RE
+.TP
+\fBttk::style layout \fIstyle\fR ?\fIlayoutSpec\fR?
+Define the widget layout for style \fIstyle\fR.
+See \fBLAYOUTS\fR below for the format of \fIlayoutSpec\fR.
+If \fIlayoutSpec\fR is omitted, return the layout specification
+for style \fIstyle\fR.
+.TP
+\fBttk::style lookup \fIstyle\fR \fI\-option \fR?\fIstate \fR?\fIdefault\fR??
+Returns the value specified for \fI\-option\fR in style \fIstyle\fR
+in state \fIstate\fR, using the standard lookup rules for element options.
+\fIstate\fR is a list of state names; if omitted,
+it defaults to all bits off (the
+.QW normal
+state).
+If the \fIdefault\fR argument is present, it is used as a fallback
+value in case no specification for \fI\-option\fR is found.
+.\" Otherwise -- signal error? return empty string? Leave unspecified for now.
+.TP
+\fBttk::style map \fIstyle\fR ?\fI\-option\fB { \fIstatespec value...\fB }\fR?
+Sets dynamic values of the specified option(s) in \fIstyle\fR.
+Each \fIstatespec / value\fR pair is examined in order;
+the value corresponding to the first matching \fIstatespec\fR
+is used.
+.TP
+\fBttk::style theme\fR \fIargs\fR
+.RS
 .TP
 \fBttk::style theme create\fR \fIthemeName\fR ?\fB\-parent \fIbasedon\fR? ?\fB\-settings \fIscript...\fR ?
 Creates a new theme.  It is an error if \fIthemeName\fR already exists.
@@ -78,19 +85,20 @@ styles, elements, and layouts from the parent theme \fIbasedon\fR.
 If \fB\-settings\fR is present, \fIscript\fR is evaluated in the
 context of the new theme as per \fBttk::style theme settings\fR.
 .TP
+\fBttk::style theme names\fR
+Returns a list of all known themes.
+.TP
 \fBttk::style theme settings \fIthemeName\fR \fIscript\fR
 Temporarily sets the current theme to \fIthemeName\fR,
 evaluate \fIscript\fR, then restore the previous theme.
 Typically \fIscript\fR simply defines styles and elements,
 though arbitrary Tcl code may appear.
 .TP
-\fBttk::style theme names\fR
-Returns a list of all known themes.
-.TP
 \fBttk::style theme use\fR ?\fIthemeName\fR?
 Without an argument the result is the name of the current theme.
 Otherwise this command sets the current theme to \fIthemeName\fR,
 and refreshes all widgets.
+.RE
 .SH LAYOUTS
 .PP
 A \fIlayout\fR specifies a list of elements, each followed
-- 
cgit v0.12

-- 
cgit v0.12


From 8962bfa23f42567fd3e6ead0c1f2326b3472ca19 Mon Sep 17 00:00:00 2001
From: bll <brad.lanam.comp@gmail.com>
Date: Thu, 20 Aug 2020 22:50:13 +0000
Subject: Fix mouse bindings for scrollbars with graphical grip elements.

---
 library/ttk/scrollbar.tcl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/library/ttk/scrollbar.tcl b/library/ttk/scrollbar.tcl
index efcf3a1..e939426 100644
--- a/library/ttk/scrollbar.tcl
+++ b/library/ttk/scrollbar.tcl
@@ -67,6 +67,7 @@ proc ttk::scrollbar::Press {w x y} {
 	*rightarrow {
 	    ttk::Repeatedly Scroll $w  1 units
 	}
+        *grip -
 	*thumb {
 	    set State(first) [lindex [$w get] 0]
 	}
@@ -89,7 +90,7 @@ proc ttk::scrollbar::Press {w x y} {
 proc ttk::scrollbar::Drag {w x y} {
     variable State
     if {![info exists State(first)]} {
-    	# Initial buttonpress was not on the thumb, 
+    	# Initial buttonpress was not on the thumb,
 	# or something screwy has happened.  In either case, ignore:
 	return;
     }
@@ -112,6 +113,7 @@ proc ttk::scrollbar::Jump {w x y} {
     variable State
 
     switch -glob -- [$w identify $x $y] {
+        *grip -
 	*thumb -
 	*trough {
 	    set State(first) [$w fraction $x $y]
-- 
cgit v0.12


From b0cb20ac4634f999816139408519cad3f65e475a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 21 Aug 2020 13:17:58 +0000
Subject: Fix 2 places where using "unsigned long" is overkill on 64-bit
 platforms

---
 generic/tkCanvas.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c
index 50a88b4..c63520b 100644
--- a/generic/tkCanvas.c
+++ b/generic/tkCanvas.c
@@ -977,7 +977,7 @@ CanvasWidgetCmd(
 
 	if (objc == 5) {
 	    int append = 0;
-	    unsigned long mask;
+	    unsigned int mask;
 	    const char *argv4 = Tcl_GetString(objv[4]);
 
 	    if (argv4[0] == 0) {
@@ -1027,7 +1027,7 @@ CanvasWidgetCmd(
 		result = TCL_ERROR;
 		goto done;
 	    }
-	    if (mask & ~(unsigned long)(ButtonMotionMask|Button1MotionMask
+	    if (mask & ~(ButtonMotionMask|Button1MotionMask
 		    |Button2MotionMask|Button3MotionMask|Button4MotionMask
 		    |Button5MotionMask|ButtonPressMask|ButtonReleaseMask
 		    |EnterWindowMask|LeaveWindowMask|KeyPressMask
@@ -4856,7 +4856,7 @@ PickCurrentItem(
 				 * ButtonRelease, or MotionNotify. */
 {
     double coords[2];
-    unsigned long buttonDown;
+    unsigned int buttonDown;
     Tk_Item *prevItemPtr;
 #ifndef USE_OLD_TAG_SEARCH
     SearchUids *searchUids = GetStaticUids();
-- 
cgit v0.12


From 7e85fa97e34d903e8b4599127e14838a49856360 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Fri, 21 Aug 2020 16:26:16 +0000
Subject: Edit comments, make some stylistic changes, remove an unused function
 parameter.

---
 macosx/tkMacOSXBitmap.c     |   2 +-
 macosx/tkMacOSXButton.c     |   4 +-
 macosx/tkMacOSXDraw.c       | 240 ++++++++++++++++++++++----------------------
 macosx/tkMacOSXEntry.c      |   4 +-
 macosx/tkMacOSXFont.c       |   2 +-
 macosx/tkMacOSXImage.c      |   2 +-
 macosx/tkMacOSXMenubutton.c |   4 +-
 macosx/tkMacOSXPrivate.h    |   2 +-
 macosx/tkMacOSXScrlbr.c     |   2 +-
 macosx/ttkMacOSXTheme.c     |   2 +-
 10 files changed, 132 insertions(+), 132 deletions(-)

diff --git a/macosx/tkMacOSXBitmap.c b/macosx/tkMacOSXBitmap.c
index c1b325a..213d925 100644
--- a/macosx/tkMacOSXBitmap.c
+++ b/macosx/tkMacOSXBitmap.c
@@ -136,7 +136,7 @@ PixmapFromImage(
     Pixmap pixmap;
 
     pixmap = Tk_GetPixmap(display, None, size.width, size.height, 0);
-    if (TkMacOSXSetupDrawingContext(pixmap, NULL, 1, &dc)) {
+    if (TkMacOSXSetupDrawingContext(pixmap, NULL, &dc)) {
 	if (dc.context) {
 	    CGAffineTransform t = { .a = 1, .b = 0, .c = 0, .d = -1,
 				    .tx = 0, .ty = size.height};
diff --git a/macosx/tkMacOSXButton.c b/macosx/tkMacOSXButton.c
index 9f60b91..857ce34 100644
--- a/macosx/tkMacOSXButton.c
+++ b/macosx/tkMacOSXButton.c
@@ -744,7 +744,7 @@ TkMacOSXDrawButton(
 
         ButtonBackgroundDrawCB(&cntrRect, mbPtr, 32, true);
 
-	if (!TkMacOSXSetupDrawingContext(pixmap, dpPtr->gc, 1, &dc)) {
+	if (!TkMacOSXSetupDrawingContext(pixmap, dpPtr->gc, &dc)) {
 	    return;
 	}
 
@@ -777,7 +777,7 @@ TkMacOSXDrawButton(
         ButtonContentDrawCB(&contHIRec, mbPtr->btnkind, &mbPtr->drawinfo,
 		(MacButton *) mbPtr, 32, true);
     } else {
-	if (!TkMacOSXSetupDrawingContext(pixmap, dpPtr->gc, 1, &dc)) {
+	if (!TkMacOSXSetupDrawingContext(pixmap, dpPtr->gc, &dc)) {
 	    return;
 	}
 
diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index a5c087b..24eb380 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -250,7 +250,7 @@ XCopyArea(
 	return BadDrawable;
     }
 
-    if (!TkMacOSXSetupDrawingContext(dst, gc, 1, &dc)) {
+    if (!TkMacOSXSetupDrawingContext(dst, gc, &dc)) {
 	TkMacOSXDbgMsg("Failed to setup drawing context.");
 	return BadDrawable;
     }
@@ -332,7 +332,7 @@ XCopyPlane(
 	Tcl_Panic("Unexpected plane specified for XCopyPlane");
     }
     if (srcDraw->flags & TK_IS_PIXMAP) {
-	if (!TkMacOSXSetupDrawingContext(dst, gc, 1, &dc)) {
+	if (!TkMacOSXSetupDrawingContext(dst, gc, &dc)) {
 	    return BadDrawable;
 	}
 
@@ -753,7 +753,7 @@ XDrawLines(
     }
 
     display->request++;
-    if (!TkMacOSXSetupDrawingContext(d, gc, 1, &dc)) {
+    if (!TkMacOSXSetupDrawingContext(d, gc, &dc)) {
 	return BadDrawable;
     }
     if (dc.context) {
@@ -821,7 +821,7 @@ XDrawSegments(
     int i, lw = gc->line_width;
 
     display->request++;
-    if (!TkMacOSXSetupDrawingContext(d, gc, 1, &dc)) {
+    if (!TkMacOSXSetupDrawingContext(d, gc, &dc)) {
 	return BadDrawable;
     }
     if (dc.context) {
@@ -873,7 +873,7 @@ XFillPolygon(
     int i;
 
     display->request++;
-    if (!TkMacOSXSetupDrawingContext(d, gc, 1, &dc)) {
+    if (!TkMacOSXSetupDrawingContext(d, gc, &dc)) {
 	return BadDrawable;
     }
     if (dc.context) {
@@ -935,7 +935,7 @@ XDrawRectangle(
     }
 
     display->request++;
-    if (!TkMacOSXSetupDrawingContext(d, gc, 1, &dc)) {
+    if (!TkMacOSXSetupDrawingContext(d, gc, &dc)) {
 	return BadDrawable;
     }
     if (dc.context) {
@@ -979,18 +979,18 @@ XDrawRectangle(
 int
 XDrawRectangles(
     Display *display,
-    Drawable drawable,
+    Drawable d,
     GC gc,
     XRectangle *rectArr,
     int nRects)
 {
-    MacDrawable *macWin = (MacDrawable *) drawable;
+    MacDrawable *macWin = (MacDrawable *) d;
     TkMacOSXDrawingContext dc;
     XRectangle * rectPtr;
     int i, lw = gc->line_width;
 
     display->request++;
-    if (!TkMacOSXSetupDrawingContext(drawable, gc, 1, &dc)) {
+    if (!TkMacOSXSetupDrawingContext(d, gc, &dc)) {
 	return BadDrawable;
     }
     if (dc.context) {
@@ -1043,7 +1043,7 @@ XFillRectangles(
     int i;
 
     display->request++;
-    if (!TkMacOSXSetupDrawingContext(d, gc, 1, &dc)) {
+    if (!TkMacOSXSetupDrawingContext(d, gc, &dc)) {
 	return BadDrawable;
     }
     if (dc.context) {
@@ -1096,7 +1096,7 @@ TkMacOSXDrawSolidBorder(
     TkMacOSXDrawingContext dc;
     CGRect outerRect, innerRect;
 
-    if (!TkMacOSXSetupDrawingContext(d, gc, 1, &dc)) {
+    if (!TkMacOSXSetupDrawingContext(d, gc, &dc)) {
 	return;
     }
     if (dc.context) {
@@ -1148,7 +1148,7 @@ XDrawArc(
     }
 
     display->request++;
-    if (!TkMacOSXSetupDrawingContext(d, gc, 1, &dc)) {
+    if (!TkMacOSXSetupDrawingContext(d, gc, &dc)) {
 	return BadDrawable;
     }
     if (dc.context) {
@@ -1219,7 +1219,7 @@ XDrawArcs(
     int i, lw = gc->line_width;
 
     display->request++;
-    if (!TkMacOSXSetupDrawingContext(d, gc, 1, &dc)) {
+    if (!TkMacOSXSetupDrawingContext(d, gc, &dc)) {
 	return BadDrawable;
     }
     if (dc.context) {
@@ -1301,7 +1301,7 @@ XFillArc(
     }
 
     display->request++;
-    if (!TkMacOSXSetupDrawingContext(d, gc, 1, &dc)) {
+    if (!TkMacOSXSetupDrawingContext(d, gc, &dc)) {
 	return BadDrawable;
     }
     if (dc.context) {
@@ -1375,7 +1375,7 @@ XFillArcs(
     int i, lw = gc->line_width;
 
     display->request++;
-    if (!TkMacOSXSetupDrawingContext(d, gc, 1, &dc)) {
+    if (!TkMacOSXSetupDrawingContext(d, gc, &dc)) {
 	return BadDrawable;
     }
     if (dc.context) {
@@ -1574,15 +1574,17 @@ TkMacOSXSetUpGraphicsPort(
  *
  * TkMacOSXSetUpDrawingContext --
  *
- *	Set up a drawing context for the given drawable and GC.
+ *	Set up a drawing context for the given drawable from an X GC.
  *
  * Results:
- *	Boolean indicating whether it is ok to draw; if false, drawing context
- *	was not setup, so do not attempt to draw and do not call
+ *	Boolean indicating whether it is ok to draw; if false, the drawing
+ *	context was not setup, so do not attempt to draw and do not call
  *	TkMacOSXRestoreDrawingContext().
  *
  * Side effects:
- *	None.
+ *	May modify or create the drawable's graphics context.  May expand the
+ *      drawable's dirty rectangle.  When the result is true The dcPtr
+ *      parameter is set to reference the new or updated drawing context.
  *
  *----------------------------------------------------------------------
  */
@@ -1591,7 +1593,6 @@ Bool
 TkMacOSXSetupDrawingContext(
     Drawable d,
     GC gc,
-    TCL_UNUSED(int),
     TkMacOSXDrawingContext *dcPtr)
 {
     MacDrawable *macDraw = (MacDrawable *) d;
@@ -1600,8 +1601,7 @@ TkMacOSXSetupDrawingContext(
     TkMacOSXDrawingContext dc = {};
 
     /*
-     * If the drawable is not a pixmap and it has an associated NSWindow then
-     * we know we are drawing to a window.
+     * If the drawable is not a pixmap, get the associated NSView.
      */
 
     if (!(macDraw->flags & TK_IS_PIXMAP)) {
@@ -1613,7 +1613,8 @@ TkMacOSXSetupDrawingContext(
     }
 
     /*
-     * Check that we have a non-empty clipping region.
+     * Intersect the drawable's clipping region with the region stored in the
+     * X GC.  If the resulting region is empty, don't do any drawing.
      */
 
     dc.clipRgn = TkMacOSXGetClipRgn(d);
@@ -1624,8 +1625,8 @@ TkMacOSXSetupDrawingContext(
     }
 
     /*
-     * If we already have a CGContext, use it.  Otherwise, if we are drawing to
-     * a window then we can get one from the window.
+     * If the drawable already has a CGContext, use it.  Otherwise, we must be
+     * drawing to a window and we use the current context of its ContentView.
      */
 
     dc.context = TkMacOSXGetCGContextForDrawable(d);
@@ -1634,9 +1635,9 @@ TkMacOSXSetupDrawingContext(
     } else {
 	NSRect drawingBounds, currentBounds;
 
-	dc.portBounds = NSRectToCGRect([view bounds]);
-	dc.context = GET_CGCONTEXT;
 	dc.view = view;
+	dc.context = GET_CGCONTEXT;
+	dc.portBounds = NSRectToCGRect([view bounds]);
 	if (dc.clipRgn) {
 	    CGRect clipBounds;
 	    CGAffineTransform t = { .a = 1, .b = 0, .c = 0, .d = -1, .tx = 0,
@@ -1649,11 +1650,18 @@ TkMacOSXSetupDrawingContext(
 	}
 
 	/*
-	 * We can only draw into the view when the current CGContext is valid
-	 * and belongs to the view.  Validity can only be guaranteed inside of
-	 * a view's drawRect or setFrame methods.  The isDrawing attribute
-	 * tells us whether we are being called from drawRect.  If the
-	 * CGContext is not valid then we mark our view as needing display.
+	 * We can only draw into the NSView which is the current focusView.
+	 * When the current [NSView focusView] is nil, the CGContext for
+	 * [NSGraphicsContext currentContext] is nil.  Otherwise the current
+	 * CGContext draws into the current focusView.  An NSView is guaranteed
+	 * to be the focusView when its drawRect or setFrame methods are
+	 * running.  Prior to OSX 10.14 it was also possible to call the
+	 * lockFocus method to force an NSView to become the current focusView.
+	 * But that method was deprecated in 10.14 and so is no longer used by
+	 * Tk.  Instead, if the view is not the current focusView then we add
+	 * the drawing bounds to its dirty rectangle and return false.  The
+	 * part of the view inside the drawing bounds will get redrawn during
+	 * the next call to its drawRect method.
 	 */
 
 	if (view != [NSView focusView]) {
@@ -1663,12 +1671,12 @@ TkMacOSXSetupDrawingContext(
 	}
 
 	/*
-	 * Drawing will also fail if we are being called from drawRect but the
-	 * clipping rectangle set by drawRect does not contain the clipping
-	 * region of our drawing context.  See bug [2a61eca3a8].  If we can't
-	 * draw all of the clipping region of the drawing context then we draw
-	 * whatever we can, but we also add a dirty rectangle so the entire
-	 * widget will get redrawn in the next cycle.
+	 * Drawing will also fail when the view is the current focusView but
+	 * the clipping rectangle set by drawRect does not contain the clipping
+	 * region of our drawing context.  (See bug [2a61eca3a8].)  If part of
+	 * the drawing bounds will be clipped then we draw whatever we can, but
+	 * we also add the drawing bounds to the view's dirty rectangle so it
+	 * will get redrawn in the next call to its drawRect method.
 	 */
 
 	currentBounds = CGContextGetClipBoundingBox(dc.context);
@@ -1678,106 +1686,97 @@ TkMacOSXSetupDrawingContext(
     }
 
     /*
-     * Configure the drawing context.
+     * Finish configuring the drawing context.
      */
 
-    if (dc.context) {
-	CGAffineTransform t = {
-	    .a = 1, .b = 0,
-	    .c = 0, .d = -1,
-	    .tx = 0,
-	    .ty = dc.portBounds.size.height
-	};
+    CGAffineTransform t = {
+	.a = 1, .b = 0,
+	.c = 0, .d = -1,
+	.tx = 0,
+	.ty = dc.portBounds.size.height
+    };
 
-	dc.portBounds.origin.x += macDraw->xOff;
-	dc.portBounds.origin.y += macDraw->yOff;
-	CGContextSaveGState(dc.context);
-	CGContextSetTextDrawingMode(dc.context, kCGTextFill);
-	CGContextConcatCTM(dc.context, t);
-	if (dc.clipRgn) {
+    dc.portBounds.origin.x += macDraw->xOff;
+    dc.portBounds.origin.y += macDraw->yOff;
+    CGContextSaveGState(dc.context);
+    CGContextSetTextDrawingMode(dc.context, kCGTextFill);
+    CGContextConcatCTM(dc.context, t);
+    if (dc.clipRgn) {
 
 #ifdef TK_MAC_DEBUG_DRAWING
-	    CGContextSaveGState(dc.context);
-	    ChkErr(HIShapeReplacePathInCGContext, dc.clipRgn, dc.context);
-	    CGContextSetRGBFillColor(dc.context, 1.0, 0.0, 0.0, 0.1);
-	    CGContextEOFillPath(dc.context);
-	    CGContextRestoreGState(dc.context);
+	CGContextSaveGState(dc.context);
+	ChkErr(HIShapeReplacePathInCGContext, dc.clipRgn, dc.context);
+	CGContextSetRGBFillColor(dc.context, 1.0, 0.0, 0.0, 0.1);
+	CGContextEOFillPath(dc.context);
+	CGContextRestoreGState(dc.context);
 #endif /* TK_MAC_DEBUG_DRAWING */
 
-	    CGRect b = CGRectApplyAffineTransform(
-		CGContextGetClipBoundingBox(dc.context), t);
-	    CGRect r;
+	CGRect r;
+	CGRect b = CGRectApplyAffineTransform(
+	    CGContextGetClipBoundingBox(dc.context), t);
+	if (!HIShapeIsRectangular(dc.clipRgn) ||
+	    !CGRectContainsRect(*HIShapeGetBounds(dc.clipRgn, &r), b)) {
+	    ChkErr(HIShapeReplacePathInCGContext, dc.clipRgn, dc.context);
+	    CGContextEOClip(dc.context);
+	}
+    }
+    if (gc) {
+	static const CGLineCap cgCap[] = {
+	    [CapNotLast] = kCGLineCapButt,
+	    [CapButt] = kCGLineCapButt,
+	    [CapRound] = kCGLineCapRound,
+	    [CapProjecting] = kCGLineCapSquare,
+	};
+	static const CGLineJoin cgJoin[] = {
+	    [JoinMiter] = kCGLineJoinMiter,
+	    [JoinRound] = kCGLineJoinRound,
+	    [JoinBevel] = kCGLineJoinBevel,
+	};
+	bool shouldAntialias = !notAA(gc->line_width);
+	double w = gc->line_width;
 
-	    if (!HIShapeIsRectangular(dc.clipRgn) ||
-		!CGRectContainsRect(*HIShapeGetBounds(dc.clipRgn, &r), b)) {
-	    	ChkErr(HIShapeReplacePathInCGContext, dc.clipRgn, dc.context);
-	    	CGContextEOClip(dc.context);
-	    }
+	TkMacOSXSetColorInContext(gc, gc->foreground, dc.context);
+	if (view) {
+	    CGContextSetPatternPhase(dc.context, CGSizeMake(
+	        dc.portBounds.size.width, dc.portBounds.size.height));
 	}
-	if (gc) {
-	    static const CGLineCap cgCap[] = {
-		[CapNotLast] = kCGLineCapButt,
-		[CapButt] = kCGLineCapButt,
-		[CapRound] = kCGLineCapRound,
-		[CapProjecting] = kCGLineCapSquare,
-	    };
-	    static const CGLineJoin cgJoin[] = {
-		[JoinMiter] = kCGLineJoinMiter,
-		[JoinRound] = kCGLineJoinRound,
-		[JoinBevel] = kCGLineJoinBevel,
-	    };
-	    bool shouldAntialias;
-	    double w = gc->line_width;
-
-	    TkMacOSXSetColorInContext(gc, gc->foreground, dc.context);
-	    if (view) {
-		CGContextSetPatternPhase(dc.context, CGSizeMake(
-			dc.portBounds.size.width, dc.portBounds.size.height));
-	    }
-	    if (gc->function != GXcopy) {
-		TkMacOSXDbgMsg("Logical functions other than GXcopy are "
-			"not supported for CG drawing!");
-	    }
+	if (gc->function != GXcopy) {
+	    TkMacOSXDbgMsg("Logical functions other than GXcopy are "
+			   "not supported for CG drawing!");
+	}
+	if (!shouldAntialias) {
 
 	    /*
-	     * When should we antialias?
+	     * Make non-antialiased CG drawing look more like X11.
 	     */
 
-	    shouldAntialias = !notAA(gc->line_width);
-	    if (!shouldAntialias) {
-		/*
-		 * Make non-antialiased CG drawing look more like X11.
-		 */
-
-		w -= (gc->line_width ? NON_AA_CG_OFFSET : 0);
-	    }
-	    CGContextSetShouldAntialias(dc.context, shouldAntialias);
-	    CGContextSetLineWidth(dc.context, w);
-	    if (gc->line_style != LineSolid) {
-		int num = 0;
-		char *p = &gc->dashes;
-		CGFloat dashOffset = gc->dash_offset;
-		dashOffset -= (gc->line_width % 2) ? 0.5 : 0.0;
-		CGFloat lengths[10];
-
-		while (p[num] != '\0' && num < 10) {
-		    lengths[num] = p[num];
-		    num++;
-		}
-		CGContextSetLineDash(dc.context, dashOffset, lengths, num);
-	    }
-	    if ((unsigned) gc->cap_style < sizeof(cgCap)/sizeof(CGLineCap)) {
-		CGContextSetLineCap(dc.context,
-			cgCap[(unsigned) gc->cap_style]);
-	    }
-	    if ((unsigned)gc->join_style < sizeof(cgJoin)/sizeof(CGLineJoin)) {
-		CGContextSetLineJoin(dc.context,
-			cgJoin[(unsigned) gc->join_style]);
+	    w -= (gc->line_width ? NON_AA_CG_OFFSET : 0);
+	}
+	CGContextSetShouldAntialias(dc.context, shouldAntialias);
+	CGContextSetLineWidth(dc.context, w);
+	if (gc->line_style != LineSolid) {
+	    int num = 0;
+	    char *p = &gc->dashes;
+	    CGFloat dashOffset = gc->dash_offset;
+	    dashOffset -= (gc->line_width % 2) ? 0.5 : 0.0;
+	    CGFloat lengths[10];
+
+	    while (p[num] != '\0' && num < 10) {
+		lengths[num] = p[num];
+		num++;
 	    }
+	    CGContextSetLineDash(dc.context, dashOffset, lengths, num);
+	}
+	if ((unsigned) gc->cap_style < sizeof(cgCap)/sizeof(CGLineCap)) {
+	    CGContextSetLineCap(dc.context, cgCap[(unsigned) gc->cap_style]);
+	}
+	if ((unsigned)gc->join_style < sizeof(cgJoin)/sizeof(CGLineJoin)) {
+	    CGContextSetLineJoin(dc.context, cgJoin[(unsigned) gc->join_style]);
 	}
     }
 
 end:
+
 #ifdef TK_MAC_DEBUG_DRAWING
     if (!canDraw && win != NULL) {
 	TkWindow *winPtr = TkMacOSXGetTkWindow(win);
@@ -1788,6 +1787,7 @@ end:
 	}
     }
 #endif
+
     if (!canDraw && dc.clipRgn) {
 	CFRelease(dc.clipRgn);
 	dc.clipRgn = NULL;
diff --git a/macosx/tkMacOSXEntry.c b/macosx/tkMacOSXEntry.c
index 7915f6f..c6f4eea 100644
--- a/macosx/tkMacOSXEntry.c
+++ b/macosx/tkMacOSXEntry.c
@@ -155,7 +155,7 @@ TkpDrawEntryBorderAndFocus(
     bounds.origin.y = macDraw->yOff + MAC_OSX_FOCUS_WIDTH;
     bounds.size.width = Tk_Width(tkwin) - 2*MAC_OSX_FOCUS_WIDTH;
     bounds.size.height = Tk_Height(tkwin) - 2*MAC_OSX_FOCUS_WIDTH;
-    if (!TkMacOSXSetupDrawingContext(d, NULL, 1, &dc)) {
+    if (!TkMacOSXSetupDrawingContext(d, NULL, &dc)) {
 
 	/*
 	 * No graphics context is available.  If the widget is a Spinbox, we
@@ -265,7 +265,7 @@ TkpDrawSpinboxButtons(
     rects[0].height = Tk_Height(tkwin);
     XFillRectangles(Tk_Display(tkwin), d, bgGC, rects, 1);
 
-    if (!TkMacOSXSetupDrawingContext(d, NULL, 1, &dc)) {
+    if (!TkMacOSXSetupDrawingContext(d, NULL, &dc)) {
 	return 0;
     }
     ChkErr(HIThemeDrawButton, &bounds, &info, dc.context, HIOrientation, NULL);
diff --git a/macosx/tkMacOSXFont.c b/macosx/tkMacOSXFont.c
index 581ada1..f58e831 100644
--- a/macosx/tkMacOSXFont.c
+++ b/macosx/tkMacOSXFont.c
@@ -1199,7 +1199,7 @@ TkpDrawAngledCharsInContext(
 
     if (rangeStart < 0 || rangeLength <= 0  ||
 	rangeStart + rangeLength > numBytes ||
-	!TkMacOSXSetupDrawingContext(drawable, gc, 1, &drawingContext)) {
+	!TkMacOSXSetupDrawingContext(drawable, gc, &drawingContext)) {
 	return;
     }
     string = [[TKNSString alloc] initWithTclUtfBytes:source length:numBytes];
diff --git a/macosx/tkMacOSXImage.c b/macosx/tkMacOSXImage.c
index 0e33b23..f7dbb70 100644
--- a/macosx/tkMacOSXImage.c
+++ b/macosx/tkMacOSXImage.c
@@ -558,7 +558,7 @@ XPutImage(
     MacDrawable *macDraw = (MacDrawable *) drawable;
 
     display->request++;
-    if (!TkMacOSXSetupDrawingContext(drawable, gc, 1, &dc)) {
+    if (!TkMacOSXSetupDrawingContext(drawable, gc, &dc)) {
 	return BadDrawable;
     }
     if (dc.context) {
diff --git a/macosx/tkMacOSXMenubutton.c b/macosx/tkMacOSXMenubutton.c
index 8eed4f0..320c070 100644
--- a/macosx/tkMacOSXMenubutton.c
+++ b/macosx/tkMacOSXMenubutton.c
@@ -560,7 +560,7 @@ TkMacOSXDrawMenuButton(
         static HIThemeButtonDrawInfo hiinfo;
 
         MenuButtonBackgroundDrawCB(mbPtr, 32, true);
-	if (!TkMacOSXSetupDrawingContext(pixmap, dpPtr->gc, 1, &dc)) {
+	if (!TkMacOSXSetupDrawingContext(pixmap, dpPtr->gc, &dc)) {
 	    return;
 	}
 
@@ -591,7 +591,7 @@ TkMacOSXDrawMenuButton(
         MenuButtonContentDrawCB(mbPtr->btnkind, &mbPtr->drawinfo,
 		mbPtr, 32, true);
     } else {
-	if (!TkMacOSXSetupDrawingContext(pixmap, dpPtr->gc, 1, &dc)) {
+	if (!TkMacOSXSetupDrawingContext(pixmap, dpPtr->gc, &dc)) {
 	    return;
 	}
 	TkMacOSXRestoreDrawingContext(&dc);
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h
index a6b988e..5c4ae7d 100644
--- a/macosx/tkMacOSXPrivate.h
+++ b/macosx/tkMacOSXPrivate.h
@@ -262,7 +262,7 @@ MODULE_SCOPE void       TkMacOSXDrawCGImage(Drawable d, GC gc, CGContextRef cont
 			    unsigned long imageBackground, CGRect imageBounds,
 			    CGRect srcBounds, CGRect dstBounds);
 MODULE_SCOPE int	TkMacOSXSetupDrawingContext(Drawable d, GC gc,
-			    int useCG, TkMacOSXDrawingContext *dcPtr);
+			    TkMacOSXDrawingContext *dcPtr);
 MODULE_SCOPE void	TkMacOSXRestoreDrawingContext(
 			    TkMacOSXDrawingContext *dcPtr);
 MODULE_SCOPE void	TkMacOSXSetColorInContext(GC gc, unsigned long pixel,
diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c
index 8bf2998..8565e76 100644
--- a/macosx/tkMacOSXScrlbr.c
+++ b/macosx/tkMacOSXScrlbr.c
@@ -263,7 +263,7 @@ TkpDisplayScrollbar(
 
     if ((view == NULL)
 	    || (macWin->flags & TK_DO_NOT_DRAW)
-	    || !TkMacOSXSetupDrawingContext((Drawable) macWin, NULL, 1, &dc)) {
+	    || !TkMacOSXSetupDrawingContext((Drawable) macWin, NULL, &dc)) {
 	return;
     }
 
diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c
index b0be4e9..2734c63 100644
--- a/macosx/ttkMacOSXTheme.c
+++ b/macosx/ttkMacOSXTheme.c
@@ -39,7 +39,7 @@
 
 #define BEGIN_DRAWING(d) {	   \
 	TkMacOSXDrawingContext dc; \
-	if (!TkMacOSXSetupDrawingContext((d), NULL, 1, &dc)) {return;}
+	if (!TkMacOSXSetupDrawingContext((d), NULL, &dc)) {return;}
 #define END_DRAWING \
     TkMacOSXRestoreDrawingContext(&dc);}
 
-- 
cgit v0.12


From ee6cc4ea5ad64d240ca940371ec26787ee2bbdb5 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Sat, 22 Aug 2020 19:16:02 +0000
Subject: Remove all use of XImage.pixelpower, but not the field, simplify and
 reorganize.

---
 generic/tkImgPhInstance.c |   7 +-
 macosx/tkMacOSXDraw.c     | 440 ++++-----------------------------
 macosx/tkMacOSXImage.c    | 611 ++++++++++++++++++++++++++++++++++------------
 macosx/tkMacOSXMenu.c     |   4 +-
 macosx/tkMacOSXPort.h     |   7 +
 macosx/tkMacOSXPrivate.h  |  11 +-
 macosx/tkMacOSXWm.c       |   2 +-
 xlib/X11/Xlib.h           |   2 +-
 8 files changed, 527 insertions(+), 557 deletions(-)

diff --git a/generic/tkImgPhInstance.c b/generic/tkImgPhInstance.c
index c500050..32b09be 100644
--- a/generic/tkImgPhInstance.c
+++ b/generic/tkImgPhInstance.c
@@ -19,9 +19,7 @@
  */
 
 #include "tkImgPhoto.h"
-#ifdef MAC_OSX_TK
-#define TKPUTIMAGE_CAN_BLEND
-#endif
+#include "tkPort.h"
 
 /*
  * Declaration for internal Xlib function used here:
@@ -409,9 +407,6 @@ TkImgPhotoGet(
  *
  *	Note that Win32 pre-defines those operations that we really need.
  *
- *	Note that on MacOS, if the background comes from a Retina display
- *	then it will be twice as wide and twice as high as the photoimage.
- *
  *----------------------------------------------------------------------
  */
 #ifndef TKPUTIMAGE_CAN_BLEND
diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index 24eb380..1089e57 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -1,13 +1,13 @@
 /*
  * tkMacOSXDraw.c --
  *
- *	This file contains functions that perform drawing to Xlib windows. Most
- *	of the functions simply emulate Xlib functions.
+ *	This file contains functions that draw to windows. Many of thees
+ *	functions emulate Xlib functions.
  *
  * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- * Copyright 2001-2009, Apple Inc.
+ * Copyright (c) 2001-2009 Apple Inc.
  * Copyright (c) 2006-2009 Daniel A. Steffen <das@users.sourceforge.net>
- * Copyright 2014 Marc Culler.
+ * Copyright (c) 2014-2020 Marc Culler.
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -50,6 +50,8 @@ static unsigned long transparentColor;
  */
 
 static void ClipToGC(Drawable d, GC gc, HIShapeRef *clipRgnPtr);
+static NSImage *CreateNSImageFromPixmap(Pixmap pixmap, int width, int height);
+
 
 /*
  *----------------------------------------------------------------------
@@ -108,384 +110,7 @@ TkMacOSXInitCGDrawing(
 /*
  *----------------------------------------------------------------------
  *
- * TkMacOSXBitmapRepFromDrawableRect
- *
- *	Extract bitmap data from a MacOSX drawable as an NSBitmapImageRep.
- *
- *      This is only used by XGetImage, which is never called.  And this
- *      implementation does not work correctly.  Originally it relied on
- *      [NSBitmapImageRep initWithFocusedViewRect:view_rect] which was
- *      deprecated by Apple in OSX 10.14 and also required the use of other
- *      deprecated functions such as [NSView lockFocus]. Apple's suggested
- *      replacement is [NSView cacheDisplayInRect: toBitmapImageRep:] and that
- *      is what is being used here.  However, that method only works when the
- *      view has a valid CGContext, and a view is only guaranteed to have a
- *      valid context during a call to [NSView drawRect]. To further complicate
- *      matters, cacheDisplayInRect calls [NSView drawRect]. Essentially it is
- *      asking the view to draw a subrectangle of itself into a special
- *      graphics context which is linked to the BitmapImageRep. But our
- *      implementation of [NSView drawRect] does not allow recursive calls. If
- *      called recursively it returns immediately without doing any drawing.
- *      So the bottom line is that this function either returns a NULL pointer
- *      or a black image. To make it useful would require a significant amount
- *      of rewriting of the drawRect method. Perhaps the next release of OSX
- *      will include some more helpful ways of doing this.
- *
- * Results:
- *	Returns an NSBitmapRep representing the image of the given rectangle of
- *      the given drawable. This object is retained. The caller is responsible
- *      for releasing it.
- *
- *      NOTE: The x,y coordinates should be relative to a coordinate system
- *      with origin at the top left, as used by XImage and CGImage, not bottom
- *      left as used by NSView.
- *
- * Side effects:
- *     None
- *
- *----------------------------------------------------------------------
- */
-
-NSBitmapImageRep *
-TkMacOSXBitmapRepFromDrawableRect(
-    Drawable drawable,
-    int x,
-    int y,
-    unsigned int width,
-    unsigned int height)
-{
-    MacDrawable *mac_drawable = (MacDrawable *) drawable;
-    CGContextRef cg_context = NULL;
-    CGImageRef cg_image = NULL, sub_cg_image = NULL;
-    NSBitmapImageRep *bitmap_rep = NULL;
-    NSView *view = NULL;
-    if (mac_drawable->flags & TK_IS_PIXMAP) {
-	/*
-	 * This MacDrawable is a bitmap, so its view is NULL.
-	 */
-
-	CGRect image_rect = CGRectMake(x, y, width, height);
-
-	cg_context = TkMacOSXGetCGContextForDrawable(drawable);
-	cg_image = CGBitmapContextCreateImage((CGContextRef) cg_context);
-	sub_cg_image = CGImageCreateWithImageInRect(cg_image, image_rect);
-	if (sub_cg_image) {
-	    bitmap_rep = [NSBitmapImageRep alloc];
-	    [bitmap_rep initWithCGImage:sub_cg_image];
-	}
-	if (cg_image) {
-	    CGImageRelease(cg_image);
-	}
-    } else if (TkMacOSXDrawableView(mac_drawable) != NULL) {
-	TKContentView *tkview = (TKContentView *)view;
-
-	/*
-	 * Convert Tk top-left to NSView bottom-left coordinates.
-	 */
-
-	int view_height = [view bounds].size.height;
-	NSRect view_rect = NSMakeRect(x + mac_drawable->xOff,
-		view_height - height - y - mac_drawable->yOff,
-		width, height);
-
-	/*
-	 * Attempt to copy from the view to a bitmapImageRep.  If the view does
-	 * not have a valid CGContext, doing this will silently corrupt memory
-	 * and make a big mess. So, in that case, we mark the view as needing
-	 * display and return NULL.
-	 */
-
-	if (view == [NSView focusView]) {
-	    bitmap_rep = [view bitmapImageRepForCachingDisplayInRect: view_rect];
-	    [bitmap_rep retain];
-	    [view cacheDisplayInRect:view_rect toBitmapImageRep:bitmap_rep];
-	} else {
-	    TkMacOSXDbgMsg("No CGContext - cannot copy from screen to bitmap.");
-	    [tkview addTkDirtyRect:[tkview bounds]];
-	    return NULL;
-	}
-    } else {
-	TkMacOSXDbgMsg("Invalid source drawable");
-    }
-    return bitmap_rep;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * XCopyArea --
- *
- *	Copies data from one drawable to another.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Data is moved from a window or bitmap to a second window or bitmap.
- *
- *----------------------------------------------------------------------
- */
-
-int
-XCopyArea(
-    Display *display,		/* Display. */
-    Drawable src,		/* Source drawable. */
-    Drawable dst,		/* Destination drawable. */
-    GC gc,			/* GC to use. */
-    int src_x,			/* X & Y, width & height */
-    int src_y,			/* define the source rectangle */
-    unsigned int width,		/* that will be copied. */
-    unsigned int height,
-    int dest_x,			/* Dest X & Y on dest rect. */
-    int dest_y)
-{
-    TkMacOSXDrawingContext dc;
-    MacDrawable *srcDraw = (MacDrawable *) src;
-    NSBitmapImageRep *bitmap_rep = NULL;
-    CGImageRef img = NULL;
-    CGRect bounds, srcRect, dstRect;
-
-    display->request++;
-    if (!width || !height) {
-	return BadDrawable;
-    }
-
-    if (!TkMacOSXSetupDrawingContext(dst, gc, &dc)) {
-	TkMacOSXDbgMsg("Failed to setup drawing context.");
-	return BadDrawable;
-    }
-
-    if (!dc.context) {
-	TkMacOSXDbgMsg("Invalid destination drawable - no context.");
-	return BadDrawable;
-    }
-
-    if (srcDraw->flags & TK_IS_PIXMAP) {
-	img = TkMacOSXCreateCGImageWithDrawable(src);
-    } else if (TkMacOSXDrawableWindow(src)) {
-	bitmap_rep = TkMacOSXBitmapRepFromDrawableRect(src,
-		src_x, src_y, width, height);
-	if (bitmap_rep) {
-	    img = [bitmap_rep CGImage];
-	}
-    } else {
-	TkMacOSXDbgMsg("Invalid source drawable - neither window nor pixmap.");
-    }
-
-    if (img) {
-	bounds = CGRectMake(0, 0, srcDraw->size.width, srcDraw->size.height);
-	srcRect = CGRectMake(src_x, src_y, width, height);
-	dstRect = CGRectMake(dest_x, dest_y, width, height);
-	TkMacOSXDrawCGImage(dst, gc, dc.context, img,
-		gc->foreground, gc->background, bounds, srcRect, dstRect);
-	CFRelease(img);
-    } else {
-	TkMacOSXDbgMsg("Failed to construct CGImage.");
-    }
-
-    TkMacOSXRestoreDrawingContext(&dc);
-    return Success;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * XCopyPlane --
- *
- *	Copies a bitmap from a source drawable to a destination drawable. The
- *	plane argument specifies which bit plane of the source contains the
- *	bitmap. Note that this implementation ignores the gc->function.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Changes the destination drawable.
- *
- *----------------------------------------------------------------------
- */
-
-int
-XCopyPlane(
-    Display *display,		/* Display. */
-    Drawable src,		/* Source drawable. */
-    Drawable dst,		/* Destination drawable. */
-    GC gc,				/* GC to use. */
-    int src_x,			/* X & Y, width & height */
-    int src_y,			/* define the source rectangle */
-    unsigned int width,	/* that will be copied. */
-    unsigned int height,
-    int dest_x,			/* Dest X & Y on dest rect. */
-    int dest_y,
-    unsigned long plane)	/* Which plane to copy. */
-{
-    TkMacOSXDrawingContext dc;
-    MacDrawable *srcDraw = (MacDrawable *) src;
-    MacDrawable *dstDraw = (MacDrawable *) dst;
-    CGRect bounds, srcRect, dstRect;
-    display->request++;
-    if (!width || !height) {
-	/* TkMacOSXDbgMsg("Drawing of empty area requested"); */
-	return BadDrawable;
-    }
-    if (plane != 1) {
-	Tcl_Panic("Unexpected plane specified for XCopyPlane");
-    }
-    if (srcDraw->flags & TK_IS_PIXMAP) {
-	if (!TkMacOSXSetupDrawingContext(dst, gc, &dc)) {
-	    return BadDrawable;
-	}
-
-	CGContextRef context = dc.context;
-
-	if (context) {
-	    CGImageRef img = TkMacOSXCreateCGImageWithDrawable(src);
-
-	    if (img) {
-		TkpClipMask *clipPtr = (TkpClipMask *) gc->clip_mask;
-		unsigned long imageBackground  = gc->background;
-
-                if (clipPtr && clipPtr->type == TKP_CLIP_PIXMAP) {
-		    srcRect = CGRectMake(src_x, src_y, width, height);
-		    CGImageRef mask = TkMacOSXCreateCGImageWithDrawable(
-			    clipPtr->value.pixmap);
-		    CGImageRef submask = CGImageCreateWithImageInRect(
-			    img, srcRect);
-		    CGRect rect = CGRectMake(dest_x, dest_y, width, height);
-
-		    rect = CGRectOffset(rect, dstDraw->xOff, dstDraw->yOff);
-		    CGContextSaveGState(context);
-
-		    /*
-		     * Move the origin of the destination to top left.
-		     */
-
-		    CGContextTranslateCTM(context,
-			    0, rect.origin.y + CGRectGetMaxY(rect));
-		    CGContextScaleCTM(context, 1, -1);
-
-		    /*
-		     * Fill with the background color, clipping to the mask.
-		     */
-
-		    CGContextClipToMask(context, rect, submask);
-		    TkMacOSXSetColorInContext(gc, gc->background, dc.context);
-		    CGContextFillRect(context, rect);
-
-		    /*
-		     * Fill with the foreground color, clipping to the
-		     * intersection of img and mask.
-		     */
-
-		    CGImageRef subimage = CGImageCreateWithImageInRect(
-			    img, srcRect);
-		    CGContextClipToMask(context, rect, subimage);
-		    TkMacOSXSetColorInContext(gc, gc->foreground, context);
-		    CGContextFillRect(context, rect);
-		    CGContextRestoreGState(context);
-		    CGImageRelease(img);
-		    CGImageRelease(mask);
-		    CGImageRelease(submask);
-		    CGImageRelease(subimage);
-		} else {
-		    bounds = CGRectMake(0, 0,
-			    srcDraw->size.width, srcDraw->size.height);
-		    srcRect = CGRectMake(src_x, src_y, width, height);
-		    dstRect = CGRectMake(dest_x, dest_y, width, height);
-		    TkMacOSXDrawCGImage(dst, gc, dc.context, img,
-			    gc->foreground, imageBackground, bounds,
-			    srcRect, dstRect);
-		    CGImageRelease(img);
-		}
-	    } else {
-		/* no image */
-		TkMacOSXDbgMsg("Invalid source drawable");
-	    }
-	} else {
-	    TkMacOSXDbgMsg("Invalid destination drawable - "
-		    "could not get a bitmap context.");
-	}
-	TkMacOSXRestoreDrawingContext(&dc);
-	return Success;
-    } else {
-	/*
-	 * Source drawable is a Window, not a Pixmap.
-	 */
-
-	return XCopyArea(display, src, dst, gc, src_x, src_y, width, height,
-		dest_x, dest_y);
-    }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TkMacOSXCreateCGImageWithDrawable --
- *
- *	Create a CGImage from the given Drawable.
- *
- * Results:
- *	CGImage, release after use.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-CGImageRef
-TkMacOSXCreateCGImageWithDrawable(
-    Drawable drawable)
-{
-    CGImageRef img = NULL;
-    CGContextRef context = TkMacOSXGetCGContextForDrawable(drawable);
-
-    if (context) {
-	img = CGBitmapContextCreateImage(context);
-    }
-    return img;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CreateNSImageWithPixmap --
- *
- *	Create NSImage for Pixmap.
- *
- * Results:
- *	NSImage.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static NSImage *
-CreateNSImageWithPixmap(
-    Pixmap pixmap,
-    int width,
-    int height)
-{
-    CGImageRef cgImage;
-    NSImage *nsImage;
-    NSBitmapImageRep *bitmapImageRep;
-
-    cgImage = TkMacOSXCreateCGImageWithDrawable(pixmap);
-    nsImage = [[NSImage alloc] initWithSize:NSMakeSize(width, height)];
-    bitmapImageRep = [[NSBitmapImageRep alloc] initWithCGImage:cgImage];
-    [nsImage addRepresentation:bitmapImageRep];
-    [bitmapImageRep release];
-    CFRelease(cgImage);
-
-    return nsImage;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TkMacOSXGetNSImageWithTkImage --
+ * TkMacOSXGetNSImageFromTkImage --
  *
  *	Get autoreleased NSImage for Tk_Image.
  *
@@ -499,7 +124,7 @@ CreateNSImageWithPixmap(
  */
 
 NSImage *
-TkMacOSXGetNSImageWithTkImage(
+TkMacOSXGetNSImageFromTkImage(
     Display *display,
     Tk_Image image,
     int width,
@@ -512,7 +137,7 @@ TkMacOSXGetNSImageWithTkImage(
     }
     pixmap = Tk_GetPixmap(display, None, width, height, 0);
     Tk_RedrawImage(image, 0, 0, width, height, pixmap, 0, 0);
-    nsImage = CreateNSImageWithPixmap(pixmap, width, height);
+    nsImage = CreateNSImageFromPixmap(pixmap, width, height);
     Tk_FreePixmap(display, pixmap);
 
     return [nsImage autorelease];
@@ -521,7 +146,7 @@ TkMacOSXGetNSImageWithTkImage(
 /*
  *----------------------------------------------------------------------
  *
- * TkMacOSXGetNSImageWithBitmap --
+ * TkMacOSXGetNSImageFromBitmap --
  *
  *	Get autoreleased NSImage for Bitmap.
  *
@@ -535,7 +160,7 @@ TkMacOSXGetNSImageWithTkImage(
  */
 
 NSImage *
-TkMacOSXGetNSImageWithBitmap(
+TkMacOSXGetNSImageFromBitmap(
     Display *display,
     Pixmap bitmap,
     GC gc,
@@ -551,7 +176,7 @@ TkMacOSXGetNSImageWithBitmap(
     XSetClipOrigin(display, gc, 0, 0);
     XCopyPlane(display, bitmap, pixmap, gc, 0, 0, width, height, 0, 0, 1);
     gc->background = origBackground;
-    nsImage = CreateNSImageWithPixmap(pixmap, width, height);
+    nsImage = CreateNSImageFromPixmap(pixmap, width, height);
     Tk_FreePixmap(display, pixmap);
 
     return [nsImage autorelease];
@@ -560,6 +185,47 @@ TkMacOSXGetNSImageWithBitmap(
 /*
  *----------------------------------------------------------------------
  *
+ * CreateNSImageFromPixmap --
+ *
+ *	Create NSImage for Pixmap.
+ *
+ * Results:
+ *	NSImage.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static NSImage *
+CreateNSImageFromPixmap(
+    Pixmap pixmap,
+    int width,
+    int height)
+{
+    CGImageRef cgImage;
+    NSImage *nsImage;
+    NSBitmapImageRep *bitmapImageRep;
+    CGContextRef context = TkMacOSXGetCGContextForDrawable(pixmap);
+
+    if (context) {
+	cgImage = CGBitmapContextCreateImage(context);
+    } else {
+	return NULL;
+    }
+    nsImage = [[NSImage alloc] initWithSize:NSMakeSize(width, height)];
+    bitmapImageRep = [[NSBitmapImageRep alloc] initWithCGImage:cgImage];
+    [nsImage addRepresentation:bitmapImageRep];
+    [bitmapImageRep release];
+    CFRelease(cgImage);
+
+    return nsImage;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
  * TkMacOSXGetCGContextForDrawable --
  *
  *	Get CGContext for given Drawable, creating one if necessary.
diff --git a/macosx/tkMacOSXImage.c b/macosx/tkMacOSXImage.c
index f7dbb70..48ed06d 100644
--- a/macosx/tkMacOSXImage.c
+++ b/macosx/tkMacOSXImage.c
@@ -6,7 +6,7 @@
  * Copyright (c) 1995-1997 Sun Microsystems, Inc.
  * Copyright 2001-2009, Apple Inc.
  * Copyright (c) 2005-2009 Daniel A. Steffen <das@users.sourceforge.net>
- * Copyright 2017-2018 Marc Culler.
+ * Copyright (c) 2017-2020 Marc Culler.
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -15,6 +15,10 @@
 #include "tkMacOSXPrivate.h"
 #include "xbytes.h"
 
+static CGImageRef CreateCGImageFromPixmap(Drawable pixmap);
+static CGImageRef CreateCGImageFromDrawableRect( Drawable drawable,
+	   int x, int y, unsigned int width, unsigned int height);
+
 #pragma mark XImage handling
 
 int
@@ -131,141 +135,6 @@ TkMacOSXCreateCGImageWithXImage(
 /*
  *----------------------------------------------------------------------
  *
- * XGetImage --
- *
- *	This function copies data from a pixmap or window into an XImage.  It
- *      is essentially never used. At one time it was called by
- *      pTkImgPhotoDisplay, but that is no longer the case. Currently it is
- *      called two places, one of which is requesting an XY image which we do
- *      not support.  It probably does not work correctly -- see the comments
- *      for TkMacOSXBitmapRepFromDrawableRect.
- *
- * Results:
- *	Returns a newly allocated XImage containing the data from the given
- *	rectangle of the given drawable, or NULL if the XImage could not be
- *	constructed.  NOTE: If we are copying from a window on a Retina
- *	display, the dimensions of the XImage will be 2*width x 2*height.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-struct pixel_fmt {int r; int g; int b; int a;};
-static struct pixel_fmt bgra = {2, 1, 0, 3};
-static struct pixel_fmt abgr = {3, 2, 1, 0};
-
-XImage *
-XGetImage(
-    Display *display,
-    Drawable drawable,
-    int x,
-    int y,
-    unsigned int width,
-    unsigned int height,
-    unsigned long plane_mask,
-    int format)
-{
-    NSBitmapImageRep* bitmap_rep = NULL;
-    NSUInteger bitmap_fmt = 0;
-    XImage* imagePtr = NULL;
-    char* bitmap = NULL;
-    char R, G, B, A;
-    int depth = 32, offset = 0, bitmap_pad = 0;
-    unsigned int bytes_per_row, size, row, n, m;
-    unsigned int scalefactor=1, scaled_height=height, scaled_width=width;
-    NSWindow *win = TkMacOSXDrawableWindow(drawable);
-    static enum {unknown, no, yes} has_retina = unknown;
-
-    if (win && has_retina == unknown) {
-#ifdef __clang__
-	has_retina = [win respondsToSelector:@selector(backingScaleFactor)] ?
-		yes : no;
-#else
-	has_retina = no;
-#endif
-    }
-
-    if (has_retina == yes) {
-	/*
-	 * We only allow scale factors 1 or 2, as Apple currently does.
-	 */
-
-#ifdef __clang__
-	scalefactor = [win backingScaleFactor] == 2.0 ? 2 : 1;
-#endif
-	scaled_height *= scalefactor;
-	scaled_width *= scalefactor;
-    }
-
-    if (format == ZPixmap) {
-	if (width == 0 || height == 0) {
-	    return NULL;
-	}
-
-	bitmap_rep = TkMacOSXBitmapRepFromDrawableRect(drawable,
-		x, y, width, height);
-	if (!bitmap_rep) {
-	    TkMacOSXDbgMsg("XGetImage: Failed to construct NSBitmapRep");
-	    return NULL;
-	}
-	bitmap_fmt = [bitmap_rep bitmapFormat];
-	size = [bitmap_rep bytesPerPlane];
-	bytes_per_row = [bitmap_rep bytesPerRow];
-	bitmap = ckalloc(size);
-	if (!bitmap
-		|| (bitmap_fmt != 0 && bitmap_fmt != 1)
-		|| [bitmap_rep samplesPerPixel] != 4
-		|| [bitmap_rep isPlanar] != 0
-		|| bytes_per_row < 4 * scaled_width
-		|| size != bytes_per_row * scaled_height) {
-	    TkMacOSXDbgMsg("XGetImage: Unrecognized bitmap format");
-	    CFRelease(bitmap_rep);
-	    return NULL;
-	}
-	memcpy(bitmap, (char *)[bitmap_rep bitmapData], size);
-	CFRelease(bitmap_rep);
-
-	/*
-	 * When Apple extracts a bitmap from an NSView, it may be in either
-	 * BGRA or ABGR format.  For an XImage we need RGBA.
-	 */
-
-	struct pixel_fmt pixel = bitmap_fmt == 0 ? bgra : abgr;
-
-	for (row = 0, n = 0; row < scaled_height; row++, n += bytes_per_row) {
-	    for (m = n; m < n + 4*scaled_width; m += 4) {
-		R = *(bitmap + m + pixel.r);
-		G = *(bitmap + m + pixel.g);
-		B = *(bitmap + m + pixel.b);
-		A = *(bitmap + m + pixel.a);
-
-		*(bitmap + m)     = R;
-		*(bitmap + m + 1) = G;
-		*(bitmap + m + 2) = B;
-		*(bitmap + m + 3) = A;
-	    }
-	}
-	imagePtr = XCreateImage(display, NULL, depth, format, offset,
-		(char*) bitmap, scaled_width, scaled_height,
-		bitmap_pad, bytes_per_row);
-	if (scalefactor == 2) {
-	    imagePtr->pixelpower = 1;
-	}
-    } else {
-	/*
-	 * There are some calls to XGetImage in the generic Tk code which pass
-	 * an XYPixmap rather than a ZPixmap.  XYPixmaps should be handled
-	 * here.
-	 */
-	TkMacOSXDbgMsg("XGetImage does not handle XYPixmaps at the moment.");
-    }
-    return imagePtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
  * DestroyImage --
  *
  *	Destroys storage associated with an image.
@@ -473,13 +342,6 @@ XCreateImage(
     ximage->data = data;
     ximage->obdata = NULL;
 
-    /*
-     * The default pixelpower is 0.  This must be explicitly set to 1 in the
-     * case of an XImage extracted from a Retina display.
-     */
-
-    ximage->pixelpower = 0;
-
     if (format == ZPixmap) {
 	ximage->bits_per_pixel = 32;
 	ximage->bitmap_unit = 32;
@@ -574,17 +436,8 @@ XPutImage(
 	}
 	if (img) {
 
-	    /*
-	     * If the XImage has big pixels, the source is rescaled to reflect
-	     * the actual pixel dimensions.  This is not currently used, but
-	     * could arise if the image were copied from a retina monitor and
-	     * redrawn on an ordinary monitor.
-	     */
-
-	    int pp = image->pixelpower;
-
 	    bounds = CGRectMake(0, 0, image->width, image->height);
-	    srcRect = CGRectMake(src_x<<pp, src_y<<pp, width<<pp, height<<pp);
+	    srcRect = CGRectMake(src_x, src_y, width, height);
 	    dstRect = CGRectMake(dest_x, dest_y, width, height);
 	    TkMacOSXDrawCGImage(drawable, gc, dc.context,
 				img, gc->foreground, gc->background,
@@ -618,6 +471,458 @@ TkPutImage(
 }
 
 /*
+ *----------------------------------------------------------------------
+ *
+ * CreateCGImageFromDrawableRect
+ *
+ *	Extract image data from a MacOSX drawable as a CGImage.
+ *
+ *      This is only called by XGetImage and XCopyArea.  The Tk core uses
+ *      these functions on some platforms, but on macOS the core does not
+ *      call them with a source drawable which is a window.  Such calls are
+ *      used only for double-buffered drawing.  Since macOS defines the
+ *      macro TK_NO_DOUBLE_BUFFERING, the generic code never calls XGetImage
+ *      or XCopyArea on macOS.  Nonetheless, these function are in the stubs
+ *      table and therefore could be used by extensions.
+ *      
+ *      This implementation does not work correctly.  Originally it relied on
+ *      [NSBitmapImageRep initWithFocusedViewRect:view_rect] which was
+ *      deprecated by Apple in OSX 10.14 and also required the use of other
+ *      deprecated functions such as [NSView lockFocus]. Apple's suggested
+ *      replacement is [NSView cacheDisplayInRect: toBitmapImageRep:] and that
+ *      is what is being used here.  However, that method only works when the
+ *      view has a valid CGContext, and a view is only guaranteed to have a
+ *      valid context during a call to [NSView drawRect]. To further complicate
+ *      matters, cacheDisplayInRect calls [NSView drawRect]. Essentially it is
+ *      asking the view to draw a subrectangle of itself using a special
+ *      graphics context which is linked to the BitmapImageRep. But our
+ *      implementation of [NSView drawRect] does not allow recursive calls. If
+ *      called recursively it returns immediately without doing any drawing.
+ *      So the bottom line is that this function either returns a NULL pointer
+ *      or a black image. To make it useful would require a significant amount
+ *      of rewriting of the drawRect method. Perhaps the next release of OSX
+ *      will include some more helpful ways of doing this.
+ *
+ * Results:
+ *	Returns an NSBitmapRep representing the image of the given rectangle of
+ *      the given drawable. This object is retained. The caller is responsible
+ *      for releasing it.
+ *
+ *      NOTE: The x,y coordinates should be relative to a coordinate system
+ *      with origin at the top left, as used by XImage and CGImage, not bottom
+ *      left as used by NSView.
+ *
+ * Side effects:
+ *     None
+ *
+ *----------------------------------------------------------------------
+ */
+
+static CGImageRef
+CreateCGImageFromDrawableRect(
+    Drawable drawable,
+    int x,
+    int y,
+    unsigned int width,
+    unsigned int height)
+{
+    MacDrawable *mac_drawable = (MacDrawable *) drawable;
+    CGContextRef cg_context = NULL;
+    CGImageRef cg_image = NULL, result = NULL;
+    NSBitmapImageRep *bitmapRep = NULL;
+    NSView *view = NULL;
+    if (mac_drawable->flags & TK_IS_PIXMAP) {
+	/*
+	 * This MacDrawable is a bitmap, so its view is NULL.
+	 */
+
+	CGRect image_rect = CGRectMake(x, y, width, height);
+
+	cg_context = TkMacOSXGetCGContextForDrawable(drawable);
+	cg_image = CGBitmapContextCreateImage((CGContextRef) cg_context);
+	if (cg_image) {
+	    result = CGImageCreateWithImageInRect(cg_image, image_rect);
+	    CGImageRelease(cg_image);
+	}
+    } else if (TkMacOSXDrawableView(mac_drawable) != NULL) {
+	TKContentView *tkview = (TKContentView *)view;
+
+	/*
+	 * Convert Tk top-left to NSView bottom-left coordinates.
+	 */
+
+	int view_height = [view bounds].size.height;
+	NSRect view_rect = NSMakeRect(x + mac_drawable->xOff,
+		view_height - height - y - mac_drawable->yOff,
+		width, height);
+
+	/*
+	 * Attempt to copy from the view to a bitmapImageRep.  If the view does
+	 * not have a valid CGContext, doing this will silently corrupt memory
+	 * and make a big mess. So, in that case, we mark the view as needing
+	 * display and return NULL.
+	 */
+
+	if (view == [NSView focusView]) {
+	    bitmapRep = [view bitmapImageRepForCachingDisplayInRect: view_rect];
+	    [view cacheDisplayInRect:view_rect toBitmapImageRep:bitmapRep];
+	    result = [bitmapRep CGImage];
+	    CFRelease(bitmapRep);
+	} else {
+	    TkMacOSXDbgMsg("No CGContext - cannot copy from screen to bitmap.");
+	    [tkview addTkDirtyRect:[tkview bounds]];
+	    result = NULL;
+	}
+    } else {
+	TkMacOSXDbgMsg("Invalid source drawable");
+    }
+    return result;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * CreateCGImageFromPixmap --
+ *
+ *	Create a CGImage from an X Pixmap.
+ *
+ * Results:
+ *	CGImage, release after use.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static CGImageRef
+CreateCGImageFromPixmap(
+    Drawable pixmap)
+{
+    CGImageRef img = NULL;
+    CGContextRef context = TkMacOSXGetCGContextForDrawable(pixmap);
+
+    if (context) {
+	img = CGBitmapContextCreateImage(context);
+    }
+    return img;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * XGetImage --
+ *
+ *	This function copies data from a pixmap or window into an XImage.  It
+ *      is essentially never used. At one time it was called by
+ *      pTkImgPhotoDisplay, but that is no longer the case. Currently it is
+ *      called two places, one of which is requesting an XY image which we do
+ *      not support.  It probably does not work correctly -- see the comments
+ *      for CGImageFromDrawableRect.
+ *
+ * Results:
+ *	Returns a newly allocated XImage containing the data from the given
+ *	rectangle of the given drawable, or NULL if the XImage could not be
+ *	constructed.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+struct pixel_fmt {int r; int g; int b; int a;};
+static struct pixel_fmt bgra = {2, 1, 0, 3};
+static struct pixel_fmt abgr = {3, 2, 1, 0};
+
+XImage *
+XGetImage(
+    Display *display,
+    Drawable drawable,
+    int x,
+    int y,
+    unsigned int width,
+    unsigned int height,
+    unsigned long plane_mask,
+    int format)
+{
+    NSBitmapImageRep* bitmapRep = NULL;
+    NSUInteger bitmap_fmt = 0;
+    XImage* imagePtr = NULL;
+    char* bitmap = NULL;
+    char R, G, B, A;
+    int depth = 32, offset = 0, bitmap_pad = 0;
+    unsigned int bytes_per_row, size, row, n, m;
+
+    if (format == ZPixmap) {
+	CGImageRef cgImage;
+	if (width == 0 || height == 0) {
+	    return NULL;
+	}
+
+	cgImage = CreateCGImageFromDrawableRect(drawable, x, y, width, height);
+	if (cgImage) {
+	    bitmapRep = [NSBitmapImageRep alloc];
+	    [bitmapRep initWithCGImage:cgImage];
+	    [cgImage release];
+	} else {
+	    TkMacOSXDbgMsg("XGetImage: Failed to construct CGImage");
+	    return NULL;
+	}
+	bitmap_fmt = [bitmapRep bitmapFormat];
+	size = [bitmapRep bytesPerPlane];
+	bytes_per_row = [bitmapRep bytesPerRow];
+	bitmap = ckalloc(size);
+	if (!bitmap
+		|| (bitmap_fmt != 0 && bitmap_fmt != 1)
+		|| [bitmapRep samplesPerPixel] != 4
+		|| [bitmapRep isPlanar] != 0
+		|| bytes_per_row < 4 * width
+		|| size != bytes_per_row * height) {
+	    TkMacOSXDbgMsg("XGetImage: Unrecognized bitmap format");
+	    CFRelease(bitmapRep);
+	    return NULL;
+	}
+	memcpy(bitmap, (char *)[bitmapRep bitmapData], size);
+	CFRelease(bitmapRep);
+
+	/*
+	 * When Apple extracts a bitmap from an NSView, it may be in either
+	 * BGRA or ABGR format.  For an XImage we need RGBA.
+	 */
+
+	struct pixel_fmt pixel = bitmap_fmt == 0 ? bgra : abgr;
+
+	for (row = 0, n = 0; row < height; row++, n += bytes_per_row) {
+	    for (m = n; m < n + 4*width; m += 4) {
+		R = *(bitmap + m + pixel.r);
+		G = *(bitmap + m + pixel.g);
+		B = *(bitmap + m + pixel.b);
+		A = *(bitmap + m + pixel.a);
+
+		*(bitmap + m)     = R;
+		*(bitmap + m + 1) = G;
+		*(bitmap + m + 2) = B;
+		*(bitmap + m + 3) = A;
+	    }
+	}
+	imagePtr = XCreateImage(display, NULL, depth, format, offset,
+		(char*) bitmap, width, height,
+		bitmap_pad, bytes_per_row);
+    } else {
+	/*
+	 * There are some calls to XGetImage in the generic Tk code which pass
+	 * an XYPixmap rather than a ZPixmap.  XYPixmaps should be handled
+	 * here.
+	 */
+	TkMacOSXDbgMsg("XGetImage does not handle XYPixmaps at the moment.");
+    }
+    return imagePtr;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * XCopyArea --
+ *
+ *	Copies image data from one drawable to another.
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	Image data is moved from a window or bitmap to a second window or bitmap.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int
+XCopyArea(
+    Display *display,		/* Display. */
+    Drawable src,		/* Source drawable. */
+    Drawable dst,		/* Destination drawable. */
+    GC gc,			/* GC to use. */
+    int src_x,			/* X & Y, width & height */
+    int src_y,			/* define the source rectangle */
+    unsigned int width,		/* that will be copied. */
+    unsigned int height,
+    int dest_x,			/* Dest X & Y on dest rect. */
+    int dest_y)
+{
+    TkMacOSXDrawingContext dc;
+    MacDrawable *srcDraw = (MacDrawable *) src;
+    NSBitmapImageRep *bitmapRep = NULL;
+    CGImageRef img = NULL;
+    CGRect bounds, srcRect, dstRect;
+
+    display->request++;
+    if (!width || !height) {
+	return BadDrawable;
+    }
+
+    if (!TkMacOSXSetupDrawingContext(dst, gc, &dc)) {
+	TkMacOSXDbgMsg("Failed to setup drawing context.");
+	return BadDrawable;
+    }
+
+    if (!dc.context) {
+	TkMacOSXDbgMsg("Invalid destination drawable - no context.");
+	return BadDrawable;
+    }
+
+    if (srcDraw->flags & TK_IS_PIXMAP) {
+	img = CreateCGImageFromPixmap(src);
+    } else if (TkMacOSXDrawableWindow(src)) {
+	img = CreateCGImageFromDrawableRect(src, src_x, src_y, width, height);
+    } else {
+	TkMacOSXDbgMsg("Invalid source drawable - neither window nor pixmap.");
+    }
+
+    if (img) {
+	bounds = CGRectMake(0, 0, srcDraw->size.width, srcDraw->size.height);
+	srcRect = CGRectMake(src_x, src_y, width, height);
+	dstRect = CGRectMake(dest_x, dest_y, width, height);
+	TkMacOSXDrawCGImage(dst, gc, dc.context, img,
+		gc->foreground, gc->background, bounds, srcRect, dstRect);
+	CFRelease(img);
+    } else {
+	TkMacOSXDbgMsg("Failed to construct CGImage.");
+    }
+
+    TkMacOSXRestoreDrawingContext(&dc);
+    return Success;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * XCopyPlane --
+ *
+ *	Copies a bitmap from a source drawable to a destination drawable. The
+ *	plane argument specifies which bit plane of the source contains the
+ *	bitmap. Note that this implementation ignores the gc->function.
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	Changes the destination drawable.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int
+XCopyPlane(
+    Display *display,		/* Display. */
+    Drawable src,		/* Source drawable. */
+    Drawable dst,		/* Destination drawable. */
+    GC gc,				/* GC to use. */
+    int src_x,			/* X & Y, width & height */
+    int src_y,			/* define the source rectangle */
+    unsigned int width,	/* that will be copied. */
+    unsigned int height,
+    int dest_x,			/* Dest X & Y on dest rect. */
+    int dest_y,
+    unsigned long plane)	/* Which plane to copy. */
+{
+    TkMacOSXDrawingContext dc;
+    MacDrawable *srcDraw = (MacDrawable *) src;
+    MacDrawable *dstDraw = (MacDrawable *) dst;
+    CGRect bounds, srcRect, dstRect;
+    display->request++;
+    if (!width || !height) {
+	/* TkMacOSXDbgMsg("Drawing of empty area requested"); */
+	return BadDrawable;
+    }
+    if (plane != 1) {
+	Tcl_Panic("Unexpected plane specified for XCopyPlane");
+    }
+    if (srcDraw->flags & TK_IS_PIXMAP) {
+	if (!TkMacOSXSetupDrawingContext(dst, gc, &dc)) {
+	    return BadDrawable;
+	}
+
+	CGContextRef context = dc.context;
+
+	if (context) {
+	    CGImageRef img = CreateCGImageFromPixmap(src);
+
+	    if (img) {
+		TkpClipMask *clipPtr = (TkpClipMask *) gc->clip_mask;
+		unsigned long imageBackground  = gc->background;
+
+                if (clipPtr && clipPtr->type == TKP_CLIP_PIXMAP) {
+		    srcRect = CGRectMake(src_x, src_y, width, height);
+		    CGImageRef mask = CreateCGImageFromPixmap(
+			    clipPtr->value.pixmap);
+		    CGImageRef submask = CGImageCreateWithImageInRect(
+			    img, srcRect);
+		    CGRect rect = CGRectMake(dest_x, dest_y, width, height);
+
+		    rect = CGRectOffset(rect, dstDraw->xOff, dstDraw->yOff);
+		    CGContextSaveGState(context);
+
+		    /*
+		     * Move the origin of the destination to top left.
+		     */
+
+		    CGContextTranslateCTM(context,
+			    0, rect.origin.y + CGRectGetMaxY(rect));
+		    CGContextScaleCTM(context, 1, -1);
+
+		    /*
+		     * Fill with the background color, clipping to the mask.
+		     */
+
+		    CGContextClipToMask(context, rect, submask);
+		    TkMacOSXSetColorInContext(gc, gc->background, dc.context);
+		    CGContextFillRect(context, rect);
+
+		    /*
+		     * Fill with the foreground color, clipping to the
+		     * intersection of img and mask.
+		     */
+
+		    CGImageRef subimage = CGImageCreateWithImageInRect(
+			    img, srcRect);
+		    CGContextClipToMask(context, rect, subimage);
+		    TkMacOSXSetColorInContext(gc, gc->foreground, context);
+		    CGContextFillRect(context, rect);
+		    CGContextRestoreGState(context);
+		    CGImageRelease(img);
+		    CGImageRelease(mask);
+		    CGImageRelease(submask);
+		    CGImageRelease(subimage);
+		} else {
+		    bounds = CGRectMake(0, 0,
+			    srcDraw->size.width, srcDraw->size.height);
+		    srcRect = CGRectMake(src_x, src_y, width, height);
+		    dstRect = CGRectMake(dest_x, dest_y, width, height);
+		    TkMacOSXDrawCGImage(dst, gc, dc.context, img,
+			    gc->foreground, imageBackground, bounds,
+			    srcRect, dstRect);
+		    CGImageRelease(img);
+		}
+	    } else {
+		/* no image */
+		TkMacOSXDbgMsg("Invalid source drawable");
+	    }
+	} else {
+	    TkMacOSXDbgMsg("Invalid destination drawable - "
+		    "could not get a bitmap context.");
+	}
+	TkMacOSXRestoreDrawingContext(&dc);
+	return Success;
+    } else {
+	/*
+	 * Source drawable is a Window, not a Pixmap.
+	 */
+
+	return XCopyArea(display, src, dst, gc, src_x, src_y, width, height,
+		dest_x, dest_y);
+    }
+}
+
+/*
  * Local Variables:
  * mode: objc
  * c-basic-offset: 4
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c
index a77ea59..321b4f8 100644
--- a/macosx/tkMacOSXMenu.c
+++ b/macosx/tkMacOSXMenu.c
@@ -690,7 +690,7 @@ TkpConfigureMenuEntry(
 
     if (mePtr->image) {
     	Tk_SizeOfImage(mePtr->image, &imageWidth, &imageHeight);
-	image = TkMacOSXGetNSImageWithTkImage(mePtr->menuPtr->display,
+	image = TkMacOSXGetNSImageFromTkImage(mePtr->menuPtr->display,
 		mePtr->image, imageWidth, imageHeight);
     } else if (mePtr->bitmapPtr != None) {
 	Pixmap bitmap = Tk_GetBitmapFromObj(mePtr->menuPtr->tkwin,
@@ -698,7 +698,7 @@ TkpConfigureMenuEntry(
 
 	Tk_SizeOfBitmap(mePtr->menuPtr->display, bitmap, &imageWidth,
 		&imageHeight);
-	image = TkMacOSXGetNSImageWithBitmap(mePtr->menuPtr->display, bitmap,
+	image = TkMacOSXGetNSImageFromBitmap(mePtr->menuPtr->display, bitmap,
 		gc, imageWidth, imageHeight);
 	if (gc->foreground == defaultFg) {
 	    // Use a semantic foreground color by default
diff --git a/macosx/tkMacOSXPort.h b/macosx/tkMacOSXPort.h
index 4347766..ba47566 100644
--- a/macosx/tkMacOSXPort.h
+++ b/macosx/tkMacOSXPort.h
@@ -163,6 +163,13 @@
 #define TK_DYNAMIC_COLORMAP 0x0fffffff
 
 /*
+ * Inform tkImgPhInstance.c that our tkPutImage can render an image with an
+ * alpha channel directly into a window.
+ */
+
+#define TKPUTIMAGE_CAN_BLEND
+
+/*
  * Used by xcolor.c
  */
 
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h
index 5c4ae7d..1091d7c 100644
--- a/macosx/tkMacOSXPrivate.h
+++ b/macosx/tkMacOSXPrivate.h
@@ -4,7 +4,8 @@
  *	Macros and declarations that are purely internal & private to TkAqua.
  *
  * Copyright (c) 2005-2009 Daniel A. Steffen <das@users.sourceforge.net>
- * Copyright 2008-2009, Apple Inc.
+ * Copyright (c) 2008-2009 Apple Inc.
+ * Copyright (c) 2020 Marc Culler
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -254,9 +255,6 @@ MODULE_SCOPE WindowClass TkMacOSXWindowClass(TkWindow *winPtr);
 MODULE_SCOPE int	TkMacOSXIsWindowZoomed(TkWindow *winPtr);
 MODULE_SCOPE int	TkGenerateButtonEventForXPointer(Window window);
 MODULE_SCOPE EventModifiers TkMacOSXModifierState(void);
-MODULE_SCOPE NSBitmapImageRep* TkMacOSXBitmapRepFromDrawableRect(Drawable drawable,
-			    int x, int y, unsigned int width, unsigned int height);
-MODULE_SCOPE CGImageRef TkMacOSXCreateCGImageWithXImage(XImage *image);
 MODULE_SCOPE void       TkMacOSXDrawCGImage(Drawable d, GC gc, CGContextRef context,
 			    CGImageRef image, unsigned long imageForeground,
 			    unsigned long imageBackground, CGRect imageBounds,
@@ -279,10 +277,9 @@ MODULE_SCOPE HIShapeRef	TkMacOSXGetClipRgn(Drawable drawable);
 MODULE_SCOPE void	TkMacOSXInvalidateViewRegion(NSView *view,
 			    HIShapeRef rgn);
 MODULE_SCOPE CGContextRef TkMacOSXGetCGContextForDrawable(Drawable drawable);
-MODULE_SCOPE CGImageRef	TkMacOSXCreateCGImageWithDrawable(Drawable drawable);
-MODULE_SCOPE NSImage*	TkMacOSXGetNSImageWithTkImage(Display *display,
+MODULE_SCOPE NSImage*	TkMacOSXGetNSImageFromTkImage(Display *display,
 			    Tk_Image image, int width, int height);
-MODULE_SCOPE NSImage*	TkMacOSXGetNSImageWithBitmap(Display *display,
+MODULE_SCOPE NSImage*	TkMacOSXGetNSImageFromBitmap(Display *display,
 			    Pixmap bitmap, GC gc, int width, int height);
 MODULE_SCOPE CGColorRef	TkMacOSXCreateCGColor(GC gc, unsigned long pixel);
 MODULE_SCOPE NSColor*	TkMacOSXGetNSColor(GC gc, unsigned long pixel);
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index cbe6f08..aebf82c 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -2581,7 +2581,7 @@ WmIconphotoCmd(
 
     Tk_SizeOfImage(tk_icon, &width, &height);
     if (width != 0 && height != 0) {
-	newIcon = TkMacOSXGetNSImageWithTkImage(winPtr->display, tk_icon,
+	newIcon = TkMacOSXGetNSImageFromTkImage(winPtr->display, tk_icon,
 						width, height);
     }
     Tk_FreeImage(tk_icon);
diff --git a/xlib/X11/Xlib.h b/xlib/X11/Xlib.h
index 91aab57..1977939 100644
--- a/xlib/X11/Xlib.h
+++ b/xlib/X11/Xlib.h
@@ -331,7 +331,7 @@ typedef struct _XImage {
     unsigned long blue_mask;
     XPointer obdata;		/* hook for the object routines to hang on */
 #if defined(MAC_OSX_TK)
-    int pixelpower;		/* n such that pixels are 2^n x 2^n blocks*/
+    int pixelpower;		/* No longer used. */
 #endif
     struct funcs {		/* image manipulation routines */
 	struct _XImage *(*create_image)();
-- 
cgit v0.12


From 45fc71df26e06074f33babae916d97880a80e9cb Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Sun, 23 Aug 2020 13:21:39 +0000
Subject: Fix [bc62f78191]: compilation issues when targeting older macOS
 versions.

---
 macosx/tkMacOSXColor.c       | 26 +++++++++++++++-----------
 macosx/tkMacOSXWindowEvent.c | 10 ++++++----
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index e9dbfec..f9d2750 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -769,19 +769,23 @@ TkpGetColor(
 	    if (entry->type == semantic) {
 		CGFloat rgba[4];
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
-		NSAppearance *savedAppearance = [NSAppearance currentAppearance];
-		NSAppearance *windowAppearance = savedAppearance;
-		if (view) {
-		    windowAppearance = [view effectiveAppearance];
-		}
-		if ([windowAppearance name] == NSAppearanceNameDarkAqua) {
-		    colormap = darkColormap;
+		if (@available(macOS 10.14, *)) {
+		    NSAppearance *savedAppearance = [NSAppearance currentAppearance];
+		    NSAppearance *windowAppearance = savedAppearance;
+		    if (view) {
+			windowAppearance = [view effectiveAppearance];
+		    }
+		    if ([windowAppearance name] == NSAppearanceNameDarkAqua) {
+			colormap = darkColormap;
+		    } else {
+			colormap = lightColormap;
+		    }
+		    [NSAppearance setCurrentAppearance:windowAppearance];
+		    GetRGBA(entry, p.ulong, rgba);
+		    [NSAppearance setCurrentAppearance:savedAppearance];
 		} else {
-		    colormap = lightColormap;
+		    GetRGBA(entry, p.ulong, rgba);
 		}
-		[NSAppearance setCurrentAppearance:windowAppearance];
-		GetRGBA(entry, p.ulong, rgba);
-		[NSAppearance setCurrentAppearance:savedAppearance];
 #else
 		GetRGBA(entry, p.ulong, rgba);
 #endif
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index acea6f0..e75858d 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -207,9 +207,9 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
     TkWindow *winPtr = TkMacOSXGetTkWindow(window);
     if (winPtr) {
 	TKContentView *view = [window contentView];
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
-	[view viewDidChangeEffectiveAppearance];
-#endif
+	if (@available(macOS 10.14, *)) {
+	    [view viewDidChangeEffectiveAppearance];
+	}
 	[view addTkDirtyRect:[view bounds]];
 	Tcl_CancelIdleCall(TkMacOSXDrawAllViews, NULL);
 	Tcl_DoWhenIdle(TkMacOSXDrawAllViews, NULL);
@@ -1142,7 +1142,9 @@ static const char *const accentNames[] = {
 {
     NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults];
     if (object == preferences && [keyPath isEqualToString:@"AppleHighlightColor"]) {
-	[self viewDidChangeEffectiveAppearance];
+	if (@available(macOS 10.14, *)) {
+	    [self viewDidChangeEffectiveAppearance];
+	}
     }
 }
 
-- 
cgit v0.12


From 3b967bf8397e69bc3437a6c6a071516cba20702e Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Sun, 23 Aug 2020 14:28:05 +0000
Subject: Address compiler warnings.

---
 macosx/tkMacOSXImage.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/macosx/tkMacOSXImage.c b/macosx/tkMacOSXImage.c
index 48ed06d..d4dcc78 100644
--- a/macosx/tkMacOSXImage.c
+++ b/macosx/tkMacOSXImage.c
@@ -545,7 +545,6 @@ CreateCGImageFromDrawableRect(
 	    CGImageRelease(cg_image);
 	}
     } else if (TkMacOSXDrawableView(mac_drawable) != NULL) {
-	TKContentView *tkview = (TKContentView *)view;
 
 	/*
 	 * Convert Tk top-left to NSView bottom-left coordinates.
@@ -559,8 +558,7 @@ CreateCGImageFromDrawableRect(
 	/*
 	 * Attempt to copy from the view to a bitmapImageRep.  If the view does
 	 * not have a valid CGContext, doing this will silently corrupt memory
-	 * and make a big mess. So, in that case, we mark the view as needing
-	 * display and return NULL.
+	 * and make a big mess. So, in that case, we just return NULL.
 	 */
 
 	if (view == [NSView focusView]) {
@@ -570,7 +568,6 @@ CreateCGImageFromDrawableRect(
 	    CFRelease(bitmapRep);
 	} else {
 	    TkMacOSXDbgMsg("No CGContext - cannot copy from screen to bitmap.");
-	    [tkview addTkDirtyRect:[tkview bounds]];
 	    result = NULL;
 	}
     } else {
@@ -663,7 +660,7 @@ XGetImage(
 	if (cgImage) {
 	    bitmapRep = [NSBitmapImageRep alloc];
 	    [bitmapRep initWithCGImage:cgImage];
-	    [cgImage release];
+	    CFRelease(cgImage);
 	} else {
 	    TkMacOSXDbgMsg("XGetImage: Failed to construct CGImage");
 	    return NULL;
@@ -750,7 +747,6 @@ XCopyArea(
 {
     TkMacOSXDrawingContext dc;
     MacDrawable *srcDraw = (MacDrawable *) src;
-    NSBitmapImageRep *bitmapRep = NULL;
     CGImageRef img = NULL;
     CGRect bounds, srcRect, dstRect;
 
-- 
cgit v0.12


From 4d8366f3ea29283c2698ea9a951c02e50c0e8fac Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 23 Aug 2020 22:10:25 +0000
Subject: Fix [970793d707]: textWind-10.10,11,12,13,14 fail on Windows in
 trunk.

---
 tests/textWind.test | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/textWind.test b/tests/textWind.test
index 8edd825..e71abe6 100644
--- a/tests/textWind.test
+++ b/tests/textWind.test
@@ -860,7 +860,7 @@ test textWind-10.10 {EmbWinLayoutProc procedure, doesn't fit on line} -setup {
 } -body {
     .t configure -wrap char
     .t insert 1.0 "Some sample text"
-    frame .f -width 125 -height 20 -bg $color -bd 2 -relief raised
+    frame .f -width [expr {($tWidth-12)*$fixedWidth-1}] -height 20 -bg $color -bd 2 -relief raised
     .t window create 1.12 -window .f
     list [.t bbox .f] [.t bbox 1.13]
 } -cleanup {
@@ -875,7 +875,7 @@ test textWind-10.11 {EmbWinLayoutProc procedure, doesn't fit on line} -setup {
 } -body {
     .t configure -wrap char
     .t insert 1.0 "Some sample text"
-    frame .f -width 126 -height 20 -bg $color -bd 2 -relief raised
+    frame .f -width [expr {($tWidth-12)*$fixedWidth}] -height 20 -bg $color -bd 2 -relief raised
     .t window create 1.12 -window .f
     update
     list [.t bbox .f] [.t bbox 1.13]
@@ -891,15 +891,15 @@ test textWind-10.12 {EmbWinLayoutProc procedure, doesn't fit on line} -setup {
 } -body {
     .t configure -wrap char
     .t insert 1.0 "Some sample text"
-    frame .f -width 127 -height 20 -bg $color -bd 2 -relief raised
+    frame .f -width [expr {($tWidth-12)*$fixedWidth+1}] -height 20 -bg $color -bd 2 -relief raised
     .t window create 1.12 -window .f
     update
     list [.t bbox .f] [.t bbox 1.13]
 } -cleanup {
     destroy .f
 } -result [list \
-    [list $padx [expr {$pady+$fixedHeight}] 127 20] \
-    [list [expr {$padx+127}] [expr {$pady+$fixedHeight+((20-$fixedHeight)/2)}] $fixedWidth $fixedHeight]]
+    [list $padx [expr {$pady+$fixedHeight}] [expr {($tWidth-12)*$fixedWidth+1}] 20] \
+    [list [expr {$padx+($tWidth-12)*$fixedWidth+1}] [expr {$pady+$fixedHeight+((20-$fixedHeight)/2)}] $fixedWidth $fixedHeight]]
 
 test textWind-10.13 {EmbWinLayoutProc procedure, doesn't fit on line} -setup {
     .t delete 1.0 end
@@ -907,7 +907,7 @@ test textWind-10.13 {EmbWinLayoutProc procedure, doesn't fit on line} -setup {
 } -body {
     .t configure -wrap none
     .t insert 1.0 "Some sample text"
-    frame .f -width 130 -height 20 -bg $color -bd 2 -relief raised
+    frame .f -width [expr {($tWidth-12)*$fixedWidth+5}] -height 20 -bg $color -bd 2 -relief raised
     .t window create 1.12 -window .f
     update
     list [.t bbox .f] [.t bbox 1.13]
@@ -923,7 +923,7 @@ test textWind-10.14 {EmbWinLayoutProc procedure, doesn't fit on line} -setup {
 } -body {
     .t configure -wrap none
     .t insert 1.0 "Some sample text"
-    frame .f -width 130 -height 220 -bg $color -bd 2 -relief raised
+    frame .f -width [expr {($tWidth-12)*$fixedWidth+5}] -height 220 -bg $color -bd 2 -relief raised
     .t window create 1.12 -window .f
     update
     list [.t bbox .f] [.t bbox 1.13]
-- 
cgit v0.12


From 5fce3b6e1af2cae22198a50413ae9712e42422b9 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Mon, 24 Aug 2020 00:44:33 +0000
Subject: Use graphicsPort instead of CGContext if the minimum target is
 earlier than 10.10.

---
 macosx/tkMacOSXDraw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index 24eb380..87bd90c 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -17,7 +17,7 @@
 #include "tkMacOSXDebug.h"
 #include "tkButton.h"
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
 #define GET_CGCONTEXT [[NSGraphicsContext currentContext] CGContext]
 #else
 #define GET_CGCONTEXT [[NSGraphicsContext currentContext] graphicsPort]
-- 
cgit v0.12


From 79cce61253647cf934c292ae7c32c133c4cff51e Mon Sep 17 00:00:00 2001
From: Kevin Walzer <kw@codebykevin.com>
Date: Mon, 24 Aug 2020 00:47:42 +0000
Subject: Test branch for AppleScript bugs with patch from Lars Helstrom

---
 library/tk.tcl            | 2 ++
 macosx/tkMacOSXHLEvents.c | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/library/tk.tcl b/library/tk.tcl
index 421bac8..abe34ab 100644
--- a/library/tk.tcl
+++ b/library/tk.tcl
@@ -687,9 +687,11 @@ if {[tk windowingsystem] eq "aqua"} {
 if {[tk windowingsystem] eq "aqua"} {
     #stub procedures to respond to "do script" Apple Events
     proc ::tk::mac::DoScriptFile {file} {
+	uplevel #0 $file
     	source $file
     }
     proc ::tk::mac::DoScriptText {script} {
+	uplevel #0 $script
     	eval $script
     }
 }
diff --git a/macosx/tkMacOSXHLEvents.c b/macosx/tkMacOSXHLEvents.c
index d15abde..91d7b72 100644
--- a/macosx/tkMacOSXHLEvents.c
+++ b/macosx/tkMacOSXHLEvents.c
@@ -309,6 +309,7 @@ static const char *scriptTextProc = "::tk::mac::DoScriptText";
 	    if (noErr == AEGetParamPtr(theDesc, keyDirectObject,
 				       typeUTF8Text, &type,
 				       data, actual, NULL)) {
+                data[actual] = '\0'; 
                 AppleEventInfo *AEInfo = ckalloc(sizeof(AppleEventInfo));
                 Tcl_DString *scriptTextCommand = &AEInfo->command;
                 Tcl_DStringInit(scriptTextCommand);
@@ -383,9 +384,6 @@ static void ProcessAppleEvent(
     }
     code = Tcl_EvalEx(AEInfo->interp, Tcl_DStringValue(&AEInfo->command),
 	    Tcl_DStringLength(&AEInfo->command), TCL_EVAL_GLOBAL);
-    if (code != TCL_OK) {
-	Tcl_BackgroundException(AEInfo->interp, code);
-    }
 
     if (AEInfo->replyEvent && code >= 0) {
         int reslen;
@@ -400,7 +398,10 @@ static void ProcessAppleEvent(
             AEPutParamPtr((AppleEvent*)[AEInfo->replyEvent aeDesc],
                           keyErrorNumber, typeSInt32, (Ptr) &code, sizeof(int));
         }
+    } else if (code != TCL_OK) {
+	Tcl_BackgroundException(AEInfo->interp, code);
     }
+
     Tcl_DStringFree(&AEInfo->command);
     ckfree(clientData);
 }
-- 
cgit v0.12


From de756c286b87b130d1c34698462a398e1eb31b63 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Mon, 24 Aug 2020 01:08:34 +0000
Subject: Adjust some point locations by 1 pixel  in DrawDarkListHeader -
 thanks to Csaba Nemethi

---
 macosx/ttkMacOSXTheme.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c
index 64d3fac..0259a55 100644
--- a/macosx/ttkMacOSXTheme.c
+++ b/macosx/ttkMacOSXTheme.c
@@ -1174,10 +1174,10 @@ static void DrawDarkListHeader(
     CGContextSetStrokeColorSpace(context, deviceRGB.CGColorSpace);
     CGFloat x = bounds.origin.x, y = bounds.origin.y;
     CGFloat w = bounds.size.width, h = bounds.size.height;
-    CGPoint top[2] = {{x, y}, {x + w, y}};
-    CGPoint bottom[2] = {{x, y + h}, {x + w, y + h}};
-    CGPoint separator[2] = {{x + w, y + 3}, {x + w, y + h - 3}};
 
+    CGPoint top[2] = {{x, y + 1}, {x + w, y + 1}};
+    CGPoint bottom[2] = {{x, y + h}, {x + w, y + h}};
+    CGPoint separator[2] = {{x + w - 1, y + 3}, {x + w - 1, y + h - 3}};
     CGContextSaveGState(context);
     CGContextSetShouldAntialias(context, false);
     stroke = [NSColor colorWithColorSpace: deviceRGB
-- 
cgit v0.12


From b9cf3db8ffcd343bcc6b58bab5efec4c50e22386 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 24 Aug 2020 08:33:08 +0000
Subject: Upgrade Travis build from bionic to focal

---
 .travis.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b0a78e0..0fb5332 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,27 +21,27 @@ jobs:
 # Testing on Linux with various compilers
     - name: "Linux/GCC/Shared"
       os: linux
-      dist: bionic
+      dist: focal
       compiler: gcc
       env:
         - BUILD_DIR=unix
     - name: "Linux/GCC/Shared/no-xft"
       os: linux
-      dist: bionic
+      dist: focal
       compiler: gcc
       env:
         - BUILD_DIR=unix
         - CFGOPT="--disable-xft"
     - name: "Linux/GCC/Static"
       os: linux
-      dist: bionic
+      dist: focal
       compiler: gcc
       env:
         - BUILD_DIR=unix
         - CFGOPT="--disable-shared"
     - name: "Linux/GCC/Debug"
       os: linux
-      dist: bionic
+      dist: focal
       compiler: gcc
       env:
         - BUILD_DIR=unix
@@ -49,7 +49,7 @@ jobs:
 # Older versions of GCC...
     - name: "Linux/GCC 7/Shared"
       os: linux
-      dist: bionic
+      dist: focal
       compiler: gcc-7
       addons:
         apt:
@@ -61,7 +61,7 @@ jobs:
         - BUILD_DIR=unix
     - name: "Linux/GCC 6/Shared"
       os: linux
-      dist: bionic
+      dist: focal
       compiler: gcc-6
       addons:
         apt:
@@ -73,7 +73,7 @@ jobs:
         - BUILD_DIR=unix
     - name: "Linux/GCC 5/Shared"
       os: linux
-      dist: bionic
+      dist: focal
       compiler: gcc-5
       addons:
         apt:
@@ -86,27 +86,27 @@ jobs:
 # Clang
     - name: "Linux/Clang/Shared"
       os: linux
-      dist: bionic
+      dist: focal
       compiler: clang
       env:
         - BUILD_DIR=unix
     - name: "Linux/Clang/Shared/no-xft"
       os: linux
-      dist: bionic
+      dist: focal
       compiler: clang
       env:
         - BUILD_DIR=unix
         - CFGOPT="--disable-xft"
     - name: "Linux/Clang/Static"
       os: linux
-      dist: bionic
+      dist: focal
       compiler: clang
       env:
         - CFGOPT="--disable-shared"
         - BUILD_DIR=unix
     - name: "Linux/Clang/Debug"
       os: linux
-      dist: bionic
+      dist: focal
       compiler: clang
       env:
         - BUILD_DIR=unix
@@ -134,7 +134,7 @@ jobs:
 # "make dist" only
     - name: "Linux: make dist"
       os: linux
-      dist: bionic
+      dist: focal
       compiler: gcc
       env:
         - BUILD_DIR=unix
-- 
cgit v0.12


From a18ac8f4cae7b165e9d8528062f40bb5a4cb29cc Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Mon, 24 Aug 2020 09:30:51 +0000
Subject: Fix duplicate test name scrollbar-3.50.1

---
 tests/scrollbar.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/scrollbar.test b/tests/scrollbar.test
index d740f7c..037fe1a 100644
--- a/tests/scrollbar.test
+++ b/tests/scrollbar.test
@@ -341,7 +341,7 @@ test scrollbar-3.49 {ScrollbarWidgetCmd procedure, "identify" option} {
 test scrollbar-3.50.1 {ScrollbarWidgetCmd procedure, "identify" option} notAqua {
     .s identify 5 5
 } {arrow1}
-test scrollbar-3.50.1 {ScrollbarWidgetCmd procedure, "identify" option} aqua {
+test scrollbar-3.50.2 {ScrollbarWidgetCmd procedure, "identify" option} aqua {
     # macOS scrollbars have no arrows nowadays
     .s identify 5 5
 } {trough1}
-- 
cgit v0.12


From b3e879b3b45d4358b9441cc090ee9e410fc31b1c Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Mon, 24 Aug 2020 10:48:02 +0000
Subject: Remove duplicate tests

---
 tests/text.test | 94 ---------------------------------------------------------
 1 file changed, 94 deletions(-)

diff --git a/tests/text.test b/tests/text.test
index 1fbb9d8..96ab21e 100644
--- a/tests/text.test
+++ b/tests/text.test
@@ -7540,100 +7540,6 @@ test text-32.4 {peer widget -start, -endline and deletion (bug 1630262)} -setup
     destroy .pt .t
 } -result {5 11 8 10 5 8 6 8 22 27 38 44 55 60 57 57}
 
-test text-32.2 {peer widget -start, -endline and deletion (bug 1630262)} -setup {
-    destroy .t .pt
-    set res {}
-} -body {
-    text .t
-    .t peer create .pt
-    for {set i 1} {$i < 100} {incr i} {
-      .t insert end "Line $i\n"
-    }
-    .t configure -startline 5
-    # none of the following delete shall crash
-    # (all did before fixing bug 1630262)
-    # 1. delete on the same line: line1 == line2 in DeleteIndexRange,
-    #    and resetView is true neither for .t not for .pt
-    .pt delete 2.0 2.2
-    # 2. delete just one line: line1 < line2 in DeleteIndexRange,
-    #    and resetView is true only for .t, not for .pt
-    .pt delete 2.0 3.0
-    # 3. delete several lines: line1 < line2 in DeleteIndexRange,
-    #    and resetView is true only for .t, not for .pt
-    .pt delete 2.0 5.0
-    # 4. delete to the end line: line1 < line2 in DeleteIndexRange,
-    #    and resetView is true only for .t, not for .pt
-    .pt delete 2.0 end
-    # this test succeeds provided there is no crash
-    set res 1
-} -cleanup {
-    destroy .pt
-} -result 1
-
-test text-32.3 {peer widget -start, -endline and deletion (bug 1630262)} -setup {
-    destroy .t .pt
-    set res {}
-} -body {
-    text .t
-    .t peer create .pt
-    for {set i 1} {$i < 100} {incr i} {
-      .t insert end "Line $i\n"
-    }
-    .t configure -startline 5
-    .pt configure -startline 3
-    # the following delete shall not crash
-    # (it did before fixing bug 1630262)
-    .pt delete 2.0 3.0
-    # moreover -startline shall be correct
-    # (was wrong before fixing bug 1630262)
-    lappend res [.t cget -start] [.pt cget -start]
-} -cleanup {
-    destroy .pt
-} -result {4 3}
-
-test text-32.4 {peer widget -start, -endline and deletion (bug 1630262)} -setup {
-    destroy .t .pt
-    set res {}
-} -body {
-    text .t
-    .t peer create .pt
-    for {set i 1} {$i < 100} {incr i} {
-      .t insert end "Line $i\n"
-    }
-    .t configure -startline 5 -endline 15
-    .pt configure -startline 8 -endline 12
-    # .pt now shows a range entirely inside the range of .pt
-    # from .t, delete lines located after [.pt cget -end]
-    .t delete 9.0 10.0
-    # from .t, delete lines straddling [.pt cget -end]
-    .t delete 6.0 9.0
-    lappend res [.t cget -start] [.t cget -end] [.pt cget -start] [.pt cget -end]
-    .t configure -startline 5 -endline 12
-    .pt configure -startline 8 -endline 12
-    # .pt now shows again a range entirely inside the range of .pt
-    # from .t, delete lines located before [.pt cget -start]
-    .t delete 2.0 3.0
-    # from .t, delete lines straddling [.pt cget -start]
-    .t delete 2.0 5.0
-    lappend res [.t cget -start] [.t cget -end] [.pt cget -start] [.pt cget -end]
-    .t configure -startline 22 -endline 31
-    .pt configure -startline 42 -endline 51
-    # .t now shows a range entirely before the range of .pt
-    # from .t, delete some lines, then do it from .pt
-    .t delete 2.0 3.0
-    .t delete 2.0 5.0
-    .pt delete 2.0 5.0
-    lappend res [.t cget -start] [.t cget -end] [.pt cget -start] [.pt cget -end]
-    .t configure -startline 55 -endline 75
-    .pt configure -startline 60 -endline 70
-    # .pt now shows a range entirely inside the range of .t
-    # from .t, delete a range straddling the entire range of .pt
-    .t delete 3.0 18.0
-    lappend res [.t cget -start] [.t cget -end] [.pt cget -start] [.pt cget -end]
-} -cleanup {
-    destroy .pt .t
-} -result {5 11 8 10 5 8 6 8 22 27 38 44 55 60 57 57}
-
 
 test text-33.1 {TextWidgetCmd procedure, "peer" option} -setup {
     text .t
-- 
cgit v0.12


From 0925898c0b0d5fde21ba8e414525bf5dd7f70757 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Mon, 24 Aug 2020 10:48:33 +0000
Subject: Fix duplicate test names

---
 tests/canvas.test   | 212 ++++++++++++++++++++++++++--------------------------
 tests/imgPhoto.test |  32 ++++----
 2 files changed, 121 insertions(+), 123 deletions(-)

diff --git a/tests/canvas.test b/tests/canvas.test
index e5e5ac9..46c745a 100644
--- a/tests/canvas.test
+++ b/tests/canvas.test
@@ -354,6 +354,22 @@ test canvas-8.1 {canvas arc bbox} -setup {
     set arcSegBox [.c bbox arc4]
     list $arcBox $coordBox $pieBox $arcSegBox
 } -result {{48 21 100 94} {248 21 300 94} {398 21 500 112} {98 171 302 202}}
+test canvas-8.2 {canvas very small arc} -setup {
+    catch {destroy .c}
+    canvas .c
+} -body {
+    # no Inf or NaN must be generated even for very small arcs
+    .c create arc 0 100 0 100 -height 100 -style arc -outline "" -tags arc1
+    set arcBox [.c bbox arc1]
+    .c create arc 0 100 0 100 -height 100 -style arc -outline blue -tags arc2
+    set outlinedArcBox [.c bbox arc2]
+    set coords [.c coords arc1]
+    set start [.c itemcget arc1 -start]
+    set extent [.c itemcget arc1 -extent]
+    set width [.c itemcget arc1 -width]
+    set height [.c itemcget arc1 -height]
+    list $arcBox $outlinedArcBox $coords $start $extent $width $height
+} -result {{-1 99 1 101} {-2 98 2 102} {0.0 100.0 0.0 100.0} 0.0 0.0 1.0 0.0}
 
 test canvas-9.1 {canvas id creation and deletion} -setup {
     catch {destroy .c}
@@ -1004,112 +1020,6 @@ test canvas-20.3 {tag deletion - all tags match} -setup {
     destroy .c
 } -result {{tagA tagA tagA tagA tagA tagA} {}}
 
-# Procedure used in test cases 20.1 20.2 20.3
-proc matchPixels {pixels expected} {
-    set matched 1
-    foreach pline $pixels eline $expected {
-        foreach ppixel $pline epixel $eline {
-            if {$ppixel != $epixel} {
-                set matched 0
-                break
-            }
-        }
-    }
-    return $matched
-}
-
-test canvas-20.1 {canvas image} -setup {
-    canvas .c
-    image create photo testimage
-} -body  {
-    .c configure -background #c0c0c0 -scrollregion {0 0 9 9}
-    .c create rectangle 0 0 0 9 -fill #000080 -outline #000080
-    .c image testimage
-    matchPixels [testimage data] { \
-            {#000080 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
-            {#000080 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
-            {#000080 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
-            {#000080 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
-            {#000080 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
-            {#000080 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
-            {#000080 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
-            {#000080 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
-            {#000080 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
-            {#000080 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0}}
-} -cleanup {
-    destroy .c
-    image delete testimage
-} -result 1
-
-test canvas-20.2 {canvas image with subsample} -setup {
-    canvas .c
-    image create photo testimage
-} -body  {
-    .c configure -background #c0c0c0 -scrollregion {0 0 9 9}
-    .c create rectangle 0 0 1 9 -fill #008000 -outline #008000
-    .c image testimage 2
-    matchPixels [testimage data] { \
-        {#008000 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
-        {#008000 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
-        {#008000 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
-        {#008000 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
-        {#008000 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0}}
-} -cleanup {
-    destroy .c
-    image delete testimage
-} -result 1
-
-test canvas-20.3 {canvas image with subsample and zoom} -setup {
-    canvas .c
-    image create photo testimage
-} -body  {
-    .c configure -background #c0c0c0 -scrollregion {0 0 9 9}
-    .c create rectangle 0 0 9 0 -fill #800000 -outline #800000
-    .c image testimage 1 2
-    matchPixels [testimage data] { \
-        {#800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000} \
-        {#800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000} \
-        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
-        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
-        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
-        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
-        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
-        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
-        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
-        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
-        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
-        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
-        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
-        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
-        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
-        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
-        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
-        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
-        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
-        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0}}
-} -cleanup {
-    destroy .c
-    image delete testimage
-} -result 1
-
-test canvas-21.1 {canvas very small arc} -setup {
-    catch {destroy .c}
-    canvas .c
-} -body {
-    # no Inf or NaN must be generated even for very small arcs
-    .c create arc 0 100 0 100 -height 100 -style arc -outline "" -tags arc1
-    set arcBox [.c bbox arc1]
-    .c create arc 0 100 0 100 -height 100 -style arc -outline blue -tags arc2
-    set outlinedArcBox [.c bbox arc2]
-    set coords [.c coords arc1]
-    set start [.c itemcget arc1 -start]
-    set extent [.c itemcget arc1 -extent]
-    set width [.c itemcget arc1 -width]
-    set height [.c itemcget arc1 -height]
-    list $arcBox $outlinedArcBox $coords $start $extent $width $height
-} -result {{-1 99 1 101} {-2 98 2 102} {0.0 100.0 0.0 100.0} 0.0 0.0 1.0 0.0}
-
-
 destroy .c
 test canvas-21.1 {canvas rotate} -setup {
     pack [canvas .c]
@@ -1292,7 +1202,95 @@ test canvas-22.9 {canvas rotate: window item rotation behaviour} -setup {
 } -cleanup {
     destroy .c
 } -result {{50.00 150.00} {} {25 125 50 150}}
-
+
+# Procedure used in test cases 23.1 23.2 23.3
+proc matchPixels {pixels expected} {
+    set matched 1
+    foreach pline $pixels eline $expected {
+        foreach ppixel $pline epixel $eline {
+            if {$ppixel != $epixel} {
+                set matched 0
+                break
+            }
+        }
+    }
+    return $matched
+}
+
+test canvas-23.1 {canvas image} -setup {
+    canvas .c
+    image create photo testimage
+} -body  {
+    .c configure -background #c0c0c0 -scrollregion {0 0 9 9}
+    .c create rectangle 0 0 0 9 -fill #000080 -outline #000080
+    .c image testimage
+    matchPixels [testimage data] { \
+            {#000080 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+            {#000080 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+            {#000080 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+            {#000080 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+            {#000080 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+            {#000080 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+            {#000080 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+            {#000080 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+            {#000080 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+            {#000080 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0}}
+} -cleanup {
+    destroy .c
+    image delete testimage
+} -result 1
+
+test canvas-23.2 {canvas image with subsample} -setup {
+    canvas .c
+    image create photo testimage
+} -body  {
+    .c configure -background #c0c0c0 -scrollregion {0 0 9 9}
+    .c create rectangle 0 0 1 9 -fill #008000 -outline #008000
+    .c image testimage 2
+    matchPixels [testimage data] { \
+        {#008000 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#008000 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#008000 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#008000 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#008000 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0}}
+} -cleanup {
+    destroy .c
+    image delete testimage
+} -result 1
+
+test canvas-23.3 {canvas image with subsample and zoom} -setup {
+    canvas .c
+    image create photo testimage
+} -body  {
+    .c configure -background #c0c0c0 -scrollregion {0 0 9 9}
+    .c create rectangle 0 0 9 0 -fill #800000 -outline #800000
+    .c image testimage 1 2
+    matchPixels [testimage data] { \
+        {#800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000} \
+        {#800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0}}
+} -cleanup {
+    destroy .c
+    image delete testimage
+} -result 1
+
 # cleanup
 imageCleanup
 cleanupTests
diff --git a/tests/imgPhoto.test b/tests/imgPhoto.test
index 782a210..9c33738 100644
--- a/tests/imgPhoto.test
+++ b/tests/imgPhoto.test
@@ -951,7 +951,7 @@ test imgPhoto-4.75 {<photo> read command: filename starting with '-'} -constrain
     image delete photo1
     file delete ./-teapotPhotoFile
 } -result {}
-test imgPhoto-4.76 {ImgPhotoCmd procedure: copy to same image} -constraints {
+test imgPhoto-4.75.1 {ImgPhotoCmd procedure: copy to same image} -constraints {
     hasTeapotPhoto
 } -setup {
     imageCleanup
@@ -963,7 +963,7 @@ test imgPhoto-4.76 {ImgPhotoCmd procedure: copy to same image} -constraints {
 } -cleanup {
     imageCleanup
 } -result {}
-test imgPhoto-4.76 {ImgPhotoCmd, transparancy get: too many options} -setup {
+test imgPhoto-4.76 {ImgPhotoCmd, transparency get: too many options} -setup {
     image create photo photo1
 } -body {
     photo1 put white -to 0 0 1 1
@@ -1941,9 +1941,9 @@ test imgPhoto-19.8 {MatchStirngFormat: invalid data for gif} -setup {
 } -returnCodes error -result {couldn't recognize image data}
 
 # Reject corrupted or truncated image [Bug b601ce3ab1].
-# WARNING - tests 18.1-18.9 will cause a segfault on 8.5.19 and lower,
+# WARNING - tests 20.1-20.9 will cause a segfault on 8.5.19 and lower,
 #           and on 8.6.6 and lower.
-test imgPhoto-18.1 {Reject corrupted GIF (binary string)} -setup {
+test imgPhoto-20.1 {Reject corrupted GIF (binary string)} -setup {
     set data [binary decode base64 {
 	R0lGODlhAAQABP8zM/8z/zP/MzP/////M////yH5CiwheLrcLTBCd6Tv2qW16tdK4jhV
 	5qpraXIvM1JlNyAgOw==
@@ -1953,7 +1953,7 @@ test imgPhoto-18.1 {Reject corrupted GIF (binary string)} -setup {
 } -cleanup {
     catch {image delete gif1}
 } -returnCodes error -result {error reading color map|not enough free memory for image buffer} -match regexp
-test imgPhoto-18.2 {Reject corrupted GIF (base 64 string)} -setup {
+test imgPhoto-20.2 {Reject corrupted GIF (base 64 string)} -setup {
     set data {
 	R0lGODlhAAQABP8zM/8z/zP/MzP/////M////yH5CiwheLrcLTBCd6Tv2qW16tdK4jhV
 	5qpraXIvM1JlNyAgOw==
@@ -1963,14 +1963,14 @@ test imgPhoto-18.2 {Reject corrupted GIF (base 64 string)} -setup {
 } -cleanup {
     catch {image delete gif1}
 } -returnCodes error -result {error reading color map|not enough free memory for image buffer} -match regexp
-test imgPhoto-18.3 {Reject corrupted GIF (file)} -setup {
+test imgPhoto-20.3 {Reject corrupted GIF (file)} -setup {
     set fileName [file join [file dirname [info script]] corruptMangled.gif]
 } -body {
     image create photo gif1 -file $fileName
 } -cleanup {
     catch {image delete gif1}
 } -returnCodes error -result {error reading color map|not enough free memory for image buffer} -match regexp
-test imgPhoto-18.4 {Reject truncated GIF (binary string)} -setup {
+test imgPhoto-20.4 {Reject truncated GIF (binary string)} -setup {
     set data [binary decode base64 {
 	R0lGODlhEAAQAMIHAAAAADMz//8zM/8z/zP/MzP///8=
     }]
@@ -1979,7 +1979,7 @@ test imgPhoto-18.4 {Reject truncated GIF (binary string)} -setup {
 } -cleanup {
     catch {image delete gif1}
 } -returnCodes error -result {error reading color map}
-test imgPhoto-18.5 {Reject truncated GIF (base 64 string)} -setup {
+test imgPhoto-20.5 {Reject truncated GIF (base 64 string)} -setup {
     set data {
 	R0lGODlhEAAQAMIHAAAAADMz//8zM/8z/zP/MzP///8=
     }
@@ -1988,14 +1988,14 @@ test imgPhoto-18.5 {Reject truncated GIF (base 64 string)} -setup {
 } -cleanup {
     catch {image delete gif1}
 } -returnCodes error -result {error reading color map}
-test imgPhoto-18.6 {Reject truncated GIF (file)} -setup {
+test imgPhoto-20.6 {Reject truncated GIF (file)} -setup {
     set fileName [file join [file dirname [info script]] corruptTruncated.gif]
 } -body {
     image create photo gif1 -file $fileName
 } -cleanup {
     catch {image delete gif1}
 } -returnCodes error -result {error reading color map}
-test imgPhoto-18.7 {Reject corrupted GIF (> 4Gb) (binary string)} -constraints {
+test imgPhoto-20.7 {Reject corrupted GIF (> 4Gb) (binary string)} -constraints {
     nonPortable
 } -setup {
     # About the non portability constraint of this test: see ticket [cc42cc18a5]
@@ -2011,7 +2011,7 @@ test imgPhoto-18.7 {Reject corrupted GIF (> 4Gb) (binary string)} -constraints {
 } -cleanup {
     catch {image delete gif1}
 } -returnCodes error -result {error reading color map|not enough free memory for image buffer} -match regexp
-test imgPhoto-18.8 {Reject corrupted GIF (> 4Gb) (base 64 string)} -constraints {
+test imgPhoto-20.8 {Reject corrupted GIF (> 4Gb) (base 64 string)} -constraints {
     nonPortable
 } -setup {
     # About the non portability constraint of this test: see ticket [cc42cc18a5]
@@ -2027,7 +2027,7 @@ test imgPhoto-18.8 {Reject corrupted GIF (> 4Gb) (base 64 string)} -constraints
 } -cleanup {
     catch {image delete gif1}
 } -returnCodes error -result {error reading color map|not enough free memory for image buffer} -match regexp
-test imgPhoto-18.9 {Reject corrupted GIF (> 4Gb) (file)} -constraints {
+test imgPhoto-20.9 {Reject corrupted GIF (> 4Gb) (file)} -constraints {
     nonPortable
 } -setup {
     # About the non portability constraint of this test: see ticket [cc42cc18a5]
@@ -2040,10 +2040,10 @@ test imgPhoto-18.9 {Reject corrupted GIF (> 4Gb) (file)} -constraints {
 } -cleanup {
     catch {image delete gif1}
 } -returnCodes error -result {error reading color map|not enough free memory for image buffer} -match regexp
-test imgPhoto-18.10 {Valid GIF (binary string)} -setup {
+test imgPhoto-20.10 {Valid GIF (binary string)} -setup {
     # Test the binary string reader with a valid GIF.
     # This is not tested elsewhere.
-    # Tests 18.11, 18.12, with matching data, are included for completeness.
+    # Tests 20.11, 20.12, with matching data, are included for completeness.
     set data [binary decode base64 {
 	R0lGODlhEAAQAMIHAAAAADMz//8zM/8z/zP/MzP/////M////yH5BAEKAAcALAAA
 	AAAQABAAAAMheLrcLTBCd6QV79qlterXB0riOFXmmapraXIvM1IdZTcJADs=
@@ -2053,7 +2053,7 @@ test imgPhoto-18.10 {Valid GIF (binary string)} -setup {
 } -cleanup {
     catch {image delete gif1}
 } -result gif1
-test imgPhoto-18.11 {Valid GIF (base 64 string)} -setup {
+test imgPhoto-20.11 {Valid GIF (base 64 string)} -setup {
     set data {
 	R0lGODlhEAAQAMIHAAAAADMz//8zM/8z/zP/MzP/////M////yH5BAEKAAcALAAA
 	AAAQABAAAAMheLrcLTBCd6QV79qlterXB0riOFXmmapraXIvM1IdZTcJADs=
@@ -2063,7 +2063,7 @@ test imgPhoto-18.11 {Valid GIF (base 64 string)} -setup {
 } -cleanup {
     catch {image delete gif1}
 } -result gif1
-test imgPhoto-18.12 {Valid GIF (file)} -setup {
+test imgPhoto-20.12 {Valid GIF (file)} -setup {
     set fileName [file join [file dirname [info script]] red.gif]
 } -body {
     image create photo gif1 -file $fileName
-- 
cgit v0.12


From 7073e267a81a7be41f44c577efac0b05aa07bebd Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 24 Aug 2020 14:20:12 +0000
Subject: Code cleanup (mainly unnecessary casts to (ClientData))

---
 generic/ttk/ttkBlink.c       |  2 +-
 generic/ttk/ttkButton.c      |  2 +-
 generic/ttk/ttkEntry.c       |  6 +++---
 generic/ttk/ttkManager.c     |  4 ++--
 generic/ttk/ttkNotebook.c    | 12 ++++++------
 generic/ttk/ttkPanedwindow.c | 10 +++++-----
 generic/ttk/ttkProgress.c    |  4 ++--
 generic/ttk/ttkScale.c       |  6 +++---
 generic/ttk/ttkScroll.c      |  8 ++++----
 generic/ttk/ttkScrollbar.c   |  8 ++++----
 generic/ttk/ttkSeparator.c   |  2 +-
 generic/ttk/ttkTrace.c       |  8 ++++----
 generic/ttk/ttkTreeview.c    | 10 +++++-----
 generic/ttk/ttkWidget.c      |  2 +-
 macosx/tkMacOSXHLEvents.c    | 12 ++++++------
 macosx/tkMacOSXMenubutton.c  |  2 +-
 macosx/tkMacOSXWm.c          |  2 +-
 macosx/ttkMacOSXTheme.c      | 10 +++++-----
 18 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/generic/ttk/ttkBlink.c b/generic/ttk/ttkBlink.c
index dcd342c..fc48af9 100644
--- a/generic/ttk/ttkBlink.c
+++ b/generic/ttk/ttkBlink.c
@@ -59,7 +59,7 @@ static CursorManager *GetCursorManager(Tcl_Interp *interp)
 	cm->owner = 0;
 	cm->onTime = DEF_CURSOR_ON_TIME;
 	cm->offTime = DEF_CURSOR_OFF_TIME;
-	Tcl_SetAssocData(interp,cm_key,CursorManagerDeleteProc,(ClientData)cm);
+	Tcl_SetAssocData(interp, cm_key, CursorManagerDeleteProc, cm);
     }
     return cm;
 }
diff --git a/generic/ttk/ttkButton.c b/generic/ttk/ttkButton.c
index 4e66120..919b4d4 100644
--- a/generic/ttk/ttkButton.c
+++ b/generic/ttk/ttkButton.c
@@ -823,7 +823,7 @@ static const Tk_OptionSpec MenubuttonOptionSpecs[] =
 	"", offsetof(Menubutton, menubutton.menuObj), TCL_INDEX_NONE, 0,0,0},
     {TK_OPTION_STRING_TABLE, "-direction", "direction", "Direction",
 	"below", offsetof(Menubutton, menubutton.directionObj), TCL_INDEX_NONE,
-	0,(ClientData)directionStrings,GEOMETRY_CHANGED},
+	0,(void *)directionStrings,GEOMETRY_CHANGED},
 
     WIDGET_TAKEFOCUS_TRUE,
     WIDGET_INHERIT_OPTIONS(BaseOptionSpecs)
diff --git a/generic/ttk/ttkEntry.c b/generic/ttk/ttkEntry.c
index 81f490c..946b7fc 100644
--- a/generic/ttk/ttkEntry.c
+++ b/generic/ttk/ttkEntry.c
@@ -181,7 +181,7 @@ static const Tk_OptionSpec EntryOptionSpecs[] = {
 	TK_OPTION_NULL_OK,0,TEXTVAR_CHANGED},
     {TK_OPTION_STRING_TABLE, "-validate", "validate", "Validate",
 	"none", TCL_INDEX_NONE, offsetof(Entry, entry.validate),
-	0, (ClientData) validateStrings, 0},
+	0, (void *) validateStrings, 0},
     {TK_OPTION_STRING, "-validatecommand", "validateCommand", "ValidateCommand",
 	NULL, TCL_INDEX_NONE, offsetof(Entry, entry.validateCmd),
 	TK_OPTION_NULL_OK, 0, 0},
@@ -403,7 +403,7 @@ static void EntryOwnSelection(Entry *entryPtr)
 	&& (!Tcl_IsSafe(entryPtr->core.interp))
 	&& !(entryPtr->core.flags & GOT_SELECTION)) {
 	Tk_OwnSelection(entryPtr->core.tkwin, XA_PRIMARY, EntryLostSelection,
-		(ClientData) entryPtr);
+		entryPtr);
 	entryPtr->core.flags |= GOT_SELECTION;
     }
 }
@@ -958,7 +958,7 @@ EntryInitialize(Tcl_Interp *dummy, void *recordPtr)
     Tk_CreateEventHandler(
 	entryPtr->core.tkwin, EntryEventMask, EntryEventProc, entryPtr);
     Tk_CreateSelHandler(entryPtr->core.tkwin, XA_PRIMARY, XA_STRING,
-	EntryFetchSelection, (ClientData) entryPtr, XA_STRING);
+	EntryFetchSelection, entryPtr, XA_STRING);
     TtkBlinkCursor(&entryPtr->core);
 
     entryPtr->entry.string		= (char *)ckalloc(1);
diff --git a/generic/ttk/ttkManager.c b/generic/ttk/ttkManager.c
index 5fa9918..c01bc47 100644
--- a/generic/ttk/ttkManager.c
+++ b/generic/ttk/ttkManager.c
@@ -261,10 +261,10 @@ static void InsertSlave(Ttk_Manager *mgr, Ttk_Slave *slave, TkSizeT index)
     mgr->slaves[index] = slave;
 
     Tk_ManageGeometry(slave->slaveWindow,
-	&mgr->managerSpec->tkGeomMgr, (ClientData)mgr);
+	&mgr->managerSpec->tkGeomMgr, mgr);
 
     Tk_CreateEventHandler(slave->slaveWindow,
-	SlaveEventMask, SlaveEventHandler, (ClientData)slave);
+	SlaveEventMask, SlaveEventHandler, slave);
 
     ScheduleUpdate(mgr, MGR_RESIZE_REQUIRED);
 }
diff --git a/generic/ttk/ttkNotebook.c b/generic/ttk/ttkNotebook.c
index 784a38e..2f02826 100644
--- a/generic/ttk/ttkNotebook.c
+++ b/generic/ttk/ttkNotebook.c
@@ -59,25 +59,25 @@ static const Tk_OptionSpec TabOptionSpecs[] =
 {
     {TK_OPTION_STRING_TABLE, "-state", "", "",
 	"normal", TCL_INDEX_NONE, offsetof(Tab,state),
-	0,(ClientData)TabStateStrings,0 },
+	0, (void *)TabStateStrings, 0 },
     {TK_OPTION_STRING, "-text", "text", "Text", "",
-	offsetof(Tab,textObj), TCL_INDEX_NONE, 0,0,GEOMETRY_CHANGED },
+	offsetof(Tab,textObj), TCL_INDEX_NONE, 0, 0, GEOMETRY_CHANGED },
     {TK_OPTION_STRING, "-image", "image", "Image", NULL/*default*/,
-	offsetof(Tab,imageObj), TCL_INDEX_NONE, TK_OPTION_NULL_OK,0,GEOMETRY_CHANGED },
+	offsetof(Tab,imageObj), TCL_INDEX_NONE, TK_OPTION_NULL_OK, 0, GEOMETRY_CHANGED },
     {TK_OPTION_STRING_TABLE, "-compound", "compound", "Compound",
 	NULL, offsetof(Tab,compoundObj), TCL_INDEX_NONE,
 	TK_OPTION_NULL_OK,(void *)ttkCompoundStrings,GEOMETRY_CHANGED },
     {TK_OPTION_INT, "-underline", "underline", "Underline", "-1",
-	offsetof(Tab,underlineObj), TCL_INDEX_NONE, 0,0,GEOMETRY_CHANGED },
+	offsetof(Tab,underlineObj), TCL_INDEX_NONE, 0, 0, GEOMETRY_CHANGED },
     {TK_OPTION_END, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0 }
 };
 
 static const Tk_OptionSpec PaneOptionSpecs[] =
 {
     {TK_OPTION_STRING, "-padding", "padding", "Padding", "0",
-	offsetof(Tab,paddingObj), TCL_INDEX_NONE, 0,0,GEOMETRY_CHANGED },
+	offsetof(Tab,paddingObj), TCL_INDEX_NONE, 0, 0, GEOMETRY_CHANGED },
     {TK_OPTION_STRING, "-sticky", "sticky", "Sticky", "nsew",
-	offsetof(Tab,stickyObj), TCL_INDEX_NONE, 0,0,GEOMETRY_CHANGED },
+	offsetof(Tab,stickyObj), TCL_INDEX_NONE, 0, 0, GEOMETRY_CHANGED },
 
     WIDGET_INHERIT_OPTIONS(TabOptionSpecs)
 };
diff --git a/generic/ttk/ttkPanedwindow.c b/generic/ttk/ttkPanedwindow.c
index f44c569..734fc34 100644
--- a/generic/ttk/ttkPanedwindow.c
+++ b/generic/ttk/ttkPanedwindow.c
@@ -77,13 +77,13 @@ typedef struct {
 static const Tk_OptionSpec PanedOptionSpecs[] = {
     {TK_OPTION_STRING_TABLE, "-orient", "orient", "Orient", "vertical",
 	offsetof(Paned,paned.orientObj), offsetof(Paned,paned.orient),
-	0,(ClientData)ttkOrientStrings,READONLY_OPTION|STYLE_CHANGED },
+	0, (void *)ttkOrientStrings, READONLY_OPTION|STYLE_CHANGED },
     {TK_OPTION_INT, "-width", "width", "Width", "0",
-	TCL_INDEX_NONE, offsetof(Paned,paned.width),
-	0,0,GEOMETRY_CHANGED },
+	TCL_INDEX_NONE, offsetof(Paned, paned.width),
+	0, 0, GEOMETRY_CHANGED },
     {TK_OPTION_INT, "-height", "height", "Height", "0",
-	TCL_INDEX_NONE, offsetof(Paned,paned.height),
-	0,0,GEOMETRY_CHANGED },
+	TCL_INDEX_NONE, offsetof(Paned, paned.height),
+	0, 0, GEOMETRY_CHANGED },
 
     WIDGET_TAKEFOCUS_FALSE,
     WIDGET_INHERIT_OPTIONS(ttkCoreOptionSpecs)
diff --git a/generic/ttk/ttkProgress.c b/generic/ttk/ttkProgress.c
index 505748b..a025885 100644
--- a/generic/ttk/ttkProgress.c
+++ b/generic/ttk/ttkProgress.c
@@ -71,10 +71,10 @@ static const Tk_OptionSpec ProgressbarOptionSpecs[] =
     {TK_OPTION_STRING_TABLE, "-mode", "mode", "ProgressMode", "determinate",
 	offsetof(Progressbar,progress.modeObj),
 	offsetof(Progressbar,progress.mode),
-	0, (ClientData)ProgressbarModeStrings, 0 },
+	0, (void *)ProgressbarModeStrings, 0 },
     {TK_OPTION_STRING_TABLE, "-orient", "orient", "Orient",
 	"horizontal", offsetof(Progressbar,progress.orientObj), TCL_INDEX_NONE,
-	0, (ClientData)ttkOrientStrings, STYLE_CHANGED },
+	0, (void *)ttkOrientStrings, STYLE_CHANGED },
     {TK_OPTION_INT, "-phase", "phase", "Phase",
 	"0", offsetof(Progressbar,progress.phaseObj), TCL_INDEX_NONE,
 	0, 0, 0 },
diff --git a/generic/ttk/ttkScale.c b/generic/ttk/ttkScale.c
index a2c5d59..6c9867a 100644
--- a/generic/ttk/ttkScale.c
+++ b/generic/ttk/ttkScale.c
@@ -57,11 +57,11 @@ static const Tk_OptionSpec ScaleOptionSpecs[] =
 	TK_OPTION_NULL_OK,0,0},
     {TK_OPTION_STRING, "-variable", "variable", "Variable", "",
 	offsetof(Scale,scale.variableObj), TCL_INDEX_NONE,
-	0,0,0},
+	0, 0, 0},
     {TK_OPTION_STRING_TABLE, "-orient", "orient", "Orient", "horizontal",
 	offsetof(Scale,scale.orientObj),
 	offsetof(Scale,scale.orient), 0,
-	(ClientData)ttkOrientStrings, STYLE_CHANGED },
+	(void *)ttkOrientStrings, STYLE_CHANGED },
 
     {TK_OPTION_DOUBLE, "-from", "from", "From", "0",
 	offsetof(Scale,scale.fromObj), TCL_INDEX_NONE, 0, 0, 0},
@@ -75,7 +75,7 @@ static const Tk_OptionSpec ScaleOptionSpecs[] =
 
     {TK_OPTION_STRING, "-state", "state", "State",
 	"normal", offsetof(Scale,scale.stateObj), TCL_INDEX_NONE,
-        0,0,STATE_CHANGED},
+        0, 0, STATE_CHANGED},
 
     WIDGET_TAKEFOCUS_TRUE,
     WIDGET_INHERIT_OPTIONS(ttkCoreOptionSpecs)
diff --git a/generic/ttk/ttkScroll.c b/generic/ttk/ttkScroll.c
index b031dc6..69370c9 100644
--- a/generic/ttk/ttkScroll.c
+++ b/generic/ttk/ttkScroll.c
@@ -130,12 +130,12 @@ static void UpdateScrollbarBG(ClientData clientData)
     int code;
 
     h->flags &= ~SCROLL_UPDATE_PENDING;
-    Tcl_Preserve((ClientData) interp);
+    Tcl_Preserve(interp);
     code = UpdateScrollbar(interp, h);
     if (code == TCL_ERROR && !Tcl_InterpDeleted(interp)) {
 	Tcl_BackgroundException(interp, code);
     }
-    Tcl_Release((ClientData) interp);
+    Tcl_Release(interp);
 }
 
 /* TtkScrolled --
@@ -167,7 +167,7 @@ void TtkScrolled(ScrollHandle h, int first, int last, int total)
 	s->total = total;
 
 	if (!(h->flags & SCROLL_UPDATE_PENDING)) {
-	    Tcl_DoWhenIdle(UpdateScrollbarBG, (ClientData)h);
+	    Tcl_DoWhenIdle(UpdateScrollbarBG, h);
 	    h->flags |= SCROLL_UPDATE_PENDING;
 	}
     }
@@ -274,7 +274,7 @@ void TtkScrollTo(ScrollHandle h, int newFirst, int updateScrollInfo)
 void TtkFreeScrollHandle(ScrollHandle h)
 {
     if (h->flags & SCROLL_UPDATE_PENDING) {
-	Tcl_CancelIdleCall(UpdateScrollbarBG, (ClientData)h);
+	Tcl_CancelIdleCall(UpdateScrollbarBG, h);
     }
     ckfree(h);
 }
diff --git a/generic/ttk/ttkScrollbar.c b/generic/ttk/ttkScrollbar.c
index 40dbc80..54923ff 100644
--- a/generic/ttk/ttkScrollbar.c
+++ b/generic/ttk/ttkScrollbar.c
@@ -34,12 +34,12 @@ typedef struct
 static const Tk_OptionSpec ScrollbarOptionSpecs[] =
 {
     {TK_OPTION_STRING, "-command", "command", "Command", "",
-	offsetof(Scrollbar,scrollbar.commandObj), TCL_INDEX_NONE, 0,0,0},
+	offsetof(Scrollbar, scrollbar.commandObj), TCL_INDEX_NONE, 0, 0, 0},
 
     {TK_OPTION_STRING_TABLE, "-orient", "orient", "Orient", "vertical",
-	offsetof(Scrollbar,scrollbar.orientObj),
-	offsetof(Scrollbar,scrollbar.orient),
-	0,(ClientData)ttkOrientStrings,STYLE_CHANGED },
+	offsetof(Scrollbar, scrollbar.orientObj),
+	offsetof(Scrollbar, scrollbar.orient),
+	0, (void *)ttkOrientStrings, STYLE_CHANGED },
 
     WIDGET_TAKEFOCUS_FALSE,
     WIDGET_INHERIT_OPTIONS(ttkCoreOptionSpecs)
diff --git a/generic/ttk/ttkSeparator.c b/generic/ttk/ttkSeparator.c
index 00605dc..a3141da 100644
--- a/generic/ttk/ttkSeparator.c
+++ b/generic/ttk/ttkSeparator.c
@@ -26,7 +26,7 @@ static const Tk_OptionSpec SeparatorOptionSpecs[] = {
     {TK_OPTION_STRING_TABLE, "-orient", "orient", "Orient", "horizontal",
 	offsetof(Separator,separator.orientObj),
 	offsetof(Separator,separator.orient),
-	0,(ClientData)ttkOrientStrings,STYLE_CHANGED },
+	0, (void *)ttkOrientStrings,STYLE_CHANGED },
 
     WIDGET_TAKEFOCUS_FALSE,
     WIDGET_INHERIT_OPTIONS(ttkCoreOptionSpecs)
diff --git a/generic/ttk/ttkTrace.c b/generic/ttk/ttkTrace.c
index 7e02b58..d086c02 100644
--- a/generic/ttk/ttkTrace.c
+++ b/generic/ttk/ttkTrace.c
@@ -53,7 +53,7 @@ VarTraceProc(
 	 */
 	if (tracePtr->interp == NULL) {
 	    Tcl_DecrRefCount(tracePtr->varnameObj);
-	    ckfree((ClientData)tracePtr);
+	    ckfree(tracePtr);
 	    return NULL;
 	}
 	Tcl_TraceVar2(interp, name, NULL,
@@ -98,7 +98,7 @@ Ttk_TraceHandle *Ttk_TraceVariable(
 
     status = Tcl_TraceVar2(interp, Tcl_GetString(varnameObj),
 	    NULL, TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-	    VarTraceProc, (ClientData)h);
+	    VarTraceProc, h);
 
     if (status != TCL_OK) {
 	Tcl_DecrRefCount(h->varnameObj);
@@ -139,7 +139,7 @@ void Ttk_UntraceVariable(Ttk_TraceHandle *h)
 	 */
 	while ((cd = Tcl_VarTraceInfo(h->interp, Tcl_GetString(h->varnameObj),
 		TCL_GLOBAL_ONLY, VarTraceProc, cd)) != NULL) {
-	    if (cd == (ClientData) h) {
+	    if (cd == h) {
 		break;
 	    }
 	}
@@ -154,7 +154,7 @@ void Ttk_UntraceVariable(Ttk_TraceHandle *h)
 	}
 	Tcl_UntraceVar2(h->interp, Tcl_GetString(h->varnameObj),
 		NULL, TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-		VarTraceProc, (ClientData)h);
+		VarTraceProc, h);
 	Tcl_DecrRefCount(h->varnameObj);
 	ckfree(h);
     }
diff --git a/generic/ttk/ttkTreeview.c b/generic/ttk/ttkTreeview.c
index 33c3466..aa89052 100644
--- a/generic/ttk/ttkTreeview.c
+++ b/generic/ttk/ttkTreeview.c
@@ -441,21 +441,21 @@ static const char *const SelectModeStrings[] = { "none", "browse", "extended", N
 static const Tk_OptionSpec TreeviewOptionSpecs[] = {
     {TK_OPTION_STRING, "-columns", "columns", "Columns",
 	"", offsetof(Treeview,tree.columnsObj), TCL_INDEX_NONE,
-	0,0,COLUMNS_CHANGED | GEOMETRY_CHANGED /*| READONLY_OPTION*/ },
+	0, 0,COLUMNS_CHANGED | GEOMETRY_CHANGED /*| READONLY_OPTION*/ },
     {TK_OPTION_STRING, "-displaycolumns","displayColumns","DisplayColumns",
 	"#all", offsetof(Treeview,tree.displayColumnsObj), TCL_INDEX_NONE,
-	0,0,DCOLUMNS_CHANGED | GEOMETRY_CHANGED },
+	0, 0,DCOLUMNS_CHANGED | GEOMETRY_CHANGED },
     {TK_OPTION_STRING, "-show", "show", "Show",
 	DEFAULT_SHOW, offsetof(Treeview,tree.showObj), TCL_INDEX_NONE,
-	0,0,SHOW_CHANGED | GEOMETRY_CHANGED },
+	0, 0,SHOW_CHANGED | GEOMETRY_CHANGED },
 
     {TK_OPTION_STRING_TABLE, "-selectmode", "selectMode", "SelectMode",
 	"extended", offsetof(Treeview,tree.selectModeObj), TCL_INDEX_NONE,
-	0,(ClientData)SelectModeStrings,0 },
+	0, (void *)SelectModeStrings, 0 },
 
     {TK_OPTION_PIXELS, "-height", "height", "Height",
 	DEF_TREE_ROWS, offsetof(Treeview,tree.heightObj), TCL_INDEX_NONE,
-	0,0,GEOMETRY_CHANGED},
+	0, 0,GEOMETRY_CHANGED},
     {TK_OPTION_STRING, "-padding", "padding", "Pad",
 	NULL, offsetof(Treeview,tree.paddingObj), TCL_INDEX_NONE,
 	TK_OPTION_NULL_OK,0,GEOMETRY_CHANGED },
diff --git a/generic/ttk/ttkWidget.c b/generic/ttk/ttkWidget.c
index df6e6be..6726e17 100644
--- a/generic/ttk/ttkWidget.c
+++ b/generic/ttk/ttkWidget.c
@@ -213,7 +213,7 @@ DestroyWidget(WidgetCore *corePtr)
     corePtr->widgetSpec->cleanupProc(corePtr);
 
     Tk_FreeConfigOptions(
-	(ClientData)corePtr, corePtr->optionTable, corePtr->tkwin);
+	    corePtr, corePtr->optionTable, corePtr->tkwin);
 
     if (corePtr->layout) {
 	Ttk_FreeLayout(corePtr->layout);
diff --git a/macosx/tkMacOSXHLEvents.c b/macosx/tkMacOSXHLEvents.c
index e2ff0f1..3b65681 100644
--- a/macosx/tkMacOSXHLEvents.c
+++ b/macosx/tkMacOSXHLEvents.c
@@ -229,7 +229,7 @@ static const char* scriptTextProc = "::tk::mac::DoScriptText";
     AEInfo->interp = _eventInterp;
     AEInfo->procedure = openDocumentProc;
     AEInfo->replyEvent = nil;
-    Tcl_DoWhenIdle(ProcessAppleEvent, (ClientData)AEInfo);
+    Tcl_DoWhenIdle(ProcessAppleEvent, AEInfo);
 }
 
 - (void) handlePrintDocumentsEvent: (NSAppleEventDescriptor *)event
@@ -248,7 +248,7 @@ static const char* scriptTextProc = "::tk::mac::DoScriptText";
     AEInfo->interp = _eventInterp;
     AEInfo->procedure = printDocProc;
     AEInfo->replyEvent = nil;
-    Tcl_DoWhenIdle(ProcessAppleEvent, (ClientData)AEInfo);
+    Tcl_DoWhenIdle(ProcessAppleEvent, AEInfo);
 }
 
 - (void) handleDoScriptEvent: (NSAppleEventDescriptor *)event
@@ -309,7 +309,7 @@ static const char* scriptTextProc = "::tk::mac::DoScriptText";
                 AEInfo->interp = _eventInterp;
                 AEInfo->procedure = scriptFileProc;
                 AEInfo->replyEvent = nil;
-                Tcl_DoWhenIdle(ProcessAppleEvent, (ClientData)AEInfo);
+                Tcl_DoWhenIdle(ProcessAppleEvent, AEInfo);
             }
         }
     } else if (noErr == AEGetParamPtr(theDesc, keyDirectObject, typeUTF8Text, &type,
@@ -334,10 +334,10 @@ static const char* scriptTextProc = "::tk::mac::DoScriptText";
 		AEInfo->procedure = scriptTextProc;
                 if (Tcl_FindCommand(AEInfo->interp, AEInfo->procedure, NULL, 0)) {
                     AEInfo->replyEvent = replyEvent;
-                    ProcessAppleEvent((ClientData)AEInfo);
+                    ProcessAppleEvent(AEInfo);
                 } else {
                     AEInfo->replyEvent = nil;
-                    Tcl_DoWhenIdle(ProcessAppleEvent, (ClientData)AEInfo);
+                    Tcl_DoWhenIdle(ProcessAppleEvent, AEInfo);
                 }
 	    }
 	}
@@ -360,7 +360,7 @@ static const char* scriptTextProc = "::tk::mac::DoScriptText";
     AEInfo->interp = _eventInterp;
     AEInfo->procedure = launchURLProc;
     AEInfo->replyEvent = nil;
-    Tcl_DoWhenIdle(ProcessAppleEvent, (ClientData)AEInfo);
+    Tcl_DoWhenIdle(ProcessAppleEvent, AEInfo);
 }
 
 @end
diff --git a/macosx/tkMacOSXMenubutton.c b/macosx/tkMacOSXMenubutton.c
index 320c070..2fad3cb 100644
--- a/macosx/tkMacOSXMenubutton.c
+++ b/macosx/tkMacOSXMenubutton.c
@@ -703,7 +703,7 @@ MenuButtonEventProc(
 	    mbPtr->flags &= ~ACTIVE;
 	}
 	if ((buttonPtr->flags & REDRAW_PENDING) == 0) {
-	    Tcl_DoWhenIdle(TkpDisplayMenuButton, (ClientData) buttonPtr);
+	    Tcl_DoWhenIdle(TkpDisplayMenuButton, buttonPtr);
 	    buttonPtr->flags |= REDRAW_PENDING;
 	}
     }
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 725342e..62fd38b 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -737,7 +737,7 @@ TkWmNewWindow(
      * window manager.
      */
 
-    Tk_ManageGeometry((Tk_Window) winPtr, &wmMgrType, (ClientData) 0);
+    Tk_ManageGeometry((Tk_Window) winPtr, &wmMgrType, NULL);
 }
 
 /*
diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c
index 1db74bf..a98e55e 100644
--- a/macosx/ttkMacOSXTheme.c
+++ b/macosx/ttkMacOSXTheme.c
@@ -1702,7 +1702,7 @@ static Ttk_ElementOptionSpec EntryElementOptions[] = {
      offsetof(EntryElement, backgroundObj), ENTRY_DEFAULT_BACKGROUND},
     {"-fieldbackground", TK_OPTION_BORDER,
      offsetof(EntryElement, fieldbackgroundObj), ENTRY_DEFAULT_BACKGROUND},
-    {0}
+    {NULL, TK_OPTION_BOOLEAN, 0, NULL}
 };
 
 static void EntryElementSize(
@@ -2062,7 +2062,7 @@ static Ttk_ElementOptionSpec TrackElementOptions[] = {
     {"-to", TK_OPTION_DOUBLE, offsetof(TrackElement, toObj), NULL},
     {"-value", TK_OPTION_DOUBLE, offsetof(TrackElement, valueObj), NULL},
     {"-orient", TK_OPTION_STRING, offsetof(TrackElement, orientObj), NULL},
-    {0, 0, 0, NULL}
+    {NULL, TK_OPTION_BOOLEAN, 0, NULL}
 };
 static void TrackElementSize(
     void *clientData,
@@ -2202,7 +2202,7 @@ static Ttk_ElementOptionSpec PbarElementOptions[] = {
      offsetof(PbarElement, phaseObj), "0"},
     {"-mode", TK_OPTION_STRING,
      offsetof(PbarElement, modeObj), "determinate"},
-    {0, 0, 0, 0}
+    {NULL, TK_OPTION_BOOLEAN, 0, NULL}
 };
 static void PbarElementSize(
     TCL_UNUSED(void *),
@@ -2292,7 +2292,7 @@ typedef struct
 static Ttk_ElementOptionSpec ScrollbarElementOptions[] = {
     {"-orient", TK_OPTION_STRING,
      offsetof(ScrollbarElement, orientObj), "horizontal"},
-    {0, 0, 0, 0}
+    {NULL, TK_OPTION_BOOLEAN, 0, NULL}
 };
 static void TroughElementSize(
     TCL_UNUSED(void *),
@@ -2810,7 +2810,7 @@ typedef struct {
 static Ttk_ElementOptionSpec FieldElementOptions[] = {
     {"-fieldbackground", TK_OPTION_BORDER,
      offsetof(FieldElement, backgroundObj), "white"},
-    {NULL, 0, 0, NULL}
+    {NULL, TK_OPTION_BOOLEAN, 0, NULL}
 };
 
 static void FieldElementDraw(
-- 
cgit v0.12


From 196c6c9af3eb4b96a9b0b94f7e41963167b534b8 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 24 Aug 2020 14:20:56 +0000
Subject: Testcase cleanup (mainly unnessary curly braces)

---
 tests/scale.test    | 14 +++++++-------
 tests/spinbox.test  |  2 +-
 tests/text.test     | 19 ++++++++-----------
 tests/textDisp.test |  4 +---
 4 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/tests/scale.test b/tests/scale.test
index 2c3a8c2..18b78f8 100644
--- a/tests/scale.test
+++ b/tests/scale.test
@@ -1135,26 +1135,26 @@ test scale-14.5 {RoundValueToResolution procedure} -body {
         -orient horizontal -resolution 4.0
     update
     .s get 84 152
-} -result {-28}
+} -result -28
 test scale-14.6 {RoundValueToResolution procedure} -body {
     .s configure -from -100 -to 0 -sliderlength 10 -length 114 -bd 2 \
         -orient horizontal -resolution 4.0
     update
     .s get 86 152
-} -result {-24}
+} -result -24
 
 test scale-14.7 {RoundValueToResolution procedure} -body {
     .s configure -from 0 -to -100 -sliderlength 10 -length 114 -bd 2 \
         -orient horizontal -resolution 4.0
     update
     .s get 84 152
-} -result {-72}
+} -result -72
 test scale-14.8 {RoundValueToResolution procedure} -body {
     .s configure -from 0 -to -100 -sliderlength 10 -length 114 -bd 2 \
         -orient horizontal -resolution 4.0
     update
     .s get 86 152
-} -result {-76}
+} -result -76
 
 test scale-14.9 {RoundValueToResolution procedure} -body {
     .s configure -from 0 -to 2.25  -sliderlength 10 -length 114 -bd 2 \
@@ -1226,7 +1226,7 @@ test scale-15.1 {ScaleVarProc procedure} -setup {
     scale .s -from 0 -to -200 -variable y -orient horizontal -length 150
     pack .s
     return $y
-} -result {-130}
+} -result -130
 test scale-15.2 {ScaleVarProc procedure} -setup {
     deleteWindows
 } -body {
@@ -1235,7 +1235,7 @@ test scale-15.2 {ScaleVarProc procedure} -setup {
     pack .s
     set y -87
     .s get
-} -result {-87}
+} -result -87
 test scale-15.3 {ScaleVarProc procedure} -setup {
     deleteWindows
 } -body {
@@ -1256,7 +1256,7 @@ test scale-15.4 {ScaleVarProc procedure} -setup {
     .s get
 } -cleanup {
     deleteWindows
-} -result {-130}
+} -result -130
 test scale-15.5 {ScaleVarProc procedure} -setup {
     deleteWindows
 } -body {
diff --git a/tests/spinbox.test b/tests/spinbox.test
index e3c7009..070337d 100644
--- a/tests/spinbox.test
+++ b/tests/spinbox.test
@@ -714,7 +714,7 @@ test spinbox-1.61 {configuration option: "repeatinterval"} -setup {
     .e cget -repeatinterval
 } -cleanup {
     destroy .e
-} -result {-500}
+} -result -500
 test spinbox-1.62 {configuration option: "repeatinterval" for spinbox} -setup {
         spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
diff --git a/tests/text.test b/tests/text.test
index 96ab21e..4b884a4 100644
--- a/tests/text.test
+++ b/tests/text.test
@@ -1252,7 +1252,7 @@ bOy GIrl .#@? x_yz
 Line 7"
     .t configure -state disabled
     .t delete 2.3
-    .t g 2.0 2.end
+    .t get 2.0 2.end
 } -cleanup {
     destroy .t
 } -result {abcdefghijklm}
@@ -2103,7 +2103,7 @@ Line 7"
     .t count 5.7 5.3
 } -cleanup {
     destroy .t
-} -result {-4}
+} -result -4
 test text-10.7 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
     .t insert 1.0 "Line 1
@@ -2598,7 +2598,7 @@ test text-10.31 {TextWidgetCmd procedure, "count" option} -setup {
     .t count -lines end 1.0
 } -cleanup {
     destroy .t
-} -result {-3}
+} -result -3
 test text-10.32 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
 } -body {
@@ -2691,7 +2691,7 @@ test text-10.39 {TextWidgetCmd procedure, "count" option} -setup {
 } -cleanup {
     destroy .t
 } -result {2 6 1 5}
-test text-9.2.45 {TextWidgetCmd procedure, "count" option} -setup {
+test text-10.40 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
     pack .t
     update
@@ -2707,7 +2707,7 @@ test text-9.2.45 {TextWidgetCmd procedure, "count" option} -setup {
 } -cleanup {
     destroy .t
 } -result 0
-test text-9.2.46 {TextWidgetCmd procedure, "count" option} -setup {
+test text-10.41 {TextWidgetCmd procedure, "count" option} -setup {
     toplevel .mytop
     pack [text .mytop.t -font TkFixedFont -bd 0 -padx 0 -wrap char]
     set spec [font measure TkFixedFont "Line 1+++Line 1---Li"]  ; # 20 chars
@@ -2729,7 +2729,7 @@ test text-9.2.46 {TextWidgetCmd procedure, "count" option} -setup {
 } -cleanup {
     destroy .mytop
 } -result {1 3}
-test text-9.2.47 {TextWidgetCmd procedure, "count" option} -setup {
+test text-10.42 {TextWidgetCmd procedure, "count" option} -setup {
     text .t
     pack .t
     update
@@ -6759,7 +6759,7 @@ test text-27.15g {No <<Selection>> virtual event on <<Cut>> without widget selec
     destroy .t
 } -result {no_<<Selection>>_event_fired}
 test text-27.16 {-maxundo configuration option} -body {
-    text .t -undo 1  -autoseparators 1 -maxundo 2
+    text .t -undo 1 -autoseparators 1 -maxundo 2
     pack .t
     .t insert end "line 1\n"
     .t delete 1.4 1.6
@@ -7558,7 +7558,7 @@ test text-33.2 {TextWidgetCmd procedure, "peer" option} -setup {
 test text-33.3 {TextWidgetCmd procedure, "peer" option} -setup {
     text .t
 } -body {
-    .t pee names
+    .t peer names
 } -cleanup {
     destroy .t
 } -returnCodes {ok} -result {}
@@ -7674,7 +7674,6 @@ test text-34.1 {peer widget -start, -endline and selection} -setup {
 
 test text-35.1 {widget dump -command alters tags} -setup {
      proc Dumpy {key value index} {
-#puts "KK: $key, $value"
       .t tag add $value [list $index linestart] [list $index lineend]
     }
     text .t
@@ -7688,7 +7687,6 @@ test text-35.1 {widget dump -command alters tags} -setup {
 } -result {ok}
 test text-35.2 {widget dump -command makes massive changes} -setup {
     proc Dumpy {key value index} {
-#puts "KK: $key, $value"
       .t delete 1.0 end
     }
     text .t
@@ -7702,7 +7700,6 @@ test text-35.2 {widget dump -command makes massive changes} -setup {
 } -result {ok}
 test text-35.3 {widget dump -command destroys widget} -setup {
     proc Dumpy {key value index} {
-#puts "KK: $key, $value"
         destroy .t
     }
     text .t
diff --git a/tests/textDisp.test b/tests/textDisp.test
index 4050823..b797715 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -2499,8 +2499,6 @@ test textDisp-18.8 {GetXView procedure} {
 catch {rename bgerror {}}
 catch {rename bogus {}}
 .t configure -xscrollcommand {} -yscrollcommand scroll
-
-.t configure -xscrollcommand {} -yscrollcommand scroll
 test textDisp-19.1 {GetYView procedure} {
     .t configure -wrap char
     .t delete 1.0 end
@@ -3005,7 +3003,7 @@ set res [.tt.u count -displaylines 3.10 2.173]
 destroy .tt
 unset message
 set res
-} {-1}
+} -1
 
 .t delete 1.0 end
 .t insert end "Line 1"
-- 
cgit v0.12


From ed5dd16c2ee4779451651a8edade91ecca229538 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 24 Aug 2020 15:58:14 +0000
Subject: Consistant Tcl_WrongNumArg() arguments when the command contains
 ?-option value ...? arguments

---
 doc/fontchooser.n       | 4 ++--
 generic/tkBusy.c        | 2 +-
 generic/tkListbox.c     | 2 +-
 generic/tkPanedWindow.c | 2 +-
 generic/tkTextTag.c     | 2 +-
 tests/busy.test         | 2 +-
 tests/listbox.test      | 2 +-
 tests/textTag.test      | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/fontchooser.n b/doc/fontchooser.n
index 65aa8e7..465af2e 100644
--- a/doc/fontchooser.n
+++ b/doc/fontchooser.n
@@ -11,7 +11,7 @@
 .SH NAME
 fontchooser \- control font selection dialog
 .SH SYNOPSIS
-\fBtk fontchooser\fR \fBconfigure\fR ?\fI\-option value \-option value ...\fR?
+\fBtk fontchooser\fR \fBconfigure\fR ?\fI\-option value ...\fR?
 .sp
 \fBtk fontchooser\fR \fBshow\fR
 .sp
@@ -31,7 +31,7 @@ caller via callbacks or virtual events.
 .PP
 The \fBtk fontchooser\fR command can have one of the following forms:
 .TP
-\fBtk fontchooser\fR \fBconfigure \fR?\fI\-option value \-option value ...\fR?
+\fBtk fontchooser\fR \fBconfigure \fR?\fI\-option value ...\fR?
 .
 Set or query one or more of the configurations options below (analogous to Tk
 widget configuration).
diff --git a/generic/tkBusy.c b/generic/tkBusy.c
index de09d1c..f639b59 100644
--- a/generic/tkBusy.c
+++ b/generic/tkBusy.c
@@ -865,7 +865,7 @@ Tk_BusyObjCmd(
 
     case BUSY_CONFIGURE:
 	if (objc < 3) {
-	    Tcl_WrongNumArgs(interp, 2, objv, "window ?-option? ?value ...?");
+	    Tcl_WrongNumArgs(interp, 2, objv, "window ?-option value ...?");
 	    return TCL_ERROR;
 	}
 	busyPtr = GetBusy(interp, busyTablePtr, objv[2]);
diff --git a/generic/tkListbox.c b/generic/tkListbox.c
index a9eee94..6a90b3c 100644
--- a/generic/tkListbox.c
+++ b/generic/tkListbox.c
@@ -906,7 +906,7 @@ ListboxWidgetObjCmd(
 
 	if (objc < 3) {
 	    Tcl_WrongNumArgs(interp, 2, objv,
-		    "index ?-option? ?value? ?-option value ...?");
+		    "index ?-option value ...?");
 	    result = TCL_ERROR;
 	    break;
 	}
diff --git a/generic/tkPanedWindow.c b/generic/tkPanedWindow.c
index 285e907..05ddcca 100644
--- a/generic/tkPanedWindow.c
+++ b/generic/tkPanedWindow.c
@@ -690,7 +690,7 @@ PanedWindowWidgetObjCmd(
     case PW_PANECONFIGURE:
 	if (objc < 3) {
 	    Tcl_WrongNumArgs(interp, 2, objv,
-		    "pane ?-option? ?value -option value ...?");
+		    "pane ?-option value ...?");
 	    result = TCL_ERROR;
 	    break;
 	}
diff --git a/generic/tkTextTag.c b/generic/tkTextTag.c
index 4918a9f..2050cc8 100644
--- a/generic/tkTextTag.c
+++ b/generic/tkTextTag.c
@@ -357,7 +357,7 @@ TkTextTagCmd(
 
 	if (objc < 4) {
 	    Tcl_WrongNumArgs(interp, 3, objv,
-		    "tagName ?-option? ?value? ?-option value ...?");
+		    "tagName ?-option value ...?");
 	    return TCL_ERROR;
 	}
 	tagPtr = TkTextCreateTag(textPtr, Tcl_GetString(objv[3]), &newTag);
diff --git a/tests/busy.test b/tests/busy.test
index f0b11be..bc0ae5f 100644
--- a/tests/busy.test
+++ b/tests/busy.test
@@ -182,7 +182,7 @@ test busy-3.7 {tk busy cget unix} -setup {
 
 test busy-4.1 {tk busy configure no window} -returnCodes error -body {
     tk busy configure
-} -result {wrong # args: should be "tk busy configure window ?-option? ?value ...?"}
+} -result {wrong # args: should be "tk busy configure window ?-option value ...?"}
 
 test busy-4.2 {tk busy configure invalid window} -body {
     tk busy configure .f
diff --git a/tests/listbox.test b/tests/listbox.test
index 9b667cd..d2fb66d 100644
--- a/tests/listbox.test
+++ b/tests/listbox.test
@@ -2854,7 +2854,7 @@ test listbox-23.4 {ConfigureListboxItem, wrong num args} -setup {
     set result
 } -cleanup {
     destroy .l
-} -result {wrong # args: should be ".l itemconfigure index ?-option? ?value? ?-option value ...?"}
+} -result {wrong # args: should be ".l itemconfigure index ?-option value ...?"}
 test listbox-23.5 {ConfigureListboxItem, multiple calls} -setup {
     destroy .l
 } -body {
diff --git a/tests/textTag.test b/tests/textTag.test
index 2fad125..94db751 100644
--- a/tests/textTag.test
+++ b/tests/textTag.test
@@ -488,7 +488,7 @@ test textTag-4.5 {TkTextTagCmd - "cget" option} -body {
 
 test textTag-5.1 {TkTextTagCmd - "configure" option} -body {
     .t tag configure
-} -returnCodes error -result {wrong # args: should be ".t tag configure tagName ?-option? ?value? ?-option value ...?"}
+} -returnCodes error -result {wrong # args: should be ".t tag configure tagName ?-option value ...?"}
 test textTag-5.2 {TkTextTagCmd - "configure" option} -body {
     .t tag configure x -foo
 } -returnCodes error -result {unknown option "-foo"}
-- 
cgit v0.12


From 2834e574832ddd1db4d7c68b5cdee9aa466fadb5 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 25 Aug 2020 09:22:07 +0000
Subject: Keep gcc-5 and gcc-6 builds on "bionic", because "focal" doesn't have
 these

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0fb5332..789e091 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,7 +61,7 @@ jobs:
         - BUILD_DIR=unix
     - name: "Linux/GCC 6/Shared"
       os: linux
-      dist: focal
+      dist: bionic
       compiler: gcc-6
       addons:
         apt:
@@ -73,7 +73,7 @@ jobs:
         - BUILD_DIR=unix
     - name: "Linux/GCC 5/Shared"
       os: linux
-      dist: focal
+      dist: bionic
       compiler: gcc-5
       addons:
         apt:
-- 
cgit v0.12


From 797d843a17df7fab1e27d6b10629d323b2987919 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Tue, 25 Aug 2020 11:36:19 +0000
Subject: Fix one more compilation issue with old macOS targets.

---
 macosx/tkMacOSXBitmap.c    |  4 +---
 macosx/tkMacOSXConstants.h | 10 ++++++++--
 macosx/tkMacOSXFont.c      |  3 +--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/macosx/tkMacOSXBitmap.c b/macosx/tkMacOSXBitmap.c
index 213d925..402178a 100644
--- a/macosx/tkMacOSXBitmap.c
+++ b/macosx/tkMacOSXBitmap.c
@@ -142,9 +142,7 @@ PixmapFromImage(
 				    .tx = 0, .ty = size.height};
 	    CGContextConcatCTM(dc.context, t);
 	    [NSGraphicsContext saveGraphicsState];
-	    [NSGraphicsContext setCurrentContext:[NSGraphicsContext
-		graphicsContextWithGraphicsPort:dc.context
-		flipped:NO]];
+	    [NSGraphicsContext setCurrentContext:TkMacOSXNSContext(dc.context)];
 	    [image drawAtPoint:NSZeroPoint fromRect:NSZeroRect
 		operation:NSCompositeCopy fraction:1.0];
 	    [NSGraphicsContext restoreGraphicsState];
diff --git a/macosx/tkMacOSXConstants.h b/macosx/tkMacOSXConstants.h
index 19ffd2c..4fc9fd6 100644
--- a/macosx/tkMacOSXConstants.h
+++ b/macosx/tkMacOSXConstants.h
@@ -102,12 +102,18 @@ typedef NSInteger NSModalResponse;
 #define NSStringPboardType NSPasteboardTypeString
 #define NSOnState NSControlStateValueOn
 #define NSOffState NSControlStateValueOff
-// Now we are also changing names of methods!
-#define graphicsContextWithGraphicsPort graphicsContextWithCGContext
 #endif
 
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 110000
 #define NSWindowStyleMaskTexturedBackground 0
 #endif
 
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 101000
+#define TkMacOSXNSContext(context) [NSGraphicsContext \
+	    graphicsContextWithGraphicsPort:context flipped:NO]
+#else
+#define TkMacOSXNSContext(context) [NSGraphicsContext \
+	    graphicsContextWithCGContext:context flipped:NO]
+#endif
+
 #endif
diff --git a/macosx/tkMacOSXFont.c b/macosx/tkMacOSXFont.c
index f58e831..b535ffe 100644
--- a/macosx/tkMacOSXFont.c
+++ b/macosx/tkMacOSXFont.c
@@ -1212,8 +1212,7 @@ TkpDrawAngledCharsInContext(
     [attributes setObject:(id)fg forKey:(id)kCTForegroundColorAttributeName];
     CFRelease(fg);
     nsFont = [attributes objectForKey:NSFontAttributeName];
-    [nsFont setInContext:[NSGraphicsContext graphicsContextWithGraphicsPort:
-	    context flipped:NO]];
+    [nsFont setInContext:TkMacOSXNSContext(context)];
     CGContextSetTextMatrix(context, CGAffineTransformIdentity);
     attributedString = [[NSAttributedString alloc] initWithString:string
 	    attributes:attributes];
-- 
cgit v0.12


From 8de1dd53e5559e54b3456769fd305f2ee0dd27a9 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Tue, 25 Aug 2020 14:23:00 +0000
Subject: Rename the NSGraphicsContext macro and add a flipped parameter.  Fix
 accent colors on old macs.

---
 macosx/tkMacOSXBitmap.c    | 2 +-
 macosx/tkMacOSXColor.c     | 2 +-
 macosx/tkMacOSXConstants.h | 6 +++---
 macosx/tkMacOSXFont.c      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/macosx/tkMacOSXBitmap.c b/macosx/tkMacOSXBitmap.c
index 402178a..29bb163 100644
--- a/macosx/tkMacOSXBitmap.c
+++ b/macosx/tkMacOSXBitmap.c
@@ -142,7 +142,7 @@ PixmapFromImage(
 				    .tx = 0, .ty = size.height};
 	    CGContextConcatCTM(dc.context, t);
 	    [NSGraphicsContext saveGraphicsState];
-	    [NSGraphicsContext setCurrentContext:TkMacOSXNSContext(dc.context)];
+	    [NSGraphicsContext setCurrentContext:GET_NSCONTEXT(dc.context, NO)];
 	    [image drawAtPoint:NSZeroPoint fromRect:NSZeroRect
 		operation:NSCompositeCopy fraction:1.0];
 	    [NSGraphicsContext restoreGraphicsState];
diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index f9d2750..1eeacc3 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -315,7 +315,7 @@ GetRGBA(
 	break;
     case semantic:
 	if (entry->index == controlAccentIndex && useFakeAccentColor) {
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 101500
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 101400
 	    color = [[NSColor colorForControlTint: [NSColor currentControlTint]]
 			      colorUsingColorSpace:sRGB];
 	    [color getComponents: rgba];
diff --git a/macosx/tkMacOSXConstants.h b/macosx/tkMacOSXConstants.h
index 4fc9fd6..0b6ae2b 100644
--- a/macosx/tkMacOSXConstants.h
+++ b/macosx/tkMacOSXConstants.h
@@ -109,10 +109,10 @@ typedef NSInteger NSModalResponse;
 #endif
 
 #if MAC_OS_X_VERSION_MIN_REQUIRED < 101000
-#define TkMacOSXNSContext(context) [NSGraphicsContext \
-	    graphicsContextWithGraphicsPort:context flipped:NO]
+#define GET_NSCONTEXT(context, flip) [NSGraphicsContext		\
+	    graphicsContextWithGraphicsPort:context flipped:flip]
 #else
-#define TkMacOSXNSContext(context) [NSGraphicsContext \
+#define GET_NSCONTEXT(context, flip) [NSGraphicsContext		\
 	    graphicsContextWithCGContext:context flipped:NO]
 #endif
 
diff --git a/macosx/tkMacOSXFont.c b/macosx/tkMacOSXFont.c
index b535ffe..ac3bf20 100644
--- a/macosx/tkMacOSXFont.c
+++ b/macosx/tkMacOSXFont.c
@@ -1212,7 +1212,7 @@ TkpDrawAngledCharsInContext(
     [attributes setObject:(id)fg forKey:(id)kCTForegroundColorAttributeName];
     CFRelease(fg);
     nsFont = [attributes objectForKey:NSFontAttributeName];
-    [nsFont setInContext:TkMacOSXNSContext(context)];
+    [nsFont setInContext:GET_NSCONTEXT(context, NO)];
     CGContextSetTextMatrix(context, CGAffineTransformIdentity);
     attributedString = [[NSAttributedString alloc] initWithString:string
 	    attributes:attributes];
-- 
cgit v0.12


From 4cb9d608b9e906a7ff8a3a67df94551dd0ce79ff Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Tue, 25 Aug 2020 16:16:43 +0000
Subject: Fix [08eb057dea]: remove two unused stub functions related to cursors
 and dating back to Carbon.

---
 generic/tk.decls         | 14 ++++++++------
 generic/tkInt.decls      |  7 ++++---
 generic/tkIntPlatDecls.h |  8 +++-----
 generic/tkPlatDecls.h    | 16 ++++++----------
 generic/tkStubInit.c     |  6 +++---
 macosx/tkMacOSXCursor.c  | 46 ++++------------------------------------------
 6 files changed, 28 insertions(+), 69 deletions(-)

diff --git a/generic/tk.decls b/generic/tk.decls
index ee1d97b..4261dec 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -1111,9 +1111,10 @@ declare 0 aqua {
 declare 1 aqua {
     void Tk_MacOSXTurnOffMenus(void)
 }
-declare 2 aqua {
-    void Tk_MacOSXTkOwnsCursor(int tkOwnsIt)
-}
+# Does not exist anymore.
+#declare 2 aqua {
+#    void Tk_MacOSXTkOwnsCursor(int tkOwnsIt)
+#}
 declare 3 aqua {
     void TkMacOSXInitMenus(Tcl_Interp *interp)
 }
@@ -1150,9 +1151,10 @@ declare 11 aqua {
 declare 12 aqua {
     void Tk_MacOSXTurnOffMenus_(void)
 }
-declare 13 aqua {
-    void Tk_MacOSXTkOwnsCursor_(int tkOwnsIt)
-}
+# Does not exist anymore
+#declare 13 aqua {
+#    void Tk_MacOSXTkOwnsCursor_(int tkOwnsIt)
+#}
 declare 14 aqua {
     void TkMacOSXInitMenus_(Tcl_Interp *interp)
 }
diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index a160541..82e4f2e 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -912,9 +912,10 @@ declare 9 aqua {
 declare 10 aqua {
     int TkMacOSXDispatchMenuEvent(int menuID, int index)
 }
-declare 11 aqua {
-    void TkMacOSXInstallCursor(int resizeOverride)
-}
+# Now a static function
+# declare 11 aqua {
+#     void TkMacOSXInstallCursor(int resizeOverride)
+# }
 declare 12 aqua {
     void TkMacOSXHandleTearoffMenu(void)
 }
diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h
index 8221d7a..f80a0c0 100644
--- a/generic/tkIntPlatDecls.h
+++ b/generic/tkIntPlatDecls.h
@@ -170,8 +170,7 @@ EXTERN unsigned int	TkMacOSXButtonKeyState(void);
 EXTERN void		TkMacOSXClearMenubarActive(void);
 /* 10 */
 EXTERN int		TkMacOSXDispatchMenuEvent(int menuID, int index);
-/* 11 */
-EXTERN void		TkMacOSXInstallCursor(int resizeOverride);
+/* Slot 11 is reserved */
 /* 12 */
 EXTERN void		TkMacOSXHandleTearoffMenu(void);
 /* Slot 13 is reserved */
@@ -405,7 +404,7 @@ typedef struct TkIntPlatStubs {
     unsigned int (*tkMacOSXButtonKeyState) (void); /* 8 */
     void (*tkMacOSXClearMenubarActive) (void); /* 9 */
     int (*tkMacOSXDispatchMenuEvent) (int menuID, int index); /* 10 */
-    void (*tkMacOSXInstallCursor) (int resizeOverride); /* 11 */
+    void (*reserved11)(void);
     void (*tkMacOSXHandleTearoffMenu) (void); /* 12 */
     void (*reserved13)(void);
     int (*tkMacOSXDoHLEvent) (void *theEvent); /* 14 */
@@ -631,8 +630,7 @@ extern const TkIntPlatStubs *tkIntPlatStubsPtr;
 	(tkIntPlatStubsPtr->tkMacOSXClearMenubarActive) /* 9 */
 #define TkMacOSXDispatchMenuEvent \
 	(tkIntPlatStubsPtr->tkMacOSXDispatchMenuEvent) /* 10 */
-#define TkMacOSXInstallCursor \
-	(tkIntPlatStubsPtr->tkMacOSXInstallCursor) /* 11 */
+/* Slot 11 is reserved */
 #define TkMacOSXHandleTearoffMenu \
 	(tkIntPlatStubsPtr->tkMacOSXHandleTearoffMenu) /* 12 */
 /* Slot 13 is reserved */
diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h
index db9141c..70b3239 100644
--- a/generic/tkPlatDecls.h
+++ b/generic/tkPlatDecls.h
@@ -63,8 +63,7 @@ EXTERN void		Tk_MacOSXSetEmbedHandler(
 				Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc);
 /* 1 */
 EXTERN void		Tk_MacOSXTurnOffMenus(void);
-/* 2 */
-EXTERN void		Tk_MacOSXTkOwnsCursor(int tkOwnsIt);
+/* Slot 2 is reserved */
 /* 3 */
 EXTERN void		TkMacOSXInitMenus(Tcl_Interp *interp);
 /* 4 */
@@ -91,8 +90,7 @@ EXTERN void		Tk_MacOSXSetEmbedHandler_(
 				Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc);
 /* 12 */
 EXTERN void		Tk_MacOSXTurnOffMenus_(void);
-/* 13 */
-EXTERN void		Tk_MacOSXTkOwnsCursor_(int tkOwnsIt);
+/* Slot 13 is reserved */
 /* 14 */
 EXTERN void		TkMacOSXInitMenus_(Tcl_Interp *interp);
 /* 15 */
@@ -117,7 +115,7 @@ typedef struct TkPlatStubs {
 #ifdef MAC_OSX_TK /* AQUA */
     void (*tk_MacOSXSetEmbedHandler) (Tk_MacOSXEmbedRegisterWinProc *registerWinProcPtr, Tk_MacOSXEmbedGetGrafPortProc *getPortProcPtr, Tk_MacOSXEmbedMakeContainerExistProc *containerExistProcPtr, Tk_MacOSXEmbedGetClipProc *getClipProc, Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc); /* 0 */
     void (*tk_MacOSXTurnOffMenus) (void); /* 1 */
-    void (*tk_MacOSXTkOwnsCursor) (int tkOwnsIt); /* 2 */
+    void (*reserved2)(void);
     void (*tkMacOSXInitMenus) (Tcl_Interp *interp); /* 3 */
     void (*tkMacOSXInitAppleEvents) (Tcl_Interp *interp); /* 4 */
     void (*tkGenWMConfigureEvent) (Tk_Window tkwin, int x, int y, int width, int height, int flags); /* 5 */
@@ -128,7 +126,7 @@ typedef struct TkPlatStubs {
     int (*tk_MacOSXIsAppInFront) (void); /* 10 */
     void (*tk_MacOSXSetEmbedHandler_) (Tk_MacOSXEmbedRegisterWinProc *registerWinProcPtr, Tk_MacOSXEmbedGetGrafPortProc *getPortProcPtr, Tk_MacOSXEmbedMakeContainerExistProc *containerExistProcPtr, Tk_MacOSXEmbedGetClipProc *getClipProc, Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc); /* 11 */
     void (*tk_MacOSXTurnOffMenus_) (void); /* 12 */
-    void (*tk_MacOSXTkOwnsCursor_) (int tkOwnsIt); /* 13 */
+    void (*reserved13)(void);
     void (*tkMacOSXInitMenus_) (Tcl_Interp *interp); /* 14 */
     void (*tkMacOSXInitAppleEvents_) (Tcl_Interp *interp); /* 15 */
     void (*tkGenWMConfigureEvent_) (Tk_Window tkwin, int x, int y, int width, int height, int flags); /* 16 */
@@ -166,8 +164,7 @@ extern const TkPlatStubs *tkPlatStubsPtr;
 	(tkPlatStubsPtr->tk_MacOSXSetEmbedHandler) /* 0 */
 #define Tk_MacOSXTurnOffMenus \
 	(tkPlatStubsPtr->tk_MacOSXTurnOffMenus) /* 1 */
-#define Tk_MacOSXTkOwnsCursor \
-	(tkPlatStubsPtr->tk_MacOSXTkOwnsCursor) /* 2 */
+/* Slot 2 is reserved */
 #define TkMacOSXInitMenus \
 	(tkPlatStubsPtr->tkMacOSXInitMenus) /* 3 */
 #define TkMacOSXInitAppleEvents \
@@ -188,8 +185,7 @@ extern const TkPlatStubs *tkPlatStubsPtr;
 	(tkPlatStubsPtr->tk_MacOSXSetEmbedHandler_) /* 11 */
 #define Tk_MacOSXTurnOffMenus_ \
 	(tkPlatStubsPtr->tk_MacOSXTurnOffMenus_) /* 12 */
-#define Tk_MacOSXTkOwnsCursor_ \
-	(tkPlatStubsPtr->tk_MacOSXTkOwnsCursor_) /* 13 */
+/* Slot 13 is reserved */
 #define TkMacOSXInitMenus_ \
 	(tkPlatStubsPtr->tkMacOSXInitMenus_) /* 14 */
 #define TkMacOSXInitAppleEvents_ \
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 0020fac..443d91a 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -572,7 +572,7 @@ static const TkIntPlatStubs tkIntPlatStubs = {
     TkMacOSXButtonKeyState, /* 8 */
     TkMacOSXClearMenubarActive, /* 9 */
     TkMacOSXDispatchMenuEvent, /* 10 */
-    TkMacOSXInstallCursor, /* 11 */
+    0, /* 11 */
     TkMacOSXHandleTearoffMenu, /* 12 */
     0, /* 13 */
     TkMacOSXDoHLEvent, /* 14 */
@@ -1009,7 +1009,7 @@ static const TkPlatStubs tkPlatStubs = {
 #ifdef MAC_OSX_TK /* AQUA */
     Tk_MacOSXSetEmbedHandler, /* 0 */
     Tk_MacOSXTurnOffMenus, /* 1 */
-    Tk_MacOSXTkOwnsCursor, /* 2 */
+    0, /* 2 */
     TkMacOSXInitMenus, /* 3 */
     TkMacOSXInitAppleEvents, /* 4 */
     TkGenWMConfigureEvent, /* 5 */
@@ -1020,7 +1020,7 @@ static const TkPlatStubs tkPlatStubs = {
     Tk_MacOSXIsAppInFront, /* 10 */
     Tk_MacOSXSetEmbedHandler_, /* 11 */
     Tk_MacOSXTurnOffMenus_, /* 12 */
-    Tk_MacOSXTkOwnsCursor_, /* 13 */
+    0, /* 13 */
     TkMacOSXInitMenus_, /* 14 */
     TkMacOSXInitAppleEvents_, /* 15 */
     TkGenWMConfigureEvent_, /* 16 */
diff --git a/macosx/tkMacOSXCursor.c b/macosx/tkMacOSXCursor.c
index 894a44d..49caf37 100644
--- a/macosx/tkMacOSXCursor.c
+++ b/macosx/tkMacOSXCursor.c
@@ -187,15 +187,6 @@ static const struct CursorName cursorNames[] = {
 
 static TkMacOSXCursor *gCurrentCursor = NULL;
 				/* A pointer to the current cursor. */
-static int gResizeOverride = false;
-				/* A boolean indicating whether we should use
-				 * the resize cursor during installations. */
-static int gTkOwnsCursor = true;/* A boolean indicating whether Tk owns the
-				 * cursor. If not (for instance, in the case
-				 * where a Tk window is embedded in another
-				 * app's window, and the cursor is out of the
-				 * Tk window, we will not attempt to adjust
-				 * the cursor. */
 
 /*
  * Declarations of procedures local to this file
@@ -487,17 +478,15 @@ TkpFreeCursor(
  *----------------------------------------------------------------------
  */
 
-void
+static void
 TkMacOSXInstallCursor(
-    int resizeOverride)
+    void)
 {
     TkMacOSXCursor *macCursorPtr = gCurrentCursor;
     static int cursorHidden = 0;
     int cursorNone = 0;
 
-    gResizeOverride = resizeOverride;
-
-    if (resizeOverride || !macCursorPtr) {
+    if (!macCursorPtr) {
 	[[NSCursor arrowCursor] set];
     } else {
 	switch (macCursorPtr->type) {
@@ -545,10 +534,6 @@ TkpSetCursor(
 {
     int cursorChanged = 1;
 
-    if (!gTkOwnsCursor) {
-	return;
-    }
-
     if (cursor == None) {
 	/*
 	 * This is a little tricky. We can't really tell whether
@@ -567,34 +552,11 @@ TkpSetCursor(
     }
 
     if (Tk_MacOSXIsAppInFront() && cursorChanged) {
-	TkMacOSXInstallCursor(gResizeOverride);
+	TkMacOSXInstallCursor();
     }
 }
 
 /*
- *----------------------------------------------------------------------
- *
- * Tk_MacOSXTkOwnsCursor --
- *
- *	Sets whether Tk has the right to adjust the cursor.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	May keep Tk from changing the cursor.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tk_MacOSXTkOwnsCursor(
-    int tkOwnsIt)
-{
-    gTkOwnsCursor = tkOwnsIt;
-}
-
-/*
  * Local Variables:
  * mode: objc
  * c-basic-offset: 4
-- 
cgit v0.12


From 219216c26fe5f38d29a865b7df2a5f816d20fffa Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 26 Aug 2020 07:39:41 +0000
Subject: Put back a dummy Tk_MacOSXTkOwnsCursor(), just because it's in the
 public stub table. Can be removed fully in Tk 8.7. More simplifications

---
 generic/tk.decls        | 26 +++++---------------------
 generic/tkPlatDecls.h   | 42 +++++++++++++-----------------------------
 generic/tkStubInit.c    | 13 ++++---------
 macosx/tkMacOSXCursor.c | 22 ++++++++++++++++++++++
 macosx/tkMacOSXMenu.c   |  8 --------
 macosx/tkMacOSXScale.c  | 28 ----------------------------
 6 files changed, 44 insertions(+), 95 deletions(-)

diff --git a/generic/tk.decls b/generic/tk.decls
index 4261dec..d4a07eb 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -1111,10 +1111,9 @@ declare 0 aqua {
 declare 1 aqua {
     void Tk_MacOSXTurnOffMenus(void)
 }
-# Does not exist anymore.
-#declare 2 aqua {
-#    void Tk_MacOSXTkOwnsCursor(int tkOwnsIt)
-#}
+declare 2 aqua {
+    void Tk_MacOSXTkOwnsCursor(int tkOwnsIt)
+}
 declare 3 aqua {
     void TkMacOSXInitMenus(Tcl_Interp *interp)
 }
@@ -1141,27 +1140,12 @@ declare 10 aqua {
     int Tk_MacOSXIsAppInFront(void)
 }
 declare 11 aqua {
-    void Tk_MacOSXSetEmbedHandler_(
-	    Tk_MacOSXEmbedRegisterWinProc *registerWinProcPtr,
-	    Tk_MacOSXEmbedGetGrafPortProc *getPortProcPtr,
-	    Tk_MacOSXEmbedMakeContainerExistProc *containerExistProcPtr,
-	    Tk_MacOSXEmbedGetClipProc *getClipProc,
-	    Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc)
-}
-declare 12 aqua {
-    void Tk_MacOSXTurnOffMenus_(void)
-}
-# Does not exist anymore
-#declare 13 aqua {
-#    void Tk_MacOSXTkOwnsCursor_(int tkOwnsIt)
-#}
-declare 14 aqua {
     void TkMacOSXInitMenus_(Tcl_Interp *interp)
 }
-declare 15 aqua {
+declare 12 aqua {
     void TkMacOSXInitAppleEvents_(Tcl_Interp *interp)
 }
-declare 16 aqua {
+declare 13 aqua {
     void TkGenWMConfigureEvent_(Tk_Window tkwin, int x, int y, int width,
 	    int height, int flags)
 }
diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h
index 70b3239..ce3e43a 100644
--- a/generic/tkPlatDecls.h
+++ b/generic/tkPlatDecls.h
@@ -63,7 +63,8 @@ EXTERN void		Tk_MacOSXSetEmbedHandler(
 				Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc);
 /* 1 */
 EXTERN void		Tk_MacOSXTurnOffMenus(void);
-/* Slot 2 is reserved */
+/* 2 */
+EXTERN void		Tk_MacOSXTkOwnsCursor(int tkOwnsIt);
 /* 3 */
 EXTERN void		TkMacOSXInitMenus(Tcl_Interp *interp);
 /* 4 */
@@ -82,20 +83,10 @@ EXTERN void		Tk_MacOSXSetupTkNotifier(void);
 /* 10 */
 EXTERN int		Tk_MacOSXIsAppInFront(void);
 /* 11 */
-EXTERN void		Tk_MacOSXSetEmbedHandler_(
-				Tk_MacOSXEmbedRegisterWinProc *registerWinProcPtr,
-				Tk_MacOSXEmbedGetGrafPortProc *getPortProcPtr,
-				Tk_MacOSXEmbedMakeContainerExistProc *containerExistProcPtr,
-				Tk_MacOSXEmbedGetClipProc *getClipProc,
-				Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc);
-/* 12 */
-EXTERN void		Tk_MacOSXTurnOffMenus_(void);
-/* Slot 13 is reserved */
-/* 14 */
 EXTERN void		TkMacOSXInitMenus_(Tcl_Interp *interp);
-/* 15 */
+/* 12 */
 EXTERN void		TkMacOSXInitAppleEvents_(Tcl_Interp *interp);
-/* 16 */
+/* 13 */
 EXTERN void		TkGenWMConfigureEvent_(Tk_Window tkwin, int x, int y,
 				int width, int height, int flags);
 #endif /* AQUA */
@@ -115,7 +106,7 @@ typedef struct TkPlatStubs {
 #ifdef MAC_OSX_TK /* AQUA */
     void (*tk_MacOSXSetEmbedHandler) (Tk_MacOSXEmbedRegisterWinProc *registerWinProcPtr, Tk_MacOSXEmbedGetGrafPortProc *getPortProcPtr, Tk_MacOSXEmbedMakeContainerExistProc *containerExistProcPtr, Tk_MacOSXEmbedGetClipProc *getClipProc, Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc); /* 0 */
     void (*tk_MacOSXTurnOffMenus) (void); /* 1 */
-    void (*reserved2)(void);
+    void (*tk_MacOSXTkOwnsCursor) (int tkOwnsIt); /* 2 */
     void (*tkMacOSXInitMenus) (Tcl_Interp *interp); /* 3 */
     void (*tkMacOSXInitAppleEvents) (Tcl_Interp *interp); /* 4 */
     void (*tkGenWMConfigureEvent) (Tk_Window tkwin, int x, int y, int width, int height, int flags); /* 5 */
@@ -124,12 +115,9 @@ typedef struct TkPlatStubs {
     void * (*tkMacOSXGetRootControl) (Drawable drawable); /* 8 */
     void (*tk_MacOSXSetupTkNotifier) (void); /* 9 */
     int (*tk_MacOSXIsAppInFront) (void); /* 10 */
-    void (*tk_MacOSXSetEmbedHandler_) (Tk_MacOSXEmbedRegisterWinProc *registerWinProcPtr, Tk_MacOSXEmbedGetGrafPortProc *getPortProcPtr, Tk_MacOSXEmbedMakeContainerExistProc *containerExistProcPtr, Tk_MacOSXEmbedGetClipProc *getClipProc, Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc); /* 11 */
-    void (*tk_MacOSXTurnOffMenus_) (void); /* 12 */
-    void (*reserved13)(void);
-    void (*tkMacOSXInitMenus_) (Tcl_Interp *interp); /* 14 */
-    void (*tkMacOSXInitAppleEvents_) (Tcl_Interp *interp); /* 15 */
-    void (*tkGenWMConfigureEvent_) (Tk_Window tkwin, int x, int y, int width, int height, int flags); /* 16 */
+    void (*tkMacOSXInitMenus_) (Tcl_Interp *interp); /* 11 */
+    void (*tkMacOSXInitAppleEvents_) (Tcl_Interp *interp); /* 12 */
+    void (*tkGenWMConfigureEvent_) (Tk_Window tkwin, int x, int y, int width, int height, int flags); /* 13 */
 #endif /* AQUA */
 } TkPlatStubs;
 
@@ -164,7 +152,8 @@ extern const TkPlatStubs *tkPlatStubsPtr;
 	(tkPlatStubsPtr->tk_MacOSXSetEmbedHandler) /* 0 */
 #define Tk_MacOSXTurnOffMenus \
 	(tkPlatStubsPtr->tk_MacOSXTurnOffMenus) /* 1 */
-/* Slot 2 is reserved */
+#define Tk_MacOSXTkOwnsCursor \
+	(tkPlatStubsPtr->tk_MacOSXTkOwnsCursor) /* 2 */
 #define TkMacOSXInitMenus \
 	(tkPlatStubsPtr->tkMacOSXInitMenus) /* 3 */
 #define TkMacOSXInitAppleEvents \
@@ -181,17 +170,12 @@ extern const TkPlatStubs *tkPlatStubsPtr;
 	(tkPlatStubsPtr->tk_MacOSXSetupTkNotifier) /* 9 */
 #define Tk_MacOSXIsAppInFront \
 	(tkPlatStubsPtr->tk_MacOSXIsAppInFront) /* 10 */
-#define Tk_MacOSXSetEmbedHandler_ \
-	(tkPlatStubsPtr->tk_MacOSXSetEmbedHandler_) /* 11 */
-#define Tk_MacOSXTurnOffMenus_ \
-	(tkPlatStubsPtr->tk_MacOSXTurnOffMenus_) /* 12 */
-/* Slot 13 is reserved */
 #define TkMacOSXInitMenus_ \
-	(tkPlatStubsPtr->tkMacOSXInitMenus_) /* 14 */
+	(tkPlatStubsPtr->tkMacOSXInitMenus_) /* 11 */
 #define TkMacOSXInitAppleEvents_ \
-	(tkPlatStubsPtr->tkMacOSXInitAppleEvents_) /* 15 */
+	(tkPlatStubsPtr->tkMacOSXInitAppleEvents_) /* 12 */
 #define TkGenWMConfigureEvent_ \
-	(tkPlatStubsPtr->tkGenWMConfigureEvent_) /* 16 */
+	(tkPlatStubsPtr->tkGenWMConfigureEvent_) /* 13 */
 #endif /* AQUA */
 
 #endif /* defined(USE_TK_STUBS) */
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 443d91a..17a0746 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -56,8 +56,6 @@ MODULE_SCOPE const TkStubs tkStubs;
 #define TkSendCleanup_ TkSendCleanup
 #define TkpTestsendCmd_ TkpTestsendCmd
 #define Tk_MacOSXSetEmbedHandler_ Tk_MacOSXSetEmbedHandler
-#define Tk_MacOSXTurnOffMenus_ Tk_MacOSXTurnOffMenus
-#define Tk_MacOSXTkOwnsCursor_ Tk_MacOSXTkOwnsCursor
 #define TkMacOSXInitMenus_ TkMacOSXInitMenus
 #define TkMacOSXInitAppleEvents_ TkMacOSXInitAppleEvents
 #define TkGenWMConfigureEvent_ TkGenWMConfigureEvent
@@ -1009,7 +1007,7 @@ static const TkPlatStubs tkPlatStubs = {
 #ifdef MAC_OSX_TK /* AQUA */
     Tk_MacOSXSetEmbedHandler, /* 0 */
     Tk_MacOSXTurnOffMenus, /* 1 */
-    0, /* 2 */
+    Tk_MacOSXTkOwnsCursor, /* 2 */
     TkMacOSXInitMenus, /* 3 */
     TkMacOSXInitAppleEvents, /* 4 */
     TkGenWMConfigureEvent, /* 5 */
@@ -1018,12 +1016,9 @@ static const TkPlatStubs tkPlatStubs = {
     TkMacOSXGetRootControl, /* 8 */
     Tk_MacOSXSetupTkNotifier, /* 9 */
     Tk_MacOSXIsAppInFront, /* 10 */
-    Tk_MacOSXSetEmbedHandler_, /* 11 */
-    Tk_MacOSXTurnOffMenus_, /* 12 */
-    0, /* 13 */
-    TkMacOSXInitMenus_, /* 14 */
-    TkMacOSXInitAppleEvents_, /* 15 */
-    TkGenWMConfigureEvent_, /* 16 */
+    TkMacOSXInitMenus_, /* 11 */
+    TkMacOSXInitAppleEvents_, /* 12 */
+    TkGenWMConfigureEvent_, /* 13 */
 #endif /* AQUA */
 };
 
diff --git a/macosx/tkMacOSXCursor.c b/macosx/tkMacOSXCursor.c
index 49caf37..140dffe 100644
--- a/macosx/tkMacOSXCursor.c
+++ b/macosx/tkMacOSXCursor.c
@@ -557,6 +557,28 @@ TkpSetCursor(
 }
 
 /*
+ *----------------------------------------------------------------------
+ *
+ * Tk_MacOSXTkOwnsCursor --
+ *
+ *	Sets whether Tk has the right to adjust the cursor.
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	May keep Tk from changing the cursor.
+ *
+ *----------------------------------------------------------------------
+ */
+
+void
+Tk_MacOSXTkOwnsCursor(
+    int tkOwnsIt)
+{
+}
+
+/*
  * Local Variables:
  * mode: objc
  * c-basic-offset: 4
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c
index 321b4f8..3b7099d 100644
--- a/macosx/tkMacOSXMenu.c
+++ b/macosx/tkMacOSXMenu.c
@@ -91,9 +91,6 @@ static const struct {
 #undef ACCEL
 #undef sl
 
-static int gNoTkMenus = 0;	/* This is used by Tk_MacOSXTurnOffMenus as
-				 * the flag that Tk is not to draw any
-				 * menus. */
 static int inPostMenu = 0;
 static unsigned long defaultBg = 0, defaultFg = 0;
 static SInt32 menuMarkColumnWidth = 0, menuIconTrailingEdgeMargin = 0;
@@ -483,10 +480,6 @@ TKBackgroundLoop *backgroundLoop = nil;
 
 - (void) tkSetMainMenu: (TKMenu *) menu
 {
-    if (gNoTkMenus) {
-	return;
-    }
-
     TKMenu *applicationMenu = nil;
 
     if (menu) {
@@ -1663,7 +1656,6 @@ TkMacOSXClearMenubarActive(void)
 void
 Tk_MacOSXTurnOffMenus(void)
 {
-    gNoTkMenus = 1;
 }
 
 /*
diff --git a/macosx/tkMacOSXScale.c b/macosx/tkMacOSXScale.c
index 80b1bda..28b192d 100644
--- a/macosx/tkMacOSXScale.c
+++ b/macosx/tkMacOSXScale.c
@@ -149,8 +149,6 @@ TkpDisplayScale(
     MacScale *macScalePtr = clientData;
     Rect r;
     WindowRef windowRef;
-    CGrafPtr destPort, savePort;
-    Boolean portChanged;
     MacDrawable *macDraw;
     SInt32 initialValue, minValue, maxValue;
     UInt16 numTicks;
@@ -216,9 +214,7 @@ TkpDisplayScale(
      */
 
     macDraw = (MacDrawable *) Tk_WindowId(tkwin);
-    destPort = TkMacOSXGetDrawablePort(Tk_WindowId(tkwin));
     windowRef = TkMacOSXDrawableWindow(Tk_WindowId(tkwin));
-    portChanged = QDSwapPort(destPort, &savePort);
 
     /*
      * Create Macintosh control.
@@ -292,9 +288,6 @@ TkpDisplayScale(
     HiliteControl(macScalePtr->scaleHandle, 0);
     Draw1Control(macScalePtr->scaleHandle);
 
-    if (portChanged) {
-	QDSwapPort(savePort, NULL);
-    }
 done:
     scalePtr->flags &= ~REDRAW_ALL;
 }
@@ -326,14 +319,10 @@ TkpScaleElement(
     ControlPartCode part;
     Point where;
     Rect bounds;
-    CGrafPtr destPort, savePort;
-    Boolean portChanged;
 
 #ifdef TK_MAC_DEBUG_SCALE
     TkMacOSXDbgMsg("TkpScaleElement");
 #endif
-    destPort = TkMacOSXGetDrawablePort(Tk_WindowId(scalePtr->tkwin));
-    portChanged = QDSwapPort(destPort, &savePort);
 
     /*
      * All of the calculations in this procedure mirror those in
@@ -345,10 +334,6 @@ TkpScaleElement(
     where.v = y + bounds.top;
     part = TestControl(macScalePtr->scaleHandle, where);
 
-    if (portChanged) {
-	QDSwapPort(savePort, NULL);
-    }
-
 #ifdef TK_MAC_DEBUG_SCALE
     fprintf (stderr,"ScalePart %d, pos ( %d %d )\n", part, where.h, where.v );
 #endif
@@ -400,8 +385,6 @@ MacScaleEventProc(
     Point where;
     Rect bounds;
     int part;
-    CGrafPtr destPort, savePort;
-    Boolean portChanged;
 
 #ifdef TK_MAC_DEBUG_SCALE
     fprintf(stderr,"MacScaleEventProc\n" );
@@ -413,13 +396,6 @@ MacScaleEventProc(
      * control was hit and act accordingly.
      */
 
-    destPort = TkMacOSXGetDrawablePort(Tk_WindowId(macScalePtr->info.tkwin));
-    portChanged = QDSwapPort(destPort, &savePort);
-
-    TkMacOSXWinBounds((TkWindow *) macScalePtr->info.tkwin, &bounds);
-    where.h = eventPtr->xbutton.x + bounds.left;
-    where.v = eventPtr->xbutton.y + bounds.top;
-#ifdef TK_MAC_DEBUG_SCALE
     TkMacOSXDbgMsg("calling TestControl");
 #endif
     part = TestControl(macScalePtr->scaleHandle, where);
@@ -445,10 +421,6 @@ MacScaleEventProc(
      */
 
     TkGenerateButtonEventForXPointer(Tk_WindowId(macScalePtr->info.tkwin));
-
-    if (portChanged) {
-	QDSwapPort(savePort, NULL);
-    }
 }
 
 /*
-- 
cgit v0.12


From 1618e2bbee42caa1010a3071f26917e298ba6ab7 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 26 Aug 2020 11:14:06 +0000
Subject: Simplifications, because TkMacOSXGetDrawablePort() always returns
 NULL Remove stub copies which are only meant for future NSAPI-related
 support: Since no browser supports NSAPI any more, who cares ....

---
 generic/tk.decls       | 20 --------------------
 generic/tkPlatDecls.h  | 50 +++++++++++++++-----------------------------------
 generic/tkStubInit.c   | 15 +++++----------
 macosx/tkMacOSXScale.c | 31 -------------------------------
 4 files changed, 20 insertions(+), 96 deletions(-)

diff --git a/generic/tk.decls b/generic/tk.decls
index ee1d97b..3e64878 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -1139,26 +1139,6 @@ declare 9 aqua {
 declare 10 aqua {
     int Tk_MacOSXIsAppInFront(void)
 }
-declare 11 aqua {
-    void Tk_MacOSXSetEmbedHandler_(
-	    Tk_MacOSXEmbedRegisterWinProc *registerWinProcPtr,
-	    Tk_MacOSXEmbedGetGrafPortProc *getPortProcPtr,
-	    Tk_MacOSXEmbedMakeContainerExistProc *containerExistProcPtr,
-	    Tk_MacOSXEmbedGetClipProc *getClipProc,
-	    Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc)
-}
-declare 12 aqua {
-    void Tk_MacOSXTurnOffMenus_(void)
-}
-declare 13 aqua {
-    void Tk_MacOSXTkOwnsCursor_(int tkOwnsIt)
-}
-declare 14 aqua {
-    void TkMacOSXInitMenus_(Tcl_Interp *interp)
-}
-declare 15 aqua {
-    void TkMacOSXInitAppleEvents_(Tcl_Interp *interp)
-}
 declare 16 aqua {
     void TkGenWMConfigureEvent_(Tk_Window tkwin, int x, int y, int width,
 	    int height, int flags)
diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h
index db9141c..ed8b1f5 100644
--- a/generic/tkPlatDecls.h
+++ b/generic/tkPlatDecls.h
@@ -82,21 +82,11 @@ EXTERN void *		TkMacOSXGetRootControl(Drawable drawable);
 EXTERN void		Tk_MacOSXSetupTkNotifier(void);
 /* 10 */
 EXTERN int		Tk_MacOSXIsAppInFront(void);
-/* 11 */
-EXTERN void		Tk_MacOSXSetEmbedHandler_(
-				Tk_MacOSXEmbedRegisterWinProc *registerWinProcPtr,
-				Tk_MacOSXEmbedGetGrafPortProc *getPortProcPtr,
-				Tk_MacOSXEmbedMakeContainerExistProc *containerExistProcPtr,
-				Tk_MacOSXEmbedGetClipProc *getClipProc,
-				Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc);
-/* 12 */
-EXTERN void		Tk_MacOSXTurnOffMenus_(void);
-/* 13 */
-EXTERN void		Tk_MacOSXTkOwnsCursor_(int tkOwnsIt);
-/* 14 */
-EXTERN void		TkMacOSXInitMenus_(Tcl_Interp *interp);
-/* 15 */
-EXTERN void		TkMacOSXInitAppleEvents_(Tcl_Interp *interp);
+/* Slot 11 is reserved */
+/* Slot 12 is reserved */
+/* Slot 13 is reserved */
+/* Slot 14 is reserved */
+/* Slot 15 is reserved */
 /* 16 */
 EXTERN void		TkGenWMConfigureEvent_(Tk_Window tkwin, int x, int y,
 				int width, int height, int flags);
@@ -126,11 +116,11 @@ typedef struct TkPlatStubs {
     void * (*tkMacOSXGetRootControl) (Drawable drawable); /* 8 */
     void (*tk_MacOSXSetupTkNotifier) (void); /* 9 */
     int (*tk_MacOSXIsAppInFront) (void); /* 10 */
-    void (*tk_MacOSXSetEmbedHandler_) (Tk_MacOSXEmbedRegisterWinProc *registerWinProcPtr, Tk_MacOSXEmbedGetGrafPortProc *getPortProcPtr, Tk_MacOSXEmbedMakeContainerExistProc *containerExistProcPtr, Tk_MacOSXEmbedGetClipProc *getClipProc, Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc); /* 11 */
-    void (*tk_MacOSXTurnOffMenus_) (void); /* 12 */
-    void (*tk_MacOSXTkOwnsCursor_) (int tkOwnsIt); /* 13 */
-    void (*tkMacOSXInitMenus_) (Tcl_Interp *interp); /* 14 */
-    void (*tkMacOSXInitAppleEvents_) (Tcl_Interp *interp); /* 15 */
+    void (*reserved11)(void);
+    void (*reserved12)(void);
+    void (*reserved13)(void);
+    void (*reserved14)(void);
+    void (*reserved15)(void);
     void (*tkGenWMConfigureEvent_) (Tk_Window tkwin, int x, int y, int width, int height, int flags); /* 16 */
 #endif /* AQUA */
 } TkPlatStubs;
@@ -184,16 +174,11 @@ extern const TkPlatStubs *tkPlatStubsPtr;
 	(tkPlatStubsPtr->tk_MacOSXSetupTkNotifier) /* 9 */
 #define Tk_MacOSXIsAppInFront \
 	(tkPlatStubsPtr->tk_MacOSXIsAppInFront) /* 10 */
-#define Tk_MacOSXSetEmbedHandler_ \
-	(tkPlatStubsPtr->tk_MacOSXSetEmbedHandler_) /* 11 */
-#define Tk_MacOSXTurnOffMenus_ \
-	(tkPlatStubsPtr->tk_MacOSXTurnOffMenus_) /* 12 */
-#define Tk_MacOSXTkOwnsCursor_ \
-	(tkPlatStubsPtr->tk_MacOSXTkOwnsCursor_) /* 13 */
-#define TkMacOSXInitMenus_ \
-	(tkPlatStubsPtr->tkMacOSXInitMenus_) /* 14 */
-#define TkMacOSXInitAppleEvents_ \
-	(tkPlatStubsPtr->tkMacOSXInitAppleEvents_) /* 15 */
+/* Slot 11 is reserved */
+/* Slot 12 is reserved */
+/* Slot 13 is reserved */
+/* Slot 14 is reserved */
+/* Slot 15 is reserved */
 #define TkGenWMConfigureEvent_ \
 	(tkPlatStubsPtr->tkGenWMConfigureEvent_) /* 16 */
 #endif /* AQUA */
@@ -202,11 +187,6 @@ extern const TkPlatStubs *tkPlatStubsPtr;
 
 /* !END!: Do not edit above this line. */
 
-#undef Tk_MacOSXSetEmbedHandler_
-#undef Tk_MacOSXTurnOffMenus_
-#undef Tk_MacOSXTkOwnsCursor_
-#undef TkMacOSXInitMenus_
-#undef TkMacOSXInitAppleEvents_
 #undef TkGenWMConfigureEvent_
 
 #ifdef __cplusplus
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 0020fac..c69ecac 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -55,11 +55,6 @@ MODULE_SCOPE const TkStubs tkStubs;
 #define TkWmCleanup_ TkWmCleanup
 #define TkSendCleanup_ TkSendCleanup
 #define TkpTestsendCmd_ TkpTestsendCmd
-#define Tk_MacOSXSetEmbedHandler_ Tk_MacOSXSetEmbedHandler
-#define Tk_MacOSXTurnOffMenus_ Tk_MacOSXTurnOffMenus
-#define Tk_MacOSXTkOwnsCursor_ Tk_MacOSXTkOwnsCursor
-#define TkMacOSXInitMenus_ TkMacOSXInitMenus
-#define TkMacOSXInitAppleEvents_ TkMacOSXInitAppleEvents
 #define TkGenWMConfigureEvent_ TkGenWMConfigureEvent
 #define TkGenerateActivateEvents_ TkGenerateActivateEvents
 
@@ -1018,11 +1013,11 @@ static const TkPlatStubs tkPlatStubs = {
     TkMacOSXGetRootControl, /* 8 */
     Tk_MacOSXSetupTkNotifier, /* 9 */
     Tk_MacOSXIsAppInFront, /* 10 */
-    Tk_MacOSXSetEmbedHandler_, /* 11 */
-    Tk_MacOSXTurnOffMenus_, /* 12 */
-    Tk_MacOSXTkOwnsCursor_, /* 13 */
-    TkMacOSXInitMenus_, /* 14 */
-    TkMacOSXInitAppleEvents_, /* 15 */
+    0, /* 11 */
+    0, /* 12 */
+    0, /* 13 */
+    0, /* 14 */
+    0, /* 15 */
     TkGenWMConfigureEvent_, /* 16 */
 #endif /* AQUA */
 };
diff --git a/macosx/tkMacOSXScale.c b/macosx/tkMacOSXScale.c
index 80b1bda..b1e918b 100644
--- a/macosx/tkMacOSXScale.c
+++ b/macosx/tkMacOSXScale.c
@@ -149,8 +149,6 @@ TkpDisplayScale(
     MacScale *macScalePtr = clientData;
     Rect r;
     WindowRef windowRef;
-    CGrafPtr destPort, savePort;
-    Boolean portChanged;
     MacDrawable *macDraw;
     SInt32 initialValue, minValue, maxValue;
     UInt16 numTicks;
@@ -216,9 +214,7 @@ TkpDisplayScale(
      */
 
     macDraw = (MacDrawable *) Tk_WindowId(tkwin);
-    destPort = TkMacOSXGetDrawablePort(Tk_WindowId(tkwin));
     windowRef = TkMacOSXDrawableWindow(Tk_WindowId(tkwin));
-    portChanged = QDSwapPort(destPort, &savePort);
 
     /*
      * Create Macintosh control.
@@ -291,10 +287,6 @@ TkpDisplayScale(
     SetControlVisibility(macScalePtr->scaleHandle, true, true);
     HiliteControl(macScalePtr->scaleHandle, 0);
     Draw1Control(macScalePtr->scaleHandle);
-
-    if (portChanged) {
-	QDSwapPort(savePort, NULL);
-    }
 done:
     scalePtr->flags &= ~REDRAW_ALL;
 }
@@ -326,14 +318,10 @@ TkpScaleElement(
     ControlPartCode part;
     Point where;
     Rect bounds;
-    CGrafPtr destPort, savePort;
-    Boolean portChanged;
 
 #ifdef TK_MAC_DEBUG_SCALE
     TkMacOSXDbgMsg("TkpScaleElement");
 #endif
-    destPort = TkMacOSXGetDrawablePort(Tk_WindowId(scalePtr->tkwin));
-    portChanged = QDSwapPort(destPort, &savePort);
 
     /*
      * All of the calculations in this procedure mirror those in
@@ -345,10 +333,6 @@ TkpScaleElement(
     where.v = y + bounds.top;
     part = TestControl(macScalePtr->scaleHandle, where);
 
-    if (portChanged) {
-	QDSwapPort(savePort, NULL);
-    }
-
 #ifdef TK_MAC_DEBUG_SCALE
     fprintf (stderr,"ScalePart %d, pos ( %d %d )\n", part, where.h, where.v );
 #endif
@@ -400,22 +384,11 @@ MacScaleEventProc(
     Point where;
     Rect bounds;
     int part;
-    CGrafPtr destPort, savePort;
-    Boolean portChanged;
 
 #ifdef TK_MAC_DEBUG_SCALE
     fprintf(stderr,"MacScaleEventProc\n" );
 #endif
 
-    /*
-     * To call Macintosh control routines we must have the port set to the
-     * window containing the control. We will then test which part of the
-     * control was hit and act accordingly.
-     */
-
-    destPort = TkMacOSXGetDrawablePort(Tk_WindowId(macScalePtr->info.tkwin));
-    portChanged = QDSwapPort(destPort, &savePort);
-
     TkMacOSXWinBounds((TkWindow *) macScalePtr->info.tkwin, &bounds);
     where.h = eventPtr->xbutton.x + bounds.left;
     where.v = eventPtr->xbutton.y + bounds.top;
@@ -445,10 +418,6 @@ MacScaleEventProc(
      */
 
     TkGenerateButtonEventForXPointer(Tk_WindowId(macScalePtr->info.tkwin));
-
-    if (portChanged) {
-	QDSwapPort(savePort, NULL);
-    }
 }
 
 /*
-- 
cgit v0.12


From bc1b481b1b3661958beec5f99e123d503749accb Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 26 Aug 2020 13:36:55 +0000
Subject: Another simplification: Change TkMacOSXDrawableView() from a
 MODULE_SCOPE function to a macro. This saves an empty wrapper-function for
 TkMacOSXGetRootControl()

---
 macosx/tkMacOSXPrivate.h    |  2 +-
 macosx/tkMacOSXSubwindows.c | 40 +++++++---------------------------------
 2 files changed, 8 insertions(+), 34 deletions(-)

diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h
index 1091d7c..c632986 100644
--- a/macosx/tkMacOSXPrivate.h
+++ b/macosx/tkMacOSXPrivate.h
@@ -271,7 +271,7 @@ MODULE_SCOPE int	TkMacOSXMakeFullscreen(TkWindow *winPtr,
 MODULE_SCOPE void	TkMacOSXEnterExitFullscreen(TkWindow *winPtr,
 			    int active);
 MODULE_SCOPE NSWindow*	TkMacOSXDrawableWindow(Drawable drawable);
-MODULE_SCOPE NSView*	TkMacOSXDrawableView(MacDrawable *macWin);
+#define TkMacOSXDrawableView(macWin) (NSView *)TkMacOSXGetRootControl((Drawable)(macWin))
 MODULE_SCOPE void	TkMacOSXWinCGBounds(TkWindow *winPtr, CGRect *bounds);
 MODULE_SCOPE HIShapeRef	TkMacOSXGetClipRgn(Drawable drawable);
 MODULE_SCOPE void	TkMacOSXInvalidateViewRegion(NSView *view,
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index 64db1b1..dd00043 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -1154,14 +1154,15 @@ TkMacOSXGetDrawablePort(
  *----------------------------------------------------------------------
  */
 
-NSView *
-TkMacOSXDrawableView(
-    MacDrawable *macWin)
+void *
+TkMacOSXGetRootControl(
+    Drawable drawable)
 {
-    NSView *result = nil;
+    void *result = NULL;
+    MacDrawable *macWin = (MacDrawable *)drawable;
 
     if (!macWin) {
-	result = nil;
+	result = NULL;
     } else if (!macWin->toplevel) {
 	result = macWin->view;
     } else if (!(macWin->toplevel->flags & TK_EMBEDDED)) {
@@ -1170,7 +1171,7 @@ TkMacOSXDrawableView(
 	TkWindow *contWinPtr = TkpGetOtherWindow(macWin->toplevel->winPtr);
 
 	if (contWinPtr) {
-	    result = TkMacOSXDrawableView(contWinPtr->privatePtr);
+	    result = TkMacOSXGetRootControl((Drawable)contWinPtr->privatePtr);
 	}
     }
     return result;
@@ -1179,33 +1180,6 @@ TkMacOSXDrawableView(
 /*
  *----------------------------------------------------------------------
  *
- * TkMacOSXGetRootControl --
- *
- *	This function returns the NSView for a given X drawable.
- *
- * Results:
- *	A NSView* .
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-void *
-TkMacOSXGetRootControl(
-    Drawable drawable)
-{
-    /*
-     * will probably need to fix this up for embedding
-     */
-
-    return TkMacOSXDrawableView((MacDrawable *) drawable);
-}
-
-/*
- *----------------------------------------------------------------------
- *
  * TkMacOSXInvalClipRgns --
  *
  *	This function invalidates the clipping regions for a given window and
-- 
cgit v0.12


From 5d0b340749ee84c407fde84ba7b4daba94f6502c Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Wed, 26 Aug 2020 18:59:18 +0000
Subject: Add comments explaining the obscure reason that the name
 TkMacOSXGetRootControl exists and why it should never be used.

---
 macosx/tkMacOSXSubwindows.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index dd00043..811608f 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -1120,7 +1120,8 @@ TkMacOSXDrawable(
  *
  * TkMacOSXGetDrawablePort --
  *
- *	This function returns the Graphics Port for a given X drawable.
+ *	This function only exists because it is listed in the stubs table.
+ *      It is useless.
  *
  * Results:
  *	NULL.
@@ -1143,7 +1144,14 @@ TkMacOSXGetDrawablePort(
  *
  * TkMacOSXDrawableView --
  *
- *	This function returns the NSView for a given X drawable.
+ *	The function name TkMacOSXGetRootControl is being preserved only
+ *      because it exists in a stubs table.  Nobody knows what it means to
+ *      get a "RootControl".  The macro TkMacOSXDrawableView calls this
+ *      function and should always be used rather than directly using the
+ *      obscure official name of this function.
+ * 
+ *      It returns the NSView for a given X drawable in the case that the
+ *      drawable is a window.  If the drawable is a pixmap it returns nil.
  *
  * Results:
  *	A NSView* or nil.
-- 
cgit v0.12


From 08372874b1ad044db326a900d3270e9a6190347a Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Wed, 26 Aug 2020 20:34:43 +0000
Subject: We don't have to preserve cruft in trunk, so let's get rid of it.

---
 generic/tk.decls             | 26 +++------------
 generic/tkPlatDecls.h        | 77 +++++++++++---------------------------------
 generic/tkStubInit.c         | 22 ++++---------
 macosx/tkMacOSXColor.c       |  4 +--
 macosx/tkMacOSXDraw.c        |  2 +-
 macosx/tkMacOSXImage.c       |  2 +-
 macosx/tkMacOSXMenu.c        |  2 +-
 macosx/tkMacOSXPrivate.h     |  4 +--
 macosx/tkMacOSXScrlbr.c      |  2 +-
 macosx/tkMacOSXSubwindows.c  | 15 +++++----
 macosx/tkMacOSXWindowEvent.c |  2 +-
 11 files changed, 47 insertions(+), 111 deletions(-)

diff --git a/generic/tk.decls b/generic/tk.decls
index 502fda1..0892660 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -1109,40 +1109,24 @@ declare 0 aqua {
 	    Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc)
 }
 declare 1 aqua {
-    void Tk_MacOSXTurnOffMenus(void)
+    void Tk_MacOSXSetupTkNotifier(void)
 }
 declare 2 aqua {
-    void Tk_MacOSXTkOwnsCursor(int tkOwnsIt)
-}
-declare 3 aqua {
     void TkMacOSXInitMenus(Tcl_Interp *interp)
 }
-declare 4 aqua {
+declare 3 aqua {
     void TkMacOSXInitAppleEvents(Tcl_Interp *interp)
 }
-declare 5 aqua {
+declare 4 aqua {
     void TkGenWMConfigureEvent(Tk_Window tkwin, int x, int y, int width,
 	    int height, int flags)
 }
-declare 6 aqua {
+declare 5 aqua {
     void TkMacOSXInvalClipRgns(Tk_Window tkwin)
 }
-declare 7 aqua {
-    void *TkMacOSXGetDrawablePort(Drawable drawable)
-}
-declare 8 aqua {
-    void *TkMacOSXGetRootControl(Drawable drawable)
-}
-declare 9 aqua {
-    void Tk_MacOSXSetupTkNotifier(void)
-}
-declare 10 aqua {
+declare 6 aqua {
     int Tk_MacOSXIsAppInFront(void)
 }
-declare 16 aqua {
-    void TkGenWMConfigureEvent_(Tk_Window tkwin, int x, int y, int width,
-	    int height, int flags)
-}
 
 ##############################################################################
 
diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h
index fd48e87..a378fdb 100644
--- a/generic/tkPlatDecls.h
+++ b/generic/tkPlatDecls.h
@@ -62,34 +62,18 @@ EXTERN void		Tk_MacOSXSetEmbedHandler(
 				Tk_MacOSXEmbedGetClipProc *getClipProc,
 				Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc);
 /* 1 */
-EXTERN void		Tk_MacOSXTurnOffMenus(void);
+EXTERN void		Tk_MacOSXSetupTkNotifier(void);
 /* 2 */
-EXTERN void		Tk_MacOSXTkOwnsCursor(int tkOwnsIt);
-/* 3 */
 EXTERN void		TkMacOSXInitMenus(Tcl_Interp *interp);
-/* 4 */
+/* 3 */
 EXTERN void		TkMacOSXInitAppleEvents(Tcl_Interp *interp);
-/* 5 */
+/* 4 */
 EXTERN void		TkGenWMConfigureEvent(Tk_Window tkwin, int x, int y,
 				int width, int height, int flags);
-/* 6 */
+/* 5 */
 EXTERN void		TkMacOSXInvalClipRgns(Tk_Window tkwin);
-/* 7 */
-EXTERN void *		TkMacOSXGetDrawablePort(Drawable drawable);
-/* 8 */
-EXTERN void *		TkMacOSXGetRootControl(Drawable drawable);
-/* 9 */
-EXTERN void		Tk_MacOSXSetupTkNotifier(void);
-/* 10 */
+/* 6 */
 EXTERN int		Tk_MacOSXIsAppInFront(void);
-/* Slot 11 is reserved */
-/* Slot 12 is reserved */
-/* Slot 13 is reserved */
-/* Slot 14 is reserved */
-/* Slot 15 is reserved */
-/* 16 */
-EXTERN void		TkGenWMConfigureEvent_(Tk_Window tkwin, int x, int y,
-				int width, int height, int flags);
 #endif /* AQUA */
 
 typedef struct TkPlatStubs {
@@ -106,22 +90,12 @@ typedef struct TkPlatStubs {
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
     void (*tk_MacOSXSetEmbedHandler) (Tk_MacOSXEmbedRegisterWinProc *registerWinProcPtr, Tk_MacOSXEmbedGetGrafPortProc *getPortProcPtr, Tk_MacOSXEmbedMakeContainerExistProc *containerExistProcPtr, Tk_MacOSXEmbedGetClipProc *getClipProc, Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc); /* 0 */
-    void (*tk_MacOSXTurnOffMenus) (void); /* 1 */
-    void (*tk_MacOSXTkOwnsCursor) (int tkOwnsIt); /* 2 */
-    void (*tkMacOSXInitMenus) (Tcl_Interp *interp); /* 3 */
-    void (*tkMacOSXInitAppleEvents) (Tcl_Interp *interp); /* 4 */
-    void (*tkGenWMConfigureEvent) (Tk_Window tkwin, int x, int y, int width, int height, int flags); /* 5 */
-    void (*tkMacOSXInvalClipRgns) (Tk_Window tkwin); /* 6 */
-    void * (*tkMacOSXGetDrawablePort) (Drawable drawable); /* 7 */
-    void * (*tkMacOSXGetRootControl) (Drawable drawable); /* 8 */
-    void (*tk_MacOSXSetupTkNotifier) (void); /* 9 */
-    int (*tk_MacOSXIsAppInFront) (void); /* 10 */
-    void (*reserved11)(void);
-    void (*reserved12)(void);
-    void (*reserved13)(void);
-    void (*reserved14)(void);
-    void (*reserved15)(void);
-    void (*tkGenWMConfigureEvent_) (Tk_Window tkwin, int x, int y, int width, int height, int flags); /* 16 */
+    void (*tk_MacOSXSetupTkNotifier) (void); /* 1 */
+    void (*tkMacOSXInitMenus) (Tcl_Interp *interp); /* 2 */
+    void (*tkMacOSXInitAppleEvents) (Tcl_Interp *interp); /* 3 */
+    void (*tkGenWMConfigureEvent) (Tk_Window tkwin, int x, int y, int width, int height, int flags); /* 4 */
+    void (*tkMacOSXInvalClipRgns) (Tk_Window tkwin); /* 5 */
+    int (*tk_MacOSXIsAppInFront) (void); /* 6 */
 #endif /* AQUA */
 } TkPlatStubs;
 
@@ -154,33 +128,18 @@ extern const TkPlatStubs *tkPlatStubsPtr;
 #ifdef MAC_OSX_TK /* AQUA */
 #define Tk_MacOSXSetEmbedHandler \
 	(tkPlatStubsPtr->tk_MacOSXSetEmbedHandler) /* 0 */
-#define Tk_MacOSXTurnOffMenus \
-	(tkPlatStubsPtr->tk_MacOSXTurnOffMenus) /* 1 */
-#define Tk_MacOSXTkOwnsCursor \
-	(tkPlatStubsPtr->tk_MacOSXTkOwnsCursor) /* 2 */
+#define Tk_MacOSXSetupTkNotifier \
+	(tkPlatStubsPtr->tk_MacOSXSetupTkNotifier) /* 1 */
 #define TkMacOSXInitMenus \
-	(tkPlatStubsPtr->tkMacOSXInitMenus) /* 3 */
+	(tkPlatStubsPtr->tkMacOSXInitMenus) /* 2 */
 #define TkMacOSXInitAppleEvents \
-	(tkPlatStubsPtr->tkMacOSXInitAppleEvents) /* 4 */
+	(tkPlatStubsPtr->tkMacOSXInitAppleEvents) /* 3 */
 #define TkGenWMConfigureEvent \
-	(tkPlatStubsPtr->tkGenWMConfigureEvent) /* 5 */
+	(tkPlatStubsPtr->tkGenWMConfigureEvent) /* 4 */
 #define TkMacOSXInvalClipRgns \
-	(tkPlatStubsPtr->tkMacOSXInvalClipRgns) /* 6 */
-#define TkMacOSXGetDrawablePort \
-	(tkPlatStubsPtr->tkMacOSXGetDrawablePort) /* 7 */
-#define TkMacOSXGetRootControl \
-	(tkPlatStubsPtr->tkMacOSXGetRootControl) /* 8 */
-#define Tk_MacOSXSetupTkNotifier \
-	(tkPlatStubsPtr->tk_MacOSXSetupTkNotifier) /* 9 */
+	(tkPlatStubsPtr->tkMacOSXInvalClipRgns) /* 5 */
 #define Tk_MacOSXIsAppInFront \
-	(tkPlatStubsPtr->tk_MacOSXIsAppInFront) /* 10 */
-/* Slot 11 is reserved */
-/* Slot 12 is reserved */
-/* Slot 13 is reserved */
-/* Slot 14 is reserved */
-/* Slot 15 is reserved */
-#define TkGenWMConfigureEvent_ \
-	(tkPlatStubsPtr->tkGenWMConfigureEvent_) /* 16 */
+	(tkPlatStubsPtr->tk_MacOSXIsAppInFront) /* 6 */
 #endif /* AQUA */
 
 #endif /* defined(USE_TK_STUBS) */
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 40ee8bb..8f7dbe9 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -1030,22 +1030,12 @@ static const TkPlatStubs tkPlatStubs = {
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
     Tk_MacOSXSetEmbedHandler, /* 0 */
-    Tk_MacOSXTurnOffMenus, /* 1 */
-    Tk_MacOSXTkOwnsCursor, /* 2 */
-    TkMacOSXInitMenus, /* 3 */
-    TkMacOSXInitAppleEvents, /* 4 */
-    TkGenWMConfigureEvent, /* 5 */
-    TkMacOSXInvalClipRgns, /* 6 */
-    TkMacOSXGetDrawablePort, /* 7 */
-    TkMacOSXGetRootControl, /* 8 */
-    Tk_MacOSXSetupTkNotifier, /* 9 */
-    Tk_MacOSXIsAppInFront, /* 10 */
-    0, /* 11 */
-    0, /* 12 */
-    0, /* 13 */
-    0, /* 14 */
-    0, /* 15 */
-    TkGenWMConfigureEvent_, /* 16 */
+    Tk_MacOSXSetupTkNotifier, /* 1 */
+    TkMacOSXInitMenus, /* 2 */
+    TkMacOSXInitAppleEvents, /* 3 */
+    TkGenWMConfigureEvent, /* 4 */
+    TkMacOSXInvalClipRgns, /* 5 */
+    Tk_MacOSXIsAppInFront, /* 6 */
 #endif /* AQUA */
 };
 
diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index 2c78b8d..5d12bc1 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -411,7 +411,7 @@ TkMacOSXInDarkMode(Tk_Window tkwin)
 	NSAppearanceName name;
 	NSView *view = nil;
 	if (winPtr && winPtr->privatePtr) {
-	    view = TkMacOSXDrawableView(winPtr->privatePtr);
+	    view = TkMacOSXDrawableView((Drawable)(winPtr->privatePtr));
 	}
 	if (view) {
 	    name = [[view effectiveAppearance] name];
@@ -709,7 +709,7 @@ TkpGetColor(
     if (tkwin) {
 	display = Tk_Display(tkwin);
 	MacDrawable *macWin = (MacDrawable *) Tk_WindowId(tkwin);
-	view = TkMacOSXDrawableView(macWin);
+	view = TkMacOSXDrawableView((Drawable) macWin);
     }
 
     /*
diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index 06b8073..b6fc073 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -1117,7 +1117,7 @@ TkScrollWindow(
 {
     Drawable drawable = Tk_WindowId(tkwin);
     MacDrawable *macDraw = (MacDrawable *) drawable;
-    TKContentView *view = (TKContentView *) TkMacOSXDrawableView(macDraw);
+    TKContentView *view = (TKContentView *) TkMacOSXDrawableView(drawable);
     CGRect srcRect, dstRect;
     HIShapeRef dmgRgn = NULL, extraRgn = NULL;
     NSRect bounds, visRect, scrollSrc, scrollDst;
diff --git a/macosx/tkMacOSXImage.c b/macosx/tkMacOSXImage.c
index 3523f2f..893d2b4 100644
--- a/macosx/tkMacOSXImage.c
+++ b/macosx/tkMacOSXImage.c
@@ -531,7 +531,7 @@ CreateCGImageFromDrawableRect(
 	    result = CGImageCreateWithImageInRect(cg_image, image_rect);
 	    CGImageRelease(cg_image);
 	}
-    } else if (TkMacOSXDrawableView(mac_drawable) != NULL) {
+    } else if (TkMacOSXDrawableView(drawable) != NULL) {
 
 	/*
 	 * Convert Tk top-left to NSView bottom-left coordinates.
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c
index 598793d..0817bf9 100644
--- a/macosx/tkMacOSXMenu.c
+++ b/macosx/tkMacOSXMenu.c
@@ -894,7 +894,7 @@ TkpPostMenu(
 	 * rather than the appearance of the root window.
 	 */
 	realWinPtr = (TkWindow*) realWin;
-	realWinView = TkMacOSXDrawableView(realWinPtr->privatePtr);
+	realWinView = TkMacOSXDrawableView((Drawable)(realWinPtr->privatePtr));
 	if (realWinView != nil) {
 	    break;
 	}
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h
index de95ca7..5c02c86 100644
--- a/macosx/tkMacOSXPrivate.h
+++ b/macosx/tkMacOSXPrivate.h
@@ -272,12 +272,12 @@ MODULE_SCOPE int	TkMacOSXMakeFullscreen(TkWindow *winPtr,
 MODULE_SCOPE void	TkMacOSXEnterExitFullscreen(TkWindow *winPtr,
 			    int active);
 MODULE_SCOPE NSWindow*	TkMacOSXDrawableWindow(Drawable drawable);
-#define TkMacOSXDrawableView(macWin) (NSView *)TkMacOSXGetRootControl((Drawable)(macWin))
+MODULE_SCOPE NSView*    TkMacOSXDrawableView(Drawable drawable);
+MODULE_SCOPE CGContextRef TkMacOSXGetCGContextForDrawable(Drawable drawable);
 MODULE_SCOPE void	TkMacOSXWinCGBounds(TkWindow *winPtr, CGRect *bounds);
 MODULE_SCOPE HIShapeRef	TkMacOSXGetClipRgn(Drawable drawable);
 MODULE_SCOPE void	TkMacOSXInvalidateViewRegion(NSView *view,
 			    HIShapeRef rgn);
-MODULE_SCOPE CGContextRef TkMacOSXGetCGContextForDrawable(Drawable drawable);
 MODULE_SCOPE NSImage*	TkMacOSXGetNSImageFromTkImage(Display *display,
 			    Tk_Image image, int width, int height);
 MODULE_SCOPE NSImage*	TkMacOSXGetNSImageFromBitmap(Display *display,
diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c
index 06e0402..a5d164f 100644
--- a/macosx/tkMacOSXScrlbr.c
+++ b/macosx/tkMacOSXScrlbr.c
@@ -595,7 +595,7 @@ UpdateControlValues(
     HIRect contrlRect;
     short width, height;
 
-    NSView *view = TkMacOSXDrawableView(macWin);
+    NSView *view = TkMacOSXDrawableView((Drawable) macWin);
     CGFloat viewHeight = [view bounds].size.height;
     NSRect frame;
 
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index bbdb9a5..07ae42a 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -714,7 +714,7 @@ XConfigureWindow(
      */
 
     if (value_mask & CWStackMode) {
-	NSView *view = TkMacOSXDrawableView(macWin);
+	NSView *view = TkMacOSXDrawableView(w);
 
 	if (view) {
 	    TkMacOSXInvalClipRgns((Tk_Window) winPtr->parentPtr);
@@ -1062,7 +1062,8 @@ TkMacOSXInvalidateWindow(
  *
  * TkMacOSXDrawableWindow --
  *
- *	This function returns the NSWindow for a given X drawable.
+ *	This function returns the NSWindow for a given X drawable, if the
+ *      drawable is a window.  If the drawable is a pixmap it returns nil.
  *
  * Results:
  *	A NSWindow, or nil for off screen pixmaps.
@@ -1134,7 +1135,9 @@ TkMacOSXGetDrawablePort(
  *
  * TkMacOSXDrawableView --
  *
- *	This function returns the NSView for a given X drawable.
+ *	This function returns the NSView for a given X drawable in the
+ *      case that the drawable is a window.  If the drawable is a pixmap
+ *      it returns nil.
  *
  * Results:
  *	A NSView* or nil.
@@ -1145,8 +1148,8 @@ TkMacOSXGetDrawablePort(
  *----------------------------------------------------------------------
  */
 
-void *
-TkMacOSXGetRootControl(
+NSView *
+TkMacOSXDrawableView(
     Drawable drawable)
 {
     void *result = NULL;
@@ -1162,7 +1165,7 @@ TkMacOSXGetRootControl(
 	TkWindow *contWinPtr = TkpGetOtherWindow(macWin->toplevel->winPtr);
 
 	if (contWinPtr) {
-	    result = TkMacOSXGetRootControl((Drawable)contWinPtr->privatePtr);
+	    result = TkMacOSXDrawableView((Drawable)contWinPtr->privatePtr);
 	}
     }
     return result;
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index aa3fa6b..87678c0 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -427,7 +427,7 @@ TkpWillDrawWidget(Tk_Window tkwin) {
     if (tkwin) {
 	TkWindow *winPtr = (TkWindow *)tkwin;
 	TKContentView *view = (TKContentView *) TkMacOSXDrawableView(
-						    winPtr->privatePtr);
+	    (Drawable)winPtr->privatePtr);
 	result = ([NSApp isDrawing] && view == [NSView focusView]);
 #if 0
 	printf("TkpWillDrawWidget: %s %d  %d \n", Tk_PathName(tkwin),
-- 
cgit v0.12


From 65e5e8caee2f25cf407f0ca73751bd1118f84d02 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 27 Aug 2020 06:15:45 +0000
Subject: Eliminate type casts to (TKContentView *)

---
 macosx/tkMacOSXDraw.c        | 4 ++--
 macosx/tkMacOSXPrivate.h     | 2 +-
 macosx/tkMacOSXSubwindows.c  | 6 +++---
 macosx/tkMacOSXWindowEvent.c | 3 +--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index 8e096bc..57680a9 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -1140,7 +1140,7 @@ TkScrollWindow(
 {
     Drawable drawable = Tk_WindowId(tkwin);
     MacDrawable *macDraw = (MacDrawable *) drawable;
-    TKContentView *view = (TKContentView *) TkMacOSXDrawableView(macDraw);
+    TKContentView *view = TkMacOSXDrawableView(macDraw);
     CGRect srcRect, dstRect;
     HIShapeRef dmgRgn = NULL, extraRgn = NULL;
     NSRect bounds, visRect, scrollSrc, scrollDst;
@@ -1271,7 +1271,7 @@ TkMacOSXSetupDrawingContext(
      */
 
     if (!(macDraw->flags & TK_IS_PIXMAP)) {
-	view = (TKContentView *) TkMacOSXDrawableView(macDraw);
+	view = TkMacOSXDrawableView(macDraw);
 	if (!view) {
 	    Tcl_Panic("TkMacOSXSetupDrawingContext(): "
 		    "no NSView to draw into !");
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h
index c632986..e62456c 100644
--- a/macosx/tkMacOSXPrivate.h
+++ b/macosx/tkMacOSXPrivate.h
@@ -271,7 +271,7 @@ MODULE_SCOPE int	TkMacOSXMakeFullscreen(TkWindow *winPtr,
 MODULE_SCOPE void	TkMacOSXEnterExitFullscreen(TkWindow *winPtr,
 			    int active);
 MODULE_SCOPE NSWindow*	TkMacOSXDrawableWindow(Drawable drawable);
-#define TkMacOSXDrawableView(macWin) (NSView *)TkMacOSXGetRootControl((Drawable)(macWin))
+#define TkMacOSXDrawableView(macWin) (TKContentView *)TkMacOSXGetRootControl((Drawable)(macWin))
 MODULE_SCOPE void	TkMacOSXWinCGBounds(TkWindow *winPtr, CGRect *bounds);
 MODULE_SCOPE HIShapeRef	TkMacOSXGetClipRgn(Drawable drawable);
 MODULE_SCOPE void	TkMacOSXInvalidateViewRegion(NSView *view,
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index 811608f..baea821 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -1142,15 +1142,15 @@ TkMacOSXGetDrawablePort(
 /*
  *----------------------------------------------------------------------
  *
- * TkMacOSXDrawableView --
+ * TkMacOSXDrawableView/TkMacOSXGetRootControl --
  *
  *	The function name TkMacOSXGetRootControl is being preserved only
  *      because it exists in a stubs table.  Nobody knows what it means to
  *      get a "RootControl".  The macro TkMacOSXDrawableView calls this
  *      function and should always be used rather than directly using the
  *      obscure official name of this function.
- * 
- *      It returns the NSView for a given X drawable in the case that the
+ *
+ *      It returns the TkContentView for a given X drawable in the case that the
  *      drawable is a window.  If the drawable is a pixmap it returns nil.
  *
  * Results:
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 7437891..7bece7c 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -414,8 +414,7 @@ TkpWillDrawWidget(Tk_Window tkwin) {
     int result;
     if (tkwin) {
 	TkWindow *winPtr = (TkWindow *)tkwin;
-	TKContentView *view = (TKContentView *) TkMacOSXDrawableView(
-						    winPtr->privatePtr);
+	TKContentView *view = TkMacOSXDrawableView(winPtr->privatePtr);
 	result = ([NSApp isDrawing] && view == [NSView focusView]);
 #if 0
 	printf("TkpWillDrawWidget: %s %d  %d \n", Tk_PathName(tkwin),
-- 
cgit v0.12


From ad908843c78dcba5e13e8c616a6d795619b6fe60 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 27 Aug 2020 07:09:54 +0000
Subject: TkContentView -> TKContentView (twice)

---
 macosx/tkMacOSXSubwindows.c  | 2 +-
 macosx/tkMacOSXWindowEvent.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index baea821..a7e8372 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -1150,7 +1150,7 @@ TkMacOSXGetDrawablePort(
  *      function and should always be used rather than directly using the
  *      obscure official name of this function.
  *
- *      It returns the TkContentView for a given X drawable in the case that the
+ *      It returns the TKContentView for a given X drawable in the case that the
  *      drawable is a window.  If the drawable is a pixmap it returns nil.
  *
  * Results:
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 7bece7c..8d432f8 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -1214,7 +1214,7 @@ static const char *const accentNames[] = {
 
 /*
  * When the services menu is opened this is called for each Responder in
- * the Responder chain until a service provider is found.  The TkContentView
+ * the Responder chain until a service provider is found.  The TKContentView
  * should be the first (and generally only) Responder in the chain.  We
  * return the TkServices object that was created in TkpInit.
  */
-- 
cgit v0.12


From c9ab6b090e48fa0dc6e18194dc636fdd47de179b Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 27 Aug 2020 10:24:45 +0000
Subject: Some internal master -> container renamings, nothing related to API

---
 macosx/tkMacOSXWm.c     | 160 ++++++++++++++++++++++++------------------------
 macosx/tkMacOSXWm.h     |   7 ++-
 macosx/tkMacOSXXStubs.c |   2 +-
 macosx/ttkMacOSXTheme.c |  24 ++++----
 4 files changed, 97 insertions(+), 96 deletions(-)

diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index aebf82c..1dc79e4 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -320,7 +320,7 @@ static int		WmWinAppearance(Tcl_Interp *interp, TkWindow *winPtr,
 static void		ApplyWindowAttributeFlagChanges(TkWindow *winPtr,
 			    NSWindow *macWindow, UInt64 oldAttributes,
 			    int oldFlags, int create, int initial);
-static void		ApplyMasterOverrideChanges(TkWindow *winPtr,
+static void		ApplyContainerOverrideChanges(TkWindow *winPtr,
 			    NSWindow *macWindow);
 static void		GetMinSize(TkWindow *winPtr, int *minWidthPtr,
 			    int *minHeightPtr);
@@ -892,7 +892,7 @@ TkWmDeadWindow(
     }
 
     /*
-     *If the dead window is a transient, remove it from the master's list.
+     *If the dead window is a transient, remove it from the container's list.
      */
 
     RemoveTransient(winPtr);
@@ -912,11 +912,11 @@ TkWmDeadWindow(
 	ckfree(wmPtr->leaderName);
     }
     if (wmPtr->icon != NULL) {
-	wmPtr2 = ((TkWindow *) wmPtr->icon)->wmInfoPtr;
+	wmPtr2 = ((TkWindow *)wmPtr->icon)->wmInfoPtr;
 	wmPtr2->iconFor = NULL;
     }
     if (wmPtr->iconFor != NULL) {
-	wmPtr2 = ((TkWindow *) wmPtr->iconFor)->wmInfoPtr;
+	wmPtr2 = ((TkWindow *)wmPtr->iconFor)->wmInfoPtr;
 	wmPtr2->icon = NULL;
 	wmPtr2->hints.flags &= ~IconWindowHint;
     }
@@ -943,9 +943,9 @@ TkWmDeadWindow(
     for (Transient *transientPtr = wmPtr->transientPtr;
 	    transientPtr != NULL; transientPtr = transientPtr->nextPtr) {
     	TkWindow *winPtr2 = transientPtr->winPtr;
-    	TkWindow *masterPtr = (TkWindow *) TkGetTransientMaster(winPtr2);
+    	TkWindow *containerPtr = (TkWindow *)TkGetTransientMaster(winPtr2);
 
-    	if (masterPtr == winPtr) {
+    	if (containerPtr == winPtr) {
     	    wmPtr2 = winPtr2->wmInfoPtr;
     	    wmPtr2->master = NULL;
     	}
@@ -1831,20 +1831,20 @@ WmDeiconifyCmd(
 
     /*
      * If this window has a transient, the transient must also be deiconified if
-     * it was withdrawn by the master.
+     * it was withdrawn by the container.
      */
 
     for (Transient *transientPtr = wmPtr->transientPtr;
 	    transientPtr != NULL; transientPtr = transientPtr->nextPtr) {
 	TkWindow *winPtr2 = transientPtr->winPtr;
 	WmInfo *wmPtr2 = winPtr2->wmInfoPtr;
-	TkWindow *masterPtr = (TkWindow *) TkGetTransientMaster(winPtr2);
+	TkWindow *containerPtr = (TkWindow *)TkGetTransientMaster(winPtr2);
 
-    	if (masterPtr == winPtr) {
+    	if (containerPtr == winPtr) {
 	    if ((wmPtr2->hints.initial_state == WithdrawnState) &&
-		    ((transientPtr->flags & WITHDRAWN_BY_MASTER) != 0)) {
+		    ((transientPtr->flags & WITHDRAWN_BY_CONTAINER) != 0)) {
 		TkpWmSetState(winPtr2, NormalState);
-		transientPtr->flags &= ~WITHDRAWN_BY_MASTER;
+		transientPtr->flags &= ~WITHDRAWN_BY_CONTAINER;
 	    }
 	}
     }
@@ -2376,17 +2376,17 @@ WmIconifyCmd(
 
     /*
      * If this window has a transient the transient must be withdrawn when
-     * the master is iconified.
+     * the container is iconified.
      */
 
     for (Transient *transientPtr = wmPtr->transientPtr;
 	    transientPtr != NULL; transientPtr = transientPtr->nextPtr) {
 	TkWindow *winPtr2 = transientPtr->winPtr;
-	TkWindow *masterPtr = (TkWindow *) TkGetTransientMaster(winPtr2);
-    	if (masterPtr == winPtr &&
+	TkWindow *containerPtr = (TkWindow *)TkGetTransientMaster(winPtr2);
+    	if (containerPtr == winPtr &&
 		winPtr2->wmInfoPtr->hints.initial_state != WithdrawnState) {
 	    TkpWmSetState(winPtr2, WithdrawnState);
-	    transientPtr->flags |= WITHDRAWN_BY_MASTER;
+	    transientPtr->flags |= WITHDRAWN_BY_CONTAINER;
 	}
     }
 
@@ -2697,7 +2697,7 @@ WmIconwindowCmd(
     if (*Tcl_GetString(objv[3]) == '\0') {
 	wmPtr->hints.flags &= ~IconWindowHint;
 	if (wmPtr->icon != NULL) {
-	    wmPtr2 = ((TkWindow *) wmPtr->icon)->wmInfoPtr;
+	    wmPtr2 = ((TkWindow *)wmPtr->icon)->wmInfoPtr;
 	    wmPtr2->iconFor = NULL;
 	    wmPtr2->hints.initial_state = WithdrawnState;
 	}
@@ -2714,7 +2714,7 @@ WmIconwindowCmd(
 		    NULL);
 	    return TCL_ERROR;
 	}
-	wmPtr2 = ((TkWindow *) tkwin2)->wmInfoPtr;
+	wmPtr2 = ((TkWindow *)tkwin2)->wmInfoPtr;
 	if (wmPtr2->iconFor != NULL) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "%s is already an icon for %s",
@@ -2973,7 +2973,7 @@ WmOverrideredirectCmd(
     }
     atts.override_redirect = flag ? True : False;
     Tk_ChangeWindowAttributes((Tk_Window) winPtr, CWOverrideRedirect, &atts);
-    ApplyMasterOverrideChanges(winPtr, win);
+    ApplyContainerOverrideChanges(winPtr, win);
     return TCL_OK;
 }
 
@@ -3607,8 +3607,8 @@ WmTransientCmd(
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     WmInfo *wmPtr = winPtr->wmInfoPtr;
-    Tk_Window master;
-    TkWindow *masterPtr, *w;
+    Tk_Window container;
+    TkWindow *containerPtr, *w;
     WmInfo *wmPtr2;
     Transient *transient;
 
@@ -3626,18 +3626,18 @@ WmTransientCmd(
     if (*Tcl_GetString(objv[3]) == '\0') {
 	RemoveTransient(winPtr);
     } else {
-	if (TkGetWindowFromObj(interp, tkwin, objv[3], &master) != TCL_OK) {
+	if (TkGetWindowFromObj(interp, tkwin, objv[3], &container) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	masterPtr = (TkWindow*) master;
-	while (!Tk_TopWinHierarchy(masterPtr)) {
+	containerPtr = (TkWindow*) container;
+	while (!Tk_TopWinHierarchy(containerPtr)) {
             /*
-             * Ensure that the master window is actually a Tk toplevel.
+             * Ensure that the container window is actually a Tk toplevel.
              */
 
-            masterPtr = masterPtr->parentPtr;
+            containerPtr = containerPtr->parentPtr;
         }
-	Tk_MakeWindowExist((Tk_Window)masterPtr);
+	Tk_MakeWindowExist((Tk_Window)containerPtr);
 
 	if (wmPtr->iconFor != NULL) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
@@ -3647,7 +3647,7 @@ WmTransientCmd(
 	    return TCL_ERROR;
 	}
 
-	wmPtr2 = masterPtr->wmInfoPtr;
+	wmPtr2 = containerPtr->wmInfoPtr;
 
 	/*
 	 * Under some circumstances, wmPtr2 is NULL here.
@@ -3661,19 +3661,19 @@ WmTransientCmd(
 	    return TCL_ERROR;
 	}
 
-	for (w = masterPtr; w != NULL && w->wmInfoPtr != NULL;
+	for (w = containerPtr; w != NULL && w->wmInfoPtr != NULL;
 		w = (TkWindow *)w->wmInfoPtr->master) {
 	    if (w == winPtr) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "setting \"%s\" as master creates a transient/master cycle",
-		    Tk_PathName(masterPtr)));
+		    Tk_PathName(containerPtr)));
 		Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "SELF", NULL);
 		return TCL_ERROR;
 	    }
 	}
 
 	/*
-	 * Add the transient to the master's list, if it not already there.
+	 * Add the transient to the container's list, if it not already there.
 	 */
 
 	for (transient = wmPtr2->transientPtr;
@@ -3688,19 +3688,19 @@ WmTransientCmd(
 	}
 
 	/*
-	 * If the master is withdrawn or iconic then withdraw the transient.
+	 * If the container is withdrawn or iconic then withdraw the transient.
 	 */
 
 	if ((wmPtr2->hints.initial_state == WithdrawnState ||
 		wmPtr2->hints.initial_state == IconicState) &&
 		wmPtr->hints.initial_state != WithdrawnState) {
 	    TkpWmSetState(winPtr, WithdrawnState);
-	    transient->flags |= WITHDRAWN_BY_MASTER;
+	    transient->flags |= WITHDRAWN_BY_CONTAINER;
 	}
 
-	wmPtr->master = (Tk_Window) masterPtr;
+	wmPtr->master = (Tk_Window) containerPtr;
     }
-    ApplyMasterOverrideChanges(winPtr, NULL);
+    ApplyContainerOverrideChanges(winPtr, NULL);
     return TCL_OK;
 }
 
@@ -3709,15 +3709,15 @@ WmTransientCmd(
  *
  * RemoveTransient --
  *
- *      Clears the transient's master record and removes the transient from the
- *      master's list.
+ *      Clears the transient's container record and removes the transient from the
+ *      container's list.
  *
  * Results:
  *	None
  *
  * Side effects:
- *      References to a master are removed from the transient's wmInfo
- *	structure and references to the transient are removed from its master's
+ *      References to a container are removed from the transient's wmInfo
+ *	structure and references to the transient are removed from its container's
  *	wmInfo.
  *
  *----------------------------------------------------------------------
@@ -3728,18 +3728,18 @@ RemoveTransient(
     TkWindow *winPtr)
 {
     WmInfo *wmPtr = winPtr->wmInfoPtr, *wmPtr2;
-    TkWindow *masterPtr;
+    TkWindow *containerPtr;
     Transient *transPtr, *temp;
 
     if (wmPtr == NULL || wmPtr->master == NULL) {
 	return;
     }
-    masterPtr = (TkWindow *)wmPtr->master;
-    wmPtr2 = masterPtr->wmInfoPtr;
+    containerPtr = (TkWindow *)wmPtr->master;
+    wmPtr2 = containerPtr->wmInfoPtr;
     if (wmPtr2 == NULL) {
 	return;
     }
-    wmPtr->master = NULL;
+    wmPtr->master= NULL;
     transPtr = wmPtr2->transientPtr;
     while (transPtr != NULL) {
 	if (transPtr->winPtr != winPtr) {
@@ -3810,12 +3810,12 @@ WmWithdrawCmd(
     for (Transient *transientPtr = wmPtr->transientPtr;
 	    transientPtr != NULL; transientPtr = transientPtr->nextPtr) {
 	TkWindow *winPtr2 = transientPtr->winPtr;
-	TkWindow *masterPtr = (TkWindow *) TkGetTransientMaster(winPtr2);
+	TkWindow *containerPtr = (TkWindow *)TkGetTransientMaster(winPtr2);
 
-    	if (masterPtr == winPtr &&
+    	if (containerPtr == winPtr &&
 		winPtr2->wmInfoPtr->hints.initial_state != WithdrawnState) {
 	    TkpWmSetState(winPtr2, WithdrawnState);
-	    transientPtr->flags |= WITHDRAWN_BY_MASTER;
+	    transientPtr->flags |= WITHDRAWN_BY_CONTAINER;
 	}
     }
 
@@ -3872,7 +3872,7 @@ Tk_SetGrid(
     int widthInc, int heightInc)/* Pixel increments corresponding to a change
 				 * of one grid unit. */
 {
-    TkWindow *winPtr = (TkWindow *) tkwin;
+    TkWindow *winPtr = (TkWindow *)tkwin;
     WmInfo *wmPtr;
 
     /*
@@ -3966,7 +3966,7 @@ Tk_UnsetGrid(
     Tk_Window tkwin)		/* Token for window that is currently
 				 * controlling gridding. */
 {
-    TkWindow *winPtr = (TkWindow *) tkwin;
+    TkWindow *winPtr = (TkWindow *)tkwin;
     WmInfo *wmPtr;
 
     /*
@@ -4073,7 +4073,7 @@ TopLevelReqProc(
     TCL_UNUSED(void *),		/* Not used. */
     Tk_Window tkwin)		/* Information about window. */
 {
-    TkWindow *winPtr = (TkWindow *) tkwin;
+    TkWindow *winPtr = (TkWindow *)tkwin;
     WmInfo *wmPtr;
 
     wmPtr = winPtr->wmInfoPtr;
@@ -4506,7 +4506,7 @@ Tk_GetRootCoords(
     int *yPtr)			/* Where to store y-displacement of (0,0). */
 {
     int x, y;
-    TkWindow *winPtr = (TkWindow *) tkwin;
+    TkWindow *winPtr = (TkWindow *)tkwin;
 
     /*
      * Search back through this window's parents all the way to a top-level
@@ -4533,11 +4533,11 @@ Tk_GetRootCoords(
 
 		    /*
 		     * We do not require that the changes.x & changes.y for a
-		     * non-Tk master window be kept up to date. So we first
-		     * subtract off the possibly bogus values that have been
-		     * added on at the top of this pass through the loop, and
-		     * then call out to the getOffsetProc to give us the
-		     * correct offset.
+		     * non-Tk container window be kept up to date. So we
+		     * first subtract off the possibly bogus values that have
+		     * been added on at the top of this pass through the
+		     * loop, and then call out to the getOffsetProc to give
+		     * us the correct offset.
 		     */
 
 		    x -= winPtr->changes.x + winPtr->changes.border_width;
@@ -4670,7 +4670,7 @@ Tk_CoordsToWindow(
 	}
 	winPtr = nextPtr;
     }
-    if (winPtr->mainPtr != ((TkWindow *) tkwin)->mainPtr) {
+    if (winPtr->mainPtr != ((TkWindow *)tkwin)->mainPtr) {
 	return NULL;
     }
     return (Tk_Window) winPtr;
@@ -4713,7 +4713,7 @@ Tk_TopCoordsToWindow(
     int x, y;			/* Coordinates in winPtr. */
     Window *children;		/* Children of winPtr, or NULL. */
 
-    winPtr = (TkWindow *) tkwin;
+    winPtr = (TkWindow *)tkwin;
     x = rootX;
     y = rootY;
     while (1) {
@@ -4867,7 +4867,7 @@ Tk_GetVRootGeometry(
     int *heightPtr)
 {
     WmInfo *wmPtr;
-    TkWindow *winPtr = (TkWindow *) tkwin;
+    TkWindow *winPtr = (TkWindow *)tkwin;
 
     /*
      * Find the top-level window for tkwin, and locate the window manager
@@ -4918,7 +4918,7 @@ Tk_MoveToplevelWindow(
     Tk_Window tkwin,		/* Window to move. */
     int x, int y)		/* New location for window (within parent). */
 {
-    TkWindow *winPtr = (TkWindow *) tkwin;
+    TkWindow *winPtr = (TkWindow *)tkwin;
     WmInfo *wmPtr = winPtr->wmInfoPtr;
 
     if (!(winPtr->flags & TK_TOP_LEVEL)) {
@@ -5356,10 +5356,10 @@ TkSetWMName(
  * TkGetTransientMaster --
  *
  *	If the passed window has the TRANSIENT_FOR property set this will
- *	return the master window. Otherwise it will return None.
+ *	return the container window. Otherwise it will return None.
  *
  * Results:
- *	The master window or None.
+ *	The container window or None.
  *
  * Side effects:
  *	None.
@@ -6005,7 +6005,7 @@ TkpMakeMenuWindow(
 				 * is always visible, e.g. as a floating
 				 * menu. */
 {
-    TkWindow *winPtr = (TkWindow *) tkwin;
+    TkWindow *winPtr = (TkWindow *)tkwin;
 
     if (transient) {
 	winPtr->wmInfoPtr->macClass = kSimpleWindowClass;
@@ -6159,7 +6159,7 @@ TkMacOSXMakeRealWindowExist(
 
     	atts.override_redirect = True;
     	Tk_ChangeWindowAttributes((Tk_Window) winPtr, CWOverrideRedirect, &atts);
-    	ApplyMasterOverrideChanges(winPtr, NULL);
+    	ApplyContainerOverrideChanges(winPtr, NULL);
     }
 }
 
@@ -6183,7 +6183,7 @@ TkMacOSXMakeRealWindowExist(
 
 void
 TkpRedrawWidget(Tk_Window tkwin) {
-    TkWindow *winPtr = (TkWindow *) tkwin;
+    TkWindow *winPtr = (TkWindow *)tkwin;
     NSWindow *w;
     Rect tkBounds;
     NSRect bounds;
@@ -6734,7 +6734,7 @@ TkMacOSXApplyWindowAttributes(
 
     ApplyWindowAttributeFlagChanges(winPtr, macWindow, 0, 0, 0, 1);
     if (wmPtr->master != NULL || winPtr->atts.override_redirect) {
-	ApplyMasterOverrideChanges(winPtr, macWindow);
+	ApplyContainerOverrideChanges(winPtr, macWindow);
     }
 }
 
@@ -6927,9 +6927,9 @@ ApplyWindowAttributeFlagChanges(
 /*
  *----------------------------------------------------------------------
  *
- * ApplyMasterOverrideChanges --
+ * ApplyContainerOverrideChanges --
  *
- *	This procedure applies changes to override_redirect or master.
+ *	This procedure applies changes to override_redirect or container.
  *
  * Results:
  *	None.
@@ -6941,7 +6941,7 @@ ApplyWindowAttributeFlagChanges(
  */
 
 static void
-ApplyMasterOverrideChanges(
+ApplyContainerOverrideChanges(
     TkWindow *winPtr,
     NSWindow *macWindow)
 {
@@ -7026,23 +7026,23 @@ ApplyMasterOverrideChanges(
 	    wmPtr->flags &= ~WM_TOPMOST;
 	}
 	if (wmPtr->master != None) {
-	    TkWindow *masterWinPtr = (TkWindow *) wmPtr->master;
+	    TkWindow *containerWinPtr = (TkWindow *)wmPtr->master;
 
-	    if (masterWinPtr && (masterWinPtr->window != None)
-		    && TkMacOSXHostToplevelExists(masterWinPtr)) {
-		NSWindow *masterMacWin = TkMacOSXDrawableWindow(
-			masterWinPtr->window);
+	    if (containerWinPtr && (containerWinPtr->window != None)
+		    && TkMacOSXHostToplevelExists(containerWinPtr)) {
+		NSWindow *containerMacWin = TkMacOSXDrawableWindow(
+			containerWinPtr->window);
 
 		/*
 		 * Try to add the transient window as a child window of the
-		 * master. A child NSWindow retains its relative position with
-		 * respect to the parent when the parent is moved.  This is
-		 * pointless if the parent is offscreen, and adding a child to
-		 * an offscreen window causes the parent to be displayed as a
-		 * zombie.  So we only do this if the parent is visible.
+		 * container. A child NSWindow retains its relative position
+		 * with respect to the parent when the parent is moved.  This
+		 * is pointless if the parent is offscreen, and adding a child
+		 * to an offscreen window causes the parent to be displayed as
+		 * a zombie.  So we only do this if the parent is visible.
 		 */
 
-		if (masterMacWin && [masterMacWin isVisible]
+		if (containerMacWin && [containerMacWin isVisible]
 			&& (winPtr->flags & TK_MAPPED)) {
 		    /*
 		     * If the transient is already a child of some other window,
@@ -7050,11 +7050,11 @@ ApplyMasterOverrideChanges(
 		     */
 
 		    parentWindow = [macWindow parentWindow];
-		    if (parentWindow && parentWindow != masterMacWin) {
+		    if (parentWindow && parentWindow != containerMacWin) {
 			[parentWindow removeChildWindow:macWindow];
 		    }
 
-		    [masterMacWin addChildWindow:macWindow
+		    [containerMacWin addChildWindow:macWindow
 					 ordered:NSWindowAbove];
 		}
 	    }
diff --git a/macosx/tkMacOSXWm.h b/macosx/tkMacOSXWm.h
index 20bbb6d..6696b05 100644
--- a/macosx/tkMacOSXWm.h
+++ b/macosx/tkMacOSXWm.h
@@ -37,7 +37,7 @@ typedef struct ProtocolHandler {
 } ProtocolHandler;
 
 /* The following data structure is used in the TkWmInfo to maintain a list of all of the
- * transient windows belonging to a given master.
+ * transient windows belonging to a given container.
  */
 
 typedef struct Transient {
@@ -46,6 +46,7 @@ typedef struct Transient {
     struct Transient *nextPtr;
 } Transient;
 
+#define WITHDRAWN_BY_CONTAINER 0x1
 #define WITHDRAWN_BY_MASTER 0x1
 
 /*
@@ -65,8 +66,8 @@ typedef struct TkWmInfo {
     Tk_Uid titleUid;		/* Title to display in window caption. If NULL,
 				 * use name of widget. */
     char *iconName;		/* Name to display in icon. */
-    Tk_Window master;		/* Master window for TRANSIENT_FOR property, or
-				 * None. */
+    Tk_Window master;		/* Container window for TRANSIENT_FOR property,
+				 * or None. */
     XWMHints hints;		/* Various pieces of information for window
 				 * manager. */
     char *leaderName;		/* Path name of leader of window group
diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c
index e685e9f..ccb3991 100644
--- a/macosx/tkMacOSXXStubs.c
+++ b/macosx/tkMacOSXXStubs.c
@@ -1005,7 +1005,7 @@ Tk_GetUserInactiveTime(
     uint64_t time;
     IOReturn result;
 
-    regEntry = IOServiceGetMatchingService(kIOMasterPortDefault,
+    regEntry = IOServiceGetMatchingService(0,
 	    IOServiceMatching("IOHIDSystem"));
 
     if (regEntry == 0) {
diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c
index 0259a55..37d3631 100644
--- a/macosx/ttkMacOSXTheme.c
+++ b/macosx/ttkMacOSXTheme.c
@@ -242,11 +242,11 @@ static CGFloat blackRGBA[4] = {0.0, 0.0, 0.0, 1.0};
  * GetBackgroundColor --
  *
  *      Fills the array rgba with the color coordinates for a background color.
- *      Start with the background color of a window's geometry master, or the
- *      standard ttk window background if there is no master. If the contrast
- *      parameter is nonzero, modify this color to be darker, for the aqua
- *      appearance, or lighter for the DarkAqua appearance.  This is primarily
- *      used by the Fill and Background elements.
+ *      Start with the background color of a window's geometry container, or
+ *      the standard ttk window background if there is no container. If the
+ *      contrast parameter is nonzero, modify this color to be darker, for the
+ *      aqua appearance, or lighter for the DarkAqua appearance.  This is
+ *      primarily used by the Fill and Background elements.
  */
 
 static void GetBackgroundColor(
@@ -255,18 +255,18 @@ static void GetBackgroundColor(
     int contrast,
     CGFloat *rgba)
 {
-    TkWindow *winPtr = (TkWindow *) tkwin;
-    TkWindow *masterPtr = (TkWindow *) TkGetGeomMaster(tkwin);
+    TkWindow *winPtr = (TkWindow *)tkwin;
+    TkWindow *containerPtr = (TkWindow *)TkGetGeomMaster(tkwin);
 
-    while (masterPtr && masterPtr->privatePtr) {
-	if (masterPtr->privatePtr->flags & TTK_HAS_CONTRASTING_BG) {
+    while (containerPtr && containerPtr->privatePtr) {
+	if (containerPtr->privatePtr->flags & TTK_HAS_CONTRASTING_BG) {
 	    break;
 	}
-	masterPtr = (TkWindow *) TkGetGeomMaster(masterPtr);
+	containerPtr = (TkWindow *)TkGetGeomMaster(containerPtr);
     }
-    if (masterPtr && masterPtr->privatePtr) {
+    if (containerPtr && containerPtr->privatePtr) {
 	for (int i = 0; i < 4; i++) {
-	    rgba[i] = masterPtr->privatePtr->fillRGBA[i];
+	    rgba[i] = containerPtr->privatePtr->fillRGBA[i];
 	}
     } else {
 	if ([NSApp macOSVersion] > 101300) {
-- 
cgit v0.12


From bff3daa8de787590d7b7e2f549f2491716963cc4 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Thu, 27 Aug 2020 14:15:43 +0000
Subject: Attempt to maintain binary compatibility with 8.6 without having to
 live with awful names.

---
 generic/tk.decls | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/generic/tk.decls b/generic/tk.decls
index 545a3b9..ee8378b 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -1099,7 +1099,9 @@ declare 5 win {
 
 ################################
 # Aqua specific functions
-
+declare 3 aqua {
+    void TkMacOSXInitMenus(Tcl_Interp *interp)
+}
 declare 4 aqua {
     void TkMacOSXInitAppleEvents(Tcl_Interp *interp)
 }
@@ -1110,6 +1112,16 @@ declare 5 aqua {
 declare 6 aqua {
     void TkMacOSXInvalClipRgns(Tk_Window tkwin)
 }
+declare 7 aqua {
+    # Formerly named TkMacOSXGetDrawablePort. For a long time it just returned NULL.
+    # This is a guess of something that would be useful and may have been the intended
+    # purpose.
+    void *TkMacOSXGetCGContextForDrawable(Drawable drawable)
+}
+declare 8 aqua {
+    # Formerly named TkMacOSXGetRootControl (????)
+    void *TkMacOSXDrawableView(Drawable drawable)
+}
 declare 9 aqua {
     void Tk_MacOSXSetupTkNotifier(void)
 }
-- 
cgit v0.12


From db647f131b9e08474b8453e88ef2d49d5c69cdb1 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 27 Aug 2020 15:28:53 +0000
Subject: For now, put back TkMacOSXGetRootControl(), since Kevin Walzer uses
 it in his extensions

---
 generic/tk.decls            |  3 +--
 generic/tkPlatDecls.h       |  8 +++++---
 generic/tkStubInit.c        |  2 +-
 macosx/tkMacOSXPrivate.h    |  5 ++---
 macosx/tkMacOSXSubwindows.c | 45 ++++++++++++++-------------------------------
 5 files changed, 23 insertions(+), 40 deletions(-)

diff --git a/generic/tk.decls b/generic/tk.decls
index ee8378b..75880e7 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -1119,8 +1119,7 @@ declare 7 aqua {
     void *TkMacOSXGetCGContextForDrawable(Drawable drawable)
 }
 declare 8 aqua {
-    # Formerly named TkMacOSXGetRootControl (????)
-    void *TkMacOSXDrawableView(Drawable drawable)
+    void *TkMacOSXGetRootControl(Drawable drawable)
 }
 declare 9 aqua {
     void Tk_MacOSXSetupTkNotifier(void)
diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h
index 503cb64..5b71f8b 100644
--- a/generic/tkPlatDecls.h
+++ b/generic/tkPlatDecls.h
@@ -66,7 +66,8 @@ EXTERN void		TkGenWMConfigureEvent(Tk_Window tkwin, int x, int y,
 /* 6 */
 EXTERN void		TkMacOSXInvalClipRgns(Tk_Window tkwin);
 /* Slot 7 is reserved */
-/* Slot 8 is reserved */
+/* 8 */
+EXTERN void *		TkMacOSXGetRootControl(Drawable drawable);
 /* 9 */
 EXTERN void		Tk_MacOSXSetupTkNotifier(void);
 /* 10 */
@@ -94,7 +95,7 @@ typedef struct TkPlatStubs {
     void (*tkGenWMConfigureEvent) (Tk_Window tkwin, int x, int y, int width, int height, int flags); /* 5 */
     void (*tkMacOSXInvalClipRgns) (Tk_Window tkwin); /* 6 */
     void (*reserved7)(void);
-    void (*reserved8)(void);
+    void * (*tkMacOSXGetRootControl) (Drawable drawable); /* 8 */
     void (*tk_MacOSXSetupTkNotifier) (void); /* 9 */
     int (*tk_MacOSXIsAppInFront) (void); /* 10 */
 #endif /* AQUA */
@@ -138,7 +139,8 @@ extern const TkPlatStubs *tkPlatStubsPtr;
 #define TkMacOSXInvalClipRgns \
 	(tkPlatStubsPtr->tkMacOSXInvalClipRgns) /* 6 */
 /* Slot 7 is reserved */
-/* Slot 8 is reserved */
+#define TkMacOSXGetRootControl \
+	(tkPlatStubsPtr->tkMacOSXGetRootControl) /* 8 */
 #define Tk_MacOSXSetupTkNotifier \
 	(tkPlatStubsPtr->tk_MacOSXSetupTkNotifier) /* 9 */
 #define Tk_MacOSXIsAppInFront \
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 5e94001..fbd9295 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -1029,7 +1029,7 @@ static const TkPlatStubs tkPlatStubs = {
     TkGenWMConfigureEvent, /* 5 */
     TkMacOSXInvalClipRgns, /* 6 */
     0, /* 7 */
-    0, /* 8 */
+    TkMacOSXGetRootControl, /* 8 */
     Tk_MacOSXSetupTkNotifier, /* 9 */
     Tk_MacOSXIsAppInFront, /* 10 */
 #endif /* AQUA */
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h
index 4bbba5a..4abad36 100644
--- a/macosx/tkMacOSXPrivate.h
+++ b/macosx/tkMacOSXPrivate.h
@@ -272,11 +272,12 @@ MODULE_SCOPE int	TkMacOSXMakeFullscreen(TkWindow *winPtr,
 MODULE_SCOPE void	TkMacOSXEnterExitFullscreen(TkWindow *winPtr,
 			    int active);
 MODULE_SCOPE NSWindow*	TkMacOSXDrawableWindow(Drawable drawable);
-MODULE_SCOPE CGContextRef TkMacOSXGetCGContextForDrawable(Drawable drawable);
+#define TkMacOSXDrawableView(macWin) (TKContentView *)TkMacOSXGetRootControl((Drawable)(macWin))
 MODULE_SCOPE void	TkMacOSXWinCGBounds(TkWindow *winPtr, CGRect *bounds);
 MODULE_SCOPE HIShapeRef	TkMacOSXGetClipRgn(Drawable drawable);
 MODULE_SCOPE void	TkMacOSXInvalidateViewRegion(NSView *view,
 			    HIShapeRef rgn);
+MODULE_SCOPE CGContextRef TkMacOSXGetCGContextForDrawable(Drawable drawable);
 MODULE_SCOPE NSImage*	TkMacOSXGetNSImageFromTkImage(Display *display,
 			    Tk_Image image, int width, int height);
 MODULE_SCOPE NSImage*	TkMacOSXGetNSImageFromBitmap(Display *display,
@@ -446,8 +447,6 @@ VISIBILITY_HIDDEN
 - (NSPoint) tkConvertPointFromScreen:(NSPoint)point;
 @end
 
-MODULE_SCOPE TKContentView*    TkMacOSXDrawableView(MacDrawable *macWin);
-
 VISIBILITY_HIDDEN
 @interface TKWindow : NSWindow
 @end
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index 5a1c4ad..18a21a6 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -1110,37 +1110,19 @@ TkMacOSXDrawable(
 /*
  *----------------------------------------------------------------------
  *
- * TkMacOSXGetDrawablePort --
+ * TkMacOSXDrawableView/TkMacOSXGetRootControl --
  *
- *	This function returns the Graphics Port for a given X drawable.
+ *	The function name TkMacOSXGetRootControl is being preserved only
+ *      because it exists in a stubs table.  Nobody knows what it means to
+ *      get a "RootControl".  The macro TkMacOSXDrawableView calls this
+ *      function and should always be used rather than directly using the
+ *      obscure official name of this function.
  *
- * Results:
- *	NULL.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-void *
-TkMacOSXGetDrawablePort(
-    TCL_UNUSED(Drawable))
-{
-    return NULL;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TkMacOSXDrawableView --
- *
- *	This function returns the TKContentView for a given X drawable in the
- *      case that the drawable is a window.  If the drawable is a pixmap
- *      it returns nil.
+ *      It returns the TKContentView for a given X drawable in the case that the
+ *      drawable is a window.  If the drawable is a pixmap it returns nil.
  *
  * Results:
- *	A TKDrawableView* or nil.
+ *	A NSView* or nil.
  *
  * Side effects:
  *	None.
@@ -1148,11 +1130,12 @@ TkMacOSXGetDrawablePort(
  *----------------------------------------------------------------------
  */
 
-TKContentView *
-TkMacOSXDrawableView(
-    MacDrawable *macWin)
+void *
+TkMacOSXGetRootControl(
+    Drawable drawable)
 {
     void *result = NULL;
+    MacDrawable *macWin = (MacDrawable *)drawable;
 
     if (!macWin) {
 	result = NULL;
@@ -1164,7 +1147,7 @@ TkMacOSXDrawableView(
 	TkWindow *contWinPtr = TkpGetOtherWindow(macWin->toplevel->winPtr);
 
 	if (contWinPtr) {
-	    result = TkMacOSXDrawableView(contWinPtr->privatePtr);
+	    result = TkMacOSXGetRootControl((Drawable)contWinPtr->privatePtr);
 	}
     }
     return result;
-- 
cgit v0.12


From 3b50413f1cf04d9960be2ac55ee591ee5ac150d8 Mon Sep 17 00:00:00 2001
From: Kevin Walzer <kw@codebykevin.com>
Date: Fri, 28 Aug 2020 02:27:49 +0000
Subject: Fix incomplete merge

---
 macosx/tkMacOSXHLEvents.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/macosx/tkMacOSXHLEvents.c b/macosx/tkMacOSXHLEvents.c
index 92551bd..b0656f7 100644
--- a/macosx/tkMacOSXHLEvents.c
+++ b/macosx/tkMacOSXHLEvents.c
@@ -402,10 +402,6 @@ static void ProcessAppleEvent(
     }
     code = Tcl_EvalEx(AEInfo->interp, Tcl_DStringValue(&AEInfo->command),
 	    Tcl_DStringLength(&AEInfo->command), TCL_EVAL_GLOBAL);
-    if (code != TCL_OK) {
-	Tcl_BackgroundException(AEInfo->interp, code);
-    }
-
     if (AEInfo->replyEvent && code >= 0) {
         int reslen;
         const char *result = Tcl_GetStringFromObj(Tcl_GetObjResult(AEInfo->interp),
@@ -419,6 +415,8 @@ static void ProcessAppleEvent(
             AEPutParamPtr((AppleEvent*)[AEInfo->replyEvent aeDesc],
                           keyErrorNumber, typeSInt32, (Ptr) &code, sizeof(int));
         }
+    } 	 else  if (code != TCL_OK) {
+	Tcl_BackgroundException(AEInfo->interp, code);
     }
     Tcl_DStringFree(&AEInfo->command);
     ckfree(clientData);
-- 
cgit v0.12


From 9cfbd3e51461d673752779dc1a09e8011a701846 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 28 Aug 2020 06:53:09 +0000
Subject: Add some explicit typecasts, e.g. to (Drawable), and prevent
 higher-level compiler warnings

---
 macosx/tkMacOSXColor.c       |  6 +++---
 macosx/tkMacOSXDraw.c        |  2 +-
 macosx/tkMacOSXScrlbr.c      |  8 ++++----
 macosx/tkMacOSXSubwindows.c  |  4 ++--
 macosx/tkMacOSXWindowEvent.c | 23 +++++++++++++++++++++--
 5 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index 1eeacc3..fd39197 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -438,7 +438,7 @@ TkMacOSXInDarkMode(Tk_Window tkwin)
 	NSAppearanceName name;
 	NSView *view = nil;
 	if (winPtr && winPtr->privatePtr) {
-	    view = TkMacOSXDrawableView(winPtr->privatePtr);
+	    view = TkMacOSXDrawableView((Drawable)winPtr->privatePtr);
 	}
 	if (view) {
 	    name = [[view effectiveAppearance] name];
@@ -747,8 +747,8 @@ TkpGetColor(
     }
     if (tkwin) {
 	display = Tk_Display(tkwin);
-	MacDrawable *macWin = (MacDrawable *) Tk_WindowId(tkwin);
-	view = TkMacOSXDrawableView(macWin);
+	Drawable d = (Drawable)Tk_WindowId(tkwin);
+	view = TkMacOSXDrawableView(d);
     }
 
     /*
diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index 57680a9..15d1eb5 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -1271,7 +1271,7 @@ TkMacOSXSetupDrawingContext(
      */
 
     if (!(macDraw->flags & TK_IS_PIXMAP)) {
-	view = TkMacOSXDrawableView(macDraw);
+	view = TkMacOSXDrawableView(d);
 	if (!view) {
 	    Tcl_Panic("TkMacOSXSetupDrawingContext(): "
 		    "no NSView to draw into !");
diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c
index 8565e76..e70867d 100644
--- a/macosx/tkMacOSXScrlbr.c
+++ b/macosx/tkMacOSXScrlbr.c
@@ -121,7 +121,7 @@ TkScrollbar *
 TkpCreateScrollbar(
     Tk_Window tkwin)
 {
-    MacScrollbar *scrollPtr = ckalloc(sizeof(MacScrollbar));
+    MacScrollbar *scrollPtr = (MacScrollbar *)ckalloc(sizeof(MacScrollbar));
 
     scrollPtr->troughGC = NULL;
     scrollPtr->copyGC = NULL;
@@ -174,8 +174,8 @@ static void drawMacScrollbar(
     MacScrollbar *msPtr,
     CGContextRef context)
 {
-    MacDrawable *macWin = (MacDrawable *) Tk_WindowId(scrollPtr->tkwin);
-    NSView *view = TkMacOSXDrawableView(macWin);
+    Drawable d = (Drawable)Tk_WindowId(scrollPtr->tkwin);
+    NSView *view = TkMacOSXDrawableView(d);
     CGPathRef path;
     CGPoint inner[2], outer[2], thumbOrigin;
     CGSize thumbSize;
@@ -263,7 +263,7 @@ TkpDisplayScrollbar(
 
     if ((view == NULL)
 	    || (macWin->flags & TK_DO_NOT_DRAW)
-	    || !TkMacOSXSetupDrawingContext((Drawable) macWin, NULL, &dc)) {
+	    || !TkMacOSXSetupDrawingContext((Drawable)macWin, NULL, &dc)) {
 	return;
     }
 
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index a7e8372..a3c7469 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -515,7 +515,7 @@ MoveResizeWindow(
 {
     int deltaX = 0, deltaY = 0, parentBorderwidth = 0;
     MacDrawable *macParent = NULL;
-    NSWindow *macWindow = TkMacOSXDrawableWindow((Drawable) macWin);
+    NSWindow *macWindow = TkMacOSXDrawableWindow((Drawable)macWin);
 
     /*
      * Find the Parent window, for an embedded window it will be its container.
@@ -1102,7 +1102,7 @@ TkMacOSXDrawableWindow(
 	TkWindow *contWinPtr = TkpGetOtherWindow(macWin->toplevel->winPtr);
 
 	if (contWinPtr) {
-	    result = TkMacOSXDrawableWindow((Drawable) contWinPtr->privatePtr);
+	    result = TkMacOSXDrawableWindow((Drawable)contWinPtr->privatePtr);
 	}
     }
     return result;
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 8d432f8..78c8bef 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -132,6 +132,8 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
 - (NSRect)windowWillUseStandardFrame:(NSWindow *)window
                         defaultFrame:(NSRect)newFrame
 {
+    (void)window;
+
     /*
      * This method needs to be implemented in order for [NSWindow isZoomed] to
      * give the correct answer. But it suffices to always validate every
@@ -144,6 +146,8 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
 - (NSSize)window:(NSWindow *)window
   willUseFullScreenContentSize:(NSSize)proposedSize
 {
+    (void)window;
+
     /*
      * We don't need to change the proposed size, but we do need to implement
      * this method.  Otherwise the full screen window will be sized to the
@@ -292,6 +296,8 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
 
 - (void) applicationActivate: (NSNotification *) notification
 {
+    (void)notification;
+
 #ifdef TK_MAC_DEBUG_NOTIFICATIONS
     TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification);
 #endif
@@ -316,6 +322,8 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
 
 - (void) applicationDeactivate: (NSNotification *) notification
 {
+    (void)notification;
+
 #ifdef TK_MAC_DEBUG_NOTIFICATIONS
     TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification);
 #endif
@@ -338,6 +346,9 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
 - (BOOL)applicationShouldHandleReopen:(NSApplication *)sender
                     hasVisibleWindows:(BOOL)flag
 {
+    (void)sender;
+    (void)flag;
+
     /*
      * Allowing the default response means that withdrawn windows will get
      * displayed on the screen with unresponsive title buttons.  We don't
@@ -370,6 +381,8 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
 
 - (void) displayChanged: (NSNotification *) notification
 {
+    (void)notification;
+
 #ifdef TK_MAC_DEBUG_NOTIFICATIONS
     TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification);
 #endif
@@ -414,7 +427,8 @@ TkpWillDrawWidget(Tk_Window tkwin) {
     int result;
     if (tkwin) {
 	TkWindow *winPtr = (TkWindow *)tkwin;
-	TKContentView *view = TkMacOSXDrawableView(winPtr->privatePtr);
+	TKContentView *view = TkMacOSXDrawableView(
+	    (Drawable)winPtr->privatePtr);
 	result = ([NSApp isDrawing] && view == [NSView focusView]);
 #if 0
 	printf("TkpWillDrawWidget: %s %d  %d \n", Tk_PathName(tkwin),
@@ -892,7 +906,7 @@ ExposeRestrictProc(
 
 static Tk_RestrictAction
 ConfigureRestrictProc(
-    ClientData arg,
+    TCL_UNUSED(void *),
     XEvent *eventPtr)
 {
     return (eventPtr->type==ConfigureNotify ? TK_PROCESS_EVENT : TK_DEFER_EVENT);
@@ -916,6 +930,7 @@ ConfigureRestrictProc(
 
 - (void) drawRect: (NSRect) rect
 {
+    (void)rect;
 
 #ifdef TK_MAC_DEBUG_DRAWING
     TkWindow *winPtr = TkMacOSXGetTkWindow([self window]);
@@ -1165,6 +1180,8 @@ static const char *const accentNames[] = {
     int x, y;
     TkWindow *winPtr = TkMacOSXGetTkWindow([self window]);
     Tk_Window tkwin = (Tk_Window) winPtr;
+    (void)sender;
+
     if (!winPtr){
 	return;
     }
@@ -1207,6 +1224,8 @@ static const char *const accentNames[] = {
 
 - (void) keyDown: (NSEvent *) theEvent
 {
+    (void)theEvent;
+
 #ifdef TK_MAC_DEBUG_EVENTS
     TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, theEvent);
 #endif
-- 
cgit v0.12


From 078bc1618f77b4a7e2ad2a8ea73125e5979bea24 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 28 Aug 2020 09:36:12 +0000
Subject: Export TkMacOSXGetTkWindow() for TkDND, without this it cannot be
 compiled as stub-enabled extension

---
 generic/tk.decls         | 3 +++
 generic/tkPlatDecls.h    | 8 +++++---
 generic/tkStubInit.c     | 2 +-
 macosx/tkMacOSXPrivate.h | 1 -
 macosx/tkMacOSXWm.c      | 6 +++---
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/generic/tk.decls b/generic/tk.decls
index 3e64878..0d6c7a1 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -1139,6 +1139,9 @@ declare 9 aqua {
 declare 10 aqua {
     int Tk_MacOSXIsAppInFront(void)
 }
+declare 11 aqua {
+    TkWindow* TkMacOSXGetTkWindow(void *w)
+}
 declare 16 aqua {
     void TkGenWMConfigureEvent_(Tk_Window tkwin, int x, int y, int width,
 	    int height, int flags)
diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h
index ed8b1f5..f2eb7bf 100644
--- a/generic/tkPlatDecls.h
+++ b/generic/tkPlatDecls.h
@@ -82,7 +82,8 @@ EXTERN void *		TkMacOSXGetRootControl(Drawable drawable);
 EXTERN void		Tk_MacOSXSetupTkNotifier(void);
 /* 10 */
 EXTERN int		Tk_MacOSXIsAppInFront(void);
-/* Slot 11 is reserved */
+/* 11 */
+EXTERN TkWindow*	TkMacOSXGetTkWindow(void *w);
 /* Slot 12 is reserved */
 /* Slot 13 is reserved */
 /* Slot 14 is reserved */
@@ -116,7 +117,7 @@ typedef struct TkPlatStubs {
     void * (*tkMacOSXGetRootControl) (Drawable drawable); /* 8 */
     void (*tk_MacOSXSetupTkNotifier) (void); /* 9 */
     int (*tk_MacOSXIsAppInFront) (void); /* 10 */
-    void (*reserved11)(void);
+    TkWindow* (*tkMacOSXGetTkWindow) (void *w); /* 11 */
     void (*reserved12)(void);
     void (*reserved13)(void);
     void (*reserved14)(void);
@@ -174,7 +175,8 @@ extern const TkPlatStubs *tkPlatStubsPtr;
 	(tkPlatStubsPtr->tk_MacOSXSetupTkNotifier) /* 9 */
 #define Tk_MacOSXIsAppInFront \
 	(tkPlatStubsPtr->tk_MacOSXIsAppInFront) /* 10 */
-/* Slot 11 is reserved */
+#define TkMacOSXGetTkWindow \
+	(tkPlatStubsPtr->tkMacOSXGetTkWindow) /* 11 */
 /* Slot 12 is reserved */
 /* Slot 13 is reserved */
 /* Slot 14 is reserved */
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index c69ecac..52b545c 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -1013,7 +1013,7 @@ static const TkPlatStubs tkPlatStubs = {
     TkMacOSXGetRootControl, /* 8 */
     Tk_MacOSXSetupTkNotifier, /* 9 */
     Tk_MacOSXIsAppInFront, /* 10 */
-    0, /* 11 */
+    TkMacOSXGetTkWindow, /* 11 */
     0, /* 12 */
     0, /* 13 */
     0, /* 14 */
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h
index e62456c..c4ef1b6 100644
--- a/macosx/tkMacOSXPrivate.h
+++ b/macosx/tkMacOSXPrivate.h
@@ -283,7 +283,6 @@ MODULE_SCOPE NSImage*	TkMacOSXGetNSImageFromBitmap(Display *display,
 			    Pixmap bitmap, GC gc, int width, int height);
 MODULE_SCOPE CGColorRef	TkMacOSXCreateCGColor(GC gc, unsigned long pixel);
 MODULE_SCOPE NSColor*	TkMacOSXGetNSColor(GC gc, unsigned long pixel);
-MODULE_SCOPE TkWindow*	TkMacOSXGetTkWindow(NSWindow *w);
 MODULE_SCOPE NSFont*	TkMacOSXNSFontForFont(Tk_Font tkfont);
 MODULE_SCOPE NSDictionary* TkMacOSXNSFontAttributesForFont(Tk_Font tkfont);
 MODULE_SCOPE NSModalSession TkMacOSXGetModalSession(void);
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 1dc79e4..8918866 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -5425,11 +5425,11 @@ TkMacOSXGetXWindow(
  *----------------------------------------------------------------------
  */
 
-TkWindow*
+TkWindow *
 TkMacOSXGetTkWindow(
-    NSWindow *w)
+    void *w)
 {
-    Window window = TkMacOSXGetXWindow(w);
+    Window window = TkMacOSXGetXWindow((NSWindow *)w);
     TkDisplay *dispPtr = TkGetDisplayList();
 
     return (window != None ?
-- 
cgit v0.12


From 1973b95cf06149eb8894e6a4c85e8c2b9f68a231 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 28 Aug 2020 14:16:41 +0000
Subject: Export TkMacOSXGetCGContextForDrawable() too, that's the only
 function from the "nicer_stubs" branch which can be added without
 compatibility problems

---
 generic/tk.decls         | 4 ++++
 generic/tkPlatDecls.h    | 8 +++++---
 generic/tkStubInit.c     | 2 +-
 macosx/tkMacOSXDraw.c    | 4 ++--
 macosx/tkMacOSXImage.c   | 4 ++--
 macosx/tkMacOSXPrivate.h | 1 -
 6 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/generic/tk.decls b/generic/tk.decls
index 0d6c7a1..12b8062 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -1142,6 +1142,10 @@ declare 10 aqua {
 declare 11 aqua {
     TkWindow* TkMacOSXGetTkWindow(void *w)
 }
+declare 12 aqua {
+    void *TkMacOSXGetCGContextForDrawable(Drawable drawable)
+}
+
 declare 16 aqua {
     void TkGenWMConfigureEvent_(Tk_Window tkwin, int x, int y, int width,
 	    int height, int flags)
diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h
index f2eb7bf..07dec66 100644
--- a/generic/tkPlatDecls.h
+++ b/generic/tkPlatDecls.h
@@ -84,7 +84,8 @@ EXTERN void		Tk_MacOSXSetupTkNotifier(void);
 EXTERN int		Tk_MacOSXIsAppInFront(void);
 /* 11 */
 EXTERN TkWindow*	TkMacOSXGetTkWindow(void *w);
-/* Slot 12 is reserved */
+/* 12 */
+EXTERN void *		TkMacOSXGetCGContextForDrawable(Drawable drawable);
 /* Slot 13 is reserved */
 /* Slot 14 is reserved */
 /* Slot 15 is reserved */
@@ -118,7 +119,7 @@ typedef struct TkPlatStubs {
     void (*tk_MacOSXSetupTkNotifier) (void); /* 9 */
     int (*tk_MacOSXIsAppInFront) (void); /* 10 */
     TkWindow* (*tkMacOSXGetTkWindow) (void *w); /* 11 */
-    void (*reserved12)(void);
+    void * (*tkMacOSXGetCGContextForDrawable) (Drawable drawable); /* 12 */
     void (*reserved13)(void);
     void (*reserved14)(void);
     void (*reserved15)(void);
@@ -177,7 +178,8 @@ extern const TkPlatStubs *tkPlatStubsPtr;
 	(tkPlatStubsPtr->tk_MacOSXIsAppInFront) /* 10 */
 #define TkMacOSXGetTkWindow \
 	(tkPlatStubsPtr->tkMacOSXGetTkWindow) /* 11 */
-/* Slot 12 is reserved */
+#define TkMacOSXGetCGContextForDrawable \
+	(tkPlatStubsPtr->tkMacOSXGetCGContextForDrawable) /* 12 */
 /* Slot 13 is reserved */
 /* Slot 14 is reserved */
 /* Slot 15 is reserved */
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 52b545c..4cd4ba9 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -1014,7 +1014,7 @@ static const TkPlatStubs tkPlatStubs = {
     Tk_MacOSXSetupTkNotifier, /* 9 */
     Tk_MacOSXIsAppInFront, /* 10 */
     TkMacOSXGetTkWindow, /* 11 */
-    0, /* 12 */
+    TkMacOSXGetCGContextForDrawable, /* 12 */
     0, /* 13 */
     0, /* 14 */
     0, /* 15 */
diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index 15d1eb5..2a9b252 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -207,7 +207,7 @@ CreateNSImageFromPixmap(
     CGImageRef cgImage;
     NSImage *nsImage;
     NSBitmapImageRep *bitmapImageRep;
-    CGContextRef context = TkMacOSXGetCGContextForDrawable(pixmap);
+    CGContextRef context = (CGContextRef)TkMacOSXGetCGContextForDrawable(pixmap);
 
     if (context) {
 	cgImage = CGBitmapContextCreateImage(context);
@@ -239,7 +239,7 @@ CreateNSImageFromPixmap(
  *----------------------------------------------------------------------
  */
 
-CGContextRef
+void *
 TkMacOSXGetCGContextForDrawable(
     Drawable drawable)
 {
diff --git a/macosx/tkMacOSXImage.c b/macosx/tkMacOSXImage.c
index 2e6b5e7..2f6e35c 100644
--- a/macosx/tkMacOSXImage.c
+++ b/macosx/tkMacOSXImage.c
@@ -538,7 +538,7 @@ CreateCGImageFromDrawableRect(
 
 	CGRect image_rect = CGRectMake(x, y, width, height);
 
-	cg_context = TkMacOSXGetCGContextForDrawable(drawable);
+	cg_context = (CGContextRef)TkMacOSXGetCGContextForDrawable(drawable);
 	cg_image = CGBitmapContextCreateImage((CGContextRef) cg_context);
 	if (cg_image) {
 	    result = CGImageCreateWithImageInRect(cg_image, image_rect);
@@ -597,7 +597,7 @@ CreateCGImageFromPixmap(
     Drawable pixmap)
 {
     CGImageRef img = NULL;
-    CGContextRef context = TkMacOSXGetCGContextForDrawable(pixmap);
+    CGContextRef context = (CGContextRef)TkMacOSXGetCGContextForDrawable(pixmap);
 
     if (context) {
 	img = CGBitmapContextCreateImage(context);
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h
index c4ef1b6..b56eb09 100644
--- a/macosx/tkMacOSXPrivate.h
+++ b/macosx/tkMacOSXPrivate.h
@@ -276,7 +276,6 @@ MODULE_SCOPE void	TkMacOSXWinCGBounds(TkWindow *winPtr, CGRect *bounds);
 MODULE_SCOPE HIShapeRef	TkMacOSXGetClipRgn(Drawable drawable);
 MODULE_SCOPE void	TkMacOSXInvalidateViewRegion(NSView *view,
 			    HIShapeRef rgn);
-MODULE_SCOPE CGContextRef TkMacOSXGetCGContextForDrawable(Drawable drawable);
 MODULE_SCOPE NSImage*	TkMacOSXGetNSImageFromTkImage(Display *display,
 			    Tk_Image image, int width, int height);
 MODULE_SCOPE NSImage*	TkMacOSXGetNSImageFromBitmap(Display *display,
-- 
cgit v0.12


From 40da9ef13ba6908f3d75465dfb2d1c47b8f43fd5 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Sat, 29 Aug 2020 19:37:09 +0000
Subject: Fix errors in tk.decls which would break the build after genStubs is
 run.

---
 generic/tk.decls | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/generic/tk.decls b/generic/tk.decls
index 75880e7..c756749 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -1099,9 +1099,10 @@ declare 5 win {
 
 ################################
 # Aqua specific functions
-declare 3 aqua {
-    void TkMacOSXInitMenus(Tcl_Interp *interp)
-}
+# Stub removed because the function no longer exists.
+#declare 3 aqua {
+#    void TkMacOSXInitMenus(Tcl_Interp *interp)
+#}
 declare 4 aqua {
     void TkMacOSXInitAppleEvents(Tcl_Interp *interp)
 }
@@ -1112,12 +1113,10 @@ declare 5 aqua {
 declare 6 aqua {
     void TkMacOSXInvalClipRgns(Tk_Window tkwin)
 }
-declare 7 aqua {
-    # Formerly named TkMacOSXGetDrawablePort. For a long time it just returned NULL.
-    # This is a guess of something that would be useful and may have been the intended
-    # purpose.
-    void *TkMacOSXGetCGContextForDrawable(Drawable drawable)
-}
+# Stub removed because it just returned NULL.
+#declare 7 aqua {
+#    void *TkMacOSXGetDrawablePort(Drawable drawable)
+#}
 declare 8 aqua {
     void *TkMacOSXGetRootControl(Drawable drawable)
 }
-- 
cgit v0.12


From 6ad2a7195f97636ac7d46c162d3c899322d1166f Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 29 Aug 2020 20:32:50 +0000
Subject: Fix [https://core.tcl-lang.org/tcl/tktview/07eb49661a|07eb49661a]:
 Change to genStubs.tcl between 8.6 and 8.7 breaks packages for macOS.

---
 generic/tkIntXlibDecls.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index ad5321c..fe11c09 100644
--- a/generic/tkIntXlibDecls.h
+++ b/generic/tkIntXlibDecls.h
@@ -38,6 +38,10 @@
 #  endif
 #endif
 
+#if defined(MAC_OSX_TK) && !defined(MAC_OSX_TCL)
+#  define MAC_OSX_TCL 1
+#endif
+
 typedef int (*XAfterFunction) (	    /* WARNING, this type not in Xlib spec */
     Display*		/* display */
 );
-- 
cgit v0.12


From 35720db1d661f7697792d72d75dbdd519c7f20b1 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 31 Aug 2020 07:12:31 +0000
Subject: More tweaks, (mainly TkMacOSXGetCGContextForDrawable <->
 TkMacOSXCGContext)

---
 generic/tk.decls         |  2 +-
 generic/tkIntXlibDecls.h | 10 ----------
 generic/tkPlatDecls.h    | 10 +++++-----
 generic/tkStubInit.c     |  2 +-
 macosx/tkMacOSXDraw.c    |  8 ++++----
 macosx/tkMacOSXImage.c   |  4 ++--
 macosx/tkMacOSXPrivate.h |  4 ++--
 7 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/generic/tk.decls b/generic/tk.decls
index 89bb19e..12b8062 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -1143,7 +1143,7 @@ declare 11 aqua {
     TkWindow* TkMacOSXGetTkWindow(void *w)
 }
 declare 12 aqua {
-    void *TkMacOSXCGContext(Drawable drawable)
+    void *TkMacOSXGetCGContextForDrawable(Drawable drawable)
 }
 
 declare 16 aqua {
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index d0cae13..9d4200a 100644
--- a/generic/tkIntXlibDecls.h
+++ b/generic/tkIntXlibDecls.h
@@ -1698,16 +1698,6 @@ extern const TkIntXlibStubs *tkIntXlibStubsPtr;
 #undef TCL_STORAGE_CLASS
 #define TCL_STORAGE_CLASS DLLIMPORT
 
-/* Those cannot be used (yet) in stub-enabled extensions on MacOS */
-#ifdef MAC_OSX_TK /* AQUA */
-#undef XSetClipRectangles
-#undef XOffsetRegion
-#undef XLowerWindow
-#undef XDestroyIC
-#undef XCreatePixmapCursor
-#undef XCreateGlyphCursor
-#undef XkbKeycodeToKeysym
-#endif
 #undef TkUnusedStubEntry
 
 #endif /* _TKINTXLIBDECLS */
diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h
index 08e9715..3485f35 100644
--- a/generic/tkPlatDecls.h
+++ b/generic/tkPlatDecls.h
@@ -85,7 +85,7 @@ EXTERN int		Tk_MacOSXIsAppInFront(void);
 /* 11 */
 EXTERN TkWindow*	TkMacOSXGetTkWindow(void *w);
 /* 12 */
-EXTERN void *		TkMacOSXCGContext(Drawable drawable);
+EXTERN void *		TkMacOSXGetCGContextForDrawable(Drawable drawable);
 /* Slot 13 is reserved */
 /* Slot 14 is reserved */
 /* Slot 15 is reserved */
@@ -119,7 +119,7 @@ typedef struct TkPlatStubs {
     void (*tk_MacOSXSetupTkNotifier) (void); /* 9 */
     int (*tk_MacOSXIsAppInFront) (void); /* 10 */
     TkWindow* (*tkMacOSXGetTkWindow) (void *w); /* 11 */
-    void * (*tkMacOSXCGContext) (Drawable drawable); /* 12 */
+    void * (*tkMacOSXGetCGContextForDrawable) (Drawable drawable); /* 12 */
     void (*reserved13)(void);
     void (*reserved14)(void);
     void (*reserved15)(void);
@@ -178,8 +178,8 @@ extern const TkPlatStubs *tkPlatStubsPtr;
 	(tkPlatStubsPtr->tk_MacOSXIsAppInFront) /* 10 */
 #define TkMacOSXGetTkWindow \
 	(tkPlatStubsPtr->tkMacOSXGetTkWindow) /* 11 */
-#define TkMacOSXCGContext \
-	(tkPlatStubsPtr->tkMacOSXCGContext) /* 12 */
+#define TkMacOSXGetCGContextForDrawable \
+	(tkPlatStubsPtr->tkMacOSXGetCGContextForDrawable) /* 12 */
 /* Slot 13 is reserved */
 /* Slot 14 is reserved */
 /* Slot 15 is reserved */
@@ -202,7 +202,7 @@ extern const TkPlatStubs *tkPlatStubsPtr;
 #ifdef MAC_OSX_TK /* AQUA */
 #undef TkMacOSXGetTkWindow
 #undef TkMacOSXGetCGContextForDrawable
-#undef TkGenWMConfigureEvent_
 #endif
+#undef TkGenWMConfigureEvent_
 
 #endif /* _TKPLATDECLS */
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 330d101..4cd4ba9 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -1014,7 +1014,7 @@ static const TkPlatStubs tkPlatStubs = {
     Tk_MacOSXSetupTkNotifier, /* 9 */
     Tk_MacOSXIsAppInFront, /* 10 */
     TkMacOSXGetTkWindow, /* 11 */
-    TkMacOSXCGContext, /* 12 */
+    TkMacOSXGetCGContextForDrawable, /* 12 */
     0, /* 13 */
     0, /* 14 */
     0, /* 15 */
diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index 7e19c56..dcec1f6 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -207,7 +207,7 @@ CreateNSImageFromPixmap(
     CGImageRef cgImage;
     NSImage *nsImage;
     NSBitmapImageRep *bitmapImageRep;
-    CGContextRef context = TkMacOSXGetCGContextForDrawable(pixmap);
+    CGContextRef context = TkMacOSXCGContext(pixmap);
 
     if (context) {
 	cgImage = CGBitmapContextCreateImage(context);
@@ -226,7 +226,7 @@ CreateNSImageFromPixmap(
 /*
  *----------------------------------------------------------------------
  *
- * TkMacOSXCGContext --
+ * TkMacOSXGetCGContextForDrawable --
  *
  *	Get CGContext for given Drawable, creating one if necessary.
  *
@@ -240,7 +240,7 @@ CreateNSImageFromPixmap(
  */
 
 void *
-TkMacOSXCGContext(
+TkMacOSXGetCGContextForDrawable(
     Drawable drawable)
 {
     MacDrawable *macDraw = (MacDrawable *)drawable;
@@ -1295,7 +1295,7 @@ TkMacOSXSetupDrawingContext(
      * drawing to a window and we use the current context of its ContentView.
      */
 
-    dc.context = TkMacOSXGetCGContextForDrawable(d);
+    dc.context = TkMacOSXCGContext(d);
     if (dc.context) {
 	dc.portBounds = CGContextGetClipBoundingBox(dc.context);
     } else {
diff --git a/macosx/tkMacOSXImage.c b/macosx/tkMacOSXImage.c
index 4179819..c757bb6 100644
--- a/macosx/tkMacOSXImage.c
+++ b/macosx/tkMacOSXImage.c
@@ -538,7 +538,7 @@ CreateCGImageFromDrawableRect(
 
 	CGRect image_rect = CGRectMake(x, y, width, height);
 
-	cg_context = TkMacOSXGetCGContextForDrawable(drawable);
+	cg_context = TkMacOSXCGContext(drawable);
 	cg_image = CGBitmapContextCreateImage((CGContextRef) cg_context);
 	if (cg_image) {
 	    result = CGImageCreateWithImageInRect(cg_image, image_rect);
@@ -597,7 +597,7 @@ CreateCGImageFromPixmap(
     Drawable pixmap)
 {
     CGImageRef img = NULL;
-    CGContextRef context = TkMacOSXGetCGContextForDrawable(pixmap);
+    CGContextRef context = TkMacOSXCGContext(pixmap);
 
     if (context) {
 	img = CGBitmapContextCreateImage(context);
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h
index e1ace4d..2c7546e 100644
--- a/macosx/tkMacOSXPrivate.h
+++ b/macosx/tkMacOSXPrivate.h
@@ -244,8 +244,8 @@ MODULE_SCOPE OSStatus	TkMacOSHIShapeUnion(HIShapeRef inShape1,
     (NSWindow *)TkMacOSXDrawable(drawable)
 #define TkMacOSXContentView(drawable) \
     (TKContentView *)TkMacOSXGetRootControl(drawable)
-#define TkMacOSXGetCGContextForDrawable(drawable) \
-    (CGContextRef)TkMacOSXCGContext(drawable)
+#define TkMacOSXCGContext(drawable) \
+    (CGContextRef)TkMacOSXGetCGContextForDrawable(drawable)
 
 MODULE_SCOPE void *	TkMacOSXGetNamedSymbol(const char *module,
 			    const char *symbol);
-- 
cgit v0.12


From c280ebcafcb45b2fb405703d10d2a8b93c377ca7 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 31 Aug 2020 10:01:21 +0000
Subject: Change expectation of safe-5.1 (error-message changed in Tcl) Don't
 use Tcl_GetMaster() any more, use Tcl_GetParent() in stead. With fallback for
 Tcl < 8.6.11.

---
 generic/tkInt.h    | 5 +++++
 generic/tkWindow.c | 2 +-
 tests/safe.test    | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/generic/tkInt.h b/generic/tkInt.h
index 2f64f99..23605cf 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -84,6 +84,11 @@
 # endif
 #endif
 
+
+#ifndef Tcl_GetParent
+#   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
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index a67329c..5e5e836 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.c
@@ -3094,7 +3094,7 @@ Initialize(
 	Tcl_Interp *parent = interp;
 
 	while (Tcl_IsSafe(parent)) {
-	    parent = Tcl_GetMaster(parent);
+	    parent = Tcl_GetParent(parent);
 	    if (parent == NULL) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			"no controlling parent interpreter", -1));
diff --git a/tests/safe.test b/tests/safe.test
index 97f6688..64cd64c 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -187,7 +187,7 @@ test safe-5.1 {loading Tk in safe interps without parent's clearance} -body {
     interp eval $i {load {} Tk}
 } -cleanup {
     safe::interpDelete $i
-} -returnCodes error -result {not allowed}
+} -returnCodes error -result {load of binary library for package Tk failed: not allowed}
 test safe-5.2 {multi-level Tk loading with clearance} -setup {
     set safeParent [safe::interpCreate]
 } -body {
-- 
cgit v0.12


From e9be26a5cd7994354c11df68142dedd1ad385705 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 31 Aug 2020 16:23:02 +0000
Subject: Remove obsolete code

---
 macosx/tkMacOSXHLEvents.c    |  2 +-
 macosx/tkMacOSXInt.h         |  4 ---
 macosx/tkMacOSXMouseEvent.c  | 32 -----------------------
 macosx/tkMacOSXPrivate.h     | 13 ----------
 macosx/tkMacOSXRegion.c      | 18 +------------
 macosx/tkMacOSXWindowEvent.c | 60 ++++++++++++++++++++++----------------------
 macosx/tkMacOSXWm.c          | 23 -----------------
 7 files changed, 32 insertions(+), 120 deletions(-)

diff --git a/macosx/tkMacOSXHLEvents.c b/macosx/tkMacOSXHLEvents.c
index 91d7b72..88036ee 100644
--- a/macosx/tkMacOSXHLEvents.c
+++ b/macosx/tkMacOSXHLEvents.c
@@ -309,7 +309,7 @@ static const char *scriptTextProc = "::tk::mac::DoScriptText";
 	    if (noErr == AEGetParamPtr(theDesc, keyDirectObject,
 				       typeUTF8Text, &type,
 				       data, actual, NULL)) {
-                data[actual] = '\0'; 
+                data[actual] = '\0';
                 AppleEventInfo *AEInfo = ckalloc(sizeof(AppleEventInfo));
                 Tcl_DString *scriptTextCommand = &AEInfo->command;
                 Tcl_DStringInit(scriptTextCommand);
diff --git a/macosx/tkMacOSXInt.h b/macosx/tkMacOSXInt.h
index 6f44014..2c2be0c 100644
--- a/macosx/tkMacOSXInt.h
+++ b/macosx/tkMacOSXInt.h
@@ -191,10 +191,6 @@ MODULE_SCOPE void TkpFreeGCCache(GC gc);
  */
 
 MODULE_SCOPE void TkMacOSXDefaultStartupScript(void);
-#if 0
-MODULE_SCOPE int XSetClipRectangles(Display *d, GC gc, int clip_x_origin,
-	int clip_y_origin, XRectangle* rectangles, int n, int ordering);
-#endif
 MODULE_SCOPE void TkpClipDrawableToRect(Display *display, Drawable d, int x,
 	int y, int width, int height);
 MODULE_SCOPE void TkpShiftButton(NSButton *button, NSPoint delta);
diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index f274a07..99505ca 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -56,10 +56,6 @@ enum {
     Tk_Window tkwin;
     NSPoint local, global;
     NSInteger button = -1;
-#if 0
-    NSTrackingArea *trackingArea = nil;
-    NSInteger eventNumber, clickCount, buttonNumber;
-#endif
     [NSEvent stopPeriodicEvents];
 
 #ifdef TK_MAC_DEBUG_EVENTS
@@ -314,34 +310,6 @@ enum {
 /*
  *----------------------------------------------------------------------
  *
- * TkMacOSXKeyModifiers --
- *
- *	Returns the current state of the modifier keys.
- *
- * Results:
- *	An OS Modifier state.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-EventModifiers
-TkMacOSXModifierState(void)
-{
-    UInt32 keyModifiers;
-    int isFrontProcess = (GetCurrentEvent() && Tk_MacOSXIsAppInFront());
-
-    keyModifiers = isFrontProcess ? GetCurrentEventKeyModifiers() :
-	    GetCurrentKeyModifiers();
-
-    return (EventModifiers) (keyModifiers & USHRT_MAX);
-}
-
-/*
- *----------------------------------------------------------------------
- *
  * TkMacOSXButtonKeyState --
  *
  *	Returns the current state of the button & modifier keys.
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h
index e62456c..1dc856c 100644
--- a/macosx/tkMacOSXPrivate.h
+++ b/macosx/tkMacOSXPrivate.h
@@ -225,10 +225,6 @@ MODULE_SCOPE HIMutableShapeRef TkMacOSXHIShapeCreateMutableWithRect(
 MODULE_SCOPE OSStatus	TkMacOSXHIShapeSetWithShape(
 			    HIMutableShapeRef inDestShape,
 			    HIShapeRef inSrcShape);
-#if 0
-MODULE_SCOPE OSStatus	TkMacOSXHIShapeSetWithRect(HIMutableShapeRef inShape,
-			    const CGRect *inRect);
-#endif
 MODULE_SCOPE OSStatus	TkMacOSHIShapeDifferenceWithRect(
 			    HIMutableShapeRef inShape, const CGRect *inRect);
 MODULE_SCOPE OSStatus	TkMacOSHIShapeUnionWithRect(HIMutableShapeRef inShape,
@@ -249,12 +245,8 @@ MODULE_SCOPE int	TkMacOSXUseAntialiasedText(Tcl_Interp *interp,
 			    int enable);
 MODULE_SCOPE int	TkMacOSXInitCGDrawing(Tcl_Interp *interp, int enable,
 			    int antiAlias);
-MODULE_SCOPE int	TkMacOSXGenerateFocusEvent(TkWindow *winPtr,
-			    int activeFlag);
-MODULE_SCOPE WindowClass TkMacOSXWindowClass(TkWindow *winPtr);
 MODULE_SCOPE int	TkMacOSXIsWindowZoomed(TkWindow *winPtr);
 MODULE_SCOPE int	TkGenerateButtonEventForXPointer(Window window);
-MODULE_SCOPE EventModifiers TkMacOSXModifierState(void);
 MODULE_SCOPE void       TkMacOSXDrawCGImage(Drawable d, GC gc, CGContextRef context,
 			    CGImageRef image, unsigned long imageForeground,
 			    unsigned long imageBackground, CGRect imageBounds,
@@ -265,11 +257,6 @@ MODULE_SCOPE void	TkMacOSXRestoreDrawingContext(
 			    TkMacOSXDrawingContext *dcPtr);
 MODULE_SCOPE void	TkMacOSXSetColorInContext(GC gc, unsigned long pixel,
 			    CGContextRef context);
-MODULE_SCOPE int	TkMacOSXMakeFullscreen(TkWindow *winPtr,
-			    NSWindow *window, int fullscreen,
-			    Tcl_Interp *interp);
-MODULE_SCOPE void	TkMacOSXEnterExitFullscreen(TkWindow *winPtr,
-			    int active);
 MODULE_SCOPE NSWindow*	TkMacOSXDrawableWindow(Drawable drawable);
 #define TkMacOSXDrawableView(macWin) (TKContentView *)TkMacOSXGetRootControl((Drawable)(macWin))
 MODULE_SCOPE void	TkMacOSXWinCGBounds(TkWindow *winPtr, CGRect *bounds);
diff --git a/macosx/tkMacOSXRegion.c b/macosx/tkMacOSXRegion.c
index 00521e8..6c70a63 100644
--- a/macosx/tkMacOSXRegion.c
+++ b/macosx/tkMacOSXRegion.c
@@ -479,7 +479,7 @@ XOffsetRegion(
  *----------------------------------------------------------------------
  *
  * TkMacOSXHIShapeCreateEmpty, TkMacOSXHIShapeCreateMutableWithRect,
- * TkMacOSXHIShapeSetWithShape, TkMacOSXHIShapeSetWithRect,
+ * TkMacOSXHIShapeSetWithShape,
  * TkMacOSHIShapeDifferenceWithRect, TkMacOSHIShapeUnionWithRect,
  * TkMacOSHIShapeUnion --
  *
@@ -518,22 +518,6 @@ TkMacOSXHIShapeSetWithShape(
     return result;
 }
 
-#if 0
-OSStatus
-TkMacOSXHIShapeSetWithRect(
-    HIMutableShapeRef inShape,
-    const CGRect *inRect)
-{
-    OSStatus result;
-    HIShapeRef rgn = HIShapeCreateWithRect(inRect);
-
-    result = TkMacOSXHIShapeSetWithShape(inShape, rgn);
-    CFRelease(rgn);
-
-    return result;
-}
-#endif
-
 OSStatus
 TkMacOSHIShapeDifferenceWithRect(
     HIMutableShapeRef inShape,
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 78c8bef..1be213b 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -536,35 +536,6 @@ GenerateUpdates(
 /*
  *----------------------------------------------------------------------
  *
- * GenerateActivateEvents --
- *
- *	Given a Macintosh window activate event this function generates all the
- *	X Activate events needed by Tk.
- *
- * Results:
- *	True if event(s) are generated - false otherwise.
- *
- * Side effects:
- *	Additional events may be placed on the Tk event queue.
- *
- *----------------------------------------------------------------------
- */
-
-int
-GenerateActivateEvents(
-    TkWindow *winPtr,
-    int activeFlag)
-{
-    TkGenerateActivateEvents(winPtr, activeFlag);
-    if (activeFlag || ![NSApp isActive]) {
-	TkMacOSXGenerateFocusEvent(winPtr, activeFlag);
-    }
-    return true;
-}
-
-/*
- *----------------------------------------------------------------------
- *
  * TkMacOSXGenerateFocusEvent --
  *
  *	Given a Macintosh window activate event this function generates all
@@ -579,7 +550,7 @@ GenerateActivateEvents(
  *----------------------------------------------------------------------
  */
 
-MODULE_SCOPE int
+static int
 TkMacOSXGenerateFocusEvent(
     TkWindow *winPtr,		/* Root X window for event. */
     int activeFlag)
@@ -621,6 +592,35 @@ TkMacOSXGenerateFocusEvent(
 /*
  *----------------------------------------------------------------------
  *
+ * GenerateActivateEvents --
+ *
+ *	Given a Macintosh window activate event this function generates all the
+ *	X Activate events needed by Tk.
+ *
+ * Results:
+ *	True if event(s) are generated - false otherwise.
+ *
+ * Side effects:
+ *	Additional events may be placed on the Tk event queue.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int
+GenerateActivateEvents(
+    TkWindow *winPtr,
+    int activeFlag)
+{
+    TkGenerateActivateEvents(winPtr, activeFlag);
+    if (activeFlag || ![NSApp isActive]) {
+	TkMacOSXGenerateFocusEvent(winPtr, activeFlag);
+    }
+    return true;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
  * TkGenWMConfigureEvent --
  *
  *	Generate a ConfigureNotify event for Tk. Depending on the value of flag
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 1dc79e4..faad78e 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -6453,29 +6453,6 @@ TkpIsWindowFloating(
 }
 
 /*
- *----------------------------------------------------------------------
- *
- * TkMacOSXWindowClass --
- *
- *	Returns OS X window class of window
- *
- * Results:
- *	1 or 0 depending on window's floating attribute.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-MODULE_SCOPE WindowClass
-TkMacOSXWindowClass(
-    TkWindow *winPtr)
-{
-    return winPtr->wmInfoPtr->macClass;
-}
-
-/*
  *--------------------------------------------------------------
  *
  * TkMacOSXWindowOffset --
-- 
cgit v0.12


From cd0daf6b28c452b2b473b1a0064b2c95634abe59 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Tue, 1 Sep 2020 02:06:58 +0000
Subject: Suggestions for name cleanup with compatibiltiy for 8.6.11

---
 generic/tk.decls             | 11 ++++--
 generic/tkPlatDecls.h        | 24 ++++++++------
 generic/tkStubInit.c         |  4 +--
 macosx/tkMacOSX.h            |  6 ++++
 macosx/tkMacOSXColor.c       |  4 +--
 macosx/tkMacOSXDialog.c      | 14 +++++---
 macosx/tkMacOSXDraw.c        | 25 ++++++++++----
 macosx/tkMacOSXImage.c       |  8 ++---
 macosx/tkMacOSXInt.h         |  8 ++---
 macosx/tkMacOSXKeyEvent.c    |  4 +--
 macosx/tkMacOSXMenu.c        |  3 +-
 macosx/tkMacOSXMouseEvent.c  |  8 ++---
 macosx/tkMacOSXPrivate.h     |  9 +----
 macosx/tkMacOSXScale.c       |  2 +-
 macosx/tkMacOSXScrlbr.c      |  6 ++--
 macosx/tkMacOSXSubwindows.c  | 79 +++++++++++++++++++++-----------------------
 macosx/tkMacOSXWindowEvent.c |  2 +-
 macosx/tkMacOSXWm.c          | 57 ++++++++++++++++++--------------
 macosx/ttkMacOSXTheme.c      |  2 +-
 19 files changed, 150 insertions(+), 126 deletions(-)

diff --git a/generic/tk.decls b/generic/tk.decls
index 12b8062..cfc0556 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -1140,12 +1140,17 @@ declare 10 aqua {
     int Tk_MacOSXIsAppInFront(void)
 }
 declare 11 aqua {
-    TkWindow* TkMacOSXGetTkWindow(void *w)
+    TkWindow* TkMacOSXGetTkWindow(NSWindow *w)
 }
 declare 12 aqua {
-    void *TkMacOSXGetCGContextForDrawable(Drawable drawable)
+    struct CGContext *TkMacOSXGetCGContextForDrawable(Drawable drawable)
+}
+declare 13 aqua {
+    NSView* TkMacOSXGetNSViewForDrawable(Drawable drawable)
+}
+declare 14 aqua {
+    NSWindow* TkMacOSXGetNSWindowForDrawable(Drawable drawable)
 }
-
 declare 16 aqua {
     void TkGenWMConfigureEvent_(Tk_Window tkwin, int x, int y, int width,
 	    int height, int flags)
diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h
index 3485f35..97ecb1f 100644
--- a/generic/tkPlatDecls.h
+++ b/generic/tkPlatDecls.h
@@ -83,11 +83,13 @@ EXTERN void		Tk_MacOSXSetupTkNotifier(void);
 /* 10 */
 EXTERN int		Tk_MacOSXIsAppInFront(void);
 /* 11 */
-EXTERN TkWindow*	TkMacOSXGetTkWindow(void *w);
+EXTERN TkWindow*	TkMacOSXGetTkWindow(NSWindow *w);
 /* 12 */
-EXTERN void *		TkMacOSXGetCGContextForDrawable(Drawable drawable);
-/* Slot 13 is reserved */
-/* Slot 14 is reserved */
+EXTERN struct CGContext * TkMacOSXGetCGContextForDrawable(Drawable drawable);
+/* 13 */
+EXTERN NSView*		TkMacOSXGetNSViewForDrawable(Drawable drawable);
+/* 14 */
+EXTERN NSWindow*	TkMacOSXGetNSWindowForDrawable(Drawable drawable);
 /* Slot 15 is reserved */
 /* 16 */
 EXTERN void		TkGenWMConfigureEvent_(Tk_Window tkwin, int x, int y,
@@ -118,10 +120,10 @@ typedef struct TkPlatStubs {
     void * (*tkMacOSXGetRootControl) (Drawable drawable); /* 8 */
     void (*tk_MacOSXSetupTkNotifier) (void); /* 9 */
     int (*tk_MacOSXIsAppInFront) (void); /* 10 */
-    TkWindow* (*tkMacOSXGetTkWindow) (void *w); /* 11 */
-    void * (*tkMacOSXGetCGContextForDrawable) (Drawable drawable); /* 12 */
-    void (*reserved13)(void);
-    void (*reserved14)(void);
+    TkWindow* (*tkMacOSXGetTkWindow) (NSWindow *w); /* 11 */
+    struct CGContext * (*tkMacOSXGetCGContextForDrawable) (Drawable drawable); /* 12 */
+    NSView* (*tkMacOSXGetNSViewForDrawable) (Drawable drawable); /* 13 */
+    NSWindow* (*tkMacOSXGetNSWindowForDrawable) (Drawable drawable); /* 14 */
     void (*reserved15)(void);
     void (*tkGenWMConfigureEvent_) (Tk_Window tkwin, int x, int y, int width, int height, int flags); /* 16 */
 #endif /* AQUA */
@@ -180,8 +182,10 @@ extern const TkPlatStubs *tkPlatStubsPtr;
 	(tkPlatStubsPtr->tkMacOSXGetTkWindow) /* 11 */
 #define TkMacOSXGetCGContextForDrawable \
 	(tkPlatStubsPtr->tkMacOSXGetCGContextForDrawable) /* 12 */
-/* Slot 13 is reserved */
-/* Slot 14 is reserved */
+#define TkMacOSXGetNSViewForDrawable \
+	(tkPlatStubsPtr->tkMacOSXGetNSViewForDrawable) /* 13 */
+#define TkMacOSXGetNSWindowForDrawable \
+	(tkPlatStubsPtr->tkMacOSXGetNSWindowForDrawable) /* 14 */
 /* Slot 15 is reserved */
 #define TkGenWMConfigureEvent_ \
 	(tkPlatStubsPtr->tkGenWMConfigureEvent_) /* 16 */
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 4cd4ba9..9c190ef 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -1015,8 +1015,8 @@ static const TkPlatStubs tkPlatStubs = {
     Tk_MacOSXIsAppInFront, /* 10 */
     TkMacOSXGetTkWindow, /* 11 */
     TkMacOSXGetCGContextForDrawable, /* 12 */
-    0, /* 13 */
-    0, /* 14 */
+    TkMacOSXGetNSViewForDrawable, /* 13 */
+    TkMacOSXGetNSWindowForDrawable, /* 14 */
     0, /* 15 */
     TkGenWMConfigureEvent_, /* 16 */
 #endif /* AQUA */
diff --git a/macosx/tkMacOSX.h b/macosx/tkMacOSX.h
index 05ea6c2..81456f5 100644
--- a/macosx/tkMacOSX.h
+++ b/macosx/tkMacOSX.h
@@ -29,6 +29,12 @@ typedef int (Tk_MacOSXEmbedMakeContainerExistProc) (Tk_Window window);
 typedef void (Tk_MacOSXEmbedGetClipProc) (Tk_Window window, TkRegion rgn);
 typedef void (Tk_MacOSXEmbedGetOffsetInParentProc) (Tk_Window window, void *ulCorner);
 
+/*
+ * Declare these classes so stubs use them as parameter or return types.
+ */
+
+@class NSWindow;
+@class NSView;
 #include "tkPlatDecls.h"
 
 #endif /* _TKMAC */
diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index fd39197..695c654 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -438,7 +438,7 @@ TkMacOSXInDarkMode(Tk_Window tkwin)
 	NSAppearanceName name;
 	NSView *view = nil;
 	if (winPtr && winPtr->privatePtr) {
-	    view = TkMacOSXDrawableView((Drawable)winPtr->privatePtr);
+	    view = TkMacOSXGetNSViewForDrawable((Drawable)winPtr->privatePtr);
 	}
 	if (view) {
 	    name = [[view effectiveAppearance] name];
@@ -748,7 +748,7 @@ TkpGetColor(
     if (tkwin) {
 	display = Tk_Display(tkwin);
 	Drawable d = (Drawable)Tk_WindowId(tkwin);
-	view = TkMacOSXDrawableView(d);
+	view = TkMacOSXGetNSViewForDrawable(d);
     }
 
     /*
diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c
index 026439f..3cddaea 100644
--- a/macosx/tkMacOSXDialog.c
+++ b/macosx/tkMacOSXDialog.c
@@ -643,6 +643,7 @@ Tk_GetOpenFileObjCmd(
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     Tk_Window tkwin = clientData;
+    TkWindow *winPtr = clientData;
     char *str;
     int i, result = TCL_ERROR, haveParentOption = 0;
     int index, len, multiple = 0;
@@ -814,7 +815,7 @@ Tk_GetOpenFileObjCmd(
 	[openpanel setDirectoryURL:fileURL];
     }
     if (haveParentOption) {
-	parent = TkMacOSXDrawableWindow(((TkWindow *) tkwin)->window);
+	parent = TkMacOSXGetNSWindowForDrawable((Drawable) winPtr->window);
 	parentIsKey = parent && [parent isKeyWindow];
     } else {
 	parent = nil;
@@ -914,6 +915,7 @@ Tk_GetSaveFileObjCmd(
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     Tk_Window tkwin = clientData;
+    TkWindow *winPtr = clientData;
     char *str;
     int i, result = TCL_ERROR, haveParentOption = 0;
     int confirmOverwrite = 1;
@@ -1100,7 +1102,7 @@ Tk_GetSaveFileObjCmd(
 	[savepanel setNameFieldStringValue:@""];
     }
     if (haveParentOption) {
-	parent = TkMacOSXDrawableWindow(((TkWindow *) tkwin)->window);
+	parent = TkMacOSXGetNSWindowForDrawable((Drawable) winPtr->window);
 	parentIsKey = parent && [parent isKeyWindow];
     } else {
 	parent = nil;
@@ -1156,6 +1158,7 @@ Tk_ChooseDirectoryObjCmd(
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     Tk_Window tkwin = clientData;
+    TkWindow *winPtr = clientData;
     char *str;
     int i, result = TCL_ERROR, haveParentOption = 0;
     int index, len, mustexist = 0;
@@ -1242,10 +1245,10 @@ Tk_ChooseDirectoryObjCmd(
     if (!directory) {
 	directory = @"/";
     }
-    parent = TkMacOSXDrawableWindow(((TkWindow *) tkwin)->window);
+    parent = TkMacOSXGetNSWindowForDrawable((Drawable) winPtr->window);
     [panel setDirectoryURL:[NSURL fileURLWithPath:directory isDirectory:YES]];
     if (haveParentOption) {
-	parent = TkMacOSXDrawableWindow(((TkWindow *) tkwin)->window);
+	parent = TkMacOSXGetNSWindowForDrawable((Drawable) winPtr->window);
 	parentIsKey = parent && [parent isKeyWindow];
     } else {
 	parent = nil;
@@ -1392,6 +1395,7 @@ Tk_MessageBoxObjCmd(
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     Tk_Window tkwin = clientData;
+    TkWindow *winPtr = (TkWindow *)clientData;
     char *str;
     int i, result = TCL_ERROR, haveParentOption = 0;
     int index, typeIndex, iconIndex, indexDefaultOption = 0;
@@ -1529,7 +1533,7 @@ Tk_MessageBoxObjCmd(
     callbackInfo->cmdObj = cmdObj;
     callbackInfo->interp = interp;
     callbackInfo->typeIndex = typeIndex;
-    parent = TkMacOSXDrawableWindow(((TkWindow *) tkwin)->window);
+    parent = TkMacOSXGetNSWindowForDrawable((Drawable) winPtr->window);
     if (haveParentOption && parent && ![parent attachedSheet]) {
 	parentIsKey = [parent isKeyWindow];
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index dcec1f6..9201855 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -207,7 +207,7 @@ CreateNSImageFromPixmap(
     CGImageRef cgImage;
     NSImage *nsImage;
     NSBitmapImageRep *bitmapImageRep;
-    CGContextRef context = TkMacOSXCGContext(pixmap);
+    CGContextRef context = TkMacOSXGetCGContextForDrawable(pixmap);
 
     if (context) {
 	cgImage = CGBitmapContextCreateImage(context);
@@ -239,7 +239,7 @@ CreateNSImageFromPixmap(
  *----------------------------------------------------------------------
  */
 
-void *
+CGContextRef
 TkMacOSXGetCGContextForDrawable(
     Drawable drawable)
 {
@@ -285,6 +285,16 @@ TkMacOSXGetCGContextForDrawable(
 
     return (macDraw ? macDraw->context : NULL);
 }
+/*
+ * An obsolete stub with the same effect but returning a void*.
+ */
+
+void *
+TkMacOSXGetDrawablePort(
+    Drawable drawable)
+{
+    return (void *) TkMacOSXGetCGContextForDrawable(drawable);
+}
 
 /*
  *----------------------------------------------------------------------
@@ -1139,8 +1149,9 @@ TkScrollWindow(
     TkRegion damageRgn)		/* Region to accumulate damage in. */
 {
     Drawable drawable = Tk_WindowId(tkwin);
-    MacDrawable *macDraw = (MacDrawable *)drawable;
-    TKContentView *view = TkMacOSXDrawableView(macDraw);
+    NSView *v = TkMacOSXGetNSViewForDrawable(drawable);
+    MacDrawable *macDraw = (MacDrawable *) drawable;
+    TKContentView *view = (TKContentView *) v;
     CGRect srcRect, dstRect;
     HIShapeRef dmgRgn = NULL, extraRgn = NULL;
     NSRect bounds, visRect, scrollSrc, scrollDst;
@@ -1271,7 +1282,7 @@ TkMacOSXSetupDrawingContext(
      */
 
     if (!(macDraw->flags & TK_IS_PIXMAP)) {
-	view = TkMacOSXDrawableView(d);
+	view = (TKContentView *) TkMacOSXGetNSViewForDrawable(d);
 	if (!view) {
 	    Tcl_Panic("TkMacOSXSetupDrawingContext(): "
 		    "no NSView to draw into !");
@@ -1295,7 +1306,7 @@ TkMacOSXSetupDrawingContext(
      * drawing to a window and we use the current context of its ContentView.
      */
 
-    dc.context = TkMacOSXCGContext(d);
+    dc.context = TkMacOSXGetCGContextForDrawable(d);
     if (dc.context) {
 	dc.portBounds = CGContextGetClipBoundingBox(dc.context);
     } else {
@@ -1523,7 +1534,7 @@ TkMacOSXGetClipRgn(
 #ifdef TK_MAC_DEBUG_DRAWING
 	TkMacOSXDbgMsg("%s", macDraw->winPtr->pathName);
 
-	NSView *view = TkMacOSXDrawableView(macDraw);
+	NSView *view = TkMacOSXGetNSViewForDrawable((Drawable) macDraw);
 	CGContextRef context = GET_CGCONTEXT;
 
 	CGContextSaveGState(context);
diff --git a/macosx/tkMacOSXImage.c b/macosx/tkMacOSXImage.c
index c757bb6..445fc89 100644
--- a/macosx/tkMacOSXImage.c
+++ b/macosx/tkMacOSXImage.c
@@ -538,13 +538,13 @@ CreateCGImageFromDrawableRect(
 
 	CGRect image_rect = CGRectMake(x, y, width, height);
 
-	cg_context = TkMacOSXCGContext(drawable);
+	cg_context = TkMacOSXGetCGContextForDrawable(drawable);
 	cg_image = CGBitmapContextCreateImage((CGContextRef) cg_context);
 	if (cg_image) {
 	    result = CGImageCreateWithImageInRect(cg_image, image_rect);
 	    CGImageRelease(cg_image);
 	}
-    } else if (TkMacOSXDrawableView(mac_drawable) != NULL) {
+    } else if (TkMacOSXGetNSViewForDrawable((Drawable) mac_drawable) != NULL) {
 
 	/*
 	 * Convert Tk top-left to NSView bottom-left coordinates.
@@ -597,7 +597,7 @@ CreateCGImageFromPixmap(
     Drawable pixmap)
 {
     CGImageRef img = NULL;
-    CGContextRef context = TkMacOSXCGContext(pixmap);
+    CGContextRef context = TkMacOSXGetCGContextForDrawable(pixmap);
 
     if (context) {
 	img = CGBitmapContextCreateImage(context);
@@ -767,7 +767,7 @@ XCopyArea(
 
     if (srcDraw->flags & TK_IS_PIXMAP) {
 	img = CreateCGImageFromPixmap(src);
-    } else if (TkMacOSXDrawableWindow(src)) {
+    } else if (TkMacOSXGetNSWindowForDrawable((Drawable) src)) {
 	img = CreateCGImageFromDrawableRect(src, src_x, src_y, width, height);
     } else {
 	TkMacOSXDbgMsg("Invalid source drawable - neither window nor pixmap.");
diff --git a/macosx/tkMacOSXInt.h b/macosx/tkMacOSXInt.h
index 6f44014..475a6d2 100644
--- a/macosx/tkMacOSXInt.h
+++ b/macosx/tkMacOSXInt.h
@@ -187,19 +187,15 @@ MODULE_SCOPE void TkpFreeGCCache(GC gc);
 #define TK_DRAW_IN_CONTEXT		1
 
 /*
- * Prototypes of internal procs not in the stubs table.
+ * Prototypes of internal procs that are called from generic or test
+ * code but are not in the stubs table.
  */
 
 MODULE_SCOPE void TkMacOSXDefaultStartupScript(void);
-#if 0
-MODULE_SCOPE int XSetClipRectangles(Display *d, GC gc, int clip_x_origin,
-	int clip_y_origin, XRectangle* rectangles, int n, int ordering);
-#endif
 MODULE_SCOPE void TkpClipDrawableToRect(Display *display, Drawable d, int x,
 	int y, int width, int height);
 MODULE_SCOPE void TkpShiftButton(NSButton *button, NSPoint delta);
 MODULE_SCOPE Bool TkTestLogDisplay(Drawable drawable);
-MODULE_SCOPE Bool TkMacOSXInDarkMode(Tk_Window tkwin);
 
 /*
  * Include the stubbed internal platform-specific API.
diff --git a/macosx/tkMacOSXKeyEvent.c b/macosx/tkMacOSXKeyEvent.c
index 014caa9..809fa77 100644
--- a/macosx/tkMacOSXKeyEvent.c
+++ b/macosx/tkMacOSXKeyEvent.c
@@ -687,7 +687,7 @@ XGrabKeyboard(
     TkWindow *captureWinPtr = (TkWindow *) TkpGetCapture();
 
     if (keyboardGrabWinPtr && captureWinPtr) {
-	NSWindow *w = TkMacOSXDrawableWindow(grab_window);
+	NSWindow *w = TkMacOSXGetNSWindowForDrawable((Drawable) grab_window);
 	MacDrawable *macWin = (MacDrawable *) grab_window;
 
 	if (w && macWin->toplevel->winPtr == (TkWindow *) captureWinPtr) {
@@ -789,7 +789,7 @@ Tk_SetCaretPos(
  {
     TkWindow *winPtr = (TkWindow *) tkwin;
     TkCaret *caretPtr = &(winPtr->dispPtr->caret);
-    NSWindow *w = TkMacOSXDrawableWindow(Tk_WindowId(tkwin));
+    NSWindow *w = TkMacOSXGetNSWindowForDrawable((Drawable) Tk_WindowId(tkwin));
 
     /*
      * Register this widget as being capable of text input, so we know we
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c
index 321b4f8..cafbee3 100644
--- a/macosx/tkMacOSXMenu.c
+++ b/macosx/tkMacOSXMenu.c
@@ -881,7 +881,8 @@ TkpPostMenu(
 	 * rather than the appearance of the root window.
 	 */
 	realWinPtr = (TkWindow*) realWin;
-	realWinView = TkMacOSXDrawableView(realWinPtr->privatePtr);
+	realWinView = TkMacOSXGetNSViewForDrawable(
+			  (Drawable) realWinPtr->privatePtr);
 	if (realWinView != nil) {
 	    break;
 	}
diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index f274a07..04defa3 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -115,7 +115,7 @@ enum {
 	tkwin = TkMacOSXGetCapture();
 	if (tkwin) {
 	    winPtr = (TkWindow *) tkwin;
-	    eventWindow = TkMacOSXDrawableWindow(winPtr->window);
+	    eventWindow = TkMacOSXGetNSWindowForDrawable((Drawable) winPtr->window);
 	    if (eventWindow) {
 		local = [eventWindow tkConvertPointFromScreen: global];
 	    } else {
@@ -134,7 +134,7 @@ enum {
 	tkwin = TkMacOSXGetCapture();
 	if (tkwin) {
 	    winPtr = (TkWindow *) tkwin;
-	    eventWindow = TkMacOSXDrawableWindow(winPtr->window);
+	    eventWindow = TkMacOSXGetNSWindowForDrawable((Drawable) winPtr->window);
 	} else {
 	    eventWindow = [NSApp mainWindow];
 	}
@@ -464,7 +464,7 @@ XQueryPointer(
 
 	if (getLocal) {
 	    MacDrawable *macWin = (MacDrawable *) w;
-	    NSWindow *win = TkMacOSXDrawableWindow(w);
+	    NSWindow *win = TkMacOSXGetNSWindowForDrawable((Drawable) w);
 
 	    if (win) {
 		NSPoint local;
@@ -554,7 +554,7 @@ TkGenerateButtonEvent(
     unsigned int state)		/* Button Key state suitable for X event. */
 {
     MacDrawable *macWin = (MacDrawable *) window;
-    NSWindow *win = TkMacOSXDrawableWindow(window);
+    NSWindow *win = TkMacOSXGetNSWindowForDrawable((Drawable) window);
     MouseEventData med;
 
     bzero(&med, sizeof(MouseEventData));
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h
index 2c7546e..6bac8df 100644
--- a/macosx/tkMacOSXPrivate.h
+++ b/macosx/tkMacOSXPrivate.h
@@ -240,13 +240,6 @@ MODULE_SCOPE OSStatus	TkMacOSHIShapeUnion(HIShapeRef inShape1,
  * Prototypes of TkAqua internal procs.
  */
 
-#define TkMacOSXDrawableWindow(drawable) \
-    (NSWindow *)TkMacOSXDrawable(drawable)
-#define TkMacOSXContentView(drawable) \
-    (TKContentView *)TkMacOSXGetRootControl(drawable)
-#define TkMacOSXCGContext(drawable) \
-    (CGContextRef)TkMacOSXGetCGContextForDrawable(drawable)
-
 MODULE_SCOPE void *	TkMacOSXGetNamedSymbol(const char *module,
 			    const char *symbol);
 MODULE_SCOPE void	TkMacOSXDisplayChanged(Display *display);
@@ -277,7 +270,6 @@ MODULE_SCOPE int	TkMacOSXMakeFullscreen(TkWindow *winPtr,
 			    Tcl_Interp *interp);
 MODULE_SCOPE void	TkMacOSXEnterExitFullscreen(TkWindow *winPtr,
 			    int active);
-#define TkMacOSXDrawableView(macWin) (TKContentView *)TkMacOSXGetRootControl((Drawable)(macWin))
 MODULE_SCOPE void	TkMacOSXWinCGBounds(TkWindow *winPtr, CGRect *bounds);
 MODULE_SCOPE HIShapeRef	TkMacOSXGetClipRgn(Drawable drawable);
 MODULE_SCOPE void	TkMacOSXInvalidateViewRegion(NSView *view,
@@ -308,6 +300,7 @@ MODULE_SCOPE int	TkMacOSXRegisterServiceWidgetObjCmd(ClientData clientData,
 MODULE_SCOPE unsigned   TkMacOSXAddVirtual(unsigned int keycode);
 MODULE_SCOPE void       TkMacOSXWinNSBounds(TkWindow *winPtr, NSView *view,
 					    NSRect *bounds);
+MODULE_SCOPE Bool       TkMacOSXInDarkMode(Tk_Window tkwin);
 MODULE_SCOPE void	TkMacOSXDrawAllViews(ClientData clientData);
 MODULE_SCOPE unsigned long TkMacOSXClearPixel(void);
 
diff --git a/macosx/tkMacOSXScale.c b/macosx/tkMacOSXScale.c
index b1e918b..8a221d5 100644
--- a/macosx/tkMacOSXScale.c
+++ b/macosx/tkMacOSXScale.c
@@ -214,7 +214,7 @@ TkpDisplayScale(
      */
 
     macDraw = (MacDrawable *) Tk_WindowId(tkwin);
-    windowRef = TkMacOSXDrawableWindow(Tk_WindowId(tkwin));
+    windowRef = TkMacOSXGetNSWindowForDrawable((Drawable) Tk_WindowId(tkwin));
 
     /*
      * Create Macintosh control.
diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c
index e70867d..f34862e 100644
--- a/macosx/tkMacOSXScrlbr.c
+++ b/macosx/tkMacOSXScrlbr.c
@@ -175,7 +175,7 @@ static void drawMacScrollbar(
     CGContextRef context)
 {
     Drawable d = (Drawable)Tk_WindowId(scrollPtr->tkwin);
-    NSView *view = TkMacOSXDrawableView(d);
+    NSView *view = TkMacOSXGetNSViewForDrawable(d);
     CGPathRef path;
     CGPoint inner[2], outer[2], thumbOrigin;
     CGSize thumbSize;
@@ -259,7 +259,7 @@ TkpDisplayScrollbar(
     }
 
     MacDrawable *macWin = (MacDrawable *) winPtr->window;
-    NSView *view = TkMacOSXDrawableView(macWin);
+    NSView *view = TkMacOSXGetNSViewForDrawable((Drawable) macWin);
 
     if ((view == NULL)
 	    || (macWin->flags & TK_DO_NOT_DRAW)
@@ -594,7 +594,7 @@ UpdateControlValues(
     HIRect contrlRect;
     short width, height;
 
-    NSView *view = TkMacOSXDrawableView(macWin);
+    NSView *view = TkMacOSXGetNSViewForDrawable((Drawable) macWin);
     CGFloat viewHeight = [view bounds].size.height;
     NSRect frame;
 
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index 05b3b01..a3ef7cc 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -141,7 +141,7 @@ XMapWindow(
     }
     MacDrawable *macWin = (MacDrawable *)window;
     TkWindow *winPtr = macWin->winPtr;
-    NSWindow *win = TkMacOSXDrawableWindow(window);
+    NSWindow *win = TkMacOSXGetNSWindowForDrawable((Drawable) window);
     XEvent event;
 
     /*
@@ -300,7 +300,7 @@ XUnmapWindow(
     MacDrawable *macWin = (MacDrawable *)window;
     TkWindow *winPtr = macWin->winPtr;
     TkWindow *parentPtr = winPtr->parentPtr;
-    NSWindow *win = TkMacOSXDrawableWindow(window);
+    NSWindow *win = TkMacOSXGetNSWindowForDrawable((Drawable) window);
     XEvent event;
 
     display->request++;
@@ -340,9 +340,8 @@ XUnmapWindow(
 	 */
 
 	if (parentPtr && parentPtr->privatePtr->visRgn) {
-	    TkMacOSXInvalidateViewRegion(
-		    TkMacOSXDrawableView(parentPtr->privatePtr),
-		    parentPtr->privatePtr->visRgn);
+	    NSView *view = TkMacOSXGetNSViewForDrawable((Drawable) parentPtr->privatePtr);
+	    TkMacOSXInvalidateViewRegion(view, parentPtr->privatePtr->visRgn);
 	}
 	TkMacOSXInvalClipRgns((Tk_Window) parentPtr);
 	TkMacOSXUpdateClipRgn(parentPtr);
@@ -515,7 +514,7 @@ MoveResizeWindow(
 {
     int deltaX = 0, deltaY = 0, parentBorderwidth = 0;
     MacDrawable *macParent = NULL;
-    NSWindow *macWindow = TkMacOSXDrawableWindow((Drawable)macWin);
+    NSWindow *macWindow = TkMacOSXGetNSWindowForDrawable((Drawable) (Drawable)macWin);
 
     /*
      * Find the Parent window, for an embedded window it will be its container.
@@ -714,7 +713,7 @@ XConfigureWindow(
      */
 
     if (value_mask & CWStackMode) {
-	NSView *view = TkMacOSXDrawableView(macWin);
+	NSView *view = TkMacOSXGetNSViewForDrawable((Drawable) macWin);
 
 	if (view) {
 	    TkMacOSXInvalClipRgns((Tk_Window) winPtr->parentPtr);
@@ -1062,16 +1061,18 @@ TkMacOSXInvalidateWindow(
     if (macWin->flags & TK_CLIP_INVALID) {
 	TkMacOSXUpdateClipRgn(macWin->winPtr);
     }
-    TkMacOSXInvalidateViewRegion(TkMacOSXDrawableView(macWin),
-	    (flag == TK_WINDOW_ONLY) ? macWin->visRgn : macWin->aboveVisRgn);
+    TkMacOSXInvalidateViewRegion(
+	TkMacOSXGetNSViewForDrawable((Drawable) macWin),
+	(flag == TK_WINDOW_ONLY) ? macWin->visRgn : macWin->aboveVisRgn);
 }
 
 /*
  *----------------------------------------------------------------------
  *
- * TkMacOSXDrawable --
+ *  -- TkMacOSXGetNSWindowForDrawable
  *
- *	This function returns the NSWindow for a given X drawable.
+ *	This is a stub function which returns the NSWindow for a given
+ *      X drawable.
  *
  * Results:
  *	A NSWindow, or nil for off screen pixmaps.
@@ -1082,8 +1083,8 @@ TkMacOSXInvalidateWindow(
  *----------------------------------------------------------------------
  */
 
-void *
-TkMacOSXDrawable(
+NSWindow *
+TkMacOSXGetNSWindowForDrawable(
     Drawable drawable)
 {
     MacDrawable *macWin = (MacDrawable *)drawable;
@@ -1102,48 +1103,29 @@ TkMacOSXDrawable(
 	TkWindow *contWinPtr = TkpGetOtherWindow(macWin->toplevel->winPtr);
 
 	if (contWinPtr) {
-	    result = TkMacOSXDrawableWindow((Drawable)contWinPtr->privatePtr);
+	    result = TkMacOSXGetNSWindowForDrawable((Drawable) (Drawable)contWinPtr->privatePtr);
 	}
     }
     return result;
 }
-
+
 /*
- *----------------------------------------------------------------------
- *
- * TkMacOSXGetDrawablePort --
- *
- *	This function only exists because it is listed in the stubs table.
- *      It is useless.
- *
- * Results:
- *	NULL.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
+ * An obsolete stub with the same effect, but returning a void*
  */
 
 void *
-TkMacOSXGetDrawablePort(
-    TCL_UNUSED(Drawable))
+TkMacOSXDrawable(
+    Drawable drawable)
 {
-    return NULL;
+    return TkMacOSXGetNSWindowForDrawable(drawable);
 }
 
 /*
  *----------------------------------------------------------------------
  *
- * TkMacOSXDrawableView/TkMacOSXGetRootControl --
- *
- *	The function name TkMacOSXGetRootControl is being preserved only
- *      because it exists in a stubs table.  Nobody knows what it means to
- *      get a "RootControl".  The macro TkMacOSXDrawableView calls this
- *      function and should always be used rather than directly using the
- *      obscure official name of this function.
+ * TkMacOSXGetNSViewForDrawable --
  *
- *      It returns the TKContentView for a given X drawable in the case that the
+ *      Returns the TKContentView for a given X drawable in the case that the
  *      drawable is a window.  If the drawable is a pixmap it returns nil.
  *
  * Results:
@@ -1155,8 +1137,8 @@ TkMacOSXGetDrawablePort(
  *----------------------------------------------------------------------
  */
 
-void *
-TkMacOSXGetRootControl(
+NSView *
+TkMacOSXGetNSViewForDrawable(
     Drawable drawable)
 {
     void *result = NULL;
@@ -1177,6 +1159,19 @@ TkMacOSXGetRootControl(
     }
     return result;
 }
+
+/*
+ * Obsolete stub which has the same effect but returns a void*.
+ * Preserved for backwards compatibility.
+ */
+
+void *
+TkMacOSXGetRootControl(
+    Drawable drawable)
+{
+    return (void *) TkMacOSXGetNSViewForDrawable(drawable);
+}
+
 
 /*
  *----------------------------------------------------------------------
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 78c8bef..8378813 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -427,7 +427,7 @@ TkpWillDrawWidget(Tk_Window tkwin) {
     int result;
     if (tkwin) {
 	TkWindow *winPtr = (TkWindow *)tkwin;
-	TKContentView *view = TkMacOSXDrawableView(
+	TKContentView *view = (TKContentView *)TkMacOSXGetNSViewForDrawable(
 	    (Drawable)winPtr->privatePtr);
 	result = ([NSApp isDrawing] && view == [NSView focusView]);
 #if 0
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 8918866..4798cd8 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -523,7 +523,8 @@ static void
 SetWindowSizeLimits(
     TkWindow *winPtr)
 {
-    NSWindow *macWindow = TkMacOSXDrawableWindow(winPtr->window);
+    NSWindow *macWindow = TkMacOSXGetNSWindowForDrawable(
+			      (Drawable) winPtr->window);
     WmInfo *wmPtr = winPtr->wmInfoPtr;
     int minWidth, minHeight, maxWidth, maxHeight, base;
 
@@ -1534,7 +1535,7 @@ WmAttributesCmd(
     if (!TkMacOSXHostToplevelExists(winPtr)) {
 	TkMacOSXMakeRealWindowExist(winPtr);
     }
-    macWindow = TkMacOSXDrawableWindow(winPtr->window);
+    macWindow = TkMacOSXGetNSWindowForDrawable((Drawable) winPtr->window);
 
     if (objc == 3) {		/* wm attributes $win */
 	Tcl_Obj *result = Tcl_NewObj();
@@ -1800,7 +1801,7 @@ WmDeiconifyCmd(
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     WmInfo *wmPtr = winPtr->wmInfoPtr;
-    NSWindow *win = TkMacOSXDrawableWindow(winPtr->window);
+    NSWindow *win = TkMacOSXGetNSWindowForDrawable((Drawable) winPtr->window);
 
     if (objc != 3) {
 	Tcl_WrongNumArgs(interp, 2, objv, "window");
@@ -2040,7 +2041,7 @@ WmGeometryCmd(
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     WmInfo *wmPtr = winPtr->wmInfoPtr;
-    NSWindow *win = TkMacOSXDrawableWindow(winPtr->window);
+    NSWindow *win = TkMacOSXGetNSWindowForDrawable((Drawable) winPtr->window);
     char xSign = '+', ySign = '+';
     int width, height, x = wmPtr->x, y= wmPtr->y;
     char *argv3;
@@ -2292,8 +2293,9 @@ WmIconbitmapCmd(
     if (!TkMacOSXHostToplevelExists(winPtr)) {
 	TkMacOSXMakeRealWindowExist(winPtr);
     }
-    if (WmSetAttribute(winPtr, TkMacOSXDrawableWindow(winPtr->window), interp,
-	    WMATT_TITLEPATH, objv[3]) == TCL_OK) {
+    if (WmSetAttribute(winPtr,
+	   TkMacOSXGetNSWindowForDrawable((Drawable) winPtr->window), interp,
+	   WMATT_TITLEPATH, objv[3]) == TCL_OK) {
 	if (!len) {
 	    if (wmPtr->hints.icon_pixmap != None) {
 		Tk_FreeBitmap(winPtr->display, wmPtr->hints.icon_pixmap);
@@ -2725,7 +2727,8 @@ WmIconwindowCmd(
 	if (wmPtr->icon != NULL) {
 	    TkWindow *oldIcon = (TkWindow *)wmPtr->icon;
 	    WmInfo *wmPtr3 = oldIcon->wmInfoPtr;
-	    NSWindow *win = TkMacOSXDrawableWindow(oldIcon->window);
+	    NSWindow *win = TkMacOSXGetNSWindowForDrawable(
+			        (Drawable) oldIcon->window);
 
 	    /*
 	     * The old icon should be withdrawn.
@@ -2955,7 +2958,8 @@ WmOverrideredirectCmd(
 {
     int flag;
     XSetWindowAttributes atts;
-    TKWindow *win = (TKWindow *)TkMacOSXDrawableWindow(winPtr->window);
+    TKWindow *win = (TKWindow *)TkMacOSXGetNSWindowForDrawable(
+				    (Drawable) winPtr->window);
 
     if ((objc != 3) && (objc != 4)) {
 	Tcl_WrongNumArgs(interp, 2, objv, "window ?boolean?");
@@ -4988,7 +4992,7 @@ TkWmRestackToplevel(
 	    wmPtr->hints.initial_state == WithdrawnState) {
 	return;
     }
-    macWindow = TkMacOSXDrawableWindow(winPtr->window);
+    macWindow = TkMacOSXGetNSWindowForDrawable((Drawable) winPtr->window);
     if (macWindow == nil) {
 	return;
     }
@@ -5004,7 +5008,8 @@ TkWmRestackToplevel(
 		otherWmPtr->hints.initial_state == WithdrawnState) {
 	    return;
 	}
-	otherMacWindow = TkMacOSXDrawableWindow(otherPtr->window);
+	otherMacWindow = TkMacOSXGetNSWindowForDrawable(
+			     (Drawable) otherPtr->window);
 	if (otherMacWindow == nil) {
 	    return;
 	}
@@ -5346,7 +5351,7 @@ TkSetWMName(
     }
 
     NSString *title = [[NSString alloc] initWithUTF8String:titleUid];
-    [TkMacOSXDrawableWindow(winPtr->window) setTitle:title];
+    [TkMacOSXGetNSWindowForDrawable((Drawable) winPtr->window) setTitle:title];
     [title release];
 }
 
@@ -5415,6 +5420,7 @@ TkMacOSXGetXWindow(
  * TkMacOSXGetTkWindow --
  *
  *	Returns the TkWindow* associated with the given NSWindow*.
+ *      This function is available as a stub.
  *
  * Results:
  *	The TkWindow* returned. NULL is returned if not a Tk window.
@@ -5427,7 +5433,7 @@ TkMacOSXGetXWindow(
 
 TkWindow *
 TkMacOSXGetTkWindow(
-    void *w)
+    NSWindow *w)
 {
     Window window = TkMacOSXGetXWindow((NSWindow *)w);
     TkDisplay *dispPtr = TkGetDisplayList();
@@ -5458,7 +5464,8 @@ MODULE_SCOPE int
 TkMacOSXIsWindowZoomed(
     TkWindow *winPtr)
 {
-    NSWindow *macWindow = TkMacOSXDrawableWindow(winPtr->window);
+    NSWindow *macWindow = TkMacOSXGetNSWindowForDrawable(
+			      (Drawable) winPtr->window);
     return [macWindow isZoomed];
 }
 
@@ -5840,13 +5847,14 @@ WmWinTabbingId(
 #if !(MAC_OS_X_VERSION_MAX_ALLOWED < 101200)
     Tcl_Obj *result = NULL;
     NSString *idString;
-    NSWindow *win = TkMacOSXDrawableWindow(winPtr->window);
+    NSWindow *win = TkMacOSXGetNSWindowForDrawable((Drawable) winPtr->window);
     if (win) {
 	idString = win.tabbingIdentifier;
 	result = Tcl_NewStringObj(idString.UTF8String, [idString length]);
     }
     if (result == NULL) {
-	NSLog(@"Failed to read tabbing identifier; try calling update idletasks before getting/setting the tabbing identifier of the window.");
+	NSLog(@"Failed to read tabbing identifier; try calling update idletasks"
+	      " before getting/setting the tabbing identifier of the window.");
 	return TCL_OK;
     }
     Tcl_SetObjResult(interp, result);
@@ -5930,7 +5938,7 @@ WmWinAppearance(
 #endif // MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
 
     const char *resultString = "unrecognized";
-    NSWindow *win = TkMacOSXDrawableWindow(winPtr->window);
+    NSWindow *win = TkMacOSXGetNSWindowForDrawable((Drawable) winPtr->window);
     if (win) {
 	appearance = win.appearance.name;
 	if (appearance == nil) {
@@ -6191,7 +6199,7 @@ TkpRedrawWidget(Tk_Window tkwin) {
     if ([NSApp isDrawing]) {
 	return;
     }
-    w = TkMacOSXDrawableWindow(winPtr->window);
+    w = TkMacOSXGetNSWindowForDrawable((Drawable) winPtr->window);
     if (w) {
 	TKContentView *view = [w contentView];
 	TkMacOSXWinBounds(winPtr, &tkBounds);
@@ -6400,7 +6408,7 @@ TkpWmSetState(
 	return;
     }
 
-    macWin = TkMacOSXDrawableWindow(winPtr->window);
+    macWin = TkMacOSXGetNSWindowForDrawable((Drawable) winPtr->window);
 
     if (state == WithdrawnState) {
 	Tk_UnmapWindow((Tk_Window) winPtr);
@@ -6599,7 +6607,7 @@ TkpChangeFocus(
     }
 
     if (Tk_IsTopLevel(winPtr) && !Tk_IsEmbedded(winPtr)) {
-    	NSWindow *win = TkMacOSXDrawableWindow(winPtr->window);
+    	NSWindow *win = TkMacOSXGetNSWindowForDrawable((Drawable) winPtr->window);
 
     	TkWmRestackToplevel(winPtr, Above, NULL);
     	if (force) {
@@ -6654,7 +6662,8 @@ WmStackorderToplevelWrapperMap(
     if (Tk_IsMapped(winPtr) && Tk_IsTopLevel(winPtr) && !Tk_IsEmbedded(winPtr)
 	    && (winPtr->display == display)) {
 	hPtr = Tcl_CreateHashEntry(table,
-		(char*) TkMacOSXDrawableWindow(winPtr->window), &newEntry);
+		(char*) TkMacOSXGetNSWindowForDrawable((Drawable) winPtr->window),
+		&newEntry);
 	Tcl_SetHashValue(hPtr, winPtr);
     }
 
@@ -6782,7 +6791,7 @@ ApplyWindowAttributeFlagChanges(
 		}
 		TkMacOSXMakeRealWindowExist(winPtr);
 	    }
-	    macWindow = TkMacOSXDrawableWindow(winPtr->window);
+	    macWindow = TkMacOSXGetNSWindowForDrawable((Drawable) winPtr->window);
 	}
 	if ((changedAttributes & kWindowCloseBoxAttribute) || initial) {
 	    [[macWindow standardWindowButton:NSWindowCloseButton]
@@ -6954,7 +6963,7 @@ ApplyContainerOverrideChanges(
 
     if (!macWindow && winPtr->window != None &&
 	    TkMacOSXHostToplevelExists(winPtr)) {
-	macWindow = TkMacOSXDrawableWindow(winPtr->window);
+	macWindow = TkMacOSXGetNSWindowForDrawable((Drawable) winPtr->window);
     }
     styleMask = [macWindow styleMask];
 
@@ -7030,8 +7039,8 @@ ApplyContainerOverrideChanges(
 
 	    if (containerWinPtr && (containerWinPtr->window != None)
 		    && TkMacOSXHostToplevelExists(containerWinPtr)) {
-		NSWindow *containerMacWin = TkMacOSXDrawableWindow(
-			containerWinPtr->window);
+		NSWindow *containerMacWin = TkMacOSXGetNSWindowForDrawable(
+			(Drawable) containerWinPtr->window);
 
 		/*
 		 * Try to add the transient window as a child window of the
diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c
index 37d3631..10b90dd 100644
--- a/macosx/ttkMacOSXTheme.c
+++ b/macosx/ttkMacOSXTheme.c
@@ -547,7 +547,7 @@ static void DrawListHeader(
      * So we have to query the Apple window manager.
      */
 
-    NSWindow *win = TkMacOSXDrawableWindow(Tk_WindowId(tkwin));
+    NSWindow *win = TkMacOSXGetNSWindowForDrawable((Drawable) Tk_WindowId(tkwin));
     CGFloat *bgRGBA = [win isKeyWindow] ? activeBgRGBA : inactiveBgRGBA;
     CGFloat x = bounds.origin.x, y = bounds.origin.y;
     CGFloat w = bounds.size.width, h = bounds.size.height;
-- 
cgit v0.12


From 80de0712f1991eb5ccfad6527e751318e3036881 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 1 Sep 2020 07:35:36 +0000
Subject: TkRegion cannot be used in tkMacOSX.h

---
 macosx/tkMacOSX.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/macosx/tkMacOSX.h b/macosx/tkMacOSX.h
index 05ea6c2..3ab0a34 100644
--- a/macosx/tkMacOSX.h
+++ b/macosx/tkMacOSX.h
@@ -26,7 +26,7 @@
 typedef int (Tk_MacOSXEmbedRegisterWinProc) (long winID, Tk_Window window);
 typedef void* (Tk_MacOSXEmbedGetGrafPortProc) (Tk_Window window);
 typedef int (Tk_MacOSXEmbedMakeContainerExistProc) (Tk_Window window);
-typedef void (Tk_MacOSXEmbedGetClipProc) (Tk_Window window, TkRegion rgn);
+typedef void (Tk_MacOSXEmbedGetClipProc) (Tk_Window window, void *rgn);
 typedef void (Tk_MacOSXEmbedGetOffsetInParentProc) (Tk_Window window, void *ulCorner);
 
 #include "tkPlatDecls.h"
-- 
cgit v0.12


From e40f7fb58ec75a963d483f76cedd2ce59e5e2845 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Tue, 1 Sep 2020 19:40:21 +0000
Subject: Remove a couple of superfluous casts.

---
 macosx/tkMacOSXSubwindows.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index 375aefd..f782d82 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -1172,7 +1172,7 @@ void *
 Tk_MacOSXGetNSViewForDrawable(
     Drawable drawable)
 {
-    return (void *) TkMacOSXGetNSViewForDrawable(drawable);
+    return TkMacOSXGetNSViewForDrawable(drawable);
 }
 
 /*
@@ -1183,7 +1183,7 @@ void *
 TkMacOSXGetRootControl(
     Drawable drawable)
 {
-    return (void *) TkMacOSXGetNSViewForDrawable(drawable);
+    return TkMacOSXGetNSViewForDrawable(drawable);
 }
 
 
-- 
cgit v0.12


From a5a75fd79518333976b2b5f8e0887b1eac08e72d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 2 Sep 2020 08:29:48 +0000
Subject: Eliminate MODULE_SCOPE wrapper function for TkMacOSXDrawable().
 Rename (internal) TkMacOSXDrawableWindow() to
 TkMacOSXGetNSWindowForDrawable(). Code (type-cast) cleanup

---
 macosx/tkMacOSXDialog.c      |  63 ++++++++++++-----------
 macosx/tkMacOSXDraw.c        |  48 +++++++++---------
 macosx/tkMacOSXEmbed.c       |   8 +--
 macosx/tkMacOSXFont.c        |   2 +-
 macosx/tkMacOSXImage.c       |   2 +-
 macosx/tkMacOSXInit.c        |   2 +-
 macosx/tkMacOSXInt.h         |   1 -
 macosx/tkMacOSXKeyEvent.c    |  16 +++---
 macosx/tkMacOSXMenubutton.c  |   2 +-
 macosx/tkMacOSXMenus.c       |   2 +-
 macosx/tkMacOSXMouseEvent.c  |  16 +++---
 macosx/tkMacOSXPrivate.h     |   3 +-
 macosx/tkMacOSXScale.c       |   2 +-
 macosx/tkMacOSXSubwindows.c  |  45 +++++++----------
 macosx/tkMacOSXTest.c        |   2 +-
 macosx/tkMacOSXWindowEvent.c |  22 ++++----
 macosx/tkMacOSXWm.c          | 116 +++++++++++++++++++++----------------------
 macosx/ttkMacOSXTheme.c      |   2 +-
 18 files changed, 177 insertions(+), 177 deletions(-)

diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c
index 026439f..c2b1b15 100644
--- a/macosx/tkMacOSXDialog.c
+++ b/macosx/tkMacOSXDialog.c
@@ -198,13 +198,17 @@ getFileURL(
 @implementation TKApplication(TKDialog)
 
 - (BOOL)panel:(id)sender shouldEnableURL:(NSURL *)url {
+	(void)sender;
+	(void)url;
     return YES;
 }
 
 - (void)panel:(id)sender didChangeToDirectoryURL:(NSURL *)url {
+    (void)sender; (void)url;
 }
 
 - (BOOL)panel:(id)sender validateURL:(NSURL *)url error:(NSError **)outError {
+    (void)sender; (void)url;
     *outError = nil;
     return YES;
 }
@@ -233,7 +237,7 @@ getFileURL(
 		    callbackInfo->cmdObj, &objc, &objv);
 
 	    if (result == TCL_OK && objc) {
-		tmpv = ckalloc(sizeof(Tcl_Obj *) * (objc + 2));
+		tmpv = (Tcl_Obj **)ckalloc(sizeof(Tcl_Obj *) * (objc + 2));
 		memcpy(tmpv, objv, sizeof(Tcl_Obj *) * objc);
 		tmpv[objc] = resultObj;
 		TkBackgroundEvalObjv(callbackInfo->interp, objc + 1, tmpv,
@@ -271,7 +275,7 @@ getFileURL(
 		    callbackInfo->cmdObj, &objc, &objv);
 
 	    if (result == TCL_OK && objc) {
-		tmpv = ckalloc(sizeof(Tcl_Obj *) * (objc + 2));
+		tmpv = (Tcl_Obj **)ckalloc(sizeof(Tcl_Obj *) * (objc + 2));
 		memcpy(tmpv, objv, sizeof(Tcl_Obj *) * objc);
 		tmpv[objc] = resultObj;
 		TkBackgroundEvalObjv(callbackInfo->interp, objc + 1, tmpv,
@@ -804,7 +808,7 @@ Tk_GetOpenFileObjCmd(
 	}
 	Tcl_IncrRefCount(cmdObj);
     }
-    callbackInfo = ckalloc(sizeof(FilePanelCallbackInfo));
+    callbackInfo = (FilePanelCallbackInfo *)ckalloc(sizeof(FilePanelCallbackInfo));
     callbackInfo->cmdObj = cmdObj;
     callbackInfo->interp = interp;
     callbackInfo->multiple = multiple;
@@ -814,7 +818,7 @@ Tk_GetOpenFileObjCmd(
 	[openpanel setDirectoryURL:fileURL];
     }
     if (haveParentOption) {
-	parent = TkMacOSXDrawableWindow(((TkWindow *) tkwin)->window);
+	parent = TkMacOSXGetNSWindowForDrawable(((TkWindow *)tkwin)->window);
 	parentIsKey = parent && [parent isKeyWindow];
     } else {
 	parent = nil;
@@ -913,7 +917,7 @@ Tk_GetSaveFileObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tk_Window tkwin = clientData;
+    Tk_Window tkwin = (Tk_Window)clientData;
     char *str;
     int i, result = TCL_ERROR, haveParentOption = 0;
     int confirmOverwrite = 1;
@@ -1080,7 +1084,7 @@ Tk_GetSaveFileObjCmd(
 	}
 	Tcl_IncrRefCount(cmdObj);
     }
-    callbackInfo = ckalloc(sizeof(FilePanelCallbackInfo));
+    callbackInfo = (FilePanelCallbackInfo *)ckalloc(sizeof(FilePanelCallbackInfo));
     callbackInfo->cmdObj = cmdObj;
     callbackInfo->interp = interp;
     callbackInfo->multiple = 0;
@@ -1100,7 +1104,7 @@ Tk_GetSaveFileObjCmd(
 	[savepanel setNameFieldStringValue:@""];
     }
     if (haveParentOption) {
-	parent = TkMacOSXDrawableWindow(((TkWindow *) tkwin)->window);
+	parent = TkMacOSXGetNSWindowForDrawable(((TkWindow *)tkwin)->window);
 	parentIsKey = parent && [parent isKeyWindow];
     } else {
 	parent = nil;
@@ -1155,7 +1159,7 @@ Tk_ChooseDirectoryObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tk_Window tkwin = clientData;
+    Tk_Window tkwin = (Tk_Window)clientData;
     char *str;
     int i, result = TCL_ERROR, haveParentOption = 0;
     int index, len, mustexist = 0;
@@ -1229,7 +1233,7 @@ Tk_ChooseDirectoryObjCmd(
 	}
 	Tcl_IncrRefCount(cmdObj);
     }
-    callbackInfo = ckalloc(sizeof(FilePanelCallbackInfo));
+    callbackInfo = (FilePanelCallbackInfo *)ckalloc(sizeof(FilePanelCallbackInfo));
     callbackInfo->cmdObj = cmdObj;
     callbackInfo->interp = interp;
     callbackInfo->multiple = 0;
@@ -1242,10 +1246,10 @@ Tk_ChooseDirectoryObjCmd(
     if (!directory) {
 	directory = @"/";
     }
-    parent = TkMacOSXDrawableWindow(((TkWindow *) tkwin)->window);
+    parent = TkMacOSXGetNSWindowForDrawable(((TkWindow *)tkwin)->window);
     [panel setDirectoryURL:[NSURL fileURLWithPath:directory isDirectory:YES]];
     if (haveParentOption) {
-	parent = TkMacOSXDrawableWindow(((TkWindow *) tkwin)->window);
+	parent = TkMacOSXGetNSWindowForDrawable(((TkWindow *)tkwin)->window);
 	parentIsKey = parent && [parent isKeyWindow];
     } else {
 	parent = nil;
@@ -1355,7 +1359,7 @@ TkAboutDlg(void)
 
 int
 TkMacOSXStandardAboutPanelObjCmd(
-    ClientData clientData,	/* Unused. */
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -1391,7 +1395,7 @@ Tk_MessageBoxObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tk_Window tkwin = clientData;
+    Tk_Window tkwin = (Tk_Window)clientData;
     char *str;
     int i, result = TCL_ERROR, haveParentOption = 0;
     int index, typeIndex, iconIndex, indexDefaultOption = 0;
@@ -1525,11 +1529,11 @@ Tk_MessageBoxObjCmd(
 	}
 	Tcl_IncrRefCount(cmdObj);
     }
-    callbackInfo = ckalloc(sizeof(AlertCallbackInfo));
+    callbackInfo = (AlertCallbackInfo *)ckalloc(sizeof(AlertCallbackInfo));
     callbackInfo->cmdObj = cmdObj;
     callbackInfo->interp = interp;
     callbackInfo->typeIndex = typeIndex;
-    parent = TkMacOSXDrawableWindow(((TkWindow *) tkwin)->window);
+    parent = TkMacOSXGetNSWindowForDrawable(((TkWindow *)tkwin)->window);
     if (haveParentOption && parent && ![parent attachedSheet]) {
 	parentIsKey = [parent isKeyWindow];
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
@@ -1626,6 +1630,7 @@ enum FontchooserOption {
 - (void) changeFont: (id) sender
 {
     NSFontManager *fm = [NSFontManager sharedFontManager];
+    (void)sender;
 
     if ([fm currentFontAction] == NSViaPanelFontAction) {
 	NSFont *font = [fm convertFont:fontPanelFont];
@@ -1649,14 +1654,16 @@ enum FontchooserOption {
     }
 }
 
-- (NSUInteger) validModesForFontPanel: (NSFontPanel *) fontPanel
+- (NSUInteger) validModesForFontPanel: (NSFontPanel *)fontPanel
 {
+    (void)fontPanel;
+
     return (NSFontPanelStandardModesMask & ~NSFontPanelAllEffectsModeMask) |
 	    NSFontPanelUnderlineEffectModeMask |
 	    NSFontPanelStrikethroughEffectModeMask;
 }
 
-- (void) windowDidOrderOffScreen: (NSNotification *) notification
+- (void) windowDidOrderOffScreen: (NSNotification *)notification
 {
 #ifdef TK_MAC_DEBUG_NOTIFICATIONS
     TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification);
@@ -1714,7 +1721,7 @@ FontchooserEvent(
 		result = Tcl_ListObjGetElements(fontchooserInterp,
 			fcdPtr->cmdObj, &objc, &objv);
 		if (result == TCL_OK) {
-		    tmpv = ckalloc(sizeof(Tcl_Obj *) * (objc + 2));
+		    tmpv = (Tcl_Obj **)ckalloc(sizeof(Tcl_Obj *) * (objc + 2));
 		    memcpy(tmpv, objv, sizeof(Tcl_Obj *) * objc);
 		    tmpv[objc] = fontObj;
 		    TkBackgroundEvalObjv(fontchooserInterp, objc + 1, tmpv,
@@ -1756,7 +1763,7 @@ FontchooserCget(
     case FontchooserParent:
 	if (fcdPtr->parent != None) {
 	    resObj = Tcl_NewStringObj(
-		    ((TkWindow *) fcdPtr->parent)->pathName, -1);
+		    ((TkWindow *)fcdPtr->parent)->pathName, -1);
 	} else {
 	    resObj = Tcl_NewStringObj(".", 1);
 	}
@@ -1977,14 +1984,14 @@ static int
 FontchooserShowCmd(
     ClientData clientData,	/* Main window */
     Tcl_Interp *interp,
-    int objc,
-    Tcl_Obj *const objv[])
+    TCL_UNUSED(int),
+    TCL_UNUSED(Tcl_Obj *const *))
 {
     FontchooserData *fcdPtr = Tcl_GetAssocData(interp, "::tk::fontchooser",
 	    NULL);
 
     if (fcdPtr->parent == None) {
-	fcdPtr->parent = (Tk_Window) clientData;
+	fcdPtr->parent = (Tk_Window)clientData;
 	Tk_CreateEventHandler(fcdPtr->parent, StructureNotifyMask,
 		FontchooserParentEventHandler, fcdPtr);
     }
@@ -2023,10 +2030,10 @@ FontchooserShowCmd(
 
 static int
 FontchooserHideCmd(
-    ClientData clientData,	/* Main window */
-    Tcl_Interp *interp,
-    int objc,
-    Tcl_Obj *const objv[])
+    TCL_UNUSED(void *),	/* Main window */
+    TCL_UNUSED(Tcl_Interp *),
+    TCL_UNUSED(int),
+    TCL_UNUSED(Tcl_Obj *const *))
 {
     NSFontPanel *fp = [[NSFontManager sharedFontManager] fontPanel:NO];
 
@@ -2125,9 +2132,9 @@ DeleteFontchooserData(
 MODULE_SCOPE int
 TkInitFontchooser(
     Tcl_Interp *interp,
-    ClientData clientData)
+    TCL_UNUSED(void *))
 {
-    FontchooserData *fcdPtr = ckalloc(sizeof(FontchooserData));
+    FontchooserData *fcdPtr = (FontchooserData *)ckalloc(sizeof(FontchooserData));
 
     bzero(fcdPtr, sizeof(FontchooserData));
     Tcl_SetAssocData(interp, "::tk::fontchooser", DeleteFontchooserData,
diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index 15d1eb5..1c77af3 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -85,7 +85,7 @@ TkMacOSXInitCGDrawing(
 	}
 
 	if (Tcl_LinkVar(interp, "::tk::mac::CGAntialiasLimit",
-		(char *) &cgAntiAliasLimit, TCL_LINK_INT) != TCL_OK) {
+		(char *)&cgAntiAliasLimit, TCL_LINK_INT) != TCL_OK) {
 	    Tcl_ResetResult(interp);
 	}
 	cgAntiAliasLimit = limit;
@@ -95,11 +95,11 @@ TkMacOSXInitCGDrawing(
 	 */
 
 	if (Tcl_LinkVar(interp, "::tk::mac::useThemedToplevel",
-		(char *) &useThemedToplevel, TCL_LINK_BOOLEAN) != TCL_OK) {
+		(char *)&useThemedToplevel, TCL_LINK_BOOLEAN) != TCL_OK) {
 	    Tcl_ResetResult(interp);
 	}
 	if (Tcl_LinkVar(interp, "::tk::mac::useThemedFrame",
-		(char *) &useThemedFrame, TCL_LINK_BOOLEAN) != TCL_OK) {
+		(char *)&useThemedFrame, TCL_LINK_BOOLEAN) != TCL_OK) {
 	    Tcl_ResetResult(interp);
 	}
 	transparentColor = TkMacOSXClearPixel();
@@ -243,7 +243,7 @@ CGContextRef
 TkMacOSXGetCGContextForDrawable(
     Drawable drawable)
 {
-    MacDrawable *macDraw = (MacDrawable *) drawable;
+    MacDrawable *macDraw = (MacDrawable *)drawable;
 
     if (macDraw && (macDraw->flags & TK_IS_PIXMAP) && !macDraw->context) {
 	const size_t bitsPerComponent = 8;
@@ -261,7 +261,7 @@ TkMacOSXGetCGContextForDrawable(
 
 	if (macDraw->flags & TK_IS_BW_PIXMAP) {
 	    bitsPerPixel = 8;
-	    bitmapInfo = (CGBitmapInfo) kCGImageAlphaOnly;
+	    bitmapInfo = (CGBitmapInfo)kCGImageAlphaOnly;
 	} else {
 	    colorspace = CGColorSpaceCreateDeviceRGB();
 	    bitsPerPixel = 32;
@@ -314,7 +314,7 @@ TkMacOSXDrawCGImage(
     CGRect srcBounds,
     CGRect dstBounds)
 {
-    MacDrawable *macDraw = (MacDrawable *) d;
+    MacDrawable *macDraw = (MacDrawable *)d;
 
     if (macDraw && context && image) {
 	CGImageRef subImage = NULL;
@@ -410,7 +410,7 @@ XDrawLines(
     int npoints,		/* Number of points. */
     int mode)			/* Line drawing mode. */
 {
-    MacDrawable *macWin = (MacDrawable *) d;
+    MacDrawable *macWin = (MacDrawable *)d;
     TkMacOSXDrawingContext dc;
     int i, lw = gc->line_width;
 
@@ -482,7 +482,7 @@ XDrawSegments(
     XSegment *segments,
     int nsegments)
 {
-    MacDrawable *macWin = (MacDrawable *) d;
+    MacDrawable *macWin = (MacDrawable *)d;
     TkMacOSXDrawingContext dc;
     int i, lw = gc->line_width;
 
@@ -534,7 +534,7 @@ XFillPolygon(
     TCL_UNUSED(int),	/* Shape to draw. */
     int mode)			/* Drawing mode. */
 {
-    MacDrawable *macWin = (MacDrawable *) d;
+    MacDrawable *macWin = (MacDrawable *)d;
     TkMacOSXDrawingContext dc;
     int i;
 
@@ -592,7 +592,7 @@ XDrawRectangle(
     unsigned int width,		/* Width & height of rect. */
     unsigned int height)
 {
-    MacDrawable *macWin = (MacDrawable *) d;
+    MacDrawable *macWin = (MacDrawable *)d;
     TkMacOSXDrawingContext dc;
     int lw = gc->line_width;
 
@@ -650,7 +650,7 @@ XDrawRectangles(
     XRectangle *rectArr,
     int nRects)
 {
-    MacDrawable *macWin = (MacDrawable *) d;
+    MacDrawable *macWin = (MacDrawable *)d;
     TkMacOSXDrawingContext dc;
     XRectangle * rectPtr;
     int i, lw = gc->line_width;
@@ -703,7 +703,7 @@ XFillRectangles(
     XRectangle *rectangles,	/* Rectangle array. */
     int n_rectangles)		/* Number of rectangles. */
 {
-    MacDrawable *macWin = (MacDrawable *) d;
+    MacDrawable *macWin = (MacDrawable *)d;
     TkMacOSXDrawingContext dc;
     XRectangle * rectPtr;
     int i;
@@ -805,7 +805,7 @@ XDrawArc(
     int angle1,			/* Staring angle of arc. */
     int angle2)			/* Extent of arc. */
 {
-    MacDrawable *macWin = (MacDrawable *) d;
+    MacDrawable *macWin = (MacDrawable *)d;
     TkMacOSXDrawingContext dc;
     int lw = gc->line_width;
 
@@ -879,7 +879,7 @@ XDrawArcs(
     XArc *arcArr,
     int nArcs)
 {
-    MacDrawable *macWin = (MacDrawable *) d;
+    MacDrawable *macWin = (MacDrawable *)d;
     TkMacOSXDrawingContext dc;
     XArc *arcPtr;
     int i, lw = gc->line_width;
@@ -958,7 +958,7 @@ XFillArc(
     int angle1,			/* Staring angle of arc. */
     int angle2)			/* Extent of arc. */
 {
-    MacDrawable *macWin = (MacDrawable *) d;
+    MacDrawable *macWin = (MacDrawable *)d;
     TkMacOSXDrawingContext dc;
     int lw = gc->line_width;
 
@@ -1035,7 +1035,7 @@ XFillArcs(
     XArc *arcArr,
     int nArcs)
 {
-    MacDrawable *macWin = (MacDrawable *) d;
+    MacDrawable *macWin = (MacDrawable *)d;
     TkMacOSXDrawingContext dc;
     XArc * arcPtr;
     int i, lw = gc->line_width;
@@ -1139,7 +1139,7 @@ TkScrollWindow(
     TkRegion damageRgn)		/* Region to accumulate damage in. */
 {
     Drawable drawable = Tk_WindowId(tkwin);
-    MacDrawable *macDraw = (MacDrawable *) drawable;
+    MacDrawable *macDraw = (MacDrawable *)drawable;
     TKContentView *view = TkMacOSXDrawableView(macDraw);
     CGRect srcRect, dstRect;
     HIShapeRef dmgRgn = NULL, extraRgn = NULL;
@@ -1261,7 +1261,7 @@ TkMacOSXSetupDrawingContext(
     GC gc,
     TkMacOSXDrawingContext *dcPtr)
 {
-    MacDrawable *macDraw = (MacDrawable *) d;
+    MacDrawable *macDraw = (MacDrawable *)d;
     Bool canDraw = true;
     TKContentView *view = nil;
     TkMacOSXDrawingContext dc = {};
@@ -1515,7 +1515,7 @@ HIShapeRef
 TkMacOSXGetClipRgn(
     Drawable drawable)		/* Drawable. */
 {
-    MacDrawable *macDraw = (MacDrawable *) drawable;
+    MacDrawable *macDraw = (MacDrawable *)drawable;
     HIShapeRef clipRgn = NULL;
 
     if (macDraw->winPtr && macDraw->flags & TK_CLIP_INVALID) {
@@ -1591,7 +1591,7 @@ TkpClipDrawableToRect(
     int x, int y,
     int width, int height)
 {
-    MacDrawable *macDraw = (MacDrawable *) d;
+    MacDrawable *macDraw = (MacDrawable *)d;
 
     if (macDraw->drawRgn) {
 	CFRelease(macDraw->drawRgn);
@@ -1638,10 +1638,10 @@ ClipToGC(
     HIShapeRef *clipRgnPtr) /* must point to initialized variable */
 {
     if (gc && gc->clip_mask &&
-	    ((TkpClipMask *) gc->clip_mask)->type == TKP_CLIP_REGION) {
-	TkRegion gcClip = ((TkpClipMask *) gc->clip_mask)->value.region;
-	int xOffset = ((MacDrawable *) d)->xOff + gc->clip_x_origin;
-	int yOffset = ((MacDrawable *) d)->yOff + gc->clip_y_origin;
+	    ((TkpClipMask *)gc->clip_mask)->type == TKP_CLIP_REGION) {
+	TkRegion gcClip = ((TkpClipMask *)gc->clip_mask)->value.region;
+	int xOffset = ((MacDrawable *)d)->xOff + gc->clip_x_origin;
+	int yOffset = ((MacDrawable *)d)->yOff + gc->clip_y_origin;
 	HIShapeRef clipRgn = *clipRgnPtr, gcClipRgn;
 
 	XOffsetRegion(gcClip, xOffset, yOffset);
diff --git a/macosx/tkMacOSXEmbed.c b/macosx/tkMacOSXEmbed.c
index e58cdd0..acf2e69 100644
--- a/macosx/tkMacOSXEmbed.c
+++ b/macosx/tkMacOSXEmbed.c
@@ -853,7 +853,7 @@ ContainerEventProc(
 	 * Here we are following unix, by destroying the container.
 	 */
 
-	Tk_DestroyWindow((Tk_Window) winPtr);
+	Tk_DestroyWindow((Tk_Window)winPtr);
     }
     Tk_DeleteErrorHandler(errHandler);
 }
@@ -902,8 +902,8 @@ EmbedStructureProc(
 
 	    errHandler = Tk_CreateErrorHandler(eventPtr->xfocus.display, -1,
 		    -1, -1, NULL, NULL);
-	    Tk_MoveResizeWindow((Tk_Window) containerPtr->embeddedPtr, 0, 0,
-		    (unsigned) Tk_Width((Tk_Window) containerPtr->parentPtr),
+	    Tk_MoveResizeWindow((Tk_Window)containerPtr->embeddedPtr, 0, 0,
+		    (unsigned) Tk_Width((Tk_Window)containerPtr->parentPtr),
 		    (unsigned) Tk_Height((Tk_Window)containerPtr->parentPtr));
 	    Tk_DeleteErrorHandler(errHandler);
 	}
@@ -1048,7 +1048,7 @@ EmbedGeometryRequest(
      * if the window's size didn't change then generate a configure event.
      */
 
-    Tk_GeometryRequest((Tk_Window) winPtr, width, height);
+    Tk_GeometryRequest((Tk_Window)winPtr, width, height);
     while (Tcl_DoOneEvent(TCL_IDLE_EVENTS|TCL_TIMER_EVENTS|TCL_DONT_WAIT)) {}
     if ((winPtr->changes.width != width)
 	    || (winPtr->changes.height != height)) {
diff --git a/macosx/tkMacOSXFont.c b/macosx/tkMacOSXFont.c
index ac3bf20..4e383f1 100644
--- a/macosx/tkMacOSXFont.c
+++ b/macosx/tkMacOSXFont.c
@@ -451,7 +451,7 @@ TkpFontPkgInit(
     TkMainInfo *mainPtr)	/* The application being created. */
 {
     Tcl_Interp *interp = mainPtr->interp;
-    Tk_Window tkwin = (Tk_Window) mainPtr->winPtr;
+    Tk_Window tkwin = (Tk_Window)mainPtr->winPtr;
     const struct SystemFontMapEntry *systemFont = systemFontMap;
     NSFont *nsFont;
     TkFontAttributes fa;
diff --git a/macosx/tkMacOSXImage.c b/macosx/tkMacOSXImage.c
index 2e6b5e7..38e14fa 100644
--- a/macosx/tkMacOSXImage.c
+++ b/macosx/tkMacOSXImage.c
@@ -767,7 +767,7 @@ XCopyArea(
 
     if (srcDraw->flags & TK_IS_PIXMAP) {
 	img = CreateCGImageFromPixmap(src);
-    } else if (TkMacOSXDrawableWindow(src)) {
+    } else if (TkMacOSXGetNSWindowForDrawable(src)) {
 	img = CreateCGImageFromDrawableRect(src, src_x, src_y, width, height);
     } else {
 	TkMacOSXDbgMsg("Invalid source drawable - neither window nor pixmap.");
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index ab2400c..51c1e37 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -491,7 +491,7 @@ TkpGetAppName(
 
 static int
 TkMacOSXGetAppPathCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
diff --git a/macosx/tkMacOSXInt.h b/macosx/tkMacOSXInt.h
index 2c2be0c..278fcac 100644
--- a/macosx/tkMacOSXInt.h
+++ b/macosx/tkMacOSXInt.h
@@ -195,7 +195,6 @@ MODULE_SCOPE void TkpClipDrawableToRect(Display *display, Drawable d, int x,
 	int y, int width, int height);
 MODULE_SCOPE void TkpShiftButton(NSButton *button, NSPoint delta);
 MODULE_SCOPE Bool TkTestLogDisplay(Drawable drawable);
-MODULE_SCOPE Bool TkMacOSXInDarkMode(Tk_Window tkwin);
 
 /*
  * Include the stubbed internal platform-specific API.
diff --git a/macosx/tkMacOSXKeyEvent.c b/macosx/tkMacOSXKeyEvent.c
index 014caa9..49d38a6 100644
--- a/macosx/tkMacOSXKeyEvent.c
+++ b/macosx/tkMacOSXKeyEvent.c
@@ -51,7 +51,7 @@ static NSUInteger textInputModifiers;
 #endif
     NSWindow *w = [theEvent window];
     TkWindow *winPtr = TkMacOSXGetTkWindow(w), *grabWinPtr, *focusWinPtr;
-    Tk_Window tkwin = (Tk_Window) winPtr;
+    Tk_Window tkwin = (Tk_Window)winPtr;
     NSEventType type = [theEvent type];
     NSUInteger virtual = [theEvent keyCode];
     NSUInteger modifiers = ([theEvent modifierFlags] &
@@ -83,7 +83,7 @@ static NSUInteger textInputModifiers;
 	if (winPtr->dispPtr->grabFlags ||  /* global grab */
 	    grabWinPtr->mainPtr == winPtr->mainPtr){ /* same application */
 	    winPtr =winPtr->dispPtr->focusPtr;
-	    tkwin = (Tk_Window) winPtr;
+	    tkwin = (Tk_Window)winPtr;
 	}
     }
 
@@ -286,7 +286,7 @@ static NSUInteger textInputModifiers;
     XEvent xEvent;
     NSString *str, *keystr, *lower;
     TkWindow *winPtr = TkMacOSXGetTkWindow([self window]);
-    Tk_Window tkwin = (Tk_Window) winPtr;
+    Tk_Window tkwin = (Tk_Window)winPtr;
     Bool sendingIMEText = NO;
 
     str = ([aString isKindOfClass: [NSAttributedString class]]) ?
@@ -322,7 +322,7 @@ static NSUInteger textInputModifiers;
      */
 
     if (repRange.location == 0) {
-	Tk_Window focusWin = (Tk_Window) winPtr->dispPtr->focusPtr;
+	Tk_Window focusWin = (Tk_Window)winPtr->dispPtr->focusPtr;
 	TkSendVirtualEvent(focusWin, "TkAccentBackspace", NULL);
     }
 
@@ -393,7 +393,7 @@ static NSUInteger textInputModifiers;
      replacementRange: (NSRange)repRange
 {
     TkWindow *winPtr = TkMacOSXGetTkWindow([self window]);
-    Tk_Window focusWin = (Tk_Window) winPtr->dispPtr->focusPtr;
+    Tk_Window focusWin = (Tk_Window)winPtr->dispPtr->focusPtr;
     NSString *temp;
     NSString *str;
 
@@ -498,7 +498,7 @@ static NSUInteger textInputModifiers;
     processingCompose = NO;
     if (aSelector == @selector (deleteBackward:)) {
 	TkWindow *winPtr = TkMacOSXGetTkWindow([self window]);
-	Tk_Window focusWin = (Tk_Window) winPtr->dispPtr->focusPtr;
+	Tk_Window focusWin = (Tk_Window)winPtr->dispPtr->focusPtr;
 	TkSendVirtualEvent(focusWin, "TkAccentBackspace", NULL);
     }
 }
@@ -687,7 +687,7 @@ XGrabKeyboard(
     TkWindow *captureWinPtr = (TkWindow *) TkpGetCapture();
 
     if (keyboardGrabWinPtr && captureWinPtr) {
-	NSWindow *w = TkMacOSXDrawableWindow(grab_window);
+	NSWindow *w = TkMacOSXGetNSWindowForDrawable(grab_window);
 	MacDrawable *macWin = (MacDrawable *) grab_window;
 
 	if (w && macWin->toplevel->winPtr == (TkWindow *) captureWinPtr) {
@@ -789,7 +789,7 @@ Tk_SetCaretPos(
  {
     TkWindow *winPtr = (TkWindow *) tkwin;
     TkCaret *caretPtr = &(winPtr->dispPtr->caret);
-    NSWindow *w = TkMacOSXDrawableWindow(Tk_WindowId(tkwin));
+    NSWindow *w = TkMacOSXGetNSWindowForDrawable(Tk_WindowId(tkwin));
 
     /*
      * Register this widget as being capable of text input, so we know we
diff --git a/macosx/tkMacOSXMenubutton.c b/macosx/tkMacOSXMenubutton.c
index 320c070..2fad3cb 100644
--- a/macosx/tkMacOSXMenubutton.c
+++ b/macosx/tkMacOSXMenubutton.c
@@ -703,7 +703,7 @@ MenuButtonEventProc(
 	    mbPtr->flags &= ~ACTIVE;
 	}
 	if ((buttonPtr->flags & REDRAW_PENDING) == 0) {
-	    Tcl_DoWhenIdle(TkpDisplayMenuButton, (ClientData) buttonPtr);
+	    Tcl_DoWhenIdle(TkpDisplayMenuButton, buttonPtr);
 	    buttonPtr->flags |= REDRAW_PENDING;
 	}
     }
diff --git a/macosx/tkMacOSXMenus.c b/macosx/tkMacOSXMenus.c
index 9b85e7a..a1519f5 100644
--- a/macosx/tkMacOSXMenus.c
+++ b/macosx/tkMacOSXMenus.c
@@ -415,7 +415,7 @@ GenerateEditEvent(
     if (!winPtr) {
 	return;
     }
-    tkwin = (Tk_Window) winPtr->dispPtr->focusPtr;
+    tkwin = (Tk_Window)winPtr->dispPtr->focusPtr;
     if (!tkwin) {
 	return;
     }
diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index 99505ca..f2d7e32 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -111,7 +111,7 @@ enum {
 	tkwin = TkMacOSXGetCapture();
 	if (tkwin) {
 	    winPtr = (TkWindow *) tkwin;
-	    eventWindow = TkMacOSXDrawableWindow(winPtr->window);
+	    eventWindow = TkMacOSXGetNSWindowForDrawable(winPtr->window);
 	    if (eventWindow) {
 		local = [eventWindow tkConvertPointFromScreen: global];
 	    } else {
@@ -130,7 +130,7 @@ enum {
 	tkwin = TkMacOSXGetCapture();
 	if (tkwin) {
 	    winPtr = (TkWindow *) tkwin;
-	    eventWindow = TkMacOSXDrawableWindow(winPtr->window);
+	    eventWindow = TkMacOSXGetNSWindowForDrawable(winPtr->window);
 	} else {
 	    eventWindow = [NSApp mainWindow];
 	}
@@ -149,7 +149,7 @@ enum {
 
     if (!tkwin) {
 	winPtr = TkMacOSXGetTkWindow(eventWindow);
-	tkwin = (Tk_Window) winPtr;
+	tkwin = (Tk_Window)winPtr;
     }
     if (!tkwin) {
 
@@ -179,11 +179,11 @@ enum {
 	for (tkwin2 = tkEventWindow;
 	     !Tk_IsTopLevel(tkwin2);
 	     tkwin2 = Tk_Parent(tkwin2)) {
-	    if (tkwin2 == (Tk_Window) grabWinPtr) {
+	    if (tkwin2 == (Tk_Window)grabWinPtr) {
 		break;
 	    }
 	}
-	if (tkwin2 != (Tk_Window) grabWinPtr) {
+	if (tkwin2 != (Tk_Window)grabWinPtr) {
 	    return theEvent;
 	}
     }
@@ -432,7 +432,7 @@ XQueryPointer(
 
 	if (getLocal) {
 	    MacDrawable *macWin = (MacDrawable *) w;
-	    NSWindow *win = TkMacOSXDrawableWindow(w);
+	    NSWindow *win = TkMacOSXGetNSWindowForDrawable(w);
 
 	    if (win) {
 		NSPoint local;
@@ -522,7 +522,7 @@ TkGenerateButtonEvent(
     unsigned int state)		/* Button Key state suitable for X event. */
 {
     MacDrawable *macWin = (MacDrawable *) window;
-    NSWindow *win = TkMacOSXDrawableWindow(window);
+    NSWindow *win = TkMacOSXGetNSWindowForDrawable(window);
     MouseEventData med;
 
     bzero(&med, sizeof(MouseEventData));
@@ -648,7 +648,7 @@ TkpSetCapture(
 	winPtr = winPtr->parentPtr;
     }
     [NSEvent stopPeriodicEvents];
-    captureWinPtr = (Tk_Window) winPtr;
+    captureWinPtr = (Tk_Window)winPtr;
 }
 
 /*
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h
index 1dc856c..5ac834c 100644
--- a/macosx/tkMacOSXPrivate.h
+++ b/macosx/tkMacOSXPrivate.h
@@ -257,7 +257,7 @@ MODULE_SCOPE void	TkMacOSXRestoreDrawingContext(
 			    TkMacOSXDrawingContext *dcPtr);
 MODULE_SCOPE void	TkMacOSXSetColorInContext(GC gc, unsigned long pixel,
 			    CGContextRef context);
-MODULE_SCOPE NSWindow*	TkMacOSXDrawableWindow(Drawable drawable);
+#define TkMacOSXGetNSWindowForDrawable(drawable) ((NSWindow*)TkMacOSXDrawable(drawable))
 #define TkMacOSXDrawableView(macWin) (TKContentView *)TkMacOSXGetRootControl((Drawable)(macWin))
 MODULE_SCOPE void	TkMacOSXWinCGBounds(TkWindow *winPtr, CGRect *bounds);
 MODULE_SCOPE HIShapeRef	TkMacOSXGetClipRgn(Drawable drawable);
@@ -291,6 +291,7 @@ MODULE_SCOPE int	TkMacOSXRegisterServiceWidgetObjCmd(ClientData clientData,
 MODULE_SCOPE unsigned   TkMacOSXAddVirtual(unsigned int keycode);
 MODULE_SCOPE void       TkMacOSXWinNSBounds(TkWindow *winPtr, NSView *view,
 					    NSRect *bounds);
+MODULE_SCOPE Bool       TkMacOSXInDarkMode(Tk_Window tkwin);
 MODULE_SCOPE void	TkMacOSXDrawAllViews(ClientData clientData);
 MODULE_SCOPE unsigned long TkMacOSXClearPixel(void);
 
diff --git a/macosx/tkMacOSXScale.c b/macosx/tkMacOSXScale.c
index b1e918b..15286d6 100644
--- a/macosx/tkMacOSXScale.c
+++ b/macosx/tkMacOSXScale.c
@@ -214,7 +214,7 @@ TkpDisplayScale(
      */
 
     macDraw = (MacDrawable *) Tk_WindowId(tkwin);
-    windowRef = TkMacOSXDrawableWindow(Tk_WindowId(tkwin));
+    windowRef = TkMacOSXGetNSWindowForDrawable(Tk_WindowId(tkwin));
 
     /*
      * Create Macintosh control.
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index a3c7469..24cd974 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -68,7 +68,7 @@ XDestroyWindow(
     if (!Tk_IsTopLevel(macWin->winPtr)) {
 	TkMacOSXInvalidateWindow(macWin, TK_PARENT_WINDOW);
 	if (macWin->winPtr->parentPtr != NULL) {
-	    TkMacOSXInvalClipRgns((Tk_Window) macWin->winPtr->parentPtr);
+	    TkMacOSXInvalClipRgns((Tk_Window)macWin->winPtr->parentPtr);
 	}
 	if (macWin->visRgn) {
 	    CFRelease(macWin->visRgn);
@@ -141,7 +141,7 @@ XMapWindow(
     }
     MacDrawable *macWin = (MacDrawable *) window;
     TkWindow *winPtr = macWin->winPtr;
-    NSWindow *win = TkMacOSXDrawableWindow(window);
+    NSWindow *win = TkMacOSXGetNSWindowForDrawable(window);
     XEvent event;
 
     /*
@@ -187,11 +187,11 @@ XMapWindow(
 	     * the window.
 	     */
 
-	    TkMacOSXInvalClipRgns((Tk_Window) contWinPtr);
+	    TkMacOSXInvalClipRgns((Tk_Window)contWinPtr);
 	    TkMacOSXInvalidateWindow(macWin, TK_PARENT_WINDOW);
 	}
 
-	TkMacOSXInvalClipRgns((Tk_Window) winPtr);
+	TkMacOSXInvalClipRgns((Tk_Window)winPtr);
 
 	/*
 	 * We only need to send the MapNotify event for toplevel windows.
@@ -221,7 +221,7 @@ XMapWindow(
 	 * and redisplay the window.
 	 */
 
-	TkMacOSXInvalClipRgns((Tk_Window) winPtr->parentPtr);
+	TkMacOSXInvalClipRgns((Tk_Window)winPtr->parentPtr);
     }
 
     TKContentView *view = [win contentView];
@@ -300,7 +300,7 @@ XUnmapWindow(
     MacDrawable *macWin = (MacDrawable *) window;
     TkWindow *winPtr = macWin->winPtr;
     TkWindow *parentPtr = winPtr->parentPtr;
-    NSWindow *win = TkMacOSXDrawableWindow(window);
+    NSWindow *win = TkMacOSXGetNSWindowForDrawable(window);
     XEvent event;
 
     display->request++;
@@ -309,7 +309,7 @@ XUnmapWindow(
 		winPtr->wmInfoPtr->hints.initial_state!=IconicState) {
 	    [win orderOut:nil];
 	}
-	TkMacOSXInvalClipRgns((Tk_Window) winPtr);
+	TkMacOSXInvalClipRgns((Tk_Window)winPtr);
 
 	/*
 	 * We only need to send the UnmapNotify event for toplevel windows.
@@ -344,7 +344,7 @@ XUnmapWindow(
 		    TkMacOSXDrawableView(parentPtr->privatePtr),
 		    parentPtr->privatePtr->visRgn);
 	}
-	TkMacOSXInvalClipRgns((Tk_Window) parentPtr);
+	TkMacOSXInvalClipRgns((Tk_Window)parentPtr);
 	TkMacOSXUpdateClipRgn(parentPtr);
     }
     winPtr->flags &= ~TK_MAPPED;
@@ -515,7 +515,7 @@ MoveResizeWindow(
 {
     int deltaX = 0, deltaY = 0, parentBorderwidth = 0;
     MacDrawable *macParent = NULL;
-    NSWindow *macWindow = TkMacOSXDrawableWindow((Drawable)macWin);
+    NSWindow *macWindow = TkMacOSXGetNSWindowForDrawable((Drawable)macWin);
 
     /*
      * Find the Parent window, for an embedded window it will be its container.
@@ -552,7 +552,7 @@ MoveResizeWindow(
     if (macWindow) {
 	TkMacOSXInvalidateWindow(macWin, TK_PARENT_WINDOW);
 	if (macParent) {
-	    TkMacOSXInvalClipRgns((Tk_Window) macParent->winPtr);
+	    TkMacOSXInvalClipRgns((Tk_Window)macParent->winPtr);
 	}
     }
     UpdateOffsets(macWin->winPtr, deltaX, deltaY);
@@ -717,8 +717,8 @@ XConfigureWindow(
 	NSView *view = TkMacOSXDrawableView(macWin);
 
 	if (view) {
-	    TkMacOSXInvalClipRgns((Tk_Window) winPtr->parentPtr);
-	    TkpRedrawWidget((Tk_Window) winPtr);
+	    TkMacOSXInvalClipRgns((Tk_Window)winPtr->parentPtr);
+	    TkpRedrawWidget((Tk_Window)winPtr);
 	}
     }
 
@@ -870,7 +870,7 @@ TkMacOSXUpdateClipRgn(
 		    TkRegion r = TkCreateRegion();
 		    HIShapeRef visRgn;
 
-		    tkMacOSXEmbedHandler->getClipProc((Tk_Window) winPtr, r);
+		    tkMacOSXEmbedHandler->getClipProc((Tk_Window)winPtr, r);
 		    visRgn = TkMacOSXGetNativeRegion(r);
 		    ChkErr(HIShapeIntersect, visRgn, rgn, rgn);
 		    CFRelease(visRgn);
@@ -1069,7 +1069,7 @@ TkMacOSXInvalidateWindow(
 /*
  *----------------------------------------------------------------------
  *
- * TkMacOSXDrawableWindow --
+ * TkMacOSXGetNSWindowForDrawable --
  *
  *	This function returns the NSWindow for a given X drawable.
  *
@@ -1082,8 +1082,8 @@ TkMacOSXInvalidateWindow(
  *----------------------------------------------------------------------
  */
 
-NSWindow *
-TkMacOSXDrawableWindow(
+void *
+TkMacOSXDrawable(
     Drawable drawable)
 {
     MacDrawable *macWin = (MacDrawable *) drawable;
@@ -1102,18 +1102,11 @@ TkMacOSXDrawableWindow(
 	TkWindow *contWinPtr = TkpGetOtherWindow(macWin->toplevel->winPtr);
 
 	if (contWinPtr) {
-	    result = TkMacOSXDrawableWindow((Drawable)contWinPtr->privatePtr);
+	    result = TkMacOSXGetNSWindowForDrawable((Drawable)contWinPtr->privatePtr);
 	}
     }
     return result;
 }
-
-void *
-TkMacOSXDrawable(
-    Drawable drawable)
-{
-    return TkMacOSXDrawableWindow(drawable);
-}
 
 /*
  *----------------------------------------------------------------------
@@ -1248,7 +1241,7 @@ TkMacOSXInvalClipRgns(
     childPtr = winPtr->childList;
     while (childPtr) {
 	if (!Tk_IsTopLevel(childPtr)) {
-	    TkMacOSXInvalClipRgns((Tk_Window) childPtr);
+	    TkMacOSXInvalClipRgns((Tk_Window)childPtr);
 	}
 	childPtr = childPtr->nextPtr;
     }
@@ -1261,7 +1254,7 @@ TkMacOSXInvalClipRgns(
 	childPtr = TkpGetOtherWindow(winPtr);
 
 	if (childPtr) {
-	    TkMacOSXInvalClipRgns((Tk_Window) childPtr);
+	    TkMacOSXInvalClipRgns((Tk_Window)childPtr);
 	}
 
 	/*
diff --git a/macosx/tkMacOSXTest.c b/macosx/tkMacOSXTest.c
index c70ecd5..434504f 100644
--- a/macosx/tkMacOSXTest.c
+++ b/macosx/tkMacOSXTest.c
@@ -266,7 +266,7 @@ PressButtonObjCmd(
 
 static int
 InjectKeyEventObjCmd(
-    TCL_UNUSED(ClientData),
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 1be213b..8b1e694 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -95,7 +95,7 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
 	 */
 
 	flags |= TK_MACOSX_HANDLE_EVENT_IMMEDIATELY;
-	TkGenWMConfigureEvent((Tk_Window) winPtr, x, y, width, height, flags);
+	TkGenWMConfigureEvent((Tk_Window)winPtr, x, y, width, height, flags);
     }
 
 }
@@ -111,7 +111,7 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
     if (winPtr) {
 	winPtr->wmInfoPtr->hints.initial_state =
 		TkMacOSXIsWindowZoomed(winPtr) ? ZoomState : NormalState;
-	Tk_MapWindow((Tk_Window) winPtr);
+	Tk_MapWindow((Tk_Window)winPtr);
 
 	/*
 	 * Process all Tk events generated by Tk_MapWindow().
@@ -182,7 +182,7 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
     TkWindow *winPtr = TkMacOSXGetTkWindow(w);
 
     if (winPtr) {
-	Tk_UnmapWindow((Tk_Window) winPtr);
+	Tk_UnmapWindow((Tk_Window)winPtr);
     }
 }
 
@@ -194,7 +194,7 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
     TkWindow *winPtr = TkMacOSXGetTkWindow(w);
 
     if (winPtr) {
-	TkGenWMDestroyEvent((Tk_Window) winPtr);
+	TkGenWMDestroyEvent((Tk_Window)winPtr);
     }
 
     /*
@@ -252,7 +252,7 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
     TkWindow *winPtr = TkMacOSXGetTkWindow(w);
 
     if (winPtr) {
-	//Tk_UnmapWindow((Tk_Window) winPtr);
+	//Tk_UnmapWindow((Tk_Window)winPtr);
     }
 }
 
@@ -823,7 +823,7 @@ TkWmProtocolEventProc(
 	    if (result != TCL_OK) {
 		Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
 			"\n    (command for \"%s\" window manager protocol)",
-			Tk_GetAtomName((Tk_Window) winPtr, protocol)));
+			Tk_GetAtomName((Tk_Window)winPtr, protocol)));
 		Tcl_BackgroundException(interp, result);
 	    }
 	    Tcl_Release(interp);
@@ -837,8 +837,8 @@ TkWmProtocolEventProc(
      * message then just destroy the window.
      */
 
-    if (protocol == Tk_InternAtom((Tk_Window) winPtr, "WM_DELETE_WINDOW")) {
-	Tk_DestroyWindow((Tk_Window) winPtr);
+    if (protocol == Tk_InternAtom((Tk_Window)winPtr, "WM_DELETE_WINDOW")) {
+	Tk_DestroyWindow((Tk_Window)winPtr);
     }
 }
 
@@ -967,7 +967,7 @@ ConfigureRestrictProc(
     [super setFrameSize: newsize];
     NSWindow *w = [self window];
     TkWindow *winPtr = TkMacOSXGetTkWindow(w);
-    Tk_Window tkwin = (Tk_Window) winPtr;
+    Tk_Window tkwin = (Tk_Window)winPtr;
 
     if (![self inLiveResize] &&
 	[w respondsToSelector: @selector (tkLayoutChanged)]) {
@@ -1109,7 +1109,7 @@ static const char *const accentNames[] = {
 
 - (void) viewDidChangeEffectiveAppearance
 {
-    Tk_Window tkwin = (Tk_Window) TkMacOSXGetTkWindow([self window]);
+    Tk_Window tkwin = (Tk_Window)TkMacOSXGetTkWindow([self window]);
     if (!tkwin) {
 	return;
     }
@@ -1179,7 +1179,7 @@ static const char *const accentNames[] = {
     XVirtualEvent event;
     int x, y;
     TkWindow *winPtr = TkMacOSXGetTkWindow([self window]);
-    Tk_Window tkwin = (Tk_Window) winPtr;
+    Tk_Window tkwin = (Tk_Window)winPtr;
     (void)sender;
 
     if (!winPtr){
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index faad78e..453f277 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -523,7 +523,7 @@ static void
 SetWindowSizeLimits(
     TkWindow *winPtr)
 {
-    NSWindow *macWindow = TkMacOSXDrawableWindow(winPtr->window);
+    NSWindow *macWindow = TkMacOSXGetNSWindowForDrawable(winPtr->window);
     WmInfo *wmPtr = winPtr->wmInfoPtr;
     int minWidth, minHeight, maxWidth, maxHeight, base;
 
@@ -729,7 +729,7 @@ TkWmNewWindow(
      * detect size and position changes caused by window managers.
      */
 
-    Tk_CreateEventHandler((Tk_Window) winPtr, StructureNotifyMask,
+    Tk_CreateEventHandler((Tk_Window)winPtr, StructureNotifyMask,
 	    TopLevelEventProc, winPtr);
 
     /*
@@ -737,7 +737,7 @@ TkWmNewWindow(
      * window manager.
      */
 
-    Tk_ManageGeometry((Tk_Window) winPtr, &wmMgrType, (ClientData) 0);
+    Tk_ManageGeometry((Tk_Window)winPtr, &wmMgrType, NULL);
 }
 
 /*
@@ -784,7 +784,7 @@ TkWmMapWindow(
 	 * Generate configure event when we first map the window.
 	 */
 
-	TkGenWMConfigureEvent((Tk_Window) winPtr, wmPtr->x, wmPtr->y, -1, -1,
+	TkGenWMConfigureEvent((Tk_Window)winPtr, wmPtr->x, wmPtr->y, -1, -1,
 		TK_LOCATION_CHANGED);
 
 	/*
@@ -896,8 +896,8 @@ TkWmDeadWindow(
      */
 
     RemoveTransient(winPtr);
-    Tk_ManageGeometry((Tk_Window) winPtr, NULL, NULL);
-    Tk_DeleteEventHandler((Tk_Window) winPtr, StructureNotifyMask,
+    Tk_ManageGeometry((Tk_Window)winPtr, NULL, NULL);
+    Tk_DeleteEventHandler((Tk_Window)winPtr, StructureNotifyMask,
 	    TopLevelEventProc, winPtr);
     if (wmPtr->hints.flags & IconPixmapHint) {
 	Tk_FreeBitmap(winPtr->display, wmPtr->hints.icon_pixmap);
@@ -1094,7 +1094,7 @@ Tk_WmObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tk_Window tkwin = (Tk_Window) clientData;
+    Tk_Window tkwin = (Tk_Window)clientData;
     static const char *const optionStrings[] = {
 	"aspect", "attributes", "client", "colormapwindows",
 	"command", "deiconify", "focusmodel", "forget",
@@ -1529,12 +1529,12 @@ WmAttributesCmd(
     NSWindow *macWindow;
 
     if (winPtr->window == None) {
-	Tk_MakeWindowExist((Tk_Window) winPtr);
+	Tk_MakeWindowExist((Tk_Window)winPtr);
     }
     if (!TkMacOSXHostToplevelExists(winPtr)) {
 	TkMacOSXMakeRealWindowExist(winPtr);
     }
-    macWindow = TkMacOSXDrawableWindow(winPtr->window);
+    macWindow = TkMacOSXGetNSWindowForDrawable(winPtr->window);
 
     if (objc == 3) {		/* wm attributes $win */
 	Tcl_Obj *result = Tcl_NewObj();
@@ -1663,7 +1663,7 @@ WmColormapwindowsCmd(
 	return TCL_ERROR;
     }
     if (objc == 3) {
-	Tk_MakeWindowExist((Tk_Window) winPtr);
+	Tk_MakeWindowExist((Tk_Window)winPtr);
 	resultObj = Tcl_NewObj();
 	for (i = 0; i < wmPtr->cmapCount; i++) {
 	    if ((i == (wmPtr->cmapCount-1))
@@ -1671,7 +1671,7 @@ WmColormapwindowsCmd(
 		break;
 	    }
 	    Tcl_ListObjAppendElement(NULL, resultObj,
-		    TkNewWindowObj((Tk_Window) wmPtr->cmapList[i]));
+		    TkNewWindowObj((Tk_Window)wmPtr->cmapList[i]));
 	}
 	Tcl_SetObjResult(interp, resultObj);
 	return TCL_OK;
@@ -1691,7 +1691,7 @@ WmColormapwindowsCmd(
 	    gotToplevel = 1;
 	}
 	if (winPtr2->window == None) {
-	    Tk_MakeWindowExist((Tk_Window) winPtr2);
+	    Tk_MakeWindowExist((Tk_Window)winPtr2);
 	}
 	cmapList[i] = winPtr2;
     }
@@ -1800,7 +1800,7 @@ WmDeiconifyCmd(
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     WmInfo *wmPtr = winPtr->wmInfoPtr;
-    NSWindow *win = TkMacOSXDrawableWindow(winPtr->window);
+    NSWindow *win = TkMacOSXGetNSWindowForDrawable(winPtr->window);
 
     if (objc != 3) {
 	Tcl_WrongNumArgs(interp, 2, objv, "window");
@@ -1931,7 +1931,7 @@ WmForgetCmd(
     TCL_UNUSED(int),			/* Number of arguments. */
     TCL_UNUSED(Tcl_Obj *const *))	/* Argument objects. */
 {
-    Tk_Window frameWin = (Tk_Window) winPtr;
+    Tk_Window frameWin = (Tk_Window)winPtr;
 
     if (Tk_IsTopLevel(frameWin)) {
 	MacDrawable *macWin;
@@ -2007,7 +2007,7 @@ WmFrameCmd(
     }
     window = wmPtr->reparent;
     if (window == None) {
-	window = Tk_WindowId((Tk_Window) winPtr);
+	window = Tk_WindowId((Tk_Window)winPtr);
     }
     sprintf(buf, "0x%" TCL_Z_MODIFIER "x", (size_t)window);
     Tcl_SetObjResult(interp, Tcl_NewStringObj(buf, -1));
@@ -2040,7 +2040,7 @@ WmGeometryCmd(
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     WmInfo *wmPtr = winPtr->wmInfoPtr;
-    NSWindow *win = TkMacOSXDrawableWindow(winPtr->window);
+    NSWindow *win = TkMacOSXGetNSWindowForDrawable(winPtr->window);
     char xSign = '+', ySign = '+';
     int width, height, x = wmPtr->x, y= wmPtr->y;
     char *argv3;
@@ -2166,7 +2166,7 @@ WmGridCmd(
 	    errorMsg = "heightInc can't be <= 0";
 	    goto error;
 	}
-	Tk_SetGrid((Tk_Window) winPtr, reqWidth, reqHeight, widthInc,
+	Tk_SetGrid((Tk_Window)winPtr, reqWidth, reqHeight, widthInc,
 		heightInc);
     }
     wmPtr->flags |= WM_UPDATE_SIZE_HINTS;
@@ -2287,12 +2287,12 @@ WmIconbitmapCmd(
     }
     str = Tcl_GetStringFromObj(objv[3], &len);
     if (winPtr->window == None) {
-	Tk_MakeWindowExist((Tk_Window) winPtr);
+	Tk_MakeWindowExist((Tk_Window)winPtr);
     }
     if (!TkMacOSXHostToplevelExists(winPtr)) {
 	TkMacOSXMakeRealWindowExist(winPtr);
     }
-    if (WmSetAttribute(winPtr, TkMacOSXDrawableWindow(winPtr->window), interp,
+    if (WmSetAttribute(winPtr, TkMacOSXGetNSWindowForDrawable(winPtr->window), interp,
 	    WMATT_TITLEPATH, objv[3]) == TCL_OK) {
 	if (!len) {
 	    if (wmPtr->hints.icon_pixmap != None) {
@@ -2302,7 +2302,7 @@ WmIconbitmapCmd(
 	    wmPtr->hints.flags &= ~IconPixmapHint;
 	}
     } else {
-	pixmap = Tk_GetBitmap(interp, (Tk_Window) winPtr, Tk_GetUid(str));
+	pixmap = Tk_GetBitmap(interp, (Tk_Window)winPtr, Tk_GetUid(str));
 	if (pixmap == None) {
 	    return TCL_ERROR;
 	}
@@ -2343,7 +2343,7 @@ WmIconifyCmd(
 	return TCL_ERROR;
     }
 
-    if (Tk_Attributes((Tk_Window) winPtr)->override_redirect) {
+    if (Tk_Attributes((Tk_Window)winPtr)->override_redirect) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"can't iconify \"%s\": override-redirect flag is set",
 		winPtr->pathName));
@@ -2725,7 +2725,7 @@ WmIconwindowCmd(
 	if (wmPtr->icon != NULL) {
 	    TkWindow *oldIcon = (TkWindow *)wmPtr->icon;
 	    WmInfo *wmPtr3 = oldIcon->wmInfoPtr;
-	    NSWindow *win = TkMacOSXDrawableWindow(oldIcon->window);
+	    NSWindow *win = TkMacOSXGetNSWindowForDrawable(oldIcon->window);
 
 	    /*
 	     * The old icon should be withdrawn.
@@ -2740,7 +2740,7 @@ WmIconwindowCmd(
 	wmPtr->hints.icon_window = Tk_WindowId(tkwin2);
 	wmPtr->hints.flags |= IconWindowHint;
 	wmPtr->icon = tkwin2;
-	wmPtr2->iconFor = (Tk_Window) winPtr;
+	wmPtr2->iconFor = (Tk_Window)winPtr;
 	if (!(wmPtr2->flags & WM_NEVER_MAPPED)) {
 	    /*
 	     * If the window is in normal or zoomed state, the icon should be
@@ -2781,7 +2781,7 @@ WmManageCmd(
     TCL_UNUSED(int),			/* Number of arguments. */
     TCL_UNUSED(Tcl_Obj *const *))	/* Argument objects. */
 {
-    Tk_Window frameWin = (Tk_Window) winPtr;
+    Tk_Window frameWin = (Tk_Window)winPtr;
     WmInfo *wmPtr = winPtr->wmInfoPtr;
 
     if (!Tk_IsTopLevel(frameWin)) {
@@ -2800,7 +2800,7 @@ WmManageCmd(
 	if (wmPtr == NULL) {
 	    TkWmNewWindow(winPtr);
 	    if (winPtr->window == None) {
-		Tk_MakeWindowExist((Tk_Window) winPtr);
+		Tk_MakeWindowExist((Tk_Window)winPtr);
 		macWin = (MacDrawable *) winPtr->window;
 	    }
 	}
@@ -2955,7 +2955,7 @@ WmOverrideredirectCmd(
 {
     int flag;
     XSetWindowAttributes atts;
-    TKWindow *win = (TKWindow *)TkMacOSXDrawableWindow(winPtr->window);
+    TKWindow *win = (TKWindow *)TkMacOSXGetNSWindowForDrawable(winPtr->window);
 
     if ((objc != 3) && (objc != 4)) {
 	Tcl_WrongNumArgs(interp, 2, objv, "window ?boolean?");
@@ -2964,7 +2964,7 @@ WmOverrideredirectCmd(
 
     if (objc == 3) {
 	Tcl_SetObjResult(interp, Tcl_NewBooleanObj(
-		Tk_Attributes((Tk_Window) winPtr)->override_redirect));
+		Tk_Attributes((Tk_Window)winPtr)->override_redirect));
 	return TCL_OK;
     }
 
@@ -2972,7 +2972,7 @@ WmOverrideredirectCmd(
 	return TCL_ERROR;
     }
     atts.override_redirect = flag ? True : False;
-    Tk_ChangeWindowAttributes((Tk_Window) winPtr, CWOverrideRedirect, &atts);
+    Tk_ChangeWindowAttributes((Tk_Window)winPtr, CWOverrideRedirect, &atts);
     ApplyContainerOverrideChanges(winPtr, win);
     return TCL_OK;
 }
@@ -3095,7 +3095,7 @@ WmProtocolCmd(
 	return TCL_OK;
     }
 
-    protocol = Tk_InternAtom((Tk_Window) winPtr, Tcl_GetString(objv[3]));
+    protocol = Tk_InternAtom((Tk_Window)winPtr, Tcl_GetString(objv[3]));
     if (objc == 4) {
 	/*
 	 * Return the command to handle a given protocol.
@@ -3333,7 +3333,7 @@ WmStackorderCmd(
 	    resultObj = Tcl_NewObj();
 	    for (windowPtr = windows; *windowPtr ; windowPtr++) {
 		Tcl_ListObjAppendElement(NULL, resultObj,
-		    TkNewWindowObj((Tk_Window) *windowPtr));
+		    TkNewWindowObj((Tk_Window)*windowPtr));
 	    }
 	    Tcl_SetObjResult(interp, resultObj);
 	    ckfree(windows);
@@ -3482,7 +3482,7 @@ WmStateCmd(
 
 	    break;
 	case OPT_ICONIC:
-	    if (Tk_Attributes((Tk_Window) winPtr)->override_redirect) {
+	    if (Tk_Attributes((Tk_Window)winPtr)->override_redirect) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 			"can't iconify \"%s\": override-redirect flag is set",
 			winPtr->pathName));
@@ -3698,7 +3698,7 @@ WmTransientCmd(
 	    transient->flags |= WITHDRAWN_BY_CONTAINER;
 	}
 
-	wmPtr->master = (Tk_Window) containerPtr;
+	wmPtr->master = (Tk_Window)containerPtr;
     }
     ApplyContainerOverrideChanges(winPtr, NULL);
     return TCL_OK;
@@ -4039,7 +4039,7 @@ TopLevelEventProc(
 	    Tk_ErrorHandler handler = Tk_CreateErrorHandler(winPtr->display,
 		    -1, -1, -1, NULL, NULL);
 
-	    Tk_DestroyWindow((Tk_Window) winPtr);
+	    Tk_DestroyWindow((Tk_Window)winPtr);
 	    Tk_DeleteErrorHandler(handler);
 	}
 	if (wmTracing) {
@@ -4253,7 +4253,7 @@ UpdateGeometryInfo(
 
 	    wmPtr->x = wmPtr->y = 0;
 	    wmPtr->flags &= ~(WM_NEGATIVE_X|WM_NEGATIVE_Y);
-	    Tk_GeometryRequest((Tk_Window) contWinPtr, width, height);
+	    Tk_GeometryRequest((Tk_Window)contWinPtr, width, height);
 	}
 	return;
     }
@@ -4543,7 +4543,7 @@ Tk_GetRootCoords(
 		    x -= winPtr->changes.x + winPtr->changes.border_width;
 		    y -= winPtr->changes.y + winPtr->changes.border_width;
 
-		    tkMacOSXEmbedHandler->getOffsetProc((Tk_Window) winPtr,
+		    tkMacOSXEmbedHandler->getOffsetProc((Tk_Window)winPtr,
 			    &theOffset);
 
 		    x += theOffset.h;
@@ -4673,7 +4673,7 @@ Tk_CoordsToWindow(
     if (winPtr->mainPtr != ((TkWindow *)tkwin)->mainPtr) {
 	return NULL;
     }
-    return (Tk_Window) winPtr;
+    return (Tk_Window)winPtr;
 }
 
 /*
@@ -4766,7 +4766,7 @@ Tk_TopCoordsToWindow(
     }
     *newX = x;
     *newY = y;
-    return (Tk_Window) winPtr;
+    return (Tk_Window)winPtr;
 }
 
 /*
@@ -4988,7 +4988,7 @@ TkWmRestackToplevel(
 	    wmPtr->hints.initial_state == WithdrawnState) {
 	return;
     }
-    macWindow = TkMacOSXDrawableWindow(winPtr->window);
+    macWindow = TkMacOSXGetNSWindowForDrawable(winPtr->window);
     if (macWindow == nil) {
 	return;
     }
@@ -5004,7 +5004,7 @@ TkWmRestackToplevel(
 		otherWmPtr->hints.initial_state == WithdrawnState) {
 	    return;
 	}
-	otherMacWindow = TkMacOSXDrawableWindow(otherPtr->window);
+	otherMacWindow = TkMacOSXGetNSWindowForDrawable(otherPtr->window);
 	if (otherMacWindow == nil) {
 	    return;
 	}
@@ -5346,7 +5346,7 @@ TkSetWMName(
     }
 
     NSString *title = [[NSString alloc] initWithUTF8String:titleUid];
-    [TkMacOSXDrawableWindow(winPtr->window) setTitle:title];
+    [TkMacOSXGetNSWindowForDrawable(winPtr->window) setTitle:title];
     [title release];
 }
 
@@ -5458,7 +5458,7 @@ MODULE_SCOPE int
 TkMacOSXIsWindowZoomed(
     TkWindow *winPtr)
 {
-    NSWindow *macWindow = TkMacOSXDrawableWindow(winPtr->window);
+    NSWindow *macWindow = TkMacOSXGetNSWindowForDrawable(winPtr->window);
     return [macWindow isZoomed];
 }
 
@@ -5613,7 +5613,7 @@ TkUnsupported1ObjCmd(
 	    return TCL_ERROR;
 	}
 	Tcl_SetObjResult(interp, Tcl_NewBooleanObj(
-		TkMacOSXInDarkMode((Tk_Window) winPtr)));
+		TkMacOSXInDarkMode((Tk_Window)winPtr)));
 	return TCL_OK;
     default:
 	return TCL_ERROR;
@@ -5840,7 +5840,7 @@ WmWinTabbingId(
 #if !(MAC_OS_X_VERSION_MAX_ALLOWED < 101200)
     Tcl_Obj *result = NULL;
     NSString *idString;
-    NSWindow *win = TkMacOSXDrawableWindow(winPtr->window);
+    NSWindow *win = TkMacOSXGetNSWindowForDrawable(winPtr->window);
     if (win) {
 	idString = win.tabbingIdentifier;
 	result = Tcl_NewStringObj(idString.UTF8String, [idString length]);
@@ -5930,7 +5930,7 @@ WmWinAppearance(
 #endif // MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
 
     const char *resultString = "unrecognized";
-    NSWindow *win = TkMacOSXDrawableWindow(winPtr->window);
+    NSWindow *win = TkMacOSXGetNSWindowForDrawable(winPtr->window);
     if (win) {
 	appearance = win.appearance.name;
 	if (appearance == nil) {
@@ -6042,7 +6042,7 @@ TkMacOSXMakeRealWindowExist(
     WmInfo *wmPtr = winPtr->wmInfoPtr;
     MacDrawable *macWin;
     WindowClass macClass;
-    Bool overrideRedirect = Tk_Attributes((Tk_Window) winPtr)->override_redirect;
+    Bool overrideRedirect = Tk_Attributes((Tk_Window)winPtr)->override_redirect;
 
     if (TkMacOSXHostToplevelExists(winPtr)) {
 	return;
@@ -6069,7 +6069,7 @@ TkMacOSXMakeRealWindowExist(
 	    Tcl_Panic("TkMacOSXMakeRealWindowExist could not find container");
 	}
 	if (tkMacOSXEmbedHandler->containerExistProc &&
-		tkMacOSXEmbedHandler->containerExistProc((Tk_Window) winPtr)
+		tkMacOSXEmbedHandler->containerExistProc((Tk_Window)winPtr)
 		!= TCL_OK) {
 	    Tcl_Panic("ContainerExistProc could not make container");
 	}
@@ -6158,7 +6158,7 @@ TkMacOSXMakeRealWindowExist(
     	XSetWindowAttributes atts;
 
     	atts.override_redirect = True;
-    	Tk_ChangeWindowAttributes((Tk_Window) winPtr, CWOverrideRedirect, &atts);
+    	Tk_ChangeWindowAttributes((Tk_Window)winPtr, CWOverrideRedirect, &atts);
     	ApplyContainerOverrideChanges(winPtr, NULL);
     }
 }
@@ -6191,7 +6191,7 @@ TkpRedrawWidget(Tk_Window tkwin) {
     if ([NSApp isDrawing]) {
 	return;
     }
-    w = TkMacOSXDrawableWindow(winPtr->window);
+    w = TkMacOSXGetNSWindowForDrawable(winPtr->window);
     if (w) {
 	TKContentView *view = [w contentView];
 	TkMacOSXWinBounds(winPtr, &tkBounds);
@@ -6400,10 +6400,10 @@ TkpWmSetState(
 	return;
     }
 
-    macWin = TkMacOSXDrawableWindow(winPtr->window);
+    macWin = TkMacOSXGetNSWindowForDrawable(winPtr->window);
 
     if (state == WithdrawnState) {
-	Tk_UnmapWindow((Tk_Window) winPtr);
+	Tk_UnmapWindow((Tk_Window)winPtr);
     } else if (state == IconicState) {
 
 	/*
@@ -6415,9 +6415,9 @@ TkpWmSetState(
 		![macWin isMiniaturized]) {
 	    [macWin miniaturize:NSApp];
 	}
-	Tk_UnmapWindow((Tk_Window) winPtr);
+	Tk_UnmapWindow((Tk_Window)winPtr);
     } else if (state == NormalState || state == ZoomState) {
-	Tk_MapWindow((Tk_Window) winPtr);
+	Tk_MapWindow((Tk_Window)winPtr);
 	[macWin deminiaturize:NSApp];
 	[macWin orderFront:NSApp];
 	TkMacOSXZoomToplevel(macWin, state == NormalState ? inZoomIn : inZoomOut);
@@ -6576,7 +6576,7 @@ TkpChangeFocus(
     }
 
     if (Tk_IsTopLevel(winPtr) && !Tk_IsEmbedded(winPtr)) {
-    	NSWindow *win = TkMacOSXDrawableWindow(winPtr->window);
+    	NSWindow *win = TkMacOSXGetNSWindowForDrawable(winPtr->window);
 
     	TkWmRestackToplevel(winPtr, Above, NULL);
     	if (force) {
@@ -6631,7 +6631,7 @@ WmStackorderToplevelWrapperMap(
     if (Tk_IsMapped(winPtr) && Tk_IsTopLevel(winPtr) && !Tk_IsEmbedded(winPtr)
 	    && (winPtr->display == display)) {
 	hPtr = Tcl_CreateHashEntry(table,
-		(char*) TkMacOSXDrawableWindow(winPtr->window), &newEntry);
+		(void *)TkMacOSXGetNSWindowForDrawable(winPtr->window), &newEntry);
 	Tcl_SetHashValue(hPtr, winPtr);
     }
 
@@ -6751,7 +6751,7 @@ ApplyWindowAttributeFlagChanges(
 		if (!create) {
 		    return;
 		}
-		Tk_MakeWindowExist((Tk_Window) winPtr);
+		Tk_MakeWindowExist((Tk_Window)winPtr);
 	    }
 	    if (!TkMacOSXHostToplevelExists(winPtr)) {
 		if (!create) {
@@ -6759,7 +6759,7 @@ ApplyWindowAttributeFlagChanges(
 		}
 		TkMacOSXMakeRealWindowExist(winPtr);
 	    }
-	    macWindow = TkMacOSXDrawableWindow(winPtr->window);
+	    macWindow = TkMacOSXGetNSWindowForDrawable(winPtr->window);
 	}
 	if ((changedAttributes & kWindowCloseBoxAttribute) || initial) {
 	    [[macWindow standardWindowButton:NSWindowCloseButton]
@@ -6931,7 +6931,7 @@ ApplyContainerOverrideChanges(
 
     if (!macWindow && winPtr->window != None &&
 	    TkMacOSXHostToplevelExists(winPtr)) {
-	macWindow = TkMacOSXDrawableWindow(winPtr->window);
+	macWindow = TkMacOSXGetNSWindowForDrawable(winPtr->window);
     }
     styleMask = [macWindow styleMask];
 
@@ -7007,7 +7007,7 @@ ApplyContainerOverrideChanges(
 
 	    if (containerWinPtr && (containerWinPtr->window != None)
 		    && TkMacOSXHostToplevelExists(containerWinPtr)) {
-		NSWindow *containerMacWin = TkMacOSXDrawableWindow(
+		NSWindow *containerMacWin = TkMacOSXGetNSWindowForDrawable(
 			containerWinPtr->window);
 
 		/*
diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c
index 37d3631..95c72c4 100644
--- a/macosx/ttkMacOSXTheme.c
+++ b/macosx/ttkMacOSXTheme.c
@@ -547,7 +547,7 @@ static void DrawListHeader(
      * So we have to query the Apple window manager.
      */
 
-    NSWindow *win = TkMacOSXDrawableWindow(Tk_WindowId(tkwin));
+    NSWindow *win = TkMacOSXGetNSWindowForDrawable(Tk_WindowId(tkwin));
     CGFloat *bgRGBA = [win isKeyWindow] ? activeBgRGBA : inactiveBgRGBA;
     CGFloat x = bounds.origin.x, y = bounds.origin.y;
     CGFloat w = bounds.size.width, h = bounds.size.height;
-- 
cgit v0.12


From 8952ee7ee1dc5bbc401ee01f356e3b8ff4a170a3 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 2 Sep 2020 08:39:16 +0000
Subject: Fix safe.test when running in a Tcl 8.7 environment (backported from
 Tk 8.7)

---
 tests/safe.test | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/tests/safe.test b/tests/safe.test
index 64cd64c..a31e029 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -28,23 +28,35 @@ namespace import -force tcltest::test
 # This probably means that tk wasn't installed properly.
 
 ## it indicates that something went wrong sourcing tk.tcl.
-## Ensure that any changes that occured to tk.tcl will work or are properly
+## Ensure that any changes that occurred to tk.tcl will work or are properly
 ## prevented in a safe interpreter.  -- hobbs
 
 # The set of hidden commands is platform dependent:
 
-set hidden_cmds {bell cd clipboard encoding exec exit fconfigure glob grab load menu open pwd selection socket source tcl:encoding:dirs toplevel unload wm}
-lappend hidden_cmds {*}[apply {{} {
+set hidden_cmds [list bell cd clipboard encoding exec exit \
+	fconfigure glob grab load menu open pwd selection \
+	socket source tcl:encoding:dirs toplevel unload wm]
+if {[package vsatisfies [package provide Tcl] 8.7-]} {
+    lappend hidden_cmds file tcl:encoding:system tcl:file:tempdir
     foreach cmd {
-	atime attributes copy delete dirname executable exists extension
-	isdirectory isfile link lstat mkdir mtime nativename normalize owned
-	readable readlink rename rootname size stat tail tempfile type
-	volumes writable
-    } {lappend result tcl:file:$cmd}; return $result
-}}]
+	cmdtype nameofexecutable
+    } {lappend hidden_cmds tcl:info:$cmd}
+    foreach cmd {
+	autopurge list purge status
+    } {lappend hidden_cmds tcl:process:$cmd}
+    foreach cmd {
+	lmkimg lmkzip mkimg mkkey mkzip mount  mount_data unmount
+    } {lappend hidden_cmds tcl:zipfs:$cmd}
+}
+foreach cmd {
+    atime attributes copy delete dirname executable exists extension
+    isdirectory isfile link lstat mkdir mtime nativename normalize
+    owned readable readlink rename rootname size stat tail tempfile
+    type volumes writable
+} {lappend hidden_cmds tcl:file:$cmd}
 if {[tk windowingsystem] ne "x11"} {
-    lappend hidden_cmds tk_chooseColor tk_chooseDirectory tk_getOpenFile \
-	tk_getSaveFile tk_messageBox
+    lappend hidden_cmds tk_chooseColor tk_chooseDirectory \
+	tk_getOpenFile tk_getSaveFile tk_messageBox
 }
 if {[llength [info commands send]]} {
     lappend hidden_cmds send
-- 
cgit v0.12


From d3271e2d220f2768f99b11887816cacb6223c784 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 2 Sep 2020 13:33:04 +0000
Subject: Upgrade from Xcode 11.6 to 11.7

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 789e091..5015f19 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -112,9 +112,9 @@ jobs:
         - BUILD_DIR=unix
         - CFGOPT="--enable-symbols"
 # Testing on Mac, various styles
-    - name: "macOS/Clang/Xcode 11.6/Shared/XQuartz"
+    - name: "macOS/Clang/Xcode 11.7/Shared/XQuartz"
       os: osx
-      osx_image: xcode11.6
+      osx_image: xcode11.7
       env:
         - BUILD_DIR=unix
         - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --disable-corefoundation --x-includes=/opt/X11/include --x-libraries=/opt/X11/lib CFLAGS=-I/usr/local/opt/tcl-tk/include"
-- 
cgit v0.12


From 066d6dcb874a4f9bae3ba8f4d8fd54e460413e88 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 2 Sep 2020 14:01:23 +0000
Subject: Rename (internal) TkMacOSXDrawableView() ->
 TkMacOSXGetNSViewForDrawable()

---
 macosx/tkMacOSXColor.c       |  6 +++---
 macosx/tkMacOSXDraw.c        |  6 +++---
 macosx/tkMacOSXEmbed.c       |  2 +-
 macosx/tkMacOSXEntry.c       |  4 ++--
 macosx/tkMacOSXFont.c        |  2 +-
 macosx/tkMacOSXImage.c       | 12 ++++++------
 macosx/tkMacOSXKeyEvent.c    |  2 +-
 macosx/tkMacOSXMenu.c        |  2 +-
 macosx/tkMacOSXMouseEvent.c  |  4 ++--
 macosx/tkMacOSXPrivate.h     |  2 +-
 macosx/tkMacOSXScale.c       |  2 +-
 macosx/tkMacOSXScrlbr.c      | 12 ++++++------
 macosx/tkMacOSXSubwindows.c  | 38 +++++++++++++++++++-------------------
 macosx/tkMacOSXTest.c        |  2 +-
 macosx/tkMacOSXWindowEvent.c |  2 +-
 macosx/tkMacOSXWm.c          | 18 +++++++++---------
 macosx/tkMacOSXXStubs.c      |  4 ++--
 macosx/ttkMacOSXTheme.c      |  4 ++--
 18 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index fd39197..8885792 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -438,7 +438,7 @@ TkMacOSXInDarkMode(Tk_Window tkwin)
 	NSAppearanceName name;
 	NSView *view = nil;
 	if (winPtr && winPtr->privatePtr) {
-	    view = TkMacOSXDrawableView((Drawable)winPtr->privatePtr);
+	    view = TkMacOSXGetNSViewForDrawable((Drawable)winPtr->privatePtr);
 	}
 	if (view) {
 	    name = [[view effectiveAppearance] name];
@@ -747,8 +747,8 @@ TkpGetColor(
     }
     if (tkwin) {
 	display = Tk_Display(tkwin);
-	Drawable d = (Drawable)Tk_WindowId(tkwin);
-	view = TkMacOSXDrawableView(d);
+	Drawable d = Tk_WindowId(tkwin);
+	view = TkMacOSXGetNSViewForDrawable(d);
     }
 
     /*
diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index 1c77af3..06d1810 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -1140,7 +1140,7 @@ TkScrollWindow(
 {
     Drawable drawable = Tk_WindowId(tkwin);
     MacDrawable *macDraw = (MacDrawable *)drawable;
-    TKContentView *view = TkMacOSXDrawableView(macDraw);
+    TKContentView *view = (TKContentView *)TkMacOSXGetNSViewForDrawable(macDraw);
     CGRect srcRect, dstRect;
     HIShapeRef dmgRgn = NULL, extraRgn = NULL;
     NSRect bounds, visRect, scrollSrc, scrollDst;
@@ -1271,7 +1271,7 @@ TkMacOSXSetupDrawingContext(
      */
 
     if (!(macDraw->flags & TK_IS_PIXMAP)) {
-	view = TkMacOSXDrawableView(d);
+	view = (TKContentView *)TkMacOSXGetNSViewForDrawable(d);
 	if (!view) {
 	    Tcl_Panic("TkMacOSXSetupDrawingContext(): "
 		    "no NSView to draw into !");
@@ -1523,7 +1523,7 @@ TkMacOSXGetClipRgn(
 #ifdef TK_MAC_DEBUG_DRAWING
 	TkMacOSXDbgMsg("%s", macDraw->winPtr->pathName);
 
-	NSView *view = TkMacOSXDrawableView(macDraw);
+	NSView *view = TkMacOSXGetNSViewForDrawable(macDraw);
 	CGContextRef context = GET_CGCONTEXT;
 
 	CGContextSaveGState(context);
diff --git a/macosx/tkMacOSXEmbed.c b/macosx/tkMacOSXEmbed.c
index acf2e69..dc43726 100644
--- a/macosx/tkMacOSXEmbed.c
+++ b/macosx/tkMacOSXEmbed.c
@@ -446,7 +446,7 @@ TkMacOSXContainerId(
     for (containerPtr = firstContainerPtr; containerPtr != NULL;
 	    containerPtr = containerPtr->nextPtr) {
 	if (containerPtr->embeddedPtr == winPtr) {
-	    return (MacDrawable *) containerPtr->parent;
+	    return (MacDrawable *)containerPtr->parent;
 	}
     }
     Tcl_Panic("TkMacOSXContainerId couldn't find window");
diff --git a/macosx/tkMacOSXEntry.c b/macosx/tkMacOSXEntry.c
index c6f4eea..75cd198 100644
--- a/macosx/tkMacOSXEntry.c
+++ b/macosx/tkMacOSXEntry.c
@@ -92,7 +92,7 @@ TkpDrawEntryBorderAndFocus(
     GC bgGC;
     Tk_Window tkwin = entryPtr->tkwin;
     int oldWidth = 0;
-    MacDrawable *macDraw = (MacDrawable *) d;
+    MacDrawable *macDraw = (MacDrawable *)d;
     const HIThemeFrameDrawInfo info = {
 	.version = 0,
 	.kind = kHIThemeFrameTextFieldSquare,
@@ -208,7 +208,7 @@ TkpDrawSpinboxButtons(
     TkMacOSXDrawingContext dc;
     XRectangle rects[1];
     GC bgGC;
-    MacDrawable *macDraw = (MacDrawable *) d;
+    MacDrawable *macDraw = (MacDrawable *)d;
     HIThemeButtonDrawInfo info = {
 	.version = 0,
 	.adornment = kThemeAdornmentNone,
diff --git a/macosx/tkMacOSXFont.c b/macosx/tkMacOSXFont.c
index 4e383f1..f7b87dc 100644
--- a/macosx/tkMacOSXFont.c
+++ b/macosx/tkMacOSXFont.c
@@ -1189,7 +1189,7 @@ TkpDrawAngledCharsInContext(
     CTTypesetterRef typesetter;
     CFIndex start, length;
     CTLineRef line, full=nil;
-    MacDrawable *macWin = (MacDrawable *) drawable;
+    MacDrawable *macWin = (MacDrawable *)drawable;
     TkMacOSXDrawingContext drawingContext;
     CGContextRef context;
     CGColorRef fg;
diff --git a/macosx/tkMacOSXImage.c b/macosx/tkMacOSXImage.c
index 38e14fa..2604dfa 100644
--- a/macosx/tkMacOSXImage.c
+++ b/macosx/tkMacOSXImage.c
@@ -417,7 +417,7 @@ XPutImage(
     unsigned int height)	/* distination and source. */
 {
     TkMacOSXDrawingContext dc;
-    MacDrawable *macDraw = (MacDrawable *) drawable;
+    MacDrawable *macDraw = (MacDrawable *)drawable;
 
     display->request++;
     if (!TkMacOSXSetupDrawingContext(drawable, gc, &dc)) {
@@ -526,7 +526,7 @@ CreateCGImageFromDrawableRect(
     unsigned int width,
     unsigned int height)
 {
-    MacDrawable *mac_drawable = (MacDrawable *) drawable;
+    MacDrawable *mac_drawable = (MacDrawable *)drawable;
     CGContextRef cg_context = NULL;
     CGImageRef cg_image = NULL, result = NULL;
     NSBitmapImageRep *bitmapRep = NULL;
@@ -544,7 +544,7 @@ CreateCGImageFromDrawableRect(
 	    result = CGImageCreateWithImageInRect(cg_image, image_rect);
 	    CGImageRelease(cg_image);
 	}
-    } else if (TkMacOSXDrawableView(mac_drawable) != NULL) {
+    } else if (TkMacOSXGetNSViewForDrawable(mac_drawable) != NULL) {
 
 	/*
 	 * Convert Tk top-left to NSView bottom-left coordinates.
@@ -746,7 +746,7 @@ XCopyArea(
     int dest_y)
 {
     TkMacOSXDrawingContext dc;
-    MacDrawable *srcDraw = (MacDrawable *) src;
+    MacDrawable *srcDraw = (MacDrawable *)src;
     CGImageRef img = NULL;
     CGRect bounds, srcRect, dstRect;
 
@@ -821,8 +821,8 @@ XCopyPlane(
     unsigned long plane)	/* Which plane to copy. */
 {
     TkMacOSXDrawingContext dc;
-    MacDrawable *srcDraw = (MacDrawable *) src;
-    MacDrawable *dstDraw = (MacDrawable *) dst;
+    MacDrawable *srcDraw = (MacDrawable *)src;
+    MacDrawable *dstDraw = (MacDrawable *)dst;
     CGRect bounds, srcRect, dstRect;
     display->request++;
     if (!width || !height) {
diff --git a/macosx/tkMacOSXKeyEvent.c b/macosx/tkMacOSXKeyEvent.c
index 49d38a6..fdf4e66 100644
--- a/macosx/tkMacOSXKeyEvent.c
+++ b/macosx/tkMacOSXKeyEvent.c
@@ -688,7 +688,7 @@ XGrabKeyboard(
 
     if (keyboardGrabWinPtr && captureWinPtr) {
 	NSWindow *w = TkMacOSXGetNSWindowForDrawable(grab_window);
-	MacDrawable *macWin = (MacDrawable *) grab_window;
+	MacDrawable *macWin = (MacDrawable *)grab_window;
 
 	if (w && macWin->toplevel->winPtr == (TkWindow *) captureWinPtr) {
 	    if (modalSession) {
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c
index 321b4f8..9ba7ce8 100644
--- a/macosx/tkMacOSXMenu.c
+++ b/macosx/tkMacOSXMenu.c
@@ -881,7 +881,7 @@ TkpPostMenu(
 	 * rather than the appearance of the root window.
 	 */
 	realWinPtr = (TkWindow*) realWin;
-	realWinView = TkMacOSXDrawableView(realWinPtr->privatePtr);
+	realWinView = TkMacOSXGetNSViewForDrawable(realWinPtr->privatePtr);
 	if (realWinView != nil) {
 	    break;
 	}
diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index f2d7e32..805b028 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -431,7 +431,7 @@ XQueryPointer(
 	NSPoint global = [NSEvent mouseLocation];
 
 	if (getLocal) {
-	    MacDrawable *macWin = (MacDrawable *) w;
+	    MacDrawable *macWin = (MacDrawable *)w;
 	    NSWindow *win = TkMacOSXGetNSWindowForDrawable(w);
 
 	    if (win) {
@@ -521,7 +521,7 @@ TkGenerateButtonEvent(
     Window window,		/* X Window containing button event. */
     unsigned int state)		/* Button Key state suitable for X event. */
 {
-    MacDrawable *macWin = (MacDrawable *) window;
+    MacDrawable *macWin = (MacDrawable *)window;
     NSWindow *win = TkMacOSXGetNSWindowForDrawable(window);
     MouseEventData med;
 
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h
index 5ac834c..1347035 100644
--- a/macosx/tkMacOSXPrivate.h
+++ b/macosx/tkMacOSXPrivate.h
@@ -258,7 +258,7 @@ MODULE_SCOPE void	TkMacOSXRestoreDrawingContext(
 MODULE_SCOPE void	TkMacOSXSetColorInContext(GC gc, unsigned long pixel,
 			    CGContextRef context);
 #define TkMacOSXGetNSWindowForDrawable(drawable) ((NSWindow*)TkMacOSXDrawable(drawable))
-#define TkMacOSXDrawableView(macWin) (TKContentView *)TkMacOSXGetRootControl((Drawable)(macWin))
+#define TkMacOSXGetNSViewForDrawable(macWin) (NSView *)TkMacOSXGetRootControl((Drawable)(macWin))
 MODULE_SCOPE void	TkMacOSXWinCGBounds(TkWindow *winPtr, CGRect *bounds);
 MODULE_SCOPE HIShapeRef	TkMacOSXGetClipRgn(Drawable drawable);
 MODULE_SCOPE void	TkMacOSXInvalidateViewRegion(NSView *view,
diff --git a/macosx/tkMacOSXScale.c b/macosx/tkMacOSXScale.c
index 15286d6..5da13d4 100644
--- a/macosx/tkMacOSXScale.c
+++ b/macosx/tkMacOSXScale.c
@@ -213,7 +213,7 @@ TkpDisplayScale(
      * Set up port for drawing Macintosh control.
      */
 
-    macDraw = (MacDrawable *) Tk_WindowId(tkwin);
+    macDraw = (MacDrawable *)Tk_WindowId(tkwin);
     windowRef = TkMacOSXGetNSWindowForDrawable(Tk_WindowId(tkwin));
 
     /*
diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c
index e70867d..2d9a038 100644
--- a/macosx/tkMacOSXScrlbr.c
+++ b/macosx/tkMacOSXScrlbr.c
@@ -174,8 +174,8 @@ static void drawMacScrollbar(
     MacScrollbar *msPtr,
     CGContextRef context)
 {
-    Drawable d = (Drawable)Tk_WindowId(scrollPtr->tkwin);
-    NSView *view = TkMacOSXDrawableView(d);
+    Drawable d = Tk_WindowId(scrollPtr->tkwin);
+    NSView *view = TkMacOSXGetNSViewForDrawable(d);
     CGPathRef path;
     CGPoint inner[2], outer[2], thumbOrigin;
     CGSize thumbSize;
@@ -258,8 +258,8 @@ TkpDisplayScrollbar(
 	return;
     }
 
-    MacDrawable *macWin = (MacDrawable *) winPtr->window;
-    NSView *view = TkMacOSXDrawableView(macWin);
+    MacDrawable *macWin = (MacDrawable *)winPtr->window;
+    NSView *view = TkMacOSXGetNSViewForDrawable(macWin);
 
     if ((view == NULL)
 	    || (macWin->flags & TK_DO_NOT_DRAW)
@@ -589,12 +589,12 @@ UpdateControlValues(
 {
     MacScrollbar *msPtr = (MacScrollbar *) scrollPtr;
     Tk_Window tkwin = scrollPtr->tkwin;
-    MacDrawable *macWin = (MacDrawable *) Tk_WindowId(scrollPtr->tkwin);
+    MacDrawable *macWin = (MacDrawable *)Tk_WindowId(scrollPtr->tkwin);
     double dViewSize;
     HIRect contrlRect;
     short width, height;
 
-    NSView *view = TkMacOSXDrawableView(macWin);
+    NSView *view = TkMacOSXGetNSViewForDrawable(macWin);
     CGFloat viewHeight = [view bounds].size.height;
     NSRect frame;
 
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index 24cd974..002eae6 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -54,7 +54,7 @@ XDestroyWindow(
     TCL_UNUSED(Display *),		/* Display. */
     Window window)		/* Window. */
 {
-    MacDrawable *macWin = (MacDrawable *) window;
+    MacDrawable *macWin = (MacDrawable *)window;
 
     /*
      * Remove any dangling pointers that may exist if the window we are
@@ -139,7 +139,7 @@ XMapWindow(
     if (!window) {
 	return BadWindow;
     }
-    MacDrawable *macWin = (MacDrawable *) window;
+    MacDrawable *macWin = (MacDrawable *)window;
     TkWindow *winPtr = macWin->winPtr;
     NSWindow *win = TkMacOSXGetNSWindowForDrawable(window);
     XEvent event;
@@ -297,7 +297,7 @@ XUnmapWindow(
     Display *display,		/* Display. */
     Window window)		/* Window. */
 {
-    MacDrawable *macWin = (MacDrawable *) window;
+    MacDrawable *macWin = (MacDrawable *)window;
     TkWindow *winPtr = macWin->winPtr;
     TkWindow *parentPtr = winPtr->parentPtr;
     NSWindow *win = TkMacOSXGetNSWindowForDrawable(window);
@@ -341,7 +341,7 @@ XUnmapWindow(
 
 	if (parentPtr && parentPtr->privatePtr->visRgn) {
 	    TkMacOSXInvalidateViewRegion(
-		    TkMacOSXDrawableView(parentPtr->privatePtr),
+		    TkMacOSXGetNSViewForDrawable(parentPtr->privatePtr),
 		    parentPtr->privatePtr->visRgn);
 	}
 	TkMacOSXInvalClipRgns((Tk_Window)parentPtr);
@@ -379,7 +379,7 @@ XResizeWindow(
     unsigned int width,
     unsigned int height)
 {
-    MacDrawable *macWin = (MacDrawable *) window;
+    MacDrawable *macWin = (MacDrawable *)window;
 
     display->request++;
     if (Tk_IsTopLevel(macWin->winPtr) && !Tk_IsEmbedded(macWin->winPtr)) {
@@ -424,7 +424,7 @@ XMoveResizeWindow(
     unsigned int width,
     unsigned int height)
 {
-    MacDrawable *macWin = (MacDrawable *) window;
+    MacDrawable *macWin = (MacDrawable *)window;
 
     display->request++;
     if (Tk_IsTopLevel(macWin->winPtr) && !Tk_IsEmbedded(macWin->winPtr)) {
@@ -477,7 +477,7 @@ XMoveWindow(
     Window window,		/* Window. */
     int x, int y)
 {
-    MacDrawable *macWin = (MacDrawable *) window;
+    MacDrawable *macWin = (MacDrawable *)window;
 
     display->request++;
     if (Tk_IsTopLevel(macWin->winPtr) && !Tk_IsEmbedded(macWin->winPtr)) {
@@ -620,7 +620,7 @@ XRaiseWindow(
     Display *display,		/* Display. */
     Window window)		/* Window. */
 {
-    MacDrawable *macWin = (MacDrawable *) window;
+    MacDrawable *macWin = (MacDrawable *)window;
 
     display->request++;
     if (Tk_IsTopLevel(macWin->winPtr) && !Tk_IsEmbedded(macWin->winPtr)) {
@@ -654,7 +654,7 @@ XLowerWindow(
     Display *display,		/* Display. */
     Window window)		/* Window. */
 {
-    MacDrawable *macWin = (MacDrawable *) window;
+    MacDrawable *macWin = (MacDrawable *)window;
 
     display->request++;
     if (Tk_IsTopLevel(macWin->winPtr) && !Tk_IsEmbedded(macWin->winPtr)) {
@@ -692,7 +692,7 @@ XConfigureWindow(
     unsigned int value_mask,
     TCL_UNUSED(XWindowChanges *))
 {
-    MacDrawable *macWin = (MacDrawable *) w;
+    MacDrawable *macWin = (MacDrawable *)w;
     TkWindow *winPtr = macWin->winPtr;
 
     display->request++;
@@ -714,7 +714,7 @@ XConfigureWindow(
      */
 
     if (value_mask & CWStackMode) {
-	NSView *view = TkMacOSXDrawableView(macWin);
+	NSView *view = TkMacOSXGetNSViewForDrawable(macWin);
 
 	if (view) {
 	    TkMacOSXInvalClipRgns((Tk_Window)winPtr->parentPtr);
@@ -1062,7 +1062,7 @@ TkMacOSXInvalidateWindow(
     if (macWin->flags & TK_CLIP_INVALID) {
 	TkMacOSXUpdateClipRgn(macWin->winPtr);
     }
-    TkMacOSXInvalidateViewRegion(TkMacOSXDrawableView(macWin),
+    TkMacOSXInvalidateViewRegion(TkMacOSXGetNSViewForDrawable(macWin),
 	    (flag == TK_WINDOW_ONLY) ? macWin->visRgn : macWin->aboveVisRgn);
 }
 
@@ -1086,7 +1086,7 @@ void *
 TkMacOSXDrawable(
     Drawable drawable)
 {
-    MacDrawable *macWin = (MacDrawable *) drawable;
+    MacDrawable *macWin = (MacDrawable *)drawable;
     NSWindow *result = nil;
 
     if (!macWin || macWin->flags & TK_IS_PIXMAP) {
@@ -1135,15 +1135,15 @@ TkMacOSXGetDrawablePort(
 /*
  *----------------------------------------------------------------------
  *
- * TkMacOSXDrawableView/TkMacOSXGetRootControl --
+ * TkMacOSXGetNSViewForDrawable/TkMacOSXGetRootControl --
  *
  *	The function name TkMacOSXGetRootControl is being preserved only
  *      because it exists in a stubs table.  Nobody knows what it means to
- *      get a "RootControl".  The macro TkMacOSXDrawableView calls this
- *      function and should always be used rather than directly using the
- *      obscure official name of this function.
+ *      get a "RootControl".  The macro TkMacOSXGetNSViewForDrawable calls
+ *      this function and should always be used rather than directly using
+ *      the obscure official name of this function.
  *
- *      It returns the TKContentView for a given X drawable in the case that the
+ *      It returns the NSView for a given X drawable in the case that the
  *      drawable is a window.  If the drawable is a pixmap it returns nil.
  *
  * Results:
@@ -1484,7 +1484,7 @@ Tk_FreePixmap(
     Display *display,		/* Display. */
     Pixmap pixmap)		/* Pixmap to destroy */
 {
-    MacDrawable *macPix = (MacDrawable *) pixmap;
+    MacDrawable *macPix = (MacDrawable *)pixmap;
 
     display->request++;
     if (macPix->context) {
diff --git a/macosx/tkMacOSXTest.c b/macosx/tkMacOSXTest.c
index 434504f..8e4a030 100644
--- a/macosx/tkMacOSXTest.c
+++ b/macosx/tkMacOSXTest.c
@@ -152,7 +152,7 @@ MODULE_SCOPE Bool
 TkTestLogDisplay(
     Drawable drawable)
 {
-    MacDrawable *macWin = (MacDrawable *) drawable;
+    MacDrawable *macWin = (MacDrawable *)drawable;
     NSWindow *win = nil;
     if (macWin->toplevel && macWin->toplevel->winPtr &&
 	macWin->toplevel->winPtr->wmInfoPtr &&
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 8b1e694..3d9120f 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -427,7 +427,7 @@ TkpWillDrawWidget(Tk_Window tkwin) {
     int result;
     if (tkwin) {
 	TkWindow *winPtr = (TkWindow *)tkwin;
-	TKContentView *view = TkMacOSXDrawableView(
+	TKContentView *view = (TKContentView *)TkMacOSXGetNSViewForDrawable(
 	    (Drawable)winPtr->privatePtr);
 	result = ([NSApp isDrawing] && view == [NSView focusView]);
 #if 0
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 453f277..d97ef64 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -969,7 +969,7 @@ TkWmDeadWindow(
 	NSWindow *parent = [ourNSWindow parentWindow];
 	TkMacOSXUnregisterMacWindow(ourNSWindow);
         if (winPtr->window) {
-            ((MacDrawable *) winPtr->window)->view = nil;
+            ((MacDrawable *)winPtr->window)->view = nil;
         }
 	wmPtr->window = NULL;
 
@@ -1433,7 +1433,7 @@ WmSetAttribute(
 		    oldFlags, 1, 0);
 	    [macWindow setBackgroundColor:boolean ? [NSColor clearColor] : nil];
 	    [macWindow setOpaque:!boolean];
-	    TkMacOSXInvalidateWindow((MacDrawable *) winPtr->window,
+	    TkMacOSXInvalidateWindow((MacDrawable *)winPtr->window,
 		    TK_PARENT_WINDOW);
 	    }
 	break;
@@ -1939,7 +1939,7 @@ WmForgetCmd(
 	Tk_MakeWindowExist(frameWin);
 	Tk_MakeWindowExist((Tk_Window)winPtr->parentPtr);
 
-	macWin = (MacDrawable *) winPtr->window;
+	macWin = (MacDrawable *)winPtr->window;
 
     	TkFocusJoin(winPtr);
     	Tk_UnmapWindow(frameWin);
@@ -1950,7 +1950,7 @@ WmForgetCmd(
 	macWin->flags &= ~TK_HOST_EXISTS;
 
 	TkWmDeadWindow(winPtr);
-	RemapWindows(winPtr, (MacDrawable *) winPtr->parentPtr->window);
+	RemapWindows(winPtr, (MacDrawable *)winPtr->parentPtr->window);
 
         /*
          * Make sure wm no longer manages this window
@@ -2785,7 +2785,7 @@ WmManageCmd(
     WmInfo *wmPtr = winPtr->wmInfoPtr;
 
     if (!Tk_IsTopLevel(frameWin)) {
-	MacDrawable *macWin = (MacDrawable *) winPtr->window;
+	MacDrawable *macWin = (MacDrawable *)winPtr->window;
 
 	if (!Tk_IsManageable(frameWin)) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
@@ -2801,7 +2801,7 @@ WmManageCmd(
 	    TkWmNewWindow(winPtr);
 	    if (winPtr->window == None) {
 		Tk_MakeWindowExist((Tk_Window)winPtr);
-		macWin = (MacDrawable *) winPtr->window;
+		macWin = (MacDrawable *)winPtr->window;
 	    }
 	}
 	wmPtr = winPtr->wmInfoPtr;
@@ -6048,7 +6048,7 @@ TkMacOSXMakeRealWindowExist(
 	return;
     }
 
-    macWin = (MacDrawable *) winPtr->window;
+    macWin = (MacDrawable *)winPtr->window;
 
     /*
      * If this is embedded, make sure its container's toplevel exists, then
@@ -7231,7 +7231,7 @@ RemapWindows(
      */
 
     if (winPtr->window != None) {
-	MacDrawable *macWin = (MacDrawable *) winPtr->window;
+	MacDrawable *macWin = (MacDrawable *)winPtr->window;
 
 	macWin->toplevel->referenceCount--;
 	macWin->toplevel = parentWin->toplevel;
@@ -7248,7 +7248,7 @@ RemapWindows(
 
     for (childPtr = winPtr->childList; childPtr != NULL;
 	    childPtr = childPtr->nextPtr) {
-	RemapWindows(childPtr, (MacDrawable *) winPtr->window);
+	RemapWindows(childPtr, (MacDrawable *)winPtr->window);
     }
 }
 
diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c
index ccb3991..aa1108e 100644
--- a/macosx/tkMacOSXXStubs.c
+++ b/macosx/tkMacOSXXStubs.c
@@ -466,7 +466,7 @@ XGetGeometry(
     unsigned int *border_width_return,
     unsigned int *depth_return)
 {
-    TkWindow *winPtr = ((MacDrawable *) d)->winPtr;
+    TkWindow *winPtr = ((MacDrawable *)d)->winPtr;
 
     display->request++;
     *root_return = ROOT_ID;
@@ -478,7 +478,7 @@ XGetGeometry(
 	*border_width_return = winPtr->changes.border_width;
 	*depth_return = Tk_Depth(winPtr);
     } else {
-	CGSize size = ((MacDrawable *) d)->size;
+	CGSize size = ((MacDrawable *)d)->size;
 	*x_return = 0;
 	*y_return =  0;
 	*width_return = size.width;
diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c
index 95c72c4..26a25b4 100644
--- a/macosx/ttkMacOSXTheme.c
+++ b/macosx/ttkMacOSXTheme.c
@@ -153,7 +153,7 @@ static inline CGRect BoxToRect(
     Drawable d,
     Ttk_Box b)
 {
-    MacDrawable *md = (MacDrawable *) d;
+    MacDrawable *md = (MacDrawable *)d;
     CGRect rect;
 
     rect.origin.y       = b.y + md->yOff;
@@ -2448,7 +2448,7 @@ static void ThumbElementDraw(
 	END_DRAWING
     } else {
 	double thumbSize, trackSize, visibleSize, factor, fraction;
-	MacDrawable *macWin = (MacDrawable *) Tk_WindowId(tkwin);
+	MacDrawable *macWin = (MacDrawable *)Tk_WindowId(tkwin);
 	CGRect troughBounds = {{macWin->xOff, macWin->yOff},
 			       {Tk_Width(tkwin), Tk_Height(tkwin)}};
 
-- 
cgit v0.12


From 1f00cd502ff3b3aef1eb1fac67d20e69fa4e4bad Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Wed, 2 Sep 2020 16:09:53 +0000
Subject: Better fix for [d72abe6b54] using NSEvents.

---
 macosx/tkMacOSXMouseEvent.c | 9 ++++++---
 macosx/tkMacOSXPrivate.h    | 7 +++++++
 macosx/tkMacOSXWm.c         | 1 +
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index f2d7e32..be08a29 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -69,8 +69,13 @@ enum {
     case NSRightMouseDragged:
     case NSOtherMouseDragged:
 	button = [theEvent buttonNumber] + Button1;
+	break;
     case NSMouseEntered:
+	[(TKWindow *)eventWindow setMouseInResizeArea:YES];
+	break;
     case NSMouseExited:
+	[(TKWindow *)eventWindow setMouseInResizeArea:NO];
+	break;
     case NSCursorUpdate:
     case NSLeftMouseUp:
     case NSRightMouseUp:
@@ -100,12 +105,10 @@ enum {
 	 */
 
 	if (eventType == NSLeftMouseDown &&
+	    [(TKWindow *)eventWindow mouseInResizeArea] &&
 	    ([eventWindow styleMask] & NSResizableWindowMask) &&
 	    [NSApp macOSVersion] > 100600) {
-	    NSRect frame = [eventWindow frame];
-	    if (local.x < 3 || local.x > frame.size.width - 3 || local.y < 3) {
 		return theEvent;
-	    }
 	}
 	global = [eventWindow tkConvertPointToScreen: local];
 	tkwin = TkMacOSXGetCapture();
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h
index 5ac834c..ef753e5 100644
--- a/macosx/tkMacOSXPrivate.h
+++ b/macosx/tkMacOSXPrivate.h
@@ -436,6 +436,13 @@ VISIBILITY_HIDDEN
 
 VISIBILITY_HIDDEN
 @interface TKWindow : NSWindow
+{
+#ifdef __i386__
+    /* The Objective C runtime used on i386 requires this. */
+    Bool _mouseInResizeArea;
+#endif
+}
+@property Bool mouseInResizeArea;
 @end
 
 @interface TKWindow(TKWm)
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 453f277..12ce7b2 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -363,6 +363,7 @@ static void             RemoveTransient(TkWindow *winPtr);
 #pragma mark TKWindow(TKWm)
 
 @implementation TKWindow: NSWindow
+@synthesize mouseInResizeArea = _mouseInResizeArea;
 @end
 
 @implementation TKWindow(TKWm)
-- 
cgit v0.12


From 65f39447cc34c5c9f1a5f8324115bd076c840d12 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Wed, 2 Sep 2020 19:43:41 +0000
Subject: Slave ->Pane, Master->Container in tkPanedwindow.c

---
 generic/tkPanedWindow.c | 814 ++++++++++++++++++++++++------------------------
 1 file changed, 407 insertions(+), 407 deletions(-)

diff --git a/generic/tkPanedWindow.c b/generic/tkPanedWindow.c
index ac61ba8..fec9448 100644
--- a/generic/tkPanedWindow.c
+++ b/generic/tkPanedWindow.c
@@ -70,7 +70,7 @@ enum stretch {
 
 typedef struct {
     Tk_OptionTable pwOptions;	/* Token for paned window option table. */
-    Tk_OptionTable slaveOpts;	/* Token for slave cget option table. */
+    Tk_OptionTable paneOpts;	/* Token for pane cget option table. */
 } OptionTables;
 
 /*
@@ -78,35 +78,35 @@ typedef struct {
  * managed by a paned window widget.
  */
 
-typedef struct Slave {
+typedef struct Pane {
     Tk_Window tkwin;		/* Window being managed. */
     int minSize;		/* Minimum size of this pane, on the relevant
 				 * axis, in pixels. */
-    int padx;			/* Additional padding requested for slave, in
+    int padx;			/* Additional padding requested for pane, in
 				 * the x dimension. */
-    int pady;			/* Additional padding requested for slave, in
+    int pady;			/* Additional padding requested for pane, in
 				 * the y dimension. */
     Tcl_Obj *widthPtr, *heightPtr;
-				/* Tcl_Obj rep's of slave width/height, to
+				/* Tcl_Obj rep's of pane width/height, to
 				 * allow for null values. */
-    int width;			/* Slave width. */
-    int height;			/* Slave height. */
+    int width;			/* Pane width. */
+    int height;			/* Pane height. */
     int sticky;			/* Sticky string. */
     int x, y;			/* Coordinates of the widget. */
     int paneWidth, paneHeight;	/* Pane dimensions (may be different from
-				 * slave width/height). */
+				 * pane width/height). */
     int sashx, sashy;		/* Coordinates of the sash of the right or
 				 * bottom of this pane. */
     int markx, marky;		/* Coordinates of the last mark set for the
 				 * sash. */
     int handlex, handley;	/* Coordinates of the sash handle. */
-    enum stretch stretch;	/* Controls how slave grows/shrinks */
+    enum stretch stretch;	/* Controls how pane grows/shrinks */
     int hide;			/* Controls visibility of pane */
-    struct PanedWindow *masterPtr;
+    struct PanedWindow *containerPtr;
 				/* Paned window managing the window. */
     Tk_Window after;		/* Placeholder for parsing options. */
     Tk_Window before;		/* Placeholder for parsing options. */
-} Slave;
+} Pane;
 
 /*
  * A data structure of the following type is kept for each paned window widget
@@ -121,7 +121,7 @@ typedef struct PanedWindow {
     Tcl_Command widgetCmd;	/* Token for square's widget command. */
     Tk_OptionTable optionTable;	/* Token representing the configuration
 				 * specifications. */
-    Tk_OptionTable slaveOpts;	/* Token for slave cget table. */
+    Tk_OptionTable paneOpts;	/* Token for pane cget table. */
     Tk_3DBorder background;	/* Background color. */
     int borderWidth;		/* Value of -borderwidth option. */
     int relief;			/* 3D border effect (TK_RELIEF_RAISED, etc) */
@@ -151,9 +151,9 @@ typedef struct PanedWindow {
     Tcl_Obj *proxyBorderWidthPtr; /* Tcl_Obj rep for proxyBorderWidth */
     int proxyBorderWidth;	/* Borderwidth used to draw proxy. */
     int proxyRelief;		/* Relief used to draw proxy, if TK_RELIEF_NULL then use relief. */
-    Slave **slaves;		/* Pointer to array of Slaves. */
-    int numSlaves;		/* Number of slaves. */
-    int sizeofSlaves;		/* Number of elements in the slaves array. */
+    Pane **panes;		/* Pointer to array of Panes. */
+    int numPanes;		/* Number of panes. */
+    int sizeofPanes;		/* Number of elements in the panes array. */
     int flags;			/* Flags for widget; see below. */
 } PanedWindow;
 
@@ -200,16 +200,16 @@ static void		DisplayProxyWindow(ClientData clientData);
 static void		PanedWindowWorldChanged(ClientData instanceData);
 static int		PanedWindowWidgetObjCmd(ClientData clientData,
 			    Tcl_Interp *, int objc, Tcl_Obj * const objv[]);
-static void		PanedWindowLostSlaveProc(ClientData clientData,
+static void		PanedWindowLostPaneProc(ClientData clientData,
 			    Tk_Window tkwin);
 static void		PanedWindowReqProc(ClientData clientData,
 			    Tk_Window tkwin);
 static void		ArrangePanes(ClientData clientData);
-static void		Unlink(Slave *slavePtr);
-static Slave *		GetPane(PanedWindow *pwPtr, Tk_Window tkwin);
+static void		Unlink(Pane *panePtr);
+static Pane *		GetPane(PanedWindow *pwPtr, Tk_Window tkwin);
 static void		GetFirstLastVisiblePane(PanedWindow *pwPtr,
 			    int *firstPtr, int *lastPtr);
-static void		SlaveStructureProc(ClientData clientData,
+static void		PaneStructureProc(ClientData clientData,
 			    XEvent *eventPtr);
 static int		PanedWindowSashCommand(PanedWindow *pwPtr,
 			    Tcl_Interp *interp, int objc,
@@ -218,7 +218,7 @@ static int		PanedWindowProxyCommand(PanedWindow *pwPtr,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj * const objv[]);
 static void		ComputeGeometry(PanedWindow *pwPtr);
-static int		ConfigureSlaves(PanedWindow *pwPtr,
+static int		ConfigurePanes(PanedWindow *pwPtr,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj * const objv[]);
 static void		DestroyOptionTables(ClientData clientData,
@@ -233,7 +233,7 @@ static void		RestoreSticky(ClientData clientData, Tk_Window tkwin,
 			    char *internalPtr, char *oldInternalPtr);
 static void		AdjustForSticky(int sticky, int cavityWidth,
 			    int cavityHeight, int *xPtr, int *yPtr,
-			    int *slaveWidthPtr, int *slaveHeightPtr);
+			    int *paneWidthPtr, int *paneHeightPtr);
 static void		MoveSash(PanedWindow *pwPtr, int sash, int diff);
 static int		ObjectIsEmpty(Tcl_Obj *objPtr);
 static char *		ComputeSlotAddress(char *recordPtr, int offset);
@@ -241,16 +241,16 @@ static int		PanedWindowIdentifyCoords(PanedWindow *pwPtr,
 			    Tcl_Interp *interp, int x, int y);
 
 /*
- * Sashes are between panes only, so there is one less sash than slaves
+ * Sashes are between panes only, so there is one less sash than panes
  */
 
 #define ValidSashIndex(pwPtr, sash) \
-	(((sash) >= 0) && ((sash) < ((pwPtr)->numSlaves-1)))
+	(((sash) >= 0) && ((sash) < ((pwPtr)->numPanes-1)))
 
 static const Tk_GeomMgr panedWindowMgrType = {
     "panedwindow",		/* name */
     PanedWindowReqProc,		/* requestProc */
-    PanedWindowLostSlaveProc,	/* lostSlaveProc */
+    PanedWindowLostPaneProc,	/* lostPaneProc */
 };
 
 /*
@@ -261,7 +261,7 @@ static const Tk_GeomMgr panedWindowMgrType = {
 
 /*
  * The following structure contains pointers to functions used for processing
- * the custom "-sticky" option for slave windows.
+ * the custom "-sticky" option for panes.
  */
 
 static const Tk_ObjCustomOption stickyOption = {
@@ -334,33 +334,33 @@ static const Tk_OptionSpec optionSpecs[] = {
     {TK_OPTION_END, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0}
 };
 
-static const Tk_OptionSpec slaveOptionSpecs[] = {
+static const Tk_OptionSpec paneOptionSpecs[] = {
     {TK_OPTION_WINDOW, "-after", NULL, NULL,
-	 DEF_PANEDWINDOW_PANE_AFTER, -1, Tk_Offset(Slave, after),
+	 DEF_PANEDWINDOW_PANE_AFTER, -1, Tk_Offset(Pane, after),
 	 TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_WINDOW, "-before", NULL, NULL,
-	 DEF_PANEDWINDOW_PANE_BEFORE, -1, Tk_Offset(Slave, before),
+	 DEF_PANEDWINDOW_PANE_BEFORE, -1, Tk_Offset(Pane, before),
 	 TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_PIXELS, "-height", NULL, NULL,
-	 DEF_PANEDWINDOW_PANE_HEIGHT, Tk_Offset(Slave, heightPtr),
-	 Tk_Offset(Slave, height), TK_OPTION_NULL_OK, 0, 0},
+	 DEF_PANEDWINDOW_PANE_HEIGHT, Tk_Offset(Pane, heightPtr),
+	 Tk_Offset(Pane, height), TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_BOOLEAN, "-hide", "hide", "Hide",
-	 DEF_PANEDWINDOW_PANE_HIDE, -1, Tk_Offset(Slave, hide), 0,0,GEOMETRY},
+	 DEF_PANEDWINDOW_PANE_HIDE, -1, Tk_Offset(Pane, hide), 0,0,GEOMETRY},
     {TK_OPTION_PIXELS, "-minsize", NULL, NULL,
-	 DEF_PANEDWINDOW_PANE_MINSIZE, -1, Tk_Offset(Slave, minSize), 0, 0, 0},
+	 DEF_PANEDWINDOW_PANE_MINSIZE, -1, Tk_Offset(Pane, minSize), 0, 0, 0},
     {TK_OPTION_PIXELS, "-padx", NULL, NULL,
-	 DEF_PANEDWINDOW_PANE_PADX, -1, Tk_Offset(Slave, padx), 0, 0, 0},
+	 DEF_PANEDWINDOW_PANE_PADX, -1, Tk_Offset(Pane, padx), 0, 0, 0},
     {TK_OPTION_PIXELS, "-pady", NULL, NULL,
-	 DEF_PANEDWINDOW_PANE_PADY, -1, Tk_Offset(Slave, pady), 0, 0, 0},
+	 DEF_PANEDWINDOW_PANE_PADY, -1, Tk_Offset(Pane, pady), 0, 0, 0},
     {TK_OPTION_CUSTOM, "-sticky", NULL, NULL,
-	 DEF_PANEDWINDOW_PANE_STICKY, -1, Tk_Offset(Slave, sticky), 0,
+	 DEF_PANEDWINDOW_PANE_STICKY, -1, Tk_Offset(Pane, sticky), 0,
 	 &stickyOption, 0},
     {TK_OPTION_STRING_TABLE, "-stretch", "stretch", "Stretch",
-	DEF_PANEDWINDOW_PANE_STRETCH, -1, Tk_Offset(Slave, stretch), 0,
+	DEF_PANEDWINDOW_PANE_STRETCH, -1, Tk_Offset(Pane, stretch), 0,
 	(ClientData) stretchStrings, 0},
     {TK_OPTION_PIXELS, "-width", NULL, NULL,
-	 DEF_PANEDWINDOW_PANE_WIDTH, Tk_Offset(Slave, widthPtr),
-	 Tk_Offset(Slave, width), TK_OPTION_NULL_OK, 0, 0},
+	 DEF_PANEDWINDOW_PANE_WIDTH, Tk_Offset(Pane, widthPtr),
+	 Tk_Offset(Pane, width), TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_END, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0}
 };
 
@@ -428,7 +428,7 @@ Tk_PanedWindowObjCmd(
 	 */
 
 	pwOpts->pwOptions = Tk_CreateOptionTable(interp, optionSpecs);
-	pwOpts->slaveOpts = Tk_CreateOptionTable(interp, slaveOptionSpecs);
+	pwOpts->paneOpts = Tk_CreateOptionTable(interp, paneOptionSpecs);
     }
 
     Tk_SetClass(tkwin, "Panedwindow");
@@ -446,7 +446,7 @@ Tk_PanedWindowObjCmd(
 	    Tk_PathName(pwPtr->tkwin), PanedWindowWidgetObjCmd, pwPtr,
 	    PanedWindowCmdDeletedProc);
     pwPtr->optionTable = pwOpts->pwOptions;
-    pwPtr->slaveOpts = pwOpts->slaveOpts;
+    pwPtr->paneOpts = pwOpts->paneOpts;
     pwPtr->relief = TK_RELIEF_RAISED;
     pwPtr->gc = NULL;
     pwPtr->cursor = NULL;
@@ -471,7 +471,7 @@ Tk_PanedWindowObjCmd(
     /*
      * Find the toplevel ancestor of the panedwindow, and make a proxy win as
      * a child of that window; this way the proxy can always float above
-     * slaves in the panedwindow.
+     * panes in the panedwindow.
      */
 
     parent = Tk_Parent(pwPtr->tkwin);
@@ -548,7 +548,7 @@ PanedWindowWidgetObjCmd(
     Tcl_Obj *resultObj;
     int index, count, i, x, y;
     Tk_Window tkwin;
-    Slave *slavePtr;
+    Pane *panePtr;
 
     if (objc < 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "option ?arg arg...?");
@@ -569,7 +569,7 @@ PanedWindowWidgetObjCmd(
 	    result = TCL_ERROR;
 	    break;
 	}
-	result = ConfigureSlaves(pwPtr, interp, objc, objv);
+	result = ConfigurePanes(pwPtr, interp, objc, objv);
 	break;
 
     case PW_CGET:
@@ -616,21 +616,21 @@ PanedWindowWidgetObjCmd(
 	 * Clean up each window named in the arg list.
 	 */
 	for (count = 0, i = 2; i < objc; i++) {
-	    Tk_Window slave = Tk_NameToWindow(interp, Tcl_GetString(objv[i]),
+	    Tk_Window pane = Tk_NameToWindow(interp, Tcl_GetString(objv[i]),
 		    pwPtr->tkwin);
 
-	    if (slave == NULL) {
+	    if (pane == NULL) {
 		continue;
 	    }
-	    slavePtr = GetPane(pwPtr, slave);
-	    if ((slavePtr != NULL) && (slavePtr->masterPtr != NULL)) {
+	    panePtr = GetPane(pwPtr, pane);
+	    if ((panePtr != NULL) && (panePtr->containerPtr != NULL)) {
 		count++;
-		Tk_ManageGeometry(slave, NULL, NULL);
-		Tk_UnmaintainGeometry(slavePtr->tkwin, pwPtr->tkwin);
-		Tk_DeleteEventHandler(slavePtr->tkwin, StructureNotifyMask,
-			SlaveStructureProc, slavePtr);
-		Tk_UnmapWindow(slavePtr->tkwin);
-		Unlink(slavePtr);
+		Tk_ManageGeometry(pane, NULL, NULL);
+		Tk_UnmaintainGeometry(panePtr->tkwin, pwPtr->tkwin);
+		Tk_DeleteEventHandler(panePtr->tkwin, StructureNotifyMask,
+			PaneStructureProc, panePtr);
+		Tk_UnmapWindow(panePtr->tkwin);
+		Unlink(panePtr);
 	    }
 	    if (count != 0) {
 		ComputeGeometry(pwPtr);
@@ -666,15 +666,15 @@ PanedWindowWidgetObjCmd(
 	    break;
 	}
 	resultObj = NULL;
-	for (i = 0; i < pwPtr->numSlaves; i++) {
-	    if (pwPtr->slaves[i]->tkwin == tkwin) {
+	for (i = 0; i < pwPtr->numPanes; i++) {
+	    if (pwPtr->panes[i]->tkwin == tkwin) {
 		resultObj = Tk_GetOptionValue(interp,
-			(char *) pwPtr->slaves[i], pwPtr->slaveOpts,
+			(char *) pwPtr->panes[i], pwPtr->paneOpts,
 			objv[3], tkwin);
 	    }
 	}
 	if (resultObj == NULL) {
-	    if (i == pwPtr->numSlaves) {
+	    if (i == pwPtr->numPanes) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			"not managed by this window", -1));
 		Tcl_SetErrorCode(interp, "TK", "PANEDWINDOW", "UNMANAGED",
@@ -706,10 +706,10 @@ PanedWindowWidgetObjCmd(
                 result = TCL_ERROR;
                 break;
             }
-	    for (i = 0; i < pwPtr->numSlaves; i++) {
-		if (pwPtr->slaves[i]->tkwin == tkwin) {
+	    for (i = 0; i < pwPtr->numPanes; i++) {
+		if (pwPtr->panes[i]->tkwin == tkwin) {
 		    resultObj = Tk_GetOptionInfo(interp,
-			    (char *) pwPtr->slaves[i], pwPtr->slaveOpts,
+			    (char *) pwPtr->panes[i], pwPtr->paneOpts,
 			    (objc == 4) ? objv[3] : NULL,
 			    pwPtr->tkwin);
 		    if (resultObj == NULL) {
@@ -721,15 +721,15 @@ PanedWindowWidgetObjCmd(
 		}
 	    }
 	} else {
-	    result = ConfigureSlaves(pwPtr, interp, objc, objv);
+	    result = ConfigurePanes(pwPtr, interp, objc, objv);
 	}
 	break;
 
     case PW_PANES:
 	resultObj = Tcl_NewObj();
-	for (i = 0; i < pwPtr->numSlaves; i++) {
+	for (i = 0; i < pwPtr->numPanes; i++) {
 	    Tcl_ListObjAppendElement(NULL, resultObj,
-		    TkNewWindowObj(pwPtr->slaves[i]->tkwin));
+		    TkNewWindowObj(pwPtr->panes[i]->tkwin));
 	}
 	Tcl_SetObjResult(interp, resultObj);
 	break;
@@ -749,37 +749,37 @@ PanedWindowWidgetObjCmd(
 /*
  *----------------------------------------------------------------------
  *
- * ConfigureSlaves --
+ * ConfigurePanes --
  *
- *	Add or alter the configuration options of a slave in a paned window.
+ *	Add or alter the configuration options of a pane in a paned window.
  *
  * Results:
  *	Standard Tcl result.
  *
  * Side effects:
- *	Depends on options; may add a slave to the paned window, may alter the
- *	geometry management options of a slave.
+ *	Depends on options; may add a pane to the paned window, may alter the
+ *	geometry management options of a pane.
  *
  *----------------------------------------------------------------------
  */
 
 static int
-ConfigureSlaves(
+ConfigurePanes(
     PanedWindow *pwPtr,		/* Information about paned window. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    int i, firstOptionArg, j, found, doubleBw, index, numNewSlaves, haveLoc;
+    int i, firstOptionArg, j, found, doubleBw, index, numNewPanes, haveLoc;
     int insertIndex;
     Tk_Window tkwin = NULL, ancestor, parent;
-    Slave *slavePtr, **inserts, **newSlaves;
-    Slave options;
+    Pane *panePtr, **inserts, **newPanes;
+    Pane options;
     const char *arg;
 
     /*
      * Find the non-window name arguments; these are the configure options for
-     * the slaves. Also validate that the window names given are legitimate
+     * the panes. Also validate that the window names given are legitimate
      * (ie, they are real windows, they are not the panedwindow itself, etc.).
      */
 
@@ -817,8 +817,8 @@ ConfigureSlaves(
 		return TCL_ERROR;
 	    } else {
 		/*
-		 * Make sure the panedwindow is the parent of the slave,
-		 * or a descendant of the slave's parent.
+		 * Make sure the panedwindow is the parent of the pane,
+		 * or a descendant of the pane's parent.
 		 */
 
 		parent = Tk_Parent(tkwin);
@@ -847,8 +847,8 @@ ConfigureSlaves(
      * extra testing in the for loop below.
      */
 
-    memset((void *)&options, 0, sizeof(Slave));
-    if (Tk_SetOptions(interp, (char *) &options, pwPtr->slaveOpts,
+    memset((void *)&options, 0, sizeof(Pane));
+    if (Tk_SetOptions(interp, (char *) &options, pwPtr->paneOpts,
 	    objc - firstOptionArg, objv + firstOptionArg,
 	    pwPtr->tkwin, NULL, NULL) != TCL_OK) {
 	return TCL_ERROR;
@@ -865,8 +865,8 @@ ConfigureSlaves(
     if (options.after != NULL) {
 	tkwin = options.after;
 	haveLoc = 1;
-	for (i = 0; i < pwPtr->numSlaves; i++) {
-	    if (options.after == pwPtr->slaves[i]->tkwin) {
+	for (i = 0; i < pwPtr->numPanes; i++) {
+	    if (options.after == pwPtr->panes[i]->tkwin) {
 		index = i + 1;
 		break;
 	    }
@@ -874,8 +874,8 @@ ConfigureSlaves(
     } else if (options.before != NULL) {
 	tkwin = options.before;
 	haveLoc = 1;
-	for (i = 0; i < pwPtr->numSlaves; i++) {
-	    if (options.before == pwPtr->slaves[i]->tkwin) {
+	for (i = 0; i < pwPtr->numPanes; i++) {
+	    if (options.before == pwPtr->panes[i]->tkwin) {
 		index = i;
 		break;
 	    }
@@ -892,28 +892,28 @@ ConfigureSlaves(
 		"window \"%s\" is not managed by %s",
 		Tk_PathName(tkwin), Tk_PathName(pwPtr->tkwin)));
 	Tcl_SetErrorCode(interp, "TK", "PANEDWINDOW", "UNMANAGED", NULL);
-	Tk_FreeConfigOptions((char *) &options, pwPtr->slaveOpts,
+	Tk_FreeConfigOptions((char *) &options, pwPtr->paneOpts,
 		pwPtr->tkwin);
 	return TCL_ERROR;
     }
 
     /*
-     * Allocate an array to hold, in order, the pointers to the slave
+     * Allocate an array to hold, in order, the pointers to the pane
      * structures corresponding to the windows specified. Some of those
      * structures may already have existed, some may be new.
      */
 
-    inserts = ckalloc(sizeof(Slave *) * (firstOptionArg - 2));
+    inserts = ckalloc(sizeof(Pane *) * (firstOptionArg - 2));
     insertIndex = 0;
 
     /*
-     * Populate the inserts array, creating new slave structures as necessary,
+     * Populate the inserts array, creating new pane structures as necessary,
      * applying the options to each structure as we go, and, if necessary,
-     * marking the spot in the original slaves array as empty (for
-     * pre-existing slave structures).
+     * marking the spot in the original panes array as empty (for
+     * pre-existing pane structures).
      */
 
-    for (i = 0, numNewSlaves = 0; i < firstOptionArg - 2; i++) {
+    for (i = 0, numNewPanes = 0; i < firstOptionArg - 2; i++) {
 	/*
 	 * We don't check that tkwin is NULL here, because the pre-pass above
 	 * guarantees that the input at this stage is good.
@@ -923,24 +923,24 @@ ConfigureSlaves(
 		pwPtr->tkwin);
 
 	found = 0;
-	for (j = 0; j < pwPtr->numSlaves; j++) {
-	    if (pwPtr->slaves[j] != NULL && pwPtr->slaves[j]->tkwin == tkwin) {
-		Tk_SetOptions(interp, (char *) pwPtr->slaves[j],
-			pwPtr->slaveOpts, objc - firstOptionArg,
+	for (j = 0; j < pwPtr->numPanes; j++) {
+	    if (pwPtr->panes[j] != NULL && pwPtr->panes[j]->tkwin == tkwin) {
+		Tk_SetOptions(interp, (char *) pwPtr->panes[j],
+			pwPtr->paneOpts, objc - firstOptionArg,
 			objv + firstOptionArg, pwPtr->tkwin, NULL, NULL);
-		if (pwPtr->slaves[j]->minSize < 0) {
-		    pwPtr->slaves[j]->minSize = 0;
+		if (pwPtr->panes[j]->minSize < 0) {
+		    pwPtr->panes[j]->minSize = 0;
 		}
 		found = 1;
 
 		/*
-		 * If the slave is supposed to move, add it to the inserts
+		 * If the pane is supposed to move, add it to the inserts
 		 * array now; otherwise, leave it where it is.
 		 */
 
 		if (index != -1) {
-		    inserts[insertIndex++] = pwPtr->slaves[j];
-		    pwPtr->slaves[j] = NULL;
+		    inserts[insertIndex++] = pwPtr->panes[j];
+		    pwPtr->panes[j] = NULL;
 		}
 		break;
 	    }
@@ -951,7 +951,7 @@ ConfigureSlaves(
 	}
 
 	/*
-	 * Make sure this slave wasn't already put into the inserts array,
+	 * Make sure this pane wasn't already put into the inserts array,
 	 * i.e., when the user specifies the same window multiple times in a
 	 * single add commaned.
 	 */
@@ -966,104 +966,104 @@ ConfigureSlaves(
 	}
 
 	/*
-	 * Create a new slave structure and initialize it. All slaves start
+	 * Create a new pane structure and initialize it. All panes start
 	 * out with their "natural" dimensions.
 	 */
 
-	slavePtr = ckalloc(sizeof(Slave));
-	memset(slavePtr, 0, sizeof(Slave));
-	Tk_InitOptions(interp, (char *)slavePtr, pwPtr->slaveOpts,
+	panePtr = ckalloc(sizeof(Pane));
+	memset(panePtr, 0, sizeof(Pane));
+	Tk_InitOptions(interp, (char *)panePtr, pwPtr->paneOpts,
 		pwPtr->tkwin);
-	Tk_SetOptions(interp, (char *)slavePtr, pwPtr->slaveOpts,
+	Tk_SetOptions(interp, (char *)panePtr, pwPtr->paneOpts,
 		objc - firstOptionArg, objv + firstOptionArg,
 		pwPtr->tkwin, NULL, NULL);
-	slavePtr->tkwin = tkwin;
-	slavePtr->masterPtr = pwPtr;
-	doubleBw = 2 * Tk_Changes(slavePtr->tkwin)->border_width;
-	if (slavePtr->width > 0) {
-	    slavePtr->paneWidth = slavePtr->width;
+	panePtr->tkwin = tkwin;
+	panePtr->containerPtr = pwPtr;
+	doubleBw = 2 * Tk_Changes(panePtr->tkwin)->border_width;
+	if (panePtr->width > 0) {
+	    panePtr->paneWidth = panePtr->width;
 	} else {
-	    slavePtr->paneWidth = Tk_ReqWidth(tkwin) + doubleBw;
+	    panePtr->paneWidth = Tk_ReqWidth(tkwin) + doubleBw;
 	}
-	if (slavePtr->height > 0) {
-	    slavePtr->paneHeight = slavePtr->height;
+	if (panePtr->height > 0) {
+	    panePtr->paneHeight = panePtr->height;
 	} else {
-	    slavePtr->paneHeight = Tk_ReqHeight(tkwin) + doubleBw;
+	    panePtr->paneHeight = Tk_ReqHeight(tkwin) + doubleBw;
 	}
-	if (slavePtr->minSize < 0) {
-	    slavePtr->minSize = 0;
+	if (panePtr->minSize < 0) {
+	    panePtr->minSize = 0;
 	}
 
 	/*
-	 * Set up the geometry management callbacks for this slave.
+	 * Set up the geometry management callbacks for this pane.
 	 */
 
-	Tk_CreateEventHandler(slavePtr->tkwin, StructureNotifyMask,
-		SlaveStructureProc, slavePtr);
-	Tk_ManageGeometry(slavePtr->tkwin, &panedWindowMgrType, slavePtr);
-	inserts[insertIndex++] = slavePtr;
-	numNewSlaves++;
+	Tk_CreateEventHandler(panePtr->tkwin, StructureNotifyMask,
+		PaneStructureProc, panePtr);
+	Tk_ManageGeometry(panePtr->tkwin, &panedWindowMgrType, panePtr);
+	inserts[insertIndex++] = panePtr;
+	numNewPanes++;
     }
 
     /*
-     * Allocate the new slaves array, then copy the slaves into it, in order.
+     * Allocate the new panes array, then copy the panes into it, in order.
      */
 
-    i = sizeof(Slave *) * (pwPtr->numSlaves + numNewSlaves);
-    newSlaves = ckalloc(i);
-    memset(newSlaves, 0, (size_t) i);
+    i = sizeof(Pane *) * (pwPtr->numPanes + numNewPanes);
+    newPanes = ckalloc(i);
+    memset(newPanes, 0, (size_t) i);
     if (index == -1) {
 	/*
-	 * If none of the existing slaves have to be moved, just copy the old
+	 * If none of the existing panes have to be moved, just copy the old
 	 * and append the new.
 	 */
-	memcpy((void *)&(newSlaves[0]), pwPtr->slaves,
-		sizeof(Slave *) * pwPtr->numSlaves);
-	memcpy((void *)&(newSlaves[pwPtr->numSlaves]), inserts,
-		sizeof(Slave *) * numNewSlaves);
+	memcpy((void *)&(newPanes[0]), pwPtr->panes,
+		sizeof(Pane *) * pwPtr->numPanes);
+	memcpy((void *)&(newPanes[pwPtr->numPanes]), inserts,
+		sizeof(Pane *) * numNewPanes);
     } else {
 	/*
-	 * If some of the existing slaves were moved, the old slaves array
+	 * If some of the existing panes were moved, the old panes array
 	 * will be partially populated, with some valid and some invalid
-	 * entries. Walk through it, copying valid entries to the new slaves
+	 * entries. Walk through it, copying valid entries to the new panes
 	 * array as we go; when we get to the insert location for the new
-	 * slaves, copy the inserts array over, then finish off the old slaves
+	 * panes, copy the inserts array over, then finish off the old panes
 	 * array.
 	 */
 
 	for (i = 0, j = 0; i < index; i++) {
-	    if (pwPtr->slaves[i] != NULL) {
-		newSlaves[j] = pwPtr->slaves[i];
+	    if (pwPtr->panes[i] != NULL) {
+		newPanes[j] = pwPtr->panes[i];
 		j++;
 	    }
 	}
 
-	memcpy((void *)&(newSlaves[j]), inserts, sizeof(Slave *)*insertIndex);
+	memcpy((void *)&(newPanes[j]), inserts, sizeof(Pane *)*insertIndex);
 	j += firstOptionArg - 2;
 
-	for (i = index; i < pwPtr->numSlaves; i++) {
-	    if (pwPtr->slaves[i] != NULL) {
-		newSlaves[j] = pwPtr->slaves[i];
+	for (i = index; i < pwPtr->numPanes; i++) {
+	    if (pwPtr->panes[i] != NULL) {
+		newPanes[j] = pwPtr->panes[i];
 		j++;
 	    }
 	}
     }
 
     /*
-     * Make the new slaves array the paned window's slave array, and clean up.
+     * Make the new panes array the paned window's pane array, and clean up.
      */
 
-    ckfree(pwPtr->slaves);
+    ckfree(pwPtr->panes);
     ckfree(inserts);
-    pwPtr->slaves = newSlaves;
+    pwPtr->panes = newPanes;
 
     /*
-     * Set the paned window's slave count to the new value.
+     * Set the paned window's pane count to the new value.
      */
 
-    pwPtr->numSlaves += numNewSlaves;
+    pwPtr->numPanes += numNewPanes;
 
-    Tk_FreeConfigOptions((char *) &options, pwPtr->slaveOpts, pwPtr->tkwin);
+    Tk_FreeConfigOptions((char *) &options, pwPtr->paneOpts, pwPtr->tkwin);
 
     ComputeGeometry(pwPtr);
     return TCL_OK;
@@ -1101,7 +1101,7 @@ PanedWindowSashCommand(
     };
     int index, sash, x, y, diff;
     Tcl_Obj *coords[2];
-    Slave *slavePtr;
+    Pane *panePtr;
 
     if (objc < 3) {
 	Tcl_WrongNumArgs(interp, 2, objv, "option ?arg ...?");
@@ -1130,10 +1130,10 @@ PanedWindowSashCommand(
 	    Tcl_SetErrorCode(interp, "TK", "VALUE", "SASH_INDEX", NULL);
 	    return TCL_ERROR;
 	}
-	slavePtr = pwPtr->slaves[sash];
+	panePtr = pwPtr->panes[sash];
 
-	coords[0] = Tcl_NewIntObj(slavePtr->sashx);
-	coords[1] = Tcl_NewIntObj(slavePtr->sashy);
+	coords[0] = Tcl_NewIntObj(panePtr->sashx);
+	coords[1] = Tcl_NewIntObj(panePtr->sashy);
 	Tcl_SetObjResult(interp, Tcl_NewListObj(2, coords));
 	break;
 
@@ -1163,11 +1163,11 @@ PanedWindowSashCommand(
 		return TCL_ERROR;
 	    }
 
-	    pwPtr->slaves[sash]->markx = x;
-	    pwPtr->slaves[sash]->marky = y;
+	    pwPtr->panes[sash]->markx = x;
+	    pwPtr->panes[sash]->marky = y;
 	} else {
-	    coords[0] = Tcl_NewIntObj(pwPtr->slaves[sash]->markx);
-	    coords[1] = Tcl_NewIntObj(pwPtr->slaves[sash]->marky);
+	    coords[0] = Tcl_NewIntObj(pwPtr->panes[sash]->markx);
+	    coords[1] = Tcl_NewIntObj(pwPtr->panes[sash]->marky);
 	    Tcl_SetObjResult(interp, Tcl_NewListObj(2, coords));
 	}
 	break;
@@ -1198,18 +1198,18 @@ PanedWindowSashCommand(
 	    return TCL_ERROR;
 	}
 
-	slavePtr = pwPtr->slaves[sash];
+	panePtr = pwPtr->panes[sash];
 	if (pwPtr->orient == ORIENT_HORIZONTAL) {
 	    if (index == SASH_PLACE) {
-		diff = x - pwPtr->slaves[sash]->sashx;
+		diff = x - pwPtr->panes[sash]->sashx;
 	    } else {
-		diff = x - pwPtr->slaves[sash]->markx;
+		diff = x - pwPtr->panes[sash]->markx;
 	    }
 	} else {
 	    if (index == SASH_PLACE) {
-		diff = y - pwPtr->slaves[sash]->sashy;
+		diff = y - pwPtr->panes[sash]->sashy;
 	    } else {
-		diff = y - pwPtr->slaves[sash]->marky;
+		diff = y - pwPtr->panes[sash]->marky;
 	    }
 	}
 
@@ -1369,15 +1369,15 @@ PanedWindowEventProc(
     } else if (eventPtr->type == DestroyNotify) {
 	DestroyPanedWindow(pwPtr);
     } else if (eventPtr->type == UnmapNotify) {
-        for (i = 0; i < pwPtr->numSlaves; i++) {
-            if (!pwPtr->slaves[i]->hide) {
-                Tk_UnmapWindow(pwPtr->slaves[i]->tkwin);
+        for (i = 0; i < pwPtr->numPanes; i++) {
+            if (!pwPtr->panes[i]->hide) {
+                Tk_UnmapWindow(pwPtr->panes[i]->tkwin);
             }
         }
     } else if (eventPtr->type == MapNotify) {
-        for (i = 0; i < pwPtr->numSlaves; i++) {
-            if (!pwPtr->slaves[i]->hide) {
-                Tk_MapWindow(pwPtr->slaves[i]->tkwin);
+        for (i = 0; i < pwPtr->numPanes; i++) {
+            if (!pwPtr->panes[i]->hide) {
+                Tk_MapWindow(pwPtr->panes[i]->tkwin);
             }
         }
     }
@@ -1443,7 +1443,7 @@ DisplayPanedWindow(
     ClientData clientData)	/* Information about window. */
 {
     PanedWindow *pwPtr = clientData;
-    Slave *slavePtr;
+    Pane *panePtr;
     Pixmap pixmap;
     Tk_Window tkwin = pwPtr->tkwin;
     int i, sashWidth, sashHeight;
@@ -1496,19 +1496,19 @@ DisplayPanedWindow(
      */
 
     GetFirstLastVisiblePane(pwPtr, &first, &last);
-    for (i = 0; i < pwPtr->numSlaves - 1; i++) {
-	slavePtr = pwPtr->slaves[i];
-	if (slavePtr->hide || i == last) {
+    for (i = 0; i < pwPtr->numPanes - 1; i++) {
+	panePtr = pwPtr->panes[i];
+	if (panePtr->hide || i == last) {
 	    continue;
 	}
 	if (sashWidth > 0 && sashHeight > 0) {
 	    Tk_Fill3DRectangle(tkwin, pixmap, pwPtr->background,
-		    slavePtr->sashx, slavePtr->sashy, sashWidth, sashHeight,
+		    panePtr->sashx, panePtr->sashy, sashWidth, sashHeight,
 		    1, pwPtr->sashRelief);
 	}
 	if (pwPtr->showHandle) {
 	    Tk_Fill3DRectangle(tkwin, pixmap, pwPtr->background,
-		    slavePtr->handlex, slavePtr->handley,
+		    panePtr->handlex, panePtr->handley,
 		    pwPtr->handleSize, pwPtr->handleSize, 1,
 		    TK_RELIEF_RAISED);
 	}
@@ -1569,23 +1569,23 @@ DestroyPanedWindow(
     }
 
     /*
-     * Clean up the slave list; foreach slave:
-     *  o  Cancel the slave's structure notification callback
-     *  o  Cancel geometry management for the slave.
-     *  o  Free memory for the slave
+     * Clean up the pane list; foreach pane:
+     *  o  Cancel the pane's structure notification callback
+     *  o  Cancel geometry management for the pane.
+     *  o  Free memory for the pane
      */
 
-    for (i = 0; i < pwPtr->numSlaves; i++) {
-	Tk_DeleteEventHandler(pwPtr->slaves[i]->tkwin, StructureNotifyMask,
-		SlaveStructureProc, pwPtr->slaves[i]);
-	Tk_ManageGeometry(pwPtr->slaves[i]->tkwin, NULL, NULL);
-	Tk_FreeConfigOptions((char *) pwPtr->slaves[i], pwPtr->slaveOpts,
+    for (i = 0; i < pwPtr->numPanes; i++) {
+	Tk_DeleteEventHandler(pwPtr->panes[i]->tkwin, StructureNotifyMask,
+		PaneStructureProc, pwPtr->panes[i]);
+	Tk_ManageGeometry(pwPtr->panes[i]->tkwin, NULL, NULL);
+	Tk_FreeConfigOptions((char *) pwPtr->panes[i], pwPtr->paneOpts,
 		pwPtr->tkwin);
-	ckfree(pwPtr->slaves[i]);
-	pwPtr->slaves[i] = NULL;
+	ckfree(pwPtr->panes[i]);
+	pwPtr->panes[i] = NULL;
     }
-    if (pwPtr->slaves) {
-	ckfree(pwPtr->slaves);
+    if (pwPtr->panes) {
+	ckfree(pwPtr->panes);
     }
 
     /*
@@ -1630,8 +1630,8 @@ PanedWindowReqProc(
     Tk_Window tkwin)		/* Other Tk-related information about the
 				 * window. */
 {
-    Slave *slavePtr = clientData;
-    PanedWindow *pwPtr = (PanedWindow *) slavePtr->masterPtr;
+    Pane *panePtr = clientData;
+    PanedWindow *pwPtr = (PanedWindow *) panePtr->containerPtr;
 
     if (Tk_IsMapped(pwPtr->tkwin)) {
 	if (!(pwPtr->flags & RESIZE_PENDING)) {
@@ -1639,13 +1639,13 @@ PanedWindowReqProc(
 	    Tcl_DoWhenIdle(ArrangePanes, pwPtr);
 	}
     } else {
-	int doubleBw = 2 * Tk_Changes(slavePtr->tkwin)->border_width;
+	int doubleBw = 2 * Tk_Changes(panePtr->tkwin)->border_width;
 
-	if (slavePtr->width <= 0) {
-	    slavePtr->paneWidth = Tk_ReqWidth(slavePtr->tkwin) + doubleBw;
+	if (panePtr->width <= 0) {
+	    panePtr->paneWidth = Tk_ReqWidth(panePtr->tkwin) + doubleBw;
 	}
-	if (slavePtr->height <= 0) {
-	    slavePtr->paneHeight = Tk_ReqHeight(slavePtr->tkwin) + doubleBw;
+	if (panePtr->height <= 0) {
+	    panePtr->paneHeight = Tk_ReqHeight(panePtr->tkwin) + doubleBw;
 	}
 	ComputeGeometry(pwPtr);
     }
@@ -1654,39 +1654,39 @@ PanedWindowReqProc(
 /*
  *--------------------------------------------------------------
  *
- * PanedWindowLostSlaveProc --
+ * PanedWindowLostPaneProc --
  *
  *	This function is invoked by Tk whenever some other geometry claims
- *	control over a slave that used to be managed by us.
+ *	control over a pane that used to be managed by us.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	Forgets all information about the slave. Causes geometry to be
+ *	Forgets all information about the pane. Causes geometry to be
  *	recomputed for the panedwindow.
  *
  *--------------------------------------------------------------
  */
 
 static void
-PanedWindowLostSlaveProc(
-    ClientData clientData,	/* Grid structure for slave window that was
+PanedWindowLostPaneProc(
+    ClientData clientData,	/* Grid structure for the pane that was
 				 * stolen away. */
-    Tk_Window tkwin)		/* Tk's handle for the slave window. */
+    Tk_Window tkwin)		/* Tk's handle for the pane. */
 {
-    register Slave *slavePtr = clientData;
-    PanedWindow *pwPtr = (PanedWindow *) slavePtr->masterPtr;
-
-    if (pwPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
-	Tk_UnmaintainGeometry(slavePtr->tkwin, pwPtr->tkwin);
-    }
-    Unlink(slavePtr);
-    Tk_DeleteEventHandler(slavePtr->tkwin, StructureNotifyMask,
-	    SlaveStructureProc, slavePtr);
-    Tk_UnmapWindow(slavePtr->tkwin);
-    slavePtr->tkwin = NULL;
-    ckfree(slavePtr);
+    register Pane *panePtr = clientData;
+    PanedWindow *pwPtr = (PanedWindow *) panePtr->containerPtr;
+
+    if (pwPtr->tkwin != Tk_Parent(panePtr->tkwin)) {
+	Tk_UnmaintainGeometry(panePtr->tkwin, pwPtr->tkwin);
+    }
+    Unlink(panePtr);
+    Tk_DeleteEventHandler(panePtr->tkwin, StructureNotifyMask,
+	    PaneStructureProc, panePtr);
+    Tk_UnmapWindow(panePtr->tkwin);
+    panePtr->tkwin = NULL;
+    ckfree(panePtr);
     ComputeGeometry(pwPtr);
 }
 
@@ -1704,19 +1704,19 @@ PanedWindowLostSlaveProc(
  *	None.
  *
  * Side effects:
- *	The slaves of masterPtr may get resized or moved.
+ *	The panes of containerPtr may get resized or moved.
  *
  *--------------------------------------------------------------
  */
 
 static void
 ArrangePanes(
-    ClientData clientData)	/* Structure describing parent whose slaves
+    ClientData clientData)	/* Structure describing parent whose panes
 				 * are to be re-layed out. */
 {
     register PanedWindow *pwPtr = clientData;
-    register Slave *slavePtr;
-    int i, slaveWidth, slaveHeight, slaveX, slaveY;
+    register Pane *panePtr;
+    int i, newPaneWidth, newPaneHeight, paneX, paneY;
     int paneWidth, paneHeight, paneSize, paneMinSize;
     int doubleBw;
     int x, y;
@@ -1731,13 +1731,13 @@ ArrangePanes(
     pwPtr->flags &= ~(REQUESTED_RELAYOUT|RESIZE_PENDING);
 
     /*
-     * If the parent has no slaves anymore, then don't do anything at all:
+     * If the parent has no panes anymore, then don't do anything at all:
      * just leave the parent's size as-is. Otherwise there is no way to
      * "relinquish" control over the parent so another geometry manager can
      * take over.
      */
 
-    if (pwPtr->numSlaves == 0) {
+    if (pwPtr->numPanes == 0) {
 	return;
     }
 
@@ -1776,37 +1776,37 @@ ArrangePanes(
 		+ pwPtr->sashPad;
     }
 
-    for (i = sashCount = 0; i < pwPtr->numSlaves; i++) {
-	slavePtr = pwPtr->slaves[i];
+    for (i = sashCount = 0; i < pwPtr->numPanes; i++) {
+	panePtr = pwPtr->panes[i];
 
-	if (slavePtr->hide) {
+	if (panePtr->hide) {
 	    continue;
 	}
 
 	/*
-	 * Compute the total size needed by all the slaves and the left-over,
+	 * Compute the total size needed by all the panes and the left-over,
 	 * or shortage of space available.
 	 */
 
 	if (horizontal) {
-            if (slavePtr->width > 0) {
-                paneSize = slavePtr->width;
+            if (panePtr->width > 0) {
+                paneSize = panePtr->width;
             } else {
-                paneSize = slavePtr->paneWidth;
+                paneSize = panePtr->paneWidth;
             }
-	    stretchReserve -= paneSize + (2 * slavePtr->padx);
+	    stretchReserve -= paneSize + (2 * panePtr->padx);
 	} else {
-            if (slavePtr->height > 0) {
-                paneSize = slavePtr->height;
+            if (panePtr->height > 0) {
+                paneSize = panePtr->height;
             } else {
-                paneSize = slavePtr->paneHeight;
+                paneSize = panePtr->paneHeight;
             }
-	    stretchReserve -= paneSize + (2 * slavePtr->pady);
+	    stretchReserve -= paneSize + (2 * panePtr->pady);
 	}
-	if (IsStretchable(slavePtr->stretch,i,first,last)
+	if (IsStretchable(panePtr->stretch,i,first,last)
 		&& Tk_IsMapped(pwPtr->tkwin)) {
 	    paneDynSize += paneSize;
-	    paneDynMinSize += slavePtr->minSize;
+	    paneDynMinSize += panePtr->minSize;
 	}
 	if (i != last) {
 	    stretchReserve -= sashWidth;
@@ -1818,53 +1818,53 @@ ArrangePanes(
      * Second pass; adjust/arrange panes.
      */
 
-    for (i = 0; i < pwPtr->numSlaves; i++) {
-	slavePtr = pwPtr->slaves[i];
+    for (i = 0; i < pwPtr->numPanes; i++) {
+	panePtr = pwPtr->panes[i];
 
-	if (slavePtr->hide) {
-	    Tk_UnmaintainGeometry(slavePtr->tkwin, pwPtr->tkwin);
-	    Tk_UnmapWindow(slavePtr->tkwin);
+	if (panePtr->hide) {
+	    Tk_UnmaintainGeometry(panePtr->tkwin, pwPtr->tkwin);
+	    Tk_UnmapWindow(panePtr->tkwin);
 	    continue;
 	}
 
 	/*
-	 * Compute the size of this slave. The algorithm (assuming a
+	 * Compute the size of this pane. The algorithm (assuming a
 	 * horizontal paned window) is:
 	 *
 	 * 1.  Get "base" dimensions. If a width or height is specified for
-	 *     this slave, use those values; else use the ReqWidth/ReqHeight.
+	 *     this pane, use those values; else use the ReqWidth/ReqHeight.
 	 * 2.  Using base dimensions, pane dimensions, and sticky values,
 	 *     determine the x and y, and actual width and height of the
 	 *     widget.
 	 */
 
-	doubleBw = 2 * Tk_Changes(slavePtr->tkwin)->border_width;
-	slaveWidth = (slavePtr->width > 0 ? slavePtr->width :
-		Tk_ReqWidth(slavePtr->tkwin) + doubleBw);
-	slaveHeight = (slavePtr->height > 0 ? slavePtr->height :
-		Tk_ReqHeight(slavePtr->tkwin) + doubleBw);
-	paneMinSize = slavePtr->minSize;
+	doubleBw = 2 * Tk_Changes(panePtr->tkwin)->border_width;
+	newPaneWidth = (panePtr->width > 0 ? panePtr->width :
+		Tk_ReqWidth(panePtr->tkwin) + doubleBw);
+	newPaneHeight = (panePtr->height > 0 ? panePtr->height :
+		Tk_ReqHeight(panePtr->tkwin) + doubleBw);
+	paneMinSize = panePtr->minSize;
 
 	/*
 	 * Calculate pane width and height.
 	 */
 
 	if (horizontal) {
-            if (slavePtr->width > 0) {
-                paneSize = slavePtr->width;
+            if (panePtr->width > 0) {
+                paneSize = panePtr->width;
             } else {
-                paneSize = slavePtr->paneWidth;
+                paneSize = panePtr->paneWidth;
             }
 	    pwSize = pwWidth;
 	} else {
-            if (slavePtr->height > 0) {
-                paneSize = slavePtr->height;
+            if (panePtr->height > 0) {
+                paneSize = panePtr->height;
             } else {
-                paneSize = slavePtr->paneHeight;
+                paneSize = panePtr->paneHeight;
             }
 	    pwSize = pwHeight;
 	}
-	if (IsStretchable(slavePtr->stretch, i, first, last)) {
+	if (IsStretchable(panePtr->stretch, i, first, last)) {
 	    double frac;
 
 	    if (paneDynSize > 0) {
@@ -1874,7 +1874,7 @@ ArrangePanes(
 	    }
 
 	    paneDynSize -= paneSize;
-	    paneDynMinSize -= slavePtr->minSize;
+	    paneDynMinSize -= panePtr->minSize;
 	    stretchAmount = (int) (frac * stretchReserve);
 	    if (paneSize + stretchAmount >= paneMinSize) {
 		stretchReserve -= stretchAmount;
@@ -1899,9 +1899,9 @@ ArrangePanes(
 	}
 	if (horizontal) {
 	    paneWidth = paneSize;
-	    paneHeight = pwHeight - (2 * slavePtr->pady);
+	    paneHeight = pwHeight - (2 * panePtr->pady);
 	} else {
-	    paneWidth = pwWidth - (2 * slavePtr->padx);
+	    paneWidth = pwWidth - (2 * panePtr->padx);
 	    paneHeight = paneSize;
 	}
 
@@ -1929,15 +1929,15 @@ ArrangePanes(
 	    paneHeight = pwHeight - syReserve - y + internalBW;
 	}
 
-	if (slaveWidth > paneWidth) {
-	    slaveWidth = paneWidth;
+	if (newPaneWidth > paneWidth) {
+	    newPaneWidth = paneWidth;
 	}
-	if (slaveHeight > paneHeight) {
-	    slaveHeight = paneHeight;
+	if (newPaneHeight > paneHeight) {
+	    newPaneHeight = paneHeight;
 	}
 
-	slavePtr->x = x;
-	slavePtr->y = y;
+	panePtr->x = x;
+	panePtr->y = y;
 
 	/*
 	 * Compute the location of the sash at the right or bottom of the
@@ -1945,51 +1945,51 @@ ArrangePanes(
 	 */
 
 	if (horizontal) {
-	    x += paneWidth + (2 * slavePtr->padx);
+	    x += paneWidth + (2 * panePtr->padx);
 	    if (x < internalBW) {
 		x = internalBW;
 	    }
-	    slavePtr->sashx = x + sashOffset;
-	    slavePtr->sashy = y;
-	    slavePtr->handlex = x + handleOffset;
-	    slavePtr->handley = y + pwPtr->handlePad;
+	    panePtr->sashx = x + sashOffset;
+	    panePtr->sashy = y;
+	    panePtr->handlex = x + handleOffset;
+	    panePtr->handley = y + pwPtr->handlePad;
 	    x += sashWidth;
 	} else {
-	    y += paneHeight + (2 * slavePtr->pady);
+	    y += paneHeight + (2 * panePtr->pady);
 	    if (y < internalBW) {
 		y = internalBW;
 	    }
-	    slavePtr->sashx = x;
-	    slavePtr->sashy = y + sashOffset;
-	    slavePtr->handlex = x + pwPtr->handlePad;
-	    slavePtr->handley = y + handleOffset;
+	    panePtr->sashx = x;
+	    panePtr->sashy = y + sashOffset;
+	    panePtr->handlex = x + pwPtr->handlePad;
+	    panePtr->handley = y + handleOffset;
 	    y += sashWidth;
 	}
 
 	/*
-	 * Compute the actual dimensions of the slave in the pane.
+	 * Compute the actual dimensions of the pane in the pane.
 	 */
 
-	slaveX = slavePtr->x;
-	slaveY = slavePtr->y;
-	AdjustForSticky(slavePtr->sticky, paneWidth, paneHeight,
-		&slaveX, &slaveY, &slaveWidth, &slaveHeight);
+	paneX = panePtr->x;
+	paneY = panePtr->y;
+	AdjustForSticky(panePtr->sticky, paneWidth, paneHeight,
+		&paneX, &paneY, &newPaneWidth, &newPaneHeight);
 
-	slaveX += slavePtr->padx;
-	slaveY += slavePtr->pady;
+	paneX += panePtr->padx;
+	paneY += panePtr->pady;
 
 	/*
 	 * Now put the window in the proper spot.
 	 */
 
-	if (slaveWidth <= 0 || slaveHeight <= 0 ||
-		(horizontal ? slaveX - internalBW > pwWidth :
-		slaveY - internalBW > pwHeight)) {
-	    Tk_UnmaintainGeometry(slavePtr->tkwin, pwPtr->tkwin);
-	    Tk_UnmapWindow(slavePtr->tkwin);
+	if (newPaneWidth <= 0 || newPaneHeight <= 0 ||
+		(horizontal ? paneX - internalBW > pwWidth :
+		paneY - internalBW > pwHeight)) {
+	    Tk_UnmaintainGeometry(panePtr->tkwin, pwPtr->tkwin);
+	    Tk_UnmapWindow(panePtr->tkwin);
 	} else {
-	    Tk_MaintainGeometry(slavePtr->tkwin, pwPtr->tkwin,
-		    slaveX, slaveY, slaveWidth, slaveHeight);
+	    Tk_MaintainGeometry(panePtr->tkwin, pwPtr->tkwin,
+		    paneX, paneY, newPaneWidth, newPaneHeight);
 	}
 	sashCount--;
     }
@@ -2001,7 +2001,7 @@ ArrangePanes(
  *
  * Unlink --
  *
- *	Remove a slave from a paned window.
+ *	Remove a pane from a paned window.
  *
  * Results:
  *	None.
@@ -2014,57 +2014,57 @@ ArrangePanes(
 
 static void
 Unlink(
-    register Slave *slavePtr)		/* Window to unlink. */
+    register Pane *panePtr)		/* Window to unlink. */
 {
-    register PanedWindow *masterPtr;
+    register PanedWindow *containerPtr;
     int i, j;
 
-    masterPtr = slavePtr->masterPtr;
-    if (masterPtr == NULL) {
+    containerPtr = panePtr->containerPtr;
+    if (containerPtr == NULL) {
 	return;
     }
 
     /*
-     * Find the specified slave in the panedwindow's list of slaves, then
+     * Find the specified pane in the panedwindow's list of panes, then
      * remove it from that list.
      */
 
-    for (i = 0; i < masterPtr->numSlaves; i++) {
-	if (masterPtr->slaves[i] == slavePtr) {
-	    for (j = i; j < masterPtr->numSlaves - 1; j++) {
-		masterPtr->slaves[j] = masterPtr->slaves[j + 1];
+    for (i = 0; i < containerPtr->numPanes; i++) {
+	if (containerPtr->panes[i] == panePtr) {
+	    for (j = i; j < containerPtr->numPanes - 1; j++) {
+		containerPtr->panes[j] = containerPtr->panes[j + 1];
 	    }
 	    break;
 	}
     }
 
     /*
-     * Clean out any -after or -before references to this slave
+     * Clean out any -after or -before references to this pane
      */
 
-    for (i = 0; i < masterPtr->numSlaves; i++) {
-	if (masterPtr->slaves[i]->before == slavePtr->tkwin) {
-	    masterPtr->slaves[i]->before = NULL;
+    for (i = 0; i < containerPtr->numPanes; i++) {
+	if (containerPtr->panes[i]->before == panePtr->tkwin) {
+	    containerPtr->panes[i]->before = NULL;
 	}
-	if (masterPtr->slaves[i]->after == slavePtr->tkwin) {
-	    masterPtr->slaves[i]->after = NULL;
+	if (containerPtr->panes[i]->after == panePtr->tkwin) {
+	    containerPtr->panes[i]->after = NULL;
 	}
     }
 
-    masterPtr->flags |= REQUESTED_RELAYOUT;
-    if (!(masterPtr->flags & REDRAW_PENDING)) {
-	masterPtr->flags |= REDRAW_PENDING;
-	Tcl_DoWhenIdle(DisplayPanedWindow, masterPtr);
+    containerPtr->flags |= REQUESTED_RELAYOUT;
+    if (!(containerPtr->flags & REDRAW_PENDING)) {
+	containerPtr->flags |= REDRAW_PENDING;
+	Tcl_DoWhenIdle(DisplayPanedWindow, containerPtr);
     }
 
     /*
-     * Set the slave's masterPtr to NULL, so that we can tell that the slave
+     * Set the pane's containerPtr to NULL, so that we can tell that the pane
      * is no longer attached to any panedwindow.
      */
 
-    slavePtr->masterPtr = NULL;
+    panePtr->containerPtr = NULL;
 
-    masterPtr->numSlaves--;
+    containerPtr->numPanes--;
 }
 
 /*
@@ -2076,7 +2076,7 @@ Unlink(
  *	token in a given paned window.
  *
  * Results:
- *	Pointer to the slave structure, or NULL if the window is not managed
+ *	Pointer to the pane structure, or NULL if the window is not managed
  *	by this paned window.
  *
  * Side effects:
@@ -2085,16 +2085,16 @@ Unlink(
  *----------------------------------------------------------------------
  */
 
-static Slave *
+static Pane *
 GetPane(
     PanedWindow *pwPtr,		/* Pointer to the paned window info. */
     Tk_Window tkwin)		/* Window to search for. */
 {
     int i;
 
-    for (i = 0; i < pwPtr->numSlaves; i++) {
-	if (pwPtr->slaves[i]->tkwin == tkwin) {
-	    return pwPtr->slaves[i];
+    for (i = 0; i < pwPtr->numPanes; i++) {
+	if (pwPtr->panes[i]->tkwin == tkwin) {
+	    return pwPtr->panes[i];
 	}
     }
     return NULL;
@@ -2125,8 +2125,8 @@ GetFirstLastVisiblePane(
 {
     int i;
 
-    for (i = 0, *lastPtr = 0, *firstPtr = -1; i < pwPtr->numSlaves; i++) {
-	if (pwPtr->slaves[i]->hide == 0) {
+    for (i = 0, *lastPtr = 0, *firstPtr = -1; i < pwPtr->numPanes; i++) {
+	if (pwPtr->panes[i]->hide == 0) {
 	    if (*firstPtr < 0) {
 		*firstPtr = i;
 	    }
@@ -2138,7 +2138,7 @@ GetFirstLastVisiblePane(
 /*
  *--------------------------------------------------------------
  *
- * SlaveStructureProc --
+ * PaneStructureProc --
  *
  *	This function is invoked whenever StructureNotify events occur for a
  *	window that's managed by a paned window. This function's only purpose
@@ -2148,25 +2148,25 @@ GetFirstLastVisiblePane(
  *	None.
  *
  * Side effects:
- *	The paned window slave structure associated with the window
- *	is freed, and the slave is disassociated from the paned
+ *	The paned window pane structure associated with the window
+ *	is freed, and the pane is disassociated from the paned
  *	window which managed it.
  *
  *--------------------------------------------------------------
  */
 
 static void
-SlaveStructureProc(
+PaneStructureProc(
     ClientData clientData,	/* Pointer to record describing window item. */
     XEvent *eventPtr)		/* Describes what just happened. */
 {
-    Slave *slavePtr = clientData;
-    PanedWindow *pwPtr = slavePtr->masterPtr;
+    Pane *panePtr = clientData;
+    PanedWindow *pwPtr = panePtr->containerPtr;
 
     if (eventPtr->type == DestroyNotify) {
-	Unlink(slavePtr);
-	slavePtr->tkwin = NULL;
-	ckfree(slavePtr);
+	Unlink(panePtr);
+	panePtr->tkwin = NULL;
+	ckfree(panePtr);
 	ComputeGeometry(pwPtr);
     }
 }
@@ -2177,7 +2177,7 @@ SlaveStructureProc(
  * ComputeGeometry --
  *
  *	Compute geometry for the paned window, including coordinates of all
- *	slave windows and each sash.
+ *	panes and each sash.
  *
  * Results:
  *	None.
@@ -2195,7 +2195,7 @@ ComputeGeometry(
     int i, x, y, doubleBw, internalBw;
     int sashWidth, sashOffset, handleOffset;
     int reqWidth, reqHeight, dim;
-    Slave *slavePtr;
+    Pane *panePtr;
     const int horizontal = (pwPtr->orient == ORIENT_HORIZONTAL);
 
     pwPtr->flags |= REQUESTED_RELAYOUT;
@@ -2221,20 +2221,20 @@ ComputeGeometry(
 		+ pwPtr->sashPad;
     }
 
-    for (i = 0; i < pwPtr->numSlaves; i++) {
-	slavePtr = pwPtr->slaves[i];
+    for (i = 0; i < pwPtr->numPanes; i++) {
+	panePtr = pwPtr->panes[i];
 
-	if (slavePtr->hide) {
+	if (panePtr->hide) {
 	    continue;
 	}
 
 	/*
-	 * First set the coordinates for the top left corner of the slave's
+	 * First set the coordinates for the top left corner of the pane's
 	 * parcel.
 	 */
 
-	slavePtr->x = x;
-	slavePtr->y = y;
+	panePtr->x = x;
+	panePtr->y = y;
 
 	/*
 	 * Make sure the pane's paned dimension is at least minsize. This
@@ -2243,12 +2243,12 @@ ComputeGeometry(
 	 */
 
 	if (horizontal) {
-	    if (slavePtr->paneWidth < slavePtr->minSize) {
-		slavePtr->paneWidth = slavePtr->minSize;
+	    if (panePtr->paneWidth < panePtr->minSize) {
+		panePtr->paneWidth = panePtr->minSize;
 	    }
 	} else {
-	    if (slavePtr->paneHeight < slavePtr->minSize) {
-		slavePtr->paneHeight = slavePtr->minSize;
+	    if (panePtr->paneHeight < panePtr->minSize) {
+		panePtr->paneHeight = panePtr->minSize;
 	    }
 	}
 
@@ -2258,55 +2258,55 @@ ComputeGeometry(
 	 */
 
 	if (horizontal) {
-	    x += slavePtr->paneWidth + (2 * slavePtr->padx);
-	    slavePtr->sashx = x + sashOffset;
-	    slavePtr->sashy = y;
-	    slavePtr->handlex = x + handleOffset;
-	    slavePtr->handley = y + pwPtr->handlePad;
+	    x += panePtr->paneWidth + (2 * panePtr->padx);
+	    panePtr->sashx = x + sashOffset;
+	    panePtr->sashy = y;
+	    panePtr->handlex = x + handleOffset;
+	    panePtr->handley = y + pwPtr->handlePad;
 	    x += sashWidth;
 	} else {
-	    y += slavePtr->paneHeight + (2 * slavePtr->pady);
-	    slavePtr->sashx = x;
-	    slavePtr->sashy = y + sashOffset;
-	    slavePtr->handlex = x + pwPtr->handlePad;
-	    slavePtr->handley = y + handleOffset;
+	    y += panePtr->paneHeight + (2 * panePtr->pady);
+	    panePtr->sashx = x;
+	    panePtr->sashy = y + sashOffset;
+	    panePtr->handlex = x + pwPtr->handlePad;
+	    panePtr->handley = y + handleOffset;
 	    y += sashWidth;
 	}
 
 	/*
-	 * Find the maximum height/width of the slaves, for computing the
+	 * Find the maximum height/width of the panes, for computing the
 	 * requested height/width of the paned window.
 	 */
 
 	if (horizontal) {
 	    /*
-	     * If the slave has an explicit height set, use that; otherwise,
-	     * use the slave's requested height.
+	     * If the pane has an explicit height set, use that; otherwise,
+	     * use the pane's requested height.
 	     */
 
-	    if (slavePtr->height > 0) {
-		dim = slavePtr->height;
+	    if (panePtr->height > 0) {
+		dim = panePtr->height;
 	    } else {
-		doubleBw = 2 * Tk_Changes(slavePtr->tkwin)->border_width;
-		dim = Tk_ReqHeight(slavePtr->tkwin) + doubleBw;
+		doubleBw = 2 * Tk_Changes(panePtr->tkwin)->border_width;
+		dim = Tk_ReqHeight(panePtr->tkwin) + doubleBw;
 	    }
-	    dim += 2 * slavePtr->pady;
+	    dim += 2 * panePtr->pady;
 	    if (dim > reqHeight) {
 		reqHeight = dim;
 	    }
 	} else {
 	    /*
-	     * If the slave has an explicit width set use that; otherwise, use
-	     * the slave's requested width.
+	     * If the pane has an explicit width set use that; otherwise, use
+	     * the pane's requested width.
 	     */
 
-	    if (slavePtr->width > 0) {
-		dim = slavePtr->width;
+	    if (panePtr->width > 0) {
+		dim = panePtr->width;
 	    } else {
-		doubleBw = 2 * Tk_Changes(slavePtr->tkwin)->border_width;
-		dim = Tk_ReqWidth(slavePtr->tkwin) + doubleBw;
+		doubleBw = 2 * Tk_Changes(panePtr->tkwin)->border_width;
+		dim = Tk_ReqWidth(panePtr->tkwin) + doubleBw;
 	    }
-	    dim += 2 * slavePtr->padx;
+	    dim += 2 * panePtr->padx;
 	    if (dim > reqWidth) {
 		reqWidth = dim;
 	    }
@@ -2324,7 +2324,7 @@ ComputeGeometry(
      * the paned window.
      *
      * The height (or width) is equal to the maximum height (or width) of the
-     * slaves, plus the width of the border of the top and bottom (or left and
+     * panes, plus the width of the border of the top and bottom (or left and
      * right) of the paned window.
      *
      * If the panedwindow has an explicit width/height set use that;
@@ -2535,11 +2535,11 @@ RestoreSticky(
  * AdjustForSticky --
  *
  *	Given the x,y coords of the top-left corner of a pane, the dimensions
- *	of that pane, and the dimensions of a slave, compute the x,y coords
- *	and actual dimensions of the slave based on the slave's sticky value.
+ *	of that pane, and the dimensions of a pane, compute the x,y coords
+ *	and actual dimensions of the pane based on the pane's sticky value.
  *
  * Results:
- *	No direct return; sets the x, y, slaveWidth and slaveHeight to correct
+ *	No direct return; sets the x, y, paneWidth and paneHeight to correct
  *	values.
  *
  * Side effects:
@@ -2556,26 +2556,26 @@ AdjustForSticky(
     int cavityHeight,		/* Height of the cavity. */
     int *xPtr, int *yPtr,	/* Initially, coordinates of the top-left
 				 * corner of cavity; also return values for
-				 * actual x, y coords of slave. */
-    int *slaveWidthPtr,		/* Slave width. */
-    int *slaveHeightPtr)	/* Slave height. */
+				 * actual x, y coords of pane. */
+    int *paneWidthPtr,		/* Pane width. */
+    int *paneHeightPtr)	/* Pane height. */
 {
-    int diffx = 0;		/* Cavity width - slave width. */
-    int diffy = 0;		/* Cavity hight - slave height. */
+    int diffx = 0;		/* Cavity width - pane width. */
+    int diffy = 0;		/* Cavity hight - pane height. */
 
-    if (cavityWidth > *slaveWidthPtr) {
-	diffx = cavityWidth - *slaveWidthPtr;
+    if (cavityWidth > *paneWidthPtr) {
+	diffx = cavityWidth - *paneWidthPtr;
     }
 
-    if (cavityHeight > *slaveHeightPtr) {
-	diffy = cavityHeight - *slaveHeightPtr;
+    if (cavityHeight > *paneHeightPtr) {
+	diffy = cavityHeight - *paneHeightPtr;
     }
 
     if ((sticky & STICK_EAST) && (sticky & STICK_WEST)) {
-	*slaveWidthPtr += diffx;
+	*paneWidthPtr += diffx;
     }
     if ((sticky & STICK_NORTH) && (sticky & STICK_SOUTH)) {
-	*slaveHeightPtr += diffy;
+	*paneHeightPtr += diffy;
     }
     if (!(sticky & STICK_WEST)) {
 	*xPtr += (sticky & STICK_EAST) ? diffx : diffx/2;
@@ -2608,8 +2608,8 @@ MoveSash(
     int diff)
 {
     int i;
-    int expandPane, reduceFirst, reduceLast, reduceIncr, slaveSize, sashOffset;
-    Slave *slavePtr;
+    int expandPane, reduceFirst, reduceLast, reduceIncr, paneSize, sashOffset;
+    Pane *panePtr;
     int stretchReserve = 0;
     int nextSash = sash + 1;
     const int horizontal = (pwPtr->orient == ORIENT_HORIZONTAL);
@@ -2618,7 +2618,7 @@ MoveSash(
 	return;
 
     /*
-     * Update the slave sizes with their real sizes.
+     * Update the pane sizes with their real sizes.
      */
 
     if (pwPtr->showHandle && pwPtr->handleSize > pwPtr->sashWidth) {
@@ -2627,17 +2627,17 @@ MoveSash(
     } else {
 	sashOffset = pwPtr->sashPad;
     }
-    for (i = 0; i < pwPtr->numSlaves; i++) {
-	slavePtr = pwPtr->slaves[i];
-	if (slavePtr->hide) {
+    for (i = 0; i < pwPtr->numPanes; i++) {
+	panePtr = pwPtr->panes[i];
+	if (panePtr->hide) {
 	    continue;
 	}
 	if (horizontal) {
-	    slavePtr->paneWidth = slavePtr->width = slavePtr->sashx
-		    - sashOffset - slavePtr->x - (2 * slavePtr->padx);
+	    panePtr->paneWidth = panePtr->width = panePtr->sashx
+		    - sashOffset - panePtr->x - (2 * panePtr->padx);
 	} else {
-	    slavePtr->paneHeight = slavePtr->height = slavePtr->sashy
-		    - sashOffset - slavePtr->y - (2 * slavePtr->pady);
+	    panePtr->paneHeight = panePtr->height = panePtr->sashy
+		    - sashOffset - panePtr->y - (2 * panePtr->pady);
 	}
     }
 
@@ -2647,7 +2647,7 @@ MoveSash(
      * pane to either side of the sash.
      */
 
-    while (nextSash < pwPtr->numSlaves-1 && pwPtr->slaves[nextSash]->hide) {
+    while (nextSash < pwPtr->numPanes-1 && pwPtr->panes[nextSash]->hide) {
 	nextSash++;
     }
 
@@ -2658,7 +2658,7 @@ MoveSash(
     if (diff > 0) {
 	expandPane = sash;
 	reduceFirst = nextSash;
-	reduceLast = pwPtr->numSlaves;
+	reduceLast = pwPtr->numPanes;
 	reduceIncr = 1;
     } else {
 	diff = abs(diff);
@@ -2674,14 +2674,14 @@ MoveSash(
      */
 
     for (i = reduceFirst; i != reduceLast; i += reduceIncr) {
-	slavePtr = pwPtr->slaves[i];
-	if (slavePtr->hide) {
+	panePtr = pwPtr->panes[i];
+	if (panePtr->hide) {
 	    continue;
 	}
 	if (horizontal) {
-	    stretchReserve += slavePtr->width - slavePtr->minSize;
+	    stretchReserve += panePtr->width - panePtr->minSize;
 	} else {
-	    stretchReserve += slavePtr->height - slavePtr->minSize;
+	    stretchReserve += panePtr->height - panePtr->minSize;
 	}
     }
     if (stretchReserve <= 0) {
@@ -2695,11 +2695,11 @@ MoveSash(
      * Expand pane by diff amount.
      */
 
-    slavePtr = pwPtr->slaves[expandPane];
+    panePtr = pwPtr->panes[expandPane];
     if (horizontal) {
-	slavePtr->paneWidth = slavePtr->width += diff;
+	panePtr->paneWidth = panePtr->width += diff;
     } else {
-	slavePtr->paneHeight = slavePtr->height += diff;
+	panePtr->paneHeight = panePtr->height += diff;
     }
 
     /*
@@ -2707,26 +2707,26 @@ MoveSash(
      */
 
     for (i = reduceFirst; i != reduceLast; i += reduceIncr) {
-	slavePtr = pwPtr->slaves[i];
-	if (slavePtr->hide) {
+	panePtr = pwPtr->panes[i];
+	if (panePtr->hide) {
 	    continue;
 	}
 	if (horizontal) {
-	    slaveSize = slavePtr->width;
+	    paneSize = panePtr->width;
 	} else {
-	    slaveSize = slavePtr->height;
+	    paneSize = panePtr->height;
 	}
-	if (diff > (slaveSize - slavePtr->minSize)) {
-	    diff -= slaveSize - slavePtr->minSize;
-	    slaveSize = slavePtr->minSize;
+	if (diff > (paneSize - panePtr->minSize)) {
+	    diff -= paneSize - panePtr->minSize;
+	    paneSize = panePtr->minSize;
 	} else {
-	    slaveSize -= diff;
+	    paneSize -= diff;
 	    i = reduceLast - reduceIncr;
 	}
 	if (horizontal) {
-	    slavePtr->paneWidth = slavePtr->width = slaveSize;
+	    panePtr->paneWidth = panePtr->width = paneSize;
 	} else {
-	    slavePtr->paneHeight = slavePtr->height = slaveSize;
+	    panePtr->paneHeight = panePtr->height = paneSize;
 	}
     }
 }
@@ -2949,9 +2949,9 @@ PanedWindowProxyCommand(
 
 	/*
 	 * Make sure the proxy window is higher in the stacking order than the
-	 * slaves, so that it will be visible when drawn. It would be more
+	 * panes, so that it will be visible when drawn. It would be more
 	 * correct to push the proxy window just high enough to appear above
-	 * the highest slave, but it's much easier to just force it all the
+	 * the highest pane, but it's much easier to just force it all the
 	 * way to the top of the stacking order.
 	 */
 
@@ -3101,12 +3101,12 @@ PanedWindowIdentifyCoords(
     GetFirstLastVisiblePane(pwPtr, &first, &last);
     isHandle = 0;
     found = -1;
-    for (i = 0; i < pwPtr->numSlaves - 1; i++) {
-	if (pwPtr->slaves[i]->hide || i == last) {
+    for (i = 0; i < pwPtr->numPanes - 1; i++) {
+	if (pwPtr->panes[i]->hide || i == last) {
 	    continue;
 	}
-	thisx = pwPtr->slaves[i]->sashx;
-	thisy = pwPtr->slaves[i]->sashy;
+	thisx = pwPtr->panes[i]->sashx;
+	thisy = pwPtr->panes[i]->sashy;
 
 	if (((thisx - lpad) <= x && x <= (thisx + rpad + sashWidth)) &&
 		((thisy - tpad) <= y && y <= (thisy + bpad + sashHeight))) {
@@ -3117,8 +3117,8 @@ PanedWindowIdentifyCoords(
 	     */
 
 	    if (pwPtr->showHandle) {
-		thisx = pwPtr->slaves[i]->handlex;
-		thisy = pwPtr->slaves[i]->handley;
+		thisx = pwPtr->panes[i]->handlex;
+		thisy = pwPtr->panes[i]->handley;
 		if (pwPtr->orient == ORIENT_HORIZONTAL) {
 		    if (thisy <= y && y <= (thisy + pwPtr->handleSize)) {
 			isHandle = 1;
-- 
cgit v0.12


From 18cb58ab84107c6049642f8aea423dd75e25e4c1 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 3 Sep 2020 06:18:06 +0000
Subject: Implement part of TIP #581: Master/Slave.  Not complete yet, and also
 the change to TkGetGeomContainer/TkGetTransientContainer is left out for now.

---
 doc/CrtImgType.3          |  15 +-
 doc/ImgChanged.3          |   4 +
 doc/NameOfImg.3           |   4 +
 generic/tk.decls          |   4 +-
 generic/tk.h              |   9 +-
 generic/tkDecls.h         |   9 +-
 generic/tkGrid.c          |   9 +-
 generic/tkImage.c         |  40 +--
 generic/tkImgBmap.c       | 252 +++++++++---------
 generic/tkImgPhInstance.c |   8 +-
 generic/tkImgPhoto.c      | 664 +++++++++++++++++++++++-----------------------
 generic/tkImgPhoto.h      |  11 +-
 generic/tkInt.h           |   2 +-
 generic/tkOldTest.c       |  52 ++--
 generic/tkPack.c          |   9 +-
 generic/tkPlace.c         |   5 +-
 generic/tkTest.c          |  54 ++--
 tests/grid.test           |   2 +-
 tests/oldpack.test        |   4 +-
 tests/pack.test           |   2 +-
 tests/place.test          |   2 +-
 21 files changed, 594 insertions(+), 567 deletions(-)

diff --git a/doc/CrtImgType.3 b/doc/CrtImgType.3
index cbbc11e..8e6b826 100644
--- a/doc/CrtImgType.3
+++ b/doc/CrtImgType.3
@@ -9,7 +9,7 @@
 .so man.macros
 .BS
 .SH NAME
-Tk_CreateImageType, Tk_GetImageMasterData, Tk_InitImageArgs \- define new kind of image
+Tk_CreateImageType, Tk_GetImageMasterData, Tk_GetImageModelData, Tk_InitImageArgs \- define new kind of image
 .SH SYNOPSIS
 .nf
 \fB#include <tk.h>\fR
@@ -19,6 +19,11 @@ Tk_CreateImageType, Tk_GetImageMasterData, Tk_InitImageArgs \- define new kind o
 ClientData
 \fBTk_GetImageMasterData\fR(\fIinterp, name, typePtrPtr\fR)
 .sp
+.VS "TIP 581"
+ClientData
+\fBTk_GetImageModelData\fR(\fIinterp, name, typePtrPtr\fR)
+.VE "TIP 581"
+.sp
 \fBTk_InitImageArgs\fR(\fIinterp, argc, argvPtr\fR)
 .SH ARGUMENTS
 .AS "const Tk_ImageType" *typePtrPtr
@@ -241,6 +246,10 @@ and the return value is the ClientData value returned by the
 \fIcreateProc\fR when the image was created (this is typically a
 pointer to the image master data structure).  If no such image exists
 then NULL is returned and NULL is stored at \fI*typePtrPtr\fR.
+.PP
+.VS "TIP 581"
+\fBTk_GetImageModelData\fR is synonym for \fBTk_GetImageMasterData\fR
+.VE "TIP 581"
 .SH "LEGACY INTERFACE SUPPORT"
 .PP
 In Tk 8.2 and earlier, the definition of \fBTk_ImageCreateProc\fR
@@ -261,6 +270,10 @@ interface.  The Tk header file will still support this legacy
 interface if the code is compiled with the macro \fBUSE_OLD_IMAGE\fR
 defined.
 .PP
+.VS "TIP 581"
+\fITk_ImageModel\fR is synonym for \fITk_ImageMaster\fR
+.VE "TIP 581"
+.PP
 When the \fBUSE_OLD_IMAGE\fR legacy support is enabled, you may
 see the routine \fBTk_InitImageArgs\fR in use.  This was a migration
 tool used to create stub-enabled extensions that could be loaded
diff --git a/doc/ImgChanged.3 b/doc/ImgChanged.3
index f4d2c04..aa56548 100644
--- a/doc/ImgChanged.3
+++ b/doc/ImgChanged.3
@@ -48,6 +48,10 @@ specify a rectangular region within the image that needs to
 be redrawn.
 \fIimageWidth\fR and \fIimageHeight\fR specify the image's (new) size.
 .PP
+.VS "TIP 581"
+\fITk_ImageModel\fR is synonym for \fITk_ImageMaster\fR
+.VE "TIP 581"
+.PP
 An image manager should call \fBTk_ImageChanged\fR during
 its \fIcreateProc\fR to specify the image's initial size and to
 force redisplay if there are existing instances for the image.
diff --git a/doc/NameOfImg.3 b/doc/NameOfImg.3
index 8c191ce..484e479 100644
--- a/doc/NameOfImg.3
+++ b/doc/NameOfImg.3
@@ -26,5 +26,9 @@ the image was created.
 This procedure is invoked by image managers to find out the name
 of an image.  Given the token for the image, it returns the
 string name for the image.
+.PP
+.VS "TIP 581"
+\fITk_ImageModel\fR is synonym for \fITk_ImageMaster\fR
+.VE "TIP 581"
 .SH KEYWORDS
 image manager, image name
diff --git a/generic/tk.decls b/generic/tk.decls
index 3e64878..59977ef 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -472,7 +472,7 @@ declare 116 {
     Tk_Window Tk_IdToWindow(Display *display, Window window)
 }
 declare 117 {
-    void Tk_ImageChanged(Tk_ImageMaster master, int x, int y,
+    void Tk_ImageChanged(Tk_ImageModel master, int x, int y,
 	    int width, int height, int imageWidth, int imageHeight)
 }
 declare 118 {
@@ -539,7 +539,7 @@ declare 136 {
     CONST84_RETURN char *Tk_NameOfFont(Tk_Font font)
 }
 declare 137 {
-    CONST84_RETURN char *Tk_NameOfImage(Tk_ImageMaster imageMaster)
+    CONST84_RETURN char *Tk_NameOfImage(Tk_ImageModel imageMaster)
 }
 declare 138 {
     CONST84_RETURN char *Tk_NameOfJoinStyle(int join)
diff --git a/generic/tk.h b/generic/tk.h
index 01f3657..4905aae 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -122,13 +122,14 @@ extern "C" {
  * Dummy types that are used by clients:
  */
 
+#define Tk_ImageModel Tk_ImageMaster
 typedef struct Tk_BindingTable_ *Tk_BindingTable;
 typedef struct Tk_Canvas_ *Tk_Canvas;
 typedef struct Tk_Cursor_ *Tk_Cursor;
 typedef struct Tk_ErrorHandler_ *Tk_ErrorHandler;
 typedef struct Tk_Font_ *Tk_Font;
 typedef struct Tk_Image__ *Tk_Image;
-typedef struct Tk_ImageMaster_ *Tk_ImageMaster;
+typedef struct Tk_ImageMaster_ *Tk_ImageModel;
 typedef struct Tk_OptionTable_ *Tk_OptionTable;
 typedef struct Tk_PostscriptInfo_ *Tk_PostscriptInfo;
 typedef struct Tk_TextLayout_ *Tk_TextLayout;
@@ -1228,12 +1229,12 @@ typedef struct Tk_Outline {
 typedef struct Tk_ImageType Tk_ImageType;
 #ifdef USE_OLD_IMAGE
 typedef int (Tk_ImageCreateProc) (Tcl_Interp *interp, char *name, int argc,
-	char **argv, Tk_ImageType *typePtr, Tk_ImageMaster master,
+	char **argv, Tk_ImageType *typePtr, Tk_ImageModel model,
 	ClientData *masterDataPtr);
 #else
 typedef int (Tk_ImageCreateProc) (Tcl_Interp *interp, CONST86 char *name, int objc,
-	Tcl_Obj *const objv[], CONST86 Tk_ImageType *typePtr, Tk_ImageMaster master,
-	ClientData *masterDataPtr);
+	Tcl_Obj *const objv[], CONST86 Tk_ImageType *typePtr, Tk_ImageModel model,
+	ClientData *modelDataPtr);
 #endif /* USE_OLD_IMAGE */
 typedef ClientData (Tk_ImageGetProc) (Tk_Window tkwin, ClientData masterData);
 typedef void (Tk_ImageDisplayProc) (ClientData instanceData, Display *display,
diff --git a/generic/tkDecls.h b/generic/tkDecls.h
index 64c32cd..c96039d 100644
--- a/generic/tkDecls.h
+++ b/generic/tkDecls.h
@@ -402,7 +402,7 @@ EXTERN void		Tk_HandleEvent(XEvent *eventPtr);
 /* 116 */
 EXTERN Tk_Window	Tk_IdToWindow(Display *display, Window window);
 /* 117 */
-EXTERN void		Tk_ImageChanged(Tk_ImageMaster master, int x, int y,
+EXTERN void		Tk_ImageChanged(Tk_ImageModel master, int x, int y,
 				int width, int height, int imageWidth,
 				int imageHeight);
 /* 118 */
@@ -453,7 +453,7 @@ EXTERN CONST84_RETURN char * Tk_NameOfCursor(Display *display,
 /* 136 */
 EXTERN CONST84_RETURN char * Tk_NameOfFont(Tk_Font font);
 /* 137 */
-EXTERN CONST84_RETURN char * Tk_NameOfImage(Tk_ImageMaster imageMaster);
+EXTERN CONST84_RETURN char * Tk_NameOfImage(Tk_ImageModel imageMaster);
 /* 138 */
 EXTERN CONST84_RETURN char * Tk_NameOfJoinStyle(int join);
 /* 139 */
@@ -993,7 +993,7 @@ typedef struct TkStubs {
     int (*tk_Grab) (Tcl_Interp *interp, Tk_Window tkwin, int grabGlobal); /* 114 */
     void (*tk_HandleEvent) (XEvent *eventPtr); /* 115 */
     Tk_Window (*tk_IdToWindow) (Display *display, Window window); /* 116 */
-    void (*tk_ImageChanged) (Tk_ImageMaster master, int x, int y, int width, int height, int imageWidth, int imageHeight); /* 117 */
+    void (*tk_ImageChanged) (Tk_ImageModel master, int x, int y, int width, int height, int imageWidth, int imageHeight); /* 117 */
     int (*tk_Init) (Tcl_Interp *interp); /* 118 */
     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 */
@@ -1013,7 +1013,7 @@ typedef struct TkStubs {
     CONST84_RETURN char * (*tk_NameOfColor) (XColor *colorPtr); /* 134 */
     CONST84_RETURN char * (*tk_NameOfCursor) (Display *display, Tk_Cursor cursor); /* 135 */
     CONST84_RETURN char * (*tk_NameOfFont) (Tk_Font font); /* 136 */
-    CONST84_RETURN char * (*tk_NameOfImage) (Tk_ImageMaster imageMaster); /* 137 */
+    CONST84_RETURN char * (*tk_NameOfImage) (Tk_ImageModel imageMaster); /* 137 */
     CONST84_RETURN char * (*tk_NameOfJoinStyle) (int join); /* 138 */
     CONST84_RETURN char * (*tk_NameOfJustify) (Tk_Justify justify); /* 139 */
     CONST84_RETURN char * (*tk_NameOfRelief) (int relief); /* 140 */
@@ -1720,6 +1720,7 @@ extern const TkStubs *tkStubsPtr;
 #undef Tk_Init
 #undef Tk_SafeInit
 #undef Tk_CreateConsoleWindow
+#define Tk_GetImageModelData Tk_GetImageMasterData
 
 #if defined(_WIN32) && defined(UNICODE)
 #   define Tk_MainEx Tk_MainExW
diff --git a/generic/tkGrid.c b/generic/tkGrid.c
index be15c14..835971d 100644
--- a/generic/tkGrid.c
+++ b/generic/tkGrid.c
@@ -338,13 +338,13 @@ Tk_GridObjCmd(
     Tk_Window tkwin = clientData;
     static const char *const optionStrings[] = {
 	"anchor", "bbox", "columnconfigure", "configure",
-	"forget", "info", "location", "propagate", "remove",
-	"rowconfigure", "size",	"slaves", NULL
+	"content", "forget", "info", "location", "propagate",
+	"remove", "rowconfigure", "size",	"slaves", NULL
     };
     enum options {
 	GRID_ANCHOR, GRID_BBOX, GRID_COLUMNCONFIGURE, GRID_CONFIGURE,
-	GRID_FORGET, GRID_INFO, GRID_LOCATION, GRID_PROPAGATE, GRID_REMOVE,
-	GRID_ROWCONFIGURE, GRID_SIZE, GRID_SLAVES
+	GRID_CONTENT, GRID_FORGET, GRID_INFO, GRID_LOCATION, GRID_PROPAGATE,
+	GRID_REMOVE, GRID_ROWCONFIGURE, GRID_SIZE, GRID_SLAVES
     };
     int index;
 
@@ -384,6 +384,7 @@ Tk_GridObjCmd(
 	return GridPropagateCommand(tkwin, interp, objc, objv);
     case GRID_SIZE:
 	return GridSizeCommand(tkwin, interp, objc, objv);
+    case GRID_CONTENT:
     case GRID_SLAVES:
 	return GridSlavesCommand(tkwin, interp, objc, objv);
 
diff --git a/generic/tkImage.c b/generic/tkImage.c
index dc4e8e0..8192c23 100644
--- a/generic/tkImage.c
+++ b/generic/tkImage.c
@@ -26,7 +26,7 @@ typedef struct Image {
     Display *display;		/* Display for tkwin. Needed because when the
 				 * image is eventually freed tkwin may not
 				 * exist anymore. */
-    struct ImageMaster *masterPtr;
+    struct ImageModel *masterPtr;
 				/* Master for this image (identifiers image
 				 * manager, for example). */
     ClientData instanceData;	/* One word argument to pass to image manager
@@ -45,7 +45,7 @@ typedef struct Image {
  * from it. Entries in mainPtr->imageTable point to these structures.
  */
 
-typedef struct ImageMaster {
+typedef struct ImageModel {
     Tk_ImageType *typePtr;	/* Information about image type. NULL means
 				 * that no image manager owns this image: the
 				 * image was deleted. */
@@ -64,7 +64,7 @@ typedef struct ImageMaster {
     int deleted;		/* Flag set when image is being deleted. */
     TkWindow *winPtr;		/* Main window of interpreter (used to detect
 				 * when the world is falling apart.) */
-} ImageMaster;
+} ImageModel;
 
 typedef struct {
     Tk_ImageType *imageTypeList;/* First in a list of all known image
@@ -82,8 +82,8 @@ static Tcl_ThreadDataKey dataKey;
  */
 
 static void		ImageTypeThreadExitProc(ClientData clientData);
-static void		DeleteImage(ImageMaster *masterPtr);
-static void		EventuallyDeleteImage(ImageMaster *masterPtr,
+static void		DeleteImage(ImageModel *masterPtr);
+static void		EventuallyDeleteImage(ImageModel *masterPtr,
 			    int forgetImageHashNow);
 
 /*
@@ -218,7 +218,7 @@ Tk_ImageObjCmd(
     TkWindow *winPtr = clientData;
     int i, isNew, firstOption, index;
     Tk_ImageType *typePtr;
-    ImageMaster *masterPtr;
+    ImageModel *masterPtr;
     Image *imagePtr;
     Tcl_HashEntry *hPtr;
     Tcl_HashSearch search;
@@ -318,7 +318,7 @@ Tk_ImageObjCmd(
 
 	hPtr = Tcl_CreateHashEntry(&winPtr->mainPtr->imageTable, name, &isNew);
 	if (isNew) {
-	    masterPtr = ckalloc(sizeof(ImageMaster));
+	    masterPtr = ckalloc(sizeof(ImageModel));
 	    masterPtr->typePtr = NULL;
 	    masterPtr->masterData = NULL;
 	    masterPtr->width = masterPtr->height = 1;
@@ -371,7 +371,7 @@ Tk_ImageObjCmd(
 	}
 	Tcl_Preserve(masterPtr);
 	if (typePtr->createProc(interp, name, objc, args, typePtr,
-		(Tk_ImageMaster)masterPtr, &masterPtr->masterData) != TCL_OK){
+		(Tk_ImageModel)masterPtr, &masterPtr->masterData) != TCL_OK){
 	    EventuallyDeleteImage(masterPtr, 0);
 	    Tcl_Release(masterPtr);
 	    if (oldimage) {
@@ -523,7 +523,7 @@ Tk_ImageObjCmd(
 
 void
 Tk_ImageChanged(
-    Tk_ImageMaster imageMaster,	/* Image that needs redisplay. */
+    Tk_ImageModel imageModel,	/* Image that needs redisplay. */
     int x, int y,		/* Coordinates of upper-left pixel of region
 				 * of image that needs to be redrawn. */
     int width, int height,	/* Dimensions (in pixels) of region of image
@@ -534,7 +534,7 @@ Tk_ImageChanged(
     int imageWidth, int imageHeight)
 				/* New dimensions of image. */
 {
-    ImageMaster *masterPtr = (ImageMaster *) imageMaster;
+    ImageModel *masterPtr = (ImageModel *) imageModel;
     Image *imagePtr;
 
     masterPtr->width = imageWidth;
@@ -555,7 +555,7 @@ Tk_ImageChanged(
  *	the image.
  *
  * Results:
- *	The return value is the string name for imageMaster.
+ *	The return value is the string name for imageModel.
  *
  * Side effects:
  *	None.
@@ -565,9 +565,9 @@ Tk_ImageChanged(
 
 const char *
 Tk_NameOfImage(
-    Tk_ImageMaster imageMaster)	/* Token for image. */
+    Tk_ImageModel imageModel)	/* Token for image. */
 {
-    ImageMaster *masterPtr = (ImageMaster *) imageMaster;
+    ImageModel *masterPtr = (ImageModel *) imageModel;
 
     if (masterPtr->hPtr == NULL) {
 	return NULL;
@@ -610,7 +610,7 @@ Tk_GetImage(
     ClientData clientData)	/* One-word argument to pass to damageProc. */
 {
     Tcl_HashEntry *hPtr;
-    ImageMaster *masterPtr;
+    ImageModel *masterPtr;
     Image *imagePtr;
 
     hPtr = Tcl_FindHashEntry(&((TkWindow *) tkwin)->mainPtr->imageTable, name);
@@ -669,7 +669,7 @@ Tk_FreeImage(
 				 * a widget. */
 {
     Image *imagePtr = (Image *) image;
-    ImageMaster *masterPtr = imagePtr->masterPtr;
+    ImageModel *masterPtr = imagePtr->masterPtr;
     Image *prevPtr;
 
     /*
@@ -956,7 +956,7 @@ Tk_DeleteImage(
 
 static void
 DeleteImage(
-    ImageMaster *masterPtr)	/* Pointer to main data structure for image. */
+    ImageModel *masterPtr)	/* Pointer to main data structure for image. */
 {
     Image *imagePtr;
     Tk_ImageType *typePtr;
@@ -1004,7 +1004,7 @@ DeleteImage(
 
 static void
 EventuallyDeleteImage(
-    ImageMaster *masterPtr,	/* Pointer to main data structure for image. */
+    ImageModel *masterPtr,	/* Pointer to main data structure for image. */
     int forgetImageHashNow)	/* Flag to say whether the hash table is about
 				 * to vanish. */
 {
@@ -1053,7 +1053,7 @@ TkDeleteAllImages(
 /*
  *----------------------------------------------------------------------
  *
- * Tk_GetImageMasterData --
+ * Tk_GetImageModelData --
  *
  *	Given the name of an image, this function returns the type of the
  *	image and the clientData associated with its master.
@@ -1071,7 +1071,7 @@ TkDeleteAllImages(
  */
 
 ClientData
-Tk_GetImageMasterData(
+Tk_GetImageModelData(
     Tcl_Interp *interp,		/* Interpreter in which the image was
 				 * created. */
     const char *name,		/* Name of image. */
@@ -1081,7 +1081,7 @@ Tk_GetImageMasterData(
 {
     TkWindow *winPtr = (TkWindow *) Tk_MainWindow(interp);
     Tcl_HashEntry *hPtr;
-    ImageMaster *masterPtr;
+    ImageModel *masterPtr;
 
     hPtr = Tcl_FindHashEntry(&winPtr->mainPtr->imageTable, name);
     if (hPtr == NULL) {
diff --git a/generic/tkImgBmap.c b/generic/tkImgBmap.c
index f4ee407..a5c21bb 100644
--- a/generic/tkImgBmap.c
+++ b/generic/tkImgBmap.c
@@ -18,8 +18,8 @@
  * image:
  */
 
-typedef struct BitmapMaster {
-    Tk_ImageMaster tkMaster;	/* Tk's token for image master. NULL means the
+typedef struct BitmapModel {
+    Tk_ImageModel tkModel;	/* Tk's token for image model. NULL means the
 				 * image is being deleted. */
     Tcl_Interp *interp;		/* Interpreter for application that is using
 				 * image. */
@@ -41,7 +41,7 @@ typedef struct BitmapMaster {
     struct BitmapInstance *instancePtr;
 				/* First in list of all instances associated
 				 * with this master. */
-} BitmapMaster;
+} BitmapModel;
 
 /*
  * The following data structure represents all of the instances of an image
@@ -51,7 +51,7 @@ typedef struct BitmapMaster {
 typedef struct BitmapInstance {
     int refCount;		/* Number of instances that share this data
 				 * structure. */
-    BitmapMaster *masterPtr;	/* Pointer to master for image. */
+    BitmapModel *modelPtr;	/* Pointer to master for image. */
     Tk_Window tkwin;		/* Window in which the instances will be
 				 * displayed. */
     XColor *fg;			/* Foreground color for displaying image. */
@@ -65,7 +65,7 @@ typedef struct BitmapInstance {
 				 * displayed. */
     struct BitmapInstance *nextPtr;
 				/* Next in list of all instance structures
-				 * associated with masterPtr (NULL means end
+				 * associated with modelPtr (NULL means end
 				 * of list). */
 } BitmapInstance;
 
@@ -76,7 +76,7 @@ typedef struct BitmapInstance {
 static int		GetByte(Tcl_Channel chan);
 static int		ImgBmapCreate(Tcl_Interp *interp,
 			    const char *name, int argc, Tcl_Obj *const objv[],
-			    const Tk_ImageType *typePtr, Tk_ImageMaster master,
+			    const Tk_ImageType *typePtr, Tk_ImageModel model,
 			    ClientData *clientDataPtr);
 static ClientData	ImgBmapGet(Tk_Window tkwin, ClientData clientData);
 static void		ImgBmapDisplay(ClientData clientData,
@@ -108,17 +108,17 @@ Tk_ImageType tkBitmapImageType = {
 
 static const Tk_ConfigSpec configSpecs[] = {
     {TK_CONFIG_UID, "-background", NULL, NULL,
-	"", Tk_Offset(BitmapMaster, bgUid), 0, NULL},
+	"", Tk_Offset(BitmapModel, bgUid), 0, NULL},
     {TK_CONFIG_STRING, "-data", NULL, NULL,
-	NULL, Tk_Offset(BitmapMaster, dataString), TK_CONFIG_NULL_OK, NULL},
+	NULL, Tk_Offset(BitmapModel, dataString), TK_CONFIG_NULL_OK, NULL},
     {TK_CONFIG_STRING, "-file", NULL, NULL,
-	NULL, Tk_Offset(BitmapMaster, fileString), TK_CONFIG_NULL_OK, NULL},
+	NULL, Tk_Offset(BitmapModel, fileString), TK_CONFIG_NULL_OK, NULL},
     {TK_CONFIG_UID, "-foreground", NULL, NULL,
-	"#000000", Tk_Offset(BitmapMaster, fgUid), 0, NULL},
+	"#000000", Tk_Offset(BitmapModel, fgUid), 0, NULL},
     {TK_CONFIG_STRING, "-maskdata", NULL, NULL,
-	NULL, Tk_Offset(BitmapMaster, maskDataString), TK_CONFIG_NULL_OK, NULL},
+	NULL, Tk_Offset(BitmapModel, maskDataString), TK_CONFIG_NULL_OK, NULL},
     {TK_CONFIG_STRING, "-maskfile", NULL, NULL,
-	NULL, Tk_Offset(BitmapMaster, maskFileString), TK_CONFIG_NULL_OK, NULL},
+	NULL, Tk_Offset(BitmapModel, maskFileString), TK_CONFIG_NULL_OK, NULL},
     {TK_CONFIG_END, NULL, NULL, NULL, NULL, 0, 0, NULL}
 };
 
@@ -149,7 +149,7 @@ static int		ImgBmapCmd(ClientData clientData, Tcl_Interp *interp,
 			    int argc, Tcl_Obj *const objv[]);
 static void		ImgBmapCmdDeletedProc(ClientData clientData);
 static void		ImgBmapConfigureInstance(BitmapInstance *instancePtr);
-static int		ImgBmapConfigureMaster(BitmapMaster *masterPtr,
+static int		ImgBmapConfigureMaster(BitmapModel *modelPtr,
 			    int argc, Tcl_Obj *const objv[], int flags);
 static int		NextBitmapWord(ParseInfo *parseInfoPtr);
 
@@ -179,32 +179,32 @@ ImgBmapCreate(
     Tcl_Obj *const argv[],	/* Argument objects for options (doesn't
 				 * include image name or type). */
     const Tk_ImageType *typePtr,/* Pointer to our type record (not used). */
-    Tk_ImageMaster master,	/* Token for image, to be used by us in later
+	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. */
 {
-    BitmapMaster *masterPtr = ckalloc(sizeof(BitmapMaster));
-
-    masterPtr->tkMaster = master;
-    masterPtr->interp = interp;
-    masterPtr->imageCmd = Tcl_CreateObjCommand(interp, name, ImgBmapCmd,
-	    masterPtr, ImgBmapCmdDeletedProc);
-    masterPtr->width = masterPtr->height = 0;
-    masterPtr->data = NULL;
-    masterPtr->maskData = NULL;
-    masterPtr->fgUid = NULL;
-    masterPtr->bgUid = NULL;
-    masterPtr->fileString = NULL;
-    masterPtr->dataString = NULL;
-    masterPtr->maskFileString = NULL;
-    masterPtr->maskDataString = NULL;
-    masterPtr->instancePtr = NULL;
-    if (ImgBmapConfigureMaster(masterPtr, argc, argv, 0) != TCL_OK) {
-	ImgBmapDelete(masterPtr);
+    BitmapModel *modelPtr = ckalloc(sizeof(BitmapModel));
+
+    modelPtr->tkModel = model;
+    modelPtr->interp = interp;
+    modelPtr->imageCmd = Tcl_CreateObjCommand(interp, name, ImgBmapCmd,
+	    modelPtr, ImgBmapCmdDeletedProc);
+    modelPtr->width = modelPtr->height = 0;
+    modelPtr->data = NULL;
+    modelPtr->maskData = NULL;
+    modelPtr->fgUid = NULL;
+    modelPtr->bgUid = NULL;
+    modelPtr->fileString = NULL;
+    modelPtr->dataString = NULL;
+    modelPtr->maskFileString = NULL;
+    modelPtr->maskDataString = NULL;
+    modelPtr->instancePtr = NULL;
+    if (ImgBmapConfigureMaster(modelPtr, argc, argv, 0) != TCL_OK) {
+	ImgBmapDelete(modelPtr);
 	return TCL_ERROR;
     }
-    *clientDataPtr = masterPtr;
+    *clientDataPtr = modelPtr;
     return TCL_OK;
 }
 
@@ -219,7 +219,7 @@ ImgBmapCreate(
  *
  * Results:
  *	A standard Tcl return value. If TCL_ERROR is returned then an error
- *	message is left in the masterPtr->interp's result.
+ *	message is left in the modelPtr->interp's result.
  *
  * Side effects:
  *	Existing instances of the image will be redisplayed to match the new
@@ -230,7 +230,7 @@ ImgBmapCreate(
 
 static int
 ImgBmapConfigureMaster(
-    BitmapMaster *masterPtr,	/* Pointer to data structure describing
+    BitmapModel *modelPtr,	/* Pointer to data structure describing
 				 * overall bitmap image to (reconfigure). */
     int objc,			/* Number of entries in objv. */
     Tcl_Obj *const objv[],	/* Pairs of configuration options for image. */
@@ -246,8 +246,8 @@ ImgBmapConfigureMaster(
     }
     argv[objc] = NULL;
 
-    if (Tk_ConfigureWidget(masterPtr->interp, Tk_MainWindow(masterPtr->interp),
-	    configSpecs, objc, argv, (char *) masterPtr, flags) != TCL_OK) {
+    if (Tk_ConfigureWidget(modelPtr->interp, Tk_MainWindow(modelPtr->interp),
+	    configSpecs, objc, argv, (char *) modelPtr, flags) != TCL_OK) {
 	ckfree(argv);
 	return TCL_ERROR;
     }
@@ -258,44 +258,44 @@ ImgBmapConfigureMaster(
      * bitmap and mask have the same dimensions.
      */
 
-    if (masterPtr->data != NULL) {
-	ckfree(masterPtr->data);
-	masterPtr->data = NULL;
+    if (modelPtr->data != NULL) {
+	ckfree(modelPtr->data);
+	modelPtr->data = NULL;
     }
-    if ((masterPtr->fileString != NULL) || (masterPtr->dataString != NULL)) {
-	masterPtr->data = TkGetBitmapData(masterPtr->interp,
-		masterPtr->dataString, masterPtr->fileString,
-		&masterPtr->width, &masterPtr->height, &dummy1, &dummy2);
-	if (masterPtr->data == NULL) {
+    if ((modelPtr->fileString != NULL) || (modelPtr->dataString != NULL)) {
+	modelPtr->data = TkGetBitmapData(modelPtr->interp,
+		modelPtr->dataString, modelPtr->fileString,
+		&modelPtr->width, &modelPtr->height, &dummy1, &dummy2);
+	if (modelPtr->data == NULL) {
 	    return TCL_ERROR;
 	}
     }
-    if (masterPtr->maskData != NULL) {
-	ckfree(masterPtr->maskData);
-	masterPtr->maskData = NULL;
+    if (modelPtr->maskData != NULL) {
+	ckfree(modelPtr->maskData);
+	modelPtr->maskData = NULL;
     }
-    if ((masterPtr->maskFileString != NULL)
-	    || (masterPtr->maskDataString != NULL)) {
-	if (masterPtr->data == NULL) {
-	    Tcl_SetObjResult(masterPtr->interp, Tcl_NewStringObj(
+    if ((modelPtr->maskFileString != NULL)
+	    || (modelPtr->maskDataString != NULL)) {
+	if (modelPtr->data == NULL) {
+	    Tcl_SetObjResult(modelPtr->interp, Tcl_NewStringObj(
 		    "can't have mask without bitmap", -1));
-	    Tcl_SetErrorCode(masterPtr->interp, "TK", "IMAGE", "BITMAP",
+	    Tcl_SetErrorCode(modelPtr->interp, "TK", "IMAGE", "BITMAP",
 		    "NO_BITMAP", NULL);
 	    return TCL_ERROR;
 	}
-	masterPtr->maskData = TkGetBitmapData(masterPtr->interp,
-		masterPtr->maskDataString, masterPtr->maskFileString,
+	modelPtr->maskData = TkGetBitmapData(modelPtr->interp,
+		modelPtr->maskDataString, modelPtr->maskFileString,
 		&maskWidth, &maskHeight, &dummy1, &dummy2);
-	if (masterPtr->maskData == NULL) {
+	if (modelPtr->maskData == NULL) {
 	    return TCL_ERROR;
 	}
-	if ((maskWidth != masterPtr->width)
-		|| (maskHeight != masterPtr->height)) {
-	    ckfree(masterPtr->maskData);
-	    masterPtr->maskData = NULL;
-	    Tcl_SetObjResult(masterPtr->interp, Tcl_NewStringObj(
+	if ((maskWidth != modelPtr->width)
+		|| (maskHeight != modelPtr->height)) {
+	    ckfree(modelPtr->maskData);
+	    modelPtr->maskData = NULL;
+	    Tcl_SetObjResult(modelPtr->interp, Tcl_NewStringObj(
 		    "bitmap and mask have different sizes", -1));
-	    Tcl_SetErrorCode(masterPtr->interp, "TK", "IMAGE", "BITMAP",
+	    Tcl_SetErrorCode(modelPtr->interp, "TK", "IMAGE", "BITMAP",
 		    "MASK_SIZE", NULL);
 	    return TCL_ERROR;
 	}
@@ -307,12 +307,12 @@ ImgBmapConfigureMaster(
      * everywhere that it is used.
      */
 
-    for (instancePtr = masterPtr->instancePtr; instancePtr != NULL;
+    for (instancePtr = modelPtr->instancePtr; instancePtr != NULL;
 	    instancePtr = instancePtr->nextPtr) {
 	ImgBmapConfigureInstance(instancePtr);
     }
-    Tk_ImageChanged(masterPtr->tkMaster, 0, 0, masterPtr->width,
-	    masterPtr->height, masterPtr->width, masterPtr->height);
+    Tk_ImageChanged(modelPtr->tkModel, 0, 0, modelPtr->width,
+	    modelPtr->height, modelPtr->width, modelPtr->height);
     return TCL_OK;
 }
 
@@ -340,7 +340,7 @@ static void
 ImgBmapConfigureInstance(
     BitmapInstance *instancePtr)/* Instance to reconfigure. */
 {
-    BitmapMaster *masterPtr = instancePtr->masterPtr;
+    BitmapModel *modelPtr = instancePtr->modelPtr;
     XColor *colorPtr;
     XGCValues gcValues;
     GC gc;
@@ -348,13 +348,13 @@ ImgBmapConfigureInstance(
     Pixmap oldBitmap, oldMask;
 
     /*
-     * For each of the options in masterPtr, translate the string form into an
+     * For each of the options in modelPtr, translate the string form into an
      * internal form appropriate for instancePtr.
      */
 
-    if (*masterPtr->bgUid != 0) {
-	colorPtr = Tk_GetColor(masterPtr->interp, instancePtr->tkwin,
-		masterPtr->bgUid);
+    if (*modelPtr->bgUid != 0) {
+	colorPtr = Tk_GetColor(modelPtr->interp, instancePtr->tkwin,
+		modelPtr->bgUid);
 	if (colorPtr == NULL) {
 	    goto error;
 	}
@@ -366,8 +366,8 @@ ImgBmapConfigureInstance(
     }
     instancePtr->bg = colorPtr;
 
-    colorPtr = Tk_GetColor(masterPtr->interp, instancePtr->tkwin,
-	    masterPtr->fgUid);
+    colorPtr = Tk_GetColor(modelPtr->interp, instancePtr->tkwin,
+	    modelPtr->fgUid);
     if (colorPtr == NULL) {
 	goto error;
     }
@@ -388,19 +388,19 @@ ImgBmapConfigureInstance(
     oldMask = instancePtr->mask;
     instancePtr->mask = None;
 
-    if (masterPtr->data != NULL) {
+    if (modelPtr->data != NULL) {
 	instancePtr->bitmap = XCreateBitmapFromData(
 		Tk_Display(instancePtr->tkwin),
 		RootWindowOfScreen(Tk_Screen(instancePtr->tkwin)),
-		masterPtr->data, (unsigned) masterPtr->width,
-		(unsigned) masterPtr->height);
+		modelPtr->data, (unsigned) modelPtr->width,
+		(unsigned) modelPtr->height);
     }
-    if (masterPtr->maskData != NULL) {
+    if (modelPtr->maskData != NULL) {
 	instancePtr->mask = XCreateBitmapFromData(
 		Tk_Display(instancePtr->tkwin),
 		RootWindowOfScreen(Tk_Screen(instancePtr->tkwin)),
-		masterPtr->maskData, (unsigned) masterPtr->width,
-		(unsigned) masterPtr->height);
+		modelPtr->maskData, (unsigned) modelPtr->width,
+		(unsigned) modelPtr->height);
     }
 
     if (oldMask != None) {
@@ -410,7 +410,7 @@ ImgBmapConfigureInstance(
 	Tk_FreePixmap(Tk_Display(instancePtr->tkwin), oldBitmap);
     }
 
-    if (masterPtr->data != NULL) {
+    if (modelPtr->data != NULL) {
 	gcValues.foreground = instancePtr->fg->pixel;
 	gcValues.graphics_exposures = False;
 	mask = GCForeground|GCGraphicsExposures;
@@ -445,10 +445,10 @@ ImgBmapConfigureInstance(
 	Tk_FreeGC(Tk_Display(instancePtr->tkwin), instancePtr->gc);
     }
     instancePtr->gc = NULL;
-    Tcl_AppendObjToErrorInfo(masterPtr->interp, Tcl_ObjPrintf(
+    Tcl_AppendObjToErrorInfo(modelPtr->interp, Tcl_ObjPrintf(
 	    "\n    (while configuring image \"%s\")", Tk_NameOfImage(
-	    masterPtr->tkMaster)));
-    Tcl_BackgroundException(masterPtr->interp, TCL_ERROR);
+	    modelPtr->tkModel)));
+    Tcl_BackgroundException(modelPtr->interp, TCL_ERROR);
 }
 
 /*
@@ -757,7 +757,7 @@ ImgBmapCmd(
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     static const char *const bmapOptions[] = {"cget", "configure", NULL};
-    BitmapMaster *masterPtr = clientData;
+    BitmapModel *modelPtr = clientData;
     int index;
 
     if (objc < 2) {
@@ -775,17 +775,17 @@ ImgBmapCmd(
 	    return TCL_ERROR;
 	}
 	return Tk_ConfigureValue(interp, Tk_MainWindow(interp), configSpecs,
-		(char *) masterPtr, Tcl_GetString(objv[2]), 0);
+		(char *) modelPtr, Tcl_GetString(objv[2]), 0);
     case 1: /* configure */
 	if (objc == 2) {
 	    return Tk_ConfigureInfo(interp, Tk_MainWindow(interp),
-		    configSpecs, (char *) masterPtr, NULL, 0);
+		    configSpecs, (char *) modelPtr, NULL, 0);
 	} else if (objc == 3) {
 	    return Tk_ConfigureInfo(interp, Tk_MainWindow(interp),
-		    configSpecs, (char *) masterPtr,
+		    configSpecs, (char *) modelPtr,
 		    Tcl_GetString(objv[2]), 0);
 	} else {
-	    return ImgBmapConfigureMaster(masterPtr, objc-2, objv+2,
+	    return ImgBmapConfigureMaster(modelPtr, objc-2, objv+2,
 		    TK_CONFIG_ARGV_ONLY);
 	}
     default:
@@ -819,7 +819,7 @@ ImgBmapGet(
     ClientData masterData)	/* Pointer to our master structure for the
 				 * image. */
 {
-    BitmapMaster *masterPtr = masterData;
+    BitmapModel *modelPtr = masterData;
     BitmapInstance *instancePtr;
 
     /*
@@ -827,7 +827,7 @@ ImgBmapGet(
      * re-use it.
      */
 
-    for (instancePtr = masterPtr->instancePtr; instancePtr != NULL;
+    for (instancePtr = modelPtr->instancePtr; instancePtr != NULL;
 	    instancePtr = instancePtr->nextPtr) {
 	if (instancePtr->tkwin == tkwin) {
 	    instancePtr->refCount++;
@@ -842,15 +842,15 @@ ImgBmapGet(
 
     instancePtr = ckalloc(sizeof(BitmapInstance));
     instancePtr->refCount = 1;
-    instancePtr->masterPtr = masterPtr;
+    instancePtr->modelPtr = modelPtr;
     instancePtr->tkwin = tkwin;
     instancePtr->fg = NULL;
     instancePtr->bg = NULL;
     instancePtr->bitmap = None;
     instancePtr->mask = None;
     instancePtr->gc = NULL;
-    instancePtr->nextPtr = masterPtr->instancePtr;
-    masterPtr->instancePtr = instancePtr;
+    instancePtr->nextPtr = modelPtr->instancePtr;
+    modelPtr->instancePtr = instancePtr;
     ImgBmapConfigureInstance(instancePtr);
 
     /*
@@ -858,8 +858,8 @@ ImgBmapGet(
      */
 
     if (instancePtr->nextPtr == NULL) {
-	Tk_ImageChanged(masterPtr->tkMaster, 0, 0, 0, 0, masterPtr->width,
-		masterPtr->height);
+	Tk_ImageChanged(modelPtr->tkModel, 0, 0, 0, 0, modelPtr->width,
+		modelPtr->height);
     }
 
     return instancePtr;
@@ -976,10 +976,10 @@ ImgBmapFree(
     if (instancePtr->gc != NULL) {
 	Tk_FreeGC(display, instancePtr->gc);
     }
-    if (instancePtr->masterPtr->instancePtr == instancePtr) {
-	instancePtr->masterPtr->instancePtr = instancePtr->nextPtr;
+    if (instancePtr->modelPtr->instancePtr == instancePtr) {
+	instancePtr->modelPtr->instancePtr = instancePtr->nextPtr;
     } else {
-	for (prevPtr = instancePtr->masterPtr->instancePtr;
+	for (prevPtr = instancePtr->modelPtr->instancePtr;
 		prevPtr->nextPtr != instancePtr; prevPtr = prevPtr->nextPtr) {
 	    /* Empty loop body */
 	}
@@ -1007,26 +1007,26 @@ ImgBmapFree(
 
 static void
 ImgBmapDelete(
-    ClientData masterData)	/* Pointer to BitmapMaster structure for
+    ClientData masterData)	/* Pointer to BitmapModel structure for
 				 * image. Must not have any more instances. */
 {
-    BitmapMaster *masterPtr = masterData;
+    BitmapModel *modelPtr = masterData;
 
-    if (masterPtr->instancePtr != NULL) {
+    if (modelPtr->instancePtr != NULL) {
 	Tcl_Panic("tried to delete bitmap image when instances still exist");
     }
-    masterPtr->tkMaster = NULL;
-    if (masterPtr->imageCmd != NULL) {
-	Tcl_DeleteCommandFromToken(masterPtr->interp, masterPtr->imageCmd);
+    modelPtr->tkModel = NULL;
+    if (modelPtr->imageCmd != NULL) {
+	Tcl_DeleteCommandFromToken(modelPtr->interp, modelPtr->imageCmd);
     }
-    if (masterPtr->data != NULL) {
-	ckfree(masterPtr->data);
+    if (modelPtr->data != NULL) {
+	ckfree(modelPtr->data);
     }
-    if (masterPtr->maskData != NULL) {
-	ckfree(masterPtr->maskData);
+    if (modelPtr->maskData != NULL) {
+	ckfree(modelPtr->maskData);
     }
-    Tk_FreeOptions(configSpecs, (char *) masterPtr, NULL, 0);
-    ckfree(masterPtr);
+    Tk_FreeOptions(configSpecs, (char *) modelPtr, NULL, 0);
+    ckfree(modelPtr);
 }
 
 /*
@@ -1048,14 +1048,14 @@ ImgBmapDelete(
 
 static void
 ImgBmapCmdDeletedProc(
-    ClientData clientData)	/* Pointer to BitmapMaster structure for
+    ClientData clientData)	/* Pointer to BitmapModel structure for
 				 * image. */
 {
-    BitmapMaster *masterPtr = clientData;
+    BitmapModel *modelPtr = clientData;
 
-    masterPtr->imageCmd = NULL;
-    if (masterPtr->tkMaster != NULL) {
-	Tk_DeleteImage(masterPtr->interp, Tk_NameOfImage(masterPtr->tkMaster));
+    modelPtr->imageCmd = NULL;
+    if (modelPtr->tkModel != NULL) {
+	Tk_DeleteImage(modelPtr->interp, Tk_NameOfImage(modelPtr->tkModel));
     }
 }
 
@@ -1198,7 +1198,7 @@ ImgBmapPostscript(
     int x, int y, int width, int height,
     int prepass)
 {
-    BitmapMaster *masterPtr = clientData;
+    BitmapModel *modelPtr = clientData;
     Tcl_InterpState interpState;
     Tcl_Obj *psObj;
 
@@ -1210,7 +1210,7 @@ ImgBmapPostscript(
      * There is nothing to do for bitmaps with zero width or height.
      */
 
-    if (width<=0 || height<=0 || masterPtr->width<=0 || masterPtr->height<=0){
+    if (width<=0 || height<=0 || modelPtr->width<=0 || modelPtr->height<=0){
 	return TCL_OK;
     }
 
@@ -1220,7 +1220,7 @@ ImgBmapPostscript(
      * we bail out.
      */
 
-    if (masterPtr->width*masterPtr->height > 60000) {
+    if (modelPtr->width*modelPtr->height > 60000) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		"unable to generate postscript for bitmaps larger than 60000"
 		" pixels", -1));
@@ -1259,10 +1259,10 @@ ImgBmapPostscript(
      * color to the bits specified by the mask.
      */
 
-    if ((masterPtr->bgUid != NULL) && (masterPtr->bgUid[0] != '\000')) {
+    if ((modelPtr->bgUid != NULL) && (modelPtr->bgUid[0] != '\000')) {
 	XColor color;
 
-	TkParseColor(Tk_Display(tkwin), Tk_Colormap(tkwin), masterPtr->bgUid,
+	TkParseColor(Tk_Display(tkwin), Tk_Colormap(tkwin), modelPtr->bgUid,
 		&color);
 	Tcl_ResetResult(interp);
 	if (Tk_PostscriptColor(interp, psinfo, &color) != TCL_OK) {
@@ -1270,13 +1270,13 @@ ImgBmapPostscript(
 	}
 	Tcl_AppendObjToObj(psObj, Tcl_GetObjResult(interp));
 
-	if (masterPtr->maskData == NULL) {
+	if (modelPtr->maskData == NULL) {
 	    Tcl_AppendToObj(psObj,
 		    "0 0 moveto 1 0 rlineto 0 1 rlineto -1 0 rlineto "
 		    "closepath fill\n", -1);
 	} else {
-	    ImgBmapPsImagemask(psObj, masterPtr->width, masterPtr->height,
-		    masterPtr->maskData);
+	    ImgBmapPsImagemask(psObj, modelPtr->width, modelPtr->height,
+		    modelPtr->maskData);
 	}
     }
 
@@ -1284,10 +1284,10 @@ ImgBmapPostscript(
      * Draw the bitmap foreground, assuming there is one.
      */
 
-    if ((masterPtr->fgUid != NULL) && (masterPtr->data != NULL)) {
+    if ((modelPtr->fgUid != NULL) && (modelPtr->data != NULL)) {
 	XColor color;
 
-	TkParseColor(Tk_Display(tkwin), Tk_Colormap(tkwin), masterPtr->fgUid,
+	TkParseColor(Tk_Display(tkwin), Tk_Colormap(tkwin), modelPtr->fgUid,
 		&color);
 	Tcl_ResetResult(interp);
 	if (Tk_PostscriptColor(interp, psinfo, &color) != TCL_OK) {
@@ -1295,8 +1295,8 @@ ImgBmapPostscript(
 	}
 	Tcl_AppendObjToObj(psObj, Tcl_GetObjResult(interp));
 
-	ImgBmapPsImagemask(psObj, masterPtr->width, masterPtr->height,
-		masterPtr->data);
+	ImgBmapPsImagemask(psObj, modelPtr->width, modelPtr->height,
+		modelPtr->data);
     }
 
     /*
diff --git a/generic/tkImgPhInstance.c b/generic/tkImgPhInstance.c
index 32b09be..a8e5b5e 100644
--- a/generic/tkImgPhInstance.c
+++ b/generic/tkImgPhInstance.c
@@ -77,7 +77,7 @@ void
 TkImgPhotoConfigureInstance(
     PhotoInstance *instancePtr)	/* Instance to reconfigure. */
 {
-    PhotoMaster *masterPtr = instancePtr->masterPtr;
+    PhotoModel *masterPtr = instancePtr->masterPtr;
     XImage *imagePtr;
     int bitsPerPixel;
     ColorTable *colorTablePtr;
@@ -210,7 +210,7 @@ TkImgPhotoGet(
     ClientData masterData)	/* Pointer to our master structure for the
 				 * image. */
 {
-    PhotoMaster *masterPtr = masterData;
+    PhotoModel *masterPtr = masterData;
     PhotoInstance *instancePtr;
     Colormap colormap;
     int mono, nRed, nGreen, nBlue, numVisuals;
@@ -768,7 +768,7 @@ void
 TkImgPhotoInstanceSetSize(
     PhotoInstance *instancePtr)	/* Instance whose size is to be changed. */
 {
-    PhotoMaster *masterPtr;
+    PhotoModel *masterPtr;
     schar *newError, *errSrcPtr, *errDestPtr;
     int h, offset;
     XRectangle validBox;
@@ -1635,7 +1635,7 @@ TkImgDitherInstance(
 				 * block to be dithered. */
     int width, int height)	/* Dimensions of the block to be dithered. */
 {
-    PhotoMaster *masterPtr = instancePtr->masterPtr;
+    PhotoModel *masterPtr = instancePtr->masterPtr;
     ColorTable *colorPtr = instancePtr->colorTablePtr;
     XImage *imagePtr;
     int nLines, bigEndian, i, c, x, y, xEnd, doDithering = 1;
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c
index 26b0446..395fc9d 100644
--- a/generic/tkImgPhoto.c
+++ b/generic/tkImgPhoto.c
@@ -101,7 +101,7 @@ static const char *const optionNames[] = {
 
 static int		ImgPhotoCreate(Tcl_Interp *interp, const char *name,
 			    int objc, Tcl_Obj *const objv[],
-			    const Tk_ImageType *typePtr, Tk_ImageMaster master,
+			    const Tk_ImageType *typePtr, Tk_ImageModel model,
 			    ClientData *clientDataPtr);
 static void		ImgPhotoDelete(ClientData clientData);
 static int		ImgPhotoPostscript(ClientData clientData,
@@ -152,15 +152,15 @@ static Tcl_ThreadDataKey dataKey;
 
 static const Tk_ConfigSpec configSpecs[] = {
     {TK_CONFIG_STRING, "-file", NULL, NULL,
-	 NULL, Tk_Offset(PhotoMaster, fileString), TK_CONFIG_NULL_OK, NULL},
+	 NULL, Tk_Offset(PhotoModel, fileString), TK_CONFIG_NULL_OK, NULL},
     {TK_CONFIG_DOUBLE, "-gamma", NULL, NULL,
-	 DEF_PHOTO_GAMMA, Tk_Offset(PhotoMaster, gamma), 0, NULL},
+	 DEF_PHOTO_GAMMA, Tk_Offset(PhotoModel, gamma), 0, NULL},
     {TK_CONFIG_INT, "-height", NULL, NULL,
-	 DEF_PHOTO_HEIGHT, Tk_Offset(PhotoMaster, userHeight), 0, NULL},
+	 DEF_PHOTO_HEIGHT, Tk_Offset(PhotoModel, userHeight), 0, NULL},
     {TK_CONFIG_UID, "-palette", NULL, NULL,
-	 DEF_PHOTO_PALETTE, Tk_Offset(PhotoMaster, palette), 0, NULL},
+	 DEF_PHOTO_PALETTE, Tk_Offset(PhotoModel, palette), 0, NULL},
     {TK_CONFIG_INT, "-width", NULL, NULL,
-	 DEF_PHOTO_WIDTH, Tk_Offset(PhotoMaster, userWidth), 0, NULL},
+	 DEF_PHOTO_WIDTH, Tk_Offset(PhotoModel, userWidth), 0, NULL},
     {TK_CONFIG_END, NULL, NULL, NULL, NULL, 0, 0, NULL}
 };
 
@@ -177,15 +177,15 @@ static int		ParseSubcommandOptions(
 			    int *indexPtr, int objc, Tcl_Obj *const objv[]);
 static void		ImgPhotoCmdDeletedProc(ClientData clientData);
 static int		ImgPhotoConfigureMaster(Tcl_Interp *interp,
-			    PhotoMaster *masterPtr, int objc,
+			    PhotoModel *modelPtr, int objc,
 			    Tcl_Obj *const objv[], int flags);
-static int		ToggleComplexAlphaIfNeeded(PhotoMaster *mPtr);
-static int		ImgPhotoSetSize(PhotoMaster *masterPtr, int width,
+static int		ToggleComplexAlphaIfNeeded(PhotoModel *mPtr);
+static int		ImgPhotoSetSize(PhotoModel *modelPtr, int width,
 			    int height);
 static int		ImgStringWrite(Tcl_Interp *interp,
 			    Tcl_Obj *formatString,
 			    Tk_PhotoImageBlock *blockPtr);
-static char *		ImgGetPhoto(PhotoMaster *masterPtr,
+static char *		ImgGetPhoto(PhotoModel *modelPtr,
 			    Tk_PhotoImageBlock *blockPtr,
 			    struct SubcommandOptions *optPtr);
 static int		MatchFileFormat(Tcl_Interp *interp, Tcl_Channel chan,
@@ -331,38 +331,38 @@ ImgPhotoCreate(
     Tcl_Obj *const objv[],	/* Argument objects for options (doesn't
 				 * include image name or type). */
     const Tk_ImageType *typePtr,/* Pointer to our type record (not used). */
-    Tk_ImageMaster master,	/* Token for image, to be used by us in later
+	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. */
 {
-    PhotoMaster *masterPtr;
+    PhotoModel *modelPtr;
 
     /*
      * Allocate and initialize the photo image master record.
      */
 
-    masterPtr = ckalloc(sizeof(PhotoMaster));
-    memset(masterPtr, 0, sizeof(PhotoMaster));
-    masterPtr->tkMaster = master;
-    masterPtr->interp = interp;
-    masterPtr->imageCmd = Tcl_CreateObjCommand(interp, name, ImgPhotoCmd,
-	    masterPtr, ImgPhotoCmdDeletedProc);
-    masterPtr->palette = NULL;
-    masterPtr->pix32 = NULL;
-    masterPtr->instancePtr = NULL;
-    masterPtr->validRegion = TkCreateRegion();
+    modelPtr = ckalloc(sizeof(PhotoModel));
+    memset(modelPtr, 0, sizeof(PhotoModel));
+    modelPtr->tkMaster = model;
+    modelPtr->interp = interp;
+    modelPtr->imageCmd = Tcl_CreateObjCommand(interp, name, ImgPhotoCmd,
+	    modelPtr, ImgPhotoCmdDeletedProc);
+    modelPtr->palette = NULL;
+    modelPtr->pix32 = NULL;
+    modelPtr->instancePtr = NULL;
+    modelPtr->validRegion = TkCreateRegion();
 
     /*
      * Process configuration options given in the image create command.
      */
 
-    if (ImgPhotoConfigureMaster(interp, masterPtr, objc, objv, 0) != TCL_OK) {
-	ImgPhotoDelete(masterPtr);
+    if (ImgPhotoConfigureMaster(interp, modelPtr, objc, objv, 0) != TCL_OK) {
+	ImgPhotoDelete(modelPtr);
 	return TCL_ERROR;
     }
 
-    *clientDataPtr = masterPtr;
+    *clientDataPtr = modelPtr;
     return TCL_OK;
 }
 
@@ -401,7 +401,7 @@ ImgPhotoCmd(
 	PHOTO_WRITE
     };
 
-    PhotoMaster *masterPtr = clientData;
+    PhotoModel *modelPtr = clientData;
     int result, index, x, y, width, height, dataWidth, dataHeight, listObjc;
     struct SubcommandOptions options;
     Tcl_Obj **listObjv, **srcObjv;
@@ -433,7 +433,7 @@ ImgPhotoCmd(
 	 */
 
 	if (objc == 2) {
-	    Tk_PhotoBlank(masterPtr);
+	    Tk_PhotoBlank(modelPtr);
 	    return TCL_OK;
 	} else {
 	    Tcl_WrongNumArgs(interp, 2, objv, NULL);
@@ -450,16 +450,16 @@ ImgPhotoCmd(
 	arg = Tcl_GetString(objv[2]);
 	length = objv[2]->length;
 	if (strncmp(arg,"-data", length) == 0) {
-	    if (masterPtr->dataString) {
-		Tcl_SetObjResult(interp, masterPtr->dataString);
+	    if (modelPtr->dataString) {
+		Tcl_SetObjResult(interp, modelPtr->dataString);
 	    }
 	} else if (strncmp(arg,"-format", length) == 0) {
-	    if (masterPtr->format) {
-		Tcl_SetObjResult(interp, masterPtr->format);
+	    if (modelPtr->format) {
+		Tcl_SetObjResult(interp, modelPtr->format);
 	    }
 	} else {
 	    Tk_ConfigureValue(interp, Tk_MainWindow(interp), configSpecs,
-		    (char *) masterPtr, Tcl_GetString(objv[2]), 0);
+		    (char *) modelPtr, Tcl_GetString(objv[2]), 0);
 	}
 	return TCL_OK;
     }
@@ -473,21 +473,21 @@ ImgPhotoCmd(
 	    Tcl_Obj *obj, *subobj;
 
 	    result = Tk_ConfigureInfo(interp, Tk_MainWindow(interp),
-		    configSpecs, (char *) masterPtr, NULL, 0);
+		    configSpecs, (char *) modelPtr, NULL, 0);
 	    if (result != TCL_OK) {
 		return result;
 	    }
 	    obj = Tcl_NewObj();
 	    subobj = Tcl_NewStringObj("-data {} {} {}", 14);
-	    if (masterPtr->dataString) {
-		Tcl_ListObjAppendElement(NULL, subobj, masterPtr->dataString);
+	    if (modelPtr->dataString) {
+		Tcl_ListObjAppendElement(NULL, subobj, modelPtr->dataString);
 	    } else {
 		Tcl_AppendStringsToObj(subobj, " {}", NULL);
 	    }
 	    Tcl_ListObjAppendElement(interp, obj, subobj);
 	    subobj = Tcl_NewStringObj("-format {} {} {}", 16);
-	    if (masterPtr->format) {
-		Tcl_ListObjAppendElement(NULL, subobj, masterPtr->format);
+	    if (modelPtr->format) {
+		Tcl_ListObjAppendElement(NULL, subobj, modelPtr->format);
 	    } else {
 		Tcl_AppendStringsToObj(subobj, " {}", NULL);
 	    }
@@ -502,13 +502,13 @@ ImgPhotoCmd(
 	    length = objv[2]->length;
 	    if (length > 1 && !strncmp(arg, "-data", length)) {
 		Tcl_AppendResult(interp, "-data {} {} {}", NULL);
-		if (masterPtr->dataString) {
+		if (modelPtr->dataString) {
 		    /*
 		     * TODO: Modifying result is bad!
 		     */
 
 		    Tcl_ListObjAppendElement(NULL, Tcl_GetObjResult(interp),
-			    masterPtr->dataString);
+			    modelPtr->dataString);
 		} else {
 		    Tcl_AppendResult(interp, " {}", NULL);
 		}
@@ -516,23 +516,23 @@ ImgPhotoCmd(
 	    } else if (length > 1 &&
 		    !strncmp(arg, "-format", length)) {
 		Tcl_AppendResult(interp, "-format {} {} {}", NULL);
-		if (masterPtr->format) {
+		if (modelPtr->format) {
 		    /*
 		     * TODO: Modifying result is bad!
 		     */
 
 		    Tcl_ListObjAppendElement(NULL, Tcl_GetObjResult(interp),
-			    masterPtr->format);
+			    modelPtr->format);
 		} else {
 		    Tcl_AppendResult(interp, " {}", NULL);
 		}
 		return TCL_OK;
 	    } else {
 		return Tk_ConfigureInfo(interp, Tk_MainWindow(interp),
-			configSpecs, (char *) masterPtr, arg, 0);
+			configSpecs, (char *) modelPtr, arg, 0);
 	    }
 	} else {
-	    return ImgPhotoConfigureMaster(interp, masterPtr, objc-2, objv+2,
+	    return ImgPhotoConfigureMaster(interp, modelPtr, objc-2, objv+2,
 		    TK_CONFIG_ARGV_ONLY);
 	}
 
@@ -591,7 +591,7 @@ ImgPhotoCmd(
 	 * has a simple alpha channel.
 	 */
 
-	if (!(((PhotoMaster *) srcHandle)->flags & COMPLEX_ALPHA)) {
+	if (!(((PhotoModel *) srcHandle)->flags & COMPLEX_ALPHA)) {
 	    options.compositingRule |= SOURCE_IS_SIMPLE_ALPHA_PHOTO;
 	}
 
@@ -635,7 +635,7 @@ ImgPhotoCmd(
 		+ options.fromY * block.pitch;
 	block.width = options.fromX2 - options.fromX;
 	block.height = options.fromY2 - options.fromY;
-	result = Tk_PhotoPutZoomedBlock(interp, (Tk_PhotoHandle) masterPtr,
+	result = Tk_PhotoPutZoomedBlock(interp, (Tk_PhotoHandle) modelPtr,
 		&block, options.toX, options.toY, options.toX2 - options.toX,
 		options.toY2 - options.toY, options.zoomX, options.zoomY,
 		options.subsampleX, options.subsampleY,
@@ -649,7 +649,7 @@ ImgPhotoCmd(
 	 */
 
 	if (options.options & OPT_SHRINK) {
-	    if (ImgPhotoSetSize(masterPtr, options.toX2,
+	    if (ImgPhotoSetSize(modelPtr, options.toX2,
 		    options.toY2) != TCL_OK) {
 		if (options.background) {
 		    Tk_FreeColor(options.background);
@@ -660,8 +660,8 @@ ImgPhotoCmd(
 		return TCL_ERROR;
 	    }
 	}
-	Tk_ImageChanged(masterPtr->tkMaster, 0, 0, 0, 0,
-		masterPtr->width, masterPtr->height);
+	Tk_ImageChanged(modelPtr->tkMaster, 0, 0, 0, 0,
+		modelPtr->width, modelPtr->height);
 	if (options.background) {
 	    Tk_FreeColor(options.background);
 	}
@@ -691,10 +691,10 @@ ImgPhotoCmd(
 	    Tcl_WrongNumArgs(interp, 2, objv, "?-option value ...?");
 	    return TCL_ERROR;
 	}
-	if ((options.fromX > masterPtr->width)
-		|| (options.fromY > masterPtr->height)
-		|| (options.fromX2 > masterPtr->width)
-		|| (options.fromY2 > masterPtr->height)) {
+	if ((options.fromX > modelPtr->width)
+		|| (options.fromY > modelPtr->height)
+		|| (options.fromX2 > modelPtr->width)
+		|| (options.fromY2 > modelPtr->height)) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "coordinates for -from option extend outside image", -1));
 	    Tcl_SetErrorCode(interp, "TK", "IMAGE", "PHOTO", "BAD_FROM", NULL);
@@ -706,8 +706,8 @@ ImgPhotoCmd(
 	 */
 
 	if (!(options.options & OPT_FROM) || (options.fromX2 < 0)) {
-	    options.fromX2 = masterPtr->width;
-	    options.fromY2 = masterPtr->height;
+	    options.fromX2 = modelPtr->width;
+	    options.fromY2 = modelPtr->height;
 	}
 
 	/*
@@ -759,7 +759,7 @@ ImgPhotoCmd(
 	 * Call the handler's string write function to write out the image.
 	 */
 
-	data = ImgGetPhoto(masterPtr, &block, &options);
+	data = ImgGetPhoto(modelPtr, &block, &options);
 
 	if (oldformat) {
 	    Tcl_DString buffer;
@@ -807,8 +807,8 @@ ImgPhotoCmd(
 		|| (Tcl_GetIntFromObj(interp, objv[3], &y) != TCL_OK)) {
 	    return TCL_ERROR;
 	}
-	if ((x < 0) || (x >= masterPtr->width)
-		|| (y < 0) || (y >= masterPtr->height)) {
+	if ((x < 0) || (x >= modelPtr->width)
+		|| (y < 0) || (y >= modelPtr->height)) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "%s get: coordinates out of range",
 		    Tcl_GetString(objv[0])));
@@ -821,7 +821,7 @@ ImgPhotoCmd(
 	 * Extract the value of the desired pixel and format it as a string.
 	 */
 
-	pixelPtr = masterPtr->pix32 + (y * masterPtr->width + x) * 4;
+	pixelPtr = modelPtr->pix32 + (y * modelPtr->width + x) * 4;
 	channels[0] = Tcl_NewIntObj(pixelPtr[0]);
 	channels[1] = Tcl_NewIntObj(pixelPtr[1]);
 	channels[2] = Tcl_NewIntObj(pixelPtr[2]);
@@ -870,11 +870,11 @@ ImgPhotoCmd(
 		data = (Tcl_Obj *) Tcl_GetString(data);
 	    }
 	    if (imageFormat->stringReadProc(interp, data, format,
-		    (Tk_PhotoHandle) masterPtr, options.toX, options.toY,
+		    (Tk_PhotoHandle) modelPtr, options.toX, options.toY,
 		    imageWidth, imageHeight, 0, 0) != TCL_OK) {
 		return TCL_ERROR;
 	    }
-	    masterPtr->flags |= IMAGE_CHANGED;
+	    modelPtr->flags |= IMAGE_CHANGED;
 	    return TCL_OK;
 	}
 	if (options.options & OPT_FORMAT) {
@@ -1007,7 +1007,7 @@ ImgPhotoCmd(
 	block.offset[1] = 1;
 	block.offset[2] = 2;
 	block.offset[3] = 0;
-	result = Tk_PhotoPutBlock(interp, masterPtr, &block,
+	result = Tk_PhotoPutBlock(interp, modelPtr, &block,
 		options.toX, options.toY, options.toX2 - options.toX,
 		options.toY2 - options.toY,
 		TK_PHOTO_COMPOSITE_SET);
@@ -1100,7 +1100,7 @@ ImgPhotoCmd(
 	 */
 
 	if (options.options & OPT_SHRINK) {
-	    if (ImgPhotoSetSize(masterPtr, options.toX + width,
+	    if (ImgPhotoSetSize(modelPtr, options.toX + width,
 		    options.toY + height) != TCL_OK) {
 		Tcl_ResetResult(interp);
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
@@ -1122,7 +1122,7 @@ ImgPhotoCmd(
 	}
 	result = imageFormat->fileReadProc(interp, chan,
 		Tcl_GetString(options.name),
-		format, (Tk_PhotoHandle) masterPtr, options.toX,
+		format, (Tk_PhotoHandle) modelPtr, options.toX,
 		options.toY, width, height, options.fromX, options.fromY);
 	if (chan != NULL) {
 	    Tcl_Close(NULL, chan);
@@ -1141,27 +1141,27 @@ ImgPhotoCmd(
 	 * present.
 	 */
 
-	x = masterPtr->ditherX;
-	y = masterPtr->ditherY;
-	if (masterPtr->ditherX != 0) {
-	    Tk_DitherPhoto((Tk_PhotoHandle) masterPtr, x, y,
-		    masterPtr->width - x, 1);
+	x = modelPtr->ditherX;
+	y = modelPtr->ditherY;
+	if (modelPtr->ditherX != 0) {
+	    Tk_DitherPhoto((Tk_PhotoHandle) modelPtr, x, y,
+		    modelPtr->width - x, 1);
 	}
-	if (masterPtr->ditherY < masterPtr->height) {
+	if (modelPtr->ditherY < modelPtr->height) {
 	    x = 0;
-	    Tk_DitherPhoto((Tk_PhotoHandle)masterPtr, 0,
-		    masterPtr->ditherY, masterPtr->width,
-		    masterPtr->height - masterPtr->ditherY);
+	    Tk_DitherPhoto((Tk_PhotoHandle)modelPtr, 0,
+		    modelPtr->ditherY, modelPtr->width,
+		    modelPtr->height - modelPtr->ditherY);
 	}
 
-	if (y < masterPtr->height) {
+	if (y < modelPtr->height) {
 	    /*
 	     * Tell the core image code that part of the image has changed.
 	     */
 
-	    Tk_ImageChanged(masterPtr->tkMaster, x, y,
-		    (masterPtr->width - x), (masterPtr->height - y),
-		    masterPtr->width, masterPtr->height);
+	    Tk_ImageChanged(modelPtr->tkMaster, x, y,
+		    (modelPtr->width - x), (modelPtr->height - y),
+		    modelPtr->width, modelPtr->height);
 	}
 	return TCL_OK;
 
@@ -1195,8 +1195,8 @@ ImgPhotoCmd(
 		    || (Tcl_GetIntFromObj(interp, objv[4], &y) != TCL_OK)) {
 		return TCL_ERROR;
 	    }
-	    if ((x < 0) || (x >= masterPtr->width)
-		    || (y < 0) || (y >= masterPtr->height)) {
+	    if ((x < 0) || (x >= modelPtr->width)
+		    || (y < 0) || (y >= modelPtr->height)) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 			"%s transparency get: coordinates out of range",
 			Tcl_GetString(objv[0])));
@@ -1212,7 +1212,7 @@ ImgPhotoCmd(
 	    /* What a way to do a test! */
 	    testRegion = TkCreateRegion();
 	    TkUnionRectWithRegion(&testBox, testRegion, testRegion);
-	    TkIntersectRegion(testRegion, masterPtr->validRegion, testRegion);
+	    TkIntersectRegion(testRegion, modelPtr->validRegion, testRegion);
 	    TkClipBox(testRegion, &testBox);
 	    TkDestroyRegion(testRegion);
 
@@ -1235,8 +1235,8 @@ ImgPhotoCmd(
 		    &transFlag) != TCL_OK)) {
 		return TCL_ERROR;
 	    }
-	    if ((x < 0) || (x >= masterPtr->width)
-		|| (y < 0) || (y >= masterPtr->height)) {
+	    if ((x < 0) || (x >= modelPtr->width)
+		|| (y < 0) || (y >= modelPtr->height)) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 			"%s transparency set: coordinates out of range",
 			Tcl_GetString(objv[0])));
@@ -1249,7 +1249,7 @@ ImgPhotoCmd(
 	    setBox.y = y;
 	    setBox.width = 1;
 	    setBox.height = 1;
-	    pixelPtr = masterPtr->pix32 + (y * masterPtr->width + x) * 4;
+	    pixelPtr = modelPtr->pix32 + (y * modelPtr->width + x) * 4;
 
 	    if (transFlag) {
 		/*
@@ -1259,8 +1259,8 @@ ImgPhotoCmd(
 		TkRegion clearRegion = TkCreateRegion();
 
 		TkUnionRectWithRegion(&setBox, clearRegion, clearRegion);
-		TkSubtractRegion(masterPtr->validRegion, clearRegion,
-			masterPtr->validRegion);
+		TkSubtractRegion(modelPtr->validRegion, clearRegion,
+			modelPtr->validRegion);
 		TkDestroyRegion(clearRegion);
 
 		/*
@@ -1273,8 +1273,8 @@ ImgPhotoCmd(
 		 * Make pixel opaque.
 		 */
 
-		TkUnionRectWithRegion(&setBox, masterPtr->validRegion,
-			masterPtr->validRegion);
+		TkUnionRectWithRegion(&setBox, modelPtr->validRegion,
+			modelPtr->validRegion);
 		pixelPtr[3] = 255;
 	    }
 
@@ -1283,9 +1283,9 @@ ImgPhotoCmd(
 	     * has (potentially) changed.
 	     */
 
-	    Tk_ImageChanged(masterPtr->tkMaster, x, y, 1, 1,
-		    masterPtr->width, masterPtr->height);
-	    masterPtr->flags &= ~IMAGE_CHANGED;
+	    Tk_ImageChanged(modelPtr->tkMaster, x, y, 1, 1,
+		    modelPtr->width, modelPtr->height);
+	    modelPtr->flags &= ~IMAGE_CHANGED;
 	    return TCL_OK;
 	}
 
@@ -1327,10 +1327,10 @@ ImgPhotoCmd(
 	    Tcl_WrongNumArgs(interp, 2, objv, "fileName ?-option value ...?");
 	    return TCL_ERROR;
 	}
-	if ((options.fromX > masterPtr->width)
-		|| (options.fromY > masterPtr->height)
-		|| (options.fromX2 > masterPtr->width)
-		|| (options.fromY2 > masterPtr->height)) {
+	if ((options.fromX > modelPtr->width)
+		|| (options.fromY > modelPtr->height)
+		|| (options.fromX2 > modelPtr->width)
+		|| (options.fromY2 > modelPtr->height)) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "coordinates for -from option extend outside image", -1));
 	    Tcl_SetErrorCode(interp, "TK", "IMAGE", "PHOTO", "BAD_FROM", NULL);
@@ -1344,8 +1344,8 @@ ImgPhotoCmd(
 	 */
 
 	if (!(options.options & OPT_FROM) || (options.fromX2 < 0)) {
-	    options.fromX2 = masterPtr->width;
-	    options.fromY2 = masterPtr->height;
+	    options.fromX2 = modelPtr->width;
+	    options.fromY2 = modelPtr->height;
 	}
 	if (options.format == NULL) {
 	    fmtString = GetExtension(Tcl_GetString(options.name));
@@ -1420,7 +1420,7 @@ ImgPhotoCmd(
 	 * Call the handler's file write function to write out the image.
 	 */
 
-	data = ImgGetPhoto(masterPtr, &block, &options);
+	data = ImgGetPhoto(modelPtr, &block, &options);
 	format = options.format;
 	if (oldformat && format) {
 	    format = (Tcl_Obj *) Tcl_GetString(options.format);
@@ -1767,7 +1767,7 @@ ParseSubcommandOptions(
  *
  * Results:
  *	A standard Tcl return value. If TCL_ERROR is returned then an error
- *	message is left in the masterPtr->interp's result.
+ *	message is left in the modelPtr->interp's result.
  *
  * Side effects:
  *	Existing instances of the image will be redisplayed to match the new
@@ -1779,7 +1779,7 @@ ParseSubcommandOptions(
 static int
 ImgPhotoConfigureMaster(
     Tcl_Interp *interp,		/* Interpreter to use for reporting errors. */
-    PhotoMaster *masterPtr,	/* Pointer to data structure describing
+    PhotoModel *modelPtr,	/* Pointer to data structure describing
 				 * overall photo image to (re)configure. */
     int objc,			/* Number of entries in objv. */
     Tcl_Obj *const objv[],	/* Pairs of configuration options for image. */
@@ -1839,28 +1839,28 @@ ImgPhotoConfigureMaster(
      * the format string influences how "-data" or "-file" is interpreted.
      */
 
-    oldFileString = masterPtr->fileString;
+    oldFileString = modelPtr->fileString;
     if (oldFileString == NULL) {
-	oldData = masterPtr->dataString;
+	oldData = modelPtr->dataString;
 	if (oldData != NULL) {
 	    Tcl_IncrRefCount(oldData);
 	}
     } else {
 	oldData = NULL;
     }
-    oldFormat = masterPtr->format;
+    oldFormat = modelPtr->format;
     if (oldFormat != NULL) {
 	Tcl_IncrRefCount(oldFormat);
     }
-    oldPaletteString = masterPtr->palette;
-    oldGamma = masterPtr->gamma;
+    oldPaletteString = modelPtr->palette;
+    oldGamma = modelPtr->gamma;
 
     /*
      * Process the configuration options specified.
      */
 
     if (Tk_ConfigureWidget(interp, Tk_MainWindow(interp), configSpecs,
-	    j, args, (char *) masterPtr, flags) != TCL_OK) {
+	    j, args, (char *) modelPtr, flags) != TCL_OK) {
 	ckfree(args);
 	goto errorExit;
     }
@@ -1870,9 +1870,9 @@ ImgPhotoConfigureMaster(
      * Regard the empty string for -file, -data or -format as the null value.
      */
 
-    if ((masterPtr->fileString != NULL) && (masterPtr->fileString[0] == 0)) {
-	ckfree(masterPtr->fileString);
-	masterPtr->fileString = NULL;
+    if ((modelPtr->fileString != NULL) && (modelPtr->fileString[0] == 0)) {
+	ckfree(modelPtr->fileString);
+	modelPtr->fileString = NULL;
     }
     if (data) {
 	/*
@@ -1887,10 +1887,10 @@ ImgPhotoConfigureMaster(
 	} else {
 	    data = NULL;
 	}
-	if (masterPtr->dataString) {
-	    Tcl_DecrRefCount(masterPtr->dataString);
+	if (modelPtr->dataString) {
+	    Tcl_DecrRefCount(modelPtr->dataString);
 	}
-	masterPtr->dataString = data;
+	modelPtr->dataString = data;
     }
     if (format) {
 	/*
@@ -1904,18 +1904,18 @@ ImgPhotoConfigureMaster(
 	} else {
 	    format = NULL;
 	}
-	if (masterPtr->format) {
-	    Tcl_DecrRefCount(masterPtr->format);
+	if (modelPtr->format) {
+	    Tcl_DecrRefCount(modelPtr->format);
 	}
-	masterPtr->format = format;
+	modelPtr->format = format;
     }
     /*
      * Set the image to the user-requested size, if any, and make sure storage
      * is correctly allocated for this image.
      */
 
-    if (ImgPhotoSetSize(masterPtr, masterPtr->width,
-	    masterPtr->height) != TCL_OK) {
+    if (ImgPhotoSetSize(modelPtr, modelPtr->width,
+	    modelPtr->height) != TCL_OK) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		TK_PHOTO_ALLOC_FAILURE_MESSAGE, -1));
 	Tcl_SetErrorCode(interp, "TK", "MALLOC", NULL);
@@ -1927,9 +1927,9 @@ ImgPhotoConfigureMaster(
      * -file or -data option.
      */
 
-    if ((masterPtr->fileString != NULL)
-	    && ((masterPtr->fileString != oldFileString)
-	    || (masterPtr->format != oldFormat))) {
+    if ((modelPtr->fileString != NULL)
+	    && ((modelPtr->fileString != oldFileString)
+	    || (modelPtr->format != oldFormat))) {
 	/*
 	 * Prevent file system access in a safe interpreter.
 	 */
@@ -1943,7 +1943,7 @@ ImgPhotoConfigureMaster(
 	    goto errorExit;
 	}
 
-	chan = Tcl_OpenFileChannel(interp, masterPtr->fileString, "r", 0);
+	chan = Tcl_OpenFileChannel(interp, modelPtr->fileString, "r", 0);
 	if (chan == NULL) {
 	    goto errorExit;
 	}
@@ -1954,13 +1954,13 @@ ImgPhotoConfigureMaster(
 
 	if ((Tcl_SetChannelOption(interp, chan,
 		"-translation", "binary") != TCL_OK) ||
-		(MatchFileFormat(interp, chan, masterPtr->fileString,
-			masterPtr->format, &imageFormat, &imageWidth,
+		(MatchFileFormat(interp, chan, modelPtr->fileString,
+			modelPtr->format, &imageFormat, &imageWidth,
 			&imageHeight, &oldformat) != TCL_OK)) {
 	    Tcl_Close(NULL, chan);
 	    goto errorExit;
 	}
-	result = ImgPhotoSetSize(masterPtr, imageWidth, imageHeight);
+	result = ImgPhotoSetSize(modelPtr, imageWidth, imageHeight);
 	if (result != TCL_OK) {
 	    Tcl_Close(NULL, chan);
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
@@ -1968,12 +1968,12 @@ ImgPhotoConfigureMaster(
 	    Tcl_SetErrorCode(interp, "TK", "MALLOC", NULL);
 	    goto errorExit;
 	}
-	tempformat = masterPtr->format;
+	tempformat = modelPtr->format;
 	if (oldformat && tempformat) {
 	    tempformat = (Tcl_Obj *) Tcl_GetString(tempformat);
 	}
 	result = imageFormat->fileReadProc(interp, chan,
-		masterPtr->fileString, tempformat, (Tk_PhotoHandle) masterPtr,
+		modelPtr->fileString, tempformat, (Tk_PhotoHandle) modelPtr,
 		0, 0, imageWidth, imageHeight, 0, 0);
 	Tcl_Close(NULL, chan);
 	if (result != TCL_OK) {
@@ -1981,26 +1981,26 @@ ImgPhotoConfigureMaster(
 	}
 
 	Tcl_ResetResult(interp);
-	masterPtr->flags |= IMAGE_CHANGED;
+	modelPtr->flags |= IMAGE_CHANGED;
     }
 
-    if ((masterPtr->fileString == NULL) && (masterPtr->dataString != NULL)
-	    && ((masterPtr->dataString != oldData)
-		    || (masterPtr->format != oldFormat))) {
+    if ((modelPtr->fileString == NULL) && (modelPtr->dataString != NULL)
+	    && ((modelPtr->dataString != oldData)
+		    || (modelPtr->format != oldFormat))) {
 
-	if (MatchStringFormat(interp, masterPtr->dataString,
-		masterPtr->format, &imageFormat, &imageWidth,
+	if (MatchStringFormat(interp, modelPtr->dataString,
+		modelPtr->format, &imageFormat, &imageWidth,
 		&imageHeight, &oldformat) != TCL_OK) {
 	    goto errorExit;
 	}
-	if (ImgPhotoSetSize(masterPtr, imageWidth, imageHeight) != TCL_OK) {
+	if (ImgPhotoSetSize(modelPtr, imageWidth, imageHeight) != TCL_OK) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    TK_PHOTO_ALLOC_FAILURE_MESSAGE, -1));
 	    Tcl_SetErrorCode(interp, "TK", "MALLOC", NULL);
 	    goto errorExit;
 	}
-	tempformat = masterPtr->format;
-	tempdata = masterPtr->dataString;
+	tempformat = modelPtr->format;
+	tempdata = modelPtr->dataString;
 	if (oldformat) {
 	    if (tempformat) {
 		tempformat = (Tcl_Obj *) Tcl_GetString(tempformat);
@@ -2008,26 +2008,26 @@ ImgPhotoConfigureMaster(
 	    tempdata = (Tcl_Obj *) Tcl_GetString(tempdata);
 	}
 	if (imageFormat->stringReadProc(interp, tempdata, tempformat,
-		(Tk_PhotoHandle) masterPtr, 0, 0, imageWidth, imageHeight,
+		(Tk_PhotoHandle) modelPtr, 0, 0, imageWidth, imageHeight,
 		0, 0) != TCL_OK) {
 	    goto errorExit;
 	}
 
 	Tcl_ResetResult(interp);
-	masterPtr->flags |= IMAGE_CHANGED;
+	modelPtr->flags |= IMAGE_CHANGED;
     }
 
     /*
      * Enforce a reasonable value for gamma.
      */
 
-    if (masterPtr->gamma <= 0) {
-	masterPtr->gamma = 1.0;
+    if (modelPtr->gamma <= 0) {
+	modelPtr->gamma = 1.0;
     }
 
-    if ((masterPtr->gamma != oldGamma)
-	    || (masterPtr->palette != oldPaletteString)) {
-	masterPtr->flags |= IMAGE_CHANGED;
+    if ((modelPtr->gamma != oldGamma)
+	    || (modelPtr->palette != oldPaletteString)) {
+	modelPtr->flags |= IMAGE_CHANGED;
     }
 
     /*
@@ -2036,7 +2036,7 @@ ImgPhotoConfigureMaster(
      * everywhere that it is used.
      */
 
-    for (instancePtr = masterPtr->instancePtr; instancePtr != NULL;
+    for (instancePtr = modelPtr->instancePtr; instancePtr != NULL;
 	    instancePtr = instancePtr->nextPtr) {
 	TkImgPhotoConfigureInstance(instancePtr);
     }
@@ -2045,9 +2045,9 @@ ImgPhotoConfigureMaster(
      * Inform the generic image code that the image has (potentially) changed.
      */
 
-    Tk_ImageChanged(masterPtr->tkMaster, 0, 0, masterPtr->width,
-	    masterPtr->height, masterPtr->width, masterPtr->height);
-    masterPtr->flags &= ~IMAGE_CHANGED;
+    Tk_ImageChanged(modelPtr->tkMaster, 0, 0, modelPtr->width,
+	    modelPtr->height, modelPtr->width, modelPtr->height);
+    modelPtr->flags &= ~IMAGE_CHANGED;
 
     if (oldData != NULL) {
 	Tcl_DecrRefCount(oldData);
@@ -2056,7 +2056,7 @@ ImgPhotoConfigureMaster(
 	Tcl_DecrRefCount(oldFormat);
     }
 
-    ToggleComplexAlphaIfNeeded(masterPtr);
+    ToggleComplexAlphaIfNeeded(modelPtr);
 
     return TCL_OK;
 
@@ -2090,7 +2090,7 @@ ImgPhotoConfigureMaster(
 
 static int
 ToggleComplexAlphaIfNeeded(
-    PhotoMaster *mPtr)
+    PhotoModel *mPtr)
 {
     size_t len = (size_t)MAX(mPtr->userWidth, mPtr->width) *
 	    (size_t)MAX(mPtr->userHeight, mPtr->height) * 4;
@@ -2135,37 +2135,37 @@ ToggleComplexAlphaIfNeeded(
 
 static void
 ImgPhotoDelete(
-    ClientData masterData)	/* Pointer to PhotoMaster structure for image.
+    ClientData masterData)	/* Pointer to PhotoModel structure for image.
 				 * Must not have any more instances. */
 {
-    PhotoMaster *masterPtr = masterData;
+    PhotoModel *modelPtr = masterData;
     PhotoInstance *instancePtr;
 
-    while ((instancePtr = masterPtr->instancePtr) != NULL) {
+    while ((instancePtr = modelPtr->instancePtr) != NULL) {
 	if (instancePtr->refCount > 0) {
 	    Tcl_Panic("tried to delete photo image when instances still exist");
 	}
 	Tcl_CancelIdleCall(TkImgDisposeInstance, instancePtr);
 	TkImgDisposeInstance(instancePtr);
     }
-    masterPtr->tkMaster = NULL;
-    if (masterPtr->imageCmd != NULL) {
-	Tcl_DeleteCommandFromToken(masterPtr->interp, masterPtr->imageCmd);
+    modelPtr->tkMaster = NULL;
+    if (modelPtr->imageCmd != NULL) {
+	Tcl_DeleteCommandFromToken(modelPtr->interp, modelPtr->imageCmd);
     }
-    if (masterPtr->pix32 != NULL) {
-	ckfree(masterPtr->pix32);
+    if (modelPtr->pix32 != NULL) {
+	ckfree(modelPtr->pix32);
     }
-    if (masterPtr->validRegion != NULL) {
-	TkDestroyRegion(masterPtr->validRegion);
+    if (modelPtr->validRegion != NULL) {
+	TkDestroyRegion(modelPtr->validRegion);
     }
-    if (masterPtr->dataString != NULL) {
-	Tcl_DecrRefCount(masterPtr->dataString);
+    if (modelPtr->dataString != NULL) {
+	Tcl_DecrRefCount(modelPtr->dataString);
     }
-    if (masterPtr->format != NULL) {
-	Tcl_DecrRefCount(masterPtr->format);
+    if (modelPtr->format != NULL) {
+	Tcl_DecrRefCount(modelPtr->format);
     }
-    Tk_FreeOptions(configSpecs, (char *) masterPtr, NULL, 0);
-    ckfree(masterPtr);
+    Tk_FreeOptions(configSpecs, (char *) modelPtr, NULL, 0);
+    ckfree(modelPtr);
 }
 
 /*
@@ -2187,14 +2187,14 @@ ImgPhotoDelete(
 
 static void
 ImgPhotoCmdDeletedProc(
-    ClientData clientData)	/* Pointer to PhotoMaster structure for
+    ClientData clientData)	/* Pointer to PhotoModel structure for
 				 * image. */
 {
-    PhotoMaster *masterPtr = clientData;
+    PhotoModel *modelPtr = clientData;
 
-    masterPtr->imageCmd = NULL;
-    if (masterPtr->tkMaster != NULL) {
-	Tk_DeleteImage(masterPtr->interp, Tk_NameOfImage(masterPtr->tkMaster));
+    modelPtr->imageCmd = NULL;
+    if (modelPtr->tkMaster != NULL) {
+	Tk_DeleteImage(modelPtr->interp, Tk_NameOfImage(modelPtr->tkMaster));
     }
 }
 
@@ -2219,7 +2219,7 @@ ImgPhotoCmdDeletedProc(
 
 static int
 ImgPhotoSetSize(
-    PhotoMaster *masterPtr,
+    PhotoModel *modelPtr,
     int width, int height)
 {
     unsigned char *newPix32 = NULL;
@@ -2229,11 +2229,11 @@ ImgPhotoSetSize(
     TkRegion clipRegion;
     PhotoInstance *instancePtr;
 
-    if (masterPtr->userWidth > 0) {
-	width = masterPtr->userWidth;
+    if (modelPtr->userWidth > 0) {
+	width = modelPtr->userWidth;
     }
-    if (masterPtr->userHeight > 0) {
-	height = masterPtr->userHeight;
+    if (modelPtr->userHeight > 0) {
+	height = modelPtr->userHeight;
     }
 
     if (width > INT_MAX / 4) {
@@ -2247,8 +2247,8 @@ ImgPhotoSetSize(
      * failures will leave the photo unchanged.
      */
 
-    if ((width != masterPtr->width) || (height != masterPtr->height)
-	    || (masterPtr->pix32 == NULL)) {
+    if ((width != modelPtr->width) || (height != modelPtr->height)
+	    || (modelPtr->pix32 == NULL)) {
 	unsigned newPixSize;
 
 	if (pitch && height > (int)(UINT_MAX / pitch)) {
@@ -2275,7 +2275,7 @@ ImgPhotoSetSize(
      * image size.
      */
 
-    TkClipBox(masterPtr->validRegion, &validBox);
+    TkClipBox(modelPtr->validRegion, &validBox);
     if ((validBox.x + validBox.width > width)
 	    || (validBox.y + validBox.height > height)) {
 	clipBox.x = 0;
@@ -2284,10 +2284,10 @@ ImgPhotoSetSize(
 	clipBox.height = height;
 	clipRegion = TkCreateRegion();
 	TkUnionRectWithRegion(&clipBox, clipRegion, clipRegion);
-	TkIntersectRegion(masterPtr->validRegion, clipRegion,
-		masterPtr->validRegion);
+	TkIntersectRegion(modelPtr->validRegion, clipRegion,
+		modelPtr->validRegion);
 	TkDestroyRegion(clipRegion);
-	TkClipBox(masterPtr->validRegion, &validBox);
+	TkClipBox(modelPtr->validRegion, &validBox);
     }
 
     /*
@@ -2303,8 +2303,8 @@ ImgPhotoSetSize(
 	 * or written to a file.
 	 */
 
-	if ((masterPtr->pix32 != NULL)
-	    && ((width == masterPtr->width) || (width == validBox.width))) {
+	if ((modelPtr->pix32 != NULL)
+	    && ((width == modelPtr->width) || (width == validBox.width))) {
 	    if (validBox.y > 0) {
 		memset(newPix32, 0, ((size_t) validBox.y * pitch));
 	    }
@@ -2316,20 +2316,20 @@ ImgPhotoSetSize(
 	    memset(newPix32, 0, ((size_t)height * pitch));
 	}
 
-	if (masterPtr->pix32 != NULL) {
+	if (modelPtr->pix32 != NULL) {
 	    /*
 	     * Copy the common area over to the new array array and free the
 	     * old array.
 	     */
 
-	    if (width == masterPtr->width) {
+	    if (width == modelPtr->width) {
 
 		/*
 		 * The region to be copied is contiguous.
 		 */
 
 		offset = validBox.y * pitch;
-		memcpy(newPix32 + offset, masterPtr->pix32 + offset,
+		memcpy(newPix32 + offset, modelPtr->pix32 + offset,
 			((size_t)validBox.height * pitch));
 
 	    } else if ((validBox.width > 0) && (validBox.height > 0)) {
@@ -2338,21 +2338,21 @@ ImgPhotoSetSize(
 		 */
 
 		destPtr = newPix32 + (validBox.y * width + validBox.x) * 4;
-		srcPtr = masterPtr->pix32 + (validBox.y * masterPtr->width
+		srcPtr = modelPtr->pix32 + (validBox.y * modelPtr->width
 			+ validBox.x) * 4;
 		for (h = validBox.height; h > 0; h--) {
 		    memcpy(destPtr, srcPtr, ((size_t)validBox.width * 4));
 		    destPtr += width * 4;
-		    srcPtr += masterPtr->width * 4;
+		    srcPtr += modelPtr->width * 4;
 		}
 	    }
 
-	    ckfree(masterPtr->pix32);
+	    ckfree(modelPtr->pix32);
 	}
 
-	masterPtr->pix32 = newPix32;
-	masterPtr->width = width;
-	masterPtr->height = height;
+	modelPtr->pix32 = newPix32;
+	modelPtr->width = width;
+	modelPtr->height = height;
 
 	/*
 	 * Dithering will be correct up to the end of the last pre-existing
@@ -2360,27 +2360,27 @@ ImgPhotoSetSize(
 	 */
 
 	if ((validBox.x > 0) || (validBox.y > 0)) {
-	    masterPtr->ditherX = 0;
-	    masterPtr->ditherY = 0;
+	    modelPtr->ditherX = 0;
+	    modelPtr->ditherY = 0;
 	} else if (validBox.width == width) {
-	    if ((int) validBox.height < masterPtr->ditherY) {
-		masterPtr->ditherX = 0;
-		masterPtr->ditherY = validBox.height;
+	    if ((int) validBox.height < modelPtr->ditherY) {
+		modelPtr->ditherX = 0;
+		modelPtr->ditherY = validBox.height;
 	    }
-	} else if ((masterPtr->ditherY > 0)
-		|| ((int) validBox.width < masterPtr->ditherX)) {
-	    masterPtr->ditherX = validBox.width;
-	    masterPtr->ditherY = 0;
+	} else if ((modelPtr->ditherY > 0)
+		|| ((int) validBox.width < modelPtr->ditherX)) {
+	    modelPtr->ditherX = validBox.width;
+	    modelPtr->ditherY = 0;
 	}
     }
 
-    ToggleComplexAlphaIfNeeded(masterPtr);
+    ToggleComplexAlphaIfNeeded(modelPtr);
 
     /*
      * Now adjust the sizes of the pixmaps for all of the instances.
      */
 
-    for (instancePtr = masterPtr->instancePtr; instancePtr != NULL;
+    for (instancePtr = modelPtr->instancePtr; instancePtr != NULL;
 	    instancePtr = instancePtr->nextPtr) {
 	TkImgPhotoInstanceSetSize(instancePtr);
     }
@@ -2659,7 +2659,7 @@ MatchStringFormat(
  * Tk_FindPhoto --
  *
  *	This function is called to get an opaque handle (actually a
- *	PhotoMaster *) for a given image, which can be used in subsequent
+ *	PhotoModel *) for a given image, which can be used in subsequent
  *	calls to Tk_PhotoPutBlock, etc. The `name' parameter is the name of
  *	the image.
  *
@@ -2724,7 +2724,7 @@ Tk_PhotoPutBlock(
     int compRule)		/* Compositing rule to use when processing
 				 * transparent pixels. */
 {
-    register PhotoMaster *masterPtr = (PhotoMaster *) handle;
+    register PhotoModel *modelPtr = (PhotoModel *) handle;
     Tk_PhotoImageBlock sourceBlock;
     unsigned char *memToFree;
     int xEnd, yEnd, greenOffset, blueOffset, alphaOffset;
@@ -2743,12 +2743,12 @@ Tk_PhotoPutBlock(
 
     compRule &= ~SOURCE_IS_SIMPLE_ALPHA_PHOTO;
 
-    if ((masterPtr->userWidth != 0) && ((x + width) > masterPtr->userWidth)) {
-	width = masterPtr->userWidth - x;
+    if ((modelPtr->userWidth != 0) && ((x + width) > modelPtr->userWidth)) {
+	width = modelPtr->userWidth - x;
     }
-    if ((masterPtr->userHeight != 0)
-	    && ((y + height) > masterPtr->userHeight)) {
-	height = masterPtr->userHeight - y;
+    if ((modelPtr->userHeight != 0)
+	    && ((y + height) > modelPtr->userHeight)) {
+	height = modelPtr->userHeight - y;
     }
     if ((width <= 0) || (height <= 0)) {
 	return TCL_OK;
@@ -2769,18 +2769,18 @@ Tk_PhotoPutBlock(
      */
     sourceBlock = *blockPtr;
     memToFree = NULL;
-    if (sourceBlock.pixelPtr >= masterPtr->pix32
-	    && sourceBlock.pixelPtr <= masterPtr->pix32 + masterPtr->width
-	    * masterPtr->height * 4) {
+    if (sourceBlock.pixelPtr >= modelPtr->pix32
+	    && sourceBlock.pixelPtr <= modelPtr->pix32 + modelPtr->width
+	    * modelPtr->height * 4) {
 	/*
 	 * Fix 5c51be6411: avoid reading
 	 *
 	 *	(sourceBlock.pitch - sourceBlock.width * sourceBlock.pixelSize)
 	 *
-	 * bytes past the end of masterPtr->pix32[] when
+	 * bytes past the end of modelPtr->pix32[] when
 	 *
-	 *	blockPtr->pixelPtr > (masterPtr->pix32 +
-	 *		4 * masterPtr->width * masterPtr->height -
+	 *	blockPtr->pixelPtr > (modelPtr->pix32 +
+	 *		4 * modelPtr->width * modelPtr->height -
 	 *		sourceBlock.height * sourceBlock.pitch)
 	 */
 	unsigned int cpyLen = (sourceBlock.height - 1) * sourceBlock.pitch +
@@ -2802,9 +2802,9 @@ Tk_PhotoPutBlock(
 
     xEnd = x + width;
     yEnd = y + height;
-    if ((xEnd > masterPtr->width) || (yEnd > masterPtr->height)) {
-	if (ImgPhotoSetSize(masterPtr, MAX(xEnd, masterPtr->width),
-		MAX(yEnd, masterPtr->height)) == TCL_ERROR) {
+    if ((xEnd > modelPtr->width) || (yEnd > modelPtr->height)) {
+	if (ImgPhotoSetSize(modelPtr, MAX(xEnd, modelPtr->width),
+		MAX(yEnd, modelPtr->height)) == TCL_ERROR) {
 	    if (interp != NULL) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			TK_PHOTO_ALLOC_FAILURE_MESSAGE, -1));
@@ -2814,14 +2814,14 @@ Tk_PhotoPutBlock(
 	}
     }
 
-    if ((y < masterPtr->ditherY) || ((y == masterPtr->ditherY)
-	    && (x < masterPtr->ditherX))) {
+    if ((y < modelPtr->ditherY) || ((y == modelPtr->ditherY)
+	    && (x < modelPtr->ditherX))) {
 	/*
 	 * The dithering isn't correct past the start of this block.
 	 */
 
-	masterPtr->ditherX = x;
-	masterPtr->ditherY = y;
+	modelPtr->ditherX = x;
+	modelPtr->ditherY = y;
     }
 
     /*
@@ -2839,7 +2839,7 @@ Tk_PhotoPutBlock(
 	alphaOffset -= sourceBlock.offset[0];
     }
     if ((greenOffset != 0) || (blueOffset != 0)) {
-	masterPtr->flags |= COLOR_IMAGE;
+	modelPtr->flags |= COLOR_IMAGE;
     }
 
     /*
@@ -2847,8 +2847,8 @@ Tk_PhotoPutBlock(
      * single memmove, we do.
      */
 
-    destLinePtr = masterPtr->pix32 + (y * masterPtr->width + x) * 4;
-    pitch = masterPtr->width * 4;
+    destLinePtr = modelPtr->pix32 + (y * modelPtr->width + x) * 4;
+    pitch = modelPtr->width * 4;
 
     /*
      * Test to see if we can do the whole write in a single copy. This test is
@@ -2859,7 +2859,7 @@ Tk_PhotoPutBlock(
     if ((sourceBlock.pixelSize == 4)
 	    && (greenOffset == 1) && (blueOffset == 2) && (alphaOffset == 3)
 	    && (width <= sourceBlock.width) && (height <= sourceBlock.height)
-	    && ((height == 1) || ((x == 0) && (width == masterPtr->width)
+	    && ((height == 1) || ((x == 0) && (width == modelPtr->width)
 		&& (sourceBlock.pitch == pitch)))
 	    && (compRule == TK_PHOTO_COMPOSITE_SET)) {
 	memmove(destLinePtr, sourceBlock.pixelPtr + sourceBlock.offset[0],
@@ -3041,8 +3041,8 @@ Tk_PhotoPutBlock(
 	    rect.width = width;
 	    rect.height = height;
 	    TkUnionRectWithRegion(&rect, workRgn, workRgn);
-	    TkSubtractRegion(masterPtr->validRegion, workRgn,
-		    masterPtr->validRegion);
+	    TkSubtractRegion(modelPtr->validRegion, workRgn,
+		    modelPtr->validRegion);
 	    TkDestroyRegion(workRgn);
 	}
 
@@ -3051,17 +3051,17 @@ Tk_PhotoPutBlock(
 	 * allow for more efficient per-platform implementations. [Bug 919066]
 	 */
 
-	TkpBuildRegionFromAlphaData(masterPtr->validRegion, (unsigned) x,
+	TkpBuildRegionFromAlphaData(modelPtr->validRegion, (unsigned) x,
 		(unsigned) y, (unsigned) width, (unsigned) height,
-		masterPtr->pix32 + (y * masterPtr->width + x) * 4 + 3,
-		4, (unsigned) masterPtr->width * 4);
+		modelPtr->pix32 + (y * modelPtr->width + x) * 4 + 3,
+		4, (unsigned) modelPtr->width * 4);
     } else {
 	rect.x = x;
 	rect.y = y;
 	rect.width = width;
 	rect.height = height;
-	TkUnionRectWithRegion(&rect, masterPtr->validRegion,
-		masterPtr->validRegion);
+	TkUnionRectWithRegion(&rect, modelPtr->validRegion,
+		modelPtr->validRegion);
     }
 
     /*
@@ -3076,21 +3076,21 @@ Tk_PhotoPutBlock(
 	 * [Patch 1539990]
 	 */
 
-	if (!(masterPtr->flags & COMPLEX_ALPHA)) {
+	if (!(modelPtr->flags & COMPLEX_ALPHA)) {
 	    register int x1;
 
 	    for (x1=x ; x1<x+width ; x1++) {
 		register unsigned char newAlpha;
 
-		destLinePtr = masterPtr->pix32 + (y*masterPtr->width + x1)*4;
+		destLinePtr = modelPtr->pix32 + (y*modelPtr->width + x1)*4;
 		newAlpha = destLinePtr[3];
 		if (newAlpha && newAlpha != 255) {
-		    masterPtr->flags |= COMPLEX_ALPHA;
+		    modelPtr->flags |= COMPLEX_ALPHA;
 		    break;
 		}
 	    }
 	}
-    } else if ((alphaOffset != 0) || (masterPtr->flags & COMPLEX_ALPHA)) {
+    } else if ((alphaOffset != 0) || (modelPtr->flags & COMPLEX_ALPHA)) {
 	/*
 	 * Check for partial transparency if alpha pixels are specified, or
 	 * rescan if we already knew such pixels existed. To restrict this
@@ -3098,21 +3098,21 @@ Tk_PhotoPutBlock(
 	 * the alpha pixels are.
 	 */
 
-	ToggleComplexAlphaIfNeeded(masterPtr);
+	ToggleComplexAlphaIfNeeded(modelPtr);
     }
 
     /*
      * Update each instance.
      */
 
-    Tk_DitherPhoto((Tk_PhotoHandle)masterPtr, x, y, width, height);
+    Tk_DitherPhoto((Tk_PhotoHandle)modelPtr, x, y, width, height);
 
     /*
      * Tell the core image code that this image has changed.
      */
 
-    Tk_ImageChanged(masterPtr->tkMaster, x, y, width, height,
-	    masterPtr->width, masterPtr->height);
+    Tk_ImageChanged(modelPtr->tkMaster, x, y, width, height,
+	    modelPtr->width, modelPtr->height);
 
     if (memToFree) ckfree(memToFree);
 
@@ -3162,7 +3162,7 @@ Tk_PhotoPutZoomedBlock(
     int compRule)		/* Compositing rule to use when processing
 				 * transparent pixels. */
 {
-    register PhotoMaster *masterPtr = (PhotoMaster *) handle;
+    register PhotoModel *modelPtr = (PhotoModel *) handle;
     register Tk_PhotoImageBlock sourceBlock;
     unsigned char *memToFree;
     int xEnd, yEnd, greenOffset, blueOffset, alphaOffset;
@@ -3190,12 +3190,12 @@ Tk_PhotoPutZoomedBlock(
     if (zoomX <= 0 || zoomY <= 0) {
 	return TCL_OK;
     }
-    if ((masterPtr->userWidth != 0) && ((x + width) > masterPtr->userWidth)) {
-	width = masterPtr->userWidth - x;
+    if ((modelPtr->userWidth != 0) && ((x + width) > modelPtr->userWidth)) {
+	width = modelPtr->userWidth - x;
     }
-    if ((masterPtr->userHeight != 0)
-	    && ((y + height) > masterPtr->userHeight)) {
-	height = masterPtr->userHeight - y;
+    if ((modelPtr->userHeight != 0)
+	    && ((y + height) > modelPtr->userHeight)) {
+	height = modelPtr->userHeight - y;
     }
     if (width <= 0 || height <= 0) {
 	return TCL_OK;
@@ -3215,18 +3215,18 @@ Tk_PhotoPutZoomedBlock(
      */
     sourceBlock = *blockPtr;
     memToFree = NULL;
-    if (sourceBlock.pixelPtr >= masterPtr->pix32
-	    && sourceBlock.pixelPtr <= masterPtr->pix32 + masterPtr->width
-	    * masterPtr->height * 4) {
+    if (sourceBlock.pixelPtr >= modelPtr->pix32
+	    && sourceBlock.pixelPtr <= modelPtr->pix32 + modelPtr->width
+	    * modelPtr->height * 4) {
 	/*
 	 * Fix 5c51be6411: avoid reading
 	 *
 	 *	(sourceBlock.pitch - sourceBlock.width * sourceBlock.pixelSize)
 	 *
-	 * bytes past the end of masterPtr->pix32[] when
+	 * bytes past the end of modelPtr->pix32[] when
 	 *
-	 *	blockPtr->pixelPtr > (masterPtr->pix32 +
-	 *		4 * masterPtr->width * masterPtr->height -
+	 *	blockPtr->pixelPtr > (modelPtr->pix32 +
+	 *		4 * modelPtr->width * modelPtr->height -
 	 *		sourceBlock.height * sourceBlock.pitch)
 	 */
 	unsigned int cpyLen = (sourceBlock.height - 1) * sourceBlock.pitch +
@@ -3247,9 +3247,9 @@ Tk_PhotoPutZoomedBlock(
 
     xEnd = x + width;
     yEnd = y + height;
-    if ((xEnd > masterPtr->width) || (yEnd > masterPtr->height)) {
-	if (ImgPhotoSetSize(masterPtr, MAX(xEnd, masterPtr->width),
-		MAX(yEnd, masterPtr->height)) == TCL_ERROR) {
+    if ((xEnd > modelPtr->width) || (yEnd > modelPtr->height)) {
+	if (ImgPhotoSetSize(modelPtr, MAX(xEnd, modelPtr->width),
+		MAX(yEnd, modelPtr->height)) == TCL_ERROR) {
 	    if (interp != NULL) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			TK_PHOTO_ALLOC_FAILURE_MESSAGE, -1));
@@ -3259,14 +3259,14 @@ Tk_PhotoPutZoomedBlock(
 	}
     }
 
-    if ((y < masterPtr->ditherY) || ((y == masterPtr->ditherY)
-	    && (x < masterPtr->ditherX))) {
+    if ((y < modelPtr->ditherY) || ((y == modelPtr->ditherY)
+	    && (x < modelPtr->ditherX))) {
 	/*
 	 * The dithering isn't correct past the start of this block.
 	 */
 
-	masterPtr->ditherX = x;
-	masterPtr->ditherY = y;
+	modelPtr->ditherX = x;
+	modelPtr->ditherY = y;
     }
 
     /*
@@ -3284,7 +3284,7 @@ Tk_PhotoPutZoomedBlock(
 	alphaOffset -= sourceBlock.offset[0];
     }
     if ((greenOffset != 0) || (blueOffset != 0)) {
-	masterPtr->flags |= COLOR_IMAGE;
+	modelPtr->flags |= COLOR_IMAGE;
     }
 
     /*
@@ -3313,7 +3313,7 @@ Tk_PhotoPutZoomedBlock(
      * Copy the data into our local 32-bit/pixel array.
      */
 
-    destLinePtr = masterPtr->pix32 + (y * masterPtr->width + x) * 4;
+    destLinePtr = modelPtr->pix32 + (y * modelPtr->width + x) * 4;
     srcOrigPtr = sourceBlock.pixelPtr + sourceBlock.offset[0];
     if (subsampleX < 0) {
 	srcOrigPtr += (sourceBlock.width - 1) * sourceBlock.pixelSize;
@@ -3322,7 +3322,7 @@ Tk_PhotoPutZoomedBlock(
 	srcOrigPtr += (sourceBlock.height - 1) * sourceBlock.pitch;
     }
 
-    pitch = masterPtr->width * 4;
+    pitch = modelPtr->width * 4;
     for (hLeft = height; hLeft > 0; ) {
 	hCopy = MIN(hLeft, blockHt);
 	hLeft -= hCopy;
@@ -3409,22 +3409,22 @@ Tk_PhotoPutZoomedBlock(
 	    rect.width = width;
 	    rect.height = 1;
 	    TkUnionRectWithRegion(&rect, workRgn, workRgn);
-	    TkSubtractRegion(masterPtr->validRegion, workRgn,
-		    masterPtr->validRegion);
+	    TkSubtractRegion(modelPtr->validRegion, workRgn,
+		    modelPtr->validRegion);
 	    TkDestroyRegion(workRgn);
 	}
 
-	TkpBuildRegionFromAlphaData(masterPtr->validRegion,
+	TkpBuildRegionFromAlphaData(modelPtr->validRegion,
 		(unsigned)x, (unsigned)y, (unsigned)width, (unsigned)height,
-		&masterPtr->pix32[(y * masterPtr->width + x) * 4 + 3], 4,
-		(unsigned) masterPtr->width * 4);
+		&modelPtr->pix32[(y * modelPtr->width + x) * 4 + 3], 4,
+		(unsigned) modelPtr->width * 4);
     } else {
 	rect.x = x;
 	rect.y = y;
 	rect.width = width;
 	rect.height = height;
-	TkUnionRectWithRegion(&rect, masterPtr->validRegion,
-		masterPtr->validRegion);
+	TkUnionRectWithRegion(&rect, modelPtr->validRegion,
+		modelPtr->validRegion);
     }
 
     /*
@@ -3437,38 +3437,38 @@ Tk_PhotoPutZoomedBlock(
 	 * builds up large simple-alpha images by single pixels. We don't
 	 * negate COMPLEX_ALPHA in this case. [Bug 1409140]
 	 */
-	if (!(masterPtr->flags & COMPLEX_ALPHA)) {
+	if (!(modelPtr->flags & COMPLEX_ALPHA)) {
 	    unsigned char newAlpha;
 
-	    destLinePtr = masterPtr->pix32 + (y * masterPtr->width + x) * 4;
+	    destLinePtr = modelPtr->pix32 + (y * modelPtr->width + x) * 4;
 	    newAlpha = destLinePtr[3];
 
 	    if (newAlpha && newAlpha != 255) {
-		masterPtr->flags |= COMPLEX_ALPHA;
+		modelPtr->flags |= COMPLEX_ALPHA;
 	    }
 	}
-    } else if ((alphaOffset != 0) || (masterPtr->flags & COMPLEX_ALPHA)) {
+    } else if ((alphaOffset != 0) || (modelPtr->flags & COMPLEX_ALPHA)) {
 	/*
 	 * Check for partial transparency if alpha pixels are specified, or
 	 * rescan if we already knew such pixels existed. To restrict this
 	 * Toggle to only checking the changed pixels requires knowing where
 	 * the alpha pixels are.
 	 */
-	ToggleComplexAlphaIfNeeded(masterPtr);
+	ToggleComplexAlphaIfNeeded(modelPtr);
     }
 
     /*
      * Update each instance.
      */
 
-    Tk_DitherPhoto((Tk_PhotoHandle) masterPtr, x, y, width, height);
+    Tk_DitherPhoto((Tk_PhotoHandle) modelPtr, x, y, width, height);
 
     /*
      * Tell the core image code that this image has changed.
      */
 
-    Tk_ImageChanged(masterPtr->tkMaster, x, y, width, height, masterPtr->width,
-	    masterPtr->height);
+    Tk_ImageChanged(modelPtr->tkMaster, x, y, width, height, modelPtr->width,
+	    modelPtr->height);
 
     if (memToFree) ckfree(memToFree);
 
@@ -3493,7 +3493,7 @@ Tk_PhotoPutZoomedBlock(
  *
  * Side effects:
  *	The pixmap of each instance of this image gets updated. The fields in
- *	*masterPtr indicating which area of the image is correctly dithered
+ *	*modelPtr indicating which area of the image is correctly dithered
  *	get updated.
  *
  *----------------------------------------------------------------------
@@ -3507,14 +3507,14 @@ Tk_DitherPhoto(
 				 * area to be dithered. */
     int width, int height)	/* Dimensions of the area to be dithered. */
 {
-    PhotoMaster *masterPtr = (PhotoMaster *) photo;
+    PhotoModel *modelPtr = (PhotoModel *) photo;
     PhotoInstance *instancePtr;
 
     if ((width <= 0) || (height <= 0)) {
 	return;
     }
 
-    for (instancePtr = masterPtr->instancePtr; instancePtr != NULL;
+    for (instancePtr = modelPtr->instancePtr; instancePtr != NULL;
 	    instancePtr = instancePtr->nextPtr) {
 	TkImgDitherInstance(instancePtr, x, y, width, height);
     }
@@ -3524,23 +3524,23 @@ Tk_DitherPhoto(
      * will extend the correctly dithered region.
      */
 
-    if (((y < masterPtr->ditherY)
-	    || ((y == masterPtr->ditherY) && (x <= masterPtr->ditherX)))
-	    && ((y + height) > (masterPtr->ditherY))) {
+    if (((y < modelPtr->ditherY)
+	    || ((y == modelPtr->ditherY) && (x <= modelPtr->ditherX)))
+	    && ((y + height) > (modelPtr->ditherY))) {
 	/*
 	 * This block starts inside (or immediately after) the correctly
 	 * dithered region, so the first scan line at least will be right.
-	 * Furthermore this block extends into scanline masterPtr->ditherY.
+	 * Furthermore this block extends into scanline modelPtr->ditherY.
 	 */
 
-	if ((x == 0) && (width == masterPtr->width)) {
+	if ((x == 0) && (width == modelPtr->width)) {
 	    /*
 	     * We are doing the full width, therefore the dithering will be
 	     * correct to the end.
 	     */
 
-	    masterPtr->ditherX = 0;
-	    masterPtr->ditherY = y + height;
+	    modelPtr->ditherX = 0;
+	    modelPtr->ditherY = y + height;
 	} else {
 	    /*
 	     * We are doing partial scanlines, therefore the
@@ -3548,11 +3548,11 @@ Tk_DitherPhoto(
 	     * line.
 	     */
 
-	    if (x <= masterPtr->ditherX) {
-		masterPtr->ditherX = x + width;
-		if (masterPtr->ditherX >= masterPtr->width) {
-		    masterPtr->ditherX = 0;
-		    masterPtr->ditherY++;
+	    if (x <= modelPtr->ditherX) {
+		modelPtr->ditherX = x + width;
+		if (modelPtr->ditherX >= modelPtr->width) {
+		    modelPtr->ditherX = 0;
+		    modelPtr->ditherY++;
 		}
 	    }
 	}
@@ -3580,29 +3580,29 @@ void
 Tk_PhotoBlank(
     Tk_PhotoHandle handle)	/* Handle for the image to be blanked. */
 {
-    PhotoMaster *masterPtr = (PhotoMaster *) handle;
+    PhotoModel *modelPtr = (PhotoModel *) handle;
     PhotoInstance *instancePtr;
 
-    masterPtr->ditherX = masterPtr->ditherY = 0;
-    masterPtr->flags = 0;
+    modelPtr->ditherX = modelPtr->ditherY = 0;
+    modelPtr->flags = 0;
 
     /*
      * The image has valid data nowhere.
      */
 
-    if (masterPtr->validRegion != NULL) {
-	TkDestroyRegion(masterPtr->validRegion);
+    if (modelPtr->validRegion != NULL) {
+	TkDestroyRegion(modelPtr->validRegion);
     }
-    masterPtr->validRegion = TkCreateRegion();
+    modelPtr->validRegion = TkCreateRegion();
 
     /*
      * Clear out the 32-bit pixel storage array. Clear out the dithering error
      * arrays for each instance.
      */
 
-    memset(masterPtr->pix32, 0,
-	    ((size_t)masterPtr->width * masterPtr->height * 4));
-    for (instancePtr = masterPtr->instancePtr; instancePtr != NULL;
+    memset(modelPtr->pix32, 0,
+	    ((size_t)modelPtr->width * modelPtr->height * 4));
+    for (instancePtr = modelPtr->instancePtr; instancePtr != NULL;
 	    instancePtr = instancePtr->nextPtr) {
 	TkImgResetDither(instancePtr);
     }
@@ -3611,8 +3611,8 @@ Tk_PhotoBlank(
      * Tell the core image code that this image has changed.
      */
 
-    Tk_ImageChanged(masterPtr->tkMaster, 0, 0, masterPtr->width,
-	    masterPtr->height, masterPtr->width, masterPtr->height);
+    Tk_ImageChanged(modelPtr->tkMaster, 0, 0, modelPtr->width,
+	    modelPtr->height, modelPtr->width, modelPtr->height);
 }
 
 /*
@@ -3642,17 +3642,17 @@ Tk_PhotoExpand(
     Tk_PhotoHandle handle,	/* Handle for the image to be expanded. */
     int width, int height)	/* Desired minimum dimensions of the image. */
 {
-    PhotoMaster *masterPtr = (PhotoMaster *) handle;
+    PhotoModel *modelPtr = (PhotoModel *) handle;
 
-    if (width <= masterPtr->width) {
-	width = masterPtr->width;
+    if (width <= modelPtr->width) {
+	width = modelPtr->width;
     }
-    if (height <= masterPtr->height) {
-	height = masterPtr->height;
+    if (height <= modelPtr->height) {
+	height = modelPtr->height;
     }
-    if ((width != masterPtr->width) || (height != masterPtr->height)) {
-	if (ImgPhotoSetSize(masterPtr, MAX(width, masterPtr->width),
-		MAX(height, masterPtr->height)) == TCL_ERROR) {
+    if ((width != modelPtr->width) || (height != modelPtr->height)) {
+	if (ImgPhotoSetSize(modelPtr, MAX(width, modelPtr->width),
+		MAX(height, modelPtr->height)) == TCL_ERROR) {
 	    if (interp != NULL) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			TK_PHOTO_ALLOC_FAILURE_MESSAGE, -1));
@@ -3660,8 +3660,8 @@ Tk_PhotoExpand(
 	    }
 	    return TCL_ERROR;
 	}
-	Tk_ImageChanged(masterPtr->tkMaster, 0, 0, 0, 0, masterPtr->width,
-		masterPtr->height);
+	Tk_ImageChanged(modelPtr->tkMaster, 0, 0, 0, 0, modelPtr->width,
+		modelPtr->height);
     }
     return TCL_OK;
 }
@@ -3690,10 +3690,10 @@ Tk_PhotoGetSize(
 				/* The dimensions of the image are returned
 				 * here. */
 {
-    PhotoMaster *masterPtr = (PhotoMaster *) handle;
+    PhotoModel *modelPtr = (PhotoModel *) handle;
 
-    *widthPtr = masterPtr->width;
-    *heightPtr = masterPtr->height;
+    *widthPtr = modelPtr->width;
+    *heightPtr = modelPtr->height;
 }
 
 /*
@@ -3722,12 +3722,12 @@ Tk_PhotoSetSize(
 				 * set. */
     int width, int height)	/* New dimensions for the image. */
 {
-    PhotoMaster *masterPtr = (PhotoMaster *) handle;
+    PhotoModel *modelPtr = (PhotoModel *) handle;
 
-    masterPtr->userWidth = width;
-    masterPtr->userHeight = height;
-    if (ImgPhotoSetSize(masterPtr, ((width > 0) ? width: masterPtr->width),
-	    ((height > 0) ? height: masterPtr->height)) == TCL_ERROR) {
+    modelPtr->userWidth = width;
+    modelPtr->userHeight = height;
+    if (ImgPhotoSetSize(modelPtr, ((width > 0) ? width: modelPtr->width),
+	    ((height > 0) ? height: modelPtr->height)) == TCL_ERROR) {
 	if (interp != NULL) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    TK_PHOTO_ALLOC_FAILURE_MESSAGE, -1));
@@ -3735,8 +3735,8 @@ Tk_PhotoSetSize(
 	}
 	return TCL_ERROR;
     }
-    Tk_ImageChanged(masterPtr->tkMaster, 0, 0, 0, 0,
-	    masterPtr->width, masterPtr->height);
+    Tk_ImageChanged(modelPtr->tkMaster, 0, 0, 0, 0,
+	    modelPtr->width, modelPtr->height);
     return TCL_OK;
 }
 
@@ -3765,9 +3765,9 @@ TkPhotoGetValidRegion(
     Tk_PhotoHandle handle)	/* Handle for the image whose valid region is
 				 * to obtained. */
 {
-    PhotoMaster *masterPtr = (PhotoMaster *) handle;
+    PhotoModel *modelPtr = (PhotoModel *) handle;
 
-    return masterPtr->validRegion;
+    return modelPtr->validRegion;
 }
 
 /*
@@ -3793,7 +3793,7 @@ TkPhotoGetValidRegion(
 
 static char *
 ImgGetPhoto(
-    PhotoMaster *masterPtr,	/* Handle for the photo image from which image
+    PhotoModel *modelPtr,	/* Handle for the photo image from which image
 				 * data is desired. */
     Tk_PhotoImageBlock *blockPtr,
 				/* Information about the address and layout of
@@ -3803,13 +3803,13 @@ ImgGetPhoto(
     unsigned char *pixelPtr;
     int x, y, greenOffset, blueOffset, alphaOffset;
 
-    Tk_PhotoGetImage((Tk_PhotoHandle) masterPtr, blockPtr);
+    Tk_PhotoGetImage((Tk_PhotoHandle) modelPtr, blockPtr);
     blockPtr->pixelPtr += optPtr->fromY * blockPtr->pitch
 	    + optPtr->fromX * blockPtr->pixelSize;
     blockPtr->width = optPtr->fromX2 - optPtr->fromX;
     blockPtr->height = optPtr->fromY2 - optPtr->fromY;
 
-    if (!(masterPtr->flags & COLOR_IMAGE) &&
+    if (!(modelPtr->flags & COLOR_IMAGE) &&
 	    (!(optPtr->options & OPT_BACKGROUND)
 	    || ((optPtr->background->red == optPtr->background->green)
 	    && (optPtr->background->red == optPtr->background->blue)))) {
@@ -4041,12 +4041,12 @@ Tk_PhotoGetImage(
 				/* Information about the address and layout of
 				 * the image data is returned here. */
 {
-    PhotoMaster *masterPtr = (PhotoMaster *) handle;
+    PhotoModel *modelPtr = (PhotoModel *) handle;
 
-    blockPtr->pixelPtr = masterPtr->pix32;
-    blockPtr->width = masterPtr->width;
-    blockPtr->height = masterPtr->height;
-    blockPtr->pitch = masterPtr->width * 4;
+    blockPtr->pixelPtr = modelPtr->pix32;
+    blockPtr->width = modelPtr->width;
+    blockPtr->height = modelPtr->height;
+    blockPtr->pitch = modelPtr->width * 4;
     blockPtr->pixelSize = 4;
     blockPtr->offset[0] = 0;
     blockPtr->offset[1] = 1;
diff --git a/generic/tkImgPhoto.h b/generic/tkImgPhoto.h
index 36bc6cb..90705e9 100644
--- a/generic/tkImgPhoto.h
+++ b/generic/tkImgPhoto.h
@@ -27,10 +27,11 @@
  * Forward declarations of the structures we define.
  */
 
+#define PhotoMaster PhotoModel
 typedef struct ColorTableId	ColorTableId;
 typedef struct ColorTable	ColorTable;
 typedef struct PhotoInstance	PhotoInstance;
-typedef struct PhotoMaster	PhotoMaster;
+typedef struct PhotoModel	PhotoModel;
 
 /*
  * A signed 8-bit integral type. If chars are unsigned and the compiler isn't
@@ -140,8 +141,8 @@ struct ColorTable {
  * Definition of the data associated with each photo image master.
  */
 
-struct PhotoMaster {
-    Tk_ImageMaster tkMaster;	/* Tk's token for image master. NULL means the
+struct PhotoModel {
+    Tk_ImageModel tkMaster;	/* Tk's token for image model. NULL means the
 				 * image is being deleted. */
     Tcl_Interp *interp;		/* Interpreter associated with the application
 				 * using this image. */
@@ -168,7 +169,7 @@ struct PhotoMaster {
 };
 
 /*
- * Bit definitions for the flags field of a PhotoMaster.
+ * Bit definitions for the flags field of a PhotoModel.
  * COLOR_IMAGE:			1 means that the image has different color
  *				components.
  * IMAGE_CHANGED:		1 means that the instances of this image need
@@ -195,7 +196,7 @@ struct PhotoMaster {
  */
 
 struct PhotoInstance {
-    PhotoMaster *masterPtr;	/* Pointer to master for image. */
+    PhotoModel *masterPtr;	/* Pointer to master for image. */
     Display *display;		/* Display for windows using this instance. */
     Colormap colormap;		/* The image may only be used in windows with
 				 * this particular colormap. */
diff --git a/generic/tkInt.h b/generic/tkInt.h
index 23605cf..9c61c20 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -665,7 +665,7 @@ typedef struct TkMainInfo {
 				/* Top level of option hierarchy for this main
 				 * window. NULL means uninitialized. Managed
 				 * by tkOption.c. */
-    Tcl_HashTable imageTable;	/* Maps from image names to Tk_ImageMaster
+    Tcl_HashTable imageTable;	/* Maps from image names to Tk_ImageModel
 				 * structures. Managed by tkImage.c. */
     int strictMotif;		/* This is linked to the tk_strictMotif global
 				 * variable. */
diff --git a/generic/tkOldTest.c b/generic/tkOldTest.c
index 948883d..8996f31 100644
--- a/generic/tkOldTest.c
+++ b/generic/tkOldTest.c
@@ -25,17 +25,17 @@
 #include "tkInt.h"
 
 /*
- * The following data structure represents the master for a test image:
+ * The following data structure represents the model for a test image:
  */
 
-typedef struct TImageMaster {
-    Tk_ImageMaster master;      /* Tk's token for image master. */
+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). */
-} TImageMaster;
+} TImageModel;
 
 /*
  * The following data structure represents a particular use of a particular
@@ -43,7 +43,7 @@ typedef struct TImageMaster {
  */
 
 typedef struct TImageInstance {
-    TImageMaster *masterPtr;    /* Pointer to master for image. */
+    TImageModel *modelPtr;    /* Pointer to model for image. */
     XColor *fg;                 /* Foreground color for drawing in image. */
     GC gc;                      /* Graphics context for drawing in image. */
 } TImageInstance;
@@ -54,7 +54,7 @@ typedef struct TImageInstance {
 
 static int		ImageCreate(Tcl_Interp *interp,
 			    char *name, int argc, char **argv,
-			    Tk_ImageType *typePtr, Tk_ImageMaster master,
+			    Tk_ImageType *typePtr, Tk_ImageModel model,
 			    ClientData *clientDataPtr);
 static ClientData	ImageGet(Tk_Window tkwin, ClientData clientData);
 static void		ImageDisplay(ClientData clientData,
@@ -143,12 +143,12 @@ ImageCreate(
     char **argv,		/* Argument strings for options (doesn't
 				 * include image name or type). */
     Tk_ImageType *typePtr,	/* Pointer to our type record (not used). */
-    Tk_ImageMaster master,	/* Token for image, to be used by us in later
+    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. */
 {
-    TImageMaster *timPtr;
+    TImageModel *timPtr;
     const char *varName;
     int i;
 
@@ -167,8 +167,8 @@ ImageCreate(
 	varName = argv[i+1];
     }
 
-    timPtr = ckalloc(sizeof(TImageMaster));
-    timPtr->master = master;
+    timPtr = ckalloc(sizeof(TImageModel));
+    timPtr->model = model;
     timPtr->interp = interp;
     timPtr->width = 30;
     timPtr->height = 15;
@@ -178,7 +178,7 @@ ImageCreate(
     strcpy(timPtr->varName, varName);
     Tcl_CreateObjCommand(interp, name, ImageObjCmd, timPtr, NULL);
     *clientDataPtr = timPtr;
-    Tk_ImageChanged(master, 0, 0, 30, 15, 30, 15);
+    Tk_ImageChanged(model, 0, 0, 30, 15, 30, 15);
     return TCL_OK;
 }
 
@@ -207,7 +207,7 @@ ImageObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])		/* Argument strings. */
 {
-    TImageMaster *timPtr = clientData;
+    TImageModel *timPtr = clientData;
     int x, y, width, height;
 
     if (objc < 2) {
@@ -228,7 +228,7 @@ ImageObjCmd(
 		|| (Tcl_GetIntFromObj(interp, objv[7], &timPtr->height) != TCL_OK)) {
 	    return TCL_ERROR;
 	}
-	Tk_ImageChanged(timPtr->master, x, y, width, height, timPtr->width,
+	Tk_ImageChanged(timPtr->model, x, y, width, height, timPtr->width,
 		timPtr->height);
     } else {
 	Tcl_AppendResult(interp, "bad option \"", Tcl_GetString(objv[1]),
@@ -260,9 +260,9 @@ static ClientData
 ImageGet(
     Tk_Window tkwin,		/* Token for window in which image will be
 				 * used. */
-    ClientData clientData)	/* Pointer to TImageMaster for image. */
+    ClientData clientData)	/* Pointer to TImageModel for image. */
 {
-    TImageMaster *timPtr = clientData;
+    TImageModel *timPtr = clientData;
     TImageInstance *instPtr;
     char buffer[100];
     XGCValues gcValues;
@@ -272,7 +272,7 @@ ImageGet(
 	    TCL_GLOBAL_ONLY|TCL_APPEND_VALUE|TCL_LIST_ELEMENT);
 
     instPtr = ckalloc(sizeof(TImageInstance));
-    instPtr->masterPtr = timPtr;
+    instPtr->modelPtr = timPtr;
     instPtr->fg = Tk_GetColor(timPtr->interp, tkwin, "#ff0000");
     gcValues.foreground = instPtr->fg->pixel;
     instPtr->gc = Tk_GetGC(tkwin, GCForeground, &gcValues);
@@ -313,15 +313,15 @@ ImageDisplay(
     char buffer[200 + TCL_INTEGER_SPACE * 6];
 
     sprintf(buffer, "%s display %d %d %d %d %d %d",
-	    instPtr->masterPtr->imageName, imageX, imageY, width, height,
+	    instPtr->modelPtr->imageName, imageX, imageY, width, height,
 	    drawableX, drawableY);
-    Tcl_SetVar2(instPtr->masterPtr->interp, instPtr->masterPtr->varName, NULL,
+    Tcl_SetVar2(instPtr->modelPtr->interp, instPtr->modelPtr->varName, NULL,
 	    buffer, TCL_GLOBAL_ONLY|TCL_APPEND_VALUE|TCL_LIST_ELEMENT);
-    if (width > (instPtr->masterPtr->width - imageX)) {
-	width = instPtr->masterPtr->width - imageX;
+    if (width > (instPtr->modelPtr->width - imageX)) {
+	width = instPtr->modelPtr->width - imageX;
     }
-    if (height > (instPtr->masterPtr->height - imageY)) {
-	height = instPtr->masterPtr->height - imageY;
+    if (height > (instPtr->modelPtr->height - imageY)) {
+	height = instPtr->modelPtr->height - imageY;
     }
     XDrawRectangle(display, drawable, instPtr->gc, drawableX, drawableY,
 	    (unsigned) (width-1), (unsigned) (height-1));
@@ -357,8 +357,8 @@ ImageFree(
     TImageInstance *instPtr = clientData;
     char buffer[200];
 
-    sprintf(buffer, "%s free", instPtr->masterPtr->imageName);
-    Tcl_SetVar2(instPtr->masterPtr->interp, instPtr->masterPtr->varName, NULL,
+    sprintf(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);
@@ -384,11 +384,11 @@ ImageFree(
 
 static void
 ImageDelete(
-    ClientData clientData)	/* Pointer to TImageMaster for image. When
+    ClientData clientData)	/* Pointer to TImageModel for image. When
 				 * this function is called, no more instances
 				 * exist. */
 {
-    TImageMaster *timPtr = clientData;
+    TImageModel *timPtr = clientData;
     char buffer[100];
 
     sprintf(buffer, "%s delete", timPtr->imageName);
diff --git a/generic/tkPack.c b/generic/tkPack.c
index 9005d7f..245c6a4 100644
--- a/generic/tkPack.c
+++ b/generic/tkPack.c
@@ -198,11 +198,11 @@ Tk_PackObjCmd(
     const char *argv2;
     static const char *const optionStrings[] = {
 	/* after, append, before and unpack are deprecated */
-	"after", "append", "before", "unpack",
-	"configure", "forget", "info", "propagate", "slaves", NULL };
+	"after", "append", "before", "unpack", "configure",
+	"content", "forget", "info", "propagate", "slaves", NULL };
     enum options {
-	PACK_AFTER, PACK_APPEND, PACK_BEFORE, PACK_UNPACK,
-	PACK_CONFIGURE, PACK_FORGET, PACK_INFO, PACK_PROPAGATE, PACK_SLAVES };
+	PACK_AFTER, PACK_APPEND, PACK_BEFORE, PACK_UNPACK, PACK_CONFIGURE,
+	PACK_CONTENT, PACK_FORGET, PACK_INFO, PACK_PROPAGATE, PACK_SLAVES };
     int index;
 
     if (objc >= 2) {
@@ -436,6 +436,7 @@ Tk_PackObjCmd(
 	}
 	break;
     }
+    case PACK_CONTENT:
     case PACK_SLAVES: {
 	Tk_Window master;
 	Packer *masterPtr, *slavePtr;
diff --git a/generic/tkPlace.c b/generic/tkPlace.c
index 59b8a2b..f5afa38 100644
--- a/generic/tkPlace.c
+++ b/generic/tkPlace.c
@@ -214,9 +214,9 @@ Tk_PlaceObjCmd(
     TkDisplay *dispPtr;
     Tk_OptionTable optionTable;
     static const char *const optionStrings[] = {
-	"configure", "forget", "info", "slaves", NULL
+	"configure", "content", "forget", "info", "slaves", NULL
     };
-    enum options { PLACE_CONFIGURE, PLACE_FORGET, PLACE_INFO, PLACE_SLAVES };
+    enum options { PLACE_CONFIGURE, PLACE_CONTENT, PLACE_FORGET, PLACE_INFO, PLACE_SLAVES };
     int index;
 
     if (objc < 3) {
@@ -330,6 +330,7 @@ Tk_PlaceObjCmd(
 	}
 	return PlaceInfoCommand(interp, tkwin);
 
+    case PLACE_CONTENT:
     case PLACE_SLAVES: {
 	Master *masterPtr;
 
diff --git a/generic/tkTest.c b/generic/tkTest.c
index 26b3fa5..bb7bde5 100644
--- a/generic/tkTest.c
+++ b/generic/tkTest.c
@@ -50,17 +50,17 @@
 #define TCL_STORAGE_CLASS DLLEXPORT
 EXTERN int		Tktest_Init(Tcl_Interp *interp);
 /*
- * The following data structure represents the master for a test image:
+ * The following data structure represents the model for a test image:
  */
 
-typedef struct TImageMaster {
-    Tk_ImageMaster master;	/* Tk's token for image master. */
+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). */
-} TImageMaster;
+} TImageModel;
 
 /*
  * The following data structure represents a particular use of a particular
@@ -68,7 +68,7 @@ typedef struct TImageMaster {
  */
 
 typedef struct TImageInstance {
-    TImageMaster *masterPtr;	/* Pointer to master for image. */
+    TImageModel *modelPtr;	/* Pointer to model for image. */
     XColor *fg;			/* Foreground color for drawing in image. */
     GC gc;			/* Graphics context for drawing in image. */
     Bool displayFailed;         /* macOS display attempted out of drawRect. */
@@ -81,7 +81,7 @@ typedef struct TImageInstance {
 
 static int		ImageCreate(Tcl_Interp *interp,
 			    const char *name, int argc, Tcl_Obj *const objv[],
-			    const Tk_ImageType *typePtr, Tk_ImageMaster master,
+			    const Tk_ImageType *typePtr, Tk_ImageModel model,
 			    ClientData *clientDataPtr);
 static ClientData	ImageGet(Tk_Window tkwin, ClientData clientData);
 static void		ImageDisplay(ClientData clientData,
@@ -1386,12 +1386,12 @@ ImageCreate(
     Tcl_Obj *const objv[],	/* Argument strings for options (doesn't
 				 * include image name or type). */
     const Tk_ImageType *typePtr,	/* Pointer to our type record (not used). */
-    Tk_ImageMaster master,	/* Token for image, to be used by us in later
+	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. */
 {
-    TImageMaster *timPtr;
+    TImageModel *timPtr;
     const char *varName;
     int i;
 
@@ -1410,8 +1410,8 @@ ImageCreate(
 	varName = Tcl_GetString(objv[i+1]);
     }
 
-    timPtr = ckalloc(sizeof(TImageMaster));
-    timPtr->master = master;
+    timPtr = ckalloc(sizeof(TImageModel));
+    timPtr->model = model;
     timPtr->interp = interp;
     timPtr->width = 30;
     timPtr->height = 15;
@@ -1421,7 +1421,7 @@ ImageCreate(
     strcpy(timPtr->varName, varName);
     Tcl_CreateObjCommand(interp, name, ImageObjCmd, timPtr, NULL);
     *clientDataPtr = timPtr;
-    Tk_ImageChanged(master, 0, 0, 30, 15, 30, 15);
+    Tk_ImageChanged(model, 0, 0, 30, 15, 30, 15);
     return TCL_OK;
 }
 
@@ -1450,7 +1450,7 @@ ImageObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])		/* Argument strings. */
 {
-    TImageMaster *timPtr = (TImageMaster *) clientData;
+    TImageModel *timPtr = (TImageModel *) clientData;
     int x, y, width, height;
 
     if (objc < 2) {
@@ -1471,7 +1471,7 @@ ImageObjCmd(
 		|| (Tcl_GetIntFromObj(interp, objv[7], &timPtr->height) != TCL_OK)) {
 	    return TCL_ERROR;
 	}
-	Tk_ImageChanged(timPtr->master, x, y, width, height, timPtr->width,
+	Tk_ImageChanged(timPtr->model, x, y, width, height, timPtr->width,
 		timPtr->height);
     } else {
 	Tcl_AppendResult(interp, "bad option \"", Tcl_GetString(objv[1]),
@@ -1503,9 +1503,9 @@ static ClientData
 ImageGet(
     Tk_Window tkwin,		/* Token for window in which image will be
 				 * used. */
-    ClientData clientData)	/* Pointer to TImageMaster for image. */
+    ClientData clientData)	/* Pointer to TImageModel for image. */
 {
-    TImageMaster *timPtr = (TImageMaster *) clientData;
+    TImageModel *timPtr = (TImageModel *) clientData;
     TImageInstance *instPtr;
     char buffer[100];
     XGCValues gcValues;
@@ -1515,7 +1515,7 @@ ImageGet(
 	    TCL_GLOBAL_ONLY|TCL_APPEND_VALUE|TCL_LIST_ELEMENT);
 
     instPtr = ckalloc(sizeof(TImageInstance));
-    instPtr->masterPtr = timPtr;
+    instPtr->modelPtr = timPtr;
     instPtr->fg = Tk_GetColor(timPtr->interp, tkwin, "#ff0000");
     gcValues.foreground = instPtr->fg->pixel;
     instPtr->gc = Tk_GetGC(tkwin, GCForeground, &gcValues);
@@ -1580,9 +1580,9 @@ ImageDisplay(
 	     */
 
 	    sprintf(instPtr->buffer, "%s display %d %d %d %d",
-	    instPtr->masterPtr->imageName, imageX, imageY, width, height);
+	    instPtr->modelPtr->imageName, imageX, imageY, width, height);
 	}
-	Tcl_SetVar2(instPtr->masterPtr->interp, instPtr->masterPtr->varName,
+	Tcl_SetVar2(instPtr->modelPtr->interp, instPtr->modelPtr->varName,
 		    NULL, instPtr->buffer,
 		    TCL_GLOBAL_ONLY|TCL_APPEND_VALUE|TCL_LIST_ELEMENT);
 	instPtr->displayFailed = False;
@@ -1595,15 +1595,15 @@ ImageDisplay(
 
 	if (instPtr->displayFailed == False) {
 	    sprintf(instPtr->buffer, "%s display %d %d %d %d",
-		    instPtr->masterPtr->imageName, imageX, imageY, width, height);
+		    instPtr->modelPtr->imageName, imageX, imageY, width, height);
 	}
 	instPtr->displayFailed = True;
     }
-    if (width > (instPtr->masterPtr->width - imageX)) {
-	width = instPtr->masterPtr->width - imageX;
+    if (width > (instPtr->modelPtr->width - imageX)) {
+	width = instPtr->modelPtr->width - imageX;
     }
-    if (height > (instPtr->masterPtr->height - imageY)) {
-	height = instPtr->masterPtr->height - imageY;
+    if (height > (instPtr->modelPtr->height - imageY)) {
+	height = instPtr->modelPtr->height - imageY;
     }
 
     XDrawRectangle(display, drawable, instPtr->gc, drawableX, drawableY,
@@ -1640,8 +1640,8 @@ ImageFree(
     TImageInstance *instPtr = (TImageInstance *) clientData;
     char buffer[200];
 
-    sprintf(buffer, "%s free", instPtr->masterPtr->imageName);
-    Tcl_SetVar2(instPtr->masterPtr->interp, instPtr->masterPtr->varName, NULL,
+    sprintf(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);
@@ -1667,11 +1667,11 @@ ImageFree(
 
 static void
 ImageDelete(
-    ClientData clientData)	/* Pointer to TImageMaster for image. When
+    ClientData clientData)	/* Pointer to TImageModel for image. When
 				 * this function is called, no more instances
 				 * exist. */
 {
-    TImageMaster *timPtr = (TImageMaster *) clientData;
+    TImageModel *timPtr = (TImageModel *) clientData;
     char buffer[100];
 
     sprintf(buffer, "%s delete", timPtr->imageName);
diff --git a/tests/grid.test b/tests/grid.test
index 62474ff..eef42e1 100644
--- a/tests/grid.test
+++ b/tests/grid.test
@@ -45,7 +45,7 @@ test grid-1.1 {basic argument checking} -body {
 } -returnCodes error -result {wrong # args: should be "grid option arg ?arg ...?"}
 test grid-1.2 {basic argument checking} -body {
     grid foo bar
-} -returnCodes error -result {bad option "foo": must be anchor, bbox, columnconfigure, configure, forget, info, location, propagate, remove, rowconfigure, size, or slaves}
+} -returnCodes error -result {bad option "foo": must be anchor, bbox, columnconfigure, configure, content, forget, info, location, propagate, remove, rowconfigure, size, or slaves}
 test grid-1.3 {basic argument checking} -body {
     button .b
     grid .b -row 0 -column
diff --git a/tests/oldpack.test b/tests/oldpack.test
index 72ec065..92c411d 100644
--- a/tests/oldpack.test
+++ b/tests/oldpack.test
@@ -452,10 +452,10 @@ test oldpack-8.2 {syntax errors} -body {
 } -returnCodes error -result {wrong # args: should be "pack option arg ?arg ...?"}
 test oldpack-8.3 {syntax errors} -body {
     pack gorp foo
-} -returnCodes error -result {bad option "gorp": must be configure, forget, info, propagate, or slaves}
+} -returnCodes error -result {bad option "gorp": must be configure, content, forget, info, propagate, or slaves}
 test oldpack-8.4 {syntax errors} -body {
     pack a .pack
-} -returnCodes error -result {bad option "a": must be configure, forget, info, propagate, or slaves}
+} -returnCodes error -result {bad option "a": must be configure, content, forget, info, propagate, or slaves}
 test oldpack-8.5 {syntax errors} -body {
     pack after foobar
 } -returnCodes error -result {bad window path name "foobar"}
diff --git a/tests/pack.test b/tests/pack.test
index 86fcad2..7b75363 100644
--- a/tests/pack.test
+++ b/tests/pack.test
@@ -1373,7 +1373,7 @@ test pack-12.46 {command options and errors} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack lousy .pack
-} -returnCodes error -result {bad option "lousy": must be configure, forget, info, propagate, or slaves}
+} -returnCodes error -result {bad option "lousy": must be configure, content, forget, info, propagate, or slaves}
 
 
 test pack-13.1 {window deletion} -setup {
diff --git a/tests/place.test b/tests/place.test
index 0a5e22f..e7cf5ff 100644
--- a/tests/place.test
+++ b/tests/place.test
@@ -329,7 +329,7 @@ test place-9.5 {PlaceObjCmd} -setup {
     place badopt .foo
 } -cleanup {
     destroy .foo
-} -returnCodes error -result {bad option "badopt": must be configure, forget, info, or slaves}
+} -returnCodes error -result {bad option "badopt": must be configure, content, forget, info, or slaves}
 test place-9.6 {PlaceObjCmd, configure errors} -setup {
     destroy .foo
 } -body {
-- 
cgit v0.12


From 1d475e6af22ce0c572da3b7a8235d8a44a89207d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 3 Sep 2020 08:15:25 +0000
Subject: (cherry-pick: Slave ->Pane, Master->Container in tkPanedwindow.c More
 Master->Container-related changes

---
 doc/grid.n                   |   2 +-
 doc/pack.n                   |   2 +-
 doc/wm.n                     |  14 +-
 generic/tkGrid.c             | 628 ++++++++++++++++-----------------
 generic/tkPack.c             | 324 ++++++++---------
 generic/tkPanedWindow.c      | 814 +++++++++++++++++++++----------------------
 generic/tkPlace.c            | 296 ++++++++--------
 generic/tkTextWind.c         |   8 +-
 generic/ttk/ttkManager.c     |  58 +--
 generic/ttk/ttkManager.h     |   8 +-
 generic/ttk/ttkPanedwindow.c |   2 +-
 11 files changed, 1078 insertions(+), 1078 deletions(-)

diff --git a/doc/grid.n b/doc/grid.n
index eb658e7..1af7185 100644
--- a/doc/grid.n
+++ b/doc/grid.n
@@ -393,7 +393,7 @@ If propagation is disabled then grid will not set
 the requested width and height of the master window.
 This may be useful if, for example, you wish for a master
 window to have a fixed size that you specify.
-.SH "RESTRICTIONS ON MASTER WINDOWS"
+.SH "RESTRICTIONS ON CONTAINER WINDOWS"
 .PP
 The master for each slave must either be the slave's parent
 (the default) or a descendant of the slave's parent.
diff --git a/doc/pack.n b/doc/pack.n
index 538af62..7345d5a 100644
--- a/doc/pack.n
+++ b/doc/pack.n
@@ -239,7 +239,7 @@ If propagation is disabled then the packer will not set
 the requested width and height of the packer.
 This may be useful if, for example, you wish for a master
 window to have a fixed size that you specify.
-.SH "RESTRICTIONS ON MASTER WINDOWS"
+.SH "RESTRICTIONS ON CONTAINER WINDOWS"
 .PP
 The master for each slave must either be the slave's parent
 (the default) or a descendant of the slave's parent.
diff --git a/doc/wm.n b/doc/wm.n
index a137d06..9ab90f5 100644
--- a/doc/wm.n
+++ b/doc/wm.n
@@ -708,18 +708,18 @@ case the command returns an empty string.  If \fIstring\fR is not
 specified then the command returns the current title for the
 \fIwindow\fR.  The title for a window defaults to its name.
 .TP
-\fBwm transient \fIwindow\fR ?\fImaster\fR?
+\fBwm transient \fIwindow\fR ?\fIcontainer\fR?
 .
-If \fImaster\fR is specified, then the window manager is informed that
+If \fIcontainer\fR is specified, then the window manager is informed that
 \fIwindow\fR is a transient window (e.g. pull-down menu) working on
-behalf of \fImaster\fR (where \fImaster\fR is the path name for a
-top-level window).  If \fImaster\fR is specified as an empty string
+behalf of \fIcontainer\fR (where \fIcontainer\fR is the path name for a
+top-level window).  If \fIcontainer\fR is specified as an empty string
 then \fIwindow\fR is marked as not being a transient window any more.
 Otherwise the command returns the path name of \fIwindow\fR's current
-master, or an empty string if \fIwindow\fR is not currently a
+container, or an empty string if \fIwindow\fR is not currently a
 transient window.  A transient window will mirror state changes in the
-master and inherit the state of the master when initially mapped. The
-directed graph with an edge from each transient to its master must be
+container and inherit the state of the container when initially mapped. The
+directed graph with an edge from each transient to its container must be
 acyclic.  In particular, it is an error to attempt to make a window a
 transient of itself.  The window manager may also decorate a transient
 window differently, removing some features normally present (e.g.,
diff --git a/generic/tkGrid.c b/generic/tkGrid.c
index 835971d..41f5213 100644
--- a/generic/tkGrid.c
+++ b/generic/tkGrid.c
@@ -66,7 +66,7 @@
 #define GRID_DEFAULT_ANCHOR TK_ANCHOR_NW
 
 /*
- * Structure to hold information for grid masters. A slot is either a row or
+ * Structure to hold information for grid containers. A slot is either a row or
  * column.
  */
 
@@ -124,7 +124,7 @@ typedef struct GridLayout {
 } GridLayout;
 
 /*
- * Keep one of these for each geometry master.
+ * Keep one of these for each geometry container.
  */
 
 typedef struct {
@@ -139,9 +139,9 @@ typedef struct {
     int rowSpace;		/* The number of slots currently allocated for
     				 * row constraints. */
     int startX;			/* Pixel offset of this layout within its
-    				 * master. */
+    				 * container. */
     int startY;			/* Pixel offset of this layout within its
-    				 * master. */
+    				 * container. */
     Tk_Anchor anchor;		/* Value of anchor option: specifies where a
 				 * grid without weight should be placed. */
 } GridMaster;
@@ -157,15 +157,15 @@ typedef struct Gridder {
 				 * window has been deleted, but the gridder
 				 * hasn't had a chance to clean up yet because
 				 * the structure is still in use. */
-    struct Gridder *masterPtr;	/* Master window within which this window is
+    struct Gridder *containerPtr;	/* Master window within which this window is
 				 * managed (NULL means this window isn't
 				 * managed by the gridder). */
-    struct Gridder *nextPtr;	/* Next window managed within same master.
+    struct Gridder *nextPtr;	/* Next window managed within same container.
 				 * List order doesn't matter. */
     struct Gridder *slavePtr;	/* First in list of slaves managed inside this
 				 * window (NULL means no grid slaves). */
-    GridMaster *masterDataPtr;	/* Additional data for geometry master. */
-    Tcl_Obj *in;                /* Store master name when removed. */
+    GridMaster *containerDataPtr;	/* Additional data for geometry container. */
+    Tcl_Obj *in;                /* Store container name when removed. */
     int column, row;		/* Location in the grid (starting from
 				 * zero). */
     int numCols, numRows;	/* Number of columns or rows this slave spans.
@@ -185,7 +185,7 @@ typedef struct Gridder {
 				 * sticks to. See below for definitions */
     int doubleBw;		/* Twice the window's last known border width.
 				 * If this changes, the window must be
-				 * re-arranged within its master. */
+				 * re-arranged within its container. */
     int *abortPtr;		/* If non-NULL, it means that there is a
 				 * nested call to ArrangeGrid already working
 				 * on this window. *abortPtr may be set to 1
@@ -238,16 +238,16 @@ typedef struct UniformGroup {
  *				been made to re-arrange all the slaves of this
  *				window.
  * DONT_PROPAGATE		1 means don't set this window's requested
- *				size. 0 means if this window is a master then
+ *				size. 0 means if this window is a container then
  *				Tk will set its requested size to fit the
  *				needs of its slaves.
- * ALLOCED_MASTER               1 means that Grid has allocated itself as
- *                              geometry master for this window.
+ * ALLOCED_CONTAINER		1 means that Grid has allocated itself as
+ *				geometry container for this window.
  */
 
 #define REQUESTED_RELAYOUT	1
 #define DONT_PROPAGATE		2
-#define ALLOCED_MASTER		4
+#define ALLOCED_CONTAINER	4
 
 /*
  * Prototypes for procedures used only in this file:
@@ -258,7 +258,7 @@ static void		AdjustForSticky(Gridder *slavePtr, int *xPtr,
 static int		AdjustOffsets(int width, int elements,
 			    SlotInfo *slotPtr);
 static void		ArrangeGrid(ClientData clientData);
-static int		CheckSlotData(Gridder *masterPtr, int slot,
+static int		CheckSlotData(Gridder *containerPtr, int slot,
 			    int slotType, int checkOnly);
 static int		ConfigureSlaves(Tcl_Interp *interp, Tk_Window tkwin,
 			    int objc, Tcl_Obj *const objv[]);
@@ -291,7 +291,7 @@ static void		GridStructureProc(ClientData clientData,
 static void		GridLostSlaveProc(ClientData clientData,
 			    Tk_Window tkwin);
 static void		GridReqProc(ClientData clientData, Tk_Window tkwin);
-static void		InitMasterData(Gridder *masterPtr);
+static void		InitMasterData(Gridder *containerPtr);
 static Tcl_Obj *	NewPairObj(int, int);
 static Tcl_Obj *	NewQuadObj(int, int, int, int);
 static int		ResolveConstraints(Gridder *gridPtr, int rowOrColumn,
@@ -390,11 +390,11 @@ Tk_GridObjCmd(
 
     /*
      * Sample argument combinations:
-     *  grid columnconfigure <master> <index> -option
-     *  grid columnconfigure <master> <index> -option value -option value
-     *  grid rowconfigure <master> <index>
-     *  grid rowconfigure <master> <index> -option
-     *  grid rowconfigure <master> <index> -option value -option value.
+     *  grid columnconfigure <container> <index> -option
+     *  grid columnconfigure <container> <index> -option value -option value
+     *  grid rowconfigure <container> <index>
+     *  grid rowconfigure <container> <index> -option
+     *  grid rowconfigure <container> <index> -option value -option value.
      */
 
     case GRID_COLUMNCONFIGURE:
@@ -432,8 +432,8 @@ GridAnchorCommand(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tk_Window master;
-    Gridder *masterPtr;
+    Tk_Window container;
+    Gridder *containerPtr;
     GridMaster *gridPtr;
     Tk_Anchor old;
 
@@ -442,21 +442,21 @@ GridAnchorCommand(
 	return TCL_ERROR;
     }
 
-    if (TkGetWindowFromObj(interp, tkwin, objv[2], &master) != TCL_OK) {
+    if (TkGetWindowFromObj(interp, tkwin, objv[2], &container) != TCL_OK) {
 	return TCL_ERROR;
     }
-    masterPtr = GetGrid(master);
+    containerPtr = GetGrid(container);
 
     if (objc == 3) {
-	gridPtr = masterPtr->masterDataPtr;
+	gridPtr = containerPtr->containerDataPtr;
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		Tk_NameOfAnchor(gridPtr?gridPtr->anchor:GRID_DEFAULT_ANCHOR),
 		-1));
 	return TCL_OK;
     }
 
-    InitMasterData(masterPtr);
-    gridPtr = masterPtr->masterDataPtr;
+    InitMasterData(containerPtr);
+    gridPtr = containerPtr->containerDataPtr;
     old = gridPtr->anchor;
     if (Tk_GetAnchorFromObj(interp, objv[3], &gridPtr->anchor) != TCL_OK) {
 	return TCL_ERROR;
@@ -467,12 +467,12 @@ GridAnchorCommand(
      */
 
     if (old != gridPtr->anchor) {
-	if (masterPtr->abortPtr != NULL) {
-	    *masterPtr->abortPtr = 1;
+	if (containerPtr->abortPtr != NULL) {
+	    *containerPtr->abortPtr = 1;
 	}
-	if (!(masterPtr->flags & REQUESTED_RELAYOUT)) {
-	    masterPtr->flags |= REQUESTED_RELAYOUT;
-	    Tcl_DoWhenIdle(ArrangeGrid, masterPtr);
+	if (!(containerPtr->flags & REQUESTED_RELAYOUT)) {
+	    containerPtr->flags |= REQUESTED_RELAYOUT;
+	    Tcl_DoWhenIdle(ArrangeGrid, containerPtr);
 	}
     }
     return TCL_OK;
@@ -501,8 +501,8 @@ GridBboxCommand(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tk_Window master;
-    Gridder *masterPtr;		/* master grid record */
+    Tk_Window container;
+    Gridder *containerPtr;		/* container grid record */
     GridMaster *gridPtr;	/* pointer to grid data */
     int row, column;		/* origin for bounding box */
     int row2, column2;		/* end of bounding box */
@@ -515,10 +515,10 @@ GridBboxCommand(
 	return TCL_ERROR;
     }
 
-    if (TkGetWindowFromObj(interp, tkwin, objv[2], &master) != TCL_OK) {
+    if (TkGetWindowFromObj(interp, tkwin, objv[2], &container) != TCL_OK) {
 	return TCL_ERROR;
     }
-    masterPtr = GetGrid(master);
+    containerPtr = GetGrid(container);
 
     if (objc >= 5) {
 	if (Tcl_GetIntFromObj(interp, objv[3], &column) != TCL_OK) {
@@ -540,13 +540,13 @@ GridBboxCommand(
 	}
     }
 
-    gridPtr = masterPtr->masterDataPtr;
+    gridPtr = containerPtr->containerDataPtr;
     if (gridPtr == NULL) {
 	Tcl_SetObjResult(interp, NewQuadObj(0, 0, 0, 0));
 	return TCL_OK;
     }
 
-    SetGridSize(masterPtr);
+    SetGridSize(containerPtr);
     endX = MAX(gridPtr->columnEnd, gridPtr->columnMax);
     endY = MAX(gridPtr->rowEnd, gridPtr->rowMax);
 
@@ -643,7 +643,7 @@ GridForgetRemoveCommand(
 	}
 
 	slavePtr = GetGrid(slave);
-	if (slavePtr->masterPtr != NULL) {
+	if (slavePtr->containerPtr != NULL) {
 	    /*
 	     * For "forget", reset all the settings to their defaults
 	     */
@@ -671,24 +671,24 @@ GridForgetRemoveCommand(
 		slavePtr->sticky = 0;
 	    } else {
 		/*
-		 * When removing, store name of master to be able to
-		 * restore it later, even if the master is recreated.
+		 * When removing, store name of container to be able to
+		 * restore it later, even if the container is recreated.
 		 */
 
 		if (slavePtr->in != NULL) {
 		    Tcl_DecrRefCount(slavePtr->in);
 		    slavePtr->in = NULL;
 		}
-		if (slavePtr->masterPtr != NULL) {
+		if (slavePtr->containerPtr != NULL) {
 		    slavePtr->in = Tcl_NewStringObj(
-			    Tk_PathName(slavePtr->masterPtr->tkwin), -1);
+			    Tk_PathName(slavePtr->containerPtr->tkwin), -1);
 		    Tcl_IncrRefCount(slavePtr->in);
 		}
 	    }
 	    Tk_ManageGeometry(slave, NULL, NULL);
-	    if (slavePtr->masterPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
+	    if (slavePtr->containerPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
 		Tk_UnmaintainGeometry(slavePtr->tkwin,
-			slavePtr->masterPtr->tkwin);
+			slavePtr->containerPtr->tkwin);
 	    }
 	    Unlink(slavePtr);
 	    Tk_UnmapWindow(slavePtr->tkwin);
@@ -733,14 +733,14 @@ GridInfoCommand(
 	return TCL_ERROR;
     }
     slavePtr = GetGrid(slave);
-    if (slavePtr->masterPtr == NULL) {
+    if (slavePtr->containerPtr == NULL) {
 	Tcl_ResetResult(interp);
 	return TCL_OK;
     }
 
     infoObj = Tcl_NewObj();
     Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-in", -1),
-	    TkNewWindowObj(slavePtr->masterPtr->tkwin));
+	    TkNewWindowObj(slavePtr->containerPtr->tkwin));
     Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-column", -1),
 	    Tcl_NewIntObj(slavePtr->column));
     Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-row", -1),
@@ -783,11 +783,11 @@ GridLocationCommand(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tk_Window master;
-    Gridder *masterPtr;		/* Master grid record. */
+    Tk_Window container;
+    Gridder *containerPtr;		/* Master grid record. */
     GridMaster *gridPtr;	/* Pointer to grid data. */
     register SlotInfo *slotPtr;
-    int x, y;			/* Offset in pixels, from edge of master. */
+    int x, y;			/* Offset in pixels, from edge of container. */
     int i, j;			/* Corresponding column and row indeces. */
     int endX, endY;		/* End of grid. */
 
@@ -796,23 +796,23 @@ GridLocationCommand(
 	return TCL_ERROR;
     }
 
-    if (TkGetWindowFromObj(interp, tkwin, objv[2], &master) != TCL_OK) {
+    if (TkGetWindowFromObj(interp, tkwin, objv[2], &container) != TCL_OK) {
 	return TCL_ERROR;
     }
 
-    if (Tk_GetPixelsFromObj(interp, master, objv[3], &x) != TCL_OK) {
+    if (Tk_GetPixelsFromObj(interp, container, objv[3], &x) != TCL_OK) {
 	return TCL_ERROR;
     }
-    if (Tk_GetPixelsFromObj(interp, master, objv[4], &y) != TCL_OK) {
+    if (Tk_GetPixelsFromObj(interp, container, objv[4], &y) != TCL_OK) {
 	return TCL_ERROR;
     }
 
-    masterPtr = GetGrid(master);
-    if (masterPtr->masterDataPtr == NULL) {
+    containerPtr = GetGrid(container);
+    if (containerPtr->containerDataPtr == NULL) {
 	Tcl_SetObjResult(interp, NewPairObj(-1, -1));
 	return TCL_OK;
     }
-    gridPtr = masterPtr->masterDataPtr;
+    gridPtr = containerPtr->containerDataPtr;
 
     /*
      * Update any pending requests. This is not always the steady state value,
@@ -820,29 +820,29 @@ GridLocationCommand(
      * its easy to get.
      */
 
-    while (masterPtr->flags & REQUESTED_RELAYOUT) {
-	Tcl_CancelIdleCall(ArrangeGrid, masterPtr);
-	ArrangeGrid(masterPtr);
+    while (containerPtr->flags & REQUESTED_RELAYOUT) {
+	Tcl_CancelIdleCall(ArrangeGrid, containerPtr);
+	ArrangeGrid(containerPtr);
     }
-    SetGridSize(masterPtr);
+    SetGridSize(containerPtr);
     endX = MAX(gridPtr->columnEnd, gridPtr->columnMax);
     endY = MAX(gridPtr->rowEnd, gridPtr->rowMax);
 
-    slotPtr = masterPtr->masterDataPtr->columnPtr;
-    if (x < masterPtr->masterDataPtr->startX) {
+    slotPtr = containerPtr->containerDataPtr->columnPtr;
+    if (x < containerPtr->containerDataPtr->startX) {
 	i = -1;
     } else {
-	x -= masterPtr->masterDataPtr->startX;
+	x -= containerPtr->containerDataPtr->startX;
 	for (i = 0; slotPtr[i].offset < x && i < endX; i++) {
 	    /* null body */
 	}
     }
 
-    slotPtr = masterPtr->masterDataPtr->rowPtr;
-    if (y < masterPtr->masterDataPtr->startY) {
+    slotPtr = containerPtr->containerDataPtr->rowPtr;
+    if (y < containerPtr->containerDataPtr->startY) {
 	j = -1;
     } else {
-	y -= masterPtr->masterDataPtr->startY;
+	y -= containerPtr->containerDataPtr->startY;
 	for (j = 0; slotPtr[j].offset < y && j < endY; j++) {
 	    /* null body */
 	}
@@ -876,8 +876,8 @@ GridPropagateCommand(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tk_Window master;
-    Gridder *masterPtr;
+    Tk_Window container;
+    Gridder *containerPtr;
     int propagate, old;
 
     if (objc > 4) {
@@ -885,13 +885,13 @@ GridPropagateCommand(
 	return TCL_ERROR;
     }
 
-    if (TkGetWindowFromObj(interp, tkwin, objv[2], &master) != TCL_OK) {
+    if (TkGetWindowFromObj(interp, tkwin, objv[2], &container) != TCL_OK) {
 	return TCL_ERROR;
     }
-    masterPtr = GetGrid(master);
+    containerPtr = GetGrid(container);
     if (objc == 3) {
 	Tcl_SetObjResult(interp,
-		Tcl_NewBooleanObj(!(masterPtr->flags & DONT_PROPAGATE)));
+		Tcl_NewBooleanObj(!(containerPtr->flags & DONT_PROPAGATE)));
 	return TCL_OK;
     }
     if (Tcl_GetBooleanFromObj(interp, objv[3], &propagate) != TCL_OK) {
@@ -902,39 +902,39 @@ GridPropagateCommand(
      * Only request a relayout if the propagation bit changes.
      */
 
-    old = !(masterPtr->flags & DONT_PROPAGATE);
+    old = !(containerPtr->flags & DONT_PROPAGATE);
     if (propagate != old) {
 	if (propagate) {
 	    /*
-	     * If we have slaves, we need to register as geometry master.
+	     * If we have slaves, we need to register as geometry container.
 	     */
 
-	    if (masterPtr->slavePtr != NULL) {
-		if (TkSetGeometryMaster(interp, master, "grid")	!= TCL_OK) {
+	    if (containerPtr->slavePtr != NULL) {
+		if (TkSetGeometryMaster(interp, container, "grid")	!= TCL_OK) {
 		    return TCL_ERROR;
 		}
-		masterPtr->flags |= ALLOCED_MASTER;
+		containerPtr->flags |= ALLOCED_CONTAINER;
 	    }
-	    masterPtr->flags &= ~DONT_PROPAGATE;
+	    containerPtr->flags &= ~DONT_PROPAGATE;
 	} else {
-	    if (masterPtr->flags & ALLOCED_MASTER) {
-		TkFreeGeometryMaster(master, "grid");
-		masterPtr->flags &= ~ALLOCED_MASTER;
+	    if (containerPtr->flags & ALLOCED_CONTAINER) {
+		TkFreeGeometryMaster(container, "grid");
+		containerPtr->flags &= ~ALLOCED_CONTAINER;
 	    }
-	    masterPtr->flags |= DONT_PROPAGATE;
+	    containerPtr->flags |= DONT_PROPAGATE;
 	}
 
 	/*
-	 * Re-arrange the master to allow new geometry information to
-	 * propagate upwards to the master's master.
+	 * Re-arrange the container to allow new geometry information to
+	 * propagate upwards to the container's container.
 	 */
 
-	if (masterPtr->abortPtr != NULL) {
-	    *masterPtr->abortPtr = 1;
+	if (containerPtr->abortPtr != NULL) {
+	    *containerPtr->abortPtr = 1;
 	}
-	if (!(masterPtr->flags & REQUESTED_RELAYOUT)) {
-	    masterPtr->flags |= REQUESTED_RELAYOUT;
-	    Tcl_DoWhenIdle(ArrangeGrid, masterPtr);
+	if (!(containerPtr->flags & REQUESTED_RELAYOUT)) {
+	    containerPtr->flags |= REQUESTED_RELAYOUT;
+	    Tcl_DoWhenIdle(ArrangeGrid, containerPtr);
 	}
     }
     return TCL_OK;
@@ -964,8 +964,8 @@ GridRowColumnConfigureCommand(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tk_Window master, slave;
-    Gridder *masterPtr, *slavePtr;
+    Tk_Window container, slave;
+    Gridder *containerPtr, *slavePtr;
     SlotInfo *slotPtr = NULL;
     int slot;			/* the column or row number */
     int slotType;		/* COLUMN or ROW */
@@ -989,7 +989,7 @@ GridRowColumnConfigureCommand(
 	return TCL_ERROR;
     }
 
-    if (TkGetWindowFromObj(interp, tkwin, objv[2], &master) != TCL_OK) {
+    if (TkGetWindowFromObj(interp, tkwin, objv[2], &container) != TCL_OK) {
 	return TCL_ERROR;
     }
 
@@ -1010,7 +1010,7 @@ GridRowColumnConfigureCommand(
 	return TCL_ERROR;
     }
 
-    masterPtr = GetGrid(master);
+    containerPtr = GetGrid(container);
     first = 0; /* lint */
     last = 0; /* lint */
 
@@ -1030,11 +1030,11 @@ GridRowColumnConfigureCommand(
 	    Tcl_DecrRefCount(listCopy);
 	    return TCL_ERROR;
 	}
-	ok = CheckSlotData(masterPtr, slot, slotType, /* checkOnly */ 1);
+	ok = CheckSlotData(containerPtr, slot, slotType, /* checkOnly */ 1);
 	if (ok == TCL_OK) {
 	    slotPtr = (slotType == COLUMN) ?
-		    masterPtr->masterDataPtr->columnPtr :
-		    masterPtr->masterDataPtr->rowPtr;
+		    containerPtr->containerDataPtr->columnPtr :
+		    containerPtr->containerDataPtr->rowPtr;
 	}
 
 	/*
@@ -1110,12 +1110,12 @@ GridRowColumnConfigureCommand(
 	    slavePtr = NULL;
 	} else if (strcmp(Tcl_GetString(lObjv[j]), "all") == 0) {
 	    /*
-	     * Make sure master is initialised.
+	     * Make sure container is initialised.
 	     */
 
-	    InitMasterData(masterPtr);
+	    InitMasterData(containerPtr);
 
-	    slavePtr = masterPtr->slavePtr;
+	    slavePtr = containerPtr->slavePtr;
 	    if (slavePtr == NULL) {
 		continue;
 	    }
@@ -1123,11 +1123,11 @@ GridRowColumnConfigureCommand(
 	} else if (TkGetWindowFromObj(NULL, tkwin, lObjv[j], &slave)
 		== TCL_OK) {
 	    /*
-	     * Is it gridded in this master?
+	     * Is it gridded in this container?
 	     */
 
 	    slavePtr = GetGrid(slave);
-	    if (slavePtr->masterPtr != masterPtr) {
+	    if (slavePtr->containerPtr != containerPtr) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 			"the window \"%s\" is not managed by \"%s\"",
 			Tcl_GetString(lObjv[j]), Tcl_GetString(objv[2])));
@@ -1156,7 +1156,7 @@ GridRowColumnConfigureCommand(
 	    }
 
 	    for (slot = first; slot <= last; slot++) {
-		ok = CheckSlotData(masterPtr, slot, slotType, /*checkOnly*/ 0);
+		ok = CheckSlotData(containerPtr, slot, slotType, /*checkOnly*/ 0);
 		if (ok != TCL_OK) {
 		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 			    "\"%s\" is out of range",
@@ -1167,8 +1167,8 @@ GridRowColumnConfigureCommand(
 		    return TCL_ERROR;
 		}
 		slotPtr = (slotType == COLUMN) ?
-			masterPtr->masterDataPtr->columnPtr :
-			masterPtr->masterDataPtr->rowPtr;
+			containerPtr->containerDataPtr->columnPtr :
+			containerPtr->containerDataPtr->rowPtr;
 
 		/*
 		 * Loop through each option value pair, setting the values as
@@ -1182,7 +1182,7 @@ GridRowColumnConfigureCommand(
 			return TCL_ERROR;
 		    }
 		    if (index == ROWCOL_MINSIZE) {
-			if (Tk_GetPixelsFromObj(interp, master, objv[i+1],
+			if (Tk_GetPixelsFromObj(interp, container, objv[i+1],
 				&size) != TCL_OK) {
 			    Tcl_DecrRefCount(listCopy);
 			    return TCL_ERROR;
@@ -1209,7 +1209,7 @@ GridRowColumnConfigureCommand(
 			    slotPtr[slot].uniform = NULL;
 			}
 		    } else if (index == ROWCOL_PAD) {
-			if (Tk_GetPixelsFromObj(interp, master, objv[i+1],
+			if (Tk_GetPixelsFromObj(interp, container, objv[i+1],
 				&size) != TCL_OK) {
 			    Tcl_DecrRefCount(listCopy);
 			    return TCL_ERROR;
@@ -1236,32 +1236,32 @@ GridRowColumnConfigureCommand(
 
     if (slotPtr != NULL) {
 	if (slotType == ROW) {
-	    int last = masterPtr->masterDataPtr->rowMax - 1;
+	    int last = containerPtr->containerDataPtr->rowMax - 1;
 
 	    while ((last >= 0) && (slotPtr[last].weight == 0)
 		    && (slotPtr[last].pad == 0) && (slotPtr[last].minSize == 0)
 		    && (slotPtr[last].uniform == NULL)) {
 		last--;
 	    }
-	    masterPtr->masterDataPtr->rowMax = last+1;
+	    containerPtr->containerDataPtr->rowMax = last+1;
 	} else {
-	    int last = masterPtr->masterDataPtr->columnMax - 1;
+	    int last = containerPtr->containerDataPtr->columnMax - 1;
 
 	    while ((last >= 0) && (slotPtr[last].weight == 0)
 		    && (slotPtr[last].pad == 0) && (slotPtr[last].minSize == 0)
 		    && (slotPtr[last].uniform == NULL)) {
 		last--;
 	    }
-	    masterPtr->masterDataPtr->columnMax = last + 1;
+	    containerPtr->containerDataPtr->columnMax = last + 1;
 	}
     }
 
-    if (masterPtr->abortPtr != NULL) {
-	*masterPtr->abortPtr = 1;
+    if (containerPtr->abortPtr != NULL) {
+	*containerPtr->abortPtr = 1;
     }
-    if (!(masterPtr->flags & REQUESTED_RELAYOUT)) {
-	masterPtr->flags |= REQUESTED_RELAYOUT;
-	Tcl_DoWhenIdle(ArrangeGrid, masterPtr);
+    if (!(containerPtr->flags & REQUESTED_RELAYOUT)) {
+	containerPtr->flags |= REQUESTED_RELAYOUT;
+	Tcl_DoWhenIdle(ArrangeGrid, containerPtr);
     }
     return TCL_OK;
 
@@ -1297,8 +1297,8 @@ GridSizeCommand(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tk_Window master;
-    Gridder *masterPtr;
+    Tk_Window container;
+    Gridder *containerPtr;
     GridMaster *gridPtr;	/* pointer to grid data */
 
     if (objc != 3) {
@@ -1306,14 +1306,14 @@ GridSizeCommand(
 	return TCL_ERROR;
     }
 
-    if (TkGetWindowFromObj(interp, tkwin, objv[2], &master) != TCL_OK) {
+    if (TkGetWindowFromObj(interp, tkwin, objv[2], &container) != TCL_OK) {
 	return TCL_ERROR;
     }
-    masterPtr = GetGrid(master);
+    containerPtr = GetGrid(container);
 
-    if (masterPtr->masterDataPtr != NULL) {
-	SetGridSize(masterPtr);
-	gridPtr = masterPtr->masterDataPtr;
+    if (containerPtr->containerDataPtr != NULL) {
+	SetGridSize(containerPtr);
+	gridPtr = containerPtr->containerDataPtr;
 	Tcl_SetObjResult(interp, NewPairObj(
 		MAX(gridPtr->columnEnd, gridPtr->columnMax),
 		MAX(gridPtr->rowEnd, gridPtr->rowMax)));
@@ -1348,8 +1348,8 @@ GridSlavesCommand(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tk_Window master;
-    Gridder *masterPtr;		/* master grid record */
+    Tk_Window container;
+    Gridder *containerPtr;		/* container grid record */
     Gridder *slavePtr;
     int i, value, index;
     int row = -1, column = -1;
@@ -1385,13 +1385,13 @@ GridSlavesCommand(
 	}
     }
 
-    if (TkGetWindowFromObj(interp, tkwin, objv[2], &master) != TCL_OK) {
+    if (TkGetWindowFromObj(interp, tkwin, objv[2], &container) != TCL_OK) {
 	return TCL_ERROR;
     }
-    masterPtr = GetGrid(master);
+    containerPtr = GetGrid(container);
 
     res = Tcl_NewListObj(0, NULL);
-    for (slavePtr = masterPtr->slavePtr; slavePtr != NULL;
+    for (slavePtr = containerPtr->slavePtr; slavePtr != NULL;
 	    slavePtr = slavePtr->nextPtr) {
 	if ((column >= 0) && (slavePtr->column > column
 		|| slavePtr->column+slavePtr->numCols-1 < column)) {
@@ -1434,7 +1434,7 @@ GridReqProc(
 {
     register Gridder *gridPtr = clientData;
 
-    gridPtr = gridPtr->masterPtr;
+    gridPtr = gridPtr->containerPtr;
     if (gridPtr && !(gridPtr->flags & REQUESTED_RELAYOUT)) {
 	gridPtr->flags |= REQUESTED_RELAYOUT;
 	Tcl_DoWhenIdle(ArrangeGrid, gridPtr);
@@ -1466,8 +1466,8 @@ GridLostSlaveProc(
 {
     register Gridder *slavePtr = clientData;
 
-    if (slavePtr->masterPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
-	Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->masterPtr->tkwin);
+    if (slavePtr->containerPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
+	Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->containerPtr->tkwin);
     }
     Unlink(slavePtr);
     Tk_UnmapWindow(slavePtr->tkwin);
@@ -1712,38 +1712,38 @@ AdjustForSticky(
  *	None.
  *
  * Side effects:
- *	The slaves of masterPtr may get resized or moved.
+ *	The slaves of containerPtr may get resized or moved.
  *
  *----------------------------------------------------------------------
  */
 
 static void
 ArrangeGrid(
-    ClientData clientData)	/* Structure describing master whose slaves
+    ClientData clientData)	/* Structure describing container whose slaves
 				 * are to be re-layed out. */
 {
-    register Gridder *masterPtr = clientData;
+    register Gridder *containerPtr = clientData;
     register Gridder *slavePtr;
-    GridMaster *slotPtr = masterPtr->masterDataPtr;
+    GridMaster *slotPtr = containerPtr->containerDataPtr;
     int abort;
     int width, height;		/* Requested size of layout, in pixels. */
     int realWidth, realHeight;	/* Actual size layout should take-up. */
     int usedX, usedY;
 
-    masterPtr->flags &= ~REQUESTED_RELAYOUT;
+    containerPtr->flags &= ~REQUESTED_RELAYOUT;
 
     /*
-     * If the master has no slaves anymore, then don't do anything at all:
-     * just leave the master's size as-is. Otherwise there is no way to
-     * "relinquish" control over the master so another geometry manager can
+     * If the container has no slaves anymore, then don't do anything at all:
+     * just leave the container's size as-is. Otherwise there is no way to
+     * "relinquish" control over the container so another geometry manager can
      * take over.
      */
 
-    if (masterPtr->slavePtr == NULL) {
+    if (containerPtr->slavePtr == NULL) {
 	return;
     }
 
-    if (masterPtr->masterDataPtr == NULL) {
+    if (containerPtr->containerDataPtr == NULL) {
 	return;
     }
 
@@ -1753,63 +1753,63 @@ ArrangeGrid(
      * necessary.
      */
 
-    if (masterPtr->abortPtr != NULL) {
-	*masterPtr->abortPtr = 1;
+    if (containerPtr->abortPtr != NULL) {
+	*containerPtr->abortPtr = 1;
     }
-    masterPtr->abortPtr = &abort;
+    containerPtr->abortPtr = &abort;
     abort = 0;
-    Tcl_Preserve(masterPtr);
+    Tcl_Preserve(containerPtr);
 
     /*
      * Call the constraint engine to fill in the row and column offsets.
      */
 
-    SetGridSize(masterPtr);
-    width = ResolveConstraints(masterPtr, COLUMN, 0);
-    height = ResolveConstraints(masterPtr, ROW, 0);
-    width += Tk_InternalBorderLeft(masterPtr->tkwin) +
-	    Tk_InternalBorderRight(masterPtr->tkwin);
-    height += Tk_InternalBorderTop(masterPtr->tkwin) +
-	    Tk_InternalBorderBottom(masterPtr->tkwin);
+    SetGridSize(containerPtr);
+    width = ResolveConstraints(containerPtr, COLUMN, 0);
+    height = ResolveConstraints(containerPtr, ROW, 0);
+    width += Tk_InternalBorderLeft(containerPtr->tkwin) +
+	    Tk_InternalBorderRight(containerPtr->tkwin);
+    height += Tk_InternalBorderTop(containerPtr->tkwin) +
+	    Tk_InternalBorderBottom(containerPtr->tkwin);
 
-    if (width < Tk_MinReqWidth(masterPtr->tkwin)) {
-	width = Tk_MinReqWidth(masterPtr->tkwin);
+    if (width < Tk_MinReqWidth(containerPtr->tkwin)) {
+	width = Tk_MinReqWidth(containerPtr->tkwin);
     }
-    if (height < Tk_MinReqHeight(masterPtr->tkwin)) {
-	height = Tk_MinReqHeight(masterPtr->tkwin);
+    if (height < Tk_MinReqHeight(containerPtr->tkwin)) {
+	height = Tk_MinReqHeight(containerPtr->tkwin);
     }
 
-    if (((width != Tk_ReqWidth(masterPtr->tkwin))
-	    || (height != Tk_ReqHeight(masterPtr->tkwin)))
-	    && !(masterPtr->flags & DONT_PROPAGATE)) {
-	Tk_GeometryRequest(masterPtr->tkwin, width, height);
+    if (((width != Tk_ReqWidth(containerPtr->tkwin))
+	    || (height != Tk_ReqHeight(containerPtr->tkwin)))
+	    && !(containerPtr->flags & DONT_PROPAGATE)) {
+	Tk_GeometryRequest(containerPtr->tkwin, width, height);
 	if (width>1 && height>1) {
-	    masterPtr->flags |= REQUESTED_RELAYOUT;
-	    Tcl_DoWhenIdle(ArrangeGrid, masterPtr);
+	    containerPtr->flags |= REQUESTED_RELAYOUT;
+	    Tcl_DoWhenIdle(ArrangeGrid, containerPtr);
 	}
-	masterPtr->abortPtr = NULL;
-	Tcl_Release(masterPtr);
+	containerPtr->abortPtr = NULL;
+	Tcl_Release(containerPtr);
 	return;
     }
 
     /*
-     * If the currently requested layout size doesn't match the master's
+     * If the currently requested layout size doesn't match the container's
      * window size, then adjust the slot offsets according to the weights. If
      * all of the weights are zero, place the layout according to the anchor
      * value.
      */
 
-    realWidth = Tk_Width(masterPtr->tkwin) -
-	    Tk_InternalBorderLeft(masterPtr->tkwin) -
-	    Tk_InternalBorderRight(masterPtr->tkwin);
-    realHeight = Tk_Height(masterPtr->tkwin) -
-	    Tk_InternalBorderTop(masterPtr->tkwin) -
-	    Tk_InternalBorderBottom(masterPtr->tkwin);
+    realWidth = Tk_Width(containerPtr->tkwin) -
+	    Tk_InternalBorderLeft(containerPtr->tkwin) -
+	    Tk_InternalBorderRight(containerPtr->tkwin);
+    realHeight = Tk_Height(containerPtr->tkwin) -
+	    Tk_InternalBorderTop(containerPtr->tkwin) -
+	    Tk_InternalBorderBottom(containerPtr->tkwin);
     usedX = AdjustOffsets(realWidth,
 	    MAX(slotPtr->columnEnd, slotPtr->columnMax), slotPtr->columnPtr);
     usedY = AdjustOffsets(realHeight, MAX(slotPtr->rowEnd, slotPtr->rowMax),
 	    slotPtr->rowPtr);
-    TkComputeAnchor(masterPtr->masterDataPtr->anchor, masterPtr->tkwin,
+    TkComputeAnchor(containerPtr->containerDataPtr->anchor, containerPtr->tkwin,
 	    0, 0, usedX, usedY, &slotPtr->startX, &slotPtr->startY);
 
     /*
@@ -1817,7 +1817,7 @@ ArrangeGrid(
      * cavity size, and adjusting the widget according to its stickyness.
      */
 
-    for (slavePtr = masterPtr->slavePtr; slavePtr != NULL && !abort;
+    for (slavePtr = containerPtr->slavePtr; slavePtr != NULL && !abort;
 	    slavePtr = slavePtr->nextPtr) {
 	int x, y;			/* Top left coordinate */
 	int width, height;		/* Slot or slave size */
@@ -1837,11 +1837,11 @@ ArrangeGrid(
 
 	/*
 	 * Now put the window in the proper spot. (This was taken directly
-	 * from tkPack.c.) If the slave is a child of the master, then do this
+	 * from tkPack.c.) If the slave is a child of the container, then do this
 	 * here. Otherwise let Tk_MaintainGeometry do the work.
 	 */
 
-	if (masterPtr->tkwin == Tk_Parent(slavePtr->tkwin)) {
+	if (containerPtr->tkwin == Tk_Parent(slavePtr->tkwin)) {
 	    if ((width <= 0) || (height <= 0)) {
 		Tk_UnmapWindow(slavePtr->tkwin);
 	    } else {
@@ -1856,25 +1856,25 @@ ArrangeGrid(
 		}
 
 		/*
-		 * Don't map the slave if the master isn't mapped: wait until
-		 * the master gets mapped later.
+		 * Don't map the slave if the container isn't mapped: wait until
+		 * the container gets mapped later.
 		 */
 
-		if (Tk_IsMapped(masterPtr->tkwin)) {
+		if (Tk_IsMapped(containerPtr->tkwin)) {
 		    Tk_MapWindow(slavePtr->tkwin);
 		}
 	    }
 	} else if ((width <= 0) || (height <= 0)) {
-	    Tk_UnmaintainGeometry(slavePtr->tkwin, masterPtr->tkwin);
+	    Tk_UnmaintainGeometry(slavePtr->tkwin, containerPtr->tkwin);
 	    Tk_UnmapWindow(slavePtr->tkwin);
 	} else {
-	    Tk_MaintainGeometry(slavePtr->tkwin, masterPtr->tkwin, x, y,
+	    Tk_MaintainGeometry(slavePtr->tkwin, containerPtr->tkwin, x, y,
 		    width, height);
 	}
     }
 
-    masterPtr->abortPtr = NULL;
-    Tcl_Release(masterPtr);
+    containerPtr->abortPtr = NULL;
+    Tcl_Release(containerPtr);
 }
 
 /*
@@ -1892,14 +1892,14 @@ ArrangeGrid(
  *
  * Side effects:
  *	The slot offsets are copied into the SlotInfo structure for the
- *	geometry master.
+ *	geometry container.
  *
  *----------------------------------------------------------------------
  */
 
 static int
 ResolveConstraints(
-    Gridder *masterPtr,		/* The geometry master for this grid. */
+    Gridder *containerPtr,		/* The geometry container for this grid. */
     int slotType,		/* Either ROW or COLUMN. */
     int maxOffset)		/* The actual maximum size of this layout in
 				 * pixels, or 0 (not currently used). */
@@ -1942,13 +1942,13 @@ ResolveConstraints(
     GridLayout layoutData[TYPICAL_SIZE + 1];
 
     if (slotType == COLUMN) {
-	constraintCount = masterPtr->masterDataPtr->columnMax;
-	slotCount = masterPtr->masterDataPtr->columnEnd;
-	slotPtr = masterPtr->masterDataPtr->columnPtr;
+	constraintCount = containerPtr->containerDataPtr->columnMax;
+	slotCount = containerPtr->containerDataPtr->columnEnd;
+	slotPtr = containerPtr->containerDataPtr->columnPtr;
     } else {
-	constraintCount = masterPtr->masterDataPtr->rowMax;
-	slotCount = masterPtr->masterDataPtr->rowEnd;
-	slotPtr = masterPtr->masterDataPtr->rowPtr;
+	constraintCount = containerPtr->containerDataPtr->rowMax;
+	slotCount = containerPtr->containerDataPtr->rowEnd;
+	slotPtr = containerPtr->containerDataPtr->rowPtr;
     }
 
     /*
@@ -2010,7 +2010,7 @@ ResolveConstraints(
 
     switch (slotType) {
     case COLUMN:
-	for (slavePtr = masterPtr->slavePtr; slavePtr != NULL;
+	for (slavePtr = containerPtr->slavePtr; slavePtr != NULL;
 		slavePtr = slavePtr->nextPtr) {
 	    int rightEdge = slavePtr->column + slavePtr->numCols - 1;
 
@@ -2029,7 +2029,7 @@ ResolveConstraints(
 	}
 	break;
     case ROW:
-	for (slavePtr = masterPtr->slavePtr; slavePtr != NULL;
+	for (slavePtr = containerPtr->slavePtr; slavePtr != NULL;
 		slavePtr = slavePtr->nextPtr) {
 	    int rightEdge = slavePtr->row + slavePtr->numRows - 1;
 
@@ -2150,7 +2150,7 @@ ResolveConstraints(
 
     /*
      * At this point, we know the minimum required size of the entire layout.
-     * It might be prudent to stop here if our "master" will resize itself to
+     * It might be prudent to stop here if our "container" will resize itself to
      * this size.
      */
 
@@ -2385,7 +2385,7 @@ ResolveConstraints(
     /*
      * Step 6.
      * All of the space has been apportioned; copy the layout information back
-     * into the master.
+     * into the container.
      */
 
     for (slot=0; slot < gridCount; slot++) {
@@ -2444,8 +2444,8 @@ GetGrid(
     }
     gridPtr = ckalloc(sizeof(Gridder));
     gridPtr->tkwin = tkwin;
-    gridPtr->masterPtr = NULL;
-    gridPtr->masterDataPtr = NULL;
+    gridPtr->containerPtr = NULL;
+    gridPtr->containerDataPtr = NULL;
     gridPtr->nextPtr = NULL;
     gridPtr->slavePtr = NULL;
     gridPtr->binNextPtr = NULL;
@@ -2467,7 +2467,7 @@ GetGrid(
     gridPtr->sticky = 0;
     gridPtr->size = 0;
     gridPtr->in = NULL;
-    gridPtr->masterDataPtr = NULL;
+    gridPtr->containerDataPtr = NULL;
     Tcl_SetHashValue(hPtr, gridPtr);
     Tk_CreateEventHandler(tkwin, StructureNotifyMask,
 	    GridStructureProc, gridPtr);
@@ -2485,7 +2485,7 @@ GetGrid(
  *	None
  *
  * Side effects:
- *	The width and height arguments are filled in the master data
+ *	The width and height arguments are filled in the container data
  *	structure. Additional space is allocated for the constraints to
  *	accommodate the offsets.
  *
@@ -2494,20 +2494,20 @@ GetGrid(
 
 static void
 SetGridSize(
-    Gridder *masterPtr)		/* The geometry master for this grid. */
+    Gridder *containerPtr)		/* The geometry container for this grid. */
 {
     register Gridder *slavePtr;	/* Current slave window. */
     int maxX = 0, maxY = 0;
 
-    for (slavePtr = masterPtr->slavePtr; slavePtr != NULL;
+    for (slavePtr = containerPtr->slavePtr; slavePtr != NULL;
 	    slavePtr = slavePtr->nextPtr) {
 	maxX = MAX(maxX, slavePtr->numCols + slavePtr->column);
 	maxY = MAX(maxY, slavePtr->numRows + slavePtr->row);
     }
-    masterPtr->masterDataPtr->columnEnd = maxX;
-    masterPtr->masterDataPtr->rowEnd = maxY;
-    CheckSlotData(masterPtr, maxX, COLUMN, CHECK_SPACE);
-    CheckSlotData(masterPtr, maxY, ROW, CHECK_SPACE);
+    containerPtr->containerDataPtr->columnEnd = maxX;
+    containerPtr->containerDataPtr->rowEnd = maxY;
+    CheckSlotData(containerPtr, maxX, COLUMN, CHECK_SPACE);
+    CheckSlotData(containerPtr, maxY, ROW, CHECK_SPACE);
 }
 
 /*
@@ -2604,7 +2604,7 @@ SetSlaveRow(
  *	TRUE if the index is OK, False otherwise.
  *
  * Side effects:
- *	A new master grid structure may be created. If so, then it is
+ *	A new container grid structure may be created. If so, then it is
  *	initialized. In addition, additional storage for a row or column
  *	constraints may be allocated, and the constraint maximums are
  *	adjusted.
@@ -2614,7 +2614,7 @@ SetSlaveRow(
 
 static int
 CheckSlotData(
-    Gridder *masterPtr,		/* The geometry master for this grid. */
+    Gridder *containerPtr,		/* The geometry container for this grid. */
     int slot,			/* Which slot to look at. */
     int slotType,		/* ROW or COLUMN. */
     int checkOnly)		/* Don't allocate new space if true. */
@@ -2630,7 +2630,7 @@ CheckSlotData(
 	return TCL_ERROR;
     }
 
-    if ((checkOnly == CHECK_ONLY) && (masterPtr->masterDataPtr == NULL)) {
+    if ((checkOnly == CHECK_ONLY) && (containerPtr->containerDataPtr == NULL)) {
 	return TCL_ERROR;
     }
 
@@ -2640,39 +2640,39 @@ CheckSlotData(
      * of the offsets as well.
      */
 
-    InitMasterData(masterPtr);
-    end = (slotType == ROW) ? masterPtr->masterDataPtr->rowMax :
-	    masterPtr->masterDataPtr->columnMax;
+    InitMasterData(containerPtr);
+    end = (slotType == ROW) ? containerPtr->containerDataPtr->rowMax :
+	    containerPtr->containerDataPtr->columnMax;
     if (checkOnly == CHECK_ONLY) {
     	return ((end < slot) ? TCL_ERROR : TCL_OK);
     } else {
-    	numSlot = (slotType == ROW) ? masterPtr->masterDataPtr->rowSpace
-		: masterPtr->masterDataPtr->columnSpace;
+    	numSlot = (slotType == ROW) ? containerPtr->containerDataPtr->rowSpace
+		: containerPtr->containerDataPtr->columnSpace;
     	if (slot >= numSlot) {
 	    int newNumSlot = slot + PREALLOC;
 	    size_t oldSize = numSlot * sizeof(SlotInfo);
 	    size_t newSize = newNumSlot * sizeof(SlotInfo);
 	    SlotInfo *newSI = ckalloc(newSize);
 	    SlotInfo *oldSI = (slotType == ROW)
-		    ? masterPtr->masterDataPtr->rowPtr
-		    : masterPtr->masterDataPtr->columnPtr;
+		    ? containerPtr->containerDataPtr->rowPtr
+		    : containerPtr->containerDataPtr->columnPtr;
 
 	    memcpy(newSI, oldSI, oldSize);
 	    memset(newSI+numSlot, 0, newSize - oldSize);
 	    ckfree(oldSI);
 	    if (slotType == ROW) {
-	 	masterPtr->masterDataPtr->rowPtr = newSI;
-	    	masterPtr->masterDataPtr->rowSpace = newNumSlot;
+	 	containerPtr->containerDataPtr->rowPtr = newSI;
+	    	containerPtr->containerDataPtr->rowSpace = newNumSlot;
 	    } else {
-	    	masterPtr->masterDataPtr->columnPtr = newSI;
-	    	masterPtr->masterDataPtr->columnSpace = newNumSlot;
+	    	containerPtr->containerDataPtr->columnPtr = newSI;
+	    	containerPtr->containerDataPtr->columnSpace = newNumSlot;
 	    }
 	}
 	if (slot >= end && checkOnly != CHECK_SPACE) {
 	    if (slotType == ROW) {
-		masterPtr->masterDataPtr->rowMax = slot+1;
+		containerPtr->containerDataPtr->rowMax = slot+1;
 	    } else {
-		masterPtr->masterDataPtr->columnMax = slot+1;
+		containerPtr->containerDataPtr->columnMax = slot+1;
 	    }
 	}
     	return TCL_OK;
@@ -2685,13 +2685,13 @@ CheckSlotData(
  * InitMasterData --
  *
  *	This internal procedure is used to allocate and initialize the data
- *	for a geometry master, if the data doesn't exist already.
+ *	for a geometry container, if the data doesn't exist already.
  *
  * Results:
  *	none
  *
  * Side effects:
- *	A new master grid structure may be created. If so, then it is
+ *	A new container grid structure may be created. If so, then it is
  *	initialized.
  *
  *----------------------------------------------------------------------
@@ -2699,10 +2699,10 @@ CheckSlotData(
 
 static void
 InitMasterData(
-    Gridder *masterPtr)
+    Gridder *containerPtr)
 {
-    if (masterPtr->masterDataPtr == NULL) {
-	GridMaster *gridPtr = masterPtr->masterDataPtr =
+    if (containerPtr->containerDataPtr == NULL) {
+	GridMaster *gridPtr = containerPtr->containerDataPtr =
 		ckalloc(sizeof(GridMaster));
 	size_t size = sizeof(SlotInfo) * TYPICAL_SIZE;
 
@@ -2728,13 +2728,13 @@ InitMasterData(
  *
  * Unlink --
  *
- *	Remove a grid from its master's list of slaves.
+ *	Remove a grid from its container's list of slaves.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	The master will be scheduled for re-arranging, and the size of the
+ *	The container will be scheduled for re-arranging, and the size of the
  *	grid will be adjusted accordingly
  *
  *----------------------------------------------------------------------
@@ -2744,17 +2744,17 @@ static void
 Unlink(
     register Gridder *slavePtr)	/* Window to unlink. */
 {
-    register Gridder *masterPtr, *slavePtr2;
+    register Gridder *containerPtr, *slavePtr2;
 
-    masterPtr = slavePtr->masterPtr;
-    if (masterPtr == NULL) {
+    containerPtr = slavePtr->containerPtr;
+    if (containerPtr == NULL) {
 	return;
     }
 
-    if (masterPtr->slavePtr == slavePtr) {
-	masterPtr->slavePtr = slavePtr->nextPtr;
+    if (containerPtr->slavePtr == slavePtr) {
+	containerPtr->slavePtr = slavePtr->nextPtr;
     } else {
-	for (slavePtr2=masterPtr->slavePtr ; ; slavePtr2=slavePtr2->nextPtr) {
+	for (slavePtr2=containerPtr->slavePtr ; ; slavePtr2=slavePtr2->nextPtr) {
 	    if (slavePtr2 == NULL) {
 		Tcl_Panic("Unlink couldn't find previous window");
 	    }
@@ -2764,25 +2764,25 @@ Unlink(
 	    }
 	}
     }
-    if (!(masterPtr->flags & REQUESTED_RELAYOUT)) {
-	masterPtr->flags |= REQUESTED_RELAYOUT;
-	Tcl_DoWhenIdle(ArrangeGrid, masterPtr);
+    if (!(containerPtr->flags & REQUESTED_RELAYOUT)) {
+	containerPtr->flags |= REQUESTED_RELAYOUT;
+	Tcl_DoWhenIdle(ArrangeGrid, containerPtr);
     }
-    if (masterPtr->abortPtr != NULL) {
-	*masterPtr->abortPtr = 1;
+    if (containerPtr->abortPtr != NULL) {
+	*containerPtr->abortPtr = 1;
     }
 
-    SetGridSize(slavePtr->masterPtr);
-    slavePtr->masterPtr = NULL;
+    SetGridSize(slavePtr->containerPtr);
+    slavePtr->containerPtr = NULL;
 
     /*
-     * If we have emptied this master from slaves it means we are no longer
+     * If we have emptied this container from slaves it means we are no longer
      * handling it and should mark it as free.
      */
 
-    if ((masterPtr->slavePtr == NULL) && (masterPtr->flags & ALLOCED_MASTER)) {
-	TkFreeGeometryMaster(masterPtr->tkwin, "grid");
-	masterPtr->flags &= ~ALLOCED_MASTER;
+    if ((containerPtr->slavePtr == NULL) && (containerPtr->flags & ALLOCED_CONTAINER)) {
+	TkFreeGeometryMaster(containerPtr->tkwin, "grid");
+	containerPtr->flags &= ~ALLOCED_CONTAINER;
     }
 }
 
@@ -2794,7 +2794,7 @@ Unlink(
  *	This procedure is invoked by Tcl_EventuallyFree or Tcl_Release to
  *	clean up the internal structure of a grid at a safe time (when no-one
  *	is using it anymore). Cleaning up the grid involves freeing the main
- *	structure for all windows and the master structure for geometry
+ *	structure for all windows and the container structure for geometry
  *	managers.
  *
  * Results:
@@ -2812,14 +2812,14 @@ DestroyGrid(
 {
     register Gridder *gridPtr = memPtr;
 
-    if (gridPtr->masterDataPtr != NULL) {
-	if (gridPtr->masterDataPtr->rowPtr != NULL) {
-	    ckfree(gridPtr->masterDataPtr -> rowPtr);
+    if (gridPtr->containerDataPtr != NULL) {
+	if (gridPtr->containerDataPtr->rowPtr != NULL) {
+	    ckfree(gridPtr->containerDataPtr -> rowPtr);
 	}
-	if (gridPtr->masterDataPtr->columnPtr != NULL) {
-	    ckfree(gridPtr->masterDataPtr -> columnPtr);
+	if (gridPtr->containerDataPtr->columnPtr != NULL) {
+	    ckfree(gridPtr->containerDataPtr -> columnPtr);
 	}
-	ckfree(gridPtr->masterDataPtr);
+	ckfree(gridPtr->containerDataPtr);
     }
     if (gridPtr->in != NULL) {
 	Tcl_DecrRefCount(gridPtr->in);
@@ -2860,25 +2860,25 @@ GridStructureProc(
 	    gridPtr->flags |= REQUESTED_RELAYOUT;
 	    Tcl_DoWhenIdle(ArrangeGrid, gridPtr);
 	}
-	if ((gridPtr->masterPtr != NULL) &&
+	if ((gridPtr->containerPtr != NULL) &&
 		(gridPtr->doubleBw != 2*Tk_Changes(gridPtr->tkwin)->border_width)) {
-	    if (!(gridPtr->masterPtr->flags & REQUESTED_RELAYOUT)) {
+	    if (!(gridPtr->containerPtr->flags & REQUESTED_RELAYOUT)) {
 		gridPtr->doubleBw = 2*Tk_Changes(gridPtr->tkwin)->border_width;
-		gridPtr->masterPtr->flags |= REQUESTED_RELAYOUT;
-		Tcl_DoWhenIdle(ArrangeGrid, gridPtr->masterPtr);
+		gridPtr->containerPtr->flags |= REQUESTED_RELAYOUT;
+		Tcl_DoWhenIdle(ArrangeGrid, gridPtr->containerPtr);
 	    }
 	}
     } else if (eventPtr->type == DestroyNotify) {
 	register Gridder *slavePtr, *nextPtr;
 
-	if (gridPtr->masterPtr != NULL) {
+	if (gridPtr->containerPtr != NULL) {
 	    Unlink(gridPtr);
 	}
 	for (slavePtr = gridPtr->slavePtr; slavePtr != NULL;
 		slavePtr = nextPtr) {
 	    Tk_ManageGeometry(slavePtr->tkwin, NULL, NULL);
 	    Tk_UnmapWindow(slavePtr->tkwin);
-	    slavePtr->masterPtr = NULL;
+	    slavePtr->containerPtr = NULL;
 	    nextPtr = slavePtr->nextPtr;
 	    slavePtr->nextPtr = NULL;
 	}
@@ -2936,10 +2936,10 @@ ConfigureSlaves(
 				 * "option value" pairs. Caller must make sure
 				 * that there is at least one window name. */
 {
-    Gridder *masterPtr = NULL;
+    Gridder *containerPtr = NULL;
     Gridder *slavePtr;
     Tk_Window other, slave, parent, ancestor;
-    TkWindow *master;
+    TkWindow *container;
     int i, j, tmp;
     int numWindows;
     int width;
@@ -2982,27 +2982,27 @@ ConfigureSlaves(
 	    if (TkGetWindowFromObj(interp, tkwin, objv[i], &slave) != TCL_OK) {
 		return TCL_ERROR;
 	    }
-	    if (masterPtr == NULL) {
+	    if (containerPtr == NULL) {
 		/*
 		 * Is there any saved -in from a removed slave?
 		 * If there is, it becomes default for -in.
-		 * If the stored master does not exist, just ignore it.
+		 * If the stored container does not exist, just ignore it.
 		 */
 
 		struct Gridder *slavePtr = GetGrid(slave);
 		if (slavePtr->in != NULL) {
 		    if (TkGetWindowFromObj(interp, slave, slavePtr->in, &parent)
 			    == TCL_OK) {
-			masterPtr = GetGrid(parent);
-			InitMasterData(masterPtr);
+			containerPtr = GetGrid(parent);
+			InitMasterData(containerPtr);
 		    }
 		}
 	    }
-	    if (masterPtr == NULL) {
+	    if (containerPtr == NULL) {
 		parent = Tk_Parent(slave);
 		if (parent != NULL) {
-		    masterPtr = GetGrid(parent);
-		    InitMasterData(masterPtr);
+		    containerPtr = GetGrid(parent);
+		    InitMasterData(containerPtr);
 		}
 	    }
 	    numWindows++;
@@ -3070,8 +3070,8 @@ ConfigureSlaves(
 		    TCL_OK) {
 		return TCL_ERROR;
 	    }
-	    masterPtr = GetGrid(other);
-	    InitMasterData(masterPtr);
+	    containerPtr = GetGrid(other);
+	    InitMasterData(containerPtr);
 	} else if (index == CONF_ROW) {
 	    if (Tcl_GetIntFromObj(interp, objv[i+1], &tmp) != TCL_OK
 		    || tmp < 0) {
@@ -3087,13 +3087,13 @@ ConfigureSlaves(
 
     /*
      * If no -row is given, use the next row after the highest occupied row
-     * of the master.
+     * of the container.
      */
 
     if (defaultRow < 0) {
-	if (masterPtr != NULL && masterPtr->masterDataPtr != NULL) {
-	    SetGridSize(masterPtr);
-	    defaultRow = masterPtr->masterDataPtr->rowEnd;
+	if (containerPtr != NULL && containerPtr->containerDataPtr != NULL) {
+	    SetGridSize(containerPtr);
+	    defaultRow = containerPtr->containerDataPtr->rowEnd;
 	} else {
 	    defaultRow = 0;
 	}
@@ -3206,8 +3206,8 @@ ConfigureSlaves(
 		    return TCL_ERROR;
 		}
 		positionGiven = 1;
-		masterPtr = GetGrid(other);
-		InitMasterData(masterPtr);
+		containerPtr = GetGrid(other);
+		InitMasterData(containerPtr);
 		break;
 	    case CONF_STICKY: {
 		int sticky = StringToSticky(Tcl_GetString(objv[i+1]));
@@ -3291,8 +3291,8 @@ ConfigureSlaves(
 	 * packed, then leave it in its current location.
 	 */
 
-    	if (!positionGiven && (slavePtr->masterPtr != NULL)) {
-	    masterPtr = slavePtr->masterPtr;
+    	if (!positionGiven && (slavePtr->containerPtr != NULL)) {
+	    containerPtr = slavePtr->containerPtr;
 	    goto scheduleLayout;
     	}
 
@@ -3301,52 +3301,52 @@ ConfigureSlaves(
 	 * its current location.
 	 */
 
-	if (positionGiven && (masterPtr == slavePtr->masterPtr)) {
+	if (positionGiven && (containerPtr == slavePtr->containerPtr)) {
 	    goto scheduleLayout;
 	}
 
 	/*
-	 * Make sure we have a geometry master. We look at:
+	 * Make sure we have a geometry container. We look at:
 	 *  1)   the -in flag
 	 *  2)   the parent of the first slave.
 	 */
 
 	parent = Tk_Parent(slave);
-    	if (masterPtr == NULL) {
-	    masterPtr = GetGrid(parent);
-	    InitMasterData(masterPtr);
+    	if (containerPtr == NULL) {
+	    containerPtr = GetGrid(parent);
+	    InitMasterData(containerPtr);
     	}
 
-	if (slavePtr->masterPtr != NULL && slavePtr->masterPtr != masterPtr) {
-            if (slavePtr->masterPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
-                Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->masterPtr->tkwin);
+	if (slavePtr->containerPtr != NULL && slavePtr->containerPtr != containerPtr) {
+            if (slavePtr->containerPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
+                Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->containerPtr->tkwin);
             }
 	    Unlink(slavePtr);
-	    slavePtr->masterPtr = NULL;
+	    slavePtr->containerPtr = NULL;
 	}
 
-	if (slavePtr->masterPtr == NULL) {
-	    Gridder *tempPtr = masterPtr->slavePtr;
+	if (slavePtr->containerPtr == NULL) {
+	    Gridder *tempPtr = containerPtr->slavePtr;
 
-	    slavePtr->masterPtr = masterPtr;
-	    masterPtr->slavePtr = slavePtr;
+	    slavePtr->containerPtr = containerPtr;
+	    containerPtr->slavePtr = slavePtr;
 	    slavePtr->nextPtr = tempPtr;
 	}
 
 	/*
-	 * Make sure that the slave's parent is either the master or an
-	 * ancestor of the master, and that the master and slave aren't the
+	 * Make sure that the slave's parent is either the container or an
+	 * ancestor of the container, and that the container and slave aren't the
 	 * same.
 	 */
 
-	for (ancestor = masterPtr->tkwin; ; ancestor = Tk_Parent(ancestor)) {
+	for (ancestor = containerPtr->tkwin; ; ancestor = Tk_Parent(ancestor)) {
 	    if (ancestor == parent) {
 		break;
 	    }
 	    if (Tk_TopWinHierarchy(ancestor)) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 			"can't put %s inside %s", Tcl_GetString(objv[j]),
-			Tk_PathName(masterPtr->tkwin)));
+			Tk_PathName(containerPtr->tkwin)));
 		Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "HIERARCHY", NULL);
 		Unlink(slavePtr);
 		return TCL_ERROR;
@@ -3357,31 +3357,31 @@ ConfigureSlaves(
 	 * Check for management loops.
 	 */
 
-	for (master = (TkWindow *)masterPtr->tkwin; master != NULL;
-	     master = (TkWindow *)TkGetGeomMaster(master)) {
-	    if (master == (TkWindow *)slave) {
+	for (container = (TkWindow *)containerPtr->tkwin; container != NULL;
+	     container = (TkWindow *)TkGetGeomMaster(container)) {
+	    if (container == (TkWindow *)slave) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "can't put %s inside %s, would cause management loop",
-	            Tcl_GetString(objv[j]), Tk_PathName(masterPtr->tkwin)));
+	            Tcl_GetString(objv[j]), Tk_PathName(containerPtr->tkwin)));
 		Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "LOOP", NULL);
 		Unlink(slavePtr);
 		return TCL_ERROR;
 	    }
 	}
-	if (masterPtr->tkwin != Tk_Parent(slave)) {
-	    ((TkWindow *)slave)->maintainerPtr = (TkWindow *)masterPtr->tkwin;
+	if (containerPtr->tkwin != Tk_Parent(slave)) {
+	    ((TkWindow *)slave)->maintainerPtr = (TkWindow *)containerPtr->tkwin;
 	}
 
 	Tk_ManageGeometry(slave, &gridMgrType, slavePtr);
 
-	if (!(masterPtr->flags & DONT_PROPAGATE)) {
-	    if (TkSetGeometryMaster(interp, masterPtr->tkwin, "grid")
+	if (!(containerPtr->flags & DONT_PROPAGATE)) {
+	    if (TkSetGeometryMaster(interp, containerPtr->tkwin, "grid")
 		    != TCL_OK) {
 		Tk_ManageGeometry(slave, NULL, NULL);
 		Unlink(slavePtr);
 		return TCL_ERROR;
 	    }
-	    masterPtr->flags |= ALLOCED_MASTER;
+	    containerPtr->flags |= ALLOCED_CONTAINER;
 	}
 
 	/*
@@ -3406,16 +3406,16 @@ ConfigureSlaves(
 	defaultColumnSpan = 1;
 
 	/*
-	 * Arrange for the master to be re-arranged at the first idle moment.
+	 * Arrange for the container to be re-arranged at the first idle moment.
 	 */
 
     scheduleLayout:
-	if (masterPtr->abortPtr != NULL) {
-	    *masterPtr->abortPtr = 1;
+	if (containerPtr->abortPtr != NULL) {
+	    *containerPtr->abortPtr = 1;
 	}
-	if (!(masterPtr->flags & REQUESTED_RELAYOUT)) {
-	    masterPtr->flags |= REQUESTED_RELAYOUT;
-	    Tcl_DoWhenIdle(ArrangeGrid, masterPtr);
+	if (!(containerPtr->flags & REQUESTED_RELAYOUT)) {
+	    containerPtr->flags |= REQUESTED_RELAYOUT;
+	    Tcl_DoWhenIdle(ArrangeGrid, containerPtr);
 	}
     }
 
@@ -3444,7 +3444,7 @@ ConfigureSlaves(
 	    continue;
 	}
 
-	if (masterPtr == NULL) {
+	if (containerPtr == NULL) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "can't use '^', cant find master", -1));
 	    Tcl_SetErrorCode(interp, "TK", "GRID", "SHORTCUT_USAGE", NULL);
@@ -3480,7 +3480,7 @@ ConfigureSlaves(
 	lastColumn += numSkip;
 
 	match = 0;
-	for (slavePtr = masterPtr->slavePtr; slavePtr != NULL;
+	for (slavePtr = containerPtr->slavePtr; slavePtr != NULL;
 		slavePtr = slavePtr->nextPtr) {
 
 	    if (slavePtr->column == lastColumn
@@ -3506,22 +3506,22 @@ ConfigureSlaves(
 	}
     }
 
-    if (masterPtr == NULL) {
+    if (containerPtr == NULL) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		"can't determine master window", -1));
 	Tcl_SetErrorCode(interp, "TK", "GRID", "SHORTCUT_USAGE", NULL);
 	return TCL_ERROR;
     }
-    SetGridSize(masterPtr);
+    SetGridSize(containerPtr);
 
     /*
-     * If we have emptied this master from slaves it means we are no longer
+     * If we have emptied this container from slaves it means we are no longer
      * handling it and should mark it as free.
      */
 
-    if (masterPtr->slavePtr == NULL && masterPtr->flags & ALLOCED_MASTER) {
-	TkFreeGeometryMaster(masterPtr->tkwin, "grid");
-	masterPtr->flags &= ~ALLOCED_MASTER;
+    if (containerPtr->slavePtr == NULL && containerPtr->flags & ALLOCED_CONTAINER) {
+	TkFreeGeometryMaster(containerPtr->tkwin, "grid");
+	containerPtr->flags &= ~ALLOCED_CONTAINER;
     }
 
     return TCL_OK;
diff --git a/generic/tkPack.c b/generic/tkPack.c
index 245c6a4..50cd3b8 100644
--- a/generic/tkPack.c
+++ b/generic/tkPack.c
@@ -29,7 +29,7 @@ typedef struct Packer {
 				 * window has been deleted, but the packet
 				 * hasn't had a chance to clean up yet because
 				 * the structure is still in use. */
-    struct Packer *masterPtr;	/* Master window within which this window is
+    struct Packer *containerPtr;	/* Master window within which this window is
 				 * packed (NULL means this window isn't
 				 * managed by the packer). */
     struct Packer *nextPtr;	/* Next window packed within same master. List
@@ -87,8 +87,8 @@ typedef struct Packer {
  *				size. 0 means if this window is a master then
  *				Tk will set its requested size to fit the
  *				needs of its slaves.
- * ALLOCED_MASTER               1 means that Pack has allocated itself as
- *                              geometry master for this window.
+ * ALLOCED_CONTAINER	1 means that Pack has allocated itself as
+ *				geometry master for this window.
  */
 
 #define REQUESTED_REPACK	1
@@ -97,7 +97,7 @@ typedef struct Packer {
 #define EXPAND			8
 #define OLD_STYLE		16
 #define DONT_PROPAGATE		32
-#define ALLOCED_MASTER		64
+#define ALLOCED_CONTAINER	64
 
 /*
  * The following structure is the official type record for the packer:
@@ -123,7 +123,7 @@ static int		ConfigureSlaves(Tcl_Interp *interp, Tk_Window tkwin,
 static void		DestroyPacker(void *memPtr);
 static Packer *		GetPacker(Tk_Window tkwin);
 static int		PackAfter(Tcl_Interp *interp, Packer *prevPtr,
-			    Packer *masterPtr, int objc,Tcl_Obj *const objv[]);
+			    Packer *containerPtr, int objc,Tcl_Obj *const objv[]);
 static void		PackStructureProc(ClientData clientData,
 			    XEvent *eventPtr);
 static void		Unlink(Packer *packPtr);
@@ -241,33 +241,33 @@ Tk_PackObjCmd(
 	    return TCL_ERROR;
 	}
 	prevPtr = GetPacker(tkwin2);
-	if (prevPtr->masterPtr == NULL) {
+	if (prevPtr->containerPtr == NULL) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "window \"%s\" isn't packed", argv2));
 	    Tcl_SetErrorCode(interp, "TK", "PACK", "NOT_PACKED", NULL);
 	    return TCL_ERROR;
 	}
-	return PackAfter(interp, prevPtr, prevPtr->masterPtr, objc-3, objv+3);
+	return PackAfter(interp, prevPtr, prevPtr->containerPtr, objc-3, objv+3);
     }
     case PACK_APPEND: {
-	Packer *masterPtr;
+	Packer *containerPtr;
 	register Packer *prevPtr;
 	Tk_Window tkwin2;
 
 	if (TkGetWindowFromObj(interp, tkwin, objv[2], &tkwin2) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	masterPtr = GetPacker(tkwin2);
-	prevPtr = masterPtr->slavePtr;
+	containerPtr = GetPacker(tkwin2);
+	prevPtr = containerPtr->slavePtr;
 	if (prevPtr != NULL) {
 	    while (prevPtr->nextPtr != NULL) {
 		prevPtr = prevPtr->nextPtr;
 	    }
 	}
-	return PackAfter(interp, prevPtr, masterPtr, objc-3, objv+3);
+	return PackAfter(interp, prevPtr, containerPtr, objc-3, objv+3);
     }
     case PACK_BEFORE: {
-	Packer *packPtr, *masterPtr;
+	Packer *packPtr, *containerPtr;
 	register Packer *prevPtr;
 	Tk_Window tkwin2;
 
@@ -275,14 +275,14 @@ Tk_PackObjCmd(
 	    return TCL_ERROR;
 	}
 	packPtr = GetPacker(tkwin2);
-	if (packPtr->masterPtr == NULL) {
+	if (packPtr->containerPtr == NULL) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "window \"%s\" isn't packed", argv2));
 	    Tcl_SetErrorCode(interp, "TK", "PACK", "NOT_PACKED", NULL);
 	    return TCL_ERROR;
 	}
-	masterPtr = packPtr->masterPtr;
-	prevPtr = masterPtr->slavePtr;
+	containerPtr = packPtr->containerPtr;
+	prevPtr = containerPtr->slavePtr;
 	if (prevPtr == packPtr) {
 	    prevPtr = NULL;
 	} else {
@@ -295,7 +295,7 @@ Tk_PackObjCmd(
 		}
 	    }
 	}
-	return PackAfter(interp, prevPtr, masterPtr, objc-3, objv+3);
+	return PackAfter(interp, prevPtr, containerPtr, objc-3, objv+3);
     }
     case PACK_CONFIGURE:
 	if (argv2[0] != '.') {
@@ -315,11 +315,11 @@ Tk_PackObjCmd(
 		continue;
 	    }
 	    slavePtr = GetPacker(slave);
-	    if ((slavePtr != NULL) && (slavePtr->masterPtr != NULL)) {
+	    if ((slavePtr != NULL) && (slavePtr->containerPtr != NULL)) {
 		Tk_ManageGeometry(slave, NULL, NULL);
-		if (slavePtr->masterPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
+		if (slavePtr->containerPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
 		    Tk_UnmaintainGeometry(slavePtr->tkwin,
-			    slavePtr->masterPtr->tkwin);
+			    slavePtr->containerPtr->tkwin);
 		}
 		Unlink(slavePtr);
 		Tk_UnmapWindow(slavePtr->tkwin);
@@ -340,7 +340,7 @@ Tk_PackObjCmd(
 	    return TCL_ERROR;
 	}
 	slavePtr = GetPacker(slave);
-	if (slavePtr->masterPtr == NULL) {
+	if (slavePtr->containerPtr == NULL) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "window \"%s\" isn't packed", argv2));
 	    Tcl_SetErrorCode(interp, "TK", "PACK", "NOT_PACKED", NULL);
@@ -349,7 +349,7 @@ Tk_PackObjCmd(
 
 	infoObj = Tcl_NewObj();
 	Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-in", -1),
-		TkNewWindowObj(slavePtr->masterPtr->tkwin));
+		TkNewWindowObj(slavePtr->containerPtr->tkwin));
 	Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-anchor", -1),
 		Tcl_NewStringObj(Tk_NameOfAnchor(slavePtr->anchor), -1));
 	Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-expand", -1),
@@ -383,7 +383,7 @@ Tk_PackObjCmd(
     }
     case PACK_PROPAGATE: {
 	Tk_Window master;
-	Packer *masterPtr;
+	Packer *containerPtr;
 	int propagate;
 
 	if (objc > 4) {
@@ -393,10 +393,10 @@ Tk_PackObjCmd(
 	if (TkGetWindowFromObj(interp, tkwin, objv[2], &master) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	masterPtr = GetPacker(master);
+	containerPtr = GetPacker(master);
 	if (objc == 3) {
 	    Tcl_SetObjResult(interp,
-		    Tcl_NewBooleanObj(!(masterPtr->flags & DONT_PROPAGATE)));
+		    Tcl_NewBooleanObj(!(containerPtr->flags & DONT_PROPAGATE)));
 	    return TCL_OK;
 	}
 	if (Tcl_GetBooleanFromObj(interp, objv[3], &propagate) != TCL_OK) {
@@ -407,39 +407,39 @@ Tk_PackObjCmd(
 	     * If we have slaves, we need to register as geometry master.
 	     */
 
-	    if (masterPtr->slavePtr != NULL) {
+	    if (containerPtr->slavePtr != NULL) {
 		if (TkSetGeometryMaster(interp, master, "pack") != TCL_OK) {
 		    return TCL_ERROR;
 		}
-		masterPtr->flags |= ALLOCED_MASTER;
+		containerPtr->flags |= ALLOCED_CONTAINER;
 	    }
-	    masterPtr->flags &= ~DONT_PROPAGATE;
+	    containerPtr->flags &= ~DONT_PROPAGATE;
 
 	    /*
 	     * Repack the master to allow new geometry information to
 	     * propagate upwards to the master's master.
 	     */
 
-	    if (masterPtr->abortPtr != NULL) {
-		*masterPtr->abortPtr = 1;
+	    if (containerPtr->abortPtr != NULL) {
+		*containerPtr->abortPtr = 1;
 	    }
-	    if (!(masterPtr->flags & REQUESTED_REPACK)) {
-		masterPtr->flags |= REQUESTED_REPACK;
-		Tcl_DoWhenIdle(ArrangePacking, masterPtr);
+	    if (!(containerPtr->flags & REQUESTED_REPACK)) {
+		containerPtr->flags |= REQUESTED_REPACK;
+		Tcl_DoWhenIdle(ArrangePacking, containerPtr);
 	    }
 	} else {
-	    if (masterPtr->flags & ALLOCED_MASTER) {
+	    if (containerPtr->flags & ALLOCED_CONTAINER) {
 		TkFreeGeometryMaster(master, "pack");
-		masterPtr->flags &= ~ALLOCED_MASTER;
+		containerPtr->flags &= ~ALLOCED_CONTAINER;
 	    }
-	    masterPtr->flags |= DONT_PROPAGATE;
+	    containerPtr->flags |= DONT_PROPAGATE;
 	}
 	break;
     }
     case PACK_CONTENT:
     case PACK_SLAVES: {
 	Tk_Window master;
-	Packer *masterPtr, *slavePtr;
+	Packer *containerPtr, *slavePtr;
 	Tcl_Obj *resultObj;
 
 	if (objc != 3) {
@@ -450,8 +450,8 @@ Tk_PackObjCmd(
 	    return TCL_ERROR;
 	}
 	resultObj = Tcl_NewObj();
-	masterPtr = GetPacker(master);
-	for (slavePtr = masterPtr->slavePtr; slavePtr != NULL;
+	containerPtr = GetPacker(master);
+	for (slavePtr = containerPtr->slavePtr; slavePtr != NULL;
 		slavePtr = slavePtr->nextPtr) {
 	    Tcl_ListObjAppendElement(NULL, resultObj,
 		    TkNewWindowObj(slavePtr->tkwin));
@@ -471,11 +471,11 @@ Tk_PackObjCmd(
 	    return TCL_ERROR;
 	}
 	packPtr = GetPacker(tkwin2);
-	if ((packPtr != NULL) && (packPtr->masterPtr != NULL)) {
+	if ((packPtr != NULL) && (packPtr->containerPtr != NULL)) {
 	    Tk_ManageGeometry(tkwin2, NULL, NULL);
-	    if (packPtr->masterPtr->tkwin != Tk_Parent(packPtr->tkwin)) {
+	    if (packPtr->containerPtr->tkwin != Tk_Parent(packPtr->tkwin)) {
 		Tk_UnmaintainGeometry(packPtr->tkwin,
-			packPtr->masterPtr->tkwin);
+			packPtr->containerPtr->tkwin);
 	    }
 	    Unlink(packPtr);
 	    Tk_UnmapWindow(packPtr->tkwin);
@@ -515,7 +515,7 @@ PackReqProc(
 {
     register Packer *packPtr = clientData;
 
-    packPtr = packPtr->masterPtr;
+    packPtr = packPtr->containerPtr;
     if (!(packPtr->flags & REQUESTED_REPACK)) {
 	packPtr->flags |= REQUESTED_REPACK;
 	Tcl_DoWhenIdle(ArrangePacking, packPtr);
@@ -548,8 +548,8 @@ PackLostSlaveProc(
 {
     register Packer *slavePtr = clientData;
 
-    if (slavePtr->masterPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
-	Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->masterPtr->tkwin);
+    if (slavePtr->containerPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
+	Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->containerPtr->tkwin);
     }
     Unlink(slavePtr);
     Tk_UnmapWindow(slavePtr->tkwin);
@@ -569,7 +569,7 @@ PackLostSlaveProc(
  *	None.
  *
  * Side effects:
- *	The packed slaves of masterPtr may get resized or moved.
+ *	The packed slaves of containerPtr may get resized or moved.
  *
  *------------------------------------------------------------------------
  */
@@ -579,7 +579,7 @@ ArrangePacking(
     ClientData clientData)	/* Structure describing master whose slaves
 				 * are to be re-layed out. */
 {
-    register Packer *masterPtr = clientData;
+    register Packer *containerPtr = clientData;
     register Packer *slavePtr;
     int cavityX, cavityY, cavityWidth, cavityHeight;
 				/* These variables keep track of the
@@ -597,14 +597,14 @@ ArrangePacking(
     int borderLeft, borderRight;
     int maxWidth, maxHeight, tmp;
 
-    masterPtr->flags &= ~REQUESTED_REPACK;
+    containerPtr->flags &= ~REQUESTED_REPACK;
 
     /*
      * If the master has no slaves anymore, then don't do anything at all:
      * just leave the master's size as-is.
      */
 
-    if (masterPtr->slavePtr == NULL) {
+    if (containerPtr->slavePtr == NULL) {
 	return;
     }
 
@@ -614,12 +614,12 @@ ArrangePacking(
      * necessary.
      */
 
-    if (masterPtr->abortPtr != NULL) {
-	*masterPtr->abortPtr = 1;
+    if (containerPtr->abortPtr != NULL) {
+	*containerPtr->abortPtr = 1;
     }
-    masterPtr->abortPtr = &abort;
+    containerPtr->abortPtr = &abort;
     abort = 0;
-    Tcl_Preserve(masterPtr);
+    Tcl_Preserve(containerPtr);
 
     /*
      * Pass #1: scan all the slaves to figure out the total amount of space
@@ -638,11 +638,11 @@ ArrangePacking(
      * maxHeight -	Same as maxWidth, except keeps height info.
      */
 
-    width = maxWidth = Tk_InternalBorderLeft(masterPtr->tkwin) +
-	    Tk_InternalBorderRight(masterPtr->tkwin);
-    height = maxHeight = Tk_InternalBorderTop(masterPtr->tkwin) +
-	    Tk_InternalBorderBottom(masterPtr->tkwin);
-    for (slavePtr = masterPtr->slavePtr; slavePtr != NULL;
+    width = maxWidth = Tk_InternalBorderLeft(containerPtr->tkwin) +
+	    Tk_InternalBorderRight(containerPtr->tkwin);
+    height = maxHeight = Tk_InternalBorderTop(containerPtr->tkwin) +
+	    Tk_InternalBorderBottom(containerPtr->tkwin);
+    for (slavePtr = containerPtr->slavePtr; slavePtr != NULL;
 	    slavePtr = slavePtr->nextPtr) {
 	if ((slavePtr->side == TOP) || (slavePtr->side == BOTTOM)) {
 	    tmp = Tk_ReqWidth(slavePtr->tkwin) + slavePtr->doubleBw
@@ -669,11 +669,11 @@ ArrangePacking(
 	maxHeight = height;
     }
 
-    if (maxWidth < Tk_MinReqWidth(masterPtr->tkwin)) {
-	maxWidth = Tk_MinReqWidth(masterPtr->tkwin);
+    if (maxWidth < Tk_MinReqWidth(containerPtr->tkwin)) {
+	maxWidth = Tk_MinReqWidth(containerPtr->tkwin);
     }
-    if (maxHeight < Tk_MinReqHeight(masterPtr->tkwin)) {
-	maxHeight = Tk_MinReqHeight(masterPtr->tkwin);
+    if (maxHeight < Tk_MinReqHeight(containerPtr->tkwin)) {
+	maxHeight = Tk_MinReqHeight(containerPtr->tkwin);
     }
 
     /*
@@ -683,12 +683,12 @@ ArrangePacking(
      * master has had a chance to resize us.
      */
 
-    if (((maxWidth != Tk_ReqWidth(masterPtr->tkwin))
-	    || (maxHeight != Tk_ReqHeight(masterPtr->tkwin)))
-	    && !(masterPtr->flags & DONT_PROPAGATE)) {
-	Tk_GeometryRequest(masterPtr->tkwin, maxWidth, maxHeight);
-	masterPtr->flags |= REQUESTED_REPACK;
-	Tcl_DoWhenIdle(ArrangePacking, masterPtr);
+    if (((maxWidth != Tk_ReqWidth(containerPtr->tkwin))
+	    || (maxHeight != Tk_ReqHeight(containerPtr->tkwin)))
+	    && !(containerPtr->flags & DONT_PROPAGATE)) {
+	Tk_GeometryRequest(containerPtr->tkwin, maxWidth, maxHeight);
+	containerPtr->flags |= REQUESTED_REPACK;
+	Tcl_DoWhenIdle(ArrangePacking, containerPtr);
 	goto done;
     }
 
@@ -701,15 +701,15 @@ ArrangePacking(
      * somewhere inside the frame, depending on anchor.
      */
 
-    cavityX = x = Tk_InternalBorderLeft(masterPtr->tkwin);
-    cavityY = y = Tk_InternalBorderTop(masterPtr->tkwin);
-    cavityWidth = Tk_Width(masterPtr->tkwin) -
-	    Tk_InternalBorderLeft(masterPtr->tkwin) -
-	    Tk_InternalBorderRight(masterPtr->tkwin);
-    cavityHeight = Tk_Height(masterPtr->tkwin) -
-	    Tk_InternalBorderTop(masterPtr->tkwin) -
-	    Tk_InternalBorderBottom(masterPtr->tkwin);
-    for (slavePtr = masterPtr->slavePtr; slavePtr != NULL;
+    cavityX = x = Tk_InternalBorderLeft(containerPtr->tkwin);
+    cavityY = y = Tk_InternalBorderTop(containerPtr->tkwin);
+    cavityWidth = Tk_Width(containerPtr->tkwin) -
+	    Tk_InternalBorderLeft(containerPtr->tkwin) -
+	    Tk_InternalBorderRight(containerPtr->tkwin);
+    cavityHeight = Tk_Height(containerPtr->tkwin) -
+	    Tk_InternalBorderTop(containerPtr->tkwin) -
+	    Tk_InternalBorderBottom(containerPtr->tkwin);
+    for (slavePtr = containerPtr->slavePtr; slavePtr != NULL;
 	    slavePtr = slavePtr->nextPtr) {
 	if ((slavePtr->side == TOP) || (slavePtr->side == BOTTOM)) {
 	    frameWidth = cavityWidth;
@@ -833,7 +833,7 @@ ArrangePacking(
 	 * this here. Otherwise let Tk_MaintainGeometry do the work.
 	 */
 
-	if (masterPtr->tkwin == Tk_Parent(slavePtr->tkwin)) {
+	if (containerPtr->tkwin == Tk_Parent(slavePtr->tkwin)) {
 	    if ((width <= 0) || (height <= 0)) {
 		Tk_UnmapWindow(slavePtr->tkwin);
 	    } else {
@@ -852,16 +852,16 @@ ArrangePacking(
 		 * the master gets mapped later.
 		 */
 
-		if (Tk_IsMapped(masterPtr->tkwin)) {
+		if (Tk_IsMapped(containerPtr->tkwin)) {
 		    Tk_MapWindow(slavePtr->tkwin);
 		}
 	    }
 	} else {
 	    if ((width <= 0) || (height <= 0)) {
-		Tk_UnmaintainGeometry(slavePtr->tkwin, masterPtr->tkwin);
+		Tk_UnmaintainGeometry(slavePtr->tkwin, containerPtr->tkwin);
 		Tk_UnmapWindow(slavePtr->tkwin);
 	    } else {
-		Tk_MaintainGeometry(slavePtr->tkwin, masterPtr->tkwin,
+		Tk_MaintainGeometry(slavePtr->tkwin, containerPtr->tkwin,
 			x, y, width, height);
 	    }
 	}
@@ -878,8 +878,8 @@ ArrangePacking(
     }
 
   done:
-    masterPtr->abortPtr = NULL;
-    Tcl_Release(masterPtr);
+    containerPtr->abortPtr = NULL;
+    Tcl_Release(containerPtr);
 }
 
 /*
@@ -1053,7 +1053,7 @@ GetPacker(
     }
     packPtr = ckalloc(sizeof(Packer));
     packPtr->tkwin = tkwin;
-    packPtr->masterPtr = NULL;
+    packPtr->containerPtr = NULL;
     packPtr->nextPtr = NULL;
     packPtr->slavePtr = NULL;
     packPtr->side = TOP;
@@ -1093,8 +1093,8 @@ PackAfter(
     Tcl_Interp *interp,		/* Interpreter for error reporting. */
     Packer *prevPtr,		/* Pack windows in argv just after this
 				 * window; NULL means pack as first child of
-				 * masterPtr. */
-    Packer *masterPtr,		/* Master in which to pack windows. */
+				 * containerPtr. */
+    Packer *containerPtr,		/* Master in which to pack windows. */
     int objc,			/* Number of elements in objv. */
     Tcl_Obj *const objv[])	/* Array of lists, each containing 2 elements:
 				 * window name and side against which to
@@ -1126,13 +1126,13 @@ PackAfter(
 	 * its parent.
 	 */
 
-	if (TkGetWindowFromObj(interp, masterPtr->tkwin, objv[0], &tkwin)
+	if (TkGetWindowFromObj(interp, containerPtr->tkwin, objv[0], &tkwin)
 		!= TCL_OK) {
 	    return TCL_ERROR;
 	}
 
 	parent = Tk_Parent(tkwin);
-	for (ancestor = masterPtr->tkwin; ; ancestor = Tk_Parent(ancestor)) {
+	for (ancestor = containerPtr->tkwin; ; ancestor = Tk_Parent(ancestor)) {
 	    if (ancestor == parent) {
 		break;
 	    }
@@ -1140,7 +1140,7 @@ PackAfter(
 	    badWindow:
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 			"can't pack %s inside %s", Tcl_GetString(objv[0]),
-			Tk_PathName(masterPtr->tkwin)));
+			Tk_PathName(containerPtr->tkwin)));
 		Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "HIERARCHY", NULL);
 		return TCL_ERROR;
 	    }
@@ -1148,7 +1148,7 @@ PackAfter(
 	if (((Tk_FakeWin *) (tkwin))->flags & TK_TOP_HIERARCHY) {
 	    goto badWindow;
 	}
-	if (tkwin == masterPtr->tkwin) {
+	if (tkwin == containerPtr->tkwin) {
 	    goto badWindow;
 	}
 	packPtr = GetPacker(tkwin);
@@ -1258,12 +1258,12 @@ PackAfter(
 	     * Unpack this window if it's currently packed.
 	     */
 
-	    if (packPtr->masterPtr != NULL) {
-		if ((packPtr->masterPtr != masterPtr) &&
-			(packPtr->masterPtr->tkwin
+	    if (packPtr->containerPtr != NULL) {
+		if ((packPtr->containerPtr != containerPtr) &&
+			(packPtr->containerPtr->tkwin
 			!= Tk_Parent(packPtr->tkwin))) {
 		    Tk_UnmaintainGeometry(packPtr->tkwin,
-			    packPtr->masterPtr->tkwin);
+			    packPtr->containerPtr->tkwin);
 		}
 		Unlink(packPtr);
 	    }
@@ -1273,24 +1273,24 @@ PackAfter(
 	     * order, then make sure that the window is managed by us.
 	     */
 
-	    packPtr->masterPtr = masterPtr;
+	    packPtr->containerPtr = containerPtr;
 	    if (prevPtr == NULL) {
-		packPtr->nextPtr = masterPtr->slavePtr;
-		masterPtr->slavePtr = packPtr;
+		packPtr->nextPtr = containerPtr->slavePtr;
+		containerPtr->slavePtr = packPtr;
 	    } else {
 		packPtr->nextPtr = prevPtr->nextPtr;
 		prevPtr->nextPtr = packPtr;
 	    }
 	    Tk_ManageGeometry(tkwin, &packerType, packPtr);
 
-	    if (!(masterPtr->flags & DONT_PROPAGATE)) {
-		if (TkSetGeometryMaster(interp, masterPtr->tkwin, "pack")
+	    if (!(containerPtr->flags & DONT_PROPAGATE)) {
+		if (TkSetGeometryMaster(interp, containerPtr->tkwin, "pack")
 			!= TCL_OK) {
 		    Tk_ManageGeometry(tkwin, NULL, NULL);
 		    Unlink(packPtr);
 		    return TCL_ERROR;
 		}
-		masterPtr->flags |= ALLOCED_MASTER;
+		containerPtr->flags |= ALLOCED_CONTAINER;
 	    }
 	}
     }
@@ -1299,12 +1299,12 @@ PackAfter(
      * Arrange for the master to be re-packed at the first idle moment.
      */
 
-    if (masterPtr->abortPtr != NULL) {
-	*masterPtr->abortPtr = 1;
+    if (containerPtr->abortPtr != NULL) {
+	*containerPtr->abortPtr = 1;
     }
-    if (!(masterPtr->flags & REQUESTED_REPACK)) {
-	masterPtr->flags |= REQUESTED_REPACK;
-	Tcl_DoWhenIdle(ArrangePacking, masterPtr);
+    if (!(containerPtr->flags & REQUESTED_REPACK)) {
+	containerPtr->flags |= REQUESTED_REPACK;
+	Tcl_DoWhenIdle(ArrangePacking, containerPtr);
     }
     return TCL_OK;
 }
@@ -1329,16 +1329,16 @@ static void
 Unlink(
     register Packer *packPtr)	/* Window to unlink. */
 {
-    register Packer *masterPtr, *packPtr2;
+    register Packer *containerPtr, *packPtr2;
 
-    masterPtr = packPtr->masterPtr;
-    if (masterPtr == NULL) {
+    containerPtr = packPtr->containerPtr;
+    if (containerPtr == NULL) {
 	return;
     }
-    if (masterPtr->slavePtr == packPtr) {
-	masterPtr->slavePtr = packPtr->nextPtr;
+    if (containerPtr->slavePtr == packPtr) {
+	containerPtr->slavePtr = packPtr->nextPtr;
     } else {
-	for (packPtr2 = masterPtr->slavePtr; ; packPtr2 = packPtr2->nextPtr) {
+	for (packPtr2 = containerPtr->slavePtr; ; packPtr2 = packPtr2->nextPtr) {
 	    if (packPtr2 == NULL) {
 		Tcl_Panic("Unlink couldn't find previous window");
 	    }
@@ -1348,24 +1348,24 @@ Unlink(
 	    }
 	}
     }
-    if (!(masterPtr->flags & REQUESTED_REPACK)) {
-	masterPtr->flags |= REQUESTED_REPACK;
-	Tcl_DoWhenIdle(ArrangePacking, masterPtr);
+    if (!(containerPtr->flags & REQUESTED_REPACK)) {
+	containerPtr->flags |= REQUESTED_REPACK;
+	Tcl_DoWhenIdle(ArrangePacking, containerPtr);
     }
-    if (masterPtr->abortPtr != NULL) {
-	*masterPtr->abortPtr = 1;
+    if (containerPtr->abortPtr != NULL) {
+	*containerPtr->abortPtr = 1;
     }
 
-    packPtr->masterPtr = NULL;
+    packPtr->containerPtr = NULL;
 
     /*
      * If we have emptied this master from slaves it means we are no longer
      * handling it and should mark it as free.
      */
 
-    if ((masterPtr->slavePtr == NULL) && (masterPtr->flags & ALLOCED_MASTER)) {
-	TkFreeGeometryMaster(masterPtr->tkwin, "pack");
-	masterPtr->flags &= ~ALLOCED_MASTER;
+    if ((containerPtr->slavePtr == NULL) && (containerPtr->flags & ALLOCED_CONTAINER)) {
+	TkFreeGeometryMaster(containerPtr->tkwin, "pack");
+	containerPtr->flags &= ~ALLOCED_CONTAINER;
     }
 
 }
@@ -1430,18 +1430,18 @@ PackStructureProc(
 	    packPtr->flags |= REQUESTED_REPACK;
 	    Tcl_DoWhenIdle(ArrangePacking, packPtr);
 	}
-	if ((packPtr->masterPtr != NULL)
+	if ((packPtr->containerPtr != NULL)
 	        && (packPtr->doubleBw != 2*Tk_Changes(packPtr->tkwin)->border_width)) {
-	    if (!(packPtr->masterPtr->flags & REQUESTED_REPACK)) {
+	    if (!(packPtr->containerPtr->flags & REQUESTED_REPACK)) {
 		packPtr->doubleBw = 2*Tk_Changes(packPtr->tkwin)->border_width;
-		packPtr->masterPtr->flags |= REQUESTED_REPACK;
-		Tcl_DoWhenIdle(ArrangePacking, packPtr->masterPtr);
+		packPtr->containerPtr->flags |= REQUESTED_REPACK;
+		Tcl_DoWhenIdle(ArrangePacking, packPtr->containerPtr);
 	    }
 	}
     } else if (eventPtr->type == DestroyNotify) {
 	register Packer *slavePtr, *nextPtr;
 
-	if (packPtr->masterPtr != NULL) {
+	if (packPtr->containerPtr != NULL) {
 	    Unlink(packPtr);
 	}
 
@@ -1449,7 +1449,7 @@ PackStructureProc(
 		slavePtr = nextPtr) {
 	    Tk_ManageGeometry(slavePtr->tkwin, NULL, NULL);
 	    Tk_UnmapWindow(slavePtr->tkwin);
-	    slavePtr->masterPtr = NULL;
+	    slavePtr->containerPtr = NULL;
 	    nextPtr = slavePtr->nextPtr;
 	    slavePtr->nextPtr = NULL;
 	}
@@ -1521,7 +1521,7 @@ ConfigureSlaves(
 				 * "option value" pairs. Caller must make sure
 				 * that there is at least one window name. */
 {
-    Packer *masterPtr, *slavePtr, *prevPtr, *otherPtr;
+    Packer *containerPtr, *slavePtr, *prevPtr, *otherPtr;
     Tk_Window other, slave, parent, ancestor;
     TkWindow *master;
     int i, j, numWindows, tmp, positionGiven;
@@ -1555,7 +1555,7 @@ ConfigureSlaves(
      * options only get processed for the first window.
      */
 
-    masterPtr = NULL;
+    containerPtr = NULL;
     prevPtr = NULL;
     positionGiven = 0;
     for (j = 0; j < numWindows; j++) {
@@ -1578,7 +1578,7 @@ ConfigureSlaves(
 	 * a previous packing).
 	 */
 
-	if (slavePtr->masterPtr == NULL) {
+	if (slavePtr->containerPtr == NULL) {
 	    slavePtr->side = TOP;
 	    slavePtr->anchor = TK_ANCHOR_CENTER;
 	    slavePtr->padX = slavePtr->padY = 0;
@@ -1608,7 +1608,7 @@ ConfigureSlaves(
 			return TCL_ERROR;
 		    }
 		    prevPtr = GetPacker(other);
-		    if (prevPtr->masterPtr == NULL) {
+		    if (prevPtr->containerPtr == NULL) {
 		    notPacked:
 			Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 				"window \"%s\" isn't packed",
@@ -1617,7 +1617,7 @@ ConfigureSlaves(
 				NULL);
 			return TCL_ERROR;
 		    }
-		    masterPtr = prevPtr->masterPtr;
+		    containerPtr = prevPtr->containerPtr;
 		    positionGiven = 1;
 		}
 		break;
@@ -1634,11 +1634,11 @@ ConfigureSlaves(
 			return TCL_ERROR;
 		    }
 		    otherPtr = GetPacker(other);
-		    if (otherPtr->masterPtr == NULL) {
+		    if (otherPtr->containerPtr == NULL) {
 			goto notPacked;
 		    }
-		    masterPtr = otherPtr->masterPtr;
-		    prevPtr = masterPtr->slavePtr;
+		    containerPtr = otherPtr->containerPtr;
+		    prevPtr = containerPtr->slavePtr;
 		    if (prevPtr == otherPtr) {
 			prevPtr = NULL;
 		    } else {
@@ -1682,8 +1682,8 @@ ConfigureSlaves(
 			    != TCL_OK) {
 			return TCL_ERROR;
 		    }
-		    masterPtr = GetPacker(other);
-		    prevPtr = masterPtr->slavePtr;
+		    containerPtr = GetPacker(other);
+		    prevPtr = containerPtr->slavePtr;
 		    if (prevPtr != NULL) {
 			while (prevPtr->nextPtr != NULL) {
 			    prevPtr = prevPtr->nextPtr;
@@ -1742,8 +1742,8 @@ ConfigureSlaves(
 	 * current packing list.
 	 */
 
-	if (!positionGiven && (slavePtr->masterPtr != NULL)) {
-	    masterPtr = slavePtr->masterPtr;
+	if (!positionGiven && (slavePtr->containerPtr != NULL)) {
+	    containerPtr = slavePtr->containerPtr;
 	    goto scheduleLayout;
 	}
 
@@ -1754,7 +1754,7 @@ ConfigureSlaves(
 	 */
 
 	if (prevPtr == slavePtr) {
-	    masterPtr = slavePtr->masterPtr;
+	    containerPtr = slavePtr->containerPtr;
 	    goto scheduleLayout;
 	}
 
@@ -1765,8 +1765,8 @@ ConfigureSlaves(
 	 */
 
 	if (!positionGiven) {
-	    masterPtr = GetPacker(Tk_Parent(slave));
-	    prevPtr = masterPtr->slavePtr;
+	    containerPtr = GetPacker(Tk_Parent(slave));
+	    prevPtr = containerPtr->slavePtr;
 	    if (prevPtr != NULL) {
 		while (prevPtr->nextPtr != NULL) {
 		    prevPtr = prevPtr->nextPtr;
@@ -1781,19 +1781,19 @@ ConfigureSlaves(
 	 */
 
 	parent = Tk_Parent(slave);
-	for (ancestor = masterPtr->tkwin; ; ancestor = Tk_Parent(ancestor)) {
+	for (ancestor = containerPtr->tkwin; ; ancestor = Tk_Parent(ancestor)) {
 	    if (ancestor == parent) {
 		break;
 	    }
 	    if (Tk_TopWinHierarchy(ancestor)) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 			"can't pack %s inside %s", Tcl_GetString(objv[j]),
-			Tk_PathName(masterPtr->tkwin)));
+			Tk_PathName(containerPtr->tkwin)));
 		Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "HIERARCHY", NULL);
 		return TCL_ERROR;
 	    }
 	}
-	if (slave == masterPtr->tkwin) {
+	if (slave == containerPtr->tkwin) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "can't pack %s inside itself", Tcl_GetString(objv[j])));
 	    Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "SELF", NULL);
@@ -1804,18 +1804,18 @@ ConfigureSlaves(
 	 * Check for management loops.
 	 */
 
-	for (master = (TkWindow *)masterPtr->tkwin; master != NULL;
+	for (master = (TkWindow *)containerPtr->tkwin; master != NULL;
 	     master = (TkWindow *)TkGetGeomMaster(master)) {
 	    if (master == (TkWindow *)slave) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "can't put %s inside %s, would cause management loop",
-	            Tcl_GetString(objv[j]), Tk_PathName(masterPtr->tkwin)));
+	            Tcl_GetString(objv[j]), Tk_PathName(containerPtr->tkwin)));
 		Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "LOOP", NULL);
 		return TCL_ERROR;
 	    }
 	}
-	if (masterPtr->tkwin != Tk_Parent(slave)) {
-	    ((TkWindow *)slave)->maintainerPtr = (TkWindow *)masterPtr->tkwin;
+	if (containerPtr->tkwin != Tk_Parent(slave)) {
+	    ((TkWindow *)slave)->maintainerPtr = (TkWindow *)containerPtr->tkwin;
 	}
 
 	/*
@@ -1823,20 +1823,20 @@ ConfigureSlaves(
 	 * prevPtr.
 	 */
 
-	if (slavePtr->masterPtr != NULL) {
-	    if ((slavePtr->masterPtr != masterPtr) &&
-		    (slavePtr->masterPtr->tkwin
+	if (slavePtr->containerPtr != NULL) {
+	    if ((slavePtr->containerPtr != containerPtr) &&
+		    (slavePtr->containerPtr->tkwin
 		    != Tk_Parent(slavePtr->tkwin))) {
 		Tk_UnmaintainGeometry(slavePtr->tkwin,
-			slavePtr->masterPtr->tkwin);
+			slavePtr->containerPtr->tkwin);
 	    }
 	    Unlink(slavePtr);
 	}
 
-	slavePtr->masterPtr = masterPtr;
+	slavePtr->containerPtr = containerPtr;
 	if (prevPtr == NULL) {
-	    slavePtr->nextPtr = masterPtr->slavePtr;
-	    masterPtr->slavePtr = slavePtr;
+	    slavePtr->nextPtr = containerPtr->slavePtr;
+	    containerPtr->slavePtr = slavePtr;
 	} else {
 	    slavePtr->nextPtr = prevPtr->nextPtr;
 	    prevPtr->nextPtr = slavePtr;
@@ -1844,14 +1844,14 @@ ConfigureSlaves(
 	Tk_ManageGeometry(slave, &packerType, slavePtr);
 	prevPtr = slavePtr;
 
-	if (!(masterPtr->flags & DONT_PROPAGATE)) {
-	    if (TkSetGeometryMaster(interp, masterPtr->tkwin, "pack")
+	if (!(containerPtr->flags & DONT_PROPAGATE)) {
+	    if (TkSetGeometryMaster(interp, containerPtr->tkwin, "pack")
 		    != TCL_OK) {
 		Tk_ManageGeometry(slave, NULL, NULL);
 		Unlink(slavePtr);
 		return TCL_ERROR;
 	    }
-	    masterPtr->flags |= ALLOCED_MASTER;
+	    containerPtr->flags |= ALLOCED_CONTAINER;
 	}
 
 	/*
@@ -1859,12 +1859,12 @@ ConfigureSlaves(
 	 */
 
     scheduleLayout:
-	if (masterPtr->abortPtr != NULL) {
-	    *masterPtr->abortPtr = 1;
+	if (containerPtr->abortPtr != NULL) {
+	    *containerPtr->abortPtr = 1;
 	}
-	if (!(masterPtr->flags & REQUESTED_REPACK)) {
-	    masterPtr->flags |= REQUESTED_REPACK;
-	    Tcl_DoWhenIdle(ArrangePacking, masterPtr);
+	if (!(containerPtr->flags & REQUESTED_REPACK)) {
+	    containerPtr->flags |= REQUESTED_REPACK;
+	    Tcl_DoWhenIdle(ArrangePacking, containerPtr);
 	}
     }
     return TCL_OK;
diff --git a/generic/tkPanedWindow.c b/generic/tkPanedWindow.c
index ac61ba8..fec9448 100644
--- a/generic/tkPanedWindow.c
+++ b/generic/tkPanedWindow.c
@@ -70,7 +70,7 @@ enum stretch {
 
 typedef struct {
     Tk_OptionTable pwOptions;	/* Token for paned window option table. */
-    Tk_OptionTable slaveOpts;	/* Token for slave cget option table. */
+    Tk_OptionTable paneOpts;	/* Token for pane cget option table. */
 } OptionTables;
 
 /*
@@ -78,35 +78,35 @@ typedef struct {
  * managed by a paned window widget.
  */
 
-typedef struct Slave {
+typedef struct Pane {
     Tk_Window tkwin;		/* Window being managed. */
     int minSize;		/* Minimum size of this pane, on the relevant
 				 * axis, in pixels. */
-    int padx;			/* Additional padding requested for slave, in
+    int padx;			/* Additional padding requested for pane, in
 				 * the x dimension. */
-    int pady;			/* Additional padding requested for slave, in
+    int pady;			/* Additional padding requested for pane, in
 				 * the y dimension. */
     Tcl_Obj *widthPtr, *heightPtr;
-				/* Tcl_Obj rep's of slave width/height, to
+				/* Tcl_Obj rep's of pane width/height, to
 				 * allow for null values. */
-    int width;			/* Slave width. */
-    int height;			/* Slave height. */
+    int width;			/* Pane width. */
+    int height;			/* Pane height. */
     int sticky;			/* Sticky string. */
     int x, y;			/* Coordinates of the widget. */
     int paneWidth, paneHeight;	/* Pane dimensions (may be different from
-				 * slave width/height). */
+				 * pane width/height). */
     int sashx, sashy;		/* Coordinates of the sash of the right or
 				 * bottom of this pane. */
     int markx, marky;		/* Coordinates of the last mark set for the
 				 * sash. */
     int handlex, handley;	/* Coordinates of the sash handle. */
-    enum stretch stretch;	/* Controls how slave grows/shrinks */
+    enum stretch stretch;	/* Controls how pane grows/shrinks */
     int hide;			/* Controls visibility of pane */
-    struct PanedWindow *masterPtr;
+    struct PanedWindow *containerPtr;
 				/* Paned window managing the window. */
     Tk_Window after;		/* Placeholder for parsing options. */
     Tk_Window before;		/* Placeholder for parsing options. */
-} Slave;
+} Pane;
 
 /*
  * A data structure of the following type is kept for each paned window widget
@@ -121,7 +121,7 @@ typedef struct PanedWindow {
     Tcl_Command widgetCmd;	/* Token for square's widget command. */
     Tk_OptionTable optionTable;	/* Token representing the configuration
 				 * specifications. */
-    Tk_OptionTable slaveOpts;	/* Token for slave cget table. */
+    Tk_OptionTable paneOpts;	/* Token for pane cget table. */
     Tk_3DBorder background;	/* Background color. */
     int borderWidth;		/* Value of -borderwidth option. */
     int relief;			/* 3D border effect (TK_RELIEF_RAISED, etc) */
@@ -151,9 +151,9 @@ typedef struct PanedWindow {
     Tcl_Obj *proxyBorderWidthPtr; /* Tcl_Obj rep for proxyBorderWidth */
     int proxyBorderWidth;	/* Borderwidth used to draw proxy. */
     int proxyRelief;		/* Relief used to draw proxy, if TK_RELIEF_NULL then use relief. */
-    Slave **slaves;		/* Pointer to array of Slaves. */
-    int numSlaves;		/* Number of slaves. */
-    int sizeofSlaves;		/* Number of elements in the slaves array. */
+    Pane **panes;		/* Pointer to array of Panes. */
+    int numPanes;		/* Number of panes. */
+    int sizeofPanes;		/* Number of elements in the panes array. */
     int flags;			/* Flags for widget; see below. */
 } PanedWindow;
 
@@ -200,16 +200,16 @@ static void		DisplayProxyWindow(ClientData clientData);
 static void		PanedWindowWorldChanged(ClientData instanceData);
 static int		PanedWindowWidgetObjCmd(ClientData clientData,
 			    Tcl_Interp *, int objc, Tcl_Obj * const objv[]);
-static void		PanedWindowLostSlaveProc(ClientData clientData,
+static void		PanedWindowLostPaneProc(ClientData clientData,
 			    Tk_Window tkwin);
 static void		PanedWindowReqProc(ClientData clientData,
 			    Tk_Window tkwin);
 static void		ArrangePanes(ClientData clientData);
-static void		Unlink(Slave *slavePtr);
-static Slave *		GetPane(PanedWindow *pwPtr, Tk_Window tkwin);
+static void		Unlink(Pane *panePtr);
+static Pane *		GetPane(PanedWindow *pwPtr, Tk_Window tkwin);
 static void		GetFirstLastVisiblePane(PanedWindow *pwPtr,
 			    int *firstPtr, int *lastPtr);
-static void		SlaveStructureProc(ClientData clientData,
+static void		PaneStructureProc(ClientData clientData,
 			    XEvent *eventPtr);
 static int		PanedWindowSashCommand(PanedWindow *pwPtr,
 			    Tcl_Interp *interp, int objc,
@@ -218,7 +218,7 @@ static int		PanedWindowProxyCommand(PanedWindow *pwPtr,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj * const objv[]);
 static void		ComputeGeometry(PanedWindow *pwPtr);
-static int		ConfigureSlaves(PanedWindow *pwPtr,
+static int		ConfigurePanes(PanedWindow *pwPtr,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj * const objv[]);
 static void		DestroyOptionTables(ClientData clientData,
@@ -233,7 +233,7 @@ static void		RestoreSticky(ClientData clientData, Tk_Window tkwin,
 			    char *internalPtr, char *oldInternalPtr);
 static void		AdjustForSticky(int sticky, int cavityWidth,
 			    int cavityHeight, int *xPtr, int *yPtr,
-			    int *slaveWidthPtr, int *slaveHeightPtr);
+			    int *paneWidthPtr, int *paneHeightPtr);
 static void		MoveSash(PanedWindow *pwPtr, int sash, int diff);
 static int		ObjectIsEmpty(Tcl_Obj *objPtr);
 static char *		ComputeSlotAddress(char *recordPtr, int offset);
@@ -241,16 +241,16 @@ static int		PanedWindowIdentifyCoords(PanedWindow *pwPtr,
 			    Tcl_Interp *interp, int x, int y);
 
 /*
- * Sashes are between panes only, so there is one less sash than slaves
+ * Sashes are between panes only, so there is one less sash than panes
  */
 
 #define ValidSashIndex(pwPtr, sash) \
-	(((sash) >= 0) && ((sash) < ((pwPtr)->numSlaves-1)))
+	(((sash) >= 0) && ((sash) < ((pwPtr)->numPanes-1)))
 
 static const Tk_GeomMgr panedWindowMgrType = {
     "panedwindow",		/* name */
     PanedWindowReqProc,		/* requestProc */
-    PanedWindowLostSlaveProc,	/* lostSlaveProc */
+    PanedWindowLostPaneProc,	/* lostPaneProc */
 };
 
 /*
@@ -261,7 +261,7 @@ static const Tk_GeomMgr panedWindowMgrType = {
 
 /*
  * The following structure contains pointers to functions used for processing
- * the custom "-sticky" option for slave windows.
+ * the custom "-sticky" option for panes.
  */
 
 static const Tk_ObjCustomOption stickyOption = {
@@ -334,33 +334,33 @@ static const Tk_OptionSpec optionSpecs[] = {
     {TK_OPTION_END, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0}
 };
 
-static const Tk_OptionSpec slaveOptionSpecs[] = {
+static const Tk_OptionSpec paneOptionSpecs[] = {
     {TK_OPTION_WINDOW, "-after", NULL, NULL,
-	 DEF_PANEDWINDOW_PANE_AFTER, -1, Tk_Offset(Slave, after),
+	 DEF_PANEDWINDOW_PANE_AFTER, -1, Tk_Offset(Pane, after),
 	 TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_WINDOW, "-before", NULL, NULL,
-	 DEF_PANEDWINDOW_PANE_BEFORE, -1, Tk_Offset(Slave, before),
+	 DEF_PANEDWINDOW_PANE_BEFORE, -1, Tk_Offset(Pane, before),
 	 TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_PIXELS, "-height", NULL, NULL,
-	 DEF_PANEDWINDOW_PANE_HEIGHT, Tk_Offset(Slave, heightPtr),
-	 Tk_Offset(Slave, height), TK_OPTION_NULL_OK, 0, 0},
+	 DEF_PANEDWINDOW_PANE_HEIGHT, Tk_Offset(Pane, heightPtr),
+	 Tk_Offset(Pane, height), TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_BOOLEAN, "-hide", "hide", "Hide",
-	 DEF_PANEDWINDOW_PANE_HIDE, -1, Tk_Offset(Slave, hide), 0,0,GEOMETRY},
+	 DEF_PANEDWINDOW_PANE_HIDE, -1, Tk_Offset(Pane, hide), 0,0,GEOMETRY},
     {TK_OPTION_PIXELS, "-minsize", NULL, NULL,
-	 DEF_PANEDWINDOW_PANE_MINSIZE, -1, Tk_Offset(Slave, minSize), 0, 0, 0},
+	 DEF_PANEDWINDOW_PANE_MINSIZE, -1, Tk_Offset(Pane, minSize), 0, 0, 0},
     {TK_OPTION_PIXELS, "-padx", NULL, NULL,
-	 DEF_PANEDWINDOW_PANE_PADX, -1, Tk_Offset(Slave, padx), 0, 0, 0},
+	 DEF_PANEDWINDOW_PANE_PADX, -1, Tk_Offset(Pane, padx), 0, 0, 0},
     {TK_OPTION_PIXELS, "-pady", NULL, NULL,
-	 DEF_PANEDWINDOW_PANE_PADY, -1, Tk_Offset(Slave, pady), 0, 0, 0},
+	 DEF_PANEDWINDOW_PANE_PADY, -1, Tk_Offset(Pane, pady), 0, 0, 0},
     {TK_OPTION_CUSTOM, "-sticky", NULL, NULL,
-	 DEF_PANEDWINDOW_PANE_STICKY, -1, Tk_Offset(Slave, sticky), 0,
+	 DEF_PANEDWINDOW_PANE_STICKY, -1, Tk_Offset(Pane, sticky), 0,
 	 &stickyOption, 0},
     {TK_OPTION_STRING_TABLE, "-stretch", "stretch", "Stretch",
-	DEF_PANEDWINDOW_PANE_STRETCH, -1, Tk_Offset(Slave, stretch), 0,
+	DEF_PANEDWINDOW_PANE_STRETCH, -1, Tk_Offset(Pane, stretch), 0,
 	(ClientData) stretchStrings, 0},
     {TK_OPTION_PIXELS, "-width", NULL, NULL,
-	 DEF_PANEDWINDOW_PANE_WIDTH, Tk_Offset(Slave, widthPtr),
-	 Tk_Offset(Slave, width), TK_OPTION_NULL_OK, 0, 0},
+	 DEF_PANEDWINDOW_PANE_WIDTH, Tk_Offset(Pane, widthPtr),
+	 Tk_Offset(Pane, width), TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_END, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0}
 };
 
@@ -428,7 +428,7 @@ Tk_PanedWindowObjCmd(
 	 */
 
 	pwOpts->pwOptions = Tk_CreateOptionTable(interp, optionSpecs);
-	pwOpts->slaveOpts = Tk_CreateOptionTable(interp, slaveOptionSpecs);
+	pwOpts->paneOpts = Tk_CreateOptionTable(interp, paneOptionSpecs);
     }
 
     Tk_SetClass(tkwin, "Panedwindow");
@@ -446,7 +446,7 @@ Tk_PanedWindowObjCmd(
 	    Tk_PathName(pwPtr->tkwin), PanedWindowWidgetObjCmd, pwPtr,
 	    PanedWindowCmdDeletedProc);
     pwPtr->optionTable = pwOpts->pwOptions;
-    pwPtr->slaveOpts = pwOpts->slaveOpts;
+    pwPtr->paneOpts = pwOpts->paneOpts;
     pwPtr->relief = TK_RELIEF_RAISED;
     pwPtr->gc = NULL;
     pwPtr->cursor = NULL;
@@ -471,7 +471,7 @@ Tk_PanedWindowObjCmd(
     /*
      * Find the toplevel ancestor of the panedwindow, and make a proxy win as
      * a child of that window; this way the proxy can always float above
-     * slaves in the panedwindow.
+     * panes in the panedwindow.
      */
 
     parent = Tk_Parent(pwPtr->tkwin);
@@ -548,7 +548,7 @@ PanedWindowWidgetObjCmd(
     Tcl_Obj *resultObj;
     int index, count, i, x, y;
     Tk_Window tkwin;
-    Slave *slavePtr;
+    Pane *panePtr;
 
     if (objc < 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "option ?arg arg...?");
@@ -569,7 +569,7 @@ PanedWindowWidgetObjCmd(
 	    result = TCL_ERROR;
 	    break;
 	}
-	result = ConfigureSlaves(pwPtr, interp, objc, objv);
+	result = ConfigurePanes(pwPtr, interp, objc, objv);
 	break;
 
     case PW_CGET:
@@ -616,21 +616,21 @@ PanedWindowWidgetObjCmd(
 	 * Clean up each window named in the arg list.
 	 */
 	for (count = 0, i = 2; i < objc; i++) {
-	    Tk_Window slave = Tk_NameToWindow(interp, Tcl_GetString(objv[i]),
+	    Tk_Window pane = Tk_NameToWindow(interp, Tcl_GetString(objv[i]),
 		    pwPtr->tkwin);
 
-	    if (slave == NULL) {
+	    if (pane == NULL) {
 		continue;
 	    }
-	    slavePtr = GetPane(pwPtr, slave);
-	    if ((slavePtr != NULL) && (slavePtr->masterPtr != NULL)) {
+	    panePtr = GetPane(pwPtr, pane);
+	    if ((panePtr != NULL) && (panePtr->containerPtr != NULL)) {
 		count++;
-		Tk_ManageGeometry(slave, NULL, NULL);
-		Tk_UnmaintainGeometry(slavePtr->tkwin, pwPtr->tkwin);
-		Tk_DeleteEventHandler(slavePtr->tkwin, StructureNotifyMask,
-			SlaveStructureProc, slavePtr);
-		Tk_UnmapWindow(slavePtr->tkwin);
-		Unlink(slavePtr);
+		Tk_ManageGeometry(pane, NULL, NULL);
+		Tk_UnmaintainGeometry(panePtr->tkwin, pwPtr->tkwin);
+		Tk_DeleteEventHandler(panePtr->tkwin, StructureNotifyMask,
+			PaneStructureProc, panePtr);
+		Tk_UnmapWindow(panePtr->tkwin);
+		Unlink(panePtr);
 	    }
 	    if (count != 0) {
 		ComputeGeometry(pwPtr);
@@ -666,15 +666,15 @@ PanedWindowWidgetObjCmd(
 	    break;
 	}
 	resultObj = NULL;
-	for (i = 0; i < pwPtr->numSlaves; i++) {
-	    if (pwPtr->slaves[i]->tkwin == tkwin) {
+	for (i = 0; i < pwPtr->numPanes; i++) {
+	    if (pwPtr->panes[i]->tkwin == tkwin) {
 		resultObj = Tk_GetOptionValue(interp,
-			(char *) pwPtr->slaves[i], pwPtr->slaveOpts,
+			(char *) pwPtr->panes[i], pwPtr->paneOpts,
 			objv[3], tkwin);
 	    }
 	}
 	if (resultObj == NULL) {
-	    if (i == pwPtr->numSlaves) {
+	    if (i == pwPtr->numPanes) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			"not managed by this window", -1));
 		Tcl_SetErrorCode(interp, "TK", "PANEDWINDOW", "UNMANAGED",
@@ -706,10 +706,10 @@ PanedWindowWidgetObjCmd(
                 result = TCL_ERROR;
                 break;
             }
-	    for (i = 0; i < pwPtr->numSlaves; i++) {
-		if (pwPtr->slaves[i]->tkwin == tkwin) {
+	    for (i = 0; i < pwPtr->numPanes; i++) {
+		if (pwPtr->panes[i]->tkwin == tkwin) {
 		    resultObj = Tk_GetOptionInfo(interp,
-			    (char *) pwPtr->slaves[i], pwPtr->slaveOpts,
+			    (char *) pwPtr->panes[i], pwPtr->paneOpts,
 			    (objc == 4) ? objv[3] : NULL,
 			    pwPtr->tkwin);
 		    if (resultObj == NULL) {
@@ -721,15 +721,15 @@ PanedWindowWidgetObjCmd(
 		}
 	    }
 	} else {
-	    result = ConfigureSlaves(pwPtr, interp, objc, objv);
+	    result = ConfigurePanes(pwPtr, interp, objc, objv);
 	}
 	break;
 
     case PW_PANES:
 	resultObj = Tcl_NewObj();
-	for (i = 0; i < pwPtr->numSlaves; i++) {
+	for (i = 0; i < pwPtr->numPanes; i++) {
 	    Tcl_ListObjAppendElement(NULL, resultObj,
-		    TkNewWindowObj(pwPtr->slaves[i]->tkwin));
+		    TkNewWindowObj(pwPtr->panes[i]->tkwin));
 	}
 	Tcl_SetObjResult(interp, resultObj);
 	break;
@@ -749,37 +749,37 @@ PanedWindowWidgetObjCmd(
 /*
  *----------------------------------------------------------------------
  *
- * ConfigureSlaves --
+ * ConfigurePanes --
  *
- *	Add or alter the configuration options of a slave in a paned window.
+ *	Add or alter the configuration options of a pane in a paned window.
  *
  * Results:
  *	Standard Tcl result.
  *
  * Side effects:
- *	Depends on options; may add a slave to the paned window, may alter the
- *	geometry management options of a slave.
+ *	Depends on options; may add a pane to the paned window, may alter the
+ *	geometry management options of a pane.
  *
  *----------------------------------------------------------------------
  */
 
 static int
-ConfigureSlaves(
+ConfigurePanes(
     PanedWindow *pwPtr,		/* Information about paned window. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    int i, firstOptionArg, j, found, doubleBw, index, numNewSlaves, haveLoc;
+    int i, firstOptionArg, j, found, doubleBw, index, numNewPanes, haveLoc;
     int insertIndex;
     Tk_Window tkwin = NULL, ancestor, parent;
-    Slave *slavePtr, **inserts, **newSlaves;
-    Slave options;
+    Pane *panePtr, **inserts, **newPanes;
+    Pane options;
     const char *arg;
 
     /*
      * Find the non-window name arguments; these are the configure options for
-     * the slaves. Also validate that the window names given are legitimate
+     * the panes. Also validate that the window names given are legitimate
      * (ie, they are real windows, they are not the panedwindow itself, etc.).
      */
 
@@ -817,8 +817,8 @@ ConfigureSlaves(
 		return TCL_ERROR;
 	    } else {
 		/*
-		 * Make sure the panedwindow is the parent of the slave,
-		 * or a descendant of the slave's parent.
+		 * Make sure the panedwindow is the parent of the pane,
+		 * or a descendant of the pane's parent.
 		 */
 
 		parent = Tk_Parent(tkwin);
@@ -847,8 +847,8 @@ ConfigureSlaves(
      * extra testing in the for loop below.
      */
 
-    memset((void *)&options, 0, sizeof(Slave));
-    if (Tk_SetOptions(interp, (char *) &options, pwPtr->slaveOpts,
+    memset((void *)&options, 0, sizeof(Pane));
+    if (Tk_SetOptions(interp, (char *) &options, pwPtr->paneOpts,
 	    objc - firstOptionArg, objv + firstOptionArg,
 	    pwPtr->tkwin, NULL, NULL) != TCL_OK) {
 	return TCL_ERROR;
@@ -865,8 +865,8 @@ ConfigureSlaves(
     if (options.after != NULL) {
 	tkwin = options.after;
 	haveLoc = 1;
-	for (i = 0; i < pwPtr->numSlaves; i++) {
-	    if (options.after == pwPtr->slaves[i]->tkwin) {
+	for (i = 0; i < pwPtr->numPanes; i++) {
+	    if (options.after == pwPtr->panes[i]->tkwin) {
 		index = i + 1;
 		break;
 	    }
@@ -874,8 +874,8 @@ ConfigureSlaves(
     } else if (options.before != NULL) {
 	tkwin = options.before;
 	haveLoc = 1;
-	for (i = 0; i < pwPtr->numSlaves; i++) {
-	    if (options.before == pwPtr->slaves[i]->tkwin) {
+	for (i = 0; i < pwPtr->numPanes; i++) {
+	    if (options.before == pwPtr->panes[i]->tkwin) {
 		index = i;
 		break;
 	    }
@@ -892,28 +892,28 @@ ConfigureSlaves(
 		"window \"%s\" is not managed by %s",
 		Tk_PathName(tkwin), Tk_PathName(pwPtr->tkwin)));
 	Tcl_SetErrorCode(interp, "TK", "PANEDWINDOW", "UNMANAGED", NULL);
-	Tk_FreeConfigOptions((char *) &options, pwPtr->slaveOpts,
+	Tk_FreeConfigOptions((char *) &options, pwPtr->paneOpts,
 		pwPtr->tkwin);
 	return TCL_ERROR;
     }
 
     /*
-     * Allocate an array to hold, in order, the pointers to the slave
+     * Allocate an array to hold, in order, the pointers to the pane
      * structures corresponding to the windows specified. Some of those
      * structures may already have existed, some may be new.
      */
 
-    inserts = ckalloc(sizeof(Slave *) * (firstOptionArg - 2));
+    inserts = ckalloc(sizeof(Pane *) * (firstOptionArg - 2));
     insertIndex = 0;
 
     /*
-     * Populate the inserts array, creating new slave structures as necessary,
+     * Populate the inserts array, creating new pane structures as necessary,
      * applying the options to each structure as we go, and, if necessary,
-     * marking the spot in the original slaves array as empty (for
-     * pre-existing slave structures).
+     * marking the spot in the original panes array as empty (for
+     * pre-existing pane structures).
      */
 
-    for (i = 0, numNewSlaves = 0; i < firstOptionArg - 2; i++) {
+    for (i = 0, numNewPanes = 0; i < firstOptionArg - 2; i++) {
 	/*
 	 * We don't check that tkwin is NULL here, because the pre-pass above
 	 * guarantees that the input at this stage is good.
@@ -923,24 +923,24 @@ ConfigureSlaves(
 		pwPtr->tkwin);
 
 	found = 0;
-	for (j = 0; j < pwPtr->numSlaves; j++) {
-	    if (pwPtr->slaves[j] != NULL && pwPtr->slaves[j]->tkwin == tkwin) {
-		Tk_SetOptions(interp, (char *) pwPtr->slaves[j],
-			pwPtr->slaveOpts, objc - firstOptionArg,
+	for (j = 0; j < pwPtr->numPanes; j++) {
+	    if (pwPtr->panes[j] != NULL && pwPtr->panes[j]->tkwin == tkwin) {
+		Tk_SetOptions(interp, (char *) pwPtr->panes[j],
+			pwPtr->paneOpts, objc - firstOptionArg,
 			objv + firstOptionArg, pwPtr->tkwin, NULL, NULL);
-		if (pwPtr->slaves[j]->minSize < 0) {
-		    pwPtr->slaves[j]->minSize = 0;
+		if (pwPtr->panes[j]->minSize < 0) {
+		    pwPtr->panes[j]->minSize = 0;
 		}
 		found = 1;
 
 		/*
-		 * If the slave is supposed to move, add it to the inserts
+		 * If the pane is supposed to move, add it to the inserts
 		 * array now; otherwise, leave it where it is.
 		 */
 
 		if (index != -1) {
-		    inserts[insertIndex++] = pwPtr->slaves[j];
-		    pwPtr->slaves[j] = NULL;
+		    inserts[insertIndex++] = pwPtr->panes[j];
+		    pwPtr->panes[j] = NULL;
 		}
 		break;
 	    }
@@ -951,7 +951,7 @@ ConfigureSlaves(
 	}
 
 	/*
-	 * Make sure this slave wasn't already put into the inserts array,
+	 * Make sure this pane wasn't already put into the inserts array,
 	 * i.e., when the user specifies the same window multiple times in a
 	 * single add commaned.
 	 */
@@ -966,104 +966,104 @@ ConfigureSlaves(
 	}
 
 	/*
-	 * Create a new slave structure and initialize it. All slaves start
+	 * Create a new pane structure and initialize it. All panes start
 	 * out with their "natural" dimensions.
 	 */
 
-	slavePtr = ckalloc(sizeof(Slave));
-	memset(slavePtr, 0, sizeof(Slave));
-	Tk_InitOptions(interp, (char *)slavePtr, pwPtr->slaveOpts,
+	panePtr = ckalloc(sizeof(Pane));
+	memset(panePtr, 0, sizeof(Pane));
+	Tk_InitOptions(interp, (char *)panePtr, pwPtr->paneOpts,
 		pwPtr->tkwin);
-	Tk_SetOptions(interp, (char *)slavePtr, pwPtr->slaveOpts,
+	Tk_SetOptions(interp, (char *)panePtr, pwPtr->paneOpts,
 		objc - firstOptionArg, objv + firstOptionArg,
 		pwPtr->tkwin, NULL, NULL);
-	slavePtr->tkwin = tkwin;
-	slavePtr->masterPtr = pwPtr;
-	doubleBw = 2 * Tk_Changes(slavePtr->tkwin)->border_width;
-	if (slavePtr->width > 0) {
-	    slavePtr->paneWidth = slavePtr->width;
+	panePtr->tkwin = tkwin;
+	panePtr->containerPtr = pwPtr;
+	doubleBw = 2 * Tk_Changes(panePtr->tkwin)->border_width;
+	if (panePtr->width > 0) {
+	    panePtr->paneWidth = panePtr->width;
 	} else {
-	    slavePtr->paneWidth = Tk_ReqWidth(tkwin) + doubleBw;
+	    panePtr->paneWidth = Tk_ReqWidth(tkwin) + doubleBw;
 	}
-	if (slavePtr->height > 0) {
-	    slavePtr->paneHeight = slavePtr->height;
+	if (panePtr->height > 0) {
+	    panePtr->paneHeight = panePtr->height;
 	} else {
-	    slavePtr->paneHeight = Tk_ReqHeight(tkwin) + doubleBw;
+	    panePtr->paneHeight = Tk_ReqHeight(tkwin) + doubleBw;
 	}
-	if (slavePtr->minSize < 0) {
-	    slavePtr->minSize = 0;
+	if (panePtr->minSize < 0) {
+	    panePtr->minSize = 0;
 	}
 
 	/*
-	 * Set up the geometry management callbacks for this slave.
+	 * Set up the geometry management callbacks for this pane.
 	 */
 
-	Tk_CreateEventHandler(slavePtr->tkwin, StructureNotifyMask,
-		SlaveStructureProc, slavePtr);
-	Tk_ManageGeometry(slavePtr->tkwin, &panedWindowMgrType, slavePtr);
-	inserts[insertIndex++] = slavePtr;
-	numNewSlaves++;
+	Tk_CreateEventHandler(panePtr->tkwin, StructureNotifyMask,
+		PaneStructureProc, panePtr);
+	Tk_ManageGeometry(panePtr->tkwin, &panedWindowMgrType, panePtr);
+	inserts[insertIndex++] = panePtr;
+	numNewPanes++;
     }
 
     /*
-     * Allocate the new slaves array, then copy the slaves into it, in order.
+     * Allocate the new panes array, then copy the panes into it, in order.
      */
 
-    i = sizeof(Slave *) * (pwPtr->numSlaves + numNewSlaves);
-    newSlaves = ckalloc(i);
-    memset(newSlaves, 0, (size_t) i);
+    i = sizeof(Pane *) * (pwPtr->numPanes + numNewPanes);
+    newPanes = ckalloc(i);
+    memset(newPanes, 0, (size_t) i);
     if (index == -1) {
 	/*
-	 * If none of the existing slaves have to be moved, just copy the old
+	 * If none of the existing panes have to be moved, just copy the old
 	 * and append the new.
 	 */
-	memcpy((void *)&(newSlaves[0]), pwPtr->slaves,
-		sizeof(Slave *) * pwPtr->numSlaves);
-	memcpy((void *)&(newSlaves[pwPtr->numSlaves]), inserts,
-		sizeof(Slave *) * numNewSlaves);
+	memcpy((void *)&(newPanes[0]), pwPtr->panes,
+		sizeof(Pane *) * pwPtr->numPanes);
+	memcpy((void *)&(newPanes[pwPtr->numPanes]), inserts,
+		sizeof(Pane *) * numNewPanes);
     } else {
 	/*
-	 * If some of the existing slaves were moved, the old slaves array
+	 * If some of the existing panes were moved, the old panes array
 	 * will be partially populated, with some valid and some invalid
-	 * entries. Walk through it, copying valid entries to the new slaves
+	 * entries. Walk through it, copying valid entries to the new panes
 	 * array as we go; when we get to the insert location for the new
-	 * slaves, copy the inserts array over, then finish off the old slaves
+	 * panes, copy the inserts array over, then finish off the old panes
 	 * array.
 	 */
 
 	for (i = 0, j = 0; i < index; i++) {
-	    if (pwPtr->slaves[i] != NULL) {
-		newSlaves[j] = pwPtr->slaves[i];
+	    if (pwPtr->panes[i] != NULL) {
+		newPanes[j] = pwPtr->panes[i];
 		j++;
 	    }
 	}
 
-	memcpy((void *)&(newSlaves[j]), inserts, sizeof(Slave *)*insertIndex);
+	memcpy((void *)&(newPanes[j]), inserts, sizeof(Pane *)*insertIndex);
 	j += firstOptionArg - 2;
 
-	for (i = index; i < pwPtr->numSlaves; i++) {
-	    if (pwPtr->slaves[i] != NULL) {
-		newSlaves[j] = pwPtr->slaves[i];
+	for (i = index; i < pwPtr->numPanes; i++) {
+	    if (pwPtr->panes[i] != NULL) {
+		newPanes[j] = pwPtr->panes[i];
 		j++;
 	    }
 	}
     }
 
     /*
-     * Make the new slaves array the paned window's slave array, and clean up.
+     * Make the new panes array the paned window's pane array, and clean up.
      */
 
-    ckfree(pwPtr->slaves);
+    ckfree(pwPtr->panes);
     ckfree(inserts);
-    pwPtr->slaves = newSlaves;
+    pwPtr->panes = newPanes;
 
     /*
-     * Set the paned window's slave count to the new value.
+     * Set the paned window's pane count to the new value.
      */
 
-    pwPtr->numSlaves += numNewSlaves;
+    pwPtr->numPanes += numNewPanes;
 
-    Tk_FreeConfigOptions((char *) &options, pwPtr->slaveOpts, pwPtr->tkwin);
+    Tk_FreeConfigOptions((char *) &options, pwPtr->paneOpts, pwPtr->tkwin);
 
     ComputeGeometry(pwPtr);
     return TCL_OK;
@@ -1101,7 +1101,7 @@ PanedWindowSashCommand(
     };
     int index, sash, x, y, diff;
     Tcl_Obj *coords[2];
-    Slave *slavePtr;
+    Pane *panePtr;
 
     if (objc < 3) {
 	Tcl_WrongNumArgs(interp, 2, objv, "option ?arg ...?");
@@ -1130,10 +1130,10 @@ PanedWindowSashCommand(
 	    Tcl_SetErrorCode(interp, "TK", "VALUE", "SASH_INDEX", NULL);
 	    return TCL_ERROR;
 	}
-	slavePtr = pwPtr->slaves[sash];
+	panePtr = pwPtr->panes[sash];
 
-	coords[0] = Tcl_NewIntObj(slavePtr->sashx);
-	coords[1] = Tcl_NewIntObj(slavePtr->sashy);
+	coords[0] = Tcl_NewIntObj(panePtr->sashx);
+	coords[1] = Tcl_NewIntObj(panePtr->sashy);
 	Tcl_SetObjResult(interp, Tcl_NewListObj(2, coords));
 	break;
 
@@ -1163,11 +1163,11 @@ PanedWindowSashCommand(
 		return TCL_ERROR;
 	    }
 
-	    pwPtr->slaves[sash]->markx = x;
-	    pwPtr->slaves[sash]->marky = y;
+	    pwPtr->panes[sash]->markx = x;
+	    pwPtr->panes[sash]->marky = y;
 	} else {
-	    coords[0] = Tcl_NewIntObj(pwPtr->slaves[sash]->markx);
-	    coords[1] = Tcl_NewIntObj(pwPtr->slaves[sash]->marky);
+	    coords[0] = Tcl_NewIntObj(pwPtr->panes[sash]->markx);
+	    coords[1] = Tcl_NewIntObj(pwPtr->panes[sash]->marky);
 	    Tcl_SetObjResult(interp, Tcl_NewListObj(2, coords));
 	}
 	break;
@@ -1198,18 +1198,18 @@ PanedWindowSashCommand(
 	    return TCL_ERROR;
 	}
 
-	slavePtr = pwPtr->slaves[sash];
+	panePtr = pwPtr->panes[sash];
 	if (pwPtr->orient == ORIENT_HORIZONTAL) {
 	    if (index == SASH_PLACE) {
-		diff = x - pwPtr->slaves[sash]->sashx;
+		diff = x - pwPtr->panes[sash]->sashx;
 	    } else {
-		diff = x - pwPtr->slaves[sash]->markx;
+		diff = x - pwPtr->panes[sash]->markx;
 	    }
 	} else {
 	    if (index == SASH_PLACE) {
-		diff = y - pwPtr->slaves[sash]->sashy;
+		diff = y - pwPtr->panes[sash]->sashy;
 	    } else {
-		diff = y - pwPtr->slaves[sash]->marky;
+		diff = y - pwPtr->panes[sash]->marky;
 	    }
 	}
 
@@ -1369,15 +1369,15 @@ PanedWindowEventProc(
     } else if (eventPtr->type == DestroyNotify) {
 	DestroyPanedWindow(pwPtr);
     } else if (eventPtr->type == UnmapNotify) {
-        for (i = 0; i < pwPtr->numSlaves; i++) {
-            if (!pwPtr->slaves[i]->hide) {
-                Tk_UnmapWindow(pwPtr->slaves[i]->tkwin);
+        for (i = 0; i < pwPtr->numPanes; i++) {
+            if (!pwPtr->panes[i]->hide) {
+                Tk_UnmapWindow(pwPtr->panes[i]->tkwin);
             }
         }
     } else if (eventPtr->type == MapNotify) {
-        for (i = 0; i < pwPtr->numSlaves; i++) {
-            if (!pwPtr->slaves[i]->hide) {
-                Tk_MapWindow(pwPtr->slaves[i]->tkwin);
+        for (i = 0; i < pwPtr->numPanes; i++) {
+            if (!pwPtr->panes[i]->hide) {
+                Tk_MapWindow(pwPtr->panes[i]->tkwin);
             }
         }
     }
@@ -1443,7 +1443,7 @@ DisplayPanedWindow(
     ClientData clientData)	/* Information about window. */
 {
     PanedWindow *pwPtr = clientData;
-    Slave *slavePtr;
+    Pane *panePtr;
     Pixmap pixmap;
     Tk_Window tkwin = pwPtr->tkwin;
     int i, sashWidth, sashHeight;
@@ -1496,19 +1496,19 @@ DisplayPanedWindow(
      */
 
     GetFirstLastVisiblePane(pwPtr, &first, &last);
-    for (i = 0; i < pwPtr->numSlaves - 1; i++) {
-	slavePtr = pwPtr->slaves[i];
-	if (slavePtr->hide || i == last) {
+    for (i = 0; i < pwPtr->numPanes - 1; i++) {
+	panePtr = pwPtr->panes[i];
+	if (panePtr->hide || i == last) {
 	    continue;
 	}
 	if (sashWidth > 0 && sashHeight > 0) {
 	    Tk_Fill3DRectangle(tkwin, pixmap, pwPtr->background,
-		    slavePtr->sashx, slavePtr->sashy, sashWidth, sashHeight,
+		    panePtr->sashx, panePtr->sashy, sashWidth, sashHeight,
 		    1, pwPtr->sashRelief);
 	}
 	if (pwPtr->showHandle) {
 	    Tk_Fill3DRectangle(tkwin, pixmap, pwPtr->background,
-		    slavePtr->handlex, slavePtr->handley,
+		    panePtr->handlex, panePtr->handley,
 		    pwPtr->handleSize, pwPtr->handleSize, 1,
 		    TK_RELIEF_RAISED);
 	}
@@ -1569,23 +1569,23 @@ DestroyPanedWindow(
     }
 
     /*
-     * Clean up the slave list; foreach slave:
-     *  o  Cancel the slave's structure notification callback
-     *  o  Cancel geometry management for the slave.
-     *  o  Free memory for the slave
+     * Clean up the pane list; foreach pane:
+     *  o  Cancel the pane's structure notification callback
+     *  o  Cancel geometry management for the pane.
+     *  o  Free memory for the pane
      */
 
-    for (i = 0; i < pwPtr->numSlaves; i++) {
-	Tk_DeleteEventHandler(pwPtr->slaves[i]->tkwin, StructureNotifyMask,
-		SlaveStructureProc, pwPtr->slaves[i]);
-	Tk_ManageGeometry(pwPtr->slaves[i]->tkwin, NULL, NULL);
-	Tk_FreeConfigOptions((char *) pwPtr->slaves[i], pwPtr->slaveOpts,
+    for (i = 0; i < pwPtr->numPanes; i++) {
+	Tk_DeleteEventHandler(pwPtr->panes[i]->tkwin, StructureNotifyMask,
+		PaneStructureProc, pwPtr->panes[i]);
+	Tk_ManageGeometry(pwPtr->panes[i]->tkwin, NULL, NULL);
+	Tk_FreeConfigOptions((char *) pwPtr->panes[i], pwPtr->paneOpts,
 		pwPtr->tkwin);
-	ckfree(pwPtr->slaves[i]);
-	pwPtr->slaves[i] = NULL;
+	ckfree(pwPtr->panes[i]);
+	pwPtr->panes[i] = NULL;
     }
-    if (pwPtr->slaves) {
-	ckfree(pwPtr->slaves);
+    if (pwPtr->panes) {
+	ckfree(pwPtr->panes);
     }
 
     /*
@@ -1630,8 +1630,8 @@ PanedWindowReqProc(
     Tk_Window tkwin)		/* Other Tk-related information about the
 				 * window. */
 {
-    Slave *slavePtr = clientData;
-    PanedWindow *pwPtr = (PanedWindow *) slavePtr->masterPtr;
+    Pane *panePtr = clientData;
+    PanedWindow *pwPtr = (PanedWindow *) panePtr->containerPtr;
 
     if (Tk_IsMapped(pwPtr->tkwin)) {
 	if (!(pwPtr->flags & RESIZE_PENDING)) {
@@ -1639,13 +1639,13 @@ PanedWindowReqProc(
 	    Tcl_DoWhenIdle(ArrangePanes, pwPtr);
 	}
     } else {
-	int doubleBw = 2 * Tk_Changes(slavePtr->tkwin)->border_width;
+	int doubleBw = 2 * Tk_Changes(panePtr->tkwin)->border_width;
 
-	if (slavePtr->width <= 0) {
-	    slavePtr->paneWidth = Tk_ReqWidth(slavePtr->tkwin) + doubleBw;
+	if (panePtr->width <= 0) {
+	    panePtr->paneWidth = Tk_ReqWidth(panePtr->tkwin) + doubleBw;
 	}
-	if (slavePtr->height <= 0) {
-	    slavePtr->paneHeight = Tk_ReqHeight(slavePtr->tkwin) + doubleBw;
+	if (panePtr->height <= 0) {
+	    panePtr->paneHeight = Tk_ReqHeight(panePtr->tkwin) + doubleBw;
 	}
 	ComputeGeometry(pwPtr);
     }
@@ -1654,39 +1654,39 @@ PanedWindowReqProc(
 /*
  *--------------------------------------------------------------
  *
- * PanedWindowLostSlaveProc --
+ * PanedWindowLostPaneProc --
  *
  *	This function is invoked by Tk whenever some other geometry claims
- *	control over a slave that used to be managed by us.
+ *	control over a pane that used to be managed by us.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	Forgets all information about the slave. Causes geometry to be
+ *	Forgets all information about the pane. Causes geometry to be
  *	recomputed for the panedwindow.
  *
  *--------------------------------------------------------------
  */
 
 static void
-PanedWindowLostSlaveProc(
-    ClientData clientData,	/* Grid structure for slave window that was
+PanedWindowLostPaneProc(
+    ClientData clientData,	/* Grid structure for the pane that was
 				 * stolen away. */
-    Tk_Window tkwin)		/* Tk's handle for the slave window. */
+    Tk_Window tkwin)		/* Tk's handle for the pane. */
 {
-    register Slave *slavePtr = clientData;
-    PanedWindow *pwPtr = (PanedWindow *) slavePtr->masterPtr;
-
-    if (pwPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
-	Tk_UnmaintainGeometry(slavePtr->tkwin, pwPtr->tkwin);
-    }
-    Unlink(slavePtr);
-    Tk_DeleteEventHandler(slavePtr->tkwin, StructureNotifyMask,
-	    SlaveStructureProc, slavePtr);
-    Tk_UnmapWindow(slavePtr->tkwin);
-    slavePtr->tkwin = NULL;
-    ckfree(slavePtr);
+    register Pane *panePtr = clientData;
+    PanedWindow *pwPtr = (PanedWindow *) panePtr->containerPtr;
+
+    if (pwPtr->tkwin != Tk_Parent(panePtr->tkwin)) {
+	Tk_UnmaintainGeometry(panePtr->tkwin, pwPtr->tkwin);
+    }
+    Unlink(panePtr);
+    Tk_DeleteEventHandler(panePtr->tkwin, StructureNotifyMask,
+	    PaneStructureProc, panePtr);
+    Tk_UnmapWindow(panePtr->tkwin);
+    panePtr->tkwin = NULL;
+    ckfree(panePtr);
     ComputeGeometry(pwPtr);
 }
 
@@ -1704,19 +1704,19 @@ PanedWindowLostSlaveProc(
  *	None.
  *
  * Side effects:
- *	The slaves of masterPtr may get resized or moved.
+ *	The panes of containerPtr may get resized or moved.
  *
  *--------------------------------------------------------------
  */
 
 static void
 ArrangePanes(
-    ClientData clientData)	/* Structure describing parent whose slaves
+    ClientData clientData)	/* Structure describing parent whose panes
 				 * are to be re-layed out. */
 {
     register PanedWindow *pwPtr = clientData;
-    register Slave *slavePtr;
-    int i, slaveWidth, slaveHeight, slaveX, slaveY;
+    register Pane *panePtr;
+    int i, newPaneWidth, newPaneHeight, paneX, paneY;
     int paneWidth, paneHeight, paneSize, paneMinSize;
     int doubleBw;
     int x, y;
@@ -1731,13 +1731,13 @@ ArrangePanes(
     pwPtr->flags &= ~(REQUESTED_RELAYOUT|RESIZE_PENDING);
 
     /*
-     * If the parent has no slaves anymore, then don't do anything at all:
+     * If the parent has no panes anymore, then don't do anything at all:
      * just leave the parent's size as-is. Otherwise there is no way to
      * "relinquish" control over the parent so another geometry manager can
      * take over.
      */
 
-    if (pwPtr->numSlaves == 0) {
+    if (pwPtr->numPanes == 0) {
 	return;
     }
 
@@ -1776,37 +1776,37 @@ ArrangePanes(
 		+ pwPtr->sashPad;
     }
 
-    for (i = sashCount = 0; i < pwPtr->numSlaves; i++) {
-	slavePtr = pwPtr->slaves[i];
+    for (i = sashCount = 0; i < pwPtr->numPanes; i++) {
+	panePtr = pwPtr->panes[i];
 
-	if (slavePtr->hide) {
+	if (panePtr->hide) {
 	    continue;
 	}
 
 	/*
-	 * Compute the total size needed by all the slaves and the left-over,
+	 * Compute the total size needed by all the panes and the left-over,
 	 * or shortage of space available.
 	 */
 
 	if (horizontal) {
-            if (slavePtr->width > 0) {
-                paneSize = slavePtr->width;
+            if (panePtr->width > 0) {
+                paneSize = panePtr->width;
             } else {
-                paneSize = slavePtr->paneWidth;
+                paneSize = panePtr->paneWidth;
             }
-	    stretchReserve -= paneSize + (2 * slavePtr->padx);
+	    stretchReserve -= paneSize + (2 * panePtr->padx);
 	} else {
-            if (slavePtr->height > 0) {
-                paneSize = slavePtr->height;
+            if (panePtr->height > 0) {
+                paneSize = panePtr->height;
             } else {
-                paneSize = slavePtr->paneHeight;
+                paneSize = panePtr->paneHeight;
             }
-	    stretchReserve -= paneSize + (2 * slavePtr->pady);
+	    stretchReserve -= paneSize + (2 * panePtr->pady);
 	}
-	if (IsStretchable(slavePtr->stretch,i,first,last)
+	if (IsStretchable(panePtr->stretch,i,first,last)
 		&& Tk_IsMapped(pwPtr->tkwin)) {
 	    paneDynSize += paneSize;
-	    paneDynMinSize += slavePtr->minSize;
+	    paneDynMinSize += panePtr->minSize;
 	}
 	if (i != last) {
 	    stretchReserve -= sashWidth;
@@ -1818,53 +1818,53 @@ ArrangePanes(
      * Second pass; adjust/arrange panes.
      */
 
-    for (i = 0; i < pwPtr->numSlaves; i++) {
-	slavePtr = pwPtr->slaves[i];
+    for (i = 0; i < pwPtr->numPanes; i++) {
+	panePtr = pwPtr->panes[i];
 
-	if (slavePtr->hide) {
-	    Tk_UnmaintainGeometry(slavePtr->tkwin, pwPtr->tkwin);
-	    Tk_UnmapWindow(slavePtr->tkwin);
+	if (panePtr->hide) {
+	    Tk_UnmaintainGeometry(panePtr->tkwin, pwPtr->tkwin);
+	    Tk_UnmapWindow(panePtr->tkwin);
 	    continue;
 	}
 
 	/*
-	 * Compute the size of this slave. The algorithm (assuming a
+	 * Compute the size of this pane. The algorithm (assuming a
 	 * horizontal paned window) is:
 	 *
 	 * 1.  Get "base" dimensions. If a width or height is specified for
-	 *     this slave, use those values; else use the ReqWidth/ReqHeight.
+	 *     this pane, use those values; else use the ReqWidth/ReqHeight.
 	 * 2.  Using base dimensions, pane dimensions, and sticky values,
 	 *     determine the x and y, and actual width and height of the
 	 *     widget.
 	 */
 
-	doubleBw = 2 * Tk_Changes(slavePtr->tkwin)->border_width;
-	slaveWidth = (slavePtr->width > 0 ? slavePtr->width :
-		Tk_ReqWidth(slavePtr->tkwin) + doubleBw);
-	slaveHeight = (slavePtr->height > 0 ? slavePtr->height :
-		Tk_ReqHeight(slavePtr->tkwin) + doubleBw);
-	paneMinSize = slavePtr->minSize;
+	doubleBw = 2 * Tk_Changes(panePtr->tkwin)->border_width;
+	newPaneWidth = (panePtr->width > 0 ? panePtr->width :
+		Tk_ReqWidth(panePtr->tkwin) + doubleBw);
+	newPaneHeight = (panePtr->height > 0 ? panePtr->height :
+		Tk_ReqHeight(panePtr->tkwin) + doubleBw);
+	paneMinSize = panePtr->minSize;
 
 	/*
 	 * Calculate pane width and height.
 	 */
 
 	if (horizontal) {
-            if (slavePtr->width > 0) {
-                paneSize = slavePtr->width;
+            if (panePtr->width > 0) {
+                paneSize = panePtr->width;
             } else {
-                paneSize = slavePtr->paneWidth;
+                paneSize = panePtr->paneWidth;
             }
 	    pwSize = pwWidth;
 	} else {
-            if (slavePtr->height > 0) {
-                paneSize = slavePtr->height;
+            if (panePtr->height > 0) {
+                paneSize = panePtr->height;
             } else {
-                paneSize = slavePtr->paneHeight;
+                paneSize = panePtr->paneHeight;
             }
 	    pwSize = pwHeight;
 	}
-	if (IsStretchable(slavePtr->stretch, i, first, last)) {
+	if (IsStretchable(panePtr->stretch, i, first, last)) {
 	    double frac;
 
 	    if (paneDynSize > 0) {
@@ -1874,7 +1874,7 @@ ArrangePanes(
 	    }
 
 	    paneDynSize -= paneSize;
-	    paneDynMinSize -= slavePtr->minSize;
+	    paneDynMinSize -= panePtr->minSize;
 	    stretchAmount = (int) (frac * stretchReserve);
 	    if (paneSize + stretchAmount >= paneMinSize) {
 		stretchReserve -= stretchAmount;
@@ -1899,9 +1899,9 @@ ArrangePanes(
 	}
 	if (horizontal) {
 	    paneWidth = paneSize;
-	    paneHeight = pwHeight - (2 * slavePtr->pady);
+	    paneHeight = pwHeight - (2 * panePtr->pady);
 	} else {
-	    paneWidth = pwWidth - (2 * slavePtr->padx);
+	    paneWidth = pwWidth - (2 * panePtr->padx);
 	    paneHeight = paneSize;
 	}
 
@@ -1929,15 +1929,15 @@ ArrangePanes(
 	    paneHeight = pwHeight - syReserve - y + internalBW;
 	}
 
-	if (slaveWidth > paneWidth) {
-	    slaveWidth = paneWidth;
+	if (newPaneWidth > paneWidth) {
+	    newPaneWidth = paneWidth;
 	}
-	if (slaveHeight > paneHeight) {
-	    slaveHeight = paneHeight;
+	if (newPaneHeight > paneHeight) {
+	    newPaneHeight = paneHeight;
 	}
 
-	slavePtr->x = x;
-	slavePtr->y = y;
+	panePtr->x = x;
+	panePtr->y = y;
 
 	/*
 	 * Compute the location of the sash at the right or bottom of the
@@ -1945,51 +1945,51 @@ ArrangePanes(
 	 */
 
 	if (horizontal) {
-	    x += paneWidth + (2 * slavePtr->padx);
+	    x += paneWidth + (2 * panePtr->padx);
 	    if (x < internalBW) {
 		x = internalBW;
 	    }
-	    slavePtr->sashx = x + sashOffset;
-	    slavePtr->sashy = y;
-	    slavePtr->handlex = x + handleOffset;
-	    slavePtr->handley = y + pwPtr->handlePad;
+	    panePtr->sashx = x + sashOffset;
+	    panePtr->sashy = y;
+	    panePtr->handlex = x + handleOffset;
+	    panePtr->handley = y + pwPtr->handlePad;
 	    x += sashWidth;
 	} else {
-	    y += paneHeight + (2 * slavePtr->pady);
+	    y += paneHeight + (2 * panePtr->pady);
 	    if (y < internalBW) {
 		y = internalBW;
 	    }
-	    slavePtr->sashx = x;
-	    slavePtr->sashy = y + sashOffset;
-	    slavePtr->handlex = x + pwPtr->handlePad;
-	    slavePtr->handley = y + handleOffset;
+	    panePtr->sashx = x;
+	    panePtr->sashy = y + sashOffset;
+	    panePtr->handlex = x + pwPtr->handlePad;
+	    panePtr->handley = y + handleOffset;
 	    y += sashWidth;
 	}
 
 	/*
-	 * Compute the actual dimensions of the slave in the pane.
+	 * Compute the actual dimensions of the pane in the pane.
 	 */
 
-	slaveX = slavePtr->x;
-	slaveY = slavePtr->y;
-	AdjustForSticky(slavePtr->sticky, paneWidth, paneHeight,
-		&slaveX, &slaveY, &slaveWidth, &slaveHeight);
+	paneX = panePtr->x;
+	paneY = panePtr->y;
+	AdjustForSticky(panePtr->sticky, paneWidth, paneHeight,
+		&paneX, &paneY, &newPaneWidth, &newPaneHeight);
 
-	slaveX += slavePtr->padx;
-	slaveY += slavePtr->pady;
+	paneX += panePtr->padx;
+	paneY += panePtr->pady;
 
 	/*
 	 * Now put the window in the proper spot.
 	 */
 
-	if (slaveWidth <= 0 || slaveHeight <= 0 ||
-		(horizontal ? slaveX - internalBW > pwWidth :
-		slaveY - internalBW > pwHeight)) {
-	    Tk_UnmaintainGeometry(slavePtr->tkwin, pwPtr->tkwin);
-	    Tk_UnmapWindow(slavePtr->tkwin);
+	if (newPaneWidth <= 0 || newPaneHeight <= 0 ||
+		(horizontal ? paneX - internalBW > pwWidth :
+		paneY - internalBW > pwHeight)) {
+	    Tk_UnmaintainGeometry(panePtr->tkwin, pwPtr->tkwin);
+	    Tk_UnmapWindow(panePtr->tkwin);
 	} else {
-	    Tk_MaintainGeometry(slavePtr->tkwin, pwPtr->tkwin,
-		    slaveX, slaveY, slaveWidth, slaveHeight);
+	    Tk_MaintainGeometry(panePtr->tkwin, pwPtr->tkwin,
+		    paneX, paneY, newPaneWidth, newPaneHeight);
 	}
 	sashCount--;
     }
@@ -2001,7 +2001,7 @@ ArrangePanes(
  *
  * Unlink --
  *
- *	Remove a slave from a paned window.
+ *	Remove a pane from a paned window.
  *
  * Results:
  *	None.
@@ -2014,57 +2014,57 @@ ArrangePanes(
 
 static void
 Unlink(
-    register Slave *slavePtr)		/* Window to unlink. */
+    register Pane *panePtr)		/* Window to unlink. */
 {
-    register PanedWindow *masterPtr;
+    register PanedWindow *containerPtr;
     int i, j;
 
-    masterPtr = slavePtr->masterPtr;
-    if (masterPtr == NULL) {
+    containerPtr = panePtr->containerPtr;
+    if (containerPtr == NULL) {
 	return;
     }
 
     /*
-     * Find the specified slave in the panedwindow's list of slaves, then
+     * Find the specified pane in the panedwindow's list of panes, then
      * remove it from that list.
      */
 
-    for (i = 0; i < masterPtr->numSlaves; i++) {
-	if (masterPtr->slaves[i] == slavePtr) {
-	    for (j = i; j < masterPtr->numSlaves - 1; j++) {
-		masterPtr->slaves[j] = masterPtr->slaves[j + 1];
+    for (i = 0; i < containerPtr->numPanes; i++) {
+	if (containerPtr->panes[i] == panePtr) {
+	    for (j = i; j < containerPtr->numPanes - 1; j++) {
+		containerPtr->panes[j] = containerPtr->panes[j + 1];
 	    }
 	    break;
 	}
     }
 
     /*
-     * Clean out any -after or -before references to this slave
+     * Clean out any -after or -before references to this pane
      */
 
-    for (i = 0; i < masterPtr->numSlaves; i++) {
-	if (masterPtr->slaves[i]->before == slavePtr->tkwin) {
-	    masterPtr->slaves[i]->before = NULL;
+    for (i = 0; i < containerPtr->numPanes; i++) {
+	if (containerPtr->panes[i]->before == panePtr->tkwin) {
+	    containerPtr->panes[i]->before = NULL;
 	}
-	if (masterPtr->slaves[i]->after == slavePtr->tkwin) {
-	    masterPtr->slaves[i]->after = NULL;
+	if (containerPtr->panes[i]->after == panePtr->tkwin) {
+	    containerPtr->panes[i]->after = NULL;
 	}
     }
 
-    masterPtr->flags |= REQUESTED_RELAYOUT;
-    if (!(masterPtr->flags & REDRAW_PENDING)) {
-	masterPtr->flags |= REDRAW_PENDING;
-	Tcl_DoWhenIdle(DisplayPanedWindow, masterPtr);
+    containerPtr->flags |= REQUESTED_RELAYOUT;
+    if (!(containerPtr->flags & REDRAW_PENDING)) {
+	containerPtr->flags |= REDRAW_PENDING;
+	Tcl_DoWhenIdle(DisplayPanedWindow, containerPtr);
     }
 
     /*
-     * Set the slave's masterPtr to NULL, so that we can tell that the slave
+     * Set the pane's containerPtr to NULL, so that we can tell that the pane
      * is no longer attached to any panedwindow.
      */
 
-    slavePtr->masterPtr = NULL;
+    panePtr->containerPtr = NULL;
 
-    masterPtr->numSlaves--;
+    containerPtr->numPanes--;
 }
 
 /*
@@ -2076,7 +2076,7 @@ Unlink(
  *	token in a given paned window.
  *
  * Results:
- *	Pointer to the slave structure, or NULL if the window is not managed
+ *	Pointer to the pane structure, or NULL if the window is not managed
  *	by this paned window.
  *
  * Side effects:
@@ -2085,16 +2085,16 @@ Unlink(
  *----------------------------------------------------------------------
  */
 
-static Slave *
+static Pane *
 GetPane(
     PanedWindow *pwPtr,		/* Pointer to the paned window info. */
     Tk_Window tkwin)		/* Window to search for. */
 {
     int i;
 
-    for (i = 0; i < pwPtr->numSlaves; i++) {
-	if (pwPtr->slaves[i]->tkwin == tkwin) {
-	    return pwPtr->slaves[i];
+    for (i = 0; i < pwPtr->numPanes; i++) {
+	if (pwPtr->panes[i]->tkwin == tkwin) {
+	    return pwPtr->panes[i];
 	}
     }
     return NULL;
@@ -2125,8 +2125,8 @@ GetFirstLastVisiblePane(
 {
     int i;
 
-    for (i = 0, *lastPtr = 0, *firstPtr = -1; i < pwPtr->numSlaves; i++) {
-	if (pwPtr->slaves[i]->hide == 0) {
+    for (i = 0, *lastPtr = 0, *firstPtr = -1; i < pwPtr->numPanes; i++) {
+	if (pwPtr->panes[i]->hide == 0) {
 	    if (*firstPtr < 0) {
 		*firstPtr = i;
 	    }
@@ -2138,7 +2138,7 @@ GetFirstLastVisiblePane(
 /*
  *--------------------------------------------------------------
  *
- * SlaveStructureProc --
+ * PaneStructureProc --
  *
  *	This function is invoked whenever StructureNotify events occur for a
  *	window that's managed by a paned window. This function's only purpose
@@ -2148,25 +2148,25 @@ GetFirstLastVisiblePane(
  *	None.
  *
  * Side effects:
- *	The paned window slave structure associated with the window
- *	is freed, and the slave is disassociated from the paned
+ *	The paned window pane structure associated with the window
+ *	is freed, and the pane is disassociated from the paned
  *	window which managed it.
  *
  *--------------------------------------------------------------
  */
 
 static void
-SlaveStructureProc(
+PaneStructureProc(
     ClientData clientData,	/* Pointer to record describing window item. */
     XEvent *eventPtr)		/* Describes what just happened. */
 {
-    Slave *slavePtr = clientData;
-    PanedWindow *pwPtr = slavePtr->masterPtr;
+    Pane *panePtr = clientData;
+    PanedWindow *pwPtr = panePtr->containerPtr;
 
     if (eventPtr->type == DestroyNotify) {
-	Unlink(slavePtr);
-	slavePtr->tkwin = NULL;
-	ckfree(slavePtr);
+	Unlink(panePtr);
+	panePtr->tkwin = NULL;
+	ckfree(panePtr);
 	ComputeGeometry(pwPtr);
     }
 }
@@ -2177,7 +2177,7 @@ SlaveStructureProc(
  * ComputeGeometry --
  *
  *	Compute geometry for the paned window, including coordinates of all
- *	slave windows and each sash.
+ *	panes and each sash.
  *
  * Results:
  *	None.
@@ -2195,7 +2195,7 @@ ComputeGeometry(
     int i, x, y, doubleBw, internalBw;
     int sashWidth, sashOffset, handleOffset;
     int reqWidth, reqHeight, dim;
-    Slave *slavePtr;
+    Pane *panePtr;
     const int horizontal = (pwPtr->orient == ORIENT_HORIZONTAL);
 
     pwPtr->flags |= REQUESTED_RELAYOUT;
@@ -2221,20 +2221,20 @@ ComputeGeometry(
 		+ pwPtr->sashPad;
     }
 
-    for (i = 0; i < pwPtr->numSlaves; i++) {
-	slavePtr = pwPtr->slaves[i];
+    for (i = 0; i < pwPtr->numPanes; i++) {
+	panePtr = pwPtr->panes[i];
 
-	if (slavePtr->hide) {
+	if (panePtr->hide) {
 	    continue;
 	}
 
 	/*
-	 * First set the coordinates for the top left corner of the slave's
+	 * First set the coordinates for the top left corner of the pane's
 	 * parcel.
 	 */
 
-	slavePtr->x = x;
-	slavePtr->y = y;
+	panePtr->x = x;
+	panePtr->y = y;
 
 	/*
 	 * Make sure the pane's paned dimension is at least minsize. This
@@ -2243,12 +2243,12 @@ ComputeGeometry(
 	 */
 
 	if (horizontal) {
-	    if (slavePtr->paneWidth < slavePtr->minSize) {
-		slavePtr->paneWidth = slavePtr->minSize;
+	    if (panePtr->paneWidth < panePtr->minSize) {
+		panePtr->paneWidth = panePtr->minSize;
 	    }
 	} else {
-	    if (slavePtr->paneHeight < slavePtr->minSize) {
-		slavePtr->paneHeight = slavePtr->minSize;
+	    if (panePtr->paneHeight < panePtr->minSize) {
+		panePtr->paneHeight = panePtr->minSize;
 	    }
 	}
 
@@ -2258,55 +2258,55 @@ ComputeGeometry(
 	 */
 
 	if (horizontal) {
-	    x += slavePtr->paneWidth + (2 * slavePtr->padx);
-	    slavePtr->sashx = x + sashOffset;
-	    slavePtr->sashy = y;
-	    slavePtr->handlex = x + handleOffset;
-	    slavePtr->handley = y + pwPtr->handlePad;
+	    x += panePtr->paneWidth + (2 * panePtr->padx);
+	    panePtr->sashx = x + sashOffset;
+	    panePtr->sashy = y;
+	    panePtr->handlex = x + handleOffset;
+	    panePtr->handley = y + pwPtr->handlePad;
 	    x += sashWidth;
 	} else {
-	    y += slavePtr->paneHeight + (2 * slavePtr->pady);
-	    slavePtr->sashx = x;
-	    slavePtr->sashy = y + sashOffset;
-	    slavePtr->handlex = x + pwPtr->handlePad;
-	    slavePtr->handley = y + handleOffset;
+	    y += panePtr->paneHeight + (2 * panePtr->pady);
+	    panePtr->sashx = x;
+	    panePtr->sashy = y + sashOffset;
+	    panePtr->handlex = x + pwPtr->handlePad;
+	    panePtr->handley = y + handleOffset;
 	    y += sashWidth;
 	}
 
 	/*
-	 * Find the maximum height/width of the slaves, for computing the
+	 * Find the maximum height/width of the panes, for computing the
 	 * requested height/width of the paned window.
 	 */
 
 	if (horizontal) {
 	    /*
-	     * If the slave has an explicit height set, use that; otherwise,
-	     * use the slave's requested height.
+	     * If the pane has an explicit height set, use that; otherwise,
+	     * use the pane's requested height.
 	     */
 
-	    if (slavePtr->height > 0) {
-		dim = slavePtr->height;
+	    if (panePtr->height > 0) {
+		dim = panePtr->height;
 	    } else {
-		doubleBw = 2 * Tk_Changes(slavePtr->tkwin)->border_width;
-		dim = Tk_ReqHeight(slavePtr->tkwin) + doubleBw;
+		doubleBw = 2 * Tk_Changes(panePtr->tkwin)->border_width;
+		dim = Tk_ReqHeight(panePtr->tkwin) + doubleBw;
 	    }
-	    dim += 2 * slavePtr->pady;
+	    dim += 2 * panePtr->pady;
 	    if (dim > reqHeight) {
 		reqHeight = dim;
 	    }
 	} else {
 	    /*
-	     * If the slave has an explicit width set use that; otherwise, use
-	     * the slave's requested width.
+	     * If the pane has an explicit width set use that; otherwise, use
+	     * the pane's requested width.
 	     */
 
-	    if (slavePtr->width > 0) {
-		dim = slavePtr->width;
+	    if (panePtr->width > 0) {
+		dim = panePtr->width;
 	    } else {
-		doubleBw = 2 * Tk_Changes(slavePtr->tkwin)->border_width;
-		dim = Tk_ReqWidth(slavePtr->tkwin) + doubleBw;
+		doubleBw = 2 * Tk_Changes(panePtr->tkwin)->border_width;
+		dim = Tk_ReqWidth(panePtr->tkwin) + doubleBw;
 	    }
-	    dim += 2 * slavePtr->padx;
+	    dim += 2 * panePtr->padx;
 	    if (dim > reqWidth) {
 		reqWidth = dim;
 	    }
@@ -2324,7 +2324,7 @@ ComputeGeometry(
      * the paned window.
      *
      * The height (or width) is equal to the maximum height (or width) of the
-     * slaves, plus the width of the border of the top and bottom (or left and
+     * panes, plus the width of the border of the top and bottom (or left and
      * right) of the paned window.
      *
      * If the panedwindow has an explicit width/height set use that;
@@ -2535,11 +2535,11 @@ RestoreSticky(
  * AdjustForSticky --
  *
  *	Given the x,y coords of the top-left corner of a pane, the dimensions
- *	of that pane, and the dimensions of a slave, compute the x,y coords
- *	and actual dimensions of the slave based on the slave's sticky value.
+ *	of that pane, and the dimensions of a pane, compute the x,y coords
+ *	and actual dimensions of the pane based on the pane's sticky value.
  *
  * Results:
- *	No direct return; sets the x, y, slaveWidth and slaveHeight to correct
+ *	No direct return; sets the x, y, paneWidth and paneHeight to correct
  *	values.
  *
  * Side effects:
@@ -2556,26 +2556,26 @@ AdjustForSticky(
     int cavityHeight,		/* Height of the cavity. */
     int *xPtr, int *yPtr,	/* Initially, coordinates of the top-left
 				 * corner of cavity; also return values for
-				 * actual x, y coords of slave. */
-    int *slaveWidthPtr,		/* Slave width. */
-    int *slaveHeightPtr)	/* Slave height. */
+				 * actual x, y coords of pane. */
+    int *paneWidthPtr,		/* Pane width. */
+    int *paneHeightPtr)	/* Pane height. */
 {
-    int diffx = 0;		/* Cavity width - slave width. */
-    int diffy = 0;		/* Cavity hight - slave height. */
+    int diffx = 0;		/* Cavity width - pane width. */
+    int diffy = 0;		/* Cavity hight - pane height. */
 
-    if (cavityWidth > *slaveWidthPtr) {
-	diffx = cavityWidth - *slaveWidthPtr;
+    if (cavityWidth > *paneWidthPtr) {
+	diffx = cavityWidth - *paneWidthPtr;
     }
 
-    if (cavityHeight > *slaveHeightPtr) {
-	diffy = cavityHeight - *slaveHeightPtr;
+    if (cavityHeight > *paneHeightPtr) {
+	diffy = cavityHeight - *paneHeightPtr;
     }
 
     if ((sticky & STICK_EAST) && (sticky & STICK_WEST)) {
-	*slaveWidthPtr += diffx;
+	*paneWidthPtr += diffx;
     }
     if ((sticky & STICK_NORTH) && (sticky & STICK_SOUTH)) {
-	*slaveHeightPtr += diffy;
+	*paneHeightPtr += diffy;
     }
     if (!(sticky & STICK_WEST)) {
 	*xPtr += (sticky & STICK_EAST) ? diffx : diffx/2;
@@ -2608,8 +2608,8 @@ MoveSash(
     int diff)
 {
     int i;
-    int expandPane, reduceFirst, reduceLast, reduceIncr, slaveSize, sashOffset;
-    Slave *slavePtr;
+    int expandPane, reduceFirst, reduceLast, reduceIncr, paneSize, sashOffset;
+    Pane *panePtr;
     int stretchReserve = 0;
     int nextSash = sash + 1;
     const int horizontal = (pwPtr->orient == ORIENT_HORIZONTAL);
@@ -2618,7 +2618,7 @@ MoveSash(
 	return;
 
     /*
-     * Update the slave sizes with their real sizes.
+     * Update the pane sizes with their real sizes.
      */
 
     if (pwPtr->showHandle && pwPtr->handleSize > pwPtr->sashWidth) {
@@ -2627,17 +2627,17 @@ MoveSash(
     } else {
 	sashOffset = pwPtr->sashPad;
     }
-    for (i = 0; i < pwPtr->numSlaves; i++) {
-	slavePtr = pwPtr->slaves[i];
-	if (slavePtr->hide) {
+    for (i = 0; i < pwPtr->numPanes; i++) {
+	panePtr = pwPtr->panes[i];
+	if (panePtr->hide) {
 	    continue;
 	}
 	if (horizontal) {
-	    slavePtr->paneWidth = slavePtr->width = slavePtr->sashx
-		    - sashOffset - slavePtr->x - (2 * slavePtr->padx);
+	    panePtr->paneWidth = panePtr->width = panePtr->sashx
+		    - sashOffset - panePtr->x - (2 * panePtr->padx);
 	} else {
-	    slavePtr->paneHeight = slavePtr->height = slavePtr->sashy
-		    - sashOffset - slavePtr->y - (2 * slavePtr->pady);
+	    panePtr->paneHeight = panePtr->height = panePtr->sashy
+		    - sashOffset - panePtr->y - (2 * panePtr->pady);
 	}
     }
 
@@ -2647,7 +2647,7 @@ MoveSash(
      * pane to either side of the sash.
      */
 
-    while (nextSash < pwPtr->numSlaves-1 && pwPtr->slaves[nextSash]->hide) {
+    while (nextSash < pwPtr->numPanes-1 && pwPtr->panes[nextSash]->hide) {
 	nextSash++;
     }
 
@@ -2658,7 +2658,7 @@ MoveSash(
     if (diff > 0) {
 	expandPane = sash;
 	reduceFirst = nextSash;
-	reduceLast = pwPtr->numSlaves;
+	reduceLast = pwPtr->numPanes;
 	reduceIncr = 1;
     } else {
 	diff = abs(diff);
@@ -2674,14 +2674,14 @@ MoveSash(
      */
 
     for (i = reduceFirst; i != reduceLast; i += reduceIncr) {
-	slavePtr = pwPtr->slaves[i];
-	if (slavePtr->hide) {
+	panePtr = pwPtr->panes[i];
+	if (panePtr->hide) {
 	    continue;
 	}
 	if (horizontal) {
-	    stretchReserve += slavePtr->width - slavePtr->minSize;
+	    stretchReserve += panePtr->width - panePtr->minSize;
 	} else {
-	    stretchReserve += slavePtr->height - slavePtr->minSize;
+	    stretchReserve += panePtr->height - panePtr->minSize;
 	}
     }
     if (stretchReserve <= 0) {
@@ -2695,11 +2695,11 @@ MoveSash(
      * Expand pane by diff amount.
      */
 
-    slavePtr = pwPtr->slaves[expandPane];
+    panePtr = pwPtr->panes[expandPane];
     if (horizontal) {
-	slavePtr->paneWidth = slavePtr->width += diff;
+	panePtr->paneWidth = panePtr->width += diff;
     } else {
-	slavePtr->paneHeight = slavePtr->height += diff;
+	panePtr->paneHeight = panePtr->height += diff;
     }
 
     /*
@@ -2707,26 +2707,26 @@ MoveSash(
      */
 
     for (i = reduceFirst; i != reduceLast; i += reduceIncr) {
-	slavePtr = pwPtr->slaves[i];
-	if (slavePtr->hide) {
+	panePtr = pwPtr->panes[i];
+	if (panePtr->hide) {
 	    continue;
 	}
 	if (horizontal) {
-	    slaveSize = slavePtr->width;
+	    paneSize = panePtr->width;
 	} else {
-	    slaveSize = slavePtr->height;
+	    paneSize = panePtr->height;
 	}
-	if (diff > (slaveSize - slavePtr->minSize)) {
-	    diff -= slaveSize - slavePtr->minSize;
-	    slaveSize = slavePtr->minSize;
+	if (diff > (paneSize - panePtr->minSize)) {
+	    diff -= paneSize - panePtr->minSize;
+	    paneSize = panePtr->minSize;
 	} else {
-	    slaveSize -= diff;
+	    paneSize -= diff;
 	    i = reduceLast - reduceIncr;
 	}
 	if (horizontal) {
-	    slavePtr->paneWidth = slavePtr->width = slaveSize;
+	    panePtr->paneWidth = panePtr->width = paneSize;
 	} else {
-	    slavePtr->paneHeight = slavePtr->height = slaveSize;
+	    panePtr->paneHeight = panePtr->height = paneSize;
 	}
     }
 }
@@ -2949,9 +2949,9 @@ PanedWindowProxyCommand(
 
 	/*
 	 * Make sure the proxy window is higher in the stacking order than the
-	 * slaves, so that it will be visible when drawn. It would be more
+	 * panes, so that it will be visible when drawn. It would be more
 	 * correct to push the proxy window just high enough to appear above
-	 * the highest slave, but it's much easier to just force it all the
+	 * the highest pane, but it's much easier to just force it all the
 	 * way to the top of the stacking order.
 	 */
 
@@ -3101,12 +3101,12 @@ PanedWindowIdentifyCoords(
     GetFirstLastVisiblePane(pwPtr, &first, &last);
     isHandle = 0;
     found = -1;
-    for (i = 0; i < pwPtr->numSlaves - 1; i++) {
-	if (pwPtr->slaves[i]->hide || i == last) {
+    for (i = 0; i < pwPtr->numPanes - 1; i++) {
+	if (pwPtr->panes[i]->hide || i == last) {
 	    continue;
 	}
-	thisx = pwPtr->slaves[i]->sashx;
-	thisy = pwPtr->slaves[i]->sashy;
+	thisx = pwPtr->panes[i]->sashx;
+	thisy = pwPtr->panes[i]->sashy;
 
 	if (((thisx - lpad) <= x && x <= (thisx + rpad + sashWidth)) &&
 		((thisy - tpad) <= y && y <= (thisy + bpad + sashHeight))) {
@@ -3117,8 +3117,8 @@ PanedWindowIdentifyCoords(
 	     */
 
 	    if (pwPtr->showHandle) {
-		thisx = pwPtr->slaves[i]->handlex;
-		thisy = pwPtr->slaves[i]->handley;
+		thisx = pwPtr->panes[i]->handlex;
+		thisy = pwPtr->panes[i]->handley;
 		if (pwPtr->orient == ORIENT_HORIZONTAL) {
 		    if (thisy <= y && y <= (thisy + pwPtr->handleSize)) {
 			isHandle = 1;
diff --git a/generic/tkPlace.c b/generic/tkPlace.c
index f5afa38..271b92a 100644
--- a/generic/tkPlace.c
+++ b/generic/tkPlace.c
@@ -17,10 +17,10 @@
  * Border modes for relative placement:
  *
  * BM_INSIDE:		relative distances computed using area inside all
- *			borders of master window.
+ *			borders of container window.
  * BM_OUTSIDE:		relative distances computed using outside area that
- *			includes all borders of master.
- * BM_IGNORE:		border issues are ignored: place relative to master's
+ *			includes all borders of container.
+ * BM_IGNORE:		border issues are ignored: place relative to container's
  *			actual window size.
  */
 
@@ -38,13 +38,13 @@ typedef enum {BM_INSIDE, BM_OUTSIDE, BM_IGNORE} BorderMode;
 typedef struct Slave {
     Tk_Window tkwin;		/* Tk's token for window. */
     Tk_Window inTkwin;		/* Token for the -in window. */
-    struct Master *masterPtr;	/* Pointer to information for window relative
+    struct Master *containerPtr;	/* Pointer to information for window relative
 				 * to which tkwin is placed. This isn't
 				 * necessarily the logical parent of tkwin.
-				 * NULL means the master was deleted or never
+				 * NULL means the container was deleted or never
 				 * assigned. */
     struct Slave *nextPtr;	/* Next in list of windows placed relative to
-				 * same master (NULL for end of list). */
+				 * same container (NULL for end of list). */
     Tk_OptionTable optionTable;	/* Table that defines configuration options
 				 * available for this command. */
     /*
@@ -57,19 +57,19 @@ typedef struct Slave {
     Tcl_Obj *xPtr, *yPtr;	/* Tcl_Obj rep's of x, y coords, to keep pixel
 				 * spec. information. */
     double relX, relY;		/* X and Y coordinates relative to size of
-				 * master. */
+				 * container. */
     int width, height;		/* Absolute dimensions for tkwin. */
     Tcl_Obj *widthPtr;		/* Tcl_Obj rep of width, to keep pixel
 				 * spec. */
     Tcl_Obj *heightPtr;		/* Tcl_Obj rep of height, to keep pixel
 				 * spec. */
     double relWidth, relHeight;	/* Dimensions for tkwin relative to size of
-				 * master. */
+				 * container. */
     Tcl_Obj *relWidthPtr;
     Tcl_Obj *relHeightPtr;
     Tk_Anchor anchor;		/* Which point on tkwin is placed at the given
 				 * position. */
-    BorderMode borderMode;	/* How to treat borders of master window. */
+    BorderMode borderMode;	/* How to treat borders of container window. */
     int flags;			/* Various flags; see below for bit
 				 * definitions. */
 } Slave;
@@ -123,14 +123,14 @@ static const Tk_OptionSpec optionSpecs[] = {
 #define CHILD_REL_HEIGHT	8
 
 /*
- * For each master window that has a slave managed by the placer there is a
+ * For each container window that has a slave managed by the placer there is a
  * structure of the following form:
  */
 
 typedef struct Master {
-    Tk_Window tkwin;		/* Tk's token for master window. */
+    Tk_Window tkwin;		/* Tk's token for container window. */
     struct Slave *slavePtr;	/* First in linked list of slaves placed
-				 * relative to this master. */
+				 * relative to this container. */
     int *abortPtr;		/* If non-NULL, it means that there is a nested
 				 * call to RecomputePlacement already working on
 				 * this window.  *abortPtr may be set to 1 to
@@ -141,7 +141,7 @@ typedef struct Master {
 } Master;
 
 /*
- * Flag definitions for masters:
+ * Flag definitions for containers:
  *
  * PARENT_RECONFIG_PENDING -	1 means that a call to RecomputePlacement is
  *				already pending via a Do_When_Idle handler.
@@ -309,9 +309,9 @@ Tk_PlaceObjCmd(
 	if (slavePtr == NULL) {
 	    return TCL_OK;
 	}
-	if ((slavePtr->masterPtr != NULL) &&
-		(slavePtr->masterPtr->tkwin != Tk_Parent(slavePtr->tkwin))) {
-	    Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->masterPtr->tkwin);
+	if ((slavePtr->containerPtr != NULL) &&
+		(slavePtr->containerPtr->tkwin != Tk_Parent(slavePtr->tkwin))) {
+	    Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->containerPtr->tkwin);
 	}
 	UnlinkSlave(slavePtr);
 	Tcl_DeleteHashEntry(Tcl_FindHashEntry(&dispPtr->slaveTable,
@@ -332,17 +332,17 @@ Tk_PlaceObjCmd(
 
     case PLACE_CONTENT:
     case PLACE_SLAVES: {
-	Master *masterPtr;
+	Master *containerPtr;
 
 	if (objc != 3) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "pathName");
 	    return TCL_ERROR;
 	}
-	masterPtr = FindMaster(tkwin);
-	if (masterPtr != NULL) {
+	containerPtr = FindMaster(tkwin);
+	if (containerPtr != NULL) {
 	    Tcl_Obj *listPtr = Tcl_NewObj();
 
-	    for (slavePtr = masterPtr->slavePtr; slavePtr != NULL;
+	    for (slavePtr = containerPtr->slavePtr; slavePtr != NULL;
 		    slavePtr = slavePtr->nextPtr) {
 		Tcl_ListObjAppendElement(NULL, listPtr,
 			TkNewWindowObj(slavePtr->tkwin));
@@ -469,13 +469,13 @@ FindSlave(
  * UnlinkSlave --
  *
  *	This function removes a slave window from the chain of slaves in its
- *	master.
+ *	container.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	The slave list of slavePtr's master changes.
+ *	The slave list of slavePtr's container changes.
  *
  *----------------------------------------------------------------------
  */
@@ -484,17 +484,17 @@ static void
 UnlinkSlave(
     Slave *slavePtr)		/* Slave structure to be unlinked. */
 {
-    register Master *masterPtr;
+    register Master *containerPtr;
     register Slave *prevPtr;
 
-    masterPtr = slavePtr->masterPtr;
-    if (masterPtr == NULL) {
+    containerPtr = slavePtr->containerPtr;
+    if (containerPtr == NULL) {
 	return;
     }
-    if (masterPtr->slavePtr == slavePtr) {
-	masterPtr->slavePtr = slavePtr->nextPtr;
+    if (containerPtr->slavePtr == slavePtr) {
+	containerPtr->slavePtr = slavePtr->nextPtr;
     } else {
-	for (prevPtr = masterPtr->slavePtr; ; prevPtr = prevPtr->nextPtr) {
+	for (prevPtr = containerPtr->slavePtr; ; prevPtr = prevPtr->nextPtr) {
 	    if (prevPtr == NULL) {
 		Tcl_Panic("UnlinkSlave couldn't find slave to unlink");
 	    }
@@ -505,10 +505,10 @@ UnlinkSlave(
 	}
     }
 
-    if (masterPtr->abortPtr != NULL) {
-	*masterPtr->abortPtr = 1;
+    if (containerPtr->abortPtr != NULL) {
+	*containerPtr->abortPtr = 1;
     }
-    slavePtr->masterPtr = NULL;
+    slavePtr->containerPtr = NULL;
 }
 
 /*
@@ -530,27 +530,27 @@ UnlinkSlave(
 
 static Master *
 CreateMaster(
-    Tk_Window tkwin)		/* Token for desired master. */
+    Tk_Window tkwin)		/* Token for desired container. */
 {
     Tcl_HashEntry *hPtr;
-    register Master *masterPtr;
+    register Master *containerPtr;
     int isNew;
     TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr;
 
     hPtr = Tcl_CreateHashEntry(&dispPtr->masterTable, (char *) tkwin, &isNew);
     if (isNew) {
-	masterPtr = ckalloc(sizeof(Master));
-	masterPtr->tkwin = tkwin;
-	masterPtr->slavePtr = NULL;
-	masterPtr->abortPtr = NULL;
-	masterPtr->flags = 0;
-	Tcl_SetHashValue(hPtr, masterPtr);
-	Tk_CreateEventHandler(masterPtr->tkwin, StructureNotifyMask,
-		MasterStructureProc, masterPtr);
+	containerPtr = ckalloc(sizeof(Master));
+	containerPtr->tkwin = tkwin;
+	containerPtr->slavePtr = NULL;
+	containerPtr->abortPtr = NULL;
+	containerPtr->flags = 0;
+	Tcl_SetHashValue(hPtr, containerPtr);
+	Tk_CreateEventHandler(containerPtr->tkwin, StructureNotifyMask,
+		MasterStructureProc, containerPtr);
     } else {
-	masterPtr = Tcl_GetHashValue(hPtr);
+	containerPtr = Tcl_GetHashValue(hPtr);
     }
-    return masterPtr;
+    return containerPtr;
 }
 
 /*
@@ -574,7 +574,7 @@ CreateMaster(
 
 static Master *
 FindMaster(
-    Tk_Window tkwin)		/* Token for desired master. */
+    Tk_Window tkwin)		/* Token for desired container. */
 {
     register Tcl_HashEntry *hPtr;
     TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr;
@@ -599,7 +599,7 @@ FindMaster(
  *	the interp's result.
  *
  * Side effects:
- *	Information in slavePtr may change, and slavePtr's master is scheduled
+ *	Information in slavePtr may change, and slavePtr's container is scheduled
  *	for reconfiguration.
  *
  *----------------------------------------------------------------------
@@ -613,12 +613,12 @@ ConfigureSlave(
     int objc,			/* Number of config arguments. */
     Tcl_Obj *const objv[])	/* Object values for arguments. */
 {
-    register Master *masterPtr;
+    register Master *containerPtr;
     Tk_SavedOptions savedOptions;
     int mask;
     Slave *slavePtr;
-    Tk_Window masterWin = NULL;
-    TkWindow *master;
+    Tk_Window containerWin = NULL;
+    TkWindow *container;
 
     if (Tk_TopWinHierarchy(tkwin)) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
@@ -656,13 +656,13 @@ ConfigureSlave(
 	slavePtr->flags |= CHILD_WIDTH;
     }
 
-    if (!(mask & IN_MASK) && (slavePtr->masterPtr != NULL)) {
+    if (!(mask & IN_MASK) && (slavePtr->containerPtr != NULL)) {
 	/*
 	 * If no -in option was passed and the slave is already placed then
 	 * just recompute the placement.
 	 */
 
-	masterPtr = slavePtr->masterPtr;
+	containerPtr = slavePtr->containerPtr;
 	goto scheduleLayout;
     } else if (mask & IN_MASK) {
 	/* -in changed */
@@ -672,8 +672,8 @@ ConfigureSlave(
 	tkwin = slavePtr->inTkwin;
 
 	/*
-	 * Make sure that the new master is either the logical parent of the
-	 * slave or a descendant of that window, and that the master and slave
+	 * Make sure that the new container is either the logical parent of the
+	 * slave or a descendant of that window, and that the container and slave
 	 * aren't the same.
 	 */
 
@@ -701,9 +701,9 @@ ConfigureSlave(
 	 * Check for management loops.
 	 */
 
-	for (master = (TkWindow *)tkwin; master != NULL;
-	     master = (TkWindow *)TkGetGeomMaster(master)) {
-	    if (master == (TkWindow *)slavePtr->tkwin) {
+	for (container = (TkWindow *)tkwin; container != NULL;
+	     container = (TkWindow *)TkGetGeomMaster(container)) {
+	    if (container == (TkWindow *)slavePtr->tkwin) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "can't put %s inside %s, would cause management loop",
 	            Tk_PathName(slavePtr->tkwin), Tk_PathName(tkwin)));
@@ -715,52 +715,52 @@ ConfigureSlave(
 	    ((TkWindow *)slavePtr->tkwin)->maintainerPtr = (TkWindow *)tkwin;
 	}
 
-	if ((slavePtr->masterPtr != NULL)
-		&& (slavePtr->masterPtr->tkwin == tkwin)) {
+	if ((slavePtr->containerPtr != NULL)
+		&& (slavePtr->containerPtr->tkwin == tkwin)) {
 	    /*
-	     * Re-using same old master. Nothing to do.
+	     * Re-using same old container. Nothing to do.
 	     */
 
-	    masterPtr = slavePtr->masterPtr;
+	    containerPtr = slavePtr->containerPtr;
 	    goto scheduleLayout;
 	}
-	if ((slavePtr->masterPtr != NULL) &&
-		(slavePtr->masterPtr->tkwin != Tk_Parent(slavePtr->tkwin))) {
-	    Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->masterPtr->tkwin);
+	if ((slavePtr->containerPtr != NULL) &&
+		(slavePtr->containerPtr->tkwin != Tk_Parent(slavePtr->tkwin))) {
+	    Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->containerPtr->tkwin);
 	}
 	UnlinkSlave(slavePtr);
-	masterWin = tkwin;
+	containerWin = tkwin;
     }
 
     /*
-     * If there's no master specified for this slave, use its Tk_Parent.
+     * If there's no container specified for this slave, use its Tk_Parent.
      */
 
-    if (masterWin == NULL) {
-	masterWin = Tk_Parent(slavePtr->tkwin);
-	slavePtr->inTkwin = masterWin;
+    if (containerWin == NULL) {
+	containerWin = Tk_Parent(slavePtr->tkwin);
+	slavePtr->inTkwin = containerWin;
     }
 
     /*
-     * Manage the slave window in this master.
+     * Manage the slave window in this container.
      */
 
-    masterPtr = CreateMaster(masterWin);
-    slavePtr->masterPtr = masterPtr;
-    slavePtr->nextPtr = masterPtr->slavePtr;
-    masterPtr->slavePtr = slavePtr;
+    containerPtr = CreateMaster(containerWin);
+    slavePtr->containerPtr = containerPtr;
+    slavePtr->nextPtr = containerPtr->slavePtr;
+    containerPtr->slavePtr = slavePtr;
     Tk_ManageGeometry(slavePtr->tkwin, &placerType, slavePtr);
 
     /*
-     * Arrange for the master to be re-arranged at the first idle moment.
+     * Arrange for the container to be re-arranged at the first idle moment.
      */
 
   scheduleLayout:
     Tk_FreeSavedOptions(&savedOptions);
 
-    if (!(masterPtr->flags & PARENT_RECONFIG_PENDING)) {
-	masterPtr->flags |= PARENT_RECONFIG_PENDING;
-	Tcl_DoWhenIdle(RecomputePlacement, masterPtr);
+    if (!(containerPtr->flags & PARENT_RECONFIG_PENDING)) {
+	containerPtr->flags |= PARENT_RECONFIG_PENDING;
+	Tcl_DoWhenIdle(RecomputePlacement, containerPtr);
     }
     return TCL_OK;
 
@@ -804,10 +804,10 @@ PlaceInfoCommand(
 	return TCL_OK;
     }
     infoObj = Tcl_NewObj();
-    if (slavePtr->masterPtr != NULL) {
+    if (slavePtr->containerPtr != NULL) {
 	Tcl_AppendToObj(infoObj, "-in", -1);
 	Tcl_ListObjAppendElement(NULL, infoObj,
-		TkNewWindowObj(slavePtr->masterPtr->tkwin));
+		TkNewWindowObj(slavePtr->containerPtr->tkwin));
 	Tcl_AppendToObj(infoObj, " ", -1);
     }
     Tcl_AppendPrintfToObj(infoObj,
@@ -849,7 +849,7 @@ PlaceInfoCommand(
  * RecomputePlacement --
  *
  *	This function is called as a when-idle handler. It recomputes the
- *	geometries of all the slaves of a given master.
+ *	geometries of all the slaves of a given container.
  *
  * Results:
  *	None.
@@ -864,15 +864,15 @@ static void
 RecomputePlacement(
     ClientData clientData)	/* Pointer to Master record. */
 {
-    register Master *masterPtr = clientData;
+    register Master *containerPtr = clientData;
     register Slave *slavePtr;
     int x, y, width, height, tmp;
-    int masterWidth, masterHeight, masterX, masterY;
+    int containerWidth, containerHeight, containerX, containerY;
     double x1, y1, x2, y2;
     int abort;			/* May get set to non-zero to abort this
 				 * placement operation. */
 
-    masterPtr->flags &= ~PARENT_RECONFIG_PENDING;
+    containerPtr->flags &= ~PARENT_RECONFIG_PENDING;
 
     /*
      * Abort any nested call to RecomputePlacement for this window, since
@@ -880,50 +880,50 @@ RecomputePlacement(
      * aborted if necessary.
      */
 
-    if (masterPtr->abortPtr != NULL) {
-	*masterPtr->abortPtr = 1;
+    if (containerPtr->abortPtr != NULL) {
+	*containerPtr->abortPtr = 1;
     }
-    masterPtr->abortPtr = &abort;
+    containerPtr->abortPtr = &abort;
     abort = 0;
-    Tcl_Preserve(masterPtr);
+    Tcl_Preserve(containerPtr);
 
     /*
-     * Iterate over all the slaves for the master. Each slave's geometry can
+     * Iterate over all the slaves for the container. Each slave's geometry can
      * be computed independently of the other slaves. Changes to the window's
      * structure could cause almost anything to happen, including deleting the
      * parent or child. If this happens, we'll be told to abort.
      */
 
-    for (slavePtr = masterPtr->slavePtr; slavePtr != NULL && !abort;
+    for (slavePtr = containerPtr->slavePtr; slavePtr != NULL && !abort;
 	    slavePtr = slavePtr->nextPtr) {
 	/*
-	 * Step 1: compute size and borderwidth of master, taking into account
+	 * Step 1: compute size and borderwidth of container, taking into account
 	 * desired border mode.
 	 */
 
-	masterX = masterY = 0;
-	masterWidth = Tk_Width(masterPtr->tkwin);
-	masterHeight = Tk_Height(masterPtr->tkwin);
+	containerX = containerY = 0;
+	containerWidth = Tk_Width(containerPtr->tkwin);
+	containerHeight = Tk_Height(containerPtr->tkwin);
 	if (slavePtr->borderMode == BM_INSIDE) {
-	    masterX = Tk_InternalBorderLeft(masterPtr->tkwin);
-	    masterY = Tk_InternalBorderTop(masterPtr->tkwin);
-	    masterWidth -= masterX + Tk_InternalBorderRight(masterPtr->tkwin);
-	    masterHeight -= masterY +
-		    Tk_InternalBorderBottom(masterPtr->tkwin);
+	    containerX = Tk_InternalBorderLeft(containerPtr->tkwin);
+	    containerY = Tk_InternalBorderTop(containerPtr->tkwin);
+	    containerWidth -= containerX + Tk_InternalBorderRight(containerPtr->tkwin);
+	    containerHeight -= containerY +
+		    Tk_InternalBorderBottom(containerPtr->tkwin);
 	} else if (slavePtr->borderMode == BM_OUTSIDE) {
-	    masterX = masterY = -Tk_Changes(masterPtr->tkwin)->border_width;
-	    masterWidth -= 2 * masterX;
-	    masterHeight -= 2 * masterY;
+	    containerX = containerY = -Tk_Changes(containerPtr->tkwin)->border_width;
+	    containerWidth -= 2 * containerX;
+	    containerHeight -= 2 * containerY;
 	}
 
 	/*
 	 * Step 2: compute size of slave (outside dimensions including border)
-	 * and location of anchor point within master.
+	 * and location of anchor point within container.
 	 */
 
-	x1 = slavePtr->x + masterX + (slavePtr->relX*masterWidth);
+	x1 = slavePtr->x + containerX + (slavePtr->relX*containerWidth);
 	x = (int) (x1 + ((x1 > 0) ? 0.5 : -0.5));
-	y1 = slavePtr->y + masterY + (slavePtr->relY*masterHeight);
+	y1 = slavePtr->y + containerY + (slavePtr->relY*containerHeight);
 	y = (int) (y1 + ((y1 > 0) ? 0.5 : -0.5));
 	if (slavePtr->flags & (CHILD_WIDTH|CHILD_REL_WIDTH)) {
 	    width = 0;
@@ -939,7 +939,7 @@ RecomputePlacement(
 		 * errors in relX and relWidth accumulate.
 		 */
 
-		x2 = x1 + (slavePtr->relWidth*masterWidth);
+		x2 = x1 + (slavePtr->relWidth*containerWidth);
 		tmp = (int) (x2 + ((x2 > 0) ? 0.5 : -0.5));
 		width += tmp - x;
 	    }
@@ -957,7 +957,7 @@ RecomputePlacement(
 		 * See note above for rounding errors in width computation.
 		 */
 
-		y2 = y1 + (slavePtr->relHeight*masterHeight);
+		y2 = y1 + (slavePtr->relHeight*containerHeight);
 		tmp = (int) (y2 + ((y2 > 0) ? 0.5 : -0.5));
 		height += tmp - y;
 	    }
@@ -969,7 +969,7 @@ RecomputePlacement(
 	/*
 	 * Step 3: adjust the x and y positions so that the desired anchor
 	 * point on the slave appears at that position. Also adjust for the
-	 * border mode and master's border.
+	 * border mode and container's border.
 	 */
 
 	switch (slavePtr->anchor) {
@@ -1022,12 +1022,12 @@ RecomputePlacement(
 
 	/*
 	 * Step 5: reconfigure the window and map it if needed. If the slave
-	 * is a child of the master, we do this ourselves. If the slave isn't
-	 * a child of the master, let Tk_MaintainGeometry do the work (it will
+	 * is a child of the container, we do this ourselves. If the slave isn't
+	 * a child of the container, let Tk_MaintainGeometry do the work (it will
 	 * re-adjust things as relevant windows map, unmap, and move).
 	 */
 
-	if (masterPtr->tkwin == Tk_Parent(slavePtr->tkwin)) {
+	if (containerPtr->tkwin == Tk_Parent(slavePtr->tkwin)) {
 	    if ((x != Tk_X(slavePtr->tkwin))
 		    || (y != Tk_Y(slavePtr->tkwin))
 		    || (width != Tk_Width(slavePtr->tkwin))
@@ -1039,26 +1039,26 @@ RecomputePlacement(
             }
 
 	    /*
-	     * Don't map the slave unless the master is mapped: the slave will
-	     * get mapped later, when the master is mapped.
+	     * Don't map the slave unless the container is mapped: the slave will
+	     * get mapped later, when the container is mapped.
 	     */
 
-	    if (Tk_IsMapped(masterPtr->tkwin)) {
+	    if (Tk_IsMapped(containerPtr->tkwin)) {
 		Tk_MapWindow(slavePtr->tkwin);
 	    }
 	} else {
 	    if ((width <= 0) || (height <= 0)) {
-		Tk_UnmaintainGeometry(slavePtr->tkwin, masterPtr->tkwin);
+		Tk_UnmaintainGeometry(slavePtr->tkwin, containerPtr->tkwin);
 		Tk_UnmapWindow(slavePtr->tkwin);
 	    } else {
-		Tk_MaintainGeometry(slavePtr->tkwin, masterPtr->tkwin,
+		Tk_MaintainGeometry(slavePtr->tkwin, containerPtr->tkwin,
 			x, y, width, height);
 	    }
 	}
     }
 
-    masterPtr->abortPtr = NULL;
-    Tcl_Release(masterPtr);
+    containerPtr->abortPtr = NULL;
+    Tcl_Release(containerPtr);
 }
 
 /*
@@ -1067,7 +1067,7 @@ RecomputePlacement(
  * MasterStructureProc --
  *
  *	This function is invoked by the Tk event handler when StructureNotify
- *	events occur for a master window.
+ *	events occur for a container window.
  *
  * Results:
  *	None.
@@ -1085,55 +1085,55 @@ MasterStructureProc(
 				 * referred to by eventPtr. */
     XEvent *eventPtr)		/* Describes what just happened. */
 {
-    register Master *masterPtr = clientData;
+    register Master *containerPtr = clientData;
     register Slave *slavePtr, *nextPtr;
-    TkDisplay *dispPtr = ((TkWindow *) masterPtr->tkwin)->dispPtr;
+    TkDisplay *dispPtr = ((TkWindow *) containerPtr->tkwin)->dispPtr;
 
     switch (eventPtr->type) {
     case ConfigureNotify:
-	if ((masterPtr->slavePtr != NULL)
-		&& !(masterPtr->flags & PARENT_RECONFIG_PENDING)) {
-	    masterPtr->flags |= PARENT_RECONFIG_PENDING;
-	    Tcl_DoWhenIdle(RecomputePlacement, masterPtr);
+	if ((containerPtr->slavePtr != NULL)
+		&& !(containerPtr->flags & PARENT_RECONFIG_PENDING)) {
+	    containerPtr->flags |= PARENT_RECONFIG_PENDING;
+	    Tcl_DoWhenIdle(RecomputePlacement, containerPtr);
 	}
 	return;
     case DestroyNotify:
-	for (slavePtr = masterPtr->slavePtr; slavePtr != NULL;
+	for (slavePtr = containerPtr->slavePtr; slavePtr != NULL;
 		slavePtr = nextPtr) {
-	    slavePtr->masterPtr = NULL;
+	    slavePtr->containerPtr = NULL;
 	    nextPtr = slavePtr->nextPtr;
 	    slavePtr->nextPtr = NULL;
 	}
 	Tcl_DeleteHashEntry(Tcl_FindHashEntry(&dispPtr->masterTable,
-		(char *) masterPtr->tkwin));
-	if (masterPtr->flags & PARENT_RECONFIG_PENDING) {
-	    Tcl_CancelIdleCall(RecomputePlacement, masterPtr);
+		(char *) containerPtr->tkwin));
+	if (containerPtr->flags & PARENT_RECONFIG_PENDING) {
+	    Tcl_CancelIdleCall(RecomputePlacement, containerPtr);
 	}
-	masterPtr->tkwin = NULL;
-	if (masterPtr->abortPtr != NULL) {
-	    *masterPtr->abortPtr = 1;
+	containerPtr->tkwin = NULL;
+	if (containerPtr->abortPtr != NULL) {
+	    *containerPtr->abortPtr = 1;
 	}
-	Tcl_EventuallyFree(masterPtr, TCL_DYNAMIC);
+	Tcl_EventuallyFree(containerPtr, TCL_DYNAMIC);
 	return;
     case MapNotify:
 	/*
-	 * When a master gets mapped, must redo the geometry computation so
+	 * When a container gets mapped, must redo the geometry computation so
 	 * that all of its slaves get remapped.
 	 */
 
-	if ((masterPtr->slavePtr != NULL)
-		&& !(masterPtr->flags & PARENT_RECONFIG_PENDING)) {
-	    masterPtr->flags |= PARENT_RECONFIG_PENDING;
-	    Tcl_DoWhenIdle(RecomputePlacement, masterPtr);
+	if ((containerPtr->slavePtr != NULL)
+		&& !(containerPtr->flags & PARENT_RECONFIG_PENDING)) {
+	    containerPtr->flags |= PARENT_RECONFIG_PENDING;
+	    Tcl_DoWhenIdle(RecomputePlacement, containerPtr);
 	}
 	return;
     case UnmapNotify:
 	/*
-	 * Unmap all of the slaves when the master gets unmapped, so that they
+	 * Unmap all of the slaves when the container gets unmapped, so that they
 	 * don't keep redisplaying themselves.
 	 */
 
-	for (slavePtr = masterPtr->slavePtr; slavePtr != NULL;
+	for (slavePtr = containerPtr->slavePtr; slavePtr != NULL;
 		slavePtr = slavePtr->nextPtr) {
 	    Tk_UnmapWindow(slavePtr->tkwin);
 	}
@@ -1168,7 +1168,7 @@ SlaveStructureProc(
     TkDisplay *dispPtr = ((TkWindow *) slavePtr->tkwin)->dispPtr;
 
     if (eventPtr->type == DestroyNotify) {
-	if (slavePtr->masterPtr != NULL) {
+	if (slavePtr->containerPtr != NULL) {
 	    UnlinkSlave(slavePtr);
 	}
 	Tcl_DeleteHashEntry(Tcl_FindHashEntry(&dispPtr->slaveTable,
@@ -1202,7 +1202,7 @@ PlaceRequestProc(
     Tk_Window tkwin)		/* Window that changed its desired size. */
 {
     Slave *slavePtr = clientData;
-    Master *masterPtr;
+    Master *containerPtr;
 
     if ((slavePtr->flags & (CHILD_WIDTH|CHILD_REL_WIDTH))
 	    && (slavePtr->flags & (CHILD_HEIGHT|CHILD_REL_HEIGHT))) {
@@ -1214,13 +1214,13 @@ PlaceRequestProc(
         TkDoConfigureNotify((TkWindow *)(slavePtr->tkwin));
 	return;
     }
-    masterPtr = slavePtr->masterPtr;
-    if (masterPtr == NULL) {
+    containerPtr = slavePtr->containerPtr;
+    if (containerPtr == NULL) {
 	return;
     }
-    if (!(masterPtr->flags & PARENT_RECONFIG_PENDING)) {
-	masterPtr->flags |= PARENT_RECONFIG_PENDING;
-	Tcl_DoWhenIdle(RecomputePlacement, masterPtr);
+    if (!(containerPtr->flags & PARENT_RECONFIG_PENDING)) {
+	containerPtr->flags |= PARENT_RECONFIG_PENDING;
+	Tcl_DoWhenIdle(RecomputePlacement, containerPtr);
     }
 }
 
@@ -1251,8 +1251,8 @@ PlaceLostSlaveProc(
     register Slave *slavePtr = clientData;
     TkDisplay *dispPtr = ((TkWindow *) slavePtr->tkwin)->dispPtr;
 
-    if (slavePtr->masterPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
-	Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->masterPtr->tkwin);
+    if (slavePtr->containerPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
+	Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->containerPtr->tkwin);
     }
     Tk_UnmapWindow(tkwin);
     UnlinkSlave(slavePtr);
diff --git a/generic/tkTextWind.c b/generic/tkTextWind.c
index c9fc20f..dd9e0ea 100644
--- a/generic/tkTextWind.c
+++ b/generic/tkTextWind.c
@@ -443,7 +443,7 @@ EmbWinConfigure(
 		    break;
 		}
 		if (Tk_TopWinHierarchy(ancestor)) {
-		badMaster:
+		badContainer:
 		    Tcl_SetObjResult(textPtr->interp, Tcl_ObjPrintf(
 			    "can't embed %s in %s",
 			    Tk_PathName(ewPtr->body.ew.tkwin),
@@ -459,7 +459,7 @@ EmbWinConfigure(
 	    }
 	    if (Tk_TopWinHierarchy(ewPtr->body.ew.tkwin)
 		    || (ewPtr->body.ew.tkwin == textPtr->tkwin)) {
-		goto badMaster;
+		goto badContainer;
 	    }
 
 	    if (client == NULL) {
@@ -936,12 +936,12 @@ EmbWinLayoutProc(
 		break;
 	    }
 	    if (Tk_TopWinHierarchy(ancestor)) {
-		goto badMaster;
+		goto badContainer;
 	    }
 	}
 	if (Tk_TopWinHierarchy(ewPtr->body.ew.tkwin)
 		|| (textPtr->tkwin == ewPtr->body.ew.tkwin)) {
-	badMaster:
+	badContainer:
 	    Tcl_SetObjResult(textPtr->interp, Tcl_ObjPrintf(
 		    "can't embed %s relative to %s",
 		    Tk_PathName(ewPtr->body.ew.tkwin),
diff --git a/generic/ttk/ttkManager.c b/generic/ttk/ttkManager.c
index c396f63..3621186 100644
--- a/generic/ttk/ttkManager.c
+++ b/generic/ttk/ttkManager.c
@@ -12,16 +12,16 @@
  * +++ The Geometry Propagation Dance.
  *
  * When a slave window requests a new size or some other parameter changes,
- * the manager recomputes the required size for the master window and calls
+ * the manager recomputes the required size for the container window and calls
  * Tk_GeometryRequest().  This is scheduled as an idle handler so multiple
  * updates can be processed as a single batch.
  *
- * If all goes well, the master's manager will process the request
- * (and so on up the chain to the toplevel window), and the master
+ * If all goes well, the container's manager will process the request
+ * (and so on up the chain to the toplevel window), and the container
  * window will eventually receive a <Configure> event.  At this point
  * it recomputes the size and position of all slaves and places them.
  *
- * If all does not go well, however, the master's request may be ignored
+ * If all does not go well, however, the container's request may be ignored
  * (typically because the top-level window has a fixed, user-specified size).
  * Tk doesn't provide any notification when this happens; to account for this,
  * we also schedule an idle handler to call the layout procedure
@@ -54,13 +54,13 @@ typedef struct
 
 /* slave->flags bits:
  */
-#define SLAVE_MAPPED 		0x1	/* slave to be mapped when master is */
+#define SLAVE_MAPPED 		0x1	/* slave to be mapped when container is */
 
 struct TtkManager_
 {
     Ttk_ManagerSpec	*managerSpec;
     void 		*managerData;
-    Tk_Window   	masterWindow;
+    Tk_Window   	containerWindow;
     unsigned		flags;
     int 	 	nSlaves;
     Ttk_Slave 		**slaves;
@@ -88,7 +88,7 @@ static void ScheduleUpdate(Ttk_Manager *mgr, unsigned flags)
 }
 
 /* ++ RecomputeSize --
- * 	Recomputes the required size of the master window,
+ * 	Recomputes the required size of the container window,
  * 	makes geometry request.
  */
 static void RecomputeSize(Ttk_Manager *mgr)
@@ -96,7 +96,7 @@ static void RecomputeSize(Ttk_Manager *mgr)
     int width = 1, height = 1;
 
     if (mgr->managerSpec->RequestedSize(mgr->managerData, &width, &height)) {
-	Tk_GeometryRequest(mgr->masterWindow, width, height);
+	Tk_GeometryRequest(mgr->containerWindow, width, height);
 	ScheduleUpdate(mgr, MGR_RELAYOUT_REQUIRED);
     }
     mgr->flags &= ~MGR_RESIZE_REQUIRED;
@@ -136,8 +136,8 @@ static void ManagerIdleProc(ClientData clientData)
  */
 
 /* ++ ManagerEventHandler --
- * 	Recompute slave layout when master widget is resized.
- * 	Keep the slave's map state in sync with the master's.
+ * 	Recompute slave layout when container widget is resized.
+ * 	Keep the slave's map state in sync with the container's.
  */
 static const int ManagerEventMask = StructureNotifyMask;
 static void ManagerEventHandler(ClientData clientData, XEvent *eventPtr)
@@ -208,19 +208,19 @@ static void DeleteSlave(Ttk_Slave *slave)
  */
 
 Ttk_Manager *Ttk_CreateManager(
-    Ttk_ManagerSpec *managerSpec, void *managerData, Tk_Window masterWindow)
+    Ttk_ManagerSpec *managerSpec, void *managerData, Tk_Window containerWindow)
 {
     Ttk_Manager *mgr = (Ttk_Manager *)ckalloc(sizeof(*mgr));
 
     mgr->managerSpec 	= managerSpec;
     mgr->managerData	= managerData;
-    mgr->masterWindow	= masterWindow;
+    mgr->containerWindow	= containerWindow;
     mgr->nSlaves 	= 0;
     mgr->slaves 	= NULL;
     mgr->flags  	= 0;
 
     Tk_CreateEventHandler(
-	mgr->masterWindow, ManagerEventMask, ManagerEventHandler, mgr);
+	mgr->containerWindow, ManagerEventMask, ManagerEventHandler, mgr);
 
     return mgr;
 }
@@ -228,7 +228,7 @@ Ttk_Manager *Ttk_CreateManager(
 void Ttk_DeleteManager(Ttk_Manager *mgr)
 {
     Tk_DeleteEventHandler(
-	mgr->masterWindow, ManagerEventMask, ManagerEventHandler, mgr);
+	mgr->containerWindow, ManagerEventMask, ManagerEventHandler, mgr);
 
     while (mgr->nSlaves > 0) {
 	Ttk_ForgetSlave(mgr, mgr->nSlaves - 1);
@@ -300,7 +300,7 @@ static void RemoveSlave(Ttk_Manager *mgr, int index)
 	slave->slaveWindow, SlaveEventMask, SlaveEventHandler, slave);
 
     /* Note [1] */
-    Tk_UnmaintainGeometry(slave->slaveWindow, mgr->masterWindow);
+    Tk_UnmaintainGeometry(slave->slaveWindow, mgr->containerWindow);
     Tk_UnmapWindow(slave->slaveWindow);
 
     DeleteSlave(slave);
@@ -370,9 +370,9 @@ void Ttk_PlaceSlave(
     Ttk_Manager *mgr, int slaveIndex, int x, int y, int width, int height)
 {
     Ttk_Slave *slave = mgr->slaves[slaveIndex];
-    Tk_MaintainGeometry(slave->slaveWindow,mgr->masterWindow,x,y,width,height);
+    Tk_MaintainGeometry(slave->slaveWindow,mgr->containerWindow,x,y,width,height);
     slave->flags |= SLAVE_MAPPED;
-    if (Tk_IsMapped(mgr->masterWindow)) {
+    if (Tk_IsMapped(mgr->containerWindow)) {
 	Tk_MapWindow(slave->slaveWindow);
     }
 }
@@ -383,7 +383,7 @@ void Ttk_PlaceSlave(
 void Ttk_UnmapSlave(Ttk_Manager *mgr, int slaveIndex)
 {
     Ttk_Slave *slave = mgr->slaves[slaveIndex];
-    Tk_UnmaintainGeometry(slave->slaveWindow, mgr->masterWindow);
+    Tk_UnmaintainGeometry(slave->slaveWindow, mgr->containerWindow);
     slave->flags &= ~SLAVE_MAPPED;
     /* Contrary to documentation, Tk_UnmaintainGeometry doesn't always
      * unmap the slave:
@@ -467,12 +467,12 @@ int Ttk_GetSlaveIndexFromObj(
     /* Try interpreting as a slave window name;
      */
     if ((*string == '.') &&
-	    (tkwin = Tk_NameToWindow(interp, string, mgr->masterWindow))) {
+	    (tkwin = Tk_NameToWindow(interp, string, mgr->containerWindow))) {
 	slaveIndex = Ttk_SlaveIndex(mgr, tkwin);
 	if (slaveIndex < 0) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "%s is not managed by %s", string,
-		    Tk_PathName(mgr->masterWindow)));
+		    Tk_PathName(mgr->containerWindow)));
 	    Tcl_SetErrorCode(interp, "TTK", "SLAVE", "MANAGER", NULL);
 	    return TCL_ERROR;
 	}
@@ -512,22 +512,22 @@ void Ttk_ReorderSlave(Ttk_Manager *mgr, int fromIndex, int toIndex)
     ScheduleUpdate(mgr, MGR_RESIZE_REQUIRED);
 }
 
-/* ++ Ttk_Maintainable(interp, slave, master) --
- * 	Utility routine.  Verifies that 'master' may be used to maintain
+/* ++ Ttk_Maintainable(interp, slave, container) --
+ * 	Utility routine.  Verifies that 'container' may be used to maintain
  *	the geometry of 'slave' via Tk_MaintainGeometry:
  *
- * 	+ 'master' is either 'slave's parent -OR-
- * 	+ 'master is a descendant of 'slave's parent.
+ * 	+ 'container' is either 'slave's parent -OR-
+ * 	+ 'container is a descendant of 'slave's parent.
  * 	+ 'slave' is not a toplevel window
- * 	+ 'slave' belongs to the same toplevel as 'master'
+ * 	+ 'slave' belongs to the same toplevel as 'container'
  *
  * Returns: 1 if OK; otherwise 0, leaving an error message in 'interp'.
  */
-int Ttk_Maintainable(Tcl_Interp *interp, Tk_Window slave, Tk_Window master)
+int Ttk_Maintainable(Tcl_Interp *interp, Tk_Window slave, Tk_Window container)
 {
-    Tk_Window ancestor = master, parent = Tk_Parent(slave);
+    Tk_Window ancestor = container, parent = Tk_Parent(slave);
 
-    if (Tk_IsTopLevel(slave) || slave == master) {
+    if (Tk_IsTopLevel(slave) || slave == container) {
 	goto badWindow;
     }
 
@@ -542,7 +542,7 @@ int Ttk_Maintainable(Tcl_Interp *interp, Tk_Window slave, Tk_Window master)
 
 badWindow:
     Tcl_SetObjResult(interp, Tcl_ObjPrintf("can't add %s as slave of %s",
-	    Tk_PathName(slave), Tk_PathName(master)));
+	    Tk_PathName(slave), Tk_PathName(container)));
     Tcl_SetErrorCode(interp, "TTK", "GEOMETRY", "MAINTAINABLE", NULL);
     return 0;
 }
diff --git a/generic/ttk/ttkManager.h b/generic/ttk/ttkManager.h
index 07fcea1..0a66ada 100644
--- a/generic/ttk/ttkManager.h
+++ b/generic/ttk/ttkManager.h
@@ -14,7 +14,7 @@ typedef struct TtkManager_ Ttk_Manager;
 /*
  * Geometry manager specification record:
  *
- * RequestedSize computes the requested size of the master window.
+ * RequestedSize computes the requested size of the container window.
  *
  * PlaceSlaves sets the position and size of all managed slaves
  * by calling Ttk_PlaceSlave().
@@ -45,7 +45,7 @@ MODULE_SCOPE void Ttk_LostSlaveProc(ClientData, Tk_Window slave);
  * Public API:
  */
 MODULE_SCOPE Ttk_Manager *Ttk_CreateManager(
-	Ttk_ManagerSpec *, void *managerData, Tk_Window masterWindow);
+	Ttk_ManagerSpec *, void *managerData, Tk_Window window);
 MODULE_SCOPE void Ttk_DeleteManager(Ttk_Manager *);
 
 MODULE_SCOPE void Ttk_InsertSlave(
@@ -86,7 +86,7 @@ MODULE_SCOPE void *Ttk_SlaveData(Ttk_Manager *, int slaveIndex);
 MODULE_SCOPE Tk_Window Ttk_SlaveWindow(Ttk_Manager *, int slaveIndex);
     /* Returns: slave window */
 
-MODULE_SCOPE int Ttk_Maintainable(Tcl_Interp *, Tk_Window slave, Tk_Window master);
-    /* Returns: 1 if master can manage slave; 0 otherwise leaving error msg */
+MODULE_SCOPE int Ttk_Maintainable(Tcl_Interp *, Tk_Window content, Tk_Window container);
+    /* Returns: 1 if container can manage content; 0 otherwise leaving error msg */
 
 #endif /* _TTKMANAGER */
diff --git a/generic/ttk/ttkPanedwindow.c b/generic/ttk/ttkPanedwindow.c
index adc2aef..704e90c 100644
--- a/generic/ttk/ttkPanedwindow.c
+++ b/generic/ttk/ttkPanedwindow.c
@@ -213,7 +213,7 @@ static int ShoveDown(Paned *pw, int i, int pos)
     int sashThickness = pw->paned.sashThickness;
 
     if (i == Ttk_NumberSlaves(pw->paned.mgr) - 1) {
-	pos = pane->sashPos; /* Sentinel value == master window size */
+	pos = pane->sashPos; /* Sentinel value == container window size */
     } else {
 	Pane *nextPane = Ttk_SlaveData(pw->paned.mgr,i+1);
 	if (pos + sashThickness > nextPane->sashPos)
-- 
cgit v0.12


From 83284028be79738bc82ba21dd3f02fe2effb46ee Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 3 Sep 2020 13:39:42 +0000
Subject: Another round of TIP #581-related name changes. Now merely
 concentrated on consistancy in the test-cases

---
 doc/grid.n                   |  46 +++---
 doc/pack.n                   |   4 +-
 doc/place.n                  |  14 +-
 generic/tk.h                 |   5 +-
 generic/tkGeometry.c         |  54 +++----
 generic/tkGrid.c             |  56 ++++----
 generic/tkImgBmap.c          |  10 +-
 generic/tkImgPhoto.c         |  10 +-
 generic/tkInt.h              |  16 ++-
 generic/tkPack.c             |  68 ++++-----
 generic/tkPlace.c            |  56 ++++----
 generic/tkTextWind.c         |  10 +-
 generic/ttk/ttkBlink.c       |   4 +-
 generic/ttk/ttkButton.c      |  11 +-
 generic/ttk/ttkCache.c       |   2 +-
 generic/ttk/ttkClamTheme.c   |   2 +-
 generic/ttk/ttkElements.c    |   3 +-
 generic/ttk/ttkFrame.c       |  33 +++--
 generic/ttk/ttkImage.c       |   2 +-
 generic/ttk/ttkInit.c        |   4 +-
 generic/ttk/ttkManager.c     | 244 +++++++++++++++----------------
 generic/ttk/ttkManager.h     |  55 ++++---
 generic/ttk/ttkNotebook.c    | 151 ++++++++++---------
 generic/ttk/ttkPanedwindow.c | 108 +++++++-------
 generic/ttk/ttkProgress.c    |   7 +-
 generic/ttk/ttkScale.c       |   4 +-
 generic/ttk/ttkScrollbar.c   |   5 +-
 generic/ttk/ttkSeparator.c   |   5 +-
 generic/ttk/ttkSquare.c      |   2 +-
 generic/ttk/ttkState.c       |   3 +-
 generic/ttk/ttkStubInit.c    |   2 +-
 generic/ttk/ttkStubLib.c     |   2 +-
 generic/ttk/ttkTagSet.c      |   3 +-
 generic/ttk/ttkTheme.c       |  12 +-
 generic/ttk/ttkTrace.c       |  10 +-
 generic/ttk/ttkTrack.c       |   2 +-
 macosx/tkMacOSX.h            |   2 +-
 tests/bind.test              |   2 +-
 tests/focus.test             |  24 ++--
 tests/grid.test              |  84 +++++------
 tests/imgBmap.test           |  14 +-
 tests/imgPhoto.test          |   6 +-
 tests/oldpack.test           |   6 +-
 tests/pack.test              |  52 +++----
 tests/packgrid.test          |  40 +++---
 tests/panedwindow.test       | 334 +++++++++++++++++++++----------------------
 tests/place.test             |  64 ++++-----
 tests/textIndex.test         |  20 +--
 tests/textWind.test          |   4 +-
 tests/ttk/labelframe.test    |  28 ++--
 tests/ttk/panedwindow.test   |   6 +-
 tests/unixEmbed.test         | 268 +++++++++++++++++-----------------
 tests/unixWm.test            |  32 ++---
 tests/wm.test                | 164 ++++++++++-----------
 54 files changed, 1093 insertions(+), 1082 deletions(-)

diff --git a/doc/grid.n b/doc/grid.n
index 1af7185..da48e66 100644
--- a/doc/grid.n
+++ b/doc/grid.n
@@ -3,7 +3,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH grid n 8.5 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
@@ -17,30 +17,30 @@ grid \- Geometry manager that arranges widgets in a grid
 .PP
 The \fBgrid\fR command is used to communicate with the grid
 geometry manager that arranges widgets in rows and columns inside
-of another window, called the geometry master (or master window).
+of another window, called the geometry container (or container window).
 The \fBgrid\fR command can have any of several forms, depending
 on the \fIoption\fR argument:
 .TP
-\fBgrid \fIslave \fR?\fIslave ...\fR? ?\fIoptions\fR?
+\fBgrid \fIwindow \fR?\fIwindow ...\fR? ?\fIoptions\fR?
 .
-If the first argument to \fBgrid\fR is suitable as the first slave
+If the first argument to \fBgrid\fR is suitable as the first window
 argument to \fBgrid configure\fR, either a window name (any value
 starting with \fB.\fR) or one of the characters \fBx\fR or \fB^\fR
 (see the \fBRELATIVE PLACEMENT\fR section below), then the command is
 processed in the same way as \fBgrid configure\fR.
 .TP
-\fBgrid anchor \fImaster\fR ?\fIanchor\fR?
+\fBgrid anchor \fIwindow\fR ?\fIanchor\fR?
 .
-The anchor value controls how to place the grid within the master
+The anchor value controls how to place the grid within the container window
 when no row/column has any weight.  See \fBTHE GRID ALGORITHM\fR below
 for further details.  The default \fIanchor\fR is \fInw\fR.
 .TP
-\fBgrid bbox \fImaster\fR ?\fIcolumn row\fR? ?\fIcolumn2 row2\fR?
+\fBgrid bbox \fIwindow\fR ?\fIcolumn row\fR? ?\fIcolumn2 row2\fR?
 .
 With no arguments,
 the bounding box (in pixels) of the grid is returned.
 The return value consists of 4 integers.  The first two are the pixel
-offset from the master window (x then y) of the top-left corner of the
+offset from the container window (x then y) of the top-left corner of the
 grid, and the second two integers are the width and height of the grid,
 also in pixels.  If a single \fIcolumn\fR and \fIrow\fR is specified on
 the command line, then the bounding box for that cell is returned, where the
@@ -48,10 +48,10 @@ top left cell is numbered from zero.  If both \fIcolumn\fR and \fIrow\fR
 arguments are specified, then the bounding box spanning the rows and columns
 indicated is returned.
 .TP
-\fBgrid columnconfigure \fImaster index \fR?\fI\-option value...\fR?
+\fBgrid columnconfigure \fIwindow index \fR?\fI\-option value...\fR?
 .
 Query or set the column properties of the \fIindex\fR column of the
-geometry master, \fImaster\fR.
+geometry container, \fIwindow\fR.
 The valid options are \fB\-minsize\fR, \fB\-weight\fR, \fB\-uniform\fR
 and \fB\-pad\fR.
 If one or more options are provided, then \fIindex\fR may be given as
@@ -209,41 +209,41 @@ Returns a list whose elements are the current configuration state of
 the slave given by \fIslave\fR in the same option-value form that
 might be specified to \fBgrid configure\fR.
 The first two elements of the list are
-.QW "\fB\-in \fImaster\fR"
-where \fImaster\fR is the slave's master.
+.QW "\fB\-in \fIother\fR"
+where \fIother\fR is the windows's container window.
 .TP
-\fBgrid location \fImaster x y\fR
+\fBgrid location \fIwindow x y\fR
 .
-Given  \fIx\fR and \fIy\fR values in screen units relative to the master window,
+Given  \fIx\fR and \fIy\fR values in screen units relative to the container window,
 the column and row number at that \fIx\fR and \fIy\fR location is returned.
 For locations that are above or to the left of the grid, \fB\-1\fR is
 returned.
 .TP
-\fBgrid propagate \fImaster\fR ?\fIboolean\fR?
+\fBgrid propagate \fIwindow\fR ?\fIboolean\fR?
 .
 If \fIboolean\fR has a true boolean value such as \fB1\fR or \fBon\fR
-then propagation is enabled for \fImaster\fR, which must be a window
+then propagation is enabled for \fIwindow\fR, which must be a window
 name (see \fBGEOMETRY PROPAGATION\fR below).
 If \fIboolean\fR has a false boolean value then propagation is
-disabled for \fImaster\fR.
+disabled for \fIwindow\fR.
 In either of these cases an empty string is returned.
 If \fIboolean\fR is omitted then the command returns \fB0\fR or
 \fB1\fR to indicate whether propagation is currently enabled
-for \fImaster\fR.
+for \fIwindow\fR.
 Propagation is enabled by default.
 .TP
-\fBgrid rowconfigure \fImaster index \fR?\fI\-option value...\fR?
+\fBgrid rowconfigure \fIwindow index \fR?\fI\-option value...\fR?
 .
 Query or set the row properties of the \fIindex\fR row of the
-geometry master, \fImaster\fR.
+geometry window, \fIwindow\fR.
 The valid options are \fB\-minsize\fR, \fB\-weight\fR, \fB\-uniform\fR
 and \fB\-pad\fR.
 If one or more options are provided, then \fIindex\fR may be given as
 a list of row indices to which the configuration options will operate on.
 Indices may be integers, window names or the keyword \fIall\fR. For \fIall\fR
-the options apply to all rows currently occupied be slave windows. For
-a window name, that window must be a slave of this master and the options
-apply to all rows currently occupied be the slave.
+the options apply to all rows currently occupied by content windows. For
+a window name, that window must be a content window of this container and the options
+apply to all rows currently occupied by the container window.
 The \fB\-minsize\fR option sets the minimum size, in screen units,
 that will be permitted for this row.
 The \fB\-weight\fR option (an integer value)
diff --git a/doc/pack.n b/doc/pack.n
index 7345d5a..cff5edf 100644
--- a/doc/pack.n
+++ b/doc/pack.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH pack n 4.0 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
@@ -83,7 +83,7 @@ Stretch the slave both horizontally and vertically.
 .RE
 .TP
 \fB\-in \fIother\fR
-Insert the slave(s) at the end of the packing order for the master
+Insert the window at the end of the packing order for the content
 window given by \fIother\fR.
 .TP
 \fB\-ipadx \fIamount\fR
diff --git a/doc/place.n b/doc/place.n
index 3a092c2..ca30c5d 100644
--- a/doc/place.n
+++ b/doc/place.n
@@ -4,7 +4,7 @@
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH place n "" Tk "Tk Built-In Commands"
 .so man.macros
 .BS
@@ -94,16 +94,16 @@ If \fIsize\fR is an empty string, or if no \fB\-height\fR or
 \fB\-relheight\fR option is specified, then the height requested
 internally by the window will be used.
 .TP
-\fB\-in \fImaster\fR
-\fIMaster\fR specifies the path name of the window relative
+\fB\-in \fIother\fR
+\fIOther\fR specifies the path name of the window relative
 to which \fIwindow\fR is to be placed.
-\fIMaster\fR must either be \fIwindow\fR's parent or a descendant
+\fIOther\fR must either be \fIwindow\fR's parent or a descendant
 of \fIwindow\fR's parent.
-In addition, \fImaster\fR and \fIwindow\fR must both be descendants
+In addition, \fIother\fR and \fIwindow\fR must both be descendants
 of the same top-level window.
 These restrictions are necessary to guarantee
-that \fIwindow\fR is visible whenever \fImaster\fR is visible.
-If this option is not specified then the master defaults to
+that \fIwindow\fR is visible whenever \fIother\fR is visible.
+If this option is not specified then the other window defaults to
 \fIwindow\fR's parent.
 .TP
 \fB\-relheight \fIsize\fR
diff --git a/generic/tk.h b/generic/tk.h
index 4905aae..ede97ac 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -615,8 +615,9 @@ typedef struct Tk_ClassProcs {
  * the geometry manager to carry out certain functions.
  */
 
+#define Tk_GeomLostContentProc Tk_GeomLostSlaveProc
 typedef void (Tk_GeomRequestProc) (ClientData clientData, Tk_Window tkwin);
-typedef void (Tk_GeomLostSlaveProc) (ClientData clientData, Tk_Window tkwin);
+typedef void (Tk_GeomLostContentProc) (ClientData clientData, Tk_Window tkwin);
 
 typedef struct Tk_GeomMgr {
     const char *name;		/* Name of the geometry manager (command used
@@ -625,7 +626,7 @@ typedef struct Tk_GeomMgr {
     Tk_GeomRequestProc *requestProc;
 				/* Procedure to invoke when a slave's
 				 * requested geometry changes. */
-    Tk_GeomLostSlaveProc *lostSlaveProc;
+    Tk_GeomLostContentProc *lostSlaveProc;
 				/* Procedure to invoke when a slave is taken
 				 * away from one geometry manager by another.
 				 * NULL means geometry manager doesn't care
diff --git a/generic/tkGeometry.c b/generic/tkGeometry.c
index 870c1f3..a8c3f2b 100644
--- a/generic/tkGeometry.c
+++ b/generic/tkGeometry.c
@@ -90,7 +90,7 @@ Tk_ManageGeometry(
     ClientData clientData)	/* Arbitrary one-word argument to pass to
 				 * geometry manager procedures. */
 {
-    register TkWindow *winPtr = (TkWindow *) tkwin;
+    TkWindow *winPtr = (TkWindow *) tkwin;
 
     if ((winPtr->geomMgrPtr != NULL) && (mgrPtr != NULL)
 	    && ((winPtr->geomMgrPtr != mgrPtr)
@@ -132,7 +132,7 @@ Tk_GeometryRequest(
     int reqWidth, int reqHeight)/* Minimum desired dimensions for window, in
 				 * pixels. */
 {
-    register TkWindow *winPtr = (TkWindow *) tkwin;
+    TkWindow *winPtr = (TkWindow *) tkwin;
 
     /*
      * X gets very upset if a window requests a width or height of zero, so
@@ -182,8 +182,8 @@ Tk_SetInternalBorderEx(
     int left, int right,	/* Width of internal border, in pixels. */
     int top, int bottom)
 {
-    register TkWindow *winPtr = (TkWindow *) tkwin;
-    register int changed = 0;
+    TkWindow *winPtr = (TkWindow *) tkwin;
+    int changed = 0;
 
     if (left < 0) {
 	left = 0;
@@ -279,7 +279,7 @@ Tk_SetMinimumRequestSize(
     Tk_Window tkwin,		/* Window that will have internal border. */
     int minWidth, int minHeight)/* Minimum requested size, in pixels. */
 {
-    register TkWindow *winPtr = (TkWindow *) tkwin;
+    TkWindow *winPtr = (TkWindow *) tkwin;
 
     if ((winPtr->minReqWidth == minWidth) &&
 	    (winPtr->minReqHeight == minHeight)) {
@@ -303,31 +303,31 @@ Tk_SetMinimumRequestSize(
 /*
  *----------------------------------------------------------------------
  *
- * TkSetGeometryMaster --
+ * TkSetGeometryContainer --
  *
- *	Set a geometry master for this window. Only one master may own
+ *	Set a geometry container for this window. Only one container may own
  *	a window at any time.
  *
  * Results:
  *	A standard Tcl result.
  *
  * Side effects:
- *	The geometry master is recorded for the window.
+ *	The geometry container is recorded for the window.
  *
  *----------------------------------------------------------------------
  */
 
 int
-TkSetGeometryMaster(
+TkSetGeometryContainer(
     Tcl_Interp *interp,		/* Current interpreter, for error. */
-    Tk_Window tkwin,		/* Window that will have geometry master
+    Tk_Window tkwin,		/* Window that will have geometry container
 				 * set. */
-    const char *master)		/* The master identity. */
+    const char *name)		/* The name of the geometry manager. */
 {
-    register TkWindow *winPtr = (TkWindow *) tkwin;
+    TkWindow *winPtr = (TkWindow *) tkwin;
 
     if (winPtr->geomMgrName != NULL &&
-	    strcmp(winPtr->geomMgrName, master) == 0) {
+	    strcmp(winPtr->geomMgrName, name) == 0) {
 	return TCL_OK;
     }
     if (winPtr->geomMgrName != NULL) {
@@ -335,46 +335,46 @@ TkSetGeometryMaster(
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "cannot use geometry manager %s inside %s which already"
 		    " has slaves managed by %s",
-		    master, Tk_PathName(tkwin), winPtr->geomMgrName));
+		    name, Tk_PathName(tkwin), winPtr->geomMgrName));
 	    Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "FIGHT", NULL);
 	}
 	return TCL_ERROR;
     }
 
-    winPtr->geomMgrName = ckalloc(strlen(master) + 1);
-    strcpy(winPtr->geomMgrName, master);
+    winPtr->geomMgrName = ckalloc(strlen(name) + 1);
+    strcpy(winPtr->geomMgrName, name);
     return TCL_OK;
 }
 
 /*
  *----------------------------------------------------------------------
  *
- * TkFreeGeometryMaster --
+ * TkFreeGeometryContainer --
  *
- *	Remove a geometry master for this window. Only one master may own
+ *	Remove a geometry container for this window. Only one container may own
  *	a window at any time.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	The geometry master is cleared for the window.
+ *	The geometry container is cleared for the window.
  *
  *----------------------------------------------------------------------
  */
 
 void
-TkFreeGeometryMaster(
-    Tk_Window tkwin,		/* Window that will have geometry master
+TkFreeGeometryContainer(
+    Tk_Window tkwin,		/* Window that will have geometry container
 				 * cleared. */
-    const char *master)		/* The master identity. */
+    const char *name)		/* The name of the geometry manager. */
 {
-    register TkWindow *winPtr = (TkWindow *) tkwin;
+    TkWindow *winPtr = (TkWindow *) tkwin;
 
     if (winPtr->geomMgrName != NULL &&
-	    strcmp(winPtr->geomMgrName, master) != 0) {
+	    strcmp(winPtr->geomMgrName, name) != 0) {
 	Tcl_Panic("Trying to free %s from geometry manager %s",
-		winPtr->geomMgrName, master);
+		winPtr->geomMgrName, name);
     }
     if (winPtr->geomMgrName != NULL) {
 	ckfree(winPtr->geomMgrName);
@@ -419,7 +419,7 @@ Tk_MaintainGeometry(
 {
     Tcl_HashEntry *hPtr;
     MaintainMaster *masterPtr;
-    register MaintainSlave *slavePtr;
+    MaintainSlave *slavePtr;
     int isNew, map;
     Tk_Window ancestor, parent;
     TkDisplay *dispPtr = ((TkWindow *) master)->dispPtr;
@@ -568,7 +568,7 @@ Tk_UnmaintainGeometry(
 {
     Tcl_HashEntry *hPtr;
     MaintainMaster *masterPtr;
-    register MaintainSlave *slavePtr, *prevPtr;
+    MaintainSlave *slavePtr, *prevPtr;
     Tk_Window ancestor;
     TkDisplay *dispPtr = ((TkWindow *) slave)->dispPtr;
 
diff --git a/generic/tkGrid.c b/generic/tkGrid.c
index 41f5213..9f08b02 100644
--- a/generic/tkGrid.c
+++ b/generic/tkGrid.c
@@ -260,7 +260,7 @@ static int		AdjustOffsets(int width, int elements,
 static void		ArrangeGrid(ClientData clientData);
 static int		CheckSlotData(Gridder *containerPtr, int slot,
 			    int slotType, int checkOnly);
-static int		ConfigureSlaves(Tcl_Interp *interp, Tk_Window tkwin,
+static int		ConfigureContent(Tcl_Interp *interp, Tk_Window tkwin,
 			    int objc, Tcl_Obj *const objv[]);
 static void		DestroyGrid(void *memPtr);
 static Gridder *	GetGrid(Tk_Window tkwin);
@@ -353,7 +353,7 @@ Tk_GridObjCmd(
 
 	if ((argv1[0] == '.') || (argv1[0] == REL_SKIP) ||
     		(argv1[0] == REL_VERT)) {
-	    return ConfigureSlaves(interp, tkwin, objc-1, objv+1);
+	    return ConfigureContent(interp, tkwin, objc-1, objv+1);
 	}
     }
     if (objc < 3) {
@@ -372,7 +372,7 @@ Tk_GridObjCmd(
     case GRID_BBOX:
 	return GridBboxCommand(tkwin, interp, objc, objv);
     case GRID_CONFIGURE:
-	return ConfigureSlaves(interp, tkwin, objc-2, objv+2);
+	return ConfigureContent(interp, tkwin, objc-2, objv+2);
     case GRID_FORGET:
     case GRID_REMOVE:
 	return GridForgetRemoveCommand(tkwin, interp, objc, objv);
@@ -721,7 +721,7 @@ GridInfoCommand(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    register Gridder *slavePtr;
+    Gridder *slavePtr;
     Tk_Window slave;
     Tcl_Obj *infoObj;
 
@@ -786,7 +786,7 @@ GridLocationCommand(
     Tk_Window container;
     Gridder *containerPtr;		/* Master grid record. */
     GridMaster *gridPtr;	/* Pointer to grid data. */
-    register SlotInfo *slotPtr;
+    SlotInfo *slotPtr;
     int x, y;			/* Offset in pixels, from edge of container. */
     int i, j;			/* Corresponding column and row indeces. */
     int endX, endY;		/* End of grid. */
@@ -910,7 +910,7 @@ GridPropagateCommand(
 	     */
 
 	    if (containerPtr->slavePtr != NULL) {
-		if (TkSetGeometryMaster(interp, container, "grid")	!= TCL_OK) {
+		if (TkSetGeometryContainer(interp, container, "grid")	!= TCL_OK) {
 		    return TCL_ERROR;
 		}
 		containerPtr->flags |= ALLOCED_CONTAINER;
@@ -918,7 +918,7 @@ GridPropagateCommand(
 	    containerPtr->flags &= ~DONT_PROPAGATE;
 	} else {
 	    if (containerPtr->flags & ALLOCED_CONTAINER) {
-		TkFreeGeometryMaster(container, "grid");
+		TkFreeGeometryContainer(container, "grid");
 		containerPtr->flags &= ~ALLOCED_CONTAINER;
 	    }
 	    containerPtr->flags |= DONT_PROPAGATE;
@@ -1432,7 +1432,7 @@ GridReqProc(
     Tk_Window tkwin)		/* Other Tk-related information about the
 				 * window. */
 {
-    register Gridder *gridPtr = clientData;
+    Gridder *gridPtr = clientData;
 
     gridPtr = gridPtr->containerPtr;
     if (gridPtr && !(gridPtr->flags & REQUESTED_RELAYOUT)) {
@@ -1464,7 +1464,7 @@ GridLostSlaveProc(
 				 * stolen away. */
     Tk_Window tkwin)		/* Tk's handle for the slave window. */
 {
-    register Gridder *slavePtr = clientData;
+    Gridder *slavePtr = clientData;
 
     if (slavePtr->containerPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
 	Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->containerPtr->tkwin);
@@ -1497,9 +1497,9 @@ static int
 AdjustOffsets(
     int size,			/* The total layout size (in pixels). */
     int slots,			/* Number of slots. */
-    register SlotInfo *slotPtr)	/* Pointer to slot array. */
+    SlotInfo *slotPtr)	/* Pointer to slot array. */
 {
-    register int slot;		/* Current slot. */
+    int slot;		/* Current slot. */
     int diff;			/* Extra pixels needed to add to the layout. */
     int totalWeight;		/* Sum of the weights for all the slots. */
     int weight;			/* Sum of the weights so far. */
@@ -1722,8 +1722,8 @@ ArrangeGrid(
     ClientData clientData)	/* Structure describing container whose slaves
 				 * are to be re-layed out. */
 {
-    register Gridder *containerPtr = clientData;
-    register Gridder *slavePtr;
+    Gridder *containerPtr = clientData;
+    Gridder *slavePtr;
     GridMaster *slotPtr = containerPtr->containerDataPtr;
     int abort;
     int width, height;		/* Requested size of layout, in pixels. */
@@ -1904,8 +1904,8 @@ ResolveConstraints(
     int maxOffset)		/* The actual maximum size of this layout in
 				 * pixels, or 0 (not currently used). */
 {
-    register SlotInfo *slotPtr;	/* Pointer to row/col constraints. */
-    register Gridder *slavePtr;	/* List of slave windows in this grid. */
+    SlotInfo *slotPtr;	/* Pointer to row/col constraints. */
+    Gridder *slavePtr;	/* List of slave windows in this grid. */
     int constraintCount;	/* Count of rows or columns that have
 				 * constraints. */
     int slotCount;		/* Last occupied row or column. */
@@ -2423,7 +2423,7 @@ GetGrid(
     Tk_Window tkwin)		/* Token for window for which grid structure
 				 * is desired. */
 {
-    register Gridder *gridPtr;
+    Gridder *gridPtr;
     Tcl_HashEntry *hPtr;
     int isNew;
     TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr;
@@ -2496,7 +2496,7 @@ static void
 SetGridSize(
     Gridder *containerPtr)		/* The geometry container for this grid. */
 {
-    register Gridder *slavePtr;	/* Current slave window. */
+    Gridder *slavePtr;	/* Current slave window. */
     int maxX = 0, maxY = 0;
 
     for (slavePtr = containerPtr->slavePtr; slavePtr != NULL;
@@ -2742,9 +2742,9 @@ InitMasterData(
 
 static void
 Unlink(
-    register Gridder *slavePtr)	/* Window to unlink. */
+    Gridder *slavePtr)	/* Window to unlink. */
 {
-    register Gridder *containerPtr, *slavePtr2;
+    Gridder *containerPtr, *slavePtr2;
 
     containerPtr = slavePtr->containerPtr;
     if (containerPtr == NULL) {
@@ -2781,7 +2781,7 @@ Unlink(
      */
 
     if ((containerPtr->slavePtr == NULL) && (containerPtr->flags & ALLOCED_CONTAINER)) {
-	TkFreeGeometryMaster(containerPtr->tkwin, "grid");
+	TkFreeGeometryContainer(containerPtr->tkwin, "grid");
 	containerPtr->flags &= ~ALLOCED_CONTAINER;
     }
 }
@@ -2810,7 +2810,7 @@ static void
 DestroyGrid(
     void *memPtr)		/* Info about window that is now dead. */
 {
-    register Gridder *gridPtr = memPtr;
+    Gridder *gridPtr = memPtr;
 
     if (gridPtr->containerDataPtr != NULL) {
 	if (gridPtr->containerDataPtr->rowPtr != NULL) {
@@ -2851,7 +2851,7 @@ GridStructureProc(
 				 * eventPtr. */
     XEvent *eventPtr)		/* Describes what just happened. */
 {
-    register Gridder *gridPtr = clientData;
+    Gridder *gridPtr = clientData;
     TkDisplay *dispPtr = ((TkWindow *) gridPtr->tkwin)->dispPtr;
 
     if (eventPtr->type == ConfigureNotify) {
@@ -2869,7 +2869,7 @@ GridStructureProc(
 	    }
 	}
     } else if (eventPtr->type == DestroyNotify) {
-	register Gridder *slavePtr, *nextPtr;
+	Gridder *slavePtr, *nextPtr;
 
 	if (gridPtr->containerPtr != NULL) {
 	    Unlink(gridPtr);
@@ -2896,7 +2896,7 @@ GridStructureProc(
 	    Tcl_DoWhenIdle(ArrangeGrid, gridPtr);
 	}
     } else if (eventPtr->type == UnmapNotify) {
-	register Gridder *slavePtr;
+	Gridder *slavePtr;
 
 	for (slavePtr = gridPtr->slavePtr; slavePtr != NULL;
 		slavePtr = slavePtr->nextPtr) {
@@ -2908,7 +2908,7 @@ GridStructureProc(
 /*
  *----------------------------------------------------------------------
  *
- * ConfigureSlaves --
+ * ConfigureContent --
  *
  *	This implements the guts of the "grid configure" command. Given a list
  *	of slaves and configuration options, it arranges for the grid to
@@ -2926,7 +2926,7 @@ GridStructureProc(
  */
 
 static int
-ConfigureSlaves(
+ConfigureContent(
     Tcl_Interp *interp,		/* Interpreter for error reporting. */
     Tk_Window tkwin,		/* Any window in application containing
 				 * slaves. Used to look up slave names. */
@@ -3375,7 +3375,7 @@ ConfigureSlaves(
 	Tk_ManageGeometry(slave, &gridMgrType, slavePtr);
 
 	if (!(containerPtr->flags & DONT_PROPAGATE)) {
-	    if (TkSetGeometryMaster(interp, containerPtr->tkwin, "grid")
+	    if (TkSetGeometryContainer(interp, containerPtr->tkwin, "grid")
 		    != TCL_OK) {
 		Tk_ManageGeometry(slave, NULL, NULL);
 		Unlink(slavePtr);
@@ -3520,7 +3520,7 @@ ConfigureSlaves(
      */
 
     if (containerPtr->slavePtr == NULL && containerPtr->flags & ALLOCED_CONTAINER) {
-	TkFreeGeometryMaster(containerPtr->tkwin, "grid");
+	TkFreeGeometryContainer(containerPtr->tkwin, "grid");
 	containerPtr->flags &= ~ALLOCED_CONTAINER;
     }
 
diff --git a/generic/tkImgBmap.c b/generic/tkImgBmap.c
index a5c21bb..8d51671 100644
--- a/generic/tkImgBmap.c
+++ b/generic/tkImgBmap.c
@@ -149,7 +149,7 @@ static int		ImgBmapCmd(ClientData clientData, Tcl_Interp *interp,
 			    int argc, Tcl_Obj *const objv[]);
 static void		ImgBmapCmdDeletedProc(ClientData clientData);
 static void		ImgBmapConfigureInstance(BitmapInstance *instancePtr);
-static int		ImgBmapConfigureMaster(BitmapModel *modelPtr,
+static int		ImgBmapConfigureModel(BitmapModel *modelPtr,
 			    int argc, Tcl_Obj *const objv[], int flags);
 static int		NextBitmapWord(ParseInfo *parseInfoPtr);
 
@@ -200,7 +200,7 @@ ImgBmapCreate(
     modelPtr->maskFileString = NULL;
     modelPtr->maskDataString = NULL;
     modelPtr->instancePtr = NULL;
-    if (ImgBmapConfigureMaster(modelPtr, argc, argv, 0) != TCL_OK) {
+    if (ImgBmapConfigureModel(modelPtr, argc, argv, 0) != TCL_OK) {
 	ImgBmapDelete(modelPtr);
 	return TCL_ERROR;
     }
@@ -211,7 +211,7 @@ ImgBmapCreate(
 /*
  *----------------------------------------------------------------------
  *
- * ImgBmapConfigureMaster --
+ * ImgBmapConfigureModel --
  *
  *	This procedure is called when a bitmap image is created or
  *	reconfigured. It process configuration options and resets any
@@ -229,7 +229,7 @@ ImgBmapCreate(
  */
 
 static int
-ImgBmapConfigureMaster(
+ImgBmapConfigureModel(
     BitmapModel *modelPtr,	/* Pointer to data structure describing
 				 * overall bitmap image to (reconfigure). */
     int objc,			/* Number of entries in objv. */
@@ -785,7 +785,7 @@ ImgBmapCmd(
 		    configSpecs, (char *) modelPtr,
 		    Tcl_GetString(objv[2]), 0);
 	} else {
-	    return ImgBmapConfigureMaster(modelPtr, objc-2, objv+2,
+	    return ImgBmapConfigureModel(modelPtr, objc-2, objv+2,
 		    TK_CONFIG_ARGV_ONLY);
 	}
     default:
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c
index 395fc9d..765b8a2 100644
--- a/generic/tkImgPhoto.c
+++ b/generic/tkImgPhoto.c
@@ -176,7 +176,7 @@ static int		ParseSubcommandOptions(
 			    Tcl_Interp *interp, int allowedOptions,
 			    int *indexPtr, int objc, Tcl_Obj *const objv[]);
 static void		ImgPhotoCmdDeletedProc(ClientData clientData);
-static int		ImgPhotoConfigureMaster(Tcl_Interp *interp,
+static int		ImgPhotoConfigureModel(Tcl_Interp *interp,
 			    PhotoModel *modelPtr, int objc,
 			    Tcl_Obj *const objv[], int flags);
 static int		ToggleComplexAlphaIfNeeded(PhotoModel *mPtr);
@@ -357,7 +357,7 @@ ImgPhotoCreate(
      * Process configuration options given in the image create command.
      */
 
-    if (ImgPhotoConfigureMaster(interp, modelPtr, objc, objv, 0) != TCL_OK) {
+    if (ImgPhotoConfigureModel(interp, modelPtr, objc, objv, 0) != TCL_OK) {
 	ImgPhotoDelete(modelPtr);
 	return TCL_ERROR;
     }
@@ -532,7 +532,7 @@ ImgPhotoCmd(
 			configSpecs, (char *) modelPtr, arg, 0);
 	    }
 	} else {
-	    return ImgPhotoConfigureMaster(interp, modelPtr, objc-2, objv+2,
+	    return ImgPhotoConfigureModel(interp, modelPtr, objc-2, objv+2,
 		    TK_CONFIG_ARGV_ONLY);
 	}
 
@@ -1759,7 +1759,7 @@ ParseSubcommandOptions(
 /*
  *----------------------------------------------------------------------
  *
- * ImgPhotoConfigureMaster --
+ * ImgPhotoConfigureModel --
  *
  *	This function is called when a photo image is created or reconfigured.
  *	It processes configuration options and resets any instances of the
@@ -1777,7 +1777,7 @@ ParseSubcommandOptions(
  */
 
 static int
-ImgPhotoConfigureMaster(
+ImgPhotoConfigureModel(
     Tcl_Interp *interp,		/* Interpreter to use for reporting errors. */
     PhotoModel *modelPtr,	/* Pointer to data structure describing
 				 * overall photo image to (re)configure. */
diff --git a/generic/tkInt.h b/generic/tkInt.h
index 9c61c20..f4bb23f 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -860,9 +860,9 @@ typedef struct TkWindow {
 #endif /* TK_USE_INPUT_METHODS */
     char *geomMgrName;          /* Records the name of the geometry manager. */
     struct TkWindow *maintainerPtr;
-				/* The geometry master for this window. The
-				 * value is NULL if the window has no master or
-				 * if its master is its parent. */
+				/* The geometry container for this window. The
+				 * value is NULL if the window has no container or
+				 * if its container is its parent. */
 } TkWindow;
 
 /*
@@ -1220,10 +1220,12 @@ MODULE_SCOPE int	Tk_WmObjCmd(ClientData clientData, Tcl_Interp *interp,
 MODULE_SCOPE int	Tk_GetDoublePixelsFromObj(Tcl_Interp *interp,
 			    Tk_Window tkwin, Tcl_Obj *objPtr,
 			    double *doublePtr);
-MODULE_SCOPE int	TkSetGeometryMaster(Tcl_Interp *interp,
-			    Tk_Window tkwin, const char *master);
-MODULE_SCOPE void	TkFreeGeometryMaster(Tk_Window tkwin,
-			    const char *master);
+#define TkSetGeometryContainer TkSetGeometryMaster
+MODULE_SCOPE int	TkSetGeometryContainer(Tcl_Interp *interp,
+			    Tk_Window tkwin, const char *name);
+#define TkFreeGeometryContainer TkFreeGeometryMaster
+MODULE_SCOPE void	TkFreeGeometryContainer(Tk_Window tkwin,
+			    const char *name);
 
 MODULE_SCOPE void	TkEventInit(void);
 MODULE_SCOPE void	TkRegisterObjTypes(void);
diff --git a/generic/tkPack.c b/generic/tkPack.c
index 50cd3b8..0272e5b 100644
--- a/generic/tkPack.c
+++ b/generic/tkPack.c
@@ -88,7 +88,7 @@ typedef struct Packer {
  *				Tk will set its requested size to fit the
  *				needs of its slaves.
  * ALLOCED_CONTAINER	1 means that Pack has allocated itself as
- *				geometry master for this window.
+ *				geometry container for this window.
  */
 
 #define REQUESTED_REPACK	1
@@ -104,13 +104,13 @@ typedef struct Packer {
  */
 
 static void		PackReqProc(ClientData clientData, Tk_Window tkwin);
-static void		PackLostSlaveProc(ClientData clientData,
+static void		PackLostContentProc(ClientData clientData,
 			    Tk_Window tkwin);
 
 static const Tk_GeomMgr packerType = {
     "pack",			/* name */
     PackReqProc,		/* requestProc */
-    PackLostSlaveProc,		/* lostSlaveProc */
+    PackLostContentProc,		/* lostSlaveProc */
 };
 
 /*
@@ -118,7 +118,7 @@ static const Tk_GeomMgr packerType = {
  */
 
 static void		ArrangePacking(ClientData clientData);
-static int		ConfigureSlaves(Tcl_Interp *interp, Tk_Window tkwin,
+static int		ConfigureContent(Tcl_Interp *interp, Tk_Window tkwin,
 			    int objc, Tcl_Obj *const objv[]);
 static void		DestroyPacker(void *memPtr);
 static Packer *		GetPacker(Tk_Window tkwin);
@@ -209,7 +209,7 @@ Tk_PackObjCmd(
 	const char *string = Tcl_GetString(objv[1]);
 
 	if (string[0] == '.') {
-	    return ConfigureSlaves(interp, tkwin, objc-1, objv+1);
+	    return ConfigureContent(interp, tkwin, objc-1, objv+1);
 	}
     }
     if (objc < 3) {
@@ -251,7 +251,7 @@ Tk_PackObjCmd(
     }
     case PACK_APPEND: {
 	Packer *containerPtr;
-	register Packer *prevPtr;
+	Packer *prevPtr;
 	Tk_Window tkwin2;
 
 	if (TkGetWindowFromObj(interp, tkwin, objv[2], &tkwin2) != TCL_OK) {
@@ -268,7 +268,7 @@ Tk_PackObjCmd(
     }
     case PACK_BEFORE: {
 	Packer *packPtr, *containerPtr;
-	register Packer *prevPtr;
+	Packer *prevPtr;
 	Tk_Window tkwin2;
 
 	if (TkGetWindowFromObj(interp, tkwin, objv[2], &tkwin2) != TCL_OK) {
@@ -304,7 +304,7 @@ Tk_PackObjCmd(
 	    Tcl_SetErrorCode(interp, "TK", "VALUE", "WINDOW_PATH", NULL);
 	    return TCL_ERROR;
 	}
-	return ConfigureSlaves(interp, tkwin, objc-2, objv+2);
+	return ConfigureContent(interp, tkwin, objc-2, objv+2);
     case PACK_FORGET: {
 	Tk_Window slave;
 	Packer *slavePtr;
@@ -328,7 +328,7 @@ Tk_PackObjCmd(
 	break;
     }
     case PACK_INFO: {
-	register Packer *slavePtr;
+	Packer *slavePtr;
 	Tk_Window slave;
 	Tcl_Obj *infoObj;
 
@@ -404,11 +404,11 @@ Tk_PackObjCmd(
 	}
 	if (propagate) {
 	    /*
-	     * If we have slaves, we need to register as geometry master.
+	     * If we have content windows, we need to register as geometry container.
 	     */
 
 	    if (containerPtr->slavePtr != NULL) {
-		if (TkSetGeometryMaster(interp, master, "pack") != TCL_OK) {
+		if (TkSetGeometryContainer(interp, master, "pack") != TCL_OK) {
 		    return TCL_ERROR;
 		}
 		containerPtr->flags |= ALLOCED_CONTAINER;
@@ -429,7 +429,7 @@ Tk_PackObjCmd(
 	    }
 	} else {
 	    if (containerPtr->flags & ALLOCED_CONTAINER) {
-		TkFreeGeometryMaster(master, "pack");
+		TkFreeGeometryContainer(master, "pack");
 		containerPtr->flags &= ~ALLOCED_CONTAINER;
 	    }
 	    containerPtr->flags |= DONT_PROPAGATE;
@@ -513,7 +513,7 @@ PackReqProc(
     Tk_Window tkwin)		/* Other Tk-related information about the
 				 * window. */
 {
-    register Packer *packPtr = clientData;
+    Packer *packPtr = clientData;
 
     packPtr = packPtr->containerPtr;
     if (!(packPtr->flags & REQUESTED_REPACK)) {
@@ -525,10 +525,10 @@ PackReqProc(
 /*
  *------------------------------------------------------------------------
  *
- * PackLostSlaveProc --
+ * PackLostContentProc --
  *
  *	This function is invoked by Tk whenever some other geometry claims
- *	control over a slave that used to be managed by us.
+ *	control over a content window that used to be managed by us.
  *
  * Results:
  *	None.
@@ -541,12 +541,12 @@ PackReqProc(
 
 	/* ARGSUSED */
 static void
-PackLostSlaveProc(
+PackLostContentProc(
     ClientData clientData,	/* Packer structure for slave window that was
 				 * stolen away. */
     Tk_Window tkwin)		/* Tk's handle for the slave window. */
 {
-    register Packer *slavePtr = clientData;
+    Packer *slavePtr = clientData;
 
     if (slavePtr->containerPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
 	Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->containerPtr->tkwin);
@@ -579,8 +579,8 @@ ArrangePacking(
     ClientData clientData)	/* Structure describing master whose slaves
 				 * are to be re-layed out. */
 {
-    register Packer *containerPtr = clientData;
-    register Packer *slavePtr;
+    Packer *containerPtr = clientData;
+    Packer *slavePtr;
     int cavityX, cavityY, cavityWidth, cavityHeight;
 				/* These variables keep track of the
 				 * as-yet-unallocated space remaining in the
@@ -902,7 +902,7 @@ ArrangePacking(
 
 static int
 XExpansion(
-    register Packer *slavePtr,	/* First in list of remaining slaves. */
+    Packer *slavePtr,	/* First in list of remaining slaves. */
     int cavityWidth)		/* Horizontal space left for all remaining
 				 * slaves. */
 {
@@ -968,7 +968,7 @@ XExpansion(
 
 static int
 YExpansion(
-    register Packer *slavePtr,	/* First in list of remaining slaves. */
+    Packer *slavePtr,	/* First in list of remaining slaves. */
     int cavityHeight)		/* Vertical space left for all remaining
 				 * slaves. */
 {
@@ -1031,7 +1031,7 @@ GetPacker(
     Tk_Window tkwin)		/* Token for window for which packer structure
 				 * is desired. */
 {
-    register Packer *packPtr;
+    Packer *packPtr;
     Tcl_HashEntry *hPtr;
     int isNew;
     TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr;
@@ -1100,7 +1100,7 @@ PackAfter(
 				 * window name and side against which to
 				 * pack. */
 {
-    register Packer *packPtr;
+    Packer *packPtr;
     Tk_Window tkwin, ancestor, parent;
     Tcl_Obj **options;
     int index, optionCount, c;
@@ -1284,7 +1284,7 @@ PackAfter(
 	    Tk_ManageGeometry(tkwin, &packerType, packPtr);
 
 	    if (!(containerPtr->flags & DONT_PROPAGATE)) {
-		if (TkSetGeometryMaster(interp, containerPtr->tkwin, "pack")
+		if (TkSetGeometryContainer(interp, containerPtr->tkwin, "pack")
 			!= TCL_OK) {
 		    Tk_ManageGeometry(tkwin, NULL, NULL);
 		    Unlink(packPtr);
@@ -1327,9 +1327,9 @@ PackAfter(
 
 static void
 Unlink(
-    register Packer *packPtr)	/* Window to unlink. */
+    Packer *packPtr)	/* Window to unlink. */
 {
-    register Packer *containerPtr, *packPtr2;
+    Packer *containerPtr, *packPtr2;
 
     containerPtr = packPtr->containerPtr;
     if (containerPtr == NULL) {
@@ -1364,7 +1364,7 @@ Unlink(
      */
 
     if ((containerPtr->slavePtr == NULL) && (containerPtr->flags & ALLOCED_CONTAINER)) {
-	TkFreeGeometryMaster(containerPtr->tkwin, "pack");
+	TkFreeGeometryContainer(containerPtr->tkwin, "pack");
 	containerPtr->flags &= ~ALLOCED_CONTAINER;
     }
 
@@ -1393,7 +1393,7 @@ DestroyPacker(
     void *memPtr)		/* Info about packed window that is now
 				 * dead. */
 {
-    register Packer *packPtr = memPtr;
+    Packer *packPtr = memPtr;
 
     ckfree(packPtr);
 }
@@ -1422,7 +1422,7 @@ PackStructureProc(
 				 * eventPtr. */
     XEvent *eventPtr)		/* Describes what just happened. */
 {
-    register Packer *packPtr = clientData;
+    Packer *packPtr = clientData;
 
     if (eventPtr->type == ConfigureNotify) {
 	if ((packPtr->slavePtr != NULL)
@@ -1439,7 +1439,7 @@ PackStructureProc(
 	    }
 	}
     } else if (eventPtr->type == DestroyNotify) {
-	register Packer *slavePtr, *nextPtr;
+	Packer *slavePtr, *nextPtr;
 
 	if (packPtr->containerPtr != NULL) {
 	    Unlink(packPtr);
@@ -1477,7 +1477,7 @@ PackStructureProc(
 	    Tcl_DoWhenIdle(ArrangePacking, packPtr);
 	}
     } else if (eventPtr->type == UnmapNotify) {
-	register Packer *packPtr2;
+	Packer *packPtr2;
 
 	/*
 	 * Unmap all of the slaves when the master gets unmapped, so that they
@@ -1494,7 +1494,7 @@ PackStructureProc(
 /*
  *----------------------------------------------------------------------
  *
- * ConfigureSlaves --
+ * ConfigureContent --
  *
  *	This implements the guts of the "pack configure" command. Given a list
  *	of slaves and configuration options, it arranges for the packer to
@@ -1511,7 +1511,7 @@ PackStructureProc(
  */
 
 static int
-ConfigureSlaves(
+ConfigureContent(
     Tcl_Interp *interp,		/* Interpreter for error reporting. */
     Tk_Window tkwin,		/* Any window in application containing
 				 * slaves. Used to look up slave names. */
@@ -1845,7 +1845,7 @@ ConfigureSlaves(
 	prevPtr = slavePtr;
 
 	if (!(containerPtr->flags & DONT_PROPAGATE)) {
-	    if (TkSetGeometryMaster(interp, containerPtr->tkwin, "pack")
+	    if (TkSetGeometryContainer(interp, containerPtr->tkwin, "pack")
 		    != TCL_OK) {
 		Tk_ManageGeometry(slave, NULL, NULL);
 		Unlink(slavePtr);
diff --git a/generic/tkPlace.c b/generic/tkPlace.c
index 271b92a..d044fa9 100644
--- a/generic/tkPlace.c
+++ b/generic/tkPlace.c
@@ -155,13 +155,13 @@ typedef struct Master {
 
 static void		PlaceRequestProc(ClientData clientData,
 			    Tk_Window tkwin);
-static void		PlaceLostSlaveProc(ClientData clientData,
+static void		PlaceLostContentProc(ClientData clientData,
 			    Tk_Window tkwin);
 
 static const Tk_GeomMgr placerType = {
     "place",			/* name */
     PlaceRequestProc,		/* requestProc */
-    PlaceLostSlaveProc,		/* lostSlaveProc */
+    PlaceLostContentProc,		/* lostSlaveProc */
 };
 
 /*
@@ -170,7 +170,7 @@ static const Tk_GeomMgr placerType = {
 
 static void		SlaveStructureProc(ClientData clientData,
 			    XEvent *eventPtr);
-static int		ConfigureSlave(Tcl_Interp *interp, Tk_Window tkwin,
+static int		ConfigureContent(Tcl_Interp *interp, Tk_Window tkwin,
 			    Tk_OptionTable table, int objc,
 			    Tcl_Obj *const objv[]);
 static int		PlaceInfoCommand(Tcl_Interp *interp, Tk_Window tkwin);
@@ -179,7 +179,7 @@ static void		FreeSlave(Slave *slavePtr);
 static Slave *		FindSlave(Tk_Window tkwin);
 static Master *		CreateMaster(Tk_Window tkwin);
 static Master *		FindMaster(Tk_Window tkwin);
-static void		MasterStructureProc(ClientData clientData,
+static void		PlaceStructureProc(ClientData clientData,
 			    XEvent *eventPtr);
 static void		RecomputePlacement(ClientData clientData);
 static void		UnlinkSlave(Slave *slavePtr);
@@ -252,7 +252,7 @@ Tk_PlaceObjCmd(
 	    dispPtr->placeInit = 1;
 	}
 
-	return ConfigureSlave(interp, tkwin, optionTable, objc-2, objv+2);
+	return ConfigureContent(interp, tkwin, optionTable, objc-2, objv+2);
     }
 
     /*
@@ -298,7 +298,7 @@ Tk_PlaceObjCmd(
 	    Tcl_SetObjResult(interp, objPtr);
 	    return TCL_OK;
 	}
-	return ConfigureSlave(interp, tkwin, optionTable, objc-3, objv+3);
+	return ConfigureContent(interp, tkwin, optionTable, objc-3, objv+3);
 
     case PLACE_FORGET:
 	if (objc != 3) {
@@ -379,7 +379,7 @@ CreateSlave(
     Tk_OptionTable table)
 {
     Tcl_HashEntry *hPtr;
-    register Slave *slavePtr;
+    Slave *slavePtr;
     int isNew;
     TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr;
 
@@ -453,7 +453,7 @@ static Slave *
 FindSlave(
     Tk_Window tkwin)		/* Token for desired slave. */
 {
-    register Tcl_HashEntry *hPtr;
+    Tcl_HashEntry *hPtr;
     TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr;
 
     hPtr = Tcl_FindHashEntry(&dispPtr->slaveTable, (char *) tkwin);
@@ -484,8 +484,8 @@ static void
 UnlinkSlave(
     Slave *slavePtr)		/* Slave structure to be unlinked. */
 {
-    register Master *containerPtr;
-    register Slave *prevPtr;
+    Master *containerPtr;
+    Slave *prevPtr;
 
     containerPtr = slavePtr->containerPtr;
     if (containerPtr == NULL) {
@@ -533,7 +533,7 @@ CreateMaster(
     Tk_Window tkwin)		/* Token for desired container. */
 {
     Tcl_HashEntry *hPtr;
-    register Master *containerPtr;
+    Master *containerPtr;
     int isNew;
     TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr;
 
@@ -546,7 +546,7 @@ CreateMaster(
 	containerPtr->flags = 0;
 	Tcl_SetHashValue(hPtr, containerPtr);
 	Tk_CreateEventHandler(containerPtr->tkwin, StructureNotifyMask,
-		MasterStructureProc, containerPtr);
+		PlaceStructureProc, containerPtr);
     } else {
 	containerPtr = Tcl_GetHashValue(hPtr);
     }
@@ -576,7 +576,7 @@ static Master *
 FindMaster(
     Tk_Window tkwin)		/* Token for desired container. */
 {
-    register Tcl_HashEntry *hPtr;
+    Tcl_HashEntry *hPtr;
     TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr;
 
     hPtr = Tcl_FindHashEntry(&dispPtr->masterTable, (char *) tkwin);
@@ -589,7 +589,7 @@ FindMaster(
 /*
  *----------------------------------------------------------------------
  *
- * ConfigureSlave --
+ * ConfigureContent --
  *
  *	This function is called to process an argv/argc list to reconfigure
  *	the placement of a window.
@@ -606,14 +606,14 @@ FindMaster(
  */
 
 static int
-ConfigureSlave(
+ConfigureContent(
     Tcl_Interp *interp,		/* Used for error reporting. */
     Tk_Window tkwin,		/* Token for the window to manipulate. */
     Tk_OptionTable table,	/* Token for option table. */
     int objc,			/* Number of config arguments. */
     Tcl_Obj *const objv[])	/* Object values for arguments. */
 {
-    register Master *containerPtr;
+    Master *containerPtr;
     Tk_SavedOptions savedOptions;
     int mask;
     Slave *slavePtr;
@@ -864,8 +864,8 @@ static void
 RecomputePlacement(
     ClientData clientData)	/* Pointer to Master record. */
 {
-    register Master *containerPtr = clientData;
-    register Slave *slavePtr;
+    Master *containerPtr = clientData;
+    Slave *slavePtr;
     int x, y, width, height, tmp;
     int containerWidth, containerHeight, containerX, containerY;
     double x1, y1, x2, y2;
@@ -1064,7 +1064,7 @@ RecomputePlacement(
 /*
  *----------------------------------------------------------------------
  *
- * MasterStructureProc --
+ * PlaceStructureProc --
  *
  *	This function is invoked by the Tk event handler when StructureNotify
  *	events occur for a container window.
@@ -1080,13 +1080,13 @@ RecomputePlacement(
  */
 
 static void
-MasterStructureProc(
+PlaceStructureProc(
     ClientData clientData,	/* Pointer to Master structure for window
 				 * referred to by eventPtr. */
     XEvent *eventPtr)		/* Describes what just happened. */
 {
-    register Master *containerPtr = clientData;
-    register Slave *slavePtr, *nextPtr;
+    Master *containerPtr = clientData;
+    Slave *slavePtr, *nextPtr;
     TkDisplay *dispPtr = ((TkWindow *) containerPtr->tkwin)->dispPtr;
 
     switch (eventPtr->type) {
@@ -1164,7 +1164,7 @@ SlaveStructureProc(
 				 * referred to by eventPtr. */
     XEvent *eventPtr)		/* Describes what just happened. */
 {
-    register Slave *slavePtr = clientData;
+    Slave *slavePtr = clientData;
     TkDisplay *dispPtr = ((TkWindow *) slavePtr->tkwin)->dispPtr;
 
     if (eventPtr->type == DestroyNotify) {
@@ -1227,28 +1227,28 @@ PlaceRequestProc(
 /*
  *--------------------------------------------------------------
  *
- * PlaceLostSlaveProc --
+ * PlaceLostContentProc --
  *
  *	This function is invoked by Tk whenever some other geometry claims
- *	control over a slave that used to be managed by us.
+ *	control over a content window that used to be managed by us.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	Forgets all placer-related information about the slave.
+ *	Forgets all placer-related information about the content window.
  *
  *--------------------------------------------------------------
  */
 
 	/* ARGSUSED */
 static void
-PlaceLostSlaveProc(
+PlaceLostContentProc(
     ClientData clientData,	/* Slave structure for slave window that was
 				 * stolen away. */
     Tk_Window tkwin)		/* Tk's handle for the slave window. */
 {
-    register Slave *slavePtr = clientData;
+    Slave *slavePtr = clientData;
     TkDisplay *dispPtr = ((TkWindow *) slavePtr->tkwin)->dispPtr;
 
     if (slavePtr->containerPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
diff --git a/generic/tkTextWind.c b/generic/tkTextWind.c
index dd9e0ea..a0e7089 100644
--- a/generic/tkTextWind.c
+++ b/generic/tkTextWind.c
@@ -22,13 +22,13 @@
 
 static void		EmbWinRequestProc(ClientData clientData,
 			    Tk_Window tkwin);
-static void		EmbWinLostSlaveProc(ClientData clientData,
+static void		EmbWinLostContentProc(ClientData clientData,
 			    Tk_Window tkwin);
 
 static const Tk_GeomMgr textGeomType = {
     "text",			/* name */
     EmbWinRequestProc,		/* requestProc */
-    EmbWinLostSlaveProc,	/* lostSlaveProc */
+    EmbWinLostContentProc,	/* lostSlaveProc */
 };
 
 /*
@@ -594,9 +594,9 @@ EmbWinRequestProc(
 /*
  *--------------------------------------------------------------
  *
- * EmbWinLostSlaveProc --
+ * EmbWinLostContentProc --
  *
- *	This function is invoked by the Tk geometry manager when a slave
+ *	This function is invoked by the Tk geometry manager when a content
  *	window managed by a text widget is claimed away by another geometry
  *	manager.
  *
@@ -611,7 +611,7 @@ EmbWinRequestProc(
  */
 
 static void
-EmbWinLostSlaveProc(
+EmbWinLostContentProc(
     ClientData clientData,	/* Pointer to record describing window item. */
     Tk_Window tkwin)		/* Window that was claimed away by another
 				 * geometry manager. */
diff --git a/generic/ttk/ttkBlink.c b/generic/ttk/ttkBlink.c
index 706a871..a7d4a9a 100644
--- a/generic/ttk/ttkBlink.c
+++ b/generic/ttk/ttkBlink.c
@@ -14,7 +14,7 @@
  * 	Add script-level access to configure application-wide blink rate.
  */
 
-#include <tk.h>
+#include "tkInt.h"
 #include "ttkTheme.h"
 #include "ttkWidget.h"
 
@@ -57,7 +57,7 @@ static CursorManager *GetCursorManager(Tcl_Interp *interp)
 	cm->owner = 0;
 	cm->onTime = DEF_CURSOR_ON_TIME;
 	cm->offTime = DEF_CURSOR_OFF_TIME;
-	Tcl_SetAssocData(interp,cm_key,CursorManagerDeleteProc,(ClientData)cm);
+	Tcl_SetAssocData(interp, cm_key, CursorManagerDeleteProc, cm);
     }
     return cm;
 }
diff --git a/generic/ttk/ttkButton.c b/generic/ttk/ttkButton.c
index 43855b2..f4ef7bc 100644
--- a/generic/ttk/ttkButton.c
+++ b/generic/ttk/ttkButton.c
@@ -4,8 +4,7 @@
  * label, button, checkbutton, radiobutton, and menubutton widgets.
  */
 
-#include <string.h>
-#include <tk.h>
+#include "tkInt.h"
 #include "ttkTheme.h"
 #include "ttkWidget.h"
 
@@ -81,9 +80,9 @@ static Tk_OptionSpec BaseOptionSpecs[] =
      * Compound base/image options
      */
     {TK_OPTION_STRING_TABLE, "-compound", "compound", "Compound",
-	 NULL, Tk_Offset(Base,base.compoundObj), -1,
-	 TK_OPTION_NULL_OK,(ClientData)ttkCompoundStrings,
-         GEOMETRY_CHANGED },
+	NULL, Tk_Offset(Base,base.compoundObj), -1,
+	TK_OPTION_NULL_OK, (void *)ttkCompoundStrings,
+	GEOMETRY_CHANGED },
     {TK_OPTION_STRING, "-padding", "padding", "Pad",
 	NULL, Tk_Offset(Base,base.paddingObj), -1,
 	TK_OPTION_NULL_OK,0,GEOMETRY_CHANGED},
@@ -820,7 +819,7 @@ static Tk_OptionSpec MenubuttonOptionSpecs[] =
 	"", Tk_Offset(Menubutton, menubutton.menuObj), -1, 0,0,0},
     {TK_OPTION_STRING_TABLE, "-direction", "direction", "Direction",
 	"below", Tk_Offset(Menubutton, menubutton.directionObj), -1,
-	0,(ClientData)directionStrings,GEOMETRY_CHANGED},
+	0, (void *)directionStrings, GEOMETRY_CHANGED},
 
     WIDGET_TAKEFOCUS_TRUE,
     WIDGET_INHERIT_OPTIONS(BaseOptionSpecs)
diff --git a/generic/ttk/ttkCache.c b/generic/ttk/ttkCache.c
index 0ae2372..e7f885f 100644
--- a/generic/ttk/ttkCache.c
+++ b/generic/ttk/ttkCache.c
@@ -29,7 +29,7 @@
  */
 
 #include <stdio.h>	/* for sprintf */
-#include <tk.h>
+#include "tkInt.h"
 #include "ttkTheme.h"
 
 struct Ttk_ResourceCache_ {
diff --git a/generic/ttk/ttkClamTheme.c b/generic/ttk/ttkClamTheme.c
index 41a8f6d..733a391 100644
--- a/generic/ttk/ttkClamTheme.c
+++ b/generic/ttk/ttkClamTheme.c
@@ -4,7 +4,7 @@
  * "clam" theme; inspired by the XFCE family of Gnome themes.
  */
 
-#include <tk.h>
+#include "tkInt.h"
 #include "ttkTheme.h"
 
 /*
diff --git a/generic/ttk/ttkElements.c b/generic/ttk/ttkElements.c
index 5c95dba..c4469dc 100644
--- a/generic/ttk/ttkElements.c
+++ b/generic/ttk/ttkElements.c
@@ -5,8 +5,7 @@
  *
  */
 
-#include <tcl.h>
-#include <tk.h>
+#include "tkInt.h"
 #include <string.h>
 #include "ttkTheme.h"
 #include "ttkWidget.h"
diff --git a/generic/ttk/ttkFrame.c b/generic/ttk/ttkFrame.c
index 8a15e5b..931c037 100644
--- a/generic/ttk/ttkFrame.c
+++ b/generic/ttk/ttkFrame.c
@@ -4,8 +4,7 @@
  * ttk::frame and ttk::labelframe widgets.
  */
 
-#include <tk.h>
-
+#include "tkInt.h"
 #include "ttkTheme.h"
 #include "ttkWidget.h"
 #include "ttkManager.h"
@@ -456,7 +455,7 @@ static void LabelframeDoLayout(void *recordPtr)
 	Ttk_PlaceLayout(
 	    lframePtr->label.labelLayout, corePtr->state, labelParcel);
     }
-    /* labelWidget placed in LabelframePlaceSlaves GM hook */
+    /* labelWidget placed in LabelframePlaceContent GM hook */
     lframePtr->label.labelParcel = labelParcel;
 }
 
@@ -472,23 +471,27 @@ static void LabelframeDisplay(void *recordPtr, Drawable d)
 /* +++ Labelframe geometry manager hooks.
  */
 
-/* LabelframePlaceSlaves --
+/* LabelframePlaceContent --
  * 	Sets the position and size of the labelwidget.
  */
-static void LabelframePlaceSlaves(void *recordPtr)
+static void LabelframePlaceContent(void *recordPtr)
 {
     Labelframe *lframe = recordPtr;
 
-    if (Ttk_NumberSlaves(lframe->label.mgr) == 1) {
+    if (Ttk_NumberContent(lframe->label.mgr) == 1) {
 	Ttk_Box b;
 	LabelframeDoLayout(recordPtr);
 	b = lframe->label.labelParcel;
 	/* ASSERT: slave #0 is lframe->label.labelWidget */
-	Ttk_PlaceSlave(lframe->label.mgr, 0, b.x,b.y,b.width,b.height);
+	Ttk_PlaceContent(lframe->label.mgr, 0, b.x,b.y,b.width,b.height);
     }
 }
 
-static int LabelRequest(void *managerData, int index, int width, int height)
+static int LabelRequest(
+    void *managerData,
+    int index,
+    int width,
+    int height)
 {
     return 1;
 }
@@ -500,16 +503,18 @@ static int LabelRequest(void *managerData, int index, int width, int height)
  * 	This routine is also called when the widget voluntarily forgets
  * 	the slave in LabelframeConfigure.
  */
-static void LabelRemoved(void *managerData, int slaveIndex)
+static void LabelRemoved(
+    void *managerData,
+    TCL_UNUSED(int))
 {
     Labelframe *lframe = managerData;
     lframe->label.labelWidget = 0;
 }
 
 static Ttk_ManagerSpec LabelframeManagerSpec = {
-    { "labelframe", Ttk_GeometryRequestProc, Ttk_LostSlaveProc },
+    { "labelframe", Ttk_GeometryRequestProc, Ttk_LostContentProc },
     LabelframeSize,
-    LabelframePlaceSlaves,
+    LabelframePlaceContent,
     LabelRequest,
     LabelRemoved
 };
@@ -591,15 +596,15 @@ static int LabelframeConfigure(Tcl_Interp *interp,void *recordPtr,int mask)
     /* Update -labelwidget changes, if any:
      */
     if (mask & LABELWIDGET_CHANGED) {
-	if (Ttk_NumberSlaves(lframePtr->label.mgr) == 1) {
-	    Ttk_ForgetSlave(lframePtr->label.mgr, 0);
+	if (Ttk_NumberContent(lframePtr->label.mgr) == 1) {
+	    Ttk_ForgetContent(lframePtr->label.mgr, 0);
 	    /* Restore labelWidget field (see <<NOTE-LABELREMOVED>>)
 	     */
 	    lframePtr->label.labelWidget = labelWidget;
 	}
 
 	if (labelWidget) {
-	    Ttk_InsertSlave(lframePtr->label.mgr, 0, labelWidget, NULL);
+		Ttk_InsertContent(lframePtr->label.mgr, 0, labelWidget, NULL);
 	    RaiseLabelWidget(lframePtr);
 	}
     }
diff --git a/generic/ttk/ttkImage.c b/generic/ttk/ttkImage.c
index e403e2d..5c2a55f 100644
--- a/generic/ttk/ttkImage.c
+++ b/generic/ttk/ttkImage.c
@@ -11,7 +11,7 @@
  */
 
 #include <string.h>
-#include <tk.h>
+#include "tkInt.h"
 #include "ttkTheme.h"
 
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
diff --git a/generic/ttk/ttkInit.c b/generic/ttk/ttkInit.c
index 01a393a..f1b6e26 100644
--- a/generic/ttk/ttkInit.c
+++ b/generic/ttk/ttkInit.c
@@ -5,7 +5,7 @@
  */
 
 #include <string.h>
-#include <tk.h>
+#include "tkInt.h"
 #include "ttkTheme.h"
 #include "ttkWidget.h"
 
@@ -275,7 +275,7 @@ Ttk_Init(Tcl_Interp *interp)
 
     Ttk_PlatformInit(interp);
 
-    Tcl_PkgProvideEx(interp, "Ttk", TTK_PATCH_LEVEL, (ClientData)&ttkStubs);
+    Tcl_PkgProvideEx(interp, "Ttk", TTK_PATCH_LEVEL, (void *)&ttkStubs);
 
     return TCL_OK;
 }
diff --git a/generic/ttk/ttkManager.c b/generic/ttk/ttkManager.c
index 3621186..8fa7860 100644
--- a/generic/ttk/ttkManager.c
+++ b/generic/ttk/ttkManager.c
@@ -5,7 +5,7 @@
  */
 
 #include <string.h>
-#include <tk.h>
+#include "tkInt.h"
 #include "ttkManager.h"
 
 /*------------------------------------------------------------------------
@@ -27,13 +27,13 @@
  * we also schedule an idle handler to call the layout procedure
  * after making a geometry request.
  *
- * +++ Slave removal <<NOTE-LOSTSLAVE>>.
+ * +++ Content window removal <<NOTE-LOSTCONTENT>>.
  *
- * There are three conditions under which a slave is removed:
+ * There are three conditions under which a content window is removed:
  *
  * (1) Another GM claims control
  * (2) Manager voluntarily relinquishes control
- * (3) Slave is destroyed
+ * (3) Content window is destroyed
  *
  * In case (1), Tk calls the manager's lostSlaveProc.
  * Case (2) is performed by calling Tk_ManageGeometry(slave,NULL,0);
@@ -46,15 +46,15 @@
  */
 typedef struct
 {
-    Tk_Window 		slaveWindow;
+    Tk_Window 		contentWindow;
     Ttk_Manager 	*manager;
-    void 		*slaveData;
+    void 		*data;
     unsigned		flags;
-} Ttk_Slave;
+} Ttk_Content;
 
 /* slave->flags bits:
  */
-#define SLAVE_MAPPED 		0x1	/* slave to be mapped when container is */
+#define CONTENT_MAPPED 	0x1	/* content windows to be mapped when container is */
 
 struct TtkManager_
 {
@@ -62,8 +62,8 @@ struct TtkManager_
     void 		*managerData;
     Tk_Window   	containerWindow;
     unsigned		flags;
-    int 	 	nSlaves;
-    Ttk_Slave 		**slaves;
+    int 	 	nContent;
+    Ttk_Content 		**content;
 };
 
 /* manager->flags bits:
@@ -151,33 +151,33 @@ static void ManagerEventHandler(ClientData clientData, XEvent *eventPtr)
 	    RecomputeLayout(mgr);
 	    break;
 	case MapNotify:
-	    for (i = 0; i < mgr->nSlaves; ++i) {
-		Ttk_Slave *slave = mgr->slaves[i];
-		if (slave->flags & SLAVE_MAPPED) {
-		    Tk_MapWindow(slave->slaveWindow);
+	    for (i = 0; i < mgr->nContent; ++i) {
+		Ttk_Content *slave = mgr->content[i];
+		if (slave->flags & CONTENT_MAPPED) {
+		    Tk_MapWindow(slave->contentWindow);
 		}
 	    }
 	    break;
 	case UnmapNotify:
-	    for (i = 0; i < mgr->nSlaves; ++i) {
-		Ttk_Slave *slave = mgr->slaves[i];
-		Tk_UnmapWindow(slave->slaveWindow);
+	    for (i = 0; i < mgr->nContent; ++i) {
+		Ttk_Content *slave = mgr->content[i];
+		Tk_UnmapWindow(slave->contentWindow);
 	    }
 	    break;
     }
 }
 
-/* ++ SlaveEventHandler --
+/* ++ LostContentEventHandler --
  * 	Notifies manager when a slave is destroyed
- * 	(see <<NOTE-LOSTSLAVE>>).
+ * 	(see <<NOTE-LOSTCONTENT>>).
  */
 static const unsigned SlaveEventMask = StructureNotifyMask;
-static void SlaveEventHandler(ClientData clientData, XEvent *eventPtr)
+static void LostContentEventHandler(ClientData clientData, XEvent *eventPtr)
 {
-    Ttk_Slave *slave = (Ttk_Slave *)clientData;
+    Ttk_Content *slave = (Ttk_Content *)clientData;
     if (eventPtr->type == DestroyNotify) {
 	slave->manager->managerSpec->tkGeomMgr.lostSlaveProc(
-	    slave->manager, slave->slaveWindow);
+	    slave->manager, slave->contentWindow);
     }
 }
 
@@ -185,22 +185,22 @@ static void SlaveEventHandler(ClientData clientData, XEvent *eventPtr)
  * +++ Slave initialization and cleanup.
  */
 
-static Ttk_Slave *NewSlave(
-    Ttk_Manager *mgr, Tk_Window slaveWindow, void *slaveData)
+static Ttk_Content *NewContent(
+    Ttk_Manager *mgr, Tk_Window contentWindow, void *data)
 {
-    Ttk_Slave *slave = (Ttk_Slave *)ckalloc(sizeof(*slave));
+    Ttk_Content *content = (Ttk_Content *)ckalloc(sizeof(Ttk_Content));
 
-    slave->slaveWindow = slaveWindow;
-    slave->manager = mgr;
-    slave->flags = 0;
-    slave->slaveData = slaveData;
+    content->contentWindow = contentWindow;
+    content->manager = mgr;
+    content->flags = 0;
+    content->data = data;
 
-    return slave;
+    return content;
 }
 
-static void DeleteSlave(Ttk_Slave *slave)
+static void DeleteSlave(Ttk_Content *content)
 {
-    ckfree(slave);
+    ckfree(content);
 }
 
 /*------------------------------------------------------------------------
@@ -215,8 +215,8 @@ Ttk_Manager *Ttk_CreateManager(
     mgr->managerSpec 	= managerSpec;
     mgr->managerData	= managerData;
     mgr->containerWindow	= containerWindow;
-    mgr->nSlaves 	= 0;
-    mgr->slaves 	= NULL;
+    mgr->nContent 	= 0;
+    mgr->content 	= NULL;
     mgr->flags  	= 0;
 
     Tk_CreateEventHandler(
@@ -230,11 +230,11 @@ void Ttk_DeleteManager(Ttk_Manager *mgr)
     Tk_DeleteEventHandler(
 	mgr->containerWindow, ManagerEventMask, ManagerEventHandler, mgr);
 
-    while (mgr->nSlaves > 0) {
-	Ttk_ForgetSlave(mgr, mgr->nSlaves - 1);
+    while (mgr->nContent > 0) {
+	Ttk_ForgetContent(mgr, mgr->nContent - 1);
     }
-    if (mgr->slaves) {
-	ckfree(mgr->slaves);
+    if (mgr->content) {
+	ckfree(mgr->content);
     }
 
     Tcl_CancelIdleCall(ManagerIdleProc, mgr);
@@ -246,26 +246,26 @@ void Ttk_DeleteManager(Ttk_Manager *mgr)
  * +++ Slave management.
  */
 
-/* ++ InsertSlave --
- * 	Adds slave to the list of managed windows.
+/* ++ InsertContent --
+ * 	Adds content to the list of managed windows.
  */
-static void InsertSlave(Ttk_Manager *mgr, Ttk_Slave *slave, int index)
+static void InsertContent(Ttk_Manager *mgr, Ttk_Content *content, int index)
 {
-    int endIndex = mgr->nSlaves++;
-    mgr->slaves = (Ttk_Slave **)ckrealloc(mgr->slaves, mgr->nSlaves * sizeof(Ttk_Slave *));
+    int endIndex = mgr->nContent++;
+    mgr->content = (Ttk_Content **)ckrealloc(mgr->content, mgr->nContent * sizeof(Ttk_Content *));
 
     while (endIndex > index) {
-	mgr->slaves[endIndex] = mgr->slaves[endIndex - 1];
+	mgr->content[endIndex] = mgr->content[endIndex - 1];
 	--endIndex;
     }
 
-    mgr->slaves[index] = slave;
+    mgr->content[index] = content;
 
-    Tk_ManageGeometry(slave->slaveWindow,
-	&mgr->managerSpec->tkGeomMgr, (ClientData)mgr);
+    Tk_ManageGeometry(content->contentWindow,
+	&mgr->managerSpec->tkGeomMgr, mgr);
 
-    Tk_CreateEventHandler(slave->slaveWindow,
-	SlaveEventMask, SlaveEventHandler, (ClientData)slave);
+    Tk_CreateEventHandler(content->contentWindow,
+	SlaveEventMask, LostContentEventHandler, content);
 
     ScheduleUpdate(mgr, MGR_RESIZE_REQUIRED);
 }
@@ -280,7 +280,7 @@ static void InsertSlave(Ttk_Manager *mgr, Ttk_Slave *slave, int index)
  */
 static void RemoveSlave(Ttk_Manager *mgr, int index)
 {
-    Ttk_Slave *slave = mgr->slaves[index];
+    Ttk_Content *slave = mgr->content[index];
     int i;
 
     /* Notify manager:
@@ -289,19 +289,19 @@ static void RemoveSlave(Ttk_Manager *mgr, int index)
 
     /* Remove from array:
      */
-    --mgr->nSlaves;
-    for (i = index ; i < mgr->nSlaves; ++i) {
-	mgr->slaves[i] = mgr->slaves[i+1];
+    --mgr->nContent;
+    for (i = index ; i < mgr->nContent; ++i) {
+	mgr->content[i] = mgr->content[i+1];
     }
 
     /* Clean up:
      */
     Tk_DeleteEventHandler(
-	slave->slaveWindow, SlaveEventMask, SlaveEventHandler, slave);
+	slave->contentWindow, SlaveEventMask, LostContentEventHandler, slave);
 
     /* Note [1] */
-    Tk_UnmaintainGeometry(slave->slaveWindow, mgr->containerWindow);
-    Tk_UnmapWindow(slave->slaveWindow);
+    Tk_UnmaintainGeometry(slave->contentWindow, mgr->containerWindow);
+    Tk_UnmapWindow(slave->contentWindow);
 
     DeleteSlave(slave);
 
@@ -312,24 +312,24 @@ static void RemoveSlave(Ttk_Manager *mgr, int index)
  * +++ Tk_GeomMgr hooks.
  */
 
-void Ttk_GeometryRequestProc(ClientData clientData, Tk_Window slaveWindow)
+void Ttk_GeometryRequestProc(ClientData clientData, Tk_Window contentWindow)
 {
     Ttk_Manager *mgr = (Ttk_Manager *)clientData;
-    int slaveIndex = Ttk_SlaveIndex(mgr, slaveWindow);
-    int reqWidth = Tk_ReqWidth(slaveWindow);
-    int reqHeight= Tk_ReqHeight(slaveWindow);
+    int index = Ttk_ContentIndex(mgr, contentWindow);
+    int reqWidth = Tk_ReqWidth(contentWindow);
+    int reqHeight= Tk_ReqHeight(contentWindow);
 
     if (mgr->managerSpec->SlaveRequest(
-		mgr->managerData, slaveIndex, reqWidth, reqHeight))
+		mgr->managerData, index, reqWidth, reqHeight))
     {
 	ScheduleUpdate(mgr, MGR_RESIZE_REQUIRED);
     }
 }
 
-void Ttk_LostSlaveProc(ClientData clientData, Tk_Window slaveWindow)
+void Ttk_LostContentProc(ClientData clientData, Tk_Window contentWindow)
 {
     Ttk_Manager *mgr = (Ttk_Manager *)clientData;
-    int index = Ttk_SlaveIndex(mgr, slaveWindow);
+    int index = Ttk_ContentIndex(mgr, contentWindow);
 
     /* ASSERT: index >= 0 */
     RemoveSlave(mgr, index);
@@ -339,56 +339,56 @@ void Ttk_LostSlaveProc(ClientData clientData, Tk_Window slaveWindow)
  * +++ Public API.
  */
 
-/* ++ Ttk_InsertSlave --
- * 	Add a new slave window at the specified index.
+/* ++ Ttk_InsertContent --
+ * 	Add a new content window at the specified index.
  */
-void Ttk_InsertSlave(
-    Ttk_Manager *mgr, int index, Tk_Window tkwin, void *slaveData)
+void Ttk_InsertContent(
+    Ttk_Manager *mgr, int index, Tk_Window tkwin, void *data)
 {
-    Ttk_Slave *slave = NewSlave(mgr, tkwin, slaveData);
-    InsertSlave(mgr, slave, index);
+    Ttk_Content *slave = NewContent(mgr, tkwin, data);
+    InsertContent(mgr, slave, index);
 }
 
-/* ++ Ttk_ForgetSlave --
- * 	Unmanage the specified slave.
+/* ++ Ttk_ForgetContent --
+ * 	Unmanage the specified content window.
  */
-void Ttk_ForgetSlave(Ttk_Manager *mgr, int slaveIndex)
+void Ttk_ForgetContent(Ttk_Manager *mgr, int index)
 {
-    Tk_Window slaveWindow = mgr->slaves[slaveIndex]->slaveWindow;
-    RemoveSlave(mgr, slaveIndex);
-    Tk_ManageGeometry(slaveWindow, NULL, 0);
+    Tk_Window contentWindow = mgr->content[index]->contentWindow;
+    RemoveSlave(mgr, index);
+    Tk_ManageGeometry(contentWindow, NULL, 0);
 }
 
-/* ++ Ttk_PlaceSlave --
- * 	Set the position and size of the specified slave window.
+/* ++ Ttk_PlaceContent --
+ * 	Set the position and size of the specified content window.
  *
  * NOTES:
  * 	Contrary to documentation, Tk_MaintainGeometry doesn't always
- * 	map the slave.
+ * 	map the content window.
  */
-void Ttk_PlaceSlave(
-    Ttk_Manager *mgr, int slaveIndex, int x, int y, int width, int height)
+void Ttk_PlaceContent(
+    Ttk_Manager *mgr, int index, int x, int y, int width, int height)
 {
-    Ttk_Slave *slave = mgr->slaves[slaveIndex];
-    Tk_MaintainGeometry(slave->slaveWindow,mgr->containerWindow,x,y,width,height);
-    slave->flags |= SLAVE_MAPPED;
+    Ttk_Content *slave = mgr->content[index];
+    Tk_MaintainGeometry(slave->contentWindow,mgr->containerWindow,x,y,width,height);
+    slave->flags |= CONTENT_MAPPED;
     if (Tk_IsMapped(mgr->containerWindow)) {
-	Tk_MapWindow(slave->slaveWindow);
+	Tk_MapWindow(slave->contentWindow);
     }
 }
 
-/* ++ Ttk_UnmapSlave --
- * 	Unmap the specified slave, but leave it managed.
+/* ++ Ttk_UnmapContent --
+ * 	Unmap the specified content window, but leave it managed.
  */
-void Ttk_UnmapSlave(Ttk_Manager *mgr, int slaveIndex)
+void Ttk_UnmapContent(Ttk_Manager *mgr, int index)
 {
-    Ttk_Slave *slave = mgr->slaves[slaveIndex];
-    Tk_UnmaintainGeometry(slave->slaveWindow, mgr->containerWindow);
-    slave->flags &= ~SLAVE_MAPPED;
+    Ttk_Content *slave = mgr->content[index];
+    Tk_UnmaintainGeometry(slave->contentWindow, mgr->containerWindow);
+    slave->flags &= ~CONTENT_MAPPED;
     /* Contrary to documentation, Tk_UnmaintainGeometry doesn't always
-     * unmap the slave:
+     * unmap the content window:
      */
-    Tk_UnmapWindow(slave->slaveWindow);
+    Tk_UnmapWindow(slave->contentWindow);
 }
 
 /* LayoutChanged, SizeChanged --
@@ -406,61 +406,61 @@ void Ttk_ManagerSizeChanged(Ttk_Manager *mgr)
 
 /* +++ Accessors.
  */
-int Ttk_NumberSlaves(Ttk_Manager *mgr)
+int Ttk_NumberContent(Ttk_Manager *mgr)
 {
-    return mgr->nSlaves;
+    return mgr->nContent;
 }
-void *Ttk_SlaveData(Ttk_Manager *mgr, int slaveIndex)
+void *Ttk_ContentData(Ttk_Manager *mgr, int index)
 {
-    return mgr->slaves[slaveIndex]->slaveData;
+    return mgr->content[index]->data;
 }
-Tk_Window Ttk_SlaveWindow(Ttk_Manager *mgr, int slaveIndex)
+Tk_Window Ttk_ContentWindow(Ttk_Manager *mgr, int index)
 {
-    return mgr->slaves[slaveIndex]->slaveWindow;
+    return mgr->content[index]->contentWindow;
 }
 
 /*------------------------------------------------------------------------
  * +++ Utility routines.
  */
 
-/* ++ Ttk_SlaveIndex --
- * 	Returns the index of specified slave window, -1 if not found.
+/* ++ Ttk_ContentIndex --
+ * 	Returns the index of specified content window, -1 if not found.
  */
-int Ttk_SlaveIndex(Ttk_Manager *mgr, Tk_Window slaveWindow)
+int Ttk_ContentIndex(Ttk_Manager *mgr, Tk_Window contentWindow)
 {
     int index;
-    for (index = 0; index < mgr->nSlaves; ++index)
-	if (mgr->slaves[index]->slaveWindow == slaveWindow)
+    for (index = 0; index < mgr->nContent; ++index)
+	if (mgr->content[index]->contentWindow == contentWindow)
 	    return index;
     return -1;
 }
 
-/* ++ Ttk_GetSlaveIndexFromObj(interp, mgr, objPtr, indexPtr) --
- * 	Return the index of the slave specified by objPtr.
- * 	Slaves may be specified as an integer index or
+/* ++ Ttk_GetContentIndexFromObj(interp, mgr, objPtr, indexPtr) --
+ * 	Return the index of the content window specified by objPtr.
+ * 	Content windows may be specified as an integer index or
  * 	as the name of the managed window.
  *
  * Returns:
  * 	Standard Tcl completion code.  Leaves an error message in case of error.
  */
 
-int Ttk_GetSlaveIndexFromObj(
+int Ttk_GetContentIndexFromObj(
     Tcl_Interp *interp, Ttk_Manager *mgr, Tcl_Obj *objPtr, int *indexPtr)
 {
     const char *string = Tcl_GetString(objPtr);
-    int slaveIndex = 0;
+    int index = 0;
     Tk_Window tkwin;
 
     /* Try interpreting as an integer first:
      */
-    if (Tcl_GetIntFromObj(NULL, objPtr, &slaveIndex) == TCL_OK) {
-	if (slaveIndex < 0 || slaveIndex >= mgr->nSlaves) {
+    if (Tcl_GetIntFromObj(NULL, objPtr, &index) == TCL_OK) {
+	if (index < 0 || index >= mgr->nContent) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		"Slave index %d out of bounds", slaveIndex));
+		"Slave index %d out of bounds", index));
 	    Tcl_SetErrorCode(interp, "TTK", "SLAVE", "INDEX", NULL);
 	    return TCL_ERROR;
 	}
-	*indexPtr = slaveIndex;
+	*indexPtr = index;
 	return TCL_OK;
     }
 
@@ -468,15 +468,15 @@ int Ttk_GetSlaveIndexFromObj(
      */
     if ((*string == '.') &&
 	    (tkwin = Tk_NameToWindow(interp, string, mgr->containerWindow))) {
-	slaveIndex = Ttk_SlaveIndex(mgr, tkwin);
-	if (slaveIndex < 0) {
+	index = Ttk_ContentIndex(mgr, tkwin);
+	if (index < 0) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "%s is not managed by %s", string,
 		    Tk_PathName(mgr->containerWindow)));
 	    Tcl_SetErrorCode(interp, "TTK", "SLAVE", "MANAGER", NULL);
 	    return TCL_ERROR;
 	}
-	*indexPtr = slaveIndex;
+	*indexPtr = index;
 	return TCL_OK;
     }
 
@@ -486,25 +486,25 @@ int Ttk_GetSlaveIndexFromObj(
     return TCL_ERROR;
 }
 
-/* ++ Ttk_ReorderSlave(mgr, fromIndex, toIndex) --
- * 	Change slave order.
+/* ++ Ttk_ReorderContent(mgr, fromIndex, toIndex) --
+ * 	Change content window order.
  */
-void Ttk_ReorderSlave(Ttk_Manager *mgr, int fromIndex, int toIndex)
+void Ttk_ReorderContent(Ttk_Manager *mgr, int fromIndex, int toIndex)
 {
-    Ttk_Slave *moved = mgr->slaves[fromIndex];
+    Ttk_Content *moved = mgr->content[fromIndex];
 
     /* Shuffle down: */
     while (fromIndex > toIndex) {
-	mgr->slaves[fromIndex] = mgr->slaves[fromIndex - 1];
+	mgr->content[fromIndex] = mgr->content[fromIndex - 1];
 	--fromIndex;
     }
     /* Or, shuffle up: */
     while (fromIndex < toIndex) {
-	mgr->slaves[fromIndex] = mgr->slaves[fromIndex + 1];
+	mgr->content[fromIndex] = mgr->content[fromIndex + 1];
 	++fromIndex;
     }
     /* ASSERT: fromIndex == toIndex */
-    mgr->slaves[fromIndex] = moved;
+    mgr->content[fromIndex] = moved;
 
     /* Schedule a relayout.  In general, rearranging slaves
      * may also change the size:
diff --git a/generic/ttk/ttkManager.h b/generic/ttk/ttkManager.h
index 0a66ada..c4c46ed 100644
--- a/generic/ttk/ttkManager.h
+++ b/generic/ttk/ttkManager.h
@@ -17,7 +17,7 @@ typedef struct TtkManager_ Ttk_Manager;
  * RequestedSize computes the requested size of the container window.
  *
  * PlaceSlaves sets the position and size of all managed slaves
- * by calling Ttk_PlaceSlave().
+ * by calling Ttk_PlaceContent().
  *
  * SlaveRemoved() is called immediately before a slave is removed.
  * NB: the associated slave window may have been destroyed when this
@@ -31,15 +31,16 @@ typedef struct {			/* Manager hooks */
 
     int  (*RequestedSize)(void *managerData, int *widthPtr, int *heightPtr);
     void (*PlaceSlaves)(void *managerData);
-    int  (*SlaveRequest)(void *managerData, int slaveIndex, int w, int h);
-    void (*SlaveRemoved)(void *managerData, int slaveIndex);
+    int  (*SlaveRequest)(void *managerData, int index, int w, int h);
+    void (*SlaveRemoved)(void *managerData, int index);
 } Ttk_ManagerSpec;
 
 /*
  * Default implementations for Tk_GeomMgr hooks:
  */
+#define Ttk_LostContentProc Ttk_LostSlaveProc
 MODULE_SCOPE void Ttk_GeometryRequestProc(ClientData, Tk_Window slave);
-MODULE_SCOPE void Ttk_LostSlaveProc(ClientData, Tk_Window slave);
+MODULE_SCOPE void Ttk_LostContentProc(ClientData, Tk_Window slave);
 
 /*
  * Public API:
@@ -48,20 +49,25 @@ MODULE_SCOPE Ttk_Manager *Ttk_CreateManager(
 	Ttk_ManagerSpec *, void *managerData, Tk_Window window);
 MODULE_SCOPE void Ttk_DeleteManager(Ttk_Manager *);
 
-MODULE_SCOPE void Ttk_InsertSlave(
-    Ttk_Manager *, int position, Tk_Window, void *slaveData);
+#define Ttk_InsertContent  Ttk_InsertSlave
+MODULE_SCOPE void Ttk_InsertContent(
+    Ttk_Manager *, int position, Tk_Window, void *data);
 
-MODULE_SCOPE void Ttk_ForgetSlave(Ttk_Manager *, int slaveIndex);
+#define Ttk_ForgetContent Ttk_ForgetSlave
+MODULE_SCOPE void Ttk_ForgetContent(Ttk_Manager *, int index);
 
-MODULE_SCOPE void Ttk_ReorderSlave(Ttk_Manager *, int fromIndex, int toIndex);
-    /* Rearrange slave positions */
+#define Ttk_ReorderContent Ttk_ReorderSlave
+MODULE_SCOPE void Ttk_ReorderContent(Ttk_Manager *, int fromIndex, int toIndex);
+    /* Rearrange content window positions */
 
-MODULE_SCOPE void Ttk_PlaceSlave(
-    Ttk_Manager *, int slaveIndex, int x, int y, int width, int height);
-    /* Position and map the slave */
+#define Ttk_PlaceContent Ttk_PlaceSlave
+MODULE_SCOPE void Ttk_PlaceContent(
+    Ttk_Manager *, int index, int x, int y, int width, int height);
+    /* Position and map the content window */
 
-MODULE_SCOPE void Ttk_UnmapSlave(Ttk_Manager *, int slaveIndex);
-    /* Unmap the slave */
+#define Ttk_UnmapContent Ttk_UnmapSlave
+MODULE_SCOPE void Ttk_UnmapContent(Ttk_Manager *, int index);
+    /* Unmap the content window */
 
 MODULE_SCOPE void Ttk_ManagerSizeChanged(Ttk_Manager *);
 MODULE_SCOPE void Ttk_ManagerLayoutChanged(Ttk_Manager *);
@@ -69,22 +75,27 @@ MODULE_SCOPE void Ttk_ManagerLayoutChanged(Ttk_Manager *);
 
 /* Utilities:
  */
-MODULE_SCOPE int Ttk_SlaveIndex(Ttk_Manager *, Tk_Window);
+#define Ttk_ContentIndex Ttk_SlaveIndex
+MODULE_SCOPE int Ttk_ContentIndex(Ttk_Manager *, Tk_Window);
     /* Returns: index in slave array of specified window, -1 if not found */
 
-MODULE_SCOPE int Ttk_GetSlaveIndexFromObj(
+#define Ttk_GetContentIndexFromObj Ttk_GetSlaveIndexFromObj
+MODULE_SCOPE int Ttk_GetContentIndexFromObj(
     Tcl_Interp *, Ttk_Manager *, Tcl_Obj *, int *indexPtr);
 
 /* Accessor functions:
  */
-MODULE_SCOPE int Ttk_NumberSlaves(Ttk_Manager *);
-    /* Returns: number of managed slaves */
+#define Ttk_NumberContent Ttk_NumberSlaves
+MODULE_SCOPE int Ttk_NumberContent(Ttk_Manager *);
+    /* Returns: number of managed content windows */
 
-MODULE_SCOPE void *Ttk_SlaveData(Ttk_Manager *, int slaveIndex);
-    /* Returns: client data associated with slave */
+#define Ttk_ContentData Ttk_SlaveData
+MODULE_SCOPE void *Ttk_ContentData(Ttk_Manager *, int index);
+    /* Returns: client data associated with content window */
 
-MODULE_SCOPE Tk_Window Ttk_SlaveWindow(Ttk_Manager *, int slaveIndex);
-    /* Returns: slave window */
+#define Ttk_ContentWindow Ttk_SlaveWindow
+MODULE_SCOPE Tk_Window Ttk_ContentWindow(Ttk_Manager *, int index);
+    /* Returns: content window */
 
 MODULE_SCOPE int Ttk_Maintainable(Tcl_Interp *, Tk_Window content, Tk_Window container);
     /* Returns: 1 if container can manage content; 0 otherwise leaving error msg */
diff --git a/generic/ttk/ttkNotebook.c b/generic/ttk/ttkNotebook.c
index 39ed6aa..d94b4ed 100644
--- a/generic/ttk/ttkNotebook.c
+++ b/generic/ttk/ttkNotebook.c
@@ -5,7 +5,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <stdio.h>
-#include <tk.h>
+#include "tkInt.h"
 
 #include "ttkTheme.h"
 #include "ttkWidget.h"
@@ -63,14 +63,14 @@ static Tk_OptionSpec TabOptionSpecs[] =
 {
     {TK_OPTION_STRING_TABLE, "-state", "", "",
 	"normal", -1,Tk_Offset(Tab,state),
-	0,(ClientData)TabStateStrings,0 },
+	0, (void *)TabStateStrings, 0 },
     {TK_OPTION_STRING, "-text", "text", "Text", "",
 	Tk_Offset(Tab,textObj), -1, 0,0,GEOMETRY_CHANGED },
     {TK_OPTION_STRING, "-image", "image", "Image", NULL/*default*/,
 	Tk_Offset(Tab,imageObj), -1, TK_OPTION_NULL_OK,0,GEOMETRY_CHANGED },
     {TK_OPTION_STRING_TABLE, "-compound", "compound", "Compound",
 	NULL, Tk_Offset(Tab,compoundObj), -1,
-	TK_OPTION_NULL_OK,(ClientData)ttkCompoundStrings,GEOMETRY_CHANGED },
+	TK_OPTION_NULL_OK, (void *)ttkCompoundStrings, GEOMETRY_CHANGED },
     {TK_OPTION_INT, "-underline", "underline", "Underline", "-1",
 	Tk_Offset(Tab,underlineObj), -1, 0,0,GEOMETRY_CHANGED },
     {TK_OPTION_END, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0 }
@@ -221,7 +221,7 @@ static int ConfigureTab(
     Tk_SavedOptions savedOptions;
     int mask = 0;
 
-    if (Tk_SetOptions(interp, (ClientData)tab, nb->notebook.paneOptionTable,
+    if (Tk_SetOptions(interp, (void *)tab, nb->notebook.paneOptionTable,
 	    objc, objv, slaveWindow, &savedOptions, &mask) != TCL_OK)
     {
 	return TCL_ERROR;
@@ -261,8 +261,8 @@ error:
 static int IdentifyTab(Notebook *nb, int x, int y)
 {
     int index;
-    for (index = 0; index < Ttk_NumberSlaves(nb->notebook.mgr); ++index) {
-	Tab *tab = Ttk_SlaveData(nb->notebook.mgr,index);
+    for (index = 0; index < Ttk_NumberContent(nb->notebook.mgr); ++index) {
+	Tab *tab = Ttk_ContentData(nb->notebook.mgr,index);
 	if (	tab->state != TAB_STATE_HIDDEN
 	     && Ttk_BoxContains(tab->parcel, x,y))
 	{
@@ -294,7 +294,7 @@ static void ActivateTab(Notebook *nb, int index)
 static Ttk_State TabState(Notebook *nb, int index)
 {
     Ttk_State state = nb->core.state;
-    Tab *tab = Ttk_SlaveData(nb->notebook.mgr, index);
+    Tab *tab = Ttk_ContentData(nb->notebook.mgr, index);
     int i = 0;
 
     if (index == nb->notebook.currentIndex) {
@@ -306,8 +306,8 @@ static Ttk_State TabState(Notebook *nb, int index)
     if (index == nb->notebook.activeIndex) {
 	state |= TTK_STATE_ACTIVE;
     }
-    for (i = 0; i < Ttk_NumberSlaves(nb->notebook.mgr); ++i) {
-	Tab *tab = Ttk_SlaveData(nb->notebook.mgr, i);
+    for (i = 0; i < Ttk_NumberContent(nb->notebook.mgr); ++i) {
+	Tab *tab = Ttk_ContentData(nb->notebook.mgr, i);
 	if (tab->state == TAB_STATE_HIDDEN) {
 	    continue;
 	}
@@ -316,8 +316,8 @@ static Ttk_State TabState(Notebook *nb, int index)
 	}
 	break;
     }
-    for (i = Ttk_NumberSlaves(nb->notebook.mgr) - 1; i >= 0; --i) {
-	Tab *tab = Ttk_SlaveData(nb->notebook.mgr, i);
+    for (i = Ttk_NumberContent(nb->notebook.mgr) - 1; i >= 0; --i) {
+	Tab *tab = Ttk_ContentData(nb->notebook.mgr, i);
 	if (tab->state == TAB_STATE_HIDDEN) {
 	    continue;
 	}
@@ -357,8 +357,8 @@ static void TabrowSize(
     int tabrowWidth = 0, tabrowHeight = 0;
     int i;
 
-    for (i = 0; i < Ttk_NumberSlaves(nb->notebook.mgr); ++i) {
-	Tab *tab = Ttk_SlaveData(nb->notebook.mgr, i);
+    for (i = 0; i < Ttk_NumberContent(nb->notebook.mgr); ++i) {
+	Tab *tab = Ttk_ContentData(nb->notebook.mgr, i);
 	Ttk_State tabState = TabState(nb,i);
 
 	Ttk_RebindSublayout(tabLayout, tab);
@@ -401,9 +401,9 @@ static int NotebookSize(void *clientData, int *widthPtr, int *heightPtr)
 
     /* Compute max requested size of all slaves:
      */
-    for (i = 0; i < Ttk_NumberSlaves(nb->notebook.mgr); ++i) {
-	Tk_Window slaveWindow = Ttk_SlaveWindow(nb->notebook.mgr, i);
-	Tab *tab = Ttk_SlaveData(nb->notebook.mgr, i);
+    for (i = 0; i < Ttk_NumberContent(nb->notebook.mgr); ++i) {
+	Tk_Window slaveWindow = Ttk_ContentWindow(nb->notebook.mgr, i);
+	Tab *tab = Ttk_ContentData(nb->notebook.mgr, i);
 	int slaveWidth
 	    = Tk_ReqWidth(slaveWindow) + Ttk_PaddingWidth(tab->padding);
 	int slaveHeight
@@ -465,7 +465,7 @@ static int NotebookSize(void *clientData, int *widthPtr, int *heightPtr)
 static void SqueezeTabs(
     Notebook *nb, int needed, int available)
 {
-    int nTabs = Ttk_NumberSlaves(nb->notebook.mgr);
+    int nTabs = Ttk_NumberContent(nb->notebook.mgr);
 
     if (nTabs > 0) {
 	int difference = available - needed;
@@ -474,7 +474,7 @@ static void SqueezeTabs(
 	int i;
 
 	for (i = 0; i < nTabs; ++i) {
-	    Tab *tab = Ttk_SlaveData(nb->notebook.mgr,i);
+	    Tab *tab = Ttk_ContentData(nb->notebook.mgr,i);
 	    double ad = slack + tab->width * delta;
 	    tab->width += (int)ad;
 	    slack = ad - (int)ad;
@@ -489,11 +489,11 @@ static void PlaceTabs(
     Notebook *nb, Ttk_Box tabrowBox, Ttk_PositionSpec tabPlacement)
 {
     Ttk_Layout tabLayout = nb->notebook.tabLayout;
-    int nTabs = Ttk_NumberSlaves(nb->notebook.mgr);
+    int nTabs = Ttk_NumberContent(nb->notebook.mgr);
     int i;
 
     for (i = 0; i < nTabs; ++i) {
-	Tab *tab = Ttk_SlaveData(nb->notebook.mgr, i);
+	Tab *tab = Ttk_ContentData(nb->notebook.mgr, i);
 	Ttk_State tabState = TabState(nb, i);
 
 	if (tab->state != TAB_STATE_HIDDEN) {
@@ -571,32 +571,32 @@ static void NotebookDoLayout(void *recordPtr)
 }
 
 /*
- * NotebookPlaceSlave --
+ * NotebookPlaceContent --
  * 	Set the position and size of a child widget
- * 	based on the current client area and slave options:
+ * 	based on the current client area and content window options:
  */
-static void NotebookPlaceSlave(Notebook *nb, int slaveIndex)
+static void NotebookPlaceContent(Notebook *nb, int index)
 {
-    Tab *tab = Ttk_SlaveData(nb->notebook.mgr, slaveIndex);
-    Tk_Window slaveWindow = Ttk_SlaveWindow(nb->notebook.mgr, slaveIndex);
+    Tab *tab = Ttk_ContentData(nb->notebook.mgr, index);
+    Tk_Window slaveWindow = Ttk_ContentWindow(nb->notebook.mgr, index);
     Ttk_Box slaveBox =
 	Ttk_StickBox(Ttk_PadBox(nb->notebook.clientArea, tab->padding),
 	    Tk_ReqWidth(slaveWindow), Tk_ReqHeight(slaveWindow),tab->sticky);
 
-    Ttk_PlaceSlave(nb->notebook.mgr, slaveIndex,
+    Ttk_PlaceContent(nb->notebook.mgr, index,
 	slaveBox.x, slaveBox.y, slaveBox.width, slaveBox.height);
 }
 
-/* NotebookPlaceSlaves --
+/* NotebookPlaceContents --
  * 	Geometry manager hook.
  */
-static void NotebookPlaceSlaves(void *recordPtr)
+static void NotebookPlaceContents(void *recordPtr)
 {
     Notebook *nb = recordPtr;
     int currentIndex = nb->notebook.currentIndex;
     if (currentIndex >= 0) {
 	NotebookDoLayout(nb);
-	NotebookPlaceSlave(nb, currentIndex);
+	NotebookPlaceContent(nb, currentIndex);
     }
 }
 
@@ -606,7 +606,7 @@ static void NotebookPlaceSlaves(void *recordPtr)
  */
 static void SelectTab(Notebook *nb, int index)
 {
-    Tab *tab = Ttk_SlaveData(nb->notebook.mgr,index);
+    Tab *tab = Ttk_ContentData(nb->notebook.mgr,index);
     int currentIndex = nb->notebook.currentIndex;
 
     if (index == currentIndex) {
@@ -624,15 +624,15 @@ static void SelectTab(Notebook *nb, int index)
     }
 
     if (currentIndex >= 0) {
-	Ttk_UnmapSlave(nb->notebook.mgr, currentIndex);
+	Ttk_UnmapContent(nb->notebook.mgr, currentIndex);
     }
 
-    /* Must be set before calling NotebookPlaceSlave(), otherwise it may
-     * happen that NotebookPlaceSlaves(), triggered by an interveaning
+    /* Must be set before calling NotebookPlaceContent(), otherwise it may
+     * happen that NotebookPlaceContents(), triggered by an interveaning
      * geometry request, will swap to old index. */
     nb->notebook.currentIndex = index;
 
-    NotebookPlaceSlave(nb, index);
+    NotebookPlaceContent(nb, index);
     TtkRedisplayWidget(&nb->core);
 
     TtkSendVirtualEvent(nb->core.tkwin, "NotebookTabChanged");
@@ -645,13 +645,13 @@ static void SelectTab(Notebook *nb, int index)
  */
 static int NextTab(Notebook *nb, int index)
 {
-    int nTabs = Ttk_NumberSlaves(nb->notebook.mgr);
+    int nTabs = Ttk_NumberContent(nb->notebook.mgr);
     int nextIndex;
 
     /* Scan forward for following usable tab:
      */
     for (nextIndex = index + 1; nextIndex < nTabs; ++nextIndex) {
-	Tab *tab = Ttk_SlaveData(nb->notebook.mgr, nextIndex);
+	Tab *tab = Ttk_ContentData(nb->notebook.mgr, nextIndex);
 	if (tab->state == TAB_STATE_NORMAL) {
 	    return nextIndex;
 	}
@@ -660,7 +660,7 @@ static int NextTab(Notebook *nb, int index)
     /* Not found -- scan backwards.
      */
     for (nextIndex = index - 1; nextIndex >= 0; --nextIndex) {
-	Tab *tab = Ttk_SlaveData(nb->notebook.mgr, nextIndex);
+	Tab *tab = Ttk_ContentData(nb->notebook.mgr, nextIndex);
 	if (tab->state == TAB_STATE_NORMAL) {
 	    return nextIndex;
 	}
@@ -684,7 +684,7 @@ static void SelectNearestTab(Notebook *nb)
     int nextIndex = NextTab(nb, currentIndex);
 
     if (currentIndex >= 0) {
-	Ttk_UnmapSlave(nb->notebook.mgr, currentIndex);
+	Ttk_UnmapContent(nb->notebook.mgr, currentIndex);
     }
     if (currentIndex != nextIndex) {
 	TtkSendVirtualEvent(nb->core.tkwin, "NotebookTabChanged");
@@ -695,14 +695,14 @@ static void SelectNearestTab(Notebook *nb)
     TtkRedisplayWidget(&nb->core);
 }
 
-/* TabRemoved -- GM SlaveRemoved hook.
+/* TabRemoved -- GM TabRemoved hook.
  * 	Select the next tab if the current one is being removed.
  * 	Adjust currentIndex to account for removed slave.
  */
 static void TabRemoved(void *managerData, int index)
 {
     Notebook *nb = managerData;
-    Tab *tab = Ttk_SlaveData(nb->notebook.mgr, index);
+    Tab *tab = Ttk_ContentData(nb->notebook.mgr, index);
 
     if (index == nb->notebook.currentIndex) {
 	SelectNearestTab(nb);
@@ -735,7 +735,7 @@ static int AddTab(
 	return TCL_ERROR;
     }
 #if 0 /* can't happen */
-    if (Ttk_SlaveIndex(nb->notebook.mgr, slaveWindow) >= 0) {
+    if (Ttk_ContentIndex(nb->notebook.mgr, slaveWindow) >= 0) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf("%s already added",
 	    Tk_PathName(slaveWindow)));
 	Tcl_SetErrorCode(interp, "TTK", "NOTEBOOK", "PRESENT", NULL);
@@ -754,7 +754,7 @@ static int AddTab(
 	return TCL_ERROR;
     }
 
-    Ttk_InsertSlave(nb->notebook.mgr, destIndex, slaveWindow, tab);
+    Ttk_InsertContent(nb->notebook.mgr, destIndex, slaveWindow, tab);
 
     /* Adjust indices and/or autoselect first tab:
      */
@@ -768,9 +768,9 @@ static int AddTab(
 }
 
 static Ttk_ManagerSpec NotebookManagerSpec = {
-    { "notebook", Ttk_GeometryRequestProc, Ttk_LostSlaveProc },
+    { "notebook", Ttk_GeometryRequestProc, Ttk_LostContentProc },
     NotebookSize,
-    NotebookPlaceSlaves,
+    NotebookPlaceContents,
     TabRequest,
     TabRemoved
 };
@@ -844,15 +844,15 @@ static int FindTabIndex(
 	return TCL_OK;
     }
 
-    /* ... or integer index or slave window name:
+    /* ... or integer index or content window name:
      */
-    if (Ttk_GetSlaveIndexFromObj(
+    if (Ttk_GetContentIndexFromObj(
 	    interp, nb->notebook.mgr, objPtr, index_rtn) == TCL_OK)
     {
 	return TCL_OK;
     }
 
-    /* Nothing matched; Ttk_GetSlaveIndexFromObj will have left error message.
+    /* Nothing matched; Ttk_GetContentIndexFromObj will have left error message.
      */
     return TCL_ERROR;
 }
@@ -886,9 +886,8 @@ static int NotebookAddCommand(
     void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
     Notebook *nb = recordPtr;
-    int index = Ttk_NumberSlaves(nb->notebook.mgr);
     Tk_Window slaveWindow;
-    int slaveIndex;
+    int index;
     Tab *tab;
 
     if (objc <= 2 || objc % 2 != 1) {
@@ -900,13 +899,13 @@ static int NotebookAddCommand(
     if (!slaveWindow) {
 	return TCL_ERROR;
     }
-    slaveIndex = Ttk_SlaveIndex(nb->notebook.mgr, slaveWindow);
+    index = Ttk_ContentIndex(nb->notebook.mgr, slaveWindow);
 
-    if (slaveIndex < 0) { /* New tab */
-	return AddTab(interp, nb, index, slaveWindow, objc-3,objv+3);
+    if (index < 0) { /* New tab */
+	return AddTab(interp, nb, Ttk_NumberContent(nb->notebook.mgr), slaveWindow, objc-3,objv+3);
     }
 
-    tab = Ttk_SlaveData(nb->notebook.mgr, slaveIndex);
+    tab = Ttk_ContentData(nb->notebook.mgr, index);
     if (tab->state == TAB_STATE_HIDDEN) {
 	tab->state = TAB_STATE_NORMAL;
     }
@@ -927,7 +926,7 @@ static int NotebookInsertCommand(
 {
     Notebook *nb = recordPtr;
     int current = nb->notebook.currentIndex;
-    int nSlaves = Ttk_NumberSlaves(nb->notebook.mgr);
+    int nContent = Ttk_NumberContent(nb->notebook.mgr);
     int srcIndex, destIndex;
 
     if (objc < 4) {
@@ -936,8 +935,8 @@ static int NotebookInsertCommand(
     }
 
     if (!strcmp(Tcl_GetString(objv[2]), "end")) {
-	destIndex = Ttk_NumberSlaves(nb->notebook.mgr);
-    } else if (TCL_OK != Ttk_GetSlaveIndexFromObj(
+	destIndex = Ttk_NumberContent(nb->notebook.mgr);
+    } else if (TCL_OK != Ttk_GetContentIndexFromObj(
 		interp, nb->notebook.mgr, objv[2], &destIndex)) {
 	return TCL_ERROR;
     }
@@ -952,11 +951,11 @@ static int NotebookInsertCommand(
 	    return TCL_ERROR;
 	}
 
-	srcIndex = Ttk_SlaveIndex(nb->notebook.mgr, slaveWindow);
+	srcIndex = Ttk_ContentIndex(nb->notebook.mgr, slaveWindow);
 	if (srcIndex < 0) {	/* New slave */
 	    return AddTab(interp, nb, destIndex, slaveWindow, objc-4,objv+4);
 	}
-    } else if (Ttk_GetSlaveIndexFromObj(
+    } else if (Ttk_GetContentIndexFromObj(
 		interp, nb->notebook.mgr, objv[3], &srcIndex) != TCL_OK)
     {
 	return TCL_ERROR;
@@ -965,17 +964,17 @@ static int NotebookInsertCommand(
     /* Move existing slave:
      */
     if (ConfigureTab(interp, nb,
-	     Ttk_SlaveData(nb->notebook.mgr,srcIndex),
-	     Ttk_SlaveWindow(nb->notebook.mgr,srcIndex),
+	     Ttk_ContentData(nb->notebook.mgr,srcIndex),
+		 Ttk_ContentWindow(nb->notebook.mgr,srcIndex),
 	     objc-4,objv+4) != TCL_OK)
     {
 	return TCL_ERROR;
     }
 
-    if (destIndex >= nSlaves) {
-	destIndex  = nSlaves - 1;
+    if (destIndex >= nContent) {
+	destIndex  = nContent - 1;
     }
-    Ttk_ReorderSlave(nb->notebook.mgr, srcIndex, destIndex);
+    Ttk_ReorderContent(nb->notebook.mgr, srcIndex, destIndex);
 
     /* Adjust internal indexes:
      */
@@ -1011,7 +1010,7 @@ static int NotebookForgetCommand(
 	return TCL_ERROR;
     }
 
-    Ttk_ForgetSlave(nb->notebook.mgr, index);
+    Ttk_ForgetContent(nb->notebook.mgr, index);
     TtkRedisplayWidget(&nb->core);
 
     return TCL_OK;
@@ -1036,7 +1035,7 @@ static int NotebookHideCommand(
 	return TCL_ERROR;
     }
 
-    tab = Ttk_SlaveData(nb->notebook.mgr, index);
+    tab = Ttk_ContentData(nb->notebook.mgr, index);
     tab->state = TAB_STATE_HIDDEN;
     if (index == nb->notebook.currentIndex) {
 	SelectNearestTab(nb);
@@ -1075,7 +1074,7 @@ static int NotebookIdentifyCommand(
 
     tabIndex = IdentifyTab(nb, x, y);
     if (tabIndex >= 0) {
-	Tab *tab = Ttk_SlaveData(nb->notebook.mgr, tabIndex);
+	Tab *tab = Ttk_ContentData(nb->notebook.mgr, tabIndex);
 	Ttk_State state = TabState(nb, tabIndex);
 	Ttk_Layout tabLayout = nb->notebook.tabLayout;
 
@@ -1122,8 +1121,8 @@ static int NotebookIndexCommand(
      * Special-case for "end":
      */
     if (!strcmp("end", Tcl_GetString(objv[2]))) {
-	int nSlaves = Ttk_NumberSlaves(nb->notebook.mgr);
-	Tcl_SetObjResult(interp, Tcl_NewIntObj(nSlaves));
+	int nContent = Ttk_NumberContent(nb->notebook.mgr);
+	Tcl_SetObjResult(interp, Tcl_NewIntObj(nContent));
 	return TCL_OK;
     }
 
@@ -1146,7 +1145,7 @@ static int NotebookSelectCommand(
 
     if (objc == 2) {
 	if (nb->notebook.currentIndex >= 0) {
-	    Tk_Window pane = Ttk_SlaveWindow(
+	    Tk_Window pane = Ttk_ContentWindow(
 		nb->notebook.mgr, nb->notebook.currentIndex);
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(Tk_PathName(pane), -1));
 	}
@@ -1179,8 +1178,8 @@ static int NotebookTabsCommand(
     }
 
     result = Tcl_NewListObj(0, NULL);
-    for (i = 0; i < Ttk_NumberSlaves(mgr); ++i) {
-	const char *pathName = Tk_PathName(Ttk_SlaveWindow(mgr,i));
+    for (i = 0; i < Ttk_NumberContent(mgr); ++i) {
+	const char *pathName = Tk_PathName(Ttk_ContentWindow(mgr,i));
 
 	Tcl_ListObjAppendElement(NULL, result, Tcl_NewStringObj(pathName,-1));
     }
@@ -1208,8 +1207,8 @@ static int NotebookTabCommand(
 	return TCL_ERROR;
     }
 
-    tab = Ttk_SlaveData(mgr, index);
-    slaveWindow = Ttk_SlaveWindow(mgr, index);
+    tab = Ttk_ContentData(mgr, index);
+    slaveWindow = Ttk_ContentWindow(mgr, index);
 
     if (objc == 3) {
 	return TtkEnumerateOptions(interp, tab,
@@ -1339,7 +1338,7 @@ static Ttk_Layout NotebookGetLayout(
 static void DisplayTab(Notebook *nb, int index, Drawable d)
 {
     Ttk_Layout tabLayout = nb->notebook.tabLayout;
-    Tab *tab = Ttk_SlaveData(nb->notebook.mgr, index);
+    Tab *tab = Ttk_ContentData(nb->notebook.mgr, index);
     Ttk_State state = TabState(nb, index);
 
     if (tab->state != TAB_STATE_HIDDEN) {
@@ -1352,7 +1351,7 @@ static void DisplayTab(Notebook *nb, int index, Drawable d)
 static void NotebookDisplay(void *clientData, Drawable d)
 {
     Notebook *nb = clientData;
-    int nSlaves = Ttk_NumberSlaves(nb->notebook.mgr);
+    int nContent = Ttk_NumberContent(nb->notebook.mgr);
     int index;
 
     /* Draw notebook background (base layout):
@@ -1362,7 +1361,7 @@ static void NotebookDisplay(void *clientData, Drawable d)
     /* Draw tabs from left to right, but draw the current tab last
      * so it will overwrite its neighbors.
      */
-    for (index = 0; index < nSlaves; ++index) {
+    for (index = 0; index < nContent; ++index) {
 	if (index != nb->notebook.currentIndex) {
 	    DisplayTab(nb, index, d);
 	}
diff --git a/generic/ttk/ttkPanedwindow.c b/generic/ttk/ttkPanedwindow.c
index 704e90c..85f0b26 100644
--- a/generic/ttk/ttkPanedwindow.c
+++ b/generic/ttk/ttkPanedwindow.c
@@ -7,7 +7,7 @@
  */
 
 #include <string.h>
-#include <tk.h>
+#include "tkInt.h"
 #include "ttkManager.h"
 #include "ttkTheme.h"
 #include "ttkWidget.h"
@@ -78,7 +78,7 @@ typedef struct {
 static Tk_OptionSpec PanedOptionSpecs[] = {
     {TK_OPTION_STRING_TABLE, "-orient", "orient", "Orient", "vertical",
 	Tk_Offset(Paned,paned.orientObj), Tk_Offset(Paned,paned.orient),
-	0,(ClientData)ttkOrientStrings,READONLY_OPTION|STYLE_CHANGED },
+	0,(void *)ttkOrientStrings,READONLY_OPTION|STYLE_CHANGED },
     {TK_OPTION_INT, "-width", "width", "Width", "0",
 	-1,Tk_Offset(Paned,paned.width),
 	0,0,GEOMETRY_CHANGED },
@@ -91,7 +91,7 @@ static Tk_OptionSpec PanedOptionSpecs[] = {
 };
 
 /*------------------------------------------------------------------------
- * +++ Slave pane record.
+ * +++ Pane record.
  */
 typedef struct {
     int 	reqSize;		/* Pane request size */
@@ -189,14 +189,14 @@ error:
 
 static int ShoveUp(Paned *pw, int i, int pos)
 {
-    Pane *pane = Ttk_SlaveData(pw->paned.mgr, i);
+    Pane *pane = Ttk_ContentData(pw->paned.mgr, i);
     int sashThickness = pw->paned.sashThickness;
 
     if (i == 0) {
 	if (pos < 0)
 	    pos = 0;
     } else {
-	Pane *prevPane = Ttk_SlaveData(pw->paned.mgr, i-1);
+	Pane *prevPane = Ttk_ContentData(pw->paned.mgr, i-1);
 	if (pos < prevPane->sashPos + sashThickness)
 	    pos = ShoveUp(pw, i-1, pos - sashThickness) + sashThickness;
     }
@@ -209,13 +209,13 @@ static int ShoveUp(Paned *pw, int i, int pos)
  */
 static int ShoveDown(Paned *pw, int i, int pos)
 {
-    Pane *pane = Ttk_SlaveData(pw->paned.mgr,i);
+    Pane *pane = Ttk_ContentData(pw->paned.mgr,i);
     int sashThickness = pw->paned.sashThickness;
 
-    if (i == Ttk_NumberSlaves(pw->paned.mgr) - 1) {
+    if (i == Ttk_NumberContent(pw->paned.mgr) - 1) {
 	pos = pane->sashPos; /* Sentinel value == container window size */
     } else {
-	Pane *nextPane = Ttk_SlaveData(pw->paned.mgr,i+1);
+	Pane *nextPane = Ttk_ContentData(pw->paned.mgr,i+1);
 	if (pos + sashThickness > nextPane->sashPos)
 	    pos = ShoveDown(pw, i+1, pos + sashThickness) - sashThickness;
     }
@@ -231,7 +231,7 @@ static int ShoveDown(Paned *pw, int i, int pos)
 static int PanedSize(void *recordPtr, int *widthPtr, int *heightPtr)
 {
     Paned *pw = recordPtr;
-    int nPanes = Ttk_NumberSlaves(pw->paned.mgr);
+    int nPanes = Ttk_NumberContent(pw->paned.mgr);
     int nSashes = nPanes - 1;
     int sashThickness = pw->paned.sashThickness;
     int width = 0, height = 0;
@@ -239,8 +239,8 @@ static int PanedSize(void *recordPtr, int *widthPtr, int *heightPtr)
 
     if (pw->paned.orient == TTK_ORIENT_HORIZONTAL) {
 	for (index = 0; index < nPanes; ++index) {
-	    Pane *pane = Ttk_SlaveData(pw->paned.mgr, index);
-	    Tk_Window slaveWindow = Ttk_SlaveWindow(pw->paned.mgr, index);
+	    Pane *pane = Ttk_ContentData(pw->paned.mgr, index);
+	    Tk_Window slaveWindow = Ttk_ContentWindow(pw->paned.mgr, index);
 
 	    if (height < Tk_ReqHeight(slaveWindow))
 		height = Tk_ReqHeight(slaveWindow);
@@ -249,8 +249,8 @@ static int PanedSize(void *recordPtr, int *widthPtr, int *heightPtr)
 	width += nSashes * sashThickness;
     } else {
 	for (index = 0; index < nPanes; ++index) {
-	    Pane *pane = Ttk_SlaveData(pw->paned.mgr, index);
-	    Tk_Window slaveWindow = Ttk_SlaveWindow(pw->paned.mgr, index);
+	    Pane *pane = Ttk_ContentData(pw->paned.mgr, index);
+	    Tk_Window slaveWindow = Ttk_ContentWindow(pw->paned.mgr, index);
 
 	    if (width < Tk_ReqWidth(slaveWindow))
 		width = Tk_ReqWidth(slaveWindow);
@@ -278,8 +278,8 @@ static void AdjustPanes(Paned *pw)
     int pos = 0;
     int index;
 
-    for (index = 0; index < Ttk_NumberSlaves(pw->paned.mgr); ++index) {
-	Pane *pane = Ttk_SlaveData(pw->paned.mgr, index);
+    for (index = 0; index < Ttk_NumberContent(pw->paned.mgr); ++index) {
+	Pane *pane = Ttk_ContentData(pw->paned.mgr, index);
 	int size = pane->sashPos - pos;
 	pane->reqSize = size >= 0 ? size : 0;
 	pos = pane->sashPos + sashThickness;
@@ -305,7 +305,7 @@ static void AdjustPanes(Paned *pw)
 static void PlaceSashes(Paned *pw, int width, int height)
 {
     Ttk_Manager *mgr = pw->paned.mgr;
-    int nPanes = Ttk_NumberSlaves(mgr);
+    int nPanes = Ttk_NumberContent(mgr);
     int sashThickness = pw->paned.sashThickness;
     int available = pw->paned.orient == TTK_ORIENT_HORIZONTAL ? width : height;
     int reqSize = 0, totalWeight = 0;
@@ -317,7 +317,7 @@ static void PlaceSashes(Paned *pw, int width, int height)
     /* Compute total required size and total available weight:
      */
     for (i = 0; i < nPanes; ++i) {
-	Pane *pane = Ttk_SlaveData(mgr, i);
+	Pane *pane = Ttk_ContentData(mgr, i);
 	reqSize += pane->reqSize;
 	totalWeight += pane->weight * (pane->reqSize != 0);
     }
@@ -341,7 +341,7 @@ static void PlaceSashes(Paned *pw, int width, int height)
      */
     pos = 0;
     for (i = 0; i < nPanes; ++i) {
-	Pane *pane = Ttk_SlaveData(mgr, i);
+	Pane *pane = Ttk_ContentData(mgr, i);
 	int weight = pane->weight * (pane->reqSize != 0);
 	int size = pane->reqSize + delta * weight;
 
@@ -375,18 +375,18 @@ static void PlacePanes(Paned *pw)
     int pos = 0;
     int index;
 
-    for (index = 0; index < Ttk_NumberSlaves(pw->paned.mgr); ++index) {
-	Pane *pane = Ttk_SlaveData(pw->paned.mgr, index);
+    for (index = 0; index < Ttk_NumberContent(pw->paned.mgr); ++index) {
+	Pane *pane = Ttk_ContentData(pw->paned.mgr, index);
 	int size = pane->sashPos - pos;
 
 	if (size > 0) {
 	    if (horizontal) {
-		Ttk_PlaceSlave(pw->paned.mgr, index, pos, 0, size, height);
+		Ttk_PlaceContent(pw->paned.mgr, index, pos, 0, size, height);
 	    } else {
-		Ttk_PlaceSlave(pw->paned.mgr, index, 0, pos, width, size);
+		Ttk_PlaceContent(pw->paned.mgr, index, 0, pos, width, size);
 	    }
 	} else {
-	    Ttk_UnmapSlave(pw->paned.mgr, index);
+	    Ttk_UnmapContent(pw->paned.mgr, index);
 	}
 
 	pos = pane->sashPos + sashThickness;
@@ -397,7 +397,7 @@ static void PlacePanes(Paned *pw)
  * +++ Manager specification.
  */
 
-static void PanedPlaceSlaves(void *managerData)
+static void PanedPlaceContent(void *managerData)
 {
     Paned *pw = managerData;
     PlaceSashes(pw, Tk_Width(pw->core.tkwin), Tk_Height(pw->core.tkwin));
@@ -407,7 +407,7 @@ static void PanedPlaceSlaves(void *managerData)
 static void PaneRemoved(void *managerData, int index)
 {
     Paned *pw = managerData;
-    Pane *pane = Ttk_SlaveData(pw->paned.mgr, index);
+    Pane *pane = Ttk_ContentData(pw->paned.mgr, index);
     DestroyPane(pw, pane);
 }
 
@@ -420,7 +420,7 @@ static int AddPane(
     if (!Ttk_Maintainable(interp, slaveWindow, pw->core.tkwin)) {
 	return TCL_ERROR;
     }
-    if (Ttk_SlaveIndex(pw->paned.mgr, slaveWindow) >= 0) {
+    if (Ttk_ContentIndex(pw->paned.mgr, slaveWindow) >= 0) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"%s already added", Tk_PathName(slaveWindow)));
 	Tcl_SetErrorCode(interp, "TTK", "PANE", "PRESENT", NULL);
@@ -436,7 +436,7 @@ static int AddPane(
 	return TCL_ERROR;
     }
 
-    Ttk_InsertSlave(pw->paned.mgr, destIndex, slaveWindow, pane);
+    Ttk_InsertContent(pw->paned.mgr, destIndex, slaveWindow, pane);
     return TCL_OK;
 }
 
@@ -449,8 +449,8 @@ static int AddPane(
 static int PaneRequest(void *managerData, int index, int width, int height)
 {
     Paned *pw = managerData;
-    Pane *pane = Ttk_SlaveData(pw->paned.mgr, index);
-    Tk_Window slaveWindow = Ttk_SlaveWindow(pw->paned.mgr, index);
+    Pane *pane = Ttk_ContentData(pw->paned.mgr, index);
+    Tk_Window slaveWindow = Ttk_ContentWindow(pw->paned.mgr, index);
     int horizontal = pw->paned.orient == TTK_ORIENT_HORIZONTAL;
 
     if (!Tk_IsMapped(slaveWindow)) {
@@ -460,9 +460,9 @@ static int PaneRequest(void *managerData, int index, int width, int height)
 }
 
 static Ttk_ManagerSpec PanedManagerSpec = {
-    { "panedwindow", Ttk_GeometryRequestProc, Ttk_LostSlaveProc },
+    { "panedwindow", Ttk_GeometryRequestProc, Ttk_LostContentProc },
     PanedSize,
-    PanedPlaceSlaves,
+    PanedPlaceContent,
     PaneRequest,
     PaneRemoved
 };
@@ -581,7 +581,7 @@ static Ttk_Layout PanedGetLayout(
  */
 static Ttk_Layout SashLayout(Paned *pw, int index)
 {
-    Pane *pane = Ttk_SlaveData(pw->paned.mgr, index);
+    Pane *pane = Ttk_ContentData(pw->paned.mgr, index);
     int thickness = pw->paned.sashThickness,
 	height = Tk_Height(pw->core.tkwin),
 	width = Tk_Width(pw->core.tkwin),
@@ -604,7 +604,7 @@ static void DrawSash(Paned *pw, int index, Drawable d)
 static void PanedDisplay(void *recordPtr, Drawable d)
 {
     Paned *pw = recordPtr;
-    int i, nSashes = Ttk_NumberSlaves(pw->paned.mgr) - 1;
+    int i, nSashes = Ttk_NumberContent(pw->paned.mgr) - 1;
 
     TtkWidgetDisplay(recordPtr, d);
     for (i = 0; i < nSashes; ++i) {
@@ -636,7 +636,7 @@ static int PanedAddCommand(
 	return TCL_ERROR;
     }
 
-    return AddPane(interp, pw, Ttk_NumberSlaves(pw->paned.mgr), slaveWindow,
+    return AddPane(interp, pw, Ttk_NumberContent(pw->paned.mgr), slaveWindow,
 	    objc - 3, objv + 3);
 }
 
@@ -647,7 +647,7 @@ static int PanedInsertCommand(
     void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
     Paned *pw = recordPtr;
-    int nSlaves = Ttk_NumberSlaves(pw->paned.mgr);
+    int nContent = Ttk_NumberContent(pw->paned.mgr);
     int srcIndex, destIndex;
     Tk_Window slaveWindow;
 
@@ -663,26 +663,26 @@ static int PanedInsertCommand(
     }
 
     if (!strcmp(Tcl_GetString(objv[2]), "end")) {
-	destIndex = Ttk_NumberSlaves(pw->paned.mgr);
-    } else if (TCL_OK != Ttk_GetSlaveIndexFromObj(
+	destIndex = Ttk_NumberContent(pw->paned.mgr);
+    } else if (TCL_OK != Ttk_GetContentIndexFromObj(
 		interp,pw->paned.mgr,objv[2],&destIndex))
     {
 	return TCL_ERROR;
     }
 
-    srcIndex = Ttk_SlaveIndex(pw->paned.mgr, slaveWindow);
+    srcIndex = Ttk_ContentIndex(pw->paned.mgr, slaveWindow);
     if (srcIndex < 0) { /* New slave: */
 	return AddPane(interp, pw, destIndex, slaveWindow, objc-4, objv+4);
     } /* else -- move existing slave: */
 
-    if (destIndex >= nSlaves)
-	destIndex  = nSlaves - 1;
-    Ttk_ReorderSlave(pw->paned.mgr, srcIndex, destIndex);
+    if (destIndex >= nContent)
+	destIndex  = nContent - 1;
+    Ttk_ReorderContent(pw->paned.mgr, srcIndex, destIndex);
 
     return objc == 4 ? TCL_OK :
 	ConfigurePane(interp, pw,
-		Ttk_SlaveData(pw->paned.mgr, destIndex),
-		Ttk_SlaveWindow(pw->paned.mgr, destIndex),
+		Ttk_ContentData(pw->paned.mgr, destIndex),
+		Ttk_ContentWindow(pw->paned.mgr, destIndex),
 		objc-4,objv+4);
 }
 
@@ -699,12 +699,12 @@ static int PanedForgetCommand(
 	return TCL_ERROR;
     }
 
-    if (TCL_OK != Ttk_GetSlaveIndexFromObj(
+    if (TCL_OK != Ttk_GetContentIndexFromObj(
 		    interp, pw->paned.mgr, objv[2], &paneIndex))
     {
 	return TCL_ERROR;
     }
-    Ttk_ForgetSlave(pw->paned.mgr, paneIndex);
+    Ttk_ForgetContent(pw->paned.mgr, paneIndex);
 
     return TCL_OK;
 }
@@ -720,7 +720,7 @@ static int PanedIdentifyCommand(
     int what = IDENTIFY_SASH;
     Paned *pw = recordPtr;
     int sashThickness = pw->paned.sashThickness;
-    int nSashes = Ttk_NumberSlaves(pw->paned.mgr) - 1;
+    int nSashes = Ttk_NumberContent(pw->paned.mgr) - 1;
     int x, y, pos;
     int index;
 
@@ -739,7 +739,7 @@ static int PanedIdentifyCommand(
 
     pos = pw->paned.orient == TTK_ORIENT_HORIZONTAL ? x : y;
     for (index = 0; index < nSashes; ++index) {
-	Pane *pane = Ttk_SlaveData(pw->paned.mgr, index);
+	Pane *pane = Ttk_ContentData(pw->paned.mgr, index);
 	if (pane->sashPos <= pos && pos <= pane->sashPos + sashThickness) {
 	    /* Found it. */
 	    switch (what) {
@@ -779,14 +779,14 @@ static int PanedPaneCommand(
 	return TCL_ERROR;
     }
 
-    if (TCL_OK != Ttk_GetSlaveIndexFromObj(
+    if (TCL_OK != Ttk_GetContentIndexFromObj(
 		    interp,pw->paned.mgr,objv[2],&paneIndex))
     {
 	return TCL_ERROR;
     }
 
-    pane = Ttk_SlaveData(pw->paned.mgr, paneIndex);
-    slaveWindow = Ttk_SlaveWindow(pw->paned.mgr, paneIndex);
+    pane = Ttk_ContentData(pw->paned.mgr, paneIndex);
+    slaveWindow = Ttk_ContentWindow(pw->paned.mgr, paneIndex);
 
     switch (objc) {
 	case 3:
@@ -817,8 +817,8 @@ static int PanedPanesCommand(
     }
 
     panes = Tcl_NewListObj(0, NULL);
-    for (i = 0; i < Ttk_NumberSlaves(mgr); ++i) {
-	const char *pathName = Tk_PathName(Ttk_SlaveWindow(mgr,i));
+    for (i = 0; i < Ttk_NumberContent(mgr); ++i) {
+	const char *pathName = Tk_PathName(Ttk_ContentWindow(mgr,i));
 	Tcl_ListObjAppendElement(interp, panes, Tcl_NewStringObj(pathName,-1));
     }
     Tcl_SetObjResult(interp, panes);
@@ -844,14 +844,14 @@ static int PanedSashposCommand(
     if (Tcl_GetIntFromObj(interp, objv[2], &sashIndex) != TCL_OK) {
 	return TCL_ERROR;
     }
-    if (sashIndex < 0 || sashIndex >= Ttk_NumberSlaves(pw->paned.mgr) - 1) {
+    if (sashIndex < 0 || sashIndex >= Ttk_NumberContent(pw->paned.mgr) - 1) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 	    "sash index %d out of range", sashIndex));
 	Tcl_SetErrorCode(interp, "TTK", "PANE", "SASH_INDEX", NULL);
 	return TCL_ERROR;
     }
 
-    pane = Ttk_SlaveData(pw->paned.mgr, sashIndex);
+    pane = Ttk_ContentData(pw->paned.mgr, sashIndex);
 
     if (objc == 3) {
 	Tcl_SetObjResult(interp, Tcl_NewIntObj(pane->sashPos));
diff --git a/generic/ttk/ttkProgress.c b/generic/ttk/ttkProgress.c
index eb776ba..ae945ae 100644
--- a/generic/ttk/ttkProgress.c
+++ b/generic/ttk/ttkProgress.c
@@ -5,8 +5,7 @@
  */
 
 #include <math.h>
-#include <tk.h>
-
+#include "tkInt.h"
 #include "ttkTheme.h"
 #include "ttkWidget.h"
 
@@ -48,14 +47,14 @@ static Tk_OptionSpec ProgressbarOptionSpecs[] =
 {
     {TK_OPTION_STRING_TABLE, "-orient", "orient", "Orient",
 	"horizontal", Tk_Offset(Progressbar,progress.orientObj), -1,
-	0, (ClientData)ttkOrientStrings, STYLE_CHANGED },
+	0, (void *)ttkOrientStrings, STYLE_CHANGED },
     {TK_OPTION_PIXELS, "-length", "length", "Length",
         DEF_PROGRESSBAR_LENGTH, Tk_Offset(Progressbar,progress.lengthObj), -1,
 	0, 0, GEOMETRY_CHANGED },
     {TK_OPTION_STRING_TABLE, "-mode", "mode", "ProgressMode", "determinate",
 	Tk_Offset(Progressbar,progress.modeObj),
 	Tk_Offset(Progressbar,progress.mode),
-	0, (ClientData)ProgressbarModeStrings, 0 },
+	0, (void *)ProgressbarModeStrings, 0 },
     {TK_OPTION_DOUBLE, "-maximum", "maximum", "Maximum",
 	"100", Tk_Offset(Progressbar,progress.maximumObj), -1,
 	0, 0, 0 },
diff --git a/generic/ttk/ttkScale.c b/generic/ttk/ttkScale.c
index 8348fb5..4d05f97 100644
--- a/generic/ttk/ttkScale.c
+++ b/generic/ttk/ttkScale.c
@@ -4,9 +4,9 @@
  * ttk::scale widget.
  */
 
-#include <tk.h>
 #include <string.h>
 #include <stdio.h>
+#include "tkInt.h"
 #include "ttkTheme.h"
 #include "ttkWidget.h"
 
@@ -63,7 +63,7 @@ static Tk_OptionSpec ScaleOptionSpecs[] =
     {TK_OPTION_STRING_TABLE, "-orient", "orient", "Orient", "horizontal",
 	Tk_Offset(Scale,scale.orientObj),
 	Tk_Offset(Scale,scale.orient), 0,
-	(ClientData)ttkOrientStrings, STYLE_CHANGED },
+	(void *)ttkOrientStrings, STYLE_CHANGED },
 
     {TK_OPTION_DOUBLE, "-from", "from", "From", "0",
 	Tk_Offset(Scale,scale.fromObj), -1, 0, 0, 0},
diff --git a/generic/ttk/ttkScrollbar.c b/generic/ttk/ttkScrollbar.c
index 2c8d195..5ffd671 100644
--- a/generic/ttk/ttkScrollbar.c
+++ b/generic/ttk/ttkScrollbar.c
@@ -4,8 +4,7 @@
  * ttk::scrollbar widget.
  */
 
-#include <tk.h>
-
+#include "tkInt.h"
 #include "ttkTheme.h"
 #include "ttkWidget.h"
 
@@ -40,7 +39,7 @@ static Tk_OptionSpec ScrollbarOptionSpecs[] =
     {TK_OPTION_STRING_TABLE, "-orient", "orient", "Orient", "vertical",
 	Tk_Offset(Scrollbar,scrollbar.orientObj),
 	Tk_Offset(Scrollbar,scrollbar.orient),
-	0,(ClientData)ttkOrientStrings,STYLE_CHANGED },
+	0, (void *)ttkOrientStrings, STYLE_CHANGED },
 
     WIDGET_TAKEFOCUS_FALSE,
     WIDGET_INHERIT_OPTIONS(ttkCoreOptionSpecs)
diff --git a/generic/ttk/ttkSeparator.c b/generic/ttk/ttkSeparator.c
index b52e6f4..a0ae596 100644
--- a/generic/ttk/ttkSeparator.c
+++ b/generic/ttk/ttkSeparator.c
@@ -4,8 +4,7 @@
  * ttk::separator and ttk::sizegrip widgets.
  */
 
-#include <tk.h>
-
+#include "tkInt.h"
 #include "ttkTheme.h"
 #include "ttkWidget.h"
 
@@ -27,7 +26,7 @@ static Tk_OptionSpec SeparatorOptionSpecs[] = {
     {TK_OPTION_STRING_TABLE, "-orient", "orient", "Orient", "horizontal",
 	Tk_Offset(Separator,separator.orientObj),
 	Tk_Offset(Separator,separator.orient),
-	0,(ClientData)ttkOrientStrings,STYLE_CHANGED },
+	0, (void *)ttkOrientStrings, STYLE_CHANGED },
 
     WIDGET_TAKEFOCUS_FALSE,
     WIDGET_INHERIT_OPTIONS(ttkCoreOptionSpecs)
diff --git a/generic/ttk/ttkSquare.c b/generic/ttk/ttkSquare.c
index b5bf6f9..bd2a8c7 100644
--- a/generic/ttk/ttkSquare.c
+++ b/generic/ttk/ttkSquare.c
@@ -3,7 +3,7 @@
  * Minimal sample ttk widget.
  */
 
-#include <tk.h>
+#include "tkInt.h"
 #include "ttkTheme.h"
 #include "ttkWidget.h"
 
diff --git a/generic/ttk/ttkState.c b/generic/ttk/ttkState.c
index 5b62f3c..d37f7f6 100644
--- a/generic/ttk/ttkState.c
+++ b/generic/ttk/ttkState.c
@@ -6,8 +6,7 @@
  */
 
 #include <string.h>
-
-#include <tk.h>
+#include "tkInt.h"
 #include "ttkTheme.h"
 
 /*
diff --git a/generic/ttk/ttkStubInit.c b/generic/ttk/ttkStubInit.c
index 87b33dc..0039585 100644
--- a/generic/ttk/ttkStubInit.c
+++ b/generic/ttk/ttkStubInit.c
@@ -3,7 +3,7 @@
  * It is compiled and linked in with the ttk package proper.
  */
 
-#include "tk.h"
+#include "tkInt.h"
 #include "ttkTheme.h"
 
 MODULE_SCOPE const TtkStubs ttkStubs;
diff --git a/generic/ttk/ttkStubLib.c b/generic/ttk/ttkStubLib.c
index 5675416..faeabe8 100644
--- a/generic/ttk/ttkStubLib.c
+++ b/generic/ttk/ttkStubLib.c
@@ -6,7 +6,7 @@
 #undef USE_TCL_STUBS
 #define USE_TCL_STUBS
 
-#include "tk.h"
+#include "tkInt.h"
 
 #define USE_TTK_STUBS 1
 #include "ttkTheme.h"
diff --git a/generic/ttk/ttkTagSet.c b/generic/ttk/ttkTagSet.c
index 07aee76..fc026cb 100644
--- a/generic/ttk/ttkTagSet.c
+++ b/generic/ttk/ttkTagSet.c
@@ -5,8 +5,7 @@
  */
 
 #include <string.h>	/* for memset() */
-#include <tcl.h>
-#include <tk.h>
+#include "tkInt.h"
 
 #include "ttkTheme.h"
 #include "ttkWidget.h"
diff --git a/generic/ttk/ttkTheme.c b/generic/ttk/ttkTheme.c
index 7bde80e..8723b94 100644
--- a/generic/ttk/ttkTheme.c
+++ b/generic/ttk/ttkTheme.c
@@ -384,7 +384,7 @@ typedef struct CleanupStruct {
 } Cleanup;
 
 /*------------------------------------------------------------------------
- * +++ Master style package data structure.
+ * +++ Style package data structure.
  */
 typedef struct
 {
@@ -398,7 +398,7 @@ typedef struct
     int themeChangePending;		/* scheduled ThemeChangedProc call? */
 } StylePackageData;
 
-static void ThemeChangedProc(ClientData);	/* Forward */
+static void ThemeChangedProc(void *);	/* Forward */
 
 /* Ttk_StylePkgFree --
  *	Cleanup procedure for StylePackageData.
@@ -1171,7 +1171,7 @@ static Tcl_Obj* HashTableToDict(Tcl_HashTable *ht)
  */
 static int
 StyleMapCmd(
-    ClientData clientData,		/* Master StylePackageData pointer */
+    ClientData clientData,		/* StylePackageData pointer */
     Tcl_Interp *interp,			/* Current interpreter */
     int objc,				/* Number of arguments */
     Tcl_Obj *const objv[])		/* Argument objects */
@@ -1448,7 +1448,7 @@ static int StyleThemeNamesCmd(
  */
 static int
 StyleThemeSettingsCmd(
-    ClientData clientData,		/* Master StylePackageData pointer */
+    ClientData clientData,		/* StylePackageData pointer */
     Tcl_Interp *interp,			/* Current interpreter */
     int objc,				/* Number of arguments */
     Tcl_Obj *const objv[])		/* Argument objects */
@@ -1606,7 +1606,7 @@ static int StyleLayoutCmd(
  */
 static int
 StyleThemeUseCmd(
-    ClientData clientData,		/* Master StylePackageData pointer */
+    ClientData clientData,		/* StylePackageData pointer */
     Tcl_Interp *interp,			/* Current interpreter */
     int objc,				/* Number of arguments */
     Tcl_Obj *const objv[])		/* Argument objects */
@@ -1663,7 +1663,7 @@ static const Ttk_Ensemble StyleEnsemble[] = {
 
 static int
 StyleObjCmd(
-    ClientData clientData,		/* Master StylePackageData pointer */
+    ClientData clientData,		/* StylePackageData pointer */
     Tcl_Interp *interp,			/* Current interpreter */
     int objc,				/* Number of arguments */
     Tcl_Obj *const objv[])		/* Argument objects */
diff --git a/generic/ttk/ttkTrace.c b/generic/ttk/ttkTrace.c
index 919f25a..d086c02 100644
--- a/generic/ttk/ttkTrace.c
+++ b/generic/ttk/ttkTrace.c
@@ -7,7 +7,7 @@
  * from other errors (which are not).
  */
 
-#include <tk.h>
+#include "tkInt.h"
 #include "ttkTheme.h"
 #include "ttkWidget.h"
 
@@ -53,7 +53,7 @@ VarTraceProc(
 	 */
 	if (tracePtr->interp == NULL) {
 	    Tcl_DecrRefCount(tracePtr->varnameObj);
-	    ckfree((ClientData)tracePtr);
+	    ckfree(tracePtr);
 	    return NULL;
 	}
 	Tcl_TraceVar2(interp, name, NULL,
@@ -98,7 +98,7 @@ Ttk_TraceHandle *Ttk_TraceVariable(
 
     status = Tcl_TraceVar2(interp, Tcl_GetString(varnameObj),
 	    NULL, TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-	    VarTraceProc, (ClientData)h);
+	    VarTraceProc, h);
 
     if (status != TCL_OK) {
 	Tcl_DecrRefCount(h->varnameObj);
@@ -139,7 +139,7 @@ void Ttk_UntraceVariable(Ttk_TraceHandle *h)
 	 */
 	while ((cd = Tcl_VarTraceInfo(h->interp, Tcl_GetString(h->varnameObj),
 		TCL_GLOBAL_ONLY, VarTraceProc, cd)) != NULL) {
-	    if (cd == (ClientData) h) {
+	    if (cd == h) {
 		break;
 	    }
 	}
@@ -154,7 +154,7 @@ void Ttk_UntraceVariable(Ttk_TraceHandle *h)
 	}
 	Tcl_UntraceVar2(h->interp, Tcl_GetString(h->varnameObj),
 		NULL, TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
-		VarTraceProc, (ClientData)h);
+		VarTraceProc, h);
 	Tcl_DecrRefCount(h->varnameObj);
 	ckfree(h);
     }
diff --git a/generic/ttk/ttkTrack.c b/generic/ttk/ttkTrack.c
index 396b073..fa2a7e0 100644
--- a/generic/ttk/ttkTrack.c
+++ b/generic/ttk/ttkTrack.c
@@ -23,7 +23,7 @@
  * TODO: Handle "chords" properly (e.g., <B1-ButtonPress-2>)
  */
 
-#include <tk.h>
+#include "tkInt.h"
 #include "ttkTheme.h"
 #include "ttkWidget.h"
 
diff --git a/macosx/tkMacOSX.h b/macosx/tkMacOSX.h
index 05ea6c2..3ab0a34 100644
--- a/macosx/tkMacOSX.h
+++ b/macosx/tkMacOSX.h
@@ -26,7 +26,7 @@
 typedef int (Tk_MacOSXEmbedRegisterWinProc) (long winID, Tk_Window window);
 typedef void* (Tk_MacOSXEmbedGetGrafPortProc) (Tk_Window window);
 typedef int (Tk_MacOSXEmbedMakeContainerExistProc) (Tk_Window window);
-typedef void (Tk_MacOSXEmbedGetClipProc) (Tk_Window window, TkRegion rgn);
+typedef void (Tk_MacOSXEmbedGetClipProc) (Tk_Window window, void *rgn);
 typedef void (Tk_MacOSXEmbedGetOffsetInParentProc) (Tk_Window window, void *ulCorner);
 
 #include "tkPlatDecls.h"
diff --git a/tests/bind.test b/tests/bind.test
index b6e3e53..6868eba 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -6948,7 +6948,7 @@ test bind-35.3 {Events agree for modifier keys} -constraints {aqua} -setup {
 } -cleanup {
 } -result pass
 
-test bind-36.1 {pointer warp with grab on master, bug [e3888d5820]} -setup {
+test bind-36.1 {pointer warp with grab on toplevel, bug [e3888d5820]} -setup {
     pointerAway
     toplevel .top
     grab release .top
diff --git a/tests/focus.test b/tests/focus.test
index 7a7e5ef..3d9d7c3 100644
--- a/tests/focus.test
+++ b/tests/focus.test
@@ -104,7 +104,7 @@ test focus-1.7 {Tk_FocusCmd procedure} -constraints unix -body {
     focus .gorp a
 } -returnCodes error -result {bad option ".gorp": must be -displayof, -force, or -lastfor}
 test focus-1.8 {Tk_FocusCmd procedure, focussing on dead window} -constraints {
-	unix 
+	unix
 } -setup {
     destroy .t2
 } -body {
@@ -130,29 +130,29 @@ test focus-1.8 {Tk_FocusCmd procedure, focussing on dead window} -constraints {
     destroy .t2
 } -result {.t2.f2 .t2 .t2}
 test focus-1.9 {Tk_FocusCmd procedure, -displayof option} -constraints {
-	unix 
+	unix
 } -body {
     focus -displayof
 } -returnCodes error -result {wrong # args: should be "focus -displayof window"}
 test focus-1.10 {Tk_FocusCmd procedure, -displayof option} -constraints {
-	unix 
+	unix
 } -body {
     focus -displayof a b
 } -returnCodes error -result {wrong # args: should be "focus -displayof window"}
 test focus-1.11 {Tk_FocusCmd procedure, -displayof option} -constraints {
-	unix 
+	unix
 } -body {
     focus -displayof .lousy
 } -returnCodes error -result {bad window path name ".lousy"}
 test focus-1.12 {Tk_FocusCmd procedure, -displayof option} -constraints {
-	unix 
+	unix
 } -body {
     focusClear
     focus .t
     focus -displayof .t.b3
 }  -result {}
 test focus-1.13 {Tk_FocusCmd procedure, -displayof option} -constraints {
-	unix 
+	unix
 } -body {
     focusClear
     focus -force .t
@@ -185,22 +185,22 @@ test focus-1.19 {Tk_FocusCmd procedure, -force option} -constraints unix -body {
     lappend x [focus]
 } -result {{} .t.b1}
 test focus-1.20 {Tk_FocusCmd procedure, -lastfor option} -constraints {
-    unix 
+    unix
 } -body {
     focus -lastfor
 } -returnCodes error -result {wrong # args: should be "focus -lastfor window"}
 test focus-1.21 {Tk_FocusCmd procedure, -lastfor option} -constraints {
-    unix 
+    unix
 } -body {
     focus -lastfor 1 2
 } -returnCodes error -result {wrong # args: should be "focus -lastfor window"}
 test focus-1.22 {Tk_FocusCmd procedure, -lastfor option} -constraints {
-    unix 
+    unix
 } -body {
     focus -lastfor who_knows?
 } -returnCodes error -result {bad window path name "who_knows?"}
 test focus-1.23 {Tk_FocusCmd procedure, -lastfor option} -constraints {
-    unix 
+    unix
 } -body {
     focusClear
     focusSetup
@@ -209,7 +209,7 @@ test focus-1.23 {Tk_FocusCmd procedure, -lastfor option} -constraints {
     list [focus -lastfor .] [focus -lastfor .t.b3]
 } -result {.b .t.b1}
 test focus-1.24 {Tk_FocusCmd procedure, -lastfor option} -constraints {
-    unix 
+    unix
 } -body {
     focusClear
     focusSetup
@@ -624,7 +624,7 @@ fixfocus
 test focus-6.1 {miscellaneous - embedded application in same process} -constraints {
     unix  testwrapper
 } -setup {
-    eval interp delete [interp slaves]
+    eval interp delete [interp children]
 } -body {
     toplevel .t
     wm geometry .t +0+0
diff --git a/tests/grid.test b/tests/grid.test
index eef42e1..dd02729 100644
--- a/tests/grid.test
+++ b/tests/grid.test
@@ -145,7 +145,7 @@ test grid-3.1 {configure: basic argument checking} -body {
 test grid-3.2 {configure: basic argument checking} -body {
     button .b
     grid configure .b
-    grid slaves .
+    grid content .
 } -cleanup {
     grid_reset 3.2
 } -result {.b}
@@ -183,7 +183,7 @@ test grid-3.7 {configure: basic argument checking} -body {
 test grid-3.8 {configure: basic argument checking} -body {
     button .b
     grid configure x .b
-    grid slaves .
+    grid content .
 } -cleanup {
     grid_reset 3.8
 } -result {.b}
@@ -193,7 +193,7 @@ test grid-3.9 {configure: basic argument checking} -body {
 } -cleanup {
     grid_reset 3.9
 } -returnCodes error -result {invalid window shortcut, "y" should be '-', 'x', or '^'}
-test grid-3.10 {ConfigureSlave procedure, bad -in option} -body {
+test grid-3.10 {ConfigureContent procedure, bad -in option} -body {
     frame .f
     grid .f -in .f
 } -cleanup {
@@ -224,9 +224,9 @@ test grid-4.1 {forget: basic argument checking} -body {
 test grid-4.2 {forget} -body {
     button .c
     grid [button .b]
-    set a [grid slaves .]
+    set a [grid content .]
     grid forget .b .c
-    lappend a [grid slaves .]
+    lappend a [grid content .]
     return $a
 } -cleanup {
     grid_reset 4.2
@@ -516,43 +516,43 @@ test grid-8.6 {size} -body {
     grid_reset 8.6
 } -result {{51 11} {51 11} {31 11} {21 11} {16 1} {1 1}}
 
-test grid-9.1 {slaves} -body {
-    grid slaves .
+test grid-9.1 {content} -body {
+    grid content .
 } -returnCodes ok -result {}
-test grid-9.2 {slaves} -body {
-    grid slaves .foo
+test grid-9.2 {content} -body {
+    grid content .foo
 } -returnCodes error -result {bad window path name ".foo"}
-test grid-9.3 {slaves} -body {
-    grid slaves a b
-} -returnCodes error -result {wrong # args: should be "grid slaves window ?-option value ...?"}
-test grid-9.4 {slaves} -body {
-    grid slaves . a b
+test grid-9.3 {content} -body {
+    grid content a b
+} -returnCodes error -result {wrong # args: should be "grid content window ?-option value ...?"}
+test grid-9.4 {content} -body {
+    grid content . a b
 } -returnCodes error -result {bad option "a": must be -column or -row}
-test grid-9.5 {slaves} -body {
-    grid slaves . -column x
+test grid-9.5 {content} -body {
+    grid content . -column x
 } -returnCodes error -result {expected integer but got "x"}
-test grid-9.6 {slaves} -body {
-    grid slaves . -row -3
+test grid-9.6 {content} -body {
+    grid content . -row -3
 } -returnCodes error -result {-3 is an invalid value: should NOT be < 0}
-test grid-9.7 {slaves} -body {
-    grid slaves . -foo 3
+test grid-9.7 {content} -body {
+    grid content . -foo 3
 } -returnCodes error -result {bad option "-foo": must be -column or -row}
-test grid-9.8 {slaves} -body {
-    grid slaves .x -row 3
+test grid-9.8 {content} -body {
+    grid content .x -row 3
 } -returnCodes error -result {bad window path name ".x"}
-test grid-9.9 {slaves} -body {
-    grid slaves . -row 3
+test grid-9.9 {content} -body {
+    grid content . -row 3
 } -returnCodes ok -result {}
-test grid-9.10 {slaves} -body {
+test grid-9.10 {content} -body {
     foreach i {0 1 2} {
 	label .$i -text $i
 	grid .$i -row $i -column $i
     }
-    grid slaves .
+    grid content .
 } -cleanup {
     grid_reset 9.10
 } -result {.2 .1 .0}
-test grid-9.11 {slaves} -body {
+test grid-9.11 {content} -body {
     catch {unset a}
     foreach i {0 1 2} {
 	label .$i -text $i
@@ -561,10 +561,10 @@ test grid-9.11 {slaves} -body {
 	grid .$i-x -row $i -column [incr i]
     }
     foreach row {0 1 2 3} {
-	lappend a $row{[grid slaves . -row $row]}
+	lappend a $row{[grid content . -row $row]}
     }
     foreach col {0 1 2 3} {
-	lappend a $col{[grid slaves . -column $col]}
+	lappend a $col{[grid content . -column $col]}
     }
     return $a
 } -cleanup {
@@ -1305,10 +1305,10 @@ test grid-13.20 {reparenting} -body {
     grid .b -in .1
     set a ""
     catch {unset info}; array set info [grid info .b]
-    lappend a [grid slaves .1],[grid slaves .2],$info(-in)
+    lappend a [grid content .1],[grid content .2],$info(-in)
     grid .b -in .2
     catch {unset info}; array set info [grid info .b]
-    lappend a [grid slaves .1],[grid slaves .2],$info(-in)
+    lappend a [grid content .1],[grid content .2],$info(-in)
     unset info
     return $a
 } -cleanup {
@@ -1369,27 +1369,27 @@ test grid-14.3 {map notify: bug 1648} -constraints {nonPortable} -body {
     grid_reset 14.3
 } -result {.2 2 .0 1 . 2 .1 1}
 
-test grid-15.1 {lost slave} -body {
+test grid-15.1 {lost content} -body {
     button .b
     grid .b
-    set a [grid slaves .]
+    set a [grid content .]
     pack .b
-    lappend a [grid slaves .]
+    lappend a [grid content .]
     grid .b
-    lappend a [grid slaves .]
+    lappend a [grid content .]
 } -cleanup {
     grid_reset 15.1
 } -result {.b {} .b}
-test grid-15.2 {lost slave} -body {
+test grid-15.2 {lost content} -body {
     frame .f
     grid .f
     button .b
     grid .b -in .f
-    set a [grid slaves .f]
+    set a [grid content .f]
     pack .b -in .f
-    lappend a [grid slaves .f]
+    lappend a [grid content .f]
     grid .b -in .f
-    lappend a [grid slaves .f]
+    lappend a [grid content .f]
 } -cleanup {
     grid_reset 15.2
 } -result {.b {} .b}
@@ -1975,9 +1975,9 @@ test grid-22.1 {remove: basic argument checking} {
 test grid-22.2 {remove} {
     button .c
     grid [button .b]
-    set a [grid slaves .]
+    set a [grid content .]
     grid remove .b .c
-    lappend a [grid slaves .]
+    lappend a [grid content .]
     return $a
 } {.b {}}
 grid_reset 22.2
@@ -2024,7 +2024,7 @@ test grid-22.5 {remove} {
 } {-in . -column 0 -row 0 -columnspan 2 -rowspan 2 -ipadx 0 -ipady 0 -padx {3 5} -pady {4 7} -sticky ns}
 grid_reset 22.5
 
-test grid-23 {grid configure -in leaked from previous master - bug
+test grid-23 {grid configure -in leaked from previous container window - bug
               6aea69fccbb266b7f0437686379fbe5b55442958} {
     frame .f
     frame .g
diff --git a/tests/imgBmap.test b/tests/imgBmap.test
index e7f2c7e..a2ebdfa 100644
--- a/tests/imgBmap.test
+++ b/tests/imgBmap.test
@@ -137,28 +137,28 @@ test imageBmap-2.2 {ImgBmapCreate procedure} -setup {
 } -result {image1 image1 0 0 #000000 {}}
 
 
-test imageBmap-3.1 {ImgBmapConfigureMaster procedure, memory de-allocation} -body {
+test imageBmap-3.1 {ImgBmapConfigureModel procedure, memory de-allocation} -body {
     image create bitmap i1 -data $data1
     i1 configure -data $data1
 } -cleanup {
 	image delete i1
 } -result {}
-test imageBmap-3.2 {ImgBmapConfigureMaster procedure} -body {
+test imageBmap-3.2 {ImgBmapConfigureModel procedure} -body {
     image create bitmap i1 -data $data1
     list [catch {i1 configure -data bogus} msg] $msg [image width i1] \
 	    [image height i1]
 } -result {1 {format error in bitmap data} 16 16}
-test imageBmap-3.3 {ImgBmapConfigureMaster procedure, memory de-allocation} -body {
+test imageBmap-3.3 {ImgBmapConfigureModel procedure, memory de-allocation} -body {
     image create bitmap i1 -data $data1 -maskdata $data2
     i1 configure -maskdata $data2
 } -cleanup {
 	image delete i1
 } -result {}
-test imageBmap-3.4 {ImgBmapConfigureMaster procedure} -body {
+test imageBmap-3.4 {ImgBmapConfigureModel procedure} -body {
     image create bitmap i1
     i1 configure -maskdata $data2
 } -returnCodes error -result {can't have mask without bitmap}
-test imageBmap-3.5 {ImgBmapConfigureMaster procedure} -body {
+test imageBmap-3.5 {ImgBmapConfigureModel procedure} -body {
     image create bitmap i1 -data $data1 -maskdata {
 	#define foo_width 8
 	#define foo_height 16
@@ -167,7 +167,7 @@ test imageBmap-3.5 {ImgBmapConfigureMaster procedure} -body {
 	   0x81, 0x81, 0xff, 0xff, 0xff, 0xff, 0x81, 0x81};
 	}
 } -returnCodes error -result {bitmap and mask have different sizes}
-test imageBmap-3.6 {ImgBmapConfigureMaster procedure} -body {
+test imageBmap-3.6 {ImgBmapConfigureModel procedure} -body {
     image create bitmap i1 -data $data1 -maskdata {
 	#define foo_width 16
 	#define foo_height 8
@@ -176,7 +176,7 @@ test imageBmap-3.6 {ImgBmapConfigureMaster procedure} -body {
 	   0x81, 0x81, 0xff, 0xff, 0xff, 0xff, 0x81, 0x81};
 	}
 } -returnCodes error -result {bitmap and mask have different sizes}
-test imageBmap-3.7 {ImgBmapConfigureMaster procedure} -setup {
+test imageBmap-3.7 {ImgBmapConfigureModel procedure} -setup {
     destroy .c
     pack [canvas .c]
 } -body {
diff --git a/tests/imgPhoto.test b/tests/imgPhoto.test
index 50f0688..3c4c7a5 100644
--- a/tests/imgPhoto.test
+++ b/tests/imgPhoto.test
@@ -131,7 +131,7 @@ test imgPhoto-2.2 {ImgPhotoCreate procedure} -setup {
 #     set msg
 # } {couldn't open "bogus.img": no such file or directory}
 
-test imgPhoto-3.1 {ImgPhotoConfigureMaster procedure} -constraints {
+test imgPhoto-3.1 {ImgPhotoConfigureModel procedure} -constraints {
     hasTeapotPhoto
 } -body {
     image create photo photo1 -file $teapotPhotoFile
@@ -139,7 +139,7 @@ test imgPhoto-3.1 {ImgPhotoConfigureMaster procedure} -constraints {
 } -cleanup {
     image delete photo1
 } -result {}
-test imgPhoto-3.2 {ImgPhotoConfigureMaster procedure} -constraints {
+test imgPhoto-3.2 {ImgPhotoConfigureModel procedure} -constraints {
     hasTeapotPhoto
 } -body {
     image create photo photo1 -file $teapotPhotoFile
@@ -148,7 +148,7 @@ test imgPhoto-3.2 {ImgPhotoConfigureMaster procedure} -constraints {
 } -cleanup {
     image delete photo1
 } -result {1 {couldn't open "bogus": no such file or directory} 256 256}
-test imgPhoto-3.3 {ImgPhotoConfigureMaster procedure} -constraints {
+test imgPhoto-3.3 {ImgPhotoConfigureModel procedure} -constraints {
     hasTeapotPhoto
 } -setup {
     destroy .c
diff --git a/tests/oldpack.test b/tests/oldpack.test
index 92c411d..94e0710 100644
--- a/tests/oldpack.test
+++ b/tests/oldpack.test
@@ -527,20 +527,20 @@ test oldpack-9.1 {information output} -body {
     pack append .pack .pack.blue {top fillx frame n} \
     .pack.red {bottom filly frame s} .pack.green {left fill frame w} \
     .pack.violet {right expand frame e}
-    list [pack slaves .pack] [pack info .pack.blue] [pack info .pack.red] \
+    list [pack content .pack] [pack info .pack.blue] [pack info .pack.red] \
         [pack info .pack.green] [pack info .pack.violet]
 } -result {{.pack.blue .pack.red .pack.green .pack.violet} {-in .pack -anchor n -expand 0 -fill x -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top} {-in .pack -anchor s -expand 0 -fill y -ipadx 0 -ipady 0 -padx 0 -pady 0 -side bottom} {-in .pack -anchor w -expand 0 -fill both -ipadx 0 -ipady 0 -padx 0 -pady 0 -side left} {-in .pack -anchor e -expand 1 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side right}}
 test oldpack-9.2 {information output} -body {
     pack append .pack .pack.blue {padx 10 frame nw} \
     .pack.red {pady 20 frame ne} .pack.green {frame se} \
     .pack.violet {frame sw}
-    list [pack slaves .pack] [pack info .pack.blue] [pack info .pack.red] \
+    list [pack content .pack] [pack info .pack.blue] [pack info .pack.red] \
         [pack info .pack.green] [pack info .pack.violet]
 } -result {{.pack.blue .pack.red .pack.green .pack.violet} {-in .pack -anchor nw -expand 0 -fill none -ipadx 0 -ipady 0 -padx 5 -pady 0 -side top} {-in .pack -anchor ne -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 10 -side top} {-in .pack -anchor se -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top} {-in .pack -anchor sw -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top}}
 test oldpack-9.3 {information output} -body {
     pack append .pack .pack.blue {frame center} .pack.red {frame center} \
     .pack.green {frame c} .pack.violet {frame c}
-    list [pack slaves .pack] [pack info .pack.blue] [pack info .pack.red] \
+    list [pack content .pack] [pack info .pack.blue] [pack info .pack.red] \
         [pack info .pack.green] [pack info .pack.violet]
 } -result {{.pack.blue .pack.red .pack.green .pack.violet} {-in .pack -anchor center -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top} {-in .pack -anchor center -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top} {-in .pack -anchor center -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top} {-in .pack -anchor center -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top}}
 
diff --git a/tests/pack.test b/tests/pack.test
index 7b75363..4128c46 100644
--- a/tests/pack.test
+++ b/tests/pack.test
@@ -878,28 +878,28 @@ test pack-9.1 {window ordering} -setup {
 } -body {
     pack .pack.a .pack.b .pack.c .pack.d -side top
     pack .pack.a -after .pack.b
-    pack slaves .pack
+    pack content .pack
 } -result {.pack.b .pack.a .pack.c .pack.d}
 test pack-9.2 {window ordering} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a .pack.b .pack.c .pack.d -side top
     pack .pack.a -after .pack.a
-    pack slaves .pack
+    pack content .pack
 } -result {.pack.a .pack.b .pack.c .pack.d}
 test pack-9.3 {window ordering} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a .pack.b .pack.c .pack.d -side top
     pack .pack.a -before .pack.d
-    pack slaves .pack
+    pack content .pack
 } -result {.pack.b .pack.c .pack.a .pack.d}
 test pack-9.4 {window ordering} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a .pack.b .pack.c .pack.d -side top
     pack .pack.d -before .pack.a
-    pack slaves .pack
+    pack content .pack
 } -result {.pack.d .pack.a .pack.b .pack.c}
 test pack-9.5 {window ordering} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
@@ -907,42 +907,42 @@ test pack-9.5 {window ordering} -setup {
     pack .pack.a .pack.b .pack.c .pack.d -side top
     pack propagate .pack.c 0
     pack .pack.a -in .pack.c
-    list [pack slaves .pack] [pack slaves .pack.c]
+    list [pack content .pack] [pack content .pack.c]
 } -result {{.pack.b .pack.c .pack.d} .pack.a}
 test pack-9.6 {window ordering} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a .pack.b .pack.c .pack.d -side top
     pack .pack.a -in .pack
-    pack slaves .pack
+    pack content .pack
 } -result {.pack.b .pack.c .pack.d .pack.a}
 test pack-9.7 {window ordering} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a .pack.b .pack.c .pack.d -side top
     pack .pack.a -padx 0
-    pack slaves .pack
+    pack content .pack
 } -result {.pack.a .pack.b .pack.c .pack.d}
 test pack-9.8 {window ordering} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a .pack.b .pack.c
     pack .pack.d
-    pack slaves .pack
+    pack content .pack
 } -result {.pack.a .pack.b .pack.c .pack.d}
 test pack-9.9 {window ordering} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a .pack.b .pack.c .pack.d
     pack .pack.b .pack.d .pack.c -before .pack.a
-    pack slaves .pack
+    pack content .pack
 } -result {.pack.b .pack.d .pack.c .pack.a}
 test pack-9.10 {window ordering} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a .pack.b .pack.c .pack.d
     pack .pack.a .pack.c .pack.d .pack.b -after .pack.a
-    pack slaves .pack
+    pack content .pack
 } -result {.pack.a .pack.c .pack.d .pack.b}
 
 
@@ -963,14 +963,14 @@ test pack-10.2 {retaining/clearing configuration state} -setup {
     pack .pack.a -pady 14
     pack info .pack.a
 } -result {-in .pack -anchor n -expand 1 -fill both -ipadx 3 -ipady 4 -padx 1 -pady 14 -side bottom}
-test pack-10.3 {bad -in window does not change master} -setup {
+test pack-10.3 {bad -in window does not change container window} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     set result [list [winfo manager .pack.a]]
     catch {pack .pack.a -in .pack.a}
     lappend result [winfo manager .pack.a]
 } -result {{} {}}
-test pack-10.4 {bad -in window does not change master} -setup {
+test pack-10.4 {bad -in window does not change container window} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     winfo manager .pack.a
@@ -1147,7 +1147,7 @@ test pack-12.4 {command options and errors} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack configure .pack.b .pack.c
-    pack slaves .pack
+    pack content .pack
 } -result {.pack.b .pack.c}
 test pack-12.5 {command options and errors} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
@@ -1311,7 +1311,7 @@ test pack-12.36 {command options and errors} -setup {
 } -body {
     pack .pack.a .pack.b .pack.c .pack.d
     pack forget .pack.a .pack.d
-    pack slaves .pack
+    pack content .pack
 } -result {.pack.b .pack.c}
 test pack-12.37 {command options and errors} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
@@ -1352,22 +1352,22 @@ test pack-12.41 {command options and errors} -setup {
 test pack-12.42 {command options and errors} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
-    pack slaves
+    pack content
 } -returnCodes error -result {wrong # args: should be "pack option arg ?arg ...?"}
 test pack-12.43 {command options and errors} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
-    pack slaves a b
-} -returnCodes error -result {wrong # args: should be "pack slaves window"}
+    pack content a b
+} -returnCodes error -result {wrong # args: should be "pack content window"}
 test pack-12.44 {command options and errors} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
-    pack slaves .x
+    pack content .x
 } -returnCodes error -result {bad window path name ".x"}
 test pack-12.45 {command options and errors} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
-    pack slaves .pack.a
+    pack content .pack.a
 } -returnCodes ok -result {}
 test pack-12.46 {command options and errors} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
@@ -1385,7 +1385,7 @@ test pack-13.1 {window deletion} -setup {
     update
     destroy .pack.d
     update
-    set result [list [pack slaves .pack] [winfo geometry .pack.a] \
+    set result [list [pack content .pack] [winfo geometry .pack.a] \
         [winfo geometry .pack.b] [winfo geometry .pack.c]]
 } -result {{.pack.right .pack.bottom .pack.a .pack.b .pack.c} 20x40+30+0 50x30+15+40 80x80+0+70}
 
@@ -1528,7 +1528,7 @@ test pack-16.1 {geometry manager name} -setup {
 } -result {{} pack {}}
 
 
-test pack-17.1 {PackLostSlaveProc procedure} -setup {
+test pack-17.1 {PackLostContentProc procedure} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a
@@ -1537,7 +1537,7 @@ test pack-17.1 {PackLostSlaveProc procedure} -setup {
     update
     list [winfo manager .pack.a] [winfo geometry .pack.a]
 } -result {place 20x40+40+10}
-test pack-17.2 {PackLostSlaveProc procedure} -setup {
+test pack-17.2 {PackLostContentProc procedure} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a
@@ -1558,7 +1558,7 @@ if {[tk windowingsystem] == "win32"} {
     }
 }
 
-test pack-18.1 {unmap slaves when master unmapped} -constraints {
+test pack-18.1 {unmap content when container unmapped} -constraints {
     tempNotPc
 } -setup {
     eval destroy [winfo child .pack]
@@ -1590,7 +1590,7 @@ test pack-18.1 {unmap slaves when master unmapped} -constraints {
     lappend result [winfo ismapped .pack.a]
 } -result {1 0 200 75 0 1}
 
-test pack-18.2 {unmap slaves when master unmapped} -setup {
+test pack-18.2 {unmap content when container unmapped} -setup {
     eval destroy [winfo child .pack]
 } -body {
 
@@ -1618,7 +1618,7 @@ test pack-18.2 {unmap slaves when master unmapped} -setup {
 
 
 test pack-19.1 {test respect for internalborder} -setup {
-    catch {eval pack forget [pack slaves .pack]}
+    catch {eval pack forget [pack content .pack]}
     destroy .pack.l .pack.lf
 } -body {
     wm geometry .pack 200x200
@@ -1636,7 +1636,7 @@ test pack-19.1 {test respect for internalborder} -setup {
     destroy .pack.l .pack.lf
 } -result {196x188+2+10 177x186+5+7}
 test pack-19.2 {test support for minreqsize} -setup {
-    catch {eval pack forget [pack slaves .pack]}
+    catch {eval pack forget [pack content .pack]}
     destroy .pack.l .pack.lf
 } -body {
     wm geometry .pack {}
diff --git a/tests/packgrid.test b/tests/packgrid.test
index 6074ce9..6dfba25 100644
--- a/tests/packgrid.test
+++ b/tests/packgrid.test
@@ -10,7 +10,7 @@ eval tcltest::configure $argv
 tcltest::loadTestedCommands
 namespace import -force tcltest::*
 
-test packgrid-1.1 {pack and grid in same master} -setup {
+test packgrid-1.1 {pack and grid in same container window} -setup {
     grid propagate . true
     pack propagate . true
     label .p -text PACK
@@ -24,7 +24,7 @@ test packgrid-1.1 {pack and grid in same master} -setup {
     destroy .g
 } -result {cannot use geometry manager pack inside . which already has slaves managed by grid}
 
-test packgrid-1.2 {pack and grid in same master} -setup {
+test packgrid-1.2 {pack and grid in same container window} -setup {
     grid propagate . true
     pack propagate . true
     label .p -text PACK
@@ -38,7 +38,7 @@ test packgrid-1.2 {pack and grid in same master} -setup {
     destroy .g
 } -result {cannot use geometry manager grid inside . which already has slaves managed by pack}
 
-test packgrid-1.3 {pack and grid in same master} -setup {
+test packgrid-1.3 {pack and grid in same container window} -setup {
     grid propagate . false
     pack propagate . true
     label .p -text PACK
@@ -52,7 +52,7 @@ test packgrid-1.3 {pack and grid in same master} -setup {
     destroy .g
 } -result {}
 
-test packgrid-1.4 {pack and grid in same master} -setup {
+test packgrid-1.4 {pack and grid in same container window} -setup {
     grid propagate . false
     pack propagate . true
     label .p -text PACK
@@ -66,7 +66,7 @@ test packgrid-1.4 {pack and grid in same master} -setup {
     destroy .g
 } -result {}
 
-test packgrid-1.5 {pack and grid in same master} -setup {
+test packgrid-1.5 {pack and grid in same container window} -setup {
     grid propagate . true
     pack propagate . false
     label .p -text PACK
@@ -80,7 +80,7 @@ test packgrid-1.5 {pack and grid in same master} -setup {
     destroy .g
 } -result {}
 
-test packgrid-1.6 {pack and grid in same master} -setup {
+test packgrid-1.6 {pack and grid in same container window} -setup {
     grid propagate . true
     pack propagate . false
     label .p -text PACK
@@ -94,7 +94,7 @@ test packgrid-1.6 {pack and grid in same master} -setup {
     destroy .g
 } -result {}
 
-test packgrid-1.7 {pack and grid in same master} -setup {
+test packgrid-1.7 {pack and grid in same container window} -setup {
     grid propagate . true
     pack propagate . true
     label .p -text PACK
@@ -103,13 +103,13 @@ test packgrid-1.7 {pack and grid in same master} -setup {
     # Basic conflict should stop widget from being handled
     grid .g
     catch { pack .p }
-    pack slaves .
+    pack content .
 } -cleanup {
     destroy .p
     destroy .g
 } -result {}
 
-test packgrid-1.8 {pack and grid in same master} -setup {
+test packgrid-1.8 {pack and grid in same container window} -setup {
     grid propagate . true
     pack propagate . true
     label .p -text PACK
@@ -118,13 +118,13 @@ test packgrid-1.8 {pack and grid in same master} -setup {
     # Basic conflict should stop widget from being handled
     pack .p
     catch { grid .g }
-    grid slaves .
+    grid content .
 } -cleanup {
     destroy .p
     destroy .g
 } -result {}
 
-test packgrid-2.1 {pack and grid in same master, change propagation} -setup {
+test packgrid-2.1 {pack and grid in same container window, change propagation} -setup {
     grid propagate . false
     pack propagate . true
     label .p -text PACK
@@ -139,7 +139,7 @@ test packgrid-2.1 {pack and grid in same master, change propagation} -setup {
     destroy .g
 } -result {cannot use geometry manager grid inside . which already has slaves managed by pack}
 
-test packgrid-2.2 {pack and grid in same master, change propagation} -setup {
+test packgrid-2.2 {pack and grid in same container window, change propagation} -setup {
     grid propagate . true
     pack propagate . false
     label .p -text PACK
@@ -155,7 +155,7 @@ test packgrid-2.2 {pack and grid in same master, change propagation} -setup {
     destroy .g
 } -result {cannot use geometry manager pack inside . which already has slaves managed by grid}
 
-test packgrid-2.3 {pack and grid in same master, change propagation} -setup {
+test packgrid-2.3 {pack and grid in same container window, change propagation} -setup {
     grid propagate . false
     pack propagate . false
     label .p -text PACK
@@ -172,7 +172,7 @@ test packgrid-2.3 {pack and grid in same master, change propagation} -setup {
     destroy .g
 } -result {cannot use geometry manager pack inside . which already has slaves managed by grid}
 
-test packgrid-2.4 {pack and grid in same master, change propagation} -setup {
+test packgrid-2.4 {pack and grid in same container window, change propagation} -setup {
     grid propagate . false
     pack propagate . false
     label .p -text PACK
@@ -188,7 +188,7 @@ test packgrid-2.4 {pack and grid in same master, change propagation} -setup {
     destroy .g
 } -result {cannot use geometry manager grid inside . which already has slaves managed by pack}
 
-test packgrid-3.1 {stealing slave} -setup {
+test packgrid-3.1 {stealing content} -setup {
     grid propagate . true
     pack propagate . true
     label .p -text PACK
@@ -202,7 +202,7 @@ test packgrid-3.1 {stealing slave} -setup {
     destroy .g
 } -result {}
 
-test packgrid-3.2 {stealing slave} -setup {
+test packgrid-3.2 {stealing content} -setup {
     grid propagate . true
     pack propagate . true
     label .p -text PACK
@@ -216,7 +216,7 @@ test packgrid-3.2 {stealing slave} -setup {
     destroy .g
 } -result {}
 
-test packgrid-3.3 {stealing slave} -setup {
+test packgrid-3.3 {stealing content} -setup {
     grid propagate . true
     pack propagate . true
     label .p -text PACK
@@ -231,7 +231,7 @@ test packgrid-3.3 {stealing slave} -setup {
     destroy .g
 } -result {cannot use geometry manager pack inside . which already has slaves managed by grid}
 
-test packgrid-3.4 {stealing slave} -setup {
+test packgrid-3.4 {stealing content} -setup {
     grid propagate . true
     pack propagate . true
     label .p -text PACK
@@ -246,7 +246,7 @@ test packgrid-3.4 {stealing slave} -setup {
     destroy .g
 } -result {cannot use geometry manager grid inside . which already has slaves managed by pack}
 
-test packgrid-4.1 {slave stolen after master destruction - bug [aa7679685e]} -setup {
+test packgrid-4.1 {content stolen after container destruction - bug [aa7679685e]} -setup {
     frame .f
     button .b -text hello
 } -body {
@@ -261,7 +261,7 @@ test packgrid-4.1 {slave stolen after master destruction - bug [aa7679685e]} -se
     destroy .b
 } -result {}
 
-test packgrid-4.2 {slave stolen after master destruction - bug [aa7679685e]} -setup {
+test packgrid-4.2 {content stolen after container destruction - bug [aa7679685e]} -setup {
     frame .f
     button .b -text hello
 } -body {
diff --git a/tests/panedwindow.test b/tests/panedwindow.test
index ee184ce..bb3a7fd 100644
--- a/tests/panedwindow.test
+++ b/tests/panedwindow.test
@@ -498,7 +498,7 @@ test panedwindow-6.9 {sash coord subcommand, errors} -setup {
     .p add [frame .p.f]
     list [catch {.p sash coord -1} msg] $msg \
 	    [catch {.p sash coord  0} msg] $msg \
-	    [catch {.p sash coord  1} msg] $msg 
+	    [catch {.p sash coord  1} msg] $msg
 } -cleanup {
 	deleteWindows
 } -result [list 1 "invalid sash index" 1 "invalid sash index" 1 "invalid sash index"]
@@ -511,7 +511,7 @@ test panedwindow-6.10 {sash coord subcommand, errors} -setup {
     list [catch {.p sash coord -1} msg] $msg \
 	    [catch {.p sash coord  0} msg] \
 	    [catch {.p sash coord  1} msg] $msg \
-	    [catch {.p sash coord  2} msg] $msg 
+	    [catch {.p sash coord  2} msg] $msg
 } -cleanup {
 	deleteWindows
 } -result [list 1 "invalid sash index" 0 1 "invalid sash index" 1 "invalid sash index"]
@@ -622,7 +622,7 @@ test panedwindow-8.5 {sash dragto subcommand, errors} -setup {
 } -cleanup {
 	deleteWindows
 } -returnCodes error -result {expected integer but got "bar"}
-    
+
 
 test panedwindow-9.1 {sash mark/sash dragto interaction} -setup {
 	deleteWindows
@@ -925,7 +925,7 @@ test panedwindow-11.15 {moving sash into "virtual" space on last pane increases
 } -cleanup {
 	deleteWindows
 } -result {68 100}
-    
+
 
 test panedwindow-12.1 {horizontal panedwindow lays out widgets properly} -setup {
 	deleteWindows
@@ -1022,7 +1022,7 @@ test panedwindow-12.6 {panedwindow takes explicit widget width over reqwidth} -s
 } -cleanup {
 	deleteWindows
 } -result [list 20 20]
-test panedwindow-12.7 {horizontal panedwindow reqheight is max slave height} -setup {
+test panedwindow-12.7 {horizontal panedwindow reqheight is max pane height} -setup {
 	deleteWindows
 } -body {
     panedwindow .p -showhandle false -borderwidth 0 -sashpad 0 -sashwidth 4
@@ -1033,7 +1033,7 @@ test panedwindow-12.7 {horizontal panedwindow reqheight is max slave height} -se
 } -cleanup {
 	deleteWindows
 } -result {20 40}
-test panedwindow-12.8 {horizontal panedwindow reqheight is max slave height} -setup {
+test panedwindow-12.8 {horizontal panedwindow reqheight is max pane height} -setup {
 	deleteWindows
 } -body {
     panedwindow .p -showhandle false -borderwidth 0 -sashpad 0 -sashwidth 4
@@ -1087,7 +1087,7 @@ test panedwindow-12.11 {panedwindow takes explicit height over reqheight} -setup
 } -cleanup {
 	deleteWindows
 } -result [list 20 20]
-test panedwindow-12.12 {vertical panedwindow reqwidth is max slave width} -setup {
+test panedwindow-12.12 {vertical panedwindow reqwidth is max pane width} -setup {
 	deleteWindows
 } -body {
     panedwindow .p -showhandle false -borderwidth 0 -sashpad 0 -sashwidth 4 \
@@ -1099,7 +1099,7 @@ test panedwindow-12.12 {vertical panedwindow reqwidth is max slave width} -setup
 } -cleanup {
 	deleteWindows
 } -result {20 40}
-test panedwindow-12.13 {vertical panedwindow reqwidth is max slave width} -setup {
+test panedwindow-12.13 {vertical panedwindow reqwidth is max pane width} -setup {
 	deleteWindows
 } -body {
     panedwindow .p -showhandle false -borderwidth 0 -sashpad 0 -sashwidth 4 \
@@ -1133,7 +1133,7 @@ test panedwindow-13.1 {PanestructureProc, widget yields managements} -setup {
 	deleteWindows
 } -body {
     # Check that the panedwindow correctly yields geometry management of
-    # a slave when the slave is destroyed.
+    # a pane when the pane is destroyed.
 
     # This test should not cause a core dump, and it should not cause
     # a memory leak.
@@ -1144,12 +1144,12 @@ test panedwindow-13.1 {PanestructureProc, widget yields managements} -setup {
     destroy .b
     set result ""
 } -result {}
-test panedwindow-13.2 {PanedWindowLostSlaveProc, widget yields management} -setup {
+test panedwindow-13.2 {PanedWindowLostPaneProc, widget yields management} -setup {
 	deleteWindows
 } -body {
     # Check that the paned window correctly yields geometry management of
-    # a slave when some other geometry manager steals the slave from us.
-    
+    # a pane when some other geometry manager steals the pane from us.
+
     # This test should not cause a core dump, and it should not cause a
     # memory leak.
     panedwindow .p
@@ -1518,9 +1518,9 @@ test panedwindow-17.1 {MoveSash, move right} -setup {
 
     # Get the requested width of the paned window
     lappend result [winfo reqwidth .p]
-    
+
     .p sash place 0 30 0
-    
+
     # Get the reqwidth again, to make sure it hasn't changed
     lappend result [winfo reqwidth .p]
 
@@ -1538,7 +1538,7 @@ test panedwindow-17.2 {MoveSash, move right (unmapped) clipped by reqwidth} -set
     }
 
     .p sash place 0 100 0
-    
+
     # Get the new sash coord; it should be clipped by the reqwidth of
     # the panedwindow.
     .p sash coord 0
@@ -1552,13 +1552,13 @@ test panedwindow-17.3 {MoveSash, move right (mapped, width < reqwidth) clipped b
     foreach w {.f1 .f2} c {red blue} {
 	    .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew
     }
-    
+
     # Put the panedwindow up on the display and give it a width < reqwidth
     place .p -x 0 -y 0 -width 32
     update
 
     .p sash place 0 100 0
-    
+
     # Get the new sash coord; it should be clipped by the visible width of
     # the panedwindow.
     .p sash coord 0
@@ -1572,13 +1572,13 @@ test panedwindow-17.4 {MoveSash, move right (mapped, width > reqwidth) clipped b
     foreach w {.f1 .f2} c {red blue} {
 	    .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew
     }
-    
+
     # Put the panedwindow up on the display and give it a width > reqwidth
     place .p -x 0 -y 0 -width 102
     update
 
     .p sash place 0 200 0
-    
+
     # Get the new sash coord; it should be clipped by the visible width of
     # the panedwindow.
     .p sash coord 0
@@ -1594,7 +1594,7 @@ test panedwindow-17.5 {MoveSash, move right respects minsize} -setup {
     }
 
     .p sash place 0 100 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     .p sash coord 0
@@ -1610,7 +1610,7 @@ test panedwindow-17.6 {MoveSash, move right respects minsize} -setup {
     }
 
     .p sash place 0 100 0
-    
+
     # Get the new sash coord; it should have moved as far as possible.
     .p sash coord 0
 } -cleanup {
@@ -1625,7 +1625,7 @@ test panedwindow-17.7 {MoveSash, move right pushes other sashes} -setup {
     }
 
     .p sash place 0 100 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     .p sash coord 1
@@ -1641,7 +1641,7 @@ test panedwindow-17.8 {MoveSash, move right pushes other sashes, respects minsiz
     }
 
     .p sash place 0 100 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     .p sash coord 1
@@ -1658,8 +1658,8 @@ test panedwindow-17.9 {MoveSash, move right respects minsize, exludes pad} -setu
     }
 
     .p sash place 0 100 0
-    
-    # Get the new sash coord; it should have moved as far as possible, 
+
+    # Get the new sash coord; it should have moved as far as possible,
     # respecting minsizes.
     .p sash coord 0
 } -cleanup {
@@ -1675,8 +1675,8 @@ test panedwindow-17.10 {MoveSash, move right, negative minsize becomes 0} -setup
     }
 
     .p sash place 0 50 0
-    
-    # Get the new sash coord; it should have moved as far as possible, 
+
+    # Get the new sash coord; it should have moved as far as possible,
     # respecting minsizes.
     list [.p sash coord 0] [.p sash coord 1]
 } -cleanup {
@@ -1693,9 +1693,9 @@ test panedwindow-17.11 {MoveSash, move left} -setup {
 
     # Get the requested width of the paned window
     lappend result [winfo reqwidth .p]
-    
+
     .p sash place 0 10 0
-    
+
     # Get the reqwidth again, to make sure it hasn't changed
     lappend result [winfo reqwidth .p]
 
@@ -1713,7 +1713,7 @@ test panedwindow-17.12 {MoveSash, move left, can't move outside of window} -setu
     }
 
     .p sash place 0 -100 0
-    
+
     # Get the new sash coord; it should be clipped by the reqwidth of
     # the panedwindow.
     .p sash coord 0
@@ -1729,7 +1729,7 @@ test panedwindow-17.13 {MoveSash, move left respects minsize} -setup {
     }
 
     .p sash place 0 0 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     .p sash coord 0
@@ -1745,7 +1745,7 @@ test panedwindow-17.14 {MoveSash, move left respects minsize} -setup {
     }
 
     .p sash place 1 0 0
-    
+
     # Get the new sash coord; it should have moved as far as possible.
     .p sash coord 1
 } -cleanup {
@@ -1760,7 +1760,7 @@ test panedwindow-17.15 {MoveSash, move left pushes other sashes} -setup {
     }
 
     .p sash place 1 0 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     .p sash coord 0
@@ -1776,7 +1776,7 @@ test panedwindow-17.16 {MoveSash, move left pushes other sashes, respects minsiz
     }
 
     .p sash place 1 0 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     .p sash coord 0
@@ -1793,8 +1793,8 @@ test panedwindow-17.17 {MoveSash, move left respects minsize, exludes pad} -setu
     }
 
     .p sash place 1 0 0
-    
-    # Get the new sash coord; it should have moved as far as possible, 
+
+    # Get the new sash coord; it should have moved as far as possible,
     # respecting minsizes.
     .p sash coord 1
 } -cleanup {
@@ -1810,8 +1810,8 @@ test panedwindow-17.18 {MoveSash, move left, negative minsize becomes 0} -setup
     }
 
     .p sash place 1 10 0
-    
-    # Get the new sash coord; it should have moved as far as possible, 
+
+    # Get the new sash coord; it should have moved as far as possible,
     # respecting minsizes.
     list [.p sash coord 0] [.p sash coord 1]
 } -cleanup {
@@ -1831,9 +1831,9 @@ test panedwindow-18.1 {MoveSash, move down} -setup {
 
     # Get the requested width of the paned window
     lappend result [winfo reqheight .p]
-    
+
     .p sash place 0 0 30
-    
+
     # Get the reqwidth again, to make sure it hasn't changed
     lappend result [winfo reqheight .p]
 
@@ -1852,7 +1852,7 @@ test panedwindow-18.2 {MoveSash, move down (unmapped) clipped by reqheight} -set
     }
 
     .p sash place 0 0 100
-    
+
     # Get the new sash coord; it should be clipped by the reqheight of
     # the panedwindow.
     .p sash coord 0
@@ -1867,13 +1867,13 @@ test panedwindow-18.3 {MoveSash, move down (mapped, height < reqheight) clipped
     foreach w {.f1 .f2} c {red blue} {
 	    .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew
     }
-    
+
     # Put the panedwindow up on the display and give it a height < reqheight
     place .p -x 0 -y 0 -height 32
     update
 
     .p sash place 0 0 100
-    
+
     # Get the new sash coord; it should be clipped by the visible height of
     # the panedwindow.
     .p sash coord 0
@@ -1888,13 +1888,13 @@ test panedwindow-18.4 {MoveSash, move down (mapped, height > reqheight) clipped
     foreach w {.f1 .f2} c {red blue} {
 	    .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew
     }
-    
+
     # Put the panedwindow up on the display and give it a width > reqwidth
     place .p -x 0 -y 0 -height 102
     update
 
     .p sash place 0 0 200
-    
+
     # Get the new sash coord; it should be clipped by the visible width of
     # the panedwindow.
     .p sash coord 0
@@ -1911,7 +1911,7 @@ test panedwindow-18.5 {MoveSash, move down respects minsize} -setup {
     }
 
     .p sash place 0 0 100
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     .p sash coord 0
@@ -1928,7 +1928,7 @@ test panedwindow-18.6 {MoveSash, move down respects minsize} -setup {
     }
 
     .p sash place 0 0 100
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     .p sash coord 0
@@ -1945,7 +1945,7 @@ test panedwindow-18.7 {MoveSash, move down pushes other sashes} -setup {
     }
 
     .p sash place 0 0 100
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     .p sash coord 1
@@ -1962,7 +1962,7 @@ test panedwindow-18.8 {MoveSash, move down pushes other sashes, respects minsize
     }
 
     .p sash place 0 0 100
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     .p sash coord 1
@@ -1980,8 +1980,8 @@ test panedwindow-18.9 {MoveSash, move down respects minsize, exludes pad} -setup
     }
 
     .p sash place 0 0 100
-    
-    # Get the new sash coord; it should have moved as far as possible, 
+
+    # Get the new sash coord; it should have moved as far as possible,
     # respecting minsizes.
     .p sash coord 0
 } -cleanup {
@@ -1998,8 +1998,8 @@ test panedwindow-18.10 {MoveSash, move right, negative minsize becomes 0} -setup
     }
 
     .p sash place 0 0 50
-    
-    # Get the new sash coord; it should have moved as far as possible, 
+
+    # Get the new sash coord; it should have moved as far as possible,
     # respecting minsizes.
     list [.p sash coord 0] [.p sash coord 1]
 } -cleanup {
@@ -2017,9 +2017,9 @@ test panedwindow-18.11 {MoveSash, move up} -setup {
 
     # Get the requested width of the paned window
     lappend result [winfo reqheight .p]
-    
+
     .p sash place 0 0 10
-    
+
     # Get the reqwidth again, to make sure it hasn't changed
     lappend result [winfo reqheight .p]
 
@@ -2038,7 +2038,7 @@ test panedwindow-18.12 {MoveSash, move up, can't move outside of window} -setup
     }
 
     .p sash place 0 0 -100
-    
+
     # Get the new sash coord; it should be clipped by the reqwidth of
     # the panedwindow.
     .p sash coord 0
@@ -2055,7 +2055,7 @@ test panedwindow-18.13 {MoveSash, move up respects minsize} -setup {
     }
 
     .p sash place 0 0 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     .p sash coord 0
@@ -2072,7 +2072,7 @@ test panedwindow-18.14 {MoveSash, move up respects minsize} -setup {
     }
 
     .p sash place 1 0 0
-    
+
     # Get the new sash coord; it should have moved as far as possible.
     .p sash coord 1
 } -cleanup {
@@ -2088,7 +2088,7 @@ test panedwindow-18.15 {MoveSash, move up pushes other sashes} -setup {
     }
 
     .p sash place 1 0 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     .p sash coord 0
@@ -2105,7 +2105,7 @@ test panedwindow-18.16 {MoveSash, move up pushes other sashes, respects minsize}
     }
 
     .p sash place 1 0 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     .p sash coord 0
@@ -2123,8 +2123,8 @@ test panedwindow-18.17 {MoveSash, move up respects minsize, exludes pad} -setup
     }
 
     .p sash place 1 0 0
-    
-    # Get the new sash coord; it should have moved as far as possible, 
+
+    # Get the new sash coord; it should have moved as far as possible,
     # respecting minsizes.
     .p sash coord 1
 } -cleanup {
@@ -2141,8 +2141,8 @@ test panedwindow-18.18 {MoveSash, move up, negative minsize becomes 0} -setup {
     }
 
     .p sash place 1 0 10
-    
-    # Get the new sash coord; it should have moved as far as possible, 
+
+    # Get the new sash coord; it should have moved as far as possible,
     # respecting minsizes.
     list [.p sash coord 0] [.p sash coord 1]
 } -cleanup {
@@ -2241,10 +2241,10 @@ test panedwindow-19.6 {ComputeGeometry, reqwidth taken from widgets} -setup {
 	deleteWindows
 } -result [list [list 60 60] [list 80 60]]
 
-test panedwindow-19.7 {ComputeGeometry, one slave, reqsize set properly} -setup {
+test panedwindow-19.7 {ComputeGeometry, one pane, reqsize set properly} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 0 -sashpad 0 \
@@ -2282,7 +2282,7 @@ test panedwindow-19.9 {ComputeGeometry, sash coords} -setup {
     deleteWindows
 } -result {{20 0} {40 0}}
 
-test panedwindow-19.10 {ComputeGeometry/ArrangePanes, slave coords} -setup {
+test panedwindow-19.10 {ComputeGeometry/ArrangePanes, pane coords} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 0 \
@@ -2303,10 +2303,10 @@ test panedwindow-19.10 {ComputeGeometry/ArrangePanes, slave coords} -setup {
     deleteWindows
 } -result {{11 3 20 20} {53 3 20 20} {95 3 20 20}}
 
-test panedwindow-19.11 {ComputeGeometry, one slave, vertical} -setup {
+test panedwindow-19.11 {ComputeGeometry, one pane, vertical} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 0 -sashpad 0 \
@@ -2349,7 +2349,7 @@ test panedwindow-19.13 {ComputeGeometry, sash coords, vertical} -setup {
     deleteWindows
 } -result {{0 20} {0 40}}
 
-test panedwindow-19.14 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
+test panedwindow-19.14 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 0 \
@@ -2370,10 +2370,10 @@ test panedwindow-19.14 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup
 } -cleanup {
     deleteWindows
 } -result {{3 11 20 20} {3 53 20 20} {3 95 20 20}}
-test panedwindow-19.15 {ComputeGeometry, one slave, reqsize set properly} -setup {
+test panedwindow-19.15 {ComputeGeometry, one pane, reqsize set properly} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 0 -sashpad 0 \
@@ -2411,7 +2411,7 @@ test panedwindow-19.17 {ComputeGeometry, sash coords} -setup {
     deleteWindows
 } -result {{23 0} {49 0}}
 
-test panedwindow-19.18 {ComputeGeometry/ArrangePanes, slave coords} -setup {
+test panedwindow-19.18 {ComputeGeometry/ArrangePanes, pane coords} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 0 \
@@ -2432,10 +2432,10 @@ test panedwindow-19.18 {ComputeGeometry/ArrangePanes, slave coords} -setup {
     deleteWindows
 } -result {{11 3 20 20} {59 3 20 20} {107 3 20 20}}
 
-test panedwindow-19.19 {ComputeGeometry, one slave, vertical} -setup {
+test panedwindow-19.19 {ComputeGeometry, one pane, vertical} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 0 -sashpad 0 \
@@ -2478,7 +2478,7 @@ test panedwindow-19.21 {ComputeGeometry, sash coords, vertical} -setup {
     deleteWindows
 } -result {{0 23} {0 49}}
 
-test panedwindow-19.22 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
+test panedwindow-19.22 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 0 \
@@ -2499,10 +2499,10 @@ test panedwindow-19.22 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup
 } -cleanup {
     deleteWindows
 } -result {{3 11 20 20} {3 59 20 20} {3 107 20 20}}
-test panedwindow-19.23 {ComputeGeometry, one slave, reqsize set properly} -setup {
+test panedwindow-19.23 {ComputeGeometry, one pane, reqsize set properly} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 0 -sashpad 0 \
@@ -2540,7 +2540,7 @@ test panedwindow-19.25 {ComputeGeometry, sash coords} -setup {
     deleteWindows
 } -result {{20 0} {43 0}}
 
-test panedwindow-19.26 {ComputeGeometry/ArrangePanes, slave coords} -setup {
+test panedwindow-19.26 {ComputeGeometry/ArrangePanes, pane coords} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 0 \
@@ -2561,10 +2561,10 @@ test panedwindow-19.26 {ComputeGeometry/ArrangePanes, slave coords} -setup {
     deleteWindows
 } -result {{11 3 20 20} {56 3 20 20} {101 3 20 20}}
 
-test panedwindow-19.27 {ComputeGeometry, one slave, vertical} -setup {
+test panedwindow-19.27 {ComputeGeometry, one pane, vertical} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 0 -sashpad 0 \
@@ -2607,7 +2607,7 @@ test panedwindow-19.29 {ComputeGeometry, sash coords, vertical} -setup {
     deleteWindows
 } -result {{0 20} {0 43}}
 
-test panedwindow-19.30 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
+test panedwindow-19.30 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 0 \
@@ -2628,10 +2628,10 @@ test panedwindow-19.30 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup
 } -cleanup {
     deleteWindows
 } -result {{3 11 20 20} {3 56 20 20} {3 101 20 20}}
-test panedwindow-19.31 {ComputeGeometry, one slave, reqsize set properly} -setup {
+test panedwindow-19.31 {ComputeGeometry, one pane, reqsize set properly} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 0 -sashpad 0 \
@@ -2669,7 +2669,7 @@ test panedwindow-19.33 {ComputeGeometry, sash coords} -setup {
     deleteWindows
 } -result {{21 0} {47 0}}
 
-test panedwindow-19.34 {ComputeGeometry/ArrangePanes, slave coords} -setup {
+test panedwindow-19.34 {ComputeGeometry/ArrangePanes, pane coords} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 0 \
@@ -2690,10 +2690,10 @@ test panedwindow-19.34 {ComputeGeometry/ArrangePanes, slave coords} -setup {
     deleteWindows
 } -result {{11 3 20 20} {59 3 20 20} {107 3 20 20}}
 
-test panedwindow-19.35 {ComputeGeometry, one slave, vertical} -setup {
+test panedwindow-19.35 {ComputeGeometry, one pane, vertical} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 0 -sashpad 0 \
@@ -2736,7 +2736,7 @@ test panedwindow-19.37 {ComputeGeometry, sash coords, vertical} -setup {
     deleteWindows
 } -result {{0 21} {0 47}}
 
-test panedwindow-19.38 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
+test panedwindow-19.38 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 0 \
@@ -2757,10 +2757,10 @@ test panedwindow-19.38 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup
 } -cleanup {
     deleteWindows
 } -result {{3 11 20 20} {3 59 20 20} {3 107 20 20}}
-test panedwindow-19.39 {ComputeGeometry, one slave, reqsize set properly} -setup {
+test panedwindow-19.39 {ComputeGeometry, one pane, reqsize set properly} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 0 -sashpad 5 \
@@ -2798,7 +2798,7 @@ test panedwindow-19.41 {ComputeGeometry, sash coords} -setup {
     deleteWindows
 } -result {{25 0} {55 0}}
 
-test panedwindow-19.42 {ComputeGeometry/ArrangePanes, slave coords} -setup {
+test panedwindow-19.42 {ComputeGeometry/ArrangePanes, pane coords} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 5 \
@@ -2819,10 +2819,10 @@ test panedwindow-19.42 {ComputeGeometry/ArrangePanes, slave coords} -setup {
     deleteWindows
 } -result {{11 3 20 20} {63 3 20 20} {115 3 20 20}}
 
-test panedwindow-19.43 {ComputeGeometry, one slave, vertical} -setup {
+test panedwindow-19.43 {ComputeGeometry, one pane, vertical} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 0 -sashpad 5 \
@@ -2865,7 +2865,7 @@ test panedwindow-19.45 {ComputeGeometry, sash coords, vertical} -setup {
     deleteWindows
 } -result {{0 25} {0 55}}
 
-test panedwindow-19.46 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
+test panedwindow-19.46 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 5 \
@@ -2886,10 +2886,10 @@ test panedwindow-19.46 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup
 } -cleanup {
     deleteWindows
 } -result {{3 11 20 20} {3 63 20 20} {3 115 20 20}}
-test panedwindow-19.47 {ComputeGeometry, one slave, reqsize set properly} -setup {
+test panedwindow-19.47 {ComputeGeometry, one pane, reqsize set properly} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 0 -sashpad 5 \
@@ -2927,7 +2927,7 @@ test panedwindow-19.49 {ComputeGeometry, sash coords} -setup {
     deleteWindows
 } -result {{28 0} {64 0}}
 
-test panedwindow-19.50 {ComputeGeometry/ArrangePanes, slave coords} -setup {
+test panedwindow-19.50 {ComputeGeometry/ArrangePanes, pane coords} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 5 \
@@ -2948,10 +2948,10 @@ test panedwindow-19.50 {ComputeGeometry/ArrangePanes, slave coords} -setup {
     deleteWindows
 } -result {{11 3 20 20} {69 3 20 20} {127 3 20 20}}
 
-test panedwindow-19.51 {ComputeGeometry, one slave, vertical} -setup {
+test panedwindow-19.51 {ComputeGeometry, one pane, vertical} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 0 -sashpad 5 \
@@ -2994,7 +2994,7 @@ test panedwindow-19.53 {ComputeGeometry, sash coords, vertical} -setup {
     deleteWindows
 } -result {{0 28} {0 64}}
 
-test panedwindow-19.54 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
+test panedwindow-19.54 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 5 \
@@ -3015,10 +3015,10 @@ test panedwindow-19.54 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup
 } -cleanup {
     deleteWindows
 } -result {{3 11 20 20} {3 69 20 20} {3 127 20 20}}
-test panedwindow-19.55 {ComputeGeometry, one slave, reqsize set properly} -setup {
+test panedwindow-19.55 {ComputeGeometry, one pane, reqsize set properly} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 0 -sashpad 5 \
@@ -3056,7 +3056,7 @@ test panedwindow-19.57 {ComputeGeometry, sash coords} -setup {
     deleteWindows
 } -result {{25 0} {58 0}}
 
-test panedwindow-19.58 {ComputeGeometry/ArrangePanes, slave coords} -setup {
+test panedwindow-19.58 {ComputeGeometry/ArrangePanes, pane coords} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 5 \
@@ -3077,10 +3077,10 @@ test panedwindow-19.58 {ComputeGeometry/ArrangePanes, slave coords} -setup {
     deleteWindows
 } -result {{11 3 20 20} {66 3 20 20} {121 3 20 20}}
 
-test panedwindow-19.59 {ComputeGeometry, one slave, vertical} -setup {
+test panedwindow-19.59 {ComputeGeometry, one pane, vertical} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 0 -sashpad 5 \
@@ -3123,7 +3123,7 @@ test panedwindow-19.61 {ComputeGeometry, sash coords, vertical} -setup {
     deleteWindows
 } -result {{0 25} {0 58}}
 
-test panedwindow-19.62 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
+test panedwindow-19.62 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 5 \
@@ -3144,10 +3144,10 @@ test panedwindow-19.62 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup
 } -cleanup {
     deleteWindows
 } -result {{3 11 20 20} {3 66 20 20} {3 121 20 20}}
-test panedwindow-19.63 {ComputeGeometry, one slave, reqsize set properly} -setup {
+test panedwindow-19.63 {ComputeGeometry, one pane, reqsize set properly} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 0 -sashpad 5 \
@@ -3185,7 +3185,7 @@ test panedwindow-19.65 {ComputeGeometry, sash coords} -setup {
     deleteWindows
 } -result {{26 0} {62 0}}
 
-test panedwindow-19.66 {ComputeGeometry/ArrangePanes, slave coords} -setup {
+test panedwindow-19.66 {ComputeGeometry/ArrangePanes, pane coords} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 5 \
@@ -3206,10 +3206,10 @@ test panedwindow-19.66 {ComputeGeometry/ArrangePanes, slave coords} -setup {
     deleteWindows
 } -result {{11 3 20 20} {69 3 20 20} {127 3 20 20}}
 
-test panedwindow-19.67 {ComputeGeometry, one slave, vertical} -setup {
+test panedwindow-19.67 {ComputeGeometry, one pane, vertical} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 0 -sashpad 5 \
@@ -3252,7 +3252,7 @@ test panedwindow-19.69 {ComputeGeometry, sash coords, vertical} -setup {
     deleteWindows
 } -result {{0 26} {0 62}}
 
-test panedwindow-19.70 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
+test panedwindow-19.70 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 5 \
@@ -3273,10 +3273,10 @@ test panedwindow-19.70 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup
 } -cleanup {
     deleteWindows
 } -result {{3 11 20 20} {3 69 20 20} {3 127 20 20}}
-test panedwindow-19.71 {ComputeGeometry, one slave, reqsize set properly} -setup {
+test panedwindow-19.71 {ComputeGeometry, one pane, reqsize set properly} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 2 -sashpad 0 \
@@ -3314,7 +3314,7 @@ test panedwindow-19.73 {ComputeGeometry, sash coords} -setup {
     deleteWindows
 } -result {{22 2} {42 2}}
 
-test panedwindow-19.74 {ComputeGeometry/ArrangePanes, slave coords} -setup {
+test panedwindow-19.74 {ComputeGeometry/ArrangePanes, pane coords} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 2 -sashpad 0 \
@@ -3335,10 +3335,10 @@ test panedwindow-19.74 {ComputeGeometry/ArrangePanes, slave coords} -setup {
     deleteWindows
 } -result {{13 5 20 20} {55 5 20 20} {97 5 20 20}}
 
-test panedwindow-19.75 {ComputeGeometry, one slave, vertical} -setup {
+test panedwindow-19.75 {ComputeGeometry, one pane, vertical} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 2 -sashpad 0 \
@@ -3381,7 +3381,7 @@ test panedwindow-19.77 {ComputeGeometry, sash coords, vertical} -setup {
     deleteWindows
 } -result {{2 22} {2 42}}
 
-test panedwindow-19.78 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
+test panedwindow-19.78 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 2 -sashpad 0 \
@@ -3402,10 +3402,10 @@ test panedwindow-19.78 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup
 } -cleanup {
     deleteWindows
 } -result {{5 13 20 20} {5 55 20 20} {5 97 20 20}}
-test panedwindow-19.79 {ComputeGeometry, one slave, reqsize set properly} -setup {
+test panedwindow-19.79 {ComputeGeometry, one pane, reqsize set properly} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 2 -sashpad 0 \
@@ -3443,7 +3443,7 @@ test panedwindow-19.81 {ComputeGeometry, sash coords} -setup {
     deleteWindows
 } -result {{25 2} {51 2}}
 
-test panedwindow-19.82 {ComputeGeometry/ArrangePanes, slave coords} -setup {
+test panedwindow-19.82 {ComputeGeometry/ArrangePanes, pane coords} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 2 -sashpad 0 \
@@ -3464,10 +3464,10 @@ test panedwindow-19.82 {ComputeGeometry/ArrangePanes, slave coords} -setup {
     deleteWindows
 } -result {{13 5 20 20} {61 5 20 20} {109 5 20 20}}
 
-test panedwindow-19.83 {ComputeGeometry, one slave, vertical} -setup {
+test panedwindow-19.83 {ComputeGeometry, one pane, vertical} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 2 -sashpad 0 \
@@ -3510,7 +3510,7 @@ test panedwindow-19.85 {ComputeGeometry, sash coords, vertical} -setup {
     deleteWindows
 } -result {{2 25} {2 51}}
 
-test panedwindow-19.86 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
+test panedwindow-19.86 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 2 -sashpad 0 \
@@ -3531,10 +3531,10 @@ test panedwindow-19.86 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup
 } -cleanup {
     deleteWindows
 } -result {{5 13 20 20} {5 61 20 20} {5 109 20 20}}
-test panedwindow-19.87 {ComputeGeometry, one slave, reqsize set properly} -setup {
+test panedwindow-19.87 {ComputeGeometry, one pane, reqsize set properly} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 2 -sashpad 0 \
@@ -3572,7 +3572,7 @@ test panedwindow-19.89 {ComputeGeometry, sash coords} -setup {
     deleteWindows
 } -result {{22 2} {45 2}}
 
-test panedwindow-19.90 {ComputeGeometry/ArrangePanes, slave coords} -setup {
+test panedwindow-19.90 {ComputeGeometry/ArrangePanes, pane coords} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 2 -sashpad 0 \
@@ -3593,10 +3593,10 @@ test panedwindow-19.90 {ComputeGeometry/ArrangePanes, slave coords} -setup {
     deleteWindows
 } -result {{13 5 20 20} {58 5 20 20} {103 5 20 20}}
 
-test panedwindow-19.91 {ComputeGeometry, one slave, vertical} -setup {
+test panedwindow-19.91 {ComputeGeometry, one pane, vertical} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 2 -sashpad 0 \
@@ -3639,7 +3639,7 @@ test panedwindow-19.93 {ComputeGeometry, sash coords, vertical} -setup {
     deleteWindows
 } -result {{2 22} {2 45}}
 
-test panedwindow-19.94 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
+test panedwindow-19.94 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 2 -sashpad 0 \
@@ -3660,10 +3660,10 @@ test panedwindow-19.94 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup
 } -cleanup {
     deleteWindows
 } -result {{5 13 20 20} {5 58 20 20} {5 103 20 20}}
-test panedwindow-19.95 {ComputeGeometry, one slave, reqsize set properly} -setup {
+test panedwindow-19.95 {ComputeGeometry, one pane, reqsize set properly} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 2 -sashpad 0 \
@@ -3701,7 +3701,7 @@ test panedwindow-19.97 {ComputeGeometry, sash coords} -setup {
     deleteWindows
 } -result {{23 2} {49 2}}
 
-test panedwindow-19.98 {ComputeGeometry/ArrangePanes, slave coords} -setup {
+test panedwindow-19.98 {ComputeGeometry/ArrangePanes, pane coords} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 2 -sashpad 0 \
@@ -3722,10 +3722,10 @@ test panedwindow-19.98 {ComputeGeometry/ArrangePanes, slave coords} -setup {
     deleteWindows
 } -result {{13 5 20 20} {61 5 20 20} {109 5 20 20}}
 
-test panedwindow-19.99 {ComputeGeometry, one slave, vertical} -setup {
+test panedwindow-19.99 {ComputeGeometry, one pane, vertical} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 2 -sashpad 0 \
@@ -3768,7 +3768,7 @@ test panedwindow-19.101 {ComputeGeometry, sash coords, vertical} -setup {
     deleteWindows
 } -result {{2 23} {2 49}}
 
-test panedwindow-19.102 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
+test panedwindow-19.102 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 2 -sashpad 0 \
@@ -3789,10 +3789,10 @@ test panedwindow-19.102 {ComputeGeometry/ArrangePanes, slave coords, vert} -setu
 } -cleanup {
     deleteWindows
 } -result {{5 13 20 20} {5 61 20 20} {5 109 20 20}}
-test panedwindow-19.103 {ComputeGeometry, one slave, reqsize set properly} -setup {
+test panedwindow-19.103 {ComputeGeometry, one pane, reqsize set properly} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 2 -sashpad 5 \
@@ -3830,7 +3830,7 @@ test panedwindow-19.105 {ComputeGeometry, sash coords} -setup {
     deleteWindows
 } -result {{27 2} {57 2}}
 
-test panedwindow-19.106 {ComputeGeometry/ArrangePanes, slave coords} -setup {
+test panedwindow-19.106 {ComputeGeometry/ArrangePanes, pane coords} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 2 -sashpad 5 \
@@ -3851,10 +3851,10 @@ test panedwindow-19.106 {ComputeGeometry/ArrangePanes, slave coords} -setup {
     deleteWindows
 } -result {{13 5 20 20} {65 5 20 20} {117 5 20 20}}
 
-test panedwindow-19.107 {ComputeGeometry, one slave, vertical} -setup {
+test panedwindow-19.107 {ComputeGeometry, one pane, vertical} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 2 -sashpad 5 \
@@ -3897,7 +3897,7 @@ test panedwindow-19.109 {ComputeGeometry, sash coords, vertical} -setup {
     deleteWindows
 } -result {{2 27} {2 57}}
 
-test panedwindow-19.110 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
+test panedwindow-19.110 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 2 -sashpad 5 \
@@ -3918,10 +3918,10 @@ test panedwindow-19.110 {ComputeGeometry/ArrangePanes, slave coords, vert} -setu
 } -cleanup {
     deleteWindows
 } -result {{5 13 20 20} {5 65 20 20} {5 117 20 20}}
-test panedwindow-19.111 {ComputeGeometry, one slave, reqsize set properly} -setup {
+test panedwindow-19.111 {ComputeGeometry, one pane, reqsize set properly} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 2 -sashpad 5 \
@@ -3959,7 +3959,7 @@ test panedwindow-19.113 {ComputeGeometry, sash coords} -setup {
     deleteWindows
 } -result {{30 2} {66 2}}
 
-test panedwindow-19.114 {ComputeGeometry/ArrangePanes, slave coords} -setup {
+test panedwindow-19.114 {ComputeGeometry/ArrangePanes, pane coords} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 2 -sashpad 5 \
@@ -3980,10 +3980,10 @@ test panedwindow-19.114 {ComputeGeometry/ArrangePanes, slave coords} -setup {
     deleteWindows
 } -result {{13 5 20 20} {71 5 20 20} {129 5 20 20}}
 
-test panedwindow-19.115 {ComputeGeometry, one slave, vertical} -setup {
+test panedwindow-19.115 {ComputeGeometry, one pane, vertical} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 2 -sashpad 5 \
@@ -4026,7 +4026,7 @@ test panedwindow-19.117 {ComputeGeometry, sash coords, vertical} -setup {
     deleteWindows
 } -result {{2 30} {2 66}}
 
-test panedwindow-19.118 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
+test panedwindow-19.118 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 2 -sashpad 5 \
@@ -4047,10 +4047,10 @@ test panedwindow-19.118 {ComputeGeometry/ArrangePanes, slave coords, vert} -setu
 } -cleanup {
     deleteWindows
 } -result {{5 13 20 20} {5 71 20 20} {5 129 20 20}}
-test panedwindow-19.119 {ComputeGeometry, one slave, reqsize set properly} -setup {
+test panedwindow-19.119 {ComputeGeometry, one pane, reqsize set properly} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 2 -sashpad 5 \
@@ -4088,7 +4088,7 @@ test panedwindow-19.121 {ComputeGeometry, sash coords} -setup {
     deleteWindows
 } -result {{27 2} {60 2}}
 
-test panedwindow-19.122 {ComputeGeometry/ArrangePanes, slave coords} -setup {
+test panedwindow-19.122 {ComputeGeometry/ArrangePanes, pane coords} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 2 -sashpad 5 \
@@ -4109,10 +4109,10 @@ test panedwindow-19.122 {ComputeGeometry/ArrangePanes, slave coords} -setup {
     deleteWindows
 } -result {{13 5 20 20} {68 5 20 20} {123 5 20 20}}
 
-test panedwindow-19.123 {ComputeGeometry, one slave, vertical} -setup {
+test panedwindow-19.123 {ComputeGeometry, one pane, vertical} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 2 -sashpad 5 \
@@ -4155,7 +4155,7 @@ test panedwindow-19.125 {ComputeGeometry, sash coords, vertical} -setup {
     deleteWindows
 } -result {{2 27} {2 60}}
 
-test panedwindow-19.126 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
+test panedwindow-19.126 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 2 -sashpad 5 \
@@ -4176,10 +4176,10 @@ test panedwindow-19.126 {ComputeGeometry/ArrangePanes, slave coords, vert} -setu
 } -cleanup {
     deleteWindows
 } -result {{5 13 20 20} {5 68 20 20} {5 123 20 20}}
-test panedwindow-19.127 {ComputeGeometry, one slave, reqsize set properly} -setup {
+test panedwindow-19.127 {ComputeGeometry, one pane, reqsize set properly} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 2 -sashpad 5 \
@@ -4217,7 +4217,7 @@ test panedwindow-19.129 {ComputeGeometry, sash coords} -setup {
     deleteWindows
 } -result {{28 2} {64 2}}
 
-test panedwindow-19.130 {ComputeGeometry/ArrangePanes, slave coords} -setup {
+test panedwindow-19.130 {ComputeGeometry/ArrangePanes, pane coords} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 2 -sashpad 5 \
@@ -4238,10 +4238,10 @@ test panedwindow-19.130 {ComputeGeometry/ArrangePanes, slave coords} -setup {
     deleteWindows
 } -result {{13 5 20 20} {71 5 20 20} {129 5 20 20}}
 
-test panedwindow-19.131 {ComputeGeometry, one slave, vertical} -setup {
+test panedwindow-19.131 {ComputeGeometry, one pane, vertical} -setup {
     deleteWindows
 } -body {
-    # With just one slave, sashpad and sashwidth should not
+    # With just one pane, sashpad and sashwidth should not
     # affect the panedwindow's geometry, since no sash should
     # ever be drawn.
     panedwindow .p -borderwidth 2 -sashpad 5 \
@@ -4284,7 +4284,7 @@ test panedwindow-19.133 {ComputeGeometry, sash coords, vertical} -setup {
     deleteWindows
 } -result {{2 28} {2 64}}
 
-test panedwindow-19.134 {ComputeGeometry/ArrangePanes, slave coords, vert} -setup {
+test panedwindow-19.134 {ComputeGeometry/ArrangePanes, pane coords, vert} -setup {
     deleteWindows
 } -body {
     panedwindow .p -borderwidth 2 -sashpad 5 \
@@ -4317,7 +4317,7 @@ test panedwindow-20.1 {destroyed widgets are removed from panedwindow} -setup {
 } -cleanup {
 	deleteWindows
 } -result {}
-test panedwindow-20.2 {destroyed slave causes geometry recomputation} -setup {
+test panedwindow-20.2 {destroyed pane causes geometry recomputation} -setup {
 	deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 0 -sashwidth 2
@@ -4328,7 +4328,7 @@ test panedwindow-20.2 {destroyed slave causes geometry recomputation} -setup {
 } -cleanup {
     deleteWindows
 } -result 20
-    
+
 
 test panedwindow-21.1 {ArrangePanes, extra space is given to the last pane} -setup {
 	deleteWindows
@@ -4537,7 +4537,7 @@ test panedwindow-21.15 {ArrangePanes, last pane grows} -setup {
 } -result {50 150 1 1 211 50 150 1 89 300}
 
 
-test panedwindow-22.1 {PanedWindowReqProc, react to slave geometry changes} -setup {
+test panedwindow-22.1 {PanedWindowReqProc, react to pane geometry changes} -setup {
 	deleteWindows
 } -body {
     # Basically just want to make sure that the PanedWindowReqProc is called
@@ -4550,7 +4550,7 @@ test panedwindow-22.1 {PanedWindowReqProc, react to slave geometry changes} -set
 } -cleanup {
 	deleteWindows
 } -result {40 80}
-test panedwindow-22.2 {PanedWindowReqProc, react to slave geometry changes} -setup {
+test panedwindow-22.2 {PanedWindowReqProc, react to pane geometry changes} -setup {
 	deleteWindows
 } -body {
     panedwindow .p -orient horizontal -sashpad 0 -sashwidth 2
@@ -4824,7 +4824,7 @@ test panedwindow-23.21 {ConfigurePanes, -before, relocate existing windows} -set
 } -cleanup {
 	deleteWindows
 } -result {.d .b .a .c}
-test panedwindow-23.22 {ConfigurePanes, slave specified multiple times} -setup {
+test panedwindow-23.22 {ConfigurePanes, pane specified multiple times} -setup {
 	deleteWindows
 } -body {
     # This test should not cause a core dump
@@ -4839,7 +4839,7 @@ test panedwindow-23.22 {ConfigurePanes, slave specified multiple times} -setup {
 } -cleanup {
 	deleteWindows
 } -result {.a .b .c}
-test panedwindow-23.23 {ConfigurePanes, slave specified multiple times} -setup {
+test panedwindow-23.23 {ConfigurePanes, pane specified multiple times} -setup {
 	deleteWindows
 } -body {
     # This test should not cause a core dump
@@ -5146,7 +5146,7 @@ test panedwindow-25.1 {DestroyPanedWindow} -setup {
     }
     set result {}
 } -result {}
-test panedwindow-25.2 {UnmapNotify and MapNotify events are propagated to slaves} -setup {
+test panedwindow-25.2 {UnmapNotify and MapNotify events are propagated to panes} -setup {
     deleteWindows
 } -body {
     panedwindow .pw
diff --git a/tests/place.test b/tests/place.test
index e7cf5ff..d389be9 100644
--- a/tests/place.test
+++ b/tests/place.test
@@ -53,17 +53,17 @@ test place-1.3 {Tk_PlaceCmd procedure, "info" option} -setup {
 } -result {-in {.t.a b} -x 1 -relx 0.2 -y 2 -rely 0.2 -width {} -relwidth 0.3 -height 4 -relheight {} -anchor w -bordermode ignore}
 
 
-test place-2.1 {ConfigureSlave procedure, -height option} -body {
+test place-2.1 {ConfigureContent procedure, -height option} -body {
     place .t.f2 -height abcd
 } -returnCodes error -result {bad screen distance "abcd"}
-test place-2.2 {ConfigureSlave procedure, -height option} -setup {
+test place-2.2 {ConfigureContent procedure, -height option} -setup {
     place forget .t.f2
 } -body {
     place .t.f2 -in .t.f -height 40
     update
     winfo height .t.f2
 } -result {40}
-test place-2.3 {ConfigureSlave procedure, -height option} -setup {
+test place-2.3 {ConfigureContent procedure, -height option} -setup {
     place forget .t.f2
 } -body {
     place .t.f2 -in .t.f -height 120
@@ -74,17 +74,17 @@ test place-2.3 {ConfigureSlave procedure, -height option} -setup {
 } -result {60}
 
 
-test place-3.1 {ConfigureSlave procedure, -relheight option} -body {
+test place-3.1 {ConfigureContent procedure, -relheight option} -body {
     place .t.f2 -relheight abcd
 } -returnCodes error -result {expected floating-point number but got "abcd"}
-test place-3.2 {ConfigureSlave procedure, -relheight option} -setup {
+test place-3.2 {ConfigureContent procedure, -relheight option} -setup {
     place forget .t.f2
 } -body {
     place .t.f2 -in .t.f -relheight .5
     update
     winfo height .t.f2
 } -result {40}
-test place-3.3 {ConfigureSlave procedure, -relheight option} -setup {
+test place-3.3 {ConfigureContent procedure, -relheight option} -setup {
     place forget .t.f2
 } -body {
     place .t.f2 -in .t.f -relheight .8
@@ -95,30 +95,30 @@ test place-3.3 {ConfigureSlave procedure, -relheight option} -setup {
 } -result {60}
 
 
-test place-4.1 {ConfigureSlave procedure, bad -in options} -setup {
+test place-4.1 {ConfigureContent procedure, bad -in options} -setup {
     place forget .t.f2
 } -body {
     place .t.f2 -in .t.f2
 } -returnCodes error -result {can't place .t.f2 relative to itself}
-test place-4.2 {ConfigureSlave procedure, bad -in option} -setup {
+test place-4.2 {ConfigureContent procedure, bad -in option} -setup {
     place forget .t.f2
 } -body {
     set result [list [winfo manager .t.f2]]
     catch {place .t.f2 -in .t.f2}
     lappend result [winfo manager .t.f2]
 } -result {{} {}}
-test place-4.3 {ConfigureSlave procedure, bad -in option} -setup {
+test place-4.3 {ConfigureContent procedure, bad -in option} -setup {
     place forget .t.f2
 } -body {
     winfo manager .t.f2
     place .t.f2 -in .t.f2
 } -returnCodes error -result {can't place .t.f2 relative to itself}
-test place-4.4 {ConfigureSlave procedure, bad -in option} -setup {
+test place-4.4 {ConfigureContent procedure, bad -in option} -setup {
     place forget .t.f2
 } -body {
     place .t.f2 -in .
 } -returnCodes error -result {can't place .t.f2 relative to .}
-test place-4.5 {ConfigureSlave procedure, bad -in option} -setup {
+test place-4.5 {ConfigureContent procedure, bad -in option} -setup {
 } -body {
     frame .t.f1
     place .t.f1 -in .t.f1
@@ -139,17 +139,17 @@ test place-4.7 {prevent management loops} -setup {
     place .t.f3 -in .t.f1
 } -returnCodes error -result {can't put .t.f3 inside .t.f1, would cause management loop}
 
-test place-5.1 {ConfigureSlave procedure, -relwidth option} -body {
+test place-5.1 {ConfigureContent procedure, -relwidth option} -body {
     place .t.f2 -relwidth abcd
 } -returnCodes error -result {expected floating-point number but got "abcd"}
-test place-5.2 {ConfigureSlave procedure, -relwidth option} -setup {
+test place-5.2 {ConfigureContent procedure, -relwidth option} -setup {
     place forget .t.f2
 } -body {
     place .t.f2 -in .t.f -relwidth .5
     update
     winfo width .t.f2
 } -result {75}
-test place-5.3 {ConfigureSlave procedure, -relwidth option} -setup {
+test place-5.3 {ConfigureContent procedure, -relwidth option} -setup {
     place forget .t.f2
 } -body {
     place .t.f2 -in .t.f -relwidth .8
@@ -159,17 +159,17 @@ test place-5.3 {ConfigureSlave procedure, -relwidth option} -setup {
     winfo width .t.f2
 } -result {30}
 
-test place-6.1 {ConfigureSlave procedure, -width option} -body {
+test place-6.1 {ConfigureContent procedure, -width option} -body {
     place .t.f2 -width abcd
 } -returnCodes error -result {bad screen distance "abcd"}
-test place-6.2 {ConfigureSlave procedure, -width option} -setup {
+test place-6.2 {ConfigureContent procedure, -width option} -setup {
     place forget .t.f2
 } -body {
     place .t.f2 -in .t.f -width 100
     update
     winfo width .t.f2
 } -result {100}
-test place-6.3 {ConfigureSlave procedure, -width option} -setup {
+test place-6.3 {ConfigureContent procedure, -width option} -setup {
     place forget .t.f2
 } -body {
     place .t.f2 -in .t.f -width 120
@@ -267,7 +267,7 @@ if {[tk windowingsystem] == "win32"} {
     }
 }
 
-test place-8.1 {MasterStructureProc, mapping and unmapping slaves} -setup {
+test place-8.1 {PlaceStructureProc, mapping and unmapping content} -setup {
     place forget .t.f2
     place forget .t.f
 } -body {
@@ -283,7 +283,7 @@ test place-8.1 {MasterStructureProc, mapping and unmapping slaves} -setup {
     placeUpdate
     lappend result [winfo ismapped .t.f2]
 } -result {1 0 40 30 0 1}
-test place-8.2 {MasterStructureProc, mapping and unmapping slaves} -setup {
+test place-8.2 {PlaceStructureProc, mapping and unmapping content} -setup {
     place forget .t.f2
     place forget .t.f
     update idletasks
@@ -380,17 +380,17 @@ test place-9.11 {PlaceObjCmd, info errors} -setup {
 } -cleanup {
     destroy .foo
 } -returnCodes error -result {wrong # args: should be "place info pathName"}
-test place-9.12 {PlaceObjCmd, slaves errors} -setup {
+test place-9.12 {PlaceObjCmd, content errors} -setup {
     destroy .foo
 } -body {
     frame .foo
-    place slaves .foo bar
+    place content .foo bar
 } -cleanup {
     destroy .foo
-} -returnCodes error -result {wrong # args: should be "place slaves pathName"}
+} -returnCodes error -result {wrong # args: should be "place content pathName"}
 
 
-test place-10.1 {ConfigureSlave} -setup {
+test place-10.1 {ConfigureContent} -setup {
     destroy .foo
 } -body {
     frame .foo
@@ -398,7 +398,7 @@ test place-10.1 {ConfigureSlave} -setup {
 } -cleanup {
     destroy .foo
 } -returnCodes error -result {unknown option "-badopt"}
-test place-10.2 {ConfigureSlave} -setup {
+test place-10.2 {ConfigureContent} -setup {
     destroy .foo
 } -body {
     frame .foo
@@ -406,7 +406,7 @@ test place-10.2 {ConfigureSlave} -setup {
 } -cleanup {
     destroy .foo
 } -returnCodes error -result {value for "-anchor" missing}
-test place-10.3 {ConfigureSlave} -setup {
+test place-10.3 {ConfigureContent} -setup {
     destroy .foo
 } -body {
     frame .foo
@@ -414,7 +414,7 @@ test place-10.3 {ConfigureSlave} -setup {
 } -cleanup {
     destroy .foo
 } -returnCodes error -result {bad bordermode "j": must be inside, outside, or ignore}
-test place-10.4 {ConfigureSlave} -setup {
+test place-10.4 {ConfigureContent} -setup {
     destroy .foo
 } -body {
     frame .foo
@@ -422,23 +422,23 @@ test place-10.4 {ConfigureSlave} -setup {
 } -cleanup {
     destroy .foo
 } -returnCodes error -result {value for "-y" missing}
-    
 
-test place-11.1 {PlaceObjCmd, slaves command} -setup {
+
+test place-11.1 {PlaceObjCmd, content command} -setup {
     destroy .foo
 } -body {
     frame .foo
-    place slaves .foo
+    place content .foo
 } -cleanup {
     destroy .foo
 } -result {}
-test place-11.2 {PlaceObjCmd, slaves command} -setup {
+test place-11.2 {PlaceObjCmd, content command} -setup {
     destroy .foo .bar
 } -body {
     frame .foo
     frame .bar
     place .bar -in .foo
-    place slaves .foo
+    place content .foo
 } -cleanup {
     destroy .foo .bar
 } -result [list .bar]
@@ -500,7 +500,7 @@ test place-14.1 {memory leak testing} -constraints memory -setup {
         return $res
     }
 } -body {
-    # Test all manners of forgetting a slave
+    # Test all manners of forgetting content
     frame .f
     frame .f.f
     stress {
diff --git a/tests/textIndex.test b/tests/textIndex.test
index 612ade1..4db3548 100644
--- a/tests/textIndex.test
+++ b/tests/textIndex.test
@@ -74,7 +74,7 @@ test textIndex-1.9 {TkTextMakeByteIndex: shortcut for 0} {testtext} {
     testtext .t byteindex 3 80
 } {3.5 5}
 test textIndex-1.10 {TkTextMakeByteIndex: verify index is in range} {testtext} {
-    # for (segPtr = indexPtr->linePtr->segPtr; ; segPtr = segPtr->nextPtr) 
+    # for (segPtr = indexPtr->linePtr->segPtr; ; segPtr = segPtr->nextPtr)
     # one segment
 
     testtext .t byteindex 3 5
@@ -84,7 +84,7 @@ test textIndex-1.11 {TkTextMakeByteIndex: verify index is in range} {testtext} {
     #     index += segPtr->size
     # Multiple segments, make sure add segment size to index.
 
-    .t mark set foo 3.2 
+    .t mark set foo 3.2
     set x [testtext .t byteindex 3 7]
     .t mark unset foo
     set x
@@ -117,7 +117,7 @@ test textIndex-1.16 {TkTextMakeByteIndex: UTF-8 characters} {testtext} {
 } {5.18 20}
 test textIndex-1.17 {TkTextMakeByteIndex: prevent splitting UTF-8 character} \
 	{testtext} {
-    # ((byteIndex > index) && (segPtr->typePtr == &tkTextCharType)) 
+    # ((byteIndex > index) && (segPtr->typePtr == &tkTextCharType))
     # Wrong answer would be \xb9 (the 2nd byte of UTF rep of 0x4e4f).
 
     set x [testtext .t byteindex 5 2]
@@ -125,7 +125,7 @@ test textIndex-1.17 {TkTextMakeByteIndex: prevent splitting UTF-8 character} \
 } {{5.2 4} y}
 test textIndex-1.18 {TkTextMakeByteIndex: prevent splitting UTF-8 character} \
 	{testtext} {
-    # ((byteIndex > index) && (segPtr->typePtr == &tkTextCharType)) 
+    # ((byteIndex > index) && (segPtr->typePtr == &tkTextCharType))
     testtext .t byteindex 5 1
     .t get insert
 } "\u4e4f"
@@ -168,7 +168,7 @@ test textIndex-2.9 {TkTextMakeCharIndex: verify index is in range} {
     # for (segPtr = indexPtr->linePtr->segPtr; ; segPtr = segPtr->nextPtr)
     # Multiple segments, make sure add segment size to index.
 
-    .t mark set foo 3.2 
+    .t mark set foo 3.2
     set x [.t index 3.7]
     .t mark unset foo
     set x
@@ -439,7 +439,7 @@ test textIndex-12.5 {TkTextIndexForwChars: find index} {
 test textIndex-12.6 {TkTextIndexForwChars: find index} {
     # for ( ; segPtr != NULL; segPtr = segPtr->nextPtr)
     # border condition: segPtr == NULL -> beginning of next line
-    
+
     .t index {2.3 + 11 chars}
 } 3.0
 test textIndex-12.7 {TkTextIndexForwChars: find index} {
@@ -458,7 +458,7 @@ test textIndex-12.9 {TkTextIndexForwChars: find index} {
     .t image create 2.4 -image textimage
     set x [.t get {2.3 + 3 chars}]
     .t delete 2.4
-    set x    
+    set x
 } "f"
 test textIndex-12.10 {TkTextIndexForwChars: find index} {
     # dstPtr->byteIndex += segPtr->size - byteOffset
@@ -588,11 +588,11 @@ test textIndex-14.11 {TkTextIndexBackChars: move to previous segment} {
     set x
 } 2.9
 test textIndex-14.12 {TkTextIndexBackChars: move to previous line} {
-    # (lineIndex == 0) 
+    # (lineIndex == 0)
     .t index {1.5 - 10 chars}
 } 1.0
 test textIndex-14.13 {TkTextIndexBackChars: move to previous line} {
-    # not (lineIndex == 0) 
+    # not (lineIndex == 0)
     .t index {2.5 - 10 chars}
 } 1.2
 test textIndex-14.14 {TkTextIndexBackChars: move to previous line} {
@@ -812,7 +812,7 @@ test textIndex-19.12.2 {Display lines} {
 } {1}
 
 test textIndex-19.13 {Display lines} {
-    destroy {*}[pack slaves .]
+    destroy {*}[pack content .]
     text .txt -height 1 -wrap word -yscroll ".sbar set" -width 400
     scrollbar .sbar -command ".txt yview"
     grid .txt .sbar -sticky news
diff --git a/tests/textWind.test b/tests/textWind.test
index e71abe6..db75c68 100644
--- a/tests/textWind.test
+++ b/tests/textWind.test
@@ -582,7 +582,7 @@ test textWind-6.1 {EmbWinRequestProc procedure} -setup {
     [list [expr {$padx+2*$fixedWidth+25}] [expr {$pady+((30-$fixedHeight)/2)}] $fixedWidth $fixedHeight]]
 
 
-test textWind-7.1 {EmbWinLostSlaveProc procedure} -setup {
+test textWind-7.1 {EmbWinLostContentProc procedure} -setup {
     .t delete 1.0 end
     destroy .f
 } -body {
@@ -599,7 +599,7 @@ test textWind-7.1 {EmbWinLostSlaveProc procedure} -setup {
     10x20+[expr {$padx+100}]+[expr {$pady+50}] \
     [list [expr {$padx+2*$fixedWidth}] [expr {$pady+($fixedHeight/2)}] 0 0]]
 
-test textWind-7.2 {EmbWinLostSlaveProc procedure} -setup {
+test textWind-7.2 {EmbWinLostContentProc procedure} -setup {
     .t delete 1.0 end
     destroy .t.f
 } -body {
diff --git a/tests/ttk/labelframe.test b/tests/ttk/labelframe.test
index 28b4d2e..6b4761f 100644
--- a/tests/ttk/labelframe.test
+++ b/tests/ttk/labelframe.test
@@ -31,49 +31,49 @@ test labelframe-2.4 "Can't use nonexistent-windows as -labelwidget" -body {
 ###
 # See also series labelframe-4.x
 #
-test labelframe-3.1 "Add child slave" -body {
+test labelframe-3.1 "Add child content" -body {
     checkbutton .lf.cb -text "abcde"
     .lf configure -labelwidget .lf.cb
     list [update; winfo viewable .lf.cb] [winfo manager .lf.cb]
 } -result [list 1 labelframe]
 
-test labelframe-3.2 "Remove child slave" -body {
+test labelframe-3.2 "Remove child content" -body {
     .lf configure -labelwidget {}
     list [update; winfo viewable .lf.cb] [winfo manager .lf.cb]
 } -result [list 0 {}]
 
-test labelframe-3.3 "Re-add child slave" -body {
+test labelframe-3.3 "Re-add child content" -body {
     .lf configure -labelwidget .lf.cb
     list [update; winfo viewable .lf.cb] [winfo manager .lf.cb]
 } -result [list 1 labelframe]
 
-test labelframe-3.4 "Re-manage child slave" -body {
+test labelframe-3.4 "Re-manage child content" -body {
     pack .lf.cb -side right
     list [update; winfo viewable .lf.cb] [winfo manager .lf.cb] [.lf cget -labelwidget]
 } -result [list 1 pack {}]
 
-test labelframe-3.5 "Re-add child slave" -body {
+test labelframe-3.5 "Re-add child content" -body {
     .lf configure -labelwidget .lf.cb
     list [update; winfo viewable .lf.cb] [winfo manager .lf.cb]
 } -result [list 1 labelframe]
 
-test labelframe-3.6 "Destroy child slave" -body {
+test labelframe-3.6 "Destroy child content" -body {
     destroy .lf.cb
     .lf cget -labelwidget
 } -result {}
 
 ###
-# Re-run series labelframe-3.x with nonchild slaves.
+# Re-run series labelframe-3.x with nonchild content.
 #
 # @@@ ODDITY, 14 Nov 2005:
 # @@@ labelframe-4.1 fails if .cb is a [checkbutton],
 # @@@ but seems to succeed if it's some other widget class.
 # @@@ I suspect a race condition; unable to track it down ATM.
 #
-# @@@ FOLLOWUP: This *may* have been caused by a bug in ManagerIdleProc 
+# @@@ FOLLOWUP: This *may* have been caused by a bug in ManagerIdleProc
 # @@@ (see manager.c r1.11). There's still probably a race condition in here.
 #
-test labelframe-4.1 "Add nonchild slave" -body {
+test labelframe-4.1 "Add nonchild content" -body {
     checkbutton .cb -text "abcde"
     .lf configure -labelwidget .cb
     update
@@ -81,32 +81,32 @@ test labelframe-4.1 "Add nonchild slave" -body {
 
 } -result [list 1 1 labelframe]
 
-test labelframe-4.2 "Remove nonchild slave" -body {
+test labelframe-4.2 "Remove nonchild content" -body {
     .lf configure -labelwidget {}
     update;
     list [winfo ismapped .cb] [winfo viewable .cb] [winfo manager .cb]
 } -result [list 0 0 {}]
 
-test labelframe-4.3 "Re-add nonchild slave" -body {
+test labelframe-4.3 "Re-add nonchild content" -body {
     .lf configure -labelwidget .cb
     list [update; winfo viewable .cb] [winfo manager .cb]
 } -result [list 1 labelframe]
 
-test labelframe-4.4 "Re-manage nonchild slave" -body {
+test labelframe-4.4 "Re-manage nonchild content" -body {
     pack .cb -side right
     list [update; winfo viewable .cb] \
     	[winfo manager .cb] \
 	[.lf cget -labelwidget]
 } -result [list 1 pack {}]
 
-test labelframe-4.5 "Re-add nonchild slave" -body {
+test labelframe-4.5 "Re-add nonchild content" -body {
     .lf configure -labelwidget .cb
     list [update; winfo viewable .cb] \
     	[winfo manager .cb] \
 	[.lf cget -labelwidget]
 } -result [list 1 labelframe .cb]
 
-test labelframe-4.6 "Destroy nonchild slave" -body {
+test labelframe-4.6 "Destroy nonchild content" -body {
     destroy .cb
     .lf cget -labelwidget
 } -result {}
diff --git a/tests/ttk/panedwindow.test b/tests/ttk/panedwindow.test
index 7fe5c87..f72ffb8 100644
--- a/tests/ttk/panedwindow.test
+++ b/tests/ttk/panedwindow.test
@@ -262,7 +262,7 @@ test paned-propagation-1 "Initial request size" -body {
     list [winfo reqwidth .pw] [winfo reqheight .pw]
 } -result [list 100 105]
 
-test paned-propagation-2 "Slave change before map" -body {
+test paned-propagation-2 "Pane change before map" -body {
     .pw.f1 configure -width 200 -height 100
     propagate-geometry
     list [winfo reqwidth .pw] [winfo reqheight .pw]
@@ -274,13 +274,13 @@ test paned-propagation-3 "Map window" -body {
     list [winfo width .pw] [winfo height .pw] [.pw sashpos 0]
 } -result [list 200 155 100]
 
-test paned-propagation-4 "Slave change after map, off-axis" -body {
+test paned-propagation-4 "Pane change after map, off-axis" -body {
     .pw.f1 configure -width 100 ;# should be granted
     propagate-geometry
     list [winfo reqwidth .pw] [winfo reqheight .pw] [.pw sashpos 0]
 } -result [list 100 155 100]
 
-test paned-propagation-5 "Slave change after map, on-axis" -body {
+test paned-propagation-5 "Pane change after map, on-axis" -body {
     .pw.f1 configure -height 50 ;# should be denied
     propagate-geometry
     list [winfo reqwidth .pw] [winfo reqheight .pw] [.pw sashpos 0]
diff --git a/tests/unixEmbed.test b/tests/unixEmbed.test
index 428e510..0f9033f 100644
--- a/tests/unixEmbed.test
+++ b/tests/unixEmbed.test
@@ -150,21 +150,21 @@ test unixEmbed-1.5a {TkpUseWindow procedure, creating Container records} -constr
     unix testembed
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     frame .f2 -container 1 -width 200 -height 50
     pack .f1 .f2
-    slave alias w winfo id .f1
-    slave eval {
+    child alias w winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t -use [w]
         list [testembed] [expr {[lindex [lindex [testembed all] 0] 0] - [w]}]
     }
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result {{{XXX {} {} .t}} 0}
 test unixEmbed-1.6 {TkpUseWindow procedure, creating Container records} -constraints {
@@ -190,23 +190,23 @@ test unixEmbed-1.6a {TkpUseWindow procedure, creating Container records} -constr
     unix testembed
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     frame .f2 -container 1 -width 200 -height 50
     pack .f1 .f2
-    slave alias w1 winfo id .f1
-    slave alias w2 winfo id .f2
-    slave eval {
+    child alias w1 winfo id .f1
+    child alias w2 winfo id .f2
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1]
         toplevel .t2 -use [w2]
         testembed
     }
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result {{XXX {} {} .t2} {XXX {} {} .t1}}
 test unixEmbed-1.7 {TkpUseWindow procedure, container and embedded in same app} -constraints {
@@ -253,21 +253,21 @@ test unixEmbed-2.1a {EmbeddedEventProc procedure} -constraints {
     unix testembed
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
-    slave alias w1 winfo id .f1
-    slave eval {
+    child alias w1 winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1]
         testembed
     }
     destroy .f1
     update
-    slave eval {
+    child eval {
         testembed
     }
 } -cleanup {
@@ -295,14 +295,14 @@ test unixEmbed-2.2a {EmbeddedEventProc procedure} -constraints {
     unix testembed
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
-    slave alias w1 winfo id .f1
-    slave eval {
+    child alias w1 winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1]
         testembed
@@ -310,7 +310,7 @@ test unixEmbed-2.2a {EmbeddedEventProc procedure} -constraints {
         testembed
     }
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result {}
 test unixEmbed-2.3 {EmbeddedEventProc procedure} -constraints {
@@ -361,22 +361,22 @@ test unixEmbed-3.1 {ContainerEventProc procedure, detect creation} -constraints
 test unixEmbed-3.1a {ContainerEventProc procedure, detect creation} -constraints {
     unix testembed
 } -setup {
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
-    slave alias w1 winfo id .f1
+    child alias w1 winfo id .f1
     set x [testembed]
-    slave eval {
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1]
         wm withdraw .t1
     }
     list $x [testembed]
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result {{{XXX .f1 {} {}}} {{XXX .f1 {} {}}}}
 test unixEmbed-3.2 {ContainerEventProc procedure, set size on creation} -constraints {
@@ -418,14 +418,14 @@ test unixEmbed-3.3a {ContainerEventProc procedure, disallow position changes} -c
     unix
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
-    slave alias w1 winfo id .f1
-    slave eval {
+    child alias w1 winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1] -bd 2 -relief raised
         update
@@ -434,7 +434,7 @@ test unixEmbed-3.3a {ContainerEventProc procedure, disallow position changes} -c
         wm geometry .t1
     }
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result {200x200+0+0}
 test unixEmbed-3.4 {ContainerEventProc procedure, disallow position changes} -constraints {
@@ -462,14 +462,14 @@ test unixEmbed-3.4a {ContainerEventProc procedure, disallow position changes} -c
     unix
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
-    slave alias w1 winfo id .f1
-    slave eval {
+    child alias w1 winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1]
         update
@@ -478,7 +478,7 @@ test unixEmbed-3.4a {ContainerEventProc procedure, disallow position changes} -c
         wm geometry .t1
     }
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result {300x100+0+0}
 test unixEmbed-3.5 {ContainerEventProc procedure, geometry requests} -constraints {
@@ -506,22 +506,22 @@ test unixEmbed-3.5a {ContainerEventProc procedure, geometry requests} -constrain
     unix
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
-    slave alias w1 winfo id .f1
-    slave eval {
+    child alias w1 winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1]
         .t1 configure -width 300 -height 80
         update
     }
-    list [winfo width .f1] [winfo height .f1] [slave eval {wm geometry .t1}]
+    list [winfo width .f1] [winfo height .f1] [child eval {wm geometry .t1}]
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result {300 80 300x80+0+0}
 test unixEmbed-3.6 {ContainerEventProc procedure, map requests} -constraints {
@@ -551,14 +551,14 @@ test unixEmbed-3.6a {ContainerEventProc procedure, map requests} -constraints {
     unix
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
-    slave alias w1 winfo id .f1
-    slave eval {
+    child alias w1 winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1]
         set x unmapped
@@ -569,7 +569,7 @@ test unixEmbed-3.6a {ContainerEventProc procedure, map requests} -constraints {
         set x
     }
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result {mapped}
 test unixEmbed-3.7 {ContainerEventProc procedure, destroy events} -constraints {
@@ -599,16 +599,16 @@ test unixEmbed-3.7a {ContainerEventProc procedure, destroy events} -constraints
     unix
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
-    slave alias w1 winfo id .f1
+    child alias w1 winfo id .f1
     bind .f1 <Destroy> {set x dead}
     set x alive
-    slave eval {
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1]
         update
@@ -617,7 +617,7 @@ test unixEmbed-3.7a {ContainerEventProc procedure, destroy events} -constraints
     update
     list $x [winfo exists .f1]
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result {dead 0}
 
@@ -648,14 +648,14 @@ test unixEmbed-4.1a {EmbedStructureProc procedure, configure events} -constraint
     unix
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
-    slave alias w1 winfo id .f1
-    slave eval {
+    child alias w1 winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1]
         update
@@ -664,7 +664,7 @@ test unixEmbed-4.1a {EmbedStructureProc procedure, configure events} -constraint
         winfo geometry .t1
     }
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result {180x100+0+0}
 test unixEmbed-4.2 {EmbedStructureProc procedure, destroy events} -constraints {
@@ -691,15 +691,15 @@ test unixEmbed-4.2a {EmbedStructureProc procedure, destroy events} -constraints
     unix testembed
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
     update
-    slave alias w1 winfo id .f1
-    slave eval {
+    child alias w1 winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1]
     }
@@ -707,7 +707,7 @@ test unixEmbed-4.2a {EmbedStructureProc procedure, destroy events} -constraints
     destroy .f1
     list $x [testembed]
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result "{{XXX .f1 {} {}}} {}"
 
@@ -737,14 +737,14 @@ test unixEmbed-5.1a {EmbedFocusProc procedure, FocusIn events} -constraints {
     unix
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
-    slave alias w1 winfo id .f1
-    slave eval {
+    child alias w1 winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1]
         bind .t1 <FocusIn> {lappend x "focus in %W"}
@@ -754,9 +754,9 @@ test unixEmbed-5.1a {EmbedFocusProc procedure, FocusIn events} -constraints {
     }
     focus -force .f1
     update
-    slave eval {set x}
+    child eval {set x}
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result {{focus in .t1}}
 test unixEmbed-5.2 {EmbedFocusProc procedure, focusing on dead window} -constraints {
@@ -785,14 +785,14 @@ test unixEmbed-5.2a {EmbedFocusProc procedure, focusing on dead window} -constra
     unix
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
-    slave alias w1 winfo id .f1
-    slave eval {
+    child alias w1 winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1]
         update
@@ -802,7 +802,7 @@ test unixEmbed-5.2a {EmbedFocusProc procedure, focusing on dead window} -constra
     focus -force .f1
     update
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result {}
 test unixEmbed-5.3 {EmbedFocusProc procedure, FocusOut events} -constraints {
@@ -833,14 +833,14 @@ test unixEmbed-5.3a {EmbedFocusProc procedure, FocusOut events} -constraints {
     unix
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
-    slave alias w1 winfo id .f1
-    slave eval {
+    child alias w1 winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1]
         set x {}
@@ -850,12 +850,12 @@ test unixEmbed-5.3a {EmbedFocusProc procedure, FocusOut events} -constraints {
     }
     focus -force .f1
     update
-    set x [slave eval {update; set x }]
+    set x [child eval {update; set x }]
     focus .
     update
-    list $x [slave eval {update; set x}]
+    list $x [child eval {update; set x}]
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result {{{focus in .t1}} {{focus in .t1} {focus out .t1}}}
 
@@ -885,14 +885,14 @@ test unixEmbed-6.1a {EmbedGeometryRequest procedure, window changes size} -const
     unix
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
-    slave alias w1 winfo id .f1
-    slave eval {
+    child alias w1 winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1]
         update
@@ -903,7 +903,7 @@ test unixEmbed-6.1a {EmbedGeometryRequest procedure, window changes size} -const
         list $x [winfo geom .t1]
     }
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result {{configure .t1 300 120} 300x120+0+0}
 test unixEmbed-6.2 {EmbedGeometryRequest procedure, window changes size} -constraints {
@@ -931,15 +931,15 @@ test unixEmbed-6.2a {EmbedGeometryRequest procedure, window changes size} -const
     unix
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     place .f1 -width 200 -height 200
     update
-    slave alias w1 winfo id .f1
-    slave eval {
+    child alias w1 winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1]
         update
@@ -950,7 +950,7 @@ test unixEmbed-6.2a {EmbedGeometryRequest procedure, window changes size} -const
         list $x [winfo geom .t1]
     }
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result {{configure .t1 200 200} 200x200+0+0}
 
@@ -991,22 +991,22 @@ test unixEmbed-7.1a {TkpRedirectKeyEvent procedure, forward keystroke} -constrai
     unix notAqua
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     deleteWindows
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
-    slave alias w1 winfo id .f1
-    slave eval {
+    child alias w1 winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1]
     }
     focus -force .
     bind . <KeyPress> {lappend x {key %A %E}}
     set x {}
-    set y [slave eval {
+    set y [child eval {
         update
         bind .t1 <KeyPress> {lappend y {key %A}}
         set y {}
@@ -1016,7 +1016,7 @@ test unixEmbed-7.1a {TkpRedirectKeyEvent procedure, forward keystroke} -constrai
     update
     list $x $y
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
     bind . <KeyPress> {}
 } -result {{{key a 1}} {}}
@@ -1054,14 +1054,14 @@ test unixEmbed-7.2a {TkpRedirectKeyEvent procedure, don't forward keystroke widt
     unix
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
-    slave alias w1 winfo id .f1
-    slave eval {
+    child alias w1 winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1]
     }
@@ -1070,7 +1070,7 @@ test unixEmbed-7.2a {TkpRedirectKeyEvent procedure, don't forward keystroke widt
     update
     bind . <KeyPress> {lappend x {key %A}}
     set x {}
-    set y [slave eval {
+    set y [child eval {
         update
         bind .t1 <KeyPress> {lappend y {key %A}}
         set y {}
@@ -1080,7 +1080,7 @@ test unixEmbed-7.2a {TkpRedirectKeyEvent procedure, don't forward keystroke widt
     update
     list $x $y
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
     bind . <KeyPress> {}
 } -result {{} {{key b}}}
@@ -1113,30 +1113,30 @@ test unixEmbed-8.1 {TkpClaimFocus procedure} -constraints {
 } -result {{{} .t1} .f1}
 test unixEmbed-8.1a {TkpClaimFocus procedure} -constraints unix -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     frame .f2 -width 200 -height 50
     pack .f1 .f2
     update
-    slave alias w1 winfo id .f1
-    slave eval {
+    child alias w1 winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1] -highlightthickness 2 -bd 2 -relief sunken
     }
     # This should clear focus from the application embedded in .f1
     focus -force .f2
     update
-    list [slave eval {
+    list [child eval {
         set x [list [focus]]
         focus .t1
 	update
         lappend x [focus]
     }] [focus]
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result {{{} .t1} .f1}
 test unixEmbed-8.2 {TkpClaimFocus procedure} -constraints unix -setup {
@@ -1211,14 +1211,14 @@ test unixEmbed-9.2a {EmbedWindowDeleted procedure, check embeddedPtr} -constrain
     unix testembed
 } -setup {
     deleteWindows
-    catch {interp delete slave}
-    ::_test_tmp::testInterp slave
-    load {} Tktest slave
+    catch {interp delete child}
+    ::_test_tmp::testInterp child
+    load {} Tktest child
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
-    slave alias w1 winfo id .f1
-    slave eval {
+    child alias w1 winfo id .f1
+    child eval {
         destroy [winfo child .]
         toplevel .t1 -use [w1] -highlightthickness 2 -bd 2 -relief sunken
         set x {}
@@ -1227,7 +1227,7 @@ test unixEmbed-9.2a {EmbedWindowDeleted procedure, check embeddedPtr} -constrain
         lappend x [testembed]
     }
 } -cleanup {
-    interp delete slave
+    interp delete child
     deleteWindows
 } -result {{{XXX {} {} .t1}} {}}
 
diff --git a/tests/unixWm.test b/tests/unixWm.test
index 39a68ae..10050de 100644
--- a/tests/unixWm.test
+++ b/tests/unixWm.test
@@ -1298,7 +1298,7 @@ test unixWm-37.3 {Tk_WmCmd procedure, "transient" option} {unix testwrapper} {
     destroy .t2
     set result
 } {{} {} .t 0 {} {}}
-test unixWm-37.4 {TkWmDeadWindow, destroy on master should clear transient} {unix testwrapper} {
+test unixWm-37.4 {TkWmDeadWindow, destroy on toplevel should clear transient} {unix testwrapper} {
     destroy .t2
     toplevel .t2
     destroy .t3
@@ -1309,7 +1309,7 @@ test unixWm-37.4 {TkWmDeadWindow, destroy on master should clear transient} {uni
     update
     list [wm transient .t2] [testprop [testwrapper .t2] WM_TRANSIENT_FOR]
 } {{} {}}
-test unixWm-37.5 {Tk_WmCmd procedure, "transient" option, create master wrapper} {unix testwrapper} {
+test unixWm-37.5 {Tk_WmCmd procedure, "transient" option, create toplevel wrapper} {unix testwrapper} {
     destroy .t2
     destroy .t3
     toplevel .t2 -width 120 -height 300
@@ -1840,7 +1840,7 @@ test unixWm-50.3 {
 	Tk_CoordsToWindow procedure, finding a toplevel with embedding
 } tempNotWin {
     deleteWindows
-    catch {interp delete slave}
+    catch {interp delete child}
 
     toplevel .t -width 300 -height 400 -bg blue
     wm geom .t +100+100
@@ -1848,10 +1848,10 @@ test unixWm-50.3 {
     place .t.f -x 150 -y 50
     tkwait visibility .t.f
     update
-    interp create slave
-    load {} Tk slave
-    slave alias frameid winfo id .t.f
-    slave eval {
+    interp create child
+    load {} Tk child
+    child alias frameid winfo id .t.f
+    child eval {
 	wm withdraw .
         toplevel .x -width 100 -height 80 -use [frameid] -bg yellow
         tkwait visibility .x
@@ -1859,9 +1859,9 @@ test unixWm-50.3 {
         set x [winfo rootx .x]
         set y [winfo rooty .x]
     }
-    set result [list [slave eval {winfo containing [expr $x - 1]  [expr $y + 50]}] \
-	       	     [slave eval {winfo containing $x [expr $y + 50]}]]
-    interp delete slave
+    set result [list [child eval {winfo containing [expr $x - 1]  [expr $y + 50]}] \
+	       	     [child eval {winfo containing $x [expr $y + 50]}]]
+    interp delete child
     set x [winfo rootx .t]
     set y [winfo rooty .t]
     lappend result [winfo containing [expr $x + 200] [expr $y + 49]] \
@@ -1871,17 +1871,17 @@ test unixWm-50.3 {
 test unixWm-50.4 {Tk_CoordsToWindow procedure, window in other application} unix {
     destroy .t
 
-    catch {interp delete slave}
+    catch {interp delete child}
     toplevel .t -width 200 -height 200 -bg green
     wm geometry .t +100+100
     tkwait visibility .t
     update
-    interp create slave
-    load {} Tk slave
-    slave eval {wm geometry . 200x200+100+100; tkwait visibility . ; update}
+    interp create child
+    load {} Tk child
+    child eval {wm geometry . 200x200+100+100; tkwait visibility . ; update}
     set result [list [winfo containing 200 200] \
-	    [slave eval {winfo containing 200 200}]]
-    interp delete slave
+	    [child eval {winfo containing 200 200}]]
+    interp delete child
     set result
 } {{} .}
 test unixWm-50.5 {Tk_CoordsToWindow procedure, handling menubars} {unix testmenubar} {
diff --git a/tests/wm.test b/tests/wm.test
index fac02fe..58910dd 100644
--- a/tests/wm.test
+++ b/tests/wm.test
@@ -1608,9 +1608,9 @@ test wm-transient-1.3 {usage} -returnCodes error -body {
 } -result {bad window path name "foo"}
 deleteWindows
 test wm-transient-1.4 {usage} -returnCodes error -body {
-    toplevel .master
+    toplevel .top
     toplevel .subject
-    wm transient .subject .master
+    wm transient .subject .top
     wm iconify .subject
 } -cleanup {
     deleteWindows
@@ -1634,11 +1634,11 @@ test wm-transient-1.6 {usage} -returnCodes error -body {
     deleteWindows
 } -result {can't make ".icon" a master: it is an icon for .top}
 test wm-transient-1.7 {usage} -returnCodes error -body {
-    toplevel .master
-    wm transient .master .master
+    toplevel .top
+    wm transient .top .top
 } -cleanup {
     deleteWindows
-} -result {setting ".master" as master creates a transient/master cycle}
+} -result {setting ".top" as master creates a transient/master cycle}
 test wm-transient-1.8 {usage} -returnCodes error -body {
     toplevel .t1
     toplevel .t2
@@ -1650,73 +1650,73 @@ test wm-transient-1.8 {usage} -returnCodes error -body {
     deleteWindows
 } -result {setting ".t3" as master creates a transient/master cycle}
 test wm-transient-1.9 {usage} -returnCodes error -body {
-    toplevel .master
-    frame .master.f
-    wm transient .master .master.f
+    toplevel .top
+    frame .top.f
+    wm transient .top .top.f
 } -cleanup {
     deleteWindows
-} -result {setting ".master" as master creates a transient/master cycle}
+} -result {setting ".top" as master creates a transient/master cycle}
 
-test wm-transient-2.1 {basic get/set of master} -setup {
+test wm-transient-2.1 {basic get/set of toplevel} -setup {
     set results [list]
 } -body {
-    toplevel .master
+    toplevel .top
     toplevel .subject
     lappend results [wm transient .subject]
-    wm transient .subject .master
+    wm transient .subject .top
     lappend results [wm transient .subject]
     wm transient .subject {}
     lappend results [wm transient .subject]
 } -cleanup {
     deleteWindows
-} -result {{} .master {}}
-test wm-transient-2.2 {first toplevel parent of non-toplevel master is used} -body {
-    toplevel .master
-    frame .master.f
+} -result {{} .top {}}
+test wm-transient-2.2 {first toplevel parent of non-toplevel container window is used} -body {
+    toplevel .top
+    frame .top.f
     toplevel .subject
-    wm transient .subject .master.f
+    wm transient .subject .top.f
     wm transient .subject
 } -cleanup {
     deleteWindows
-} -result {.master}
+} -result {.top}
 
 test wm-transient-3.1 {transient toplevel is withdrawn
-        when mapped if master is withdrawn} -body {
-    toplevel .master
-    wm withdraw .master
+        when mapped if toplevel is withdrawn} -body {
+    toplevel .top
+    wm withdraw .top
     update
     toplevel .subject
-    wm transient .subject .master
+    wm transient .subject .top
     update
     list [wm state .subject] [winfo ismapped .subject]
 } -cleanup {
     deleteWindows
 } -result {withdrawn 0}
 test wm-transient-3.2 {already mapped transient toplevel
-        takes on withdrawn state of master} -body {
-    toplevel .master
-    wm withdraw .master
+        takes on withdrawn state of toplevel} -body {
+    toplevel .top
+    wm withdraw .top
     update
     toplevel .subject
     update
-    wm transient .subject .master
+    wm transient .subject .top
     update
     list [wm state .subject] [winfo ismapped .subject]
 } -cleanup {
     deleteWindows
 } -result {withdrawn 0}
-test wm-transient-3.3 {withdraw/deiconify on the master
+test wm-transient-3.3 {withdraw/deiconify on the toplevel
         also does a withdraw/deiconify on the transient} -setup {
     set results [list]
 } -body {
-    toplevel .master
+    toplevel .top
     toplevel .subject
     update
-    wm transient .subject .master
-    wm withdraw .master
+    wm transient .subject .top
+    wm withdraw .top
     update
     lappend results [wm state .subject] [winfo ismapped .subject]
-    wm deiconify .master
+    wm deiconify .top
     update
     lappend results [wm state .subject] [winfo ismapped .subject]
 } -cleanup {
@@ -1724,43 +1724,43 @@ test wm-transient-3.3 {withdraw/deiconify on the master
 } -result {withdrawn 0 normal 1}
 
 test wm-transient-4.1 {transient toplevel is withdrawn
-        when mapped if master is iconic} -body {
-    toplevel .master
-    wm iconify .master
+        when mapped if toplevel is iconic} -body {
+    toplevel .top
+    wm iconify .top
     update
     toplevel .subject
-    wm transient .subject .master
+    wm transient .subject .top
     update
     list [wm state .subject] [winfo ismapped .subject]
 } -cleanup {
     deleteWindows
 } -result {withdrawn 0}
 test wm-transient-4.2 {already mapped transient toplevel
-        is withdrawn if master is iconic} -body {
-    toplevel .master
+        is withdrawn if toplevel is iconic} -body {
+    toplevel .top
     raiseDelay
-    wm iconify .master
+    wm iconify .top
     update idletasks
     toplevel .subject
     update idletasks
-    wm transient .subject .master
+    wm transient .subject .top
     update idletasks
     list [wm state .subject] [winfo ismapped .subject]
 } -cleanup {
     deleteWindows
 } -result {withdrawn 0}
-test wm-transient-4.3 {iconify/deiconify on the master
+test wm-transient-4.3 {iconify/deiconify on the toplevel
         does a withdraw/deiconify on the transient} -setup {
     set results [list]
 } -body {
-    toplevel .master
+    toplevel .top
     toplevel .subject
     update idletasks
-    wm transient .subject .master
-    wm iconify .master
+    wm transient .subject .top
+    wm iconify .top
     update idletasks
     lappend results [wm state .subject] [winfo ismapped .subject]
-    wm deiconify .master
+    wm deiconify .top
     update idletasks
     lappend results [wm state .subject] [winfo ismapped .subject]
 } -cleanup {
@@ -1771,53 +1771,53 @@ test wm-transient-5.1 {an error during transient command should not
         cause the map/unmap binding to be deleted} -setup {
     set results [list]
 } -body {
-    toplevel .master
+    toplevel .top
     toplevel .subject
     update
-    wm transient .subject .master
+    wm transient .subject .top
     # Expect a bad window path error here
     lappend results [catch {wm transient .subject .bad}]
-    wm withdraw .master
+    wm withdraw .top
     update
     lappend results [wm state .subject]
-    wm deiconify .master
+    wm deiconify .top
     update
     lappend results [wm state .subject]
 } -cleanup {
     deleteWindows
 } -result {1 withdrawn normal}
-test wm-transient-5.2 {remove transient property when master
+test wm-transient-5.2 {remove transient property when toplevel
         is destroyed} -body {
-    toplevel .master
+    toplevel .top
     toplevel .subject
-    wm transient .subject .master
+    wm transient .subject .top
     update
-    destroy .master
+    destroy .top
     update
     wm transient .subject
 } -cleanup {
     deleteWindows
 } -result {}
 test wm-transient-5.3 {remove transient property from window
-        that had never been mapped when master is destroyed} -body {
-    toplevel .master
+        that had never been mapped when toplevel is destroyed} -body {
+    toplevel .top
     toplevel .subject
-    wm transient .subject .master
-    destroy .master
+    wm transient .subject .top
+    destroy .top
     wm transient .subject
 } -cleanup {
     deleteWindows
 } -result {}
 
 test wm-transient-6.1 {a withdrawn transient does not track
-        state changes in the master} -body {
-    toplevel .master
+        state changes in the toplevel} -body {
+    toplevel .top
     toplevel .subject
     update
-    wm transient .subject .master
+    wm transient .subject .top
     wm withdraw .subject
-    wm withdraw .master
-    wm deiconify .master
+    wm withdraw .top
+    wm deiconify .top
     # idle handler should not map the transient
     update
     wm state .subject
@@ -1825,24 +1825,24 @@ test wm-transient-6.1 {a withdrawn transient does not track
     deleteWindows
 } -result {withdrawn}
 test wm-transient-6.2 {a withdrawn transient does not track
-        state changes in the master} -setup {
+        state changes in the toplevel} -setup {
     set results [list]
 } -body {
-    toplevel .master
+    toplevel .top
     toplevel .subject
     update
-    wm transient .subject .master
+    wm transient .subject .top
     wm withdraw .subject
-    wm withdraw .master
-    wm deiconify .master
+    wm withdraw .top
+    wm deiconify .top
     # idle handler should not map the transient
     update
     lappend results [wm state .subject]
     wm deiconify .subject
     lappend results [wm state .subject]
-    wm withdraw .master
+    wm withdraw .top
     lappend results [wm state .subject]
-    wm deiconify .master
+    wm deiconify .top
     # idle handler should map transient
     update
     lappend results [wm state .subject]
@@ -1850,15 +1850,15 @@ test wm-transient-6.2 {a withdrawn transient does not track
     deleteWindows
 } -result {withdrawn normal withdrawn normal}
 test wm-transient-6.3 {a withdrawn transient does not track
-        state changes in the master} -body {
-    toplevel .master
+        state changes in the toplevel} -body {
+    toplevel .top
     toplevel .subject
     update
     # withdraw before making window a transient
     wm withdraw .subject
-    wm transient .subject .master
-    wm withdraw .master
-    wm deiconify .master
+    wm transient .subject .top
+    wm withdraw .top
+    wm deiconify .top
     # idle handler should not map the transient
     update
     wm state .subject
@@ -1866,7 +1866,7 @@ test wm-transient-6.3 {a withdrawn transient does not track
     deleteWindows
 } -result {withdrawn}
 
-# wm-transient-7.*: See SF Tk Bug #592201 "wm transient fails with two masters"
+# wm-transient-7.*: See SF Tk Bug #592201 "wm transient fails with two toplevels"
 # wm-transient-7.3 through 7.5 all caused panics on Unix in Tk 8.4b1.
 # 7.1 and 7.2 added to catch (potential) future errors.
 #
@@ -1880,16 +1880,16 @@ test wm-transient-7.1 {Destroying transient} -body {
 } -cleanup {
     deleteWindows
 }
-test wm-transient-7.2 {Destroying master} -body {
-    toplevel .t
+test wm-transient-7.2 {Destroying toplevel} -body {
+    toplevel .top
     toplevel .transient
-    wm transient .transient .t
-    destroy .t
+    wm transient .transient .top
+    destroy .top
     wm transient .transient
 } -cleanup {
     deleteWindows
 } -result {}
-test wm-transient-7.3 {Reassign transient, destroy old master} -body {
+test wm-transient-7.3 {Reassign transient, destroy old toplevel} -body {
     toplevel .t1
     toplevel .t2
     toplevel .transient
@@ -1901,7 +1901,7 @@ test wm-transient-7.3 {Reassign transient, destroy old master} -body {
 } -cleanup {
     deleteWindows
 }
-test wm-transient-7.4 {Reassign transient, destroy new master} -body {
+test wm-transient-7.4 {Reassign transient, destroy new toplevel} -body {
     toplevel .t1
     toplevel .t2
     toplevel .transient
@@ -1930,8 +1930,8 @@ test wm-transient-8.1 {transient to withdrawn window, Bug 1163496} -setup {
     deleteWindows
     set result {}
 } -body {
-    # Verifies that transients stay on top of their masters, even if they were
-    # made transients when those masters were withdrawn.
+    # Verifies that transients stay on top of their toplevels, even if they were
+    # made transients when those toplevels were withdrawn.
     toplevel .t1; wm withdraw  .t1;     update
     toplevel .t2; wm transient .t2 .t1; update
     lappend result [winfo ismapped .t1] [winfo ismapped .t2]
-- 
cgit v0.12


From 1a1f6bb851a8f05fd555d9e28bc01edea61adef5 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 3 Sep 2020 20:45:19 +0000
Subject: Consolidate Tk 8.7 error-messages regarding TIP #581. More Master ->
 Container related (internal) changes

---
 doc/ManageGeom.3             |  14 +-
 generic/tk.h                 |   8 +-
 generic/tkCanvWind.c         |  16 +-
 generic/tkFrame.c            |  16 +-
 generic/tkGeometry.c         |  10 +-
 generic/tkGrid.c             | 488 ++++++++++++++++++++---------------------
 generic/tkImage.c            |  26 +--
 generic/tkImgBmap.c          |  42 ++--
 generic/tkImgPhInstance.c    |  18 +-
 generic/tkImgPhoto.c         | 110 +++++-----
 generic/tkImgPhoto.h         |  10 +-
 generic/tkInt.h              |   4 +-
 generic/tkOldConfig.c        |   2 +-
 generic/tkPack.c             | 322 +++++++++++++--------------
 generic/tkPlace.c            | 507 +++++++++++++++++++++----------------------
 generic/tkTextWind.c         |   2 +-
 generic/ttk/ttkManager.c     |  20 +-
 generic/ttk/ttkManager.h     |   4 +-
 generic/ttk/ttkNotebook.c    |  74 +++----
 generic/ttk/ttkPanedwindow.c |  66 +++---
 library/tk.tcl               |   4 +-
 library/ttk/combobox.tcl     |  14 +-
 macosx/tkMacOSXWm.c          |  12 +-
 tests/grid.test              |  10 +-
 tests/imgPhoto.test          |   8 +-
 tests/packgrid.test          |  16 +-
 tests/unixWm.test            |   2 +-
 tests/wm.test                |  16 +-
 unix/tkUnixWm.c              |  14 +-
 win/tkWinWm.c                |  12 +-
 30 files changed, 933 insertions(+), 934 deletions(-)

diff --git a/doc/ManageGeom.3 b/doc/ManageGeom.3
index ba12aca..25f4886 100644
--- a/doc/ManageGeom.3
+++ b/doc/ManageGeom.3
@@ -44,7 +44,7 @@ the geometry manager:
 typedef struct {
     const char *\fIname\fR;
     Tk_GeomRequestProc *\fIrequestProc\fR;
-    Tk_GeomLostSlaveProc *\fIlostSlaveProc\fR;
+    Tk_GeomLostContentProc *\fIlostContentProc\fR;
 } \fBTk_GeomMgr\fR;
 .CE
 The \fIname\fR field is the textual name for the geometry manager,
@@ -67,24 +67,24 @@ corresponding parameters passed to \fBTk_ManageGeometry\fR.
 structure containing application-specific information about
 how to manage \fItkwin\fR's geometry.
 .PP
-The \fIlostSlaveProc\fR field of \fImgrPtr\fR points to another
+The \fIlostContentProc\fR field of \fImgrPtr\fR points to another
 procedure in the geometry manager.
-Tk will invoke \fIlostSlaveProc\fR if some other manager
+Tk will invoke \fIlostContentProc\fR if some other manager
 calls \fBTk_ManageGeometry\fR to claim
 \fItkwin\fR away from the current geometry manager.
-\fIlostSlaveProc\fR is not invoked if \fBTk_ManageGeometry\fR is
+\fIlostContentProc\fR is not invoked if \fBTk_ManageGeometry\fR is
 called with a NULL value for \fImgrPtr\fR (presumably the current
 geometry manager has made this call, so it already knows that the
 window is no longer managed), nor is it called if \fImgrPtr\fR
 is the same as the window's current geometry manager.
-\fIlostSlaveProc\fR should have
+\fIlostContentProc\fR should have
 arguments and results that match the following prototype:
 .CS
-typedef void \fBTk_GeomLostSlaveProc\fR(
+typedef void \fBTk_GeomLostContentProc\fR(
         ClientData \fIclientData\fR,
         Tk_Window \fItkwin\fR);
 .CE
-The parameters to \fIlostSlaveProc\fR will be identical to the
+The parameters to \fIlostContentProc\fR will be identical to the
 corresponding parameters passed to \fBTk_ManageGeometry\fR.
 .SH KEYWORDS
 callback, geometry, managed, request, unmanaged
diff --git a/generic/tk.h b/generic/tk.h
index 8b0619d..9672110 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -122,14 +122,14 @@ extern "C" {
  * Dummy types that are used by clients:
  */
 
-#define Tk_ImageModel Tk_ImageMaster
+#define Tk_ImageMaster Tk_ImageModel
 typedef struct Tk_BindingTable_ *Tk_BindingTable;
 typedef struct Tk_Canvas_ *Tk_Canvas;
 typedef struct Tk_Cursor_ *Tk_Cursor;
 typedef struct Tk_ErrorHandler_ *Tk_ErrorHandler;
 typedef struct Tk_Font_ *Tk_Font;
 typedef struct Tk_Image__ *Tk_Image;
-typedef struct Tk_ImageMaster_ *Tk_ImageModel;
+typedef struct Tk_ImageModel_ *Tk_ImageModel;
 typedef struct Tk_OptionTable_ *Tk_OptionTable;
 typedef struct Tk_PostscriptInfo_ *Tk_PostscriptInfo;
 typedef struct Tk_TextLayout_ *Tk_TextLayout;
@@ -651,7 +651,7 @@ typedef struct Tk_ClassProcs {
  * the geometry manager to carry out certain functions.
  */
 
-#define Tk_GeomLostContentProc Tk_GeomLostSlaveProc
+#define Tk_GeomLostSlaveProc Tk_GeomLostContentProc
 typedef void (Tk_GeomRequestProc) (ClientData clientData, Tk_Window tkwin);
 typedef void (Tk_GeomLostContentProc) (ClientData clientData, Tk_Window tkwin);
 
@@ -662,7 +662,7 @@ typedef struct Tk_GeomMgr {
     Tk_GeomRequestProc *requestProc;
 				/* Procedure to invoke when a slave's
 				 * requested geometry changes. */
-    Tk_GeomLostContentProc *lostSlaveProc;
+    Tk_GeomLostContentProc *lostContentProc;
 				/* Procedure to invoke when a slave is taken
 				 * away from one geometry manager by another.
 				 * NULL means geometry manager doesn't care
diff --git a/generic/tkCanvWind.c b/generic/tkCanvWind.c
index 8028c14..2fd799f 100644
--- a/generic/tkCanvWind.c
+++ b/generic/tkCanvWind.c
@@ -87,7 +87,7 @@ static void		TranslateWinItem(Tk_Canvas canvas,
 static int		WinItemCoords(Tcl_Interp *interp,
 			    Tk_Canvas canvas, Tk_Item *itemPtr, int objc,
 			    Tcl_Obj *const objv[]);
-static void		WinItemLostSlaveProc(ClientData clientData,
+static void		WinItemLostContentProc(ClientData clientData,
 			    Tk_Window tkwin);
 static void		WinItemRequestProc(ClientData clientData,
 			    Tk_Window tkwin);
@@ -144,7 +144,7 @@ Tk_ItemType tkWindowType = {
 static const Tk_GeomMgr canvasGeomType = {
     "canvas",				/* name */
     WinItemRequestProc,			/* requestProc */
-    WinItemLostSlaveProc,		/* lostSlaveProc */
+    WinItemLostContentProc,		/* lostContentProc */
 };
 
 /*
@@ -1102,25 +1102,25 @@ WinItemRequestProc(
 /*
  *--------------------------------------------------------------
  *
- * WinItemLostSlaveProc --
+ * WinItemLostContentProc --
  *
  *	This function is invoked by Tk whenever some other geometry claims
- *	control over a slave that used to be managed by us.
+ *	control over a content window that used to be managed by us.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	Forgets all canvas-related information about the slave.
+ *	Forgets all canvas-related information about the content window.
  *
  *--------------------------------------------------------------
  */
 
 static void
-WinItemLostSlaveProc(
-    ClientData clientData,	/* WindowItem structure for slave window that
+WinItemLostContentProc(
+    ClientData clientData,	/* WindowItem structure for content window window that
 				 * was stolen away. */
-    Tk_Window tkwin)		/* Tk's handle for the slave window. */
+    Tk_Window tkwin)		/* Tk's handle for the content window window. */
 {
     WindowItem *winItemPtr = (WindowItem *)clientData;
     Tk_Window canvasTkwin = Tk_CanvasTkwin(winItemPtr->canvas);
diff --git a/generic/tkFrame.c b/generic/tkFrame.c
index 726594a..696d2f5 100644
--- a/generic/tkFrame.c
+++ b/generic/tkFrame.c
@@ -344,7 +344,7 @@ static void		FrameBgImageProc(ClientData clientData,
 static void		FrameCmdDeletedProc(ClientData clientData);
 static void		FrameEventProc(ClientData clientData,
 			    XEvent *eventPtr);
-static void		FrameLostSlaveProc(ClientData clientData,
+static void		FrameLostContentProc(ClientData clientData,
 			    Tk_Window tkwin);
 static void		FrameRequestProc(ClientData clientData,
 			    Tk_Window tkwin);
@@ -376,7 +376,7 @@ static const Tk_ClassProcs frameClass = {
 static const Tk_GeomMgr frameGeomType = {
     "labelframe",		/* name */
     FrameRequestProc,		/* requestProc */
-    FrameLostSlaveProc		/* lostSlaveProc */
+    FrameLostContentProc		/* lostContentProc */
 };
 
 /*
@@ -2016,25 +2016,25 @@ FrameRequestProc(
 /*
  *--------------------------------------------------------------
  *
- * FrameLostSlaveProc --
+ * FrameLostContentProc --
  *
  *	This function is invoked by Tk whenever some other geometry claims
- *	control over a slave that used to be managed by us.
+ *	control over a content window that used to be managed by us.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	Forgets all frame-related information about the slave.
+ *	Forgets all frame-related information about the content window.
  *
  *--------------------------------------------------------------
  */
 
 static void
-FrameLostSlaveProc(
-    ClientData clientData,	/* Frame structure for slave window that was
+FrameLostContentProc(
+    ClientData clientData,	/* Frame structure for content window window that was
 				 * stolen away. */
-    Tk_Window tkwin)		/* Tk's handle for the slave window. */
+    Tk_Window tkwin)		/* Tk's handle for the content window window. */
 {
     Frame *framePtr = (Frame *)clientData;
     Labelframe *labelframePtr = (Labelframe *)clientData;
diff --git a/generic/tkGeometry.c b/generic/tkGeometry.c
index 3fca474..9bc1ae6 100644
--- a/generic/tkGeometry.c
+++ b/generic/tkGeometry.c
@@ -75,7 +75,7 @@ static void		MaintainSlaveProc(ClientData clientData,
  *	previous geometry manager. The geometry manager will be notified (by
  *	calling procedures in *mgrPtr) when interesting things happen in the
  *	future. If there was an existing geometry manager for tkwin different
- *	from the new one, it is notified by calling its lostSlaveProc.
+ *	from the new one, it is notified by calling its lostContentProc.
  *
  *--------------------------------------------------------------
  */
@@ -95,8 +95,8 @@ Tk_ManageGeometry(
     if ((winPtr->geomMgrPtr != NULL) && (mgrPtr != NULL)
 	    && ((winPtr->geomMgrPtr != mgrPtr)
 		|| (winPtr->geomData != clientData))
-	    && (winPtr->geomMgrPtr->lostSlaveProc != NULL)) {
-	winPtr->geomMgrPtr->lostSlaveProc(winPtr->geomData, tkwin);
+	    && (winPtr->geomMgrPtr->lostContentProc != NULL)) {
+	winPtr->geomMgrPtr->lostContentProc(winPtr->geomData, tkwin);
     }
 
     winPtr->geomMgrPtr = mgrPtr;
@@ -333,8 +333,8 @@ TkSetGeometryContainer(
     if (winPtr->geomMgrName != NULL) {
 	if (interp != NULL) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		    "cannot use geometry manager %s inside %s which already"
-		    " has slaves managed by %s",
+		    "cannot use geometry manager %s inside %s because"
+		    " %s is already managing it's content windows",
 		    name, Tk_PathName(tkwin), winPtr->geomMgrName));
 	    Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "FIGHT", NULL);
 	}
diff --git a/generic/tkGrid.c b/generic/tkGrid.c
index fa2acc5..b016fc8 100644
--- a/generic/tkGrid.c
+++ b/generic/tkGrid.c
@@ -144,7 +144,7 @@ typedef struct {
     				 * container. */
     Tk_Anchor anchor;		/* Value of anchor option: specifies where a
 				 * grid without weight should be placed. */
-} GridMaster;
+} GridContainer;
 
 /*
  * For each window that the grid cares about (either because the window is
@@ -162,9 +162,9 @@ typedef struct Gridder {
 				 * managed by the gridder). */
     struct Gridder *nextPtr;	/* Next window managed within same container.
 				 * List order doesn't matter. */
-    struct Gridder *slavePtr;	/* First in list of slaves managed inside this
+    struct Gridder *contentPtr;	/* First in list of slaves managed inside this
 				 * window (NULL means no grid slaves). */
-    GridMaster *containerDataPtr;	/* Additional data for geometry container. */
+    GridContainer *containerDataPtr;	/* Additional data for geometry container. */
     Tcl_Obj *in;                /* Store container name when removed. */
     int column, row;		/* Location in the grid (starting from
 				 * zero). */
@@ -253,7 +253,7 @@ typedef struct UniformGroup {
  * Prototypes for procedures used only in this file:
  */
 
-static void		AdjustForSticky(Gridder *slavePtr, int *xPtr,
+static void		AdjustForSticky(Gridder *contentPtr, int *xPtr,
 			    int *yPtr, int *widthPtr, int *heightPtr);
 static int		AdjustOffsets(int width, int elements,
 			    SlotInfo *slotPtr);
@@ -288,7 +288,7 @@ static int		GridContentCommand(Tk_Window tkwin, Tcl_Interp *interp,
 			    int objc, Tcl_Obj *const objv[]);
 static void		GridStructureProc(ClientData clientData,
 			    XEvent *eventPtr);
-static void		GridLostSlaveProc(ClientData clientData,
+static void		GridLostContentProc(ClientData clientData,
 			    Tk_Window tkwin);
 static void		GridReqProc(ClientData clientData, Tk_Window tkwin);
 static void		InitMasterData(Gridder *containerPtr);
@@ -297,9 +297,9 @@ static Tcl_Obj *	NewQuadObj(Tcl_WideInt, Tcl_WideInt, Tcl_WideInt, Tcl_WideInt);
 static int		ResolveConstraints(Gridder *gridPtr, int rowOrColumn,
 			    int maxOffset);
 static void		SetGridSize(Gridder *gridPtr);
-static int		SetSlaveColumn(Tcl_Interp *interp, Gridder *slavePtr,
+static int		SetSlaveColumn(Tcl_Interp *interp, Gridder *contentPtr,
 			    int column, int numCols);
-static int		SetSlaveRow(Tcl_Interp *interp, Gridder *slavePtr,
+static int		SetSlaveRow(Tcl_Interp *interp, Gridder *contentPtr,
 			    int row, int numRows);
 static Tcl_Obj *	StickyToObj(int flags);
 static int		StringToSticky(const char *string);
@@ -308,7 +308,7 @@ static void		Unlink(Gridder *gridPtr);
 static const Tk_GeomMgr gridMgrType = {
     "grid",			/* name */
     GridReqProc,		/* requestProc */
-    GridLostSlaveProc,		/* lostSlaveProc */
+    GridLostContentProc,		/* lostContentProc */
 };
 
 /*
@@ -434,7 +434,7 @@ GridAnchorCommand(
 {
     Tk_Window container;
     Gridder *containerPtr;
-    GridMaster *gridPtr;
+    GridContainer *gridPtr;
     Tk_Anchor old;
 
     if (objc > 4) {
@@ -503,7 +503,7 @@ GridBboxCommand(
 {
     Tk_Window container;
     Gridder *containerPtr;		/* container grid record */
-    GridMaster *gridPtr;	/* pointer to grid data */
+    GridContainer *gridPtr;	/* pointer to grid data */
     int row, column;		/* origin for bounding box */
     int row2, column2;		/* end of bounding box */
     int endX, endY;		/* last column/row in the layout */
@@ -632,7 +632,7 @@ GridForgetRemoveCommand(
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     Tk_Window slave;
-    Gridder *slavePtr;
+    Gridder *contentPtr;
     int i;
     const char *string = Tcl_GetString(objv[1]);
     char c = string[0];
@@ -642,56 +642,56 @@ GridForgetRemoveCommand(
 	    return TCL_ERROR;
 	}
 
-	slavePtr = GetGrid(slave);
-	if (slavePtr->containerPtr != NULL) {
+	contentPtr = GetGrid(slave);
+	if (contentPtr->containerPtr != NULL) {
 	    /*
 	     * For "forget", reset all the settings to their defaults
 	     */
 
 	    if (c == 'f') {
-		slavePtr->column = -1;
-		slavePtr->row = -1;
-		slavePtr->numCols = 1;
-		slavePtr->numRows = 1;
-		slavePtr->padX = 0;
-		slavePtr->padY = 0;
-		slavePtr->padLeft = 0;
-		slavePtr->padTop = 0;
-		slavePtr->iPadX = 0;
-		slavePtr->iPadY = 0;
-		if (slavePtr->in != NULL) {
-		    Tcl_DecrRefCount(slavePtr->in);
-		    slavePtr->in = NULL;
+		contentPtr->column = -1;
+		contentPtr->row = -1;
+		contentPtr->numCols = 1;
+		contentPtr->numRows = 1;
+		contentPtr->padX = 0;
+		contentPtr->padY = 0;
+		contentPtr->padLeft = 0;
+		contentPtr->padTop = 0;
+		contentPtr->iPadX = 0;
+		contentPtr->iPadY = 0;
+		if (contentPtr->in != NULL) {
+		    Tcl_DecrRefCount(contentPtr->in);
+		    contentPtr->in = NULL;
 		}
-		slavePtr->doubleBw = 2*Tk_Changes(tkwin)->border_width;
-		if (slavePtr->flags & REQUESTED_RELAYOUT) {
-		    Tcl_CancelIdleCall(ArrangeGrid, slavePtr);
+		contentPtr->doubleBw = 2*Tk_Changes(tkwin)->border_width;
+		if (contentPtr->flags & REQUESTED_RELAYOUT) {
+		    Tcl_CancelIdleCall(ArrangeGrid, contentPtr);
 		}
-		slavePtr->flags = 0;
-		slavePtr->sticky = 0;
+		contentPtr->flags = 0;
+		contentPtr->sticky = 0;
 	    } else {
 		/*
 		 * When removing, store name of container to be able to
 		 * restore it later, even if the container is recreated.
 		 */
 
-		if (slavePtr->in != NULL) {
-		    Tcl_DecrRefCount(slavePtr->in);
-		    slavePtr->in = NULL;
+		if (contentPtr->in != NULL) {
+		    Tcl_DecrRefCount(contentPtr->in);
+		    contentPtr->in = NULL;
 		}
-		if (slavePtr->containerPtr != NULL) {
-		    slavePtr->in = Tcl_NewStringObj(
-			    Tk_PathName(slavePtr->containerPtr->tkwin), -1);
-		    Tcl_IncrRefCount(slavePtr->in);
+		if (contentPtr->containerPtr != NULL) {
+		    contentPtr->in = Tcl_NewStringObj(
+			    Tk_PathName(contentPtr->containerPtr->tkwin), -1);
+		    Tcl_IncrRefCount(contentPtr->in);
 		}
 	    }
 	    Tk_ManageGeometry(slave, NULL, NULL);
-	    if (slavePtr->containerPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
-		Tk_UnmaintainGeometry(slavePtr->tkwin,
-			slavePtr->containerPtr->tkwin);
+	    if (contentPtr->containerPtr->tkwin != Tk_Parent(contentPtr->tkwin)) {
+		Tk_UnmaintainGeometry(contentPtr->tkwin,
+			contentPtr->containerPtr->tkwin);
 	    }
-	    Unlink(slavePtr);
-	    Tk_UnmapWindow(slavePtr->tkwin);
+	    Unlink(contentPtr);
+	    Tk_UnmapWindow(contentPtr->tkwin);
 	}
     }
     return TCL_OK;
@@ -721,7 +721,7 @@ GridInfoCommand(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Gridder *slavePtr;
+    Gridder *contentPtr;
     Tk_Window slave;
     Tcl_Obj *infoObj;
 
@@ -732,29 +732,29 @@ GridInfoCommand(
     if (TkGetWindowFromObj(interp, tkwin, objv[2], &slave) != TCL_OK) {
 	return TCL_ERROR;
     }
-    slavePtr = GetGrid(slave);
-    if (slavePtr->containerPtr == NULL) {
+    contentPtr = GetGrid(slave);
+    if (contentPtr->containerPtr == NULL) {
 	Tcl_ResetResult(interp);
 	return TCL_OK;
     }
 
     infoObj = Tcl_NewObj();
     Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-in", -1),
-	    Tk_NewWindowObj(slavePtr->containerPtr->tkwin));
+	    Tk_NewWindowObj(contentPtr->containerPtr->tkwin));
     Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-column", -1),
-	    Tcl_NewWideIntObj(slavePtr->column));
+	    Tcl_NewWideIntObj(contentPtr->column));
     Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-row", -1),
-	    Tcl_NewWideIntObj(slavePtr->row));
+	    Tcl_NewWideIntObj(contentPtr->row));
     Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-columnspan", -1),
-	    Tcl_NewWideIntObj(slavePtr->numCols));
+	    Tcl_NewWideIntObj(contentPtr->numCols));
     Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-rowspan", -1),
-	    Tcl_NewWideIntObj(slavePtr->numRows));
-    TkAppendPadAmount(infoObj, "-ipadx", slavePtr->iPadX/2, slavePtr->iPadX);
-    TkAppendPadAmount(infoObj, "-ipady", slavePtr->iPadY/2, slavePtr->iPadY);
-    TkAppendPadAmount(infoObj, "-padx", slavePtr->padLeft, slavePtr->padX);
-    TkAppendPadAmount(infoObj, "-pady", slavePtr->padTop, slavePtr->padY);
+	    Tcl_NewWideIntObj(contentPtr->numRows));
+    TkAppendPadAmount(infoObj, "-ipadx", contentPtr->iPadX/2, contentPtr->iPadX);
+    TkAppendPadAmount(infoObj, "-ipady", contentPtr->iPadY/2, contentPtr->iPadY);
+    TkAppendPadAmount(infoObj, "-padx", contentPtr->padLeft, contentPtr->padX);
+    TkAppendPadAmount(infoObj, "-pady", contentPtr->padTop, contentPtr->padY);
     Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-sticky", -1),
-	    StickyToObj(slavePtr->sticky));
+	    StickyToObj(contentPtr->sticky));
     Tcl_SetObjResult(interp, infoObj);
     return TCL_OK;
 }
@@ -785,7 +785,7 @@ GridLocationCommand(
 {
     Tk_Window container;
     Gridder *containerPtr;		/* Master grid record. */
-    GridMaster *gridPtr;	/* Pointer to grid data. */
+    GridContainer *gridPtr;	/* Pointer to grid data. */
     SlotInfo *slotPtr;
     int x, y;			/* Offset in pixels, from edge of container. */
     int i, j;			/* Corresponding column and row indeces. */
@@ -909,7 +909,7 @@ GridPropagateCommand(
 	     * If we have slaves, we need to register as geometry container.
 	     */
 
-	    if (containerPtr->slavePtr != NULL) {
+	    if (containerPtr->contentPtr != NULL) {
 		if (TkSetGeometryContainer(interp, container, "grid")	!= TCL_OK) {
 		    return TCL_ERROR;
 		}
@@ -965,7 +965,7 @@ GridRowColumnConfigureCommand(
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     Tk_Window container, slave;
-    Gridder *containerPtr, *slavePtr;
+    Gridder *containerPtr, *contentPtr;
     SlotInfo *slotPtr = NULL;
     int slot;			/* the column or row number */
     int slotType;		/* COLUMN or ROW */
@@ -1107,7 +1107,7 @@ GridRowColumnConfigureCommand(
 	if (Tcl_GetIntFromObj(NULL, lObjv[j], &slot) == TCL_OK) {
 	    first = slot;
 	    last = slot;
-	    slavePtr = NULL;
+	    contentPtr = NULL;
 	} else if (strcmp(Tcl_GetString(lObjv[j]), "all") == 0) {
 	    /*
 	     * Make sure container is initialised.
@@ -1115,8 +1115,8 @@ GridRowColumnConfigureCommand(
 
 	    InitMasterData(containerPtr);
 
-	    slavePtr = containerPtr->slavePtr;
-	    if (slavePtr == NULL) {
+	    contentPtr = containerPtr->contentPtr;
+	    if (contentPtr == NULL) {
 		continue;
 	    }
 	    allSlaves = 1;
@@ -1126,8 +1126,8 @@ GridRowColumnConfigureCommand(
 	     * Is it gridded in this container?
 	     */
 
-	    slavePtr = GetGrid(slave);
-	    if (slavePtr->containerPtr != containerPtr) {
+	    contentPtr = GetGrid(slave);
+	    if (contentPtr->containerPtr != containerPtr) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 			"the window \"%s\" is not managed by \"%s\"",
 			Tcl_GetString(lObjv[j]), Tcl_GetString(objv[2])));
@@ -1148,11 +1148,11 @@ GridRowColumnConfigureCommand(
 	 */
 
 	do {
-	    if (slavePtr != NULL) {
+	    if (contentPtr != NULL) {
 		first = (slotType == COLUMN) ?
-			slavePtr->column : slavePtr->row;
+			contentPtr->column : contentPtr->row;
 		last = first - 1 + ((slotType == COLUMN) ?
-			slavePtr->numCols : slavePtr->numRows);
+			contentPtr->numCols : contentPtr->numRows);
 	    }
 
 	    for (slot = first; slot <= last; slot++) {
@@ -1222,10 +1222,10 @@ GridRowColumnConfigureCommand(
 		    }
 		}
 	    }
-	    if (slavePtr != NULL) {
-		slavePtr = slavePtr->nextPtr;
+	    if (contentPtr != NULL) {
+		contentPtr = contentPtr->nextPtr;
 	    }
-	} while ((allSlaves == 1) && (slavePtr != NULL));
+	} while ((allSlaves == 1) && (contentPtr != NULL));
     }
     Tcl_DecrRefCount(listCopy);
 
@@ -1299,7 +1299,7 @@ GridSizeCommand(
 {
     Tk_Window container;
     Gridder *containerPtr;
-    GridMaster *gridPtr;	/* pointer to grid data */
+    GridContainer *gridPtr;	/* pointer to grid data */
 
     if (objc != 3) {
 	Tcl_WrongNumArgs(interp, 2, objv, "window");
@@ -1350,7 +1350,7 @@ GridContentCommand(
 {
     Tk_Window container;
     Gridder *containerPtr;		/* container grid record */
-    Gridder *slavePtr;
+    Gridder *contentPtr;
     int i, value, index;
     int row = -1, column = -1;
     static const char *const optionStrings[] = {
@@ -1391,17 +1391,17 @@ GridContentCommand(
     containerPtr = GetGrid(container);
 
     res = Tcl_NewListObj(0, NULL);
-    for (slavePtr = containerPtr->slavePtr; slavePtr != NULL;
-	    slavePtr = slavePtr->nextPtr) {
-	if ((column >= 0) && (slavePtr->column > column
-		|| slavePtr->column+slavePtr->numCols-1 < column)) {
+    for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
+	    contentPtr = contentPtr->nextPtr) {
+	if ((column >= 0) && (contentPtr->column > column
+		|| contentPtr->column+contentPtr->numCols-1 < column)) {
 	    continue;
 	}
-	if ((row >= 0) && (slavePtr->row > row ||
-		slavePtr->row+slavePtr->numRows-1 < row)) {
+	if ((row >= 0) && (contentPtr->row > row ||
+		contentPtr->row+contentPtr->numRows-1 < row)) {
 	    continue;
 	}
-	Tcl_ListObjAppendElement(interp,res, Tk_NewWindowObj(slavePtr->tkwin));
+	Tcl_ListObjAppendElement(interp,res, Tk_NewWindowObj(contentPtr->tkwin));
     }
     Tcl_SetObjResult(interp, res);
     return TCL_OK;
@@ -1444,7 +1444,7 @@ GridReqProc(
 /*
  *----------------------------------------------------------------------
  *
- * GridLostSlaveProc --
+ * GridLostContentProc --
  *
  *	This procedure is invoked by Tk whenever some other geometry claims
  *	control over a slave that used to be managed by us.
@@ -1459,18 +1459,18 @@ GridReqProc(
  */
 
 static void
-GridLostSlaveProc(
+GridLostContentProc(
     ClientData clientData,	/* Grid structure for content window that was
 				 * stolen away. */
     TCL_UNUSED(Tk_Window))		/* Tk's handle for the content window. */
 {
-    Gridder *slavePtr = (Gridder *)clientData;
+    Gridder *contentPtr = (Gridder *)clientData;
 
-    if (slavePtr->containerPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
-	Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->containerPtr->tkwin);
+    if (contentPtr->containerPtr->tkwin != Tk_Parent(contentPtr->tkwin)) {
+	Tk_UnmaintainGeometry(contentPtr->tkwin, contentPtr->containerPtr->tkwin);
     }
-    Unlink(slavePtr);
-    Tk_UnmapWindow(slavePtr->tkwin);
+    Unlink(contentPtr);
+    Tk_UnmapWindow(contentPtr->tkwin);
 }
 
 /*
@@ -1659,7 +1659,7 @@ AdjustOffsets(
 
 static void
 AdjustForSticky(
-    Gridder *slavePtr,	/* Slave window to arrange in its cavity. */
+    Gridder *contentPtr,	/* Slave window to arrange in its cavity. */
     int *xPtr,		/* Pixel location of the left edge of the cavity. */
     int *yPtr,		/* Pixel location of the top edge of the cavity. */
     int *widthPtr,	/* Width of the cavity (in pixels). */
@@ -1667,21 +1667,21 @@ AdjustForSticky(
 {
     int diffx = 0;	/* Cavity width - slave width. */
     int diffy = 0;	/* Cavity hight - slave height. */
-    int sticky = slavePtr->sticky;
+    int sticky = contentPtr->sticky;
 
-    *xPtr += slavePtr->padLeft;
-    *widthPtr -= slavePtr->padX;
-    *yPtr += slavePtr->padTop;
-    *heightPtr -= slavePtr->padY;
+    *xPtr += contentPtr->padLeft;
+    *widthPtr -= contentPtr->padX;
+    *yPtr += contentPtr->padTop;
+    *heightPtr -= contentPtr->padY;
 
-    if (*widthPtr > (Tk_ReqWidth(slavePtr->tkwin) + slavePtr->iPadX)) {
-	diffx = *widthPtr - (Tk_ReqWidth(slavePtr->tkwin) + slavePtr->iPadX);
-	*widthPtr = Tk_ReqWidth(slavePtr->tkwin) + slavePtr->iPadX;
+    if (*widthPtr > (Tk_ReqWidth(contentPtr->tkwin) + contentPtr->iPadX)) {
+	diffx = *widthPtr - (Tk_ReqWidth(contentPtr->tkwin) + contentPtr->iPadX);
+	*widthPtr = Tk_ReqWidth(contentPtr->tkwin) + contentPtr->iPadX;
     }
 
-    if (*heightPtr > (Tk_ReqHeight(slavePtr->tkwin) + slavePtr->iPadY)) {
-	diffy = *heightPtr - (Tk_ReqHeight(slavePtr->tkwin) + slavePtr->iPadY);
-	*heightPtr = Tk_ReqHeight(slavePtr->tkwin) + slavePtr->iPadY;
+    if (*heightPtr > (Tk_ReqHeight(contentPtr->tkwin) + contentPtr->iPadY)) {
+	diffy = *heightPtr - (Tk_ReqHeight(contentPtr->tkwin) + contentPtr->iPadY);
+	*heightPtr = Tk_ReqHeight(contentPtr->tkwin) + contentPtr->iPadY;
     }
 
     if (sticky&STICK_EAST && sticky&STICK_WEST) {
@@ -1723,8 +1723,8 @@ ArrangeGrid(
 				 * are to be re-layed out. */
 {
     Gridder *containerPtr = (Gridder *)clientData;
-    Gridder *slavePtr;
-    GridMaster *slotPtr = containerPtr->containerDataPtr;
+    Gridder *contentPtr;
+    GridContainer *slotPtr = containerPtr->containerDataPtr;
     int abort;
     int width, height;		/* Requested size of layout, in pixels. */
     int realWidth, realHeight;	/* Actual size layout should take-up. */
@@ -1738,7 +1738,7 @@ ArrangeGrid(
      * so another geometry manager can take over.
      */
 
-    if (containerPtr->slavePtr == NULL) {
+    if (containerPtr->contentPtr == NULL) {
 	return;
     }
 
@@ -1816,23 +1816,23 @@ ArrangeGrid(
      * cavity size, and adjusting the widget according to its stickyness.
      */
 
-    for (slavePtr = containerPtr->slavePtr; slavePtr != NULL && !abort;
-	    slavePtr = slavePtr->nextPtr) {
+    for (contentPtr = containerPtr->contentPtr; contentPtr != NULL && !abort;
+	    contentPtr = contentPtr->nextPtr) {
 	int x, y;			/* Top left coordinate */
 	int width, height;		/* Slot or slave size */
-	int col = slavePtr->column;
-	int row = slavePtr->row;
+	int col = contentPtr->column;
+	int row = contentPtr->row;
 
 	x = (col>0) ? slotPtr->columnPtr[col-1].offset : 0;
 	y = (row>0) ? slotPtr->rowPtr[row-1].offset : 0;
 
-	width = slotPtr->columnPtr[slavePtr->numCols+col-1].offset - x;
-	height = slotPtr->rowPtr[slavePtr->numRows+row-1].offset - y;
+	width = slotPtr->columnPtr[contentPtr->numCols+col-1].offset - x;
+	height = slotPtr->rowPtr[contentPtr->numRows+row-1].offset - y;
 
 	x += slotPtr->startX;
 	y += slotPtr->startY;
 
-	AdjustForSticky(slavePtr, &x, &y, &width, &height);
+	AdjustForSticky(contentPtr, &x, &y, &width, &height);
 
 	/*
 	 * Now put the window in the proper spot. (This was taken directly
@@ -1840,15 +1840,15 @@ ArrangeGrid(
 	 * here. Otherwise let Tk_MaintainGeometry do the work.
 	 */
 
-	if (containerPtr->tkwin == Tk_Parent(slavePtr->tkwin)) {
+	if (containerPtr->tkwin == Tk_Parent(contentPtr->tkwin)) {
 	    if ((width <= 0) || (height <= 0)) {
-		Tk_UnmapWindow(slavePtr->tkwin);
+		Tk_UnmapWindow(contentPtr->tkwin);
 	    } else {
-		if ((x != Tk_X(slavePtr->tkwin))
-			|| (y != Tk_Y(slavePtr->tkwin))
-			|| (width != Tk_Width(slavePtr->tkwin))
-			|| (height != Tk_Height(slavePtr->tkwin))) {
-		    Tk_MoveResizeWindow(slavePtr->tkwin, x, y, width, height);
+		if ((x != Tk_X(contentPtr->tkwin))
+			|| (y != Tk_Y(contentPtr->tkwin))
+			|| (width != Tk_Width(contentPtr->tkwin))
+			|| (height != Tk_Height(contentPtr->tkwin))) {
+		    Tk_MoveResizeWindow(contentPtr->tkwin, x, y, width, height);
 		}
 		if (abort) {
 		    break;
@@ -1860,14 +1860,14 @@ ArrangeGrid(
 		 */
 
 		if (Tk_IsMapped(containerPtr->tkwin)) {
-		    Tk_MapWindow(slavePtr->tkwin);
+		    Tk_MapWindow(contentPtr->tkwin);
 		}
 	    }
 	} else if ((width <= 0) || (height <= 0)) {
-	    Tk_UnmaintainGeometry(slavePtr->tkwin, containerPtr->tkwin);
-	    Tk_UnmapWindow(slavePtr->tkwin);
+	    Tk_UnmaintainGeometry(contentPtr->tkwin, containerPtr->tkwin);
+	    Tk_UnmapWindow(contentPtr->tkwin);
 	} else {
-	    Tk_MaintainGeometry(slavePtr->tkwin, containerPtr->tkwin, x, y,
+	    Tk_MaintainGeometry(contentPtr->tkwin, containerPtr->tkwin, x, y,
 		    width, height);
 	}
     }
@@ -1904,7 +1904,7 @@ ResolveConstraints(
 				 * pixels, or 0 (not currently used). */
 {
     SlotInfo *slotPtr;	/* Pointer to row/col constraints. */
-    Gridder *slavePtr;	/* List of slave windows in this grid. */
+    Gridder *contentPtr;	/* List of slave windows in this grid. */
     int constraintCount;	/* Count of rows or columns that have
 				 * constraints. */
     int slotCount;		/* Last occupied row or column. */
@@ -2009,17 +2009,17 @@ ResolveConstraints(
 
     switch (slotType) {
     case COLUMN:
-	for (slavePtr = containerPtr->slavePtr; slavePtr != NULL;
-		slavePtr = slavePtr->nextPtr) {
-	    int rightEdge = slavePtr->column + slavePtr->numCols - 1;
-
-	    slavePtr->size = Tk_ReqWidth(slavePtr->tkwin) + slavePtr->padX
-		    + slavePtr->iPadX + slavePtr->doubleBw;
-	    if (slavePtr->numCols > 1) {
-		slavePtr->binNextPtr = layoutPtr[rightEdge].binNextPtr;
-		layoutPtr[rightEdge].binNextPtr = slavePtr;
+	for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
+		contentPtr = contentPtr->nextPtr) {
+	    int rightEdge = contentPtr->column + contentPtr->numCols - 1;
+
+	    contentPtr->size = Tk_ReqWidth(contentPtr->tkwin) + contentPtr->padX
+		    + contentPtr->iPadX + contentPtr->doubleBw;
+	    if (contentPtr->numCols > 1) {
+		contentPtr->binNextPtr = layoutPtr[rightEdge].binNextPtr;
+		layoutPtr[rightEdge].binNextPtr = contentPtr;
 	    } else if (rightEdge >= 0) {
-		int size = slavePtr->size + layoutPtr[rightEdge].pad;
+		int size = contentPtr->size + layoutPtr[rightEdge].pad;
 
 		if (size > layoutPtr[rightEdge].minSize) {
 		    layoutPtr[rightEdge].minSize = size;
@@ -2028,17 +2028,17 @@ ResolveConstraints(
 	}
 	break;
     case ROW:
-	for (slavePtr = containerPtr->slavePtr; slavePtr != NULL;
-		slavePtr = slavePtr->nextPtr) {
-	    int rightEdge = slavePtr->row + slavePtr->numRows - 1;
-
-	    slavePtr->size = Tk_ReqHeight(slavePtr->tkwin) + slavePtr->padY
-		    + slavePtr->iPadY + slavePtr->doubleBw;
-	    if (slavePtr->numRows > 1) {
-		slavePtr->binNextPtr = layoutPtr[rightEdge].binNextPtr;
-		layoutPtr[rightEdge].binNextPtr = slavePtr;
+	for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
+		contentPtr = contentPtr->nextPtr) {
+	    int rightEdge = contentPtr->row + contentPtr->numRows - 1;
+
+	    contentPtr->size = Tk_ReqHeight(contentPtr->tkwin) + contentPtr->padY
+		    + contentPtr->iPadY + contentPtr->doubleBw;
+	    if (contentPtr->numRows > 1) {
+		contentPtr->binNextPtr = layoutPtr[rightEdge].binNextPtr;
+		layoutPtr[rightEdge].binNextPtr = contentPtr;
 	    } else if (rightEdge >= 0) {
-		int size = slavePtr->size + layoutPtr[rightEdge].pad;
+		int size = contentPtr->size + layoutPtr[rightEdge].pad;
 
 		if (size > layoutPtr[rightEdge].minSize) {
 		    layoutPtr[rightEdge].minSize = size;
@@ -2134,11 +2134,11 @@ ResolveConstraints(
 
     for (offset=0,slot=0; slot < gridCount; slot++) {
 	layoutPtr[slot].minOffset = layoutPtr[slot].minSize + offset;
-	for (slavePtr = layoutPtr[slot].binNextPtr; slavePtr != NULL;
-		slavePtr = slavePtr->binNextPtr) {
+	for (contentPtr = layoutPtr[slot].binNextPtr; contentPtr != NULL;
+		contentPtr = contentPtr->binNextPtr) {
 	    int span = (slotType == COLUMN) ?
-		    slavePtr->numCols : slavePtr->numRows;
-	    int required = slavePtr->size + layoutPtr[slot - span].minOffset;
+		    contentPtr->numCols : contentPtr->numRows;
+	    int required = contentPtr->size + layoutPtr[slot - span].minOffset;
 
 	    if (required > layoutPtr[slot].minOffset) {
 		layoutPtr[slot].minOffset = required;
@@ -2170,11 +2170,11 @@ ResolveConstraints(
 	layoutPtr[slot].maxOffset = offset;
     }
     for (slot=gridCount-1; slot > 0;) {
-	for (slavePtr = layoutPtr[slot].binNextPtr; slavePtr != NULL;
-		slavePtr = slavePtr->binNextPtr) {
+	for (contentPtr = layoutPtr[slot].binNextPtr; contentPtr != NULL;
+		contentPtr = contentPtr->binNextPtr) {
 	    int span = (slotType == COLUMN) ?
-		    slavePtr->numCols : slavePtr->numRows;
-	    int require = offset - slavePtr->size;
+		    contentPtr->numCols : contentPtr->numRows;
+	    int require = offset - contentPtr->size;
 	    int startSlot = slot - span;
 
 	    if (startSlot >=0 && require < layoutPtr[startSlot].maxOffset) {
@@ -2446,7 +2446,7 @@ GetGrid(
     gridPtr->containerPtr = NULL;
     gridPtr->containerDataPtr = NULL;
     gridPtr->nextPtr = NULL;
-    gridPtr->slavePtr = NULL;
+    gridPtr->contentPtr = NULL;
     gridPtr->binNextPtr = NULL;
 
     gridPtr->column = -1;
@@ -2495,13 +2495,13 @@ static void
 SetGridSize(
     Gridder *containerPtr)		/* The geometry container for this grid. */
 {
-    Gridder *slavePtr;	/* Current slave window. */
+    Gridder *contentPtr;	/* Current slave window. */
     int maxX = 0, maxY = 0;
 
-    for (slavePtr = containerPtr->slavePtr; slavePtr != NULL;
-	    slavePtr = slavePtr->nextPtr) {
-	maxX = MAX(maxX, slavePtr->numCols + slavePtr->column);
-	maxY = MAX(maxY, slavePtr->numRows + slavePtr->row);
+    for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
+	    contentPtr = contentPtr->nextPtr) {
+	maxX = MAX(maxX, contentPtr->numCols + contentPtr->column);
+	maxY = MAX(maxY, contentPtr->numRows + contentPtr->row);
     }
     containerPtr->containerDataPtr->columnEnd = maxX;
     containerPtr->containerDataPtr->rowEnd = maxY;
@@ -2529,14 +2529,14 @@ SetGridSize(
 static int
 SetSlaveColumn(
     Tcl_Interp *interp,		/* Interp for error message. */
-    Gridder *slavePtr,		/* Slave to be updated. */
+    Gridder *contentPtr,		/* Slave to be updated. */
     int column,			/* New column or -1 to be unchanged. */
     int numCols)		/* New columnspan or -1 to be unchanged. */
 {
     int newColumn, newNumCols, lastCol;
 
-    newColumn = (column >= 0) ? column : slavePtr->column;
-    newNumCols = (numCols >= 1) ? numCols : slavePtr->numCols;
+    newColumn = (column >= 0) ? column : contentPtr->column;
+    newNumCols = (numCols >= 1) ? numCols : contentPtr->numCols;
 
     lastCol = ((newColumn >= 0) ? newColumn : 0) + newNumCols;
     if (lastCol >= MAX_ELEMENT) {
@@ -2545,8 +2545,8 @@ SetSlaveColumn(
 	return TCL_ERROR;
     }
 
-    slavePtr->column = newColumn;
-    slavePtr->numCols = newNumCols;
+    contentPtr->column = newColumn;
+    contentPtr->numCols = newNumCols;
     return TCL_OK;
 }
 
@@ -2570,14 +2570,14 @@ SetSlaveColumn(
 static int
 SetSlaveRow(
     Tcl_Interp *interp,		/* Interp for error message. */
-    Gridder *slavePtr,		/* Slave to be updated. */
+    Gridder *contentPtr,		/* Slave to be updated. */
     int row,			/* New row or -1 to be unchanged. */
     int numRows)		/* New rowspan or -1 to be unchanged. */
 {
     int newRow, newNumRows, lastRow;
 
-    newRow = (row >= 0) ? row : slavePtr->row;
-    newNumRows = (numRows >= 1) ? numRows : slavePtr->numRows;
+    newRow = (row >= 0) ? row : contentPtr->row;
+    newNumRows = (numRows >= 1) ? numRows : contentPtr->numRows;
 
     lastRow = ((newRow >= 0) ? newRow : 0) + newNumRows;
     if (lastRow >= MAX_ELEMENT) {
@@ -2586,8 +2586,8 @@ SetSlaveRow(
 	return TCL_ERROR;
     }
 
-    slavePtr->row = newRow;
-    slavePtr->numRows = newNumRows;
+    contentPtr->row = newRow;
+    contentPtr->numRows = newNumRows;
     return TCL_OK;
 }
 
@@ -2701,8 +2701,8 @@ InitMasterData(
     Gridder *containerPtr)
 {
     if (containerPtr->containerDataPtr == NULL) {
-	GridMaster *gridPtr = containerPtr->containerDataPtr = (GridMaster *)
-		ckalloc(sizeof(GridMaster));
+	GridContainer *gridPtr = containerPtr->containerDataPtr = (GridContainer *)
+		ckalloc(sizeof(GridContainer));
 	size_t size = sizeof(SlotInfo) * TYPICAL_SIZE;
 
 	gridPtr->columnEnd = 0;
@@ -2741,24 +2741,24 @@ InitMasterData(
 
 static void
 Unlink(
-    Gridder *slavePtr)	/* Window to unlink. */
+    Gridder *contentPtr)	/* Window to unlink. */
 {
-    Gridder *containerPtr, *slavePtr2;
+    Gridder *containerPtr, *contentPtr2;
 
-    containerPtr = slavePtr->containerPtr;
+    containerPtr = contentPtr->containerPtr;
     if (containerPtr == NULL) {
 	return;
     }
 
-    if (containerPtr->slavePtr == slavePtr) {
-	containerPtr->slavePtr = slavePtr->nextPtr;
+    if (containerPtr->contentPtr == contentPtr) {
+	containerPtr->contentPtr = contentPtr->nextPtr;
     } else {
-	for (slavePtr2=containerPtr->slavePtr ; ; slavePtr2=slavePtr2->nextPtr) {
-	    if (slavePtr2 == NULL) {
+	for (contentPtr2=containerPtr->contentPtr ; ; contentPtr2=contentPtr2->nextPtr) {
+	    if (contentPtr2 == NULL) {
 		Tcl_Panic("Unlink couldn't find previous window");
 	    }
-	    if (slavePtr2->nextPtr == slavePtr) {
-		slavePtr2->nextPtr = slavePtr->nextPtr;
+	    if (contentPtr2->nextPtr == contentPtr) {
+		contentPtr2->nextPtr = contentPtr->nextPtr;
 		break;
 	    }
 	}
@@ -2771,8 +2771,8 @@ Unlink(
 	*containerPtr->abortPtr = 1;
     }
 
-    SetGridSize(slavePtr->containerPtr);
-    slavePtr->containerPtr = NULL;
+    SetGridSize(contentPtr->containerPtr);
+    contentPtr->containerPtr = NULL;
 
     /*
      * If we have emptied this container from slaves it means we are no longer
@@ -2782,7 +2782,7 @@ Unlink(
      * being no managed children inside it.
      */
 
-    if ((containerPtr->slavePtr == NULL) && (containerPtr->flags & ALLOCED_CONTAINER)) {
+    if ((containerPtr->contentPtr == NULL) && (containerPtr->flags & ALLOCED_CONTAINER)) {
 	TkFreeGeometryContainer(containerPtr->tkwin, "grid");
 	containerPtr->flags &= ~ALLOCED_CONTAINER;
 	Tk_SendVirtualEvent(containerPtr->tkwin, "NoManagedChild", NULL);
@@ -2858,7 +2858,7 @@ GridStructureProc(
     TkDisplay *dispPtr = ((TkWindow *) gridPtr->tkwin)->dispPtr;
 
     if (eventPtr->type == ConfigureNotify) {
-	if ((gridPtr->slavePtr != NULL)
+	if ((gridPtr->contentPtr != NULL)
 		&& !(gridPtr->flags & REQUESTED_RELAYOUT)) {
 	    gridPtr->flags |= REQUESTED_RELAYOUT;
 	    Tcl_DoWhenIdle(ArrangeGrid, gridPtr);
@@ -2872,18 +2872,18 @@ GridStructureProc(
 	    }
 	}
     } else if (eventPtr->type == DestroyNotify) {
-	Gridder *slavePtr, *nextPtr;
+	Gridder *contentPtr, *nextPtr;
 
 	if (gridPtr->containerPtr != NULL) {
 	    Unlink(gridPtr);
 	}
-	for (slavePtr = gridPtr->slavePtr; slavePtr != NULL;
-		slavePtr = nextPtr) {
-	    Tk_ManageGeometry(slavePtr->tkwin, NULL, NULL);
-	    Tk_UnmapWindow(slavePtr->tkwin);
-	    slavePtr->containerPtr = NULL;
-	    nextPtr = slavePtr->nextPtr;
-	    slavePtr->nextPtr = NULL;
+	for (contentPtr = gridPtr->contentPtr; contentPtr != NULL;
+		contentPtr = nextPtr) {
+	    Tk_ManageGeometry(contentPtr->tkwin, NULL, NULL);
+	    Tk_UnmapWindow(contentPtr->tkwin);
+	    contentPtr->containerPtr = NULL;
+	    nextPtr = contentPtr->nextPtr;
+	    contentPtr->nextPtr = NULL;
 	}
 	Tcl_DeleteHashEntry(Tcl_FindHashEntry(&dispPtr->gridHashTable,
 		gridPtr->tkwin));
@@ -2893,17 +2893,17 @@ GridStructureProc(
 	gridPtr->tkwin = NULL;
 	Tcl_EventuallyFree(gridPtr, (Tcl_FreeProc *)DestroyGrid);
     } else if (eventPtr->type == MapNotify) {
-	if ((gridPtr->slavePtr != NULL)
+	if ((gridPtr->contentPtr != NULL)
 		&& !(gridPtr->flags & REQUESTED_RELAYOUT)) {
 	    gridPtr->flags |= REQUESTED_RELAYOUT;
 	    Tcl_DoWhenIdle(ArrangeGrid, gridPtr);
 	}
     } else if (eventPtr->type == UnmapNotify) {
-	Gridder *slavePtr;
+	Gridder *contentPtr;
 
-	for (slavePtr = gridPtr->slavePtr; slavePtr != NULL;
-		slavePtr = slavePtr->nextPtr) {
-	    Tk_UnmapWindow(slavePtr->tkwin);
+	for (contentPtr = gridPtr->contentPtr; contentPtr != NULL;
+		contentPtr = contentPtr->nextPtr) {
+	    Tk_UnmapWindow(contentPtr->tkwin);
 	}
     }
 }
@@ -2940,7 +2940,7 @@ ConfigureContent(
 				 * that there is at least one window name. */
 {
     Gridder *containerPtr = NULL;
-    Gridder *slavePtr;
+    Gridder *contentPtr;
     Tk_Window other, slave, parent, ancestor;
     TkWindow *container;
     int i, j, tmp;
@@ -2992,9 +2992,9 @@ ConfigureContent(
 		 * If the stored container does not exist, just ignore it.
 		 */
 
-		struct Gridder *slavePtr = GetGrid(slave);
-		if (slavePtr->in != NULL) {
-		    if (TkGetWindowFromObj(interp, slave, slavePtr->in, &parent)
+		struct Gridder *contentPtr = GetGrid(slave);
+		if (contentPtr->in != NULL) {
+		    if (TkGetWindowFromObj(interp, slave, contentPtr->in, &parent)
 			    == TCL_OK) {
 			containerPtr = GetGrid(parent);
 			InitMasterData(containerPtr);
@@ -3150,7 +3150,7 @@ ConfigureContent(
 	    Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "TOPLEVEL", NULL);
 	    return TCL_ERROR;
 	}
-	slavePtr = GetGrid(slave);
+	contentPtr = GetGrid(slave);
 
 	/*
 	 * The following statement is taken from tkPack.c:
@@ -3180,7 +3180,7 @@ ConfigureContent(
 		    Tcl_SetErrorCode(interp, "TK", "VALUE", "COLUMN", NULL);
 		    return TCL_ERROR;
 		}
-		if (SetSlaveColumn(interp, slavePtr, tmp, -1) != TCL_OK) {
+		if (SetSlaveColumn(interp, contentPtr, tmp, -1) != TCL_OK) {
 		    return TCL_ERROR;
 		}
 		break;
@@ -3193,7 +3193,7 @@ ConfigureContent(
 		    Tcl_SetErrorCode(interp, "TK", "VALUE", "SPAN", NULL);
 		    return TCL_ERROR;
 		}
-		if (SetSlaveColumn(interp, slavePtr, -1, tmp) != TCL_OK) {
+		if (SetSlaveColumn(interp, contentPtr, -1, tmp) != TCL_OK) {
 		    return TCL_ERROR;
 		}
 		break;
@@ -3223,7 +3223,7 @@ ConfigureContent(
 		    Tcl_SetErrorCode(interp, "TK", "VALUE", "STICKY", NULL);
 		    return TCL_ERROR;
 		}
-		slavePtr->sticky = sticky;
+		contentPtr->sticky = sticky;
 		break;
 	    }
 	    case CONF_IPADX:
@@ -3235,7 +3235,7 @@ ConfigureContent(
 		    Tcl_SetErrorCode(interp, "TK", "VALUE", "INT_PAD", NULL);
 		    return TCL_ERROR;
 		}
-		slavePtr->iPadX = tmp * 2;
+		contentPtr->iPadX = tmp * 2;
 		break;
 	    case CONF_IPADY:
 		if ((Tk_GetPixelsFromObj(NULL, slave, objv[i+1],
@@ -3246,17 +3246,17 @@ ConfigureContent(
 		    Tcl_SetErrorCode(interp, "TK", "VALUE", "INT_PAD", NULL);
 		    return TCL_ERROR;
 		}
-		slavePtr->iPadY = tmp * 2;
+		contentPtr->iPadY = tmp * 2;
 		break;
 	    case CONF_PADX:
 		if (TkParsePadAmount(interp, tkwin, objv[i+1],
-			&slavePtr->padLeft, &slavePtr->padX) != TCL_OK) {
+			&contentPtr->padLeft, &contentPtr->padX) != TCL_OK) {
 		    return TCL_ERROR;
 		}
 		break;
 	    case CONF_PADY:
 		if (TkParsePadAmount(interp, tkwin, objv[i+1],
-			&slavePtr->padTop, &slavePtr->padY) != TCL_OK) {
+			&contentPtr->padTop, &contentPtr->padY) != TCL_OK) {
 		    return TCL_ERROR;
 		}
 		break;
@@ -3269,7 +3269,7 @@ ConfigureContent(
 		    Tcl_SetErrorCode(interp, "TK", "VALUE", "COLUMN", NULL);
 		    return TCL_ERROR;
 		}
-		if (SetSlaveRow(interp, slavePtr, tmp, -1) != TCL_OK) {
+		if (SetSlaveRow(interp, contentPtr, tmp, -1) != TCL_OK) {
 		    return TCL_ERROR;
 		}
 		break;
@@ -3282,7 +3282,7 @@ ConfigureContent(
 		    Tcl_SetErrorCode(interp, "TK", "VALUE", "SPAN", NULL);
 		    return TCL_ERROR;
 		}
-		if (SetSlaveRow(interp, slavePtr, -1, tmp) != TCL_OK) {
+		if (SetSlaveRow(interp, contentPtr, -1, tmp) != TCL_OK) {
 		    return TCL_ERROR;
 		}
 		break;
@@ -3294,8 +3294,8 @@ ConfigureContent(
 	 * packed, then leave it in its current location.
 	 */
 
-    	if (!positionGiven && (slavePtr->containerPtr != NULL)) {
-	    containerPtr = slavePtr->containerPtr;
+    	if (!positionGiven && (contentPtr->containerPtr != NULL)) {
+	    containerPtr = contentPtr->containerPtr;
 	    goto scheduleLayout;
     	}
 
@@ -3304,7 +3304,7 @@ ConfigureContent(
 	 * its current location.
 	 */
 
-	if (positionGiven && (containerPtr == slavePtr->containerPtr)) {
+	if (positionGiven && (containerPtr == contentPtr->containerPtr)) {
 	    goto scheduleLayout;
 	}
 
@@ -3320,20 +3320,20 @@ ConfigureContent(
 	    InitMasterData(containerPtr);
     	}
 
-	if (slavePtr->containerPtr != NULL && slavePtr->containerPtr != containerPtr) {
-            if (slavePtr->containerPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
-                Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->containerPtr->tkwin);
+	if (contentPtr->containerPtr != NULL && contentPtr->containerPtr != containerPtr) {
+            if (contentPtr->containerPtr->tkwin != Tk_Parent(contentPtr->tkwin)) {
+                Tk_UnmaintainGeometry(contentPtr->tkwin, contentPtr->containerPtr->tkwin);
             }
-	    Unlink(slavePtr);
-	    slavePtr->containerPtr = NULL;
+	    Unlink(contentPtr);
+	    contentPtr->containerPtr = NULL;
 	}
 
-	if (slavePtr->containerPtr == NULL) {
-	    Gridder *tempPtr = containerPtr->slavePtr;
+	if (contentPtr->containerPtr == NULL) {
+	    Gridder *tempPtr = containerPtr->contentPtr;
 
-	    slavePtr->containerPtr = containerPtr;
-	    containerPtr->slavePtr = slavePtr;
-	    slavePtr->nextPtr = tempPtr;
+	    contentPtr->containerPtr = containerPtr;
+	    containerPtr->contentPtr = contentPtr;
+	    contentPtr->nextPtr = tempPtr;
 	}
 
 	/*
@@ -3351,7 +3351,7 @@ ConfigureContent(
 			"can't put %s inside %s", Tcl_GetString(objv[j]),
 			Tk_PathName(containerPtr->tkwin)));
 		Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "HIERARCHY", NULL);
-		Unlink(slavePtr);
+		Unlink(contentPtr);
 		return TCL_ERROR;
 	    }
 	}
@@ -3367,7 +3367,7 @@ ConfigureContent(
 		    "can't put %s inside %s, would cause management loop",
 	            Tcl_GetString(objv[j]), Tk_PathName(containerPtr->tkwin)));
 		Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "LOOP", NULL);
-		Unlink(slavePtr);
+		Unlink(contentPtr);
 		return TCL_ERROR;
 	    }
 	}
@@ -3375,13 +3375,13 @@ ConfigureContent(
 	    ((TkWindow *)slave)->maintainerPtr = (TkWindow *)containerPtr->tkwin;
 	}
 
-	Tk_ManageGeometry(slave, &gridMgrType, slavePtr);
+	Tk_ManageGeometry(slave, &gridMgrType, contentPtr);
 
 	if (!(containerPtr->flags & DONT_PROPAGATE)) {
 	    if (TkSetGeometryContainer(interp, containerPtr->tkwin, "grid")
 		    != TCL_OK) {
 		Tk_ManageGeometry(slave, NULL, NULL);
-		Unlink(slavePtr);
+		Unlink(contentPtr);
 		return TCL_ERROR;
 	    }
 	    containerPtr->flags |= ALLOCED_CONTAINER;
@@ -3391,21 +3391,21 @@ ConfigureContent(
 	 * Assign default position information.
 	 */
 
-	if (slavePtr->column == -1) {
-	    if (SetSlaveColumn(interp, slavePtr, defaultColumn,-1) != TCL_OK){
+	if (contentPtr->column == -1) {
+	    if (SetSlaveColumn(interp, contentPtr, defaultColumn,-1) != TCL_OK){
 		return TCL_ERROR;
 	    }
 	}
-	if (SetSlaveColumn(interp, slavePtr, -1,
-		slavePtr->numCols + defaultColumnSpan - 1) != TCL_OK) {
+	if (SetSlaveColumn(interp, contentPtr, -1,
+		contentPtr->numCols + defaultColumnSpan - 1) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	if (slavePtr->row == -1) {
-	    if (SetSlaveRow(interp, slavePtr, defaultRow, -1) != TCL_OK) {
+	if (contentPtr->row == -1) {
+	    if (SetSlaveRow(interp, contentPtr, defaultRow, -1) != TCL_OK) {
 		return TCL_ERROR;
 	    }
 	}
-	defaultColumn += slavePtr->numCols;
+	defaultColumn += contentPtr->numCols;
 	defaultColumnSpan = 1;
 
 	/*
@@ -3449,7 +3449,7 @@ ConfigureContent(
 
 	if (containerPtr == NULL) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "can't use '^', cant find master", -1));
+		    "can't use '^', can't find container window", -1));
 	    Tcl_SetErrorCode(interp, "TK", "GRID", "SHORTCUT_USAGE", NULL);
 	    return TCL_ERROR;
 	}
@@ -3483,19 +3483,19 @@ ConfigureContent(
 	lastColumn += numSkip;
 
 	match = 0;
-	for (slavePtr = containerPtr->slavePtr; slavePtr != NULL;
-		slavePtr = slavePtr->nextPtr) {
-
-	    if (slavePtr->column == lastColumn
-		    && slavePtr->row + slavePtr->numRows - 1 == lastRow) {
-		if (slavePtr->numCols <= width) {
-		    if (SetSlaveRow(interp, slavePtr, -1,
-			    slavePtr->numRows + 1) != TCL_OK) {
+	for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
+		contentPtr = contentPtr->nextPtr) {
+
+	    if (contentPtr->column == lastColumn
+		    && contentPtr->row + contentPtr->numRows - 1 == lastRow) {
+		if (contentPtr->numCols <= width) {
+		    if (SetSlaveRow(interp, contentPtr, -1,
+			    contentPtr->numRows + 1) != TCL_OK) {
 			return TCL_ERROR;
 		    }
 		    match++;
-		    j += slavePtr->numCols - 1;
-		    lastWindow = Tk_PathName(slavePtr->tkwin);
+		    j += contentPtr->numCols - 1;
+		    lastWindow = Tk_PathName(contentPtr->tkwin);
 		    numSkip = 0;
 		    break;
 		}
@@ -3503,7 +3503,7 @@ ConfigureContent(
 	}
 	if (!match) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		    "can't find slave to extend with \"^\"", -1));
+		    "can't find content to extend with \"^\"", -1));
 	    Tcl_SetErrorCode(interp, "TK", "GRID", "SHORTCUT_USAGE", NULL);
 	    return TCL_ERROR;
 	}
@@ -3511,7 +3511,7 @@ ConfigureContent(
 
     if (containerPtr == NULL) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		"can't determine master window", -1));
+		"can't determine container window", -1));
 	Tcl_SetErrorCode(interp, "TK", "GRID", "SHORTCUT_USAGE", NULL);
 	return TCL_ERROR;
     }
@@ -3525,7 +3525,7 @@ ConfigureContent(
      * being no managed children inside it.
      */
 
-    if (containerPtr->slavePtr == NULL && containerPtr->flags & ALLOCED_CONTAINER) {
+    if (containerPtr->contentPtr == NULL && containerPtr->flags & ALLOCED_CONTAINER) {
 	TkFreeGeometryContainer(containerPtr->tkwin, "grid");
 	containerPtr->flags &= ~ALLOCED_CONTAINER;
 	Tk_SendVirtualEvent(containerPtr->tkwin, "NoManagedChild", NULL);
diff --git a/generic/tkImage.c b/generic/tkImage.c
index 8c58c78..e4015fd 100644
--- a/generic/tkImage.c
+++ b/generic/tkImage.c
@@ -27,7 +27,7 @@ typedef struct Image {
 				 * image is eventually freed tkwin may not
 				 * exist anymore. */
     struct ImageModel *modelPtr;
-				/* Master for this image (identifiers image
+				/* Model for this image (identifiers image
 				 * manager, for example). */
     ClientData instanceData;	/* One word argument to pass to image manager
 				 * when dealing with this image instance. */
@@ -40,7 +40,7 @@ typedef struct Image {
 } Image;
 
 /*
- * For each image master there is one of the following structures, which
+ * For each image model there is one of the following structures, which
  * represents a name in the image table and all of the images instantiated
  * from it. Entries in mainPtr->imageTable point to these structures.
  */
@@ -50,7 +50,7 @@ typedef struct ImageModel {
 				 * that no image manager owns this image: the
 				 * image was deleted. */
     ClientData modelData;	/* One-word argument to pass to image mgr when
-				 * dealing with the master, as opposed to
+				 * dealing with the model, as opposed to
 				 * instances. */
     int width, height;		/* Last known dimensions for image. */
     Tcl_HashTable *tablePtr;	/* Pointer to hash table containing image (the
@@ -298,7 +298,7 @@ Tk_ImageObjCmd(
 
 	    /*
 	     * Need to check if the _command_ that we are about to create is
-	     * the name of the current master widget command (normally "." but
+	     * the name of the current model widget command (normally "." but
 	     * could have been renamed) and fail in that case before a really
 	     * nasty and hard to stop crash happens.
 	     */
@@ -333,7 +333,7 @@ Tk_ImageObjCmd(
 	} else {
 	    /*
 	     * An image already exists by this name. Disconnect the instances
-	     * from the master.
+	     * from the model.
 	     */
 
 	    modelPtr = (ImageModel *)Tcl_GetHashValue(hPtr);
@@ -450,7 +450,7 @@ Tk_ImageObjCmd(
     case IMAGE_WIDTH:
 	/*
 	 * These operations all parse virtually identically. First check to
-	 * see if three args are given. Then get a non-deleted master from the
+	 * see if three args are given. Then get a non-deleted model from the
 	 * third arg.
 	 */
 
@@ -552,7 +552,7 @@ Tk_ImageChanged(
  *
  * Tk_NameOfImage --
  *
- *	Given a token for an image master, this function returns the name of
+ *	Given a token for an image model, this function returns the name of
  *	the image.
  *
  * Results:
@@ -693,8 +693,8 @@ Tk_FreeImage(
     ckfree(imagePtr);
 
     /*
-     * If there are no more instances left for the master, and if the master
-     * image has been deleted, then delete the master too.
+     * If there are no more instances left for the model, and if the model
+     * image has been deleted, then delete the model too.
      */
 
     if ((modelPtr->typePtr == NULL) && (modelPtr->instancePtr == NULL)) {
@@ -744,7 +744,7 @@ Tk_PostscriptImage(
 
     if (imagePtr->modelPtr->typePtr == NULL) {
 	/*
-	 * No master for image, so nothing to display on postscript.
+	 * No model for image, so nothing to display on postscript.
 	 */
 
 	return TCL_OK;
@@ -840,7 +840,7 @@ Tk_RedrawImage(
 
     if (imagePtr->modelPtr->typePtr == NULL) {
 	/*
-	 * No master for image, so nothing to display.
+	 * No model for image, so nothing to display.
 	 */
 
 	return;
@@ -949,7 +949,7 @@ Tk_DeleteImage(
  *
  * Side effects:
  *	The connection is dropped between instances of this image and an image
- *	master. Image instances will redisplay themselves as empty areas, but
+ *	model. Image instances will redisplay themselves as empty areas, but
  *	existing instances will not be deleted.
  *
  *----------------------------------------------------------------------
@@ -1057,7 +1057,7 @@ TkDeleteAllImages(
  * Tk_GetImageModelData --
  *
  *	Given the name of an image, this function returns the type of the
- *	image and the clientData associated with its master.
+ *	image and the clientData associated with its model.
  *
  * Results:
  *	If there is no image by the given name, then NULL is returned and a
diff --git a/generic/tkImgBmap.c b/generic/tkImgBmap.c
index ad8ce8c..a77b9b8 100644
--- a/generic/tkImgBmap.c
+++ b/generic/tkImgBmap.c
@@ -14,12 +14,12 @@
 #include "tkInt.h"
 
 /*
- * The following data structure represents the master for a bitmap
+ * The following data structure represents the model for a bitmap
  * image:
  */
 
 typedef struct {
-    Tk_ImageMaster tkMaster;	/* Tk's token for image master. NULL means the
+    Tk_ImageModel tkModel;	/* Tk's token for image model. NULL means the
 				 * image is being deleted. */
     Tcl_Interp *interp;		/* Interpreter for application that is using
 				 * image. */
@@ -40,7 +40,7 @@ typedef struct {
     char *maskDataString;	/* Value of -maskdata option (malloc'ed). */
     struct BitmapInstance *instancePtr;
 				/* First in list of all instances associated
-				 * with this master. */
+				 * with this model. */
 } BitmapModel;
 
 /*
@@ -51,7 +51,7 @@ typedef struct {
 typedef struct BitmapInstance {
     size_t refCount;		/* Number of instances that share this data
 				 * structure. */
-    BitmapModel *modelPtr;	/* Pointer to master for image. */
+    BitmapModel *modelPtr;	/* Pointer to model for image. */
     Tk_Window tkwin;		/* Window in which the instances will be
 				 * displayed. */
     XColor *fg;			/* Foreground color for displaying image. */
@@ -76,7 +76,7 @@ typedef struct BitmapInstance {
 static int		GetByte(Tcl_Channel chan);
 static int		ImgBmapCreate(Tcl_Interp *interp,
 			    const char *name, int argc, Tcl_Obj *const objv[],
-			    const Tk_ImageType *typePtr, Tk_ImageMaster master,
+			    const Tk_ImageType *typePtr, Tk_ImageModel model,
 			    ClientData *clientDataPtr);
 static ClientData	ImgBmapGet(Tk_Window tkwin, ClientData clientData);
 static void		ImgBmapDisplay(ClientData clientData,
@@ -178,7 +178,7 @@ ImgBmapCreate(
     Tcl_Obj *const argv[],	/* Argument objects for options (doesn't
 				 * include image name or type). */
     const Tk_ImageType *typePtr,/* Pointer to our type record (not used). */
-    Tk_ImageMaster master,	/* Token for image, to be used by us in later
+    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. */
@@ -186,7 +186,7 @@ ImgBmapCreate(
     BitmapModel *modelPtr = (BitmapModel *)ckalloc(sizeof(BitmapModel));
     (void)typePtr;
 
-    modelPtr->tkMaster = master;
+    modelPtr->tkModel = model;
     modelPtr->interp = interp;
     modelPtr->imageCmd = Tcl_CreateObjCommand(interp, name, ImgBmapCmd,
 	    modelPtr, ImgBmapCmdDeletedProc);
@@ -311,7 +311,7 @@ ImgBmapConfigureModel(
 	    instancePtr = instancePtr->nextPtr) {
 	ImgBmapConfigureInstance(instancePtr);
     }
-    Tk_ImageChanged(modelPtr->tkMaster, 0, 0, modelPtr->width,
+    Tk_ImageChanged(modelPtr->tkModel, 0, 0, modelPtr->width,
 	    modelPtr->height, modelPtr->width, modelPtr->height);
     return TCL_OK;
 }
@@ -322,8 +322,8 @@ ImgBmapConfigureModel(
  * ImgBmapConfigureInstance --
  *
  *	This procedure is called to create displaying information for a bitmap
- *	image instance based on the configuration information in the master.
- *	It is invoked both when new instances are created and when the master
+ *	image instance based on the configuration information in the model.
+ *	It is invoked both when new instances are created and when the model
  *	is reconfigured.
  *
  * Results:
@@ -447,7 +447,7 @@ ImgBmapConfigureInstance(
     instancePtr->gc = NULL;
     Tcl_AppendObjToErrorInfo(modelPtr->interp, Tcl_ObjPrintf(
 	    "\n    (while configuring image \"%s\")", Tk_NameOfImage(
-	    modelPtr->tkMaster)));
+	    modelPtr->tkModel)));
     Tcl_BackgroundException(modelPtr->interp, TCL_ERROR);
 }
 
@@ -751,7 +751,7 @@ NextBitmapWord(
 
 static int
 ImgBmapCmd(
-    ClientData clientData,	/* Information about the image master. */
+    ClientData clientData,	/* Information about the image model. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -816,10 +816,10 @@ static ClientData
 ImgBmapGet(
     Tk_Window tkwin,		/* Window in which the instance will be
 				 * used. */
-    ClientData masterData)	/* Pointer to our master structure for the
+    ClientData modelData)	/* Pointer to our model structure for the
 				 * image. */
 {
-    BitmapModel *modelPtr = (BitmapModel *)masterData;
+    BitmapModel *modelPtr = (BitmapModel *)modelData;
     BitmapInstance *instancePtr;
 
     /*
@@ -858,7 +858,7 @@ ImgBmapGet(
      */
 
     if (instancePtr->nextPtr == NULL) {
-	Tk_ImageChanged(modelPtr->tkMaster, 0, 0, 0, 0, modelPtr->width,
+	Tk_ImageChanged(modelPtr->tkModel, 0, 0, 0, 0, modelPtr->width,
 		modelPtr->height);
     }
 
@@ -992,7 +992,7 @@ ImgBmapFree(
  *
  * ImgBmapDelete --
  *
- *	This procedure is called by the image code to delete the master
+ *	This procedure is called by the image code to delete the model
  *	structure for an image.
  *
  * Results:
@@ -1006,15 +1006,15 @@ ImgBmapFree(
 
 static void
 ImgBmapDelete(
-    ClientData masterData)	/* Pointer to BitmapModel structure for
+    ClientData modelData)	/* Pointer to BitmapModel structure for
 				 * image. Must not have any more instances. */
 {
-    BitmapModel *modelPtr = (BitmapModel *)masterData;
+    BitmapModel *modelPtr = (BitmapModel *)modelData;
 
     if (modelPtr->instancePtr != NULL) {
 	Tcl_Panic("tried to delete bitmap image when instances still exist");
     }
-    modelPtr->tkMaster = NULL;
+    modelPtr->tkModel = NULL;
     if (modelPtr->imageCmd != NULL) {
 	Tcl_DeleteCommandFromToken(modelPtr->interp, modelPtr->imageCmd);
     }
@@ -1053,8 +1053,8 @@ ImgBmapCmdDeletedProc(
     BitmapModel *modelPtr = (BitmapModel *)clientData;
 
     modelPtr->imageCmd = NULL;
-    if (modelPtr->tkMaster != NULL) {
-	Tk_DeleteImage(modelPtr->interp, Tk_NameOfImage(modelPtr->tkMaster));
+    if (modelPtr->tkModel != NULL) {
+	Tk_DeleteImage(modelPtr->interp, Tk_NameOfImage(modelPtr->tkModel));
     }
 }
 
diff --git a/generic/tkImgPhInstance.c b/generic/tkImgPhInstance.c
index b47f21c..11dc251 100644
--- a/generic/tkImgPhInstance.c
+++ b/generic/tkImgPhInstance.c
@@ -66,8 +66,8 @@ static int imgPhotoColorHashInitialized;
  * TkImgPhotoConfigureInstance --
  *
  *	This function is called to create displaying information for a photo
- *	image instance based on the configuration information in the master.
- *	It is invoked both when new instances are created and when the master
+ *	image instance based on the configuration information in the model.
+ *	It is invoked both when new instances are created and when the model
  *	is reconfigured.
  *
  * Results:
@@ -91,9 +91,9 @@ TkImgPhotoConfigureInstance(
     XRectangle validBox;
 
     /*
-     * If the -palette configuration option has been set for the master, use
+     * If the -palette configuration option has been set for the model, use
      * the value specified for our palette, but only if it is a valid palette
-     * for our windows. Use the gamma value specified the master.
+     * for our windows. Use the gamma value specified the model.
      */
 
     if ((modelPtr->palette && modelPtr->palette[0])
@@ -166,7 +166,7 @@ TkImgPhotoConfigureInstance(
     }
 
     /*
-     * If the user has specified a width and/or height for the master which is
+     * If the user has specified a width and/or height for the model which is
      * different from our current width/height, set the size to the values
      * specified by the user. If we have no pixmap, we do this also, since it
      * has the side effect of allocating a pixmap for us.
@@ -214,7 +214,7 @@ ClientData
 TkImgPhotoGet(
     Tk_Window tkwin,		/* Window in which the instance will be
 				 * used. */
-    ClientData modelData)	/* Pointer to our master structure for the
+    ClientData modelData)	/* Pointer to our model structure for the
 				 * image. */
 {
     PhotoModel *modelPtr = (PhotoModel *)modelData;
@@ -380,7 +380,7 @@ TkImgPhotoGet(
      */
 
     if (instancePtr->nextPtr == NULL) {
-	Tk_ImageChanged(modelPtr->tkMaster, 0, 0, 0, 0,
+	Tk_ImageChanged(modelPtr->tkModel, 0, 0, 0, 0,
 		modelPtr->width, modelPtr->height);
     }
 
@@ -1624,7 +1624,7 @@ TkImgDisposeInstance(
  * TkImgDitherInstance --
  *
  *	This function is called to update an area of an instance's pixmap by
- *	dithering the corresponding area of the master.
+ *	dithering the corresponding area of the model.
  *
  * Results:
  *	None.
@@ -1827,7 +1827,7 @@ TkImgDitherInstance(
 		/*
 		 * Multibit monochrome window. The operation here is similar
 		 * to the color window case above, except that there is only
-		 * one component. If the master image is in color, use the
+		 * one component. If the model image is in color, use the
 		 * luminance computed as
 		 *	0.344 * red + 0.5 * green + 0.156 * blue.
 		 */
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c
index 01e188a..db810d8 100644
--- a/generic/tkImgPhoto.c
+++ b/generic/tkImgPhoto.c
@@ -107,7 +107,7 @@ static const char *const optionNames[] = {
 
 static int		ImgPhotoCreate(Tcl_Interp *interp, const char *name,
 			    int objc, Tcl_Obj *const objv[],
-			    const Tk_ImageType *typePtr, Tk_ImageMaster master,
+			    const Tk_ImageType *typePtr, Tk_ImageModel model,
 			    ClientData *clientDataPtr);
 static void		ImgPhotoDelete(ClientData clientData);
 static int		ImgPhotoPostscript(ClientData clientData,
@@ -160,15 +160,15 @@ static Tcl_ThreadDataKey dataKey;
 
 static const Tk_ConfigSpec configSpecs[] = {
     {TK_CONFIG_STRING, "-file", NULL, NULL,
-	 NULL, offsetof(PhotoMaster, fileString), TK_CONFIG_NULL_OK, NULL},
+	 NULL, offsetof(PhotoModel, fileString), TK_CONFIG_NULL_OK, NULL},
     {TK_CONFIG_DOUBLE, "-gamma", NULL, NULL,
-	 DEF_PHOTO_GAMMA, offsetof(PhotoMaster, gamma), 0, NULL},
+	 DEF_PHOTO_GAMMA, offsetof(PhotoModel, gamma), 0, NULL},
     {TK_CONFIG_INT, "-height", NULL, NULL,
-	 DEF_PHOTO_HEIGHT, offsetof(PhotoMaster, userHeight), 0, NULL},
+	 DEF_PHOTO_HEIGHT, offsetof(PhotoModel, userHeight), 0, NULL},
     {TK_CONFIG_UID, "-palette", NULL, NULL,
-	 DEF_PHOTO_PALETTE, offsetof(PhotoMaster, palette), 0, NULL},
+	 DEF_PHOTO_PALETTE, offsetof(PhotoModel, palette), 0, NULL},
     {TK_CONFIG_INT, "-width", NULL, NULL,
-	 DEF_PHOTO_WIDTH, offsetof(PhotoMaster, userWidth), 0, NULL},
+	 DEF_PHOTO_WIDTH, offsetof(PhotoModel, userWidth), 0, NULL},
     {TK_CONFIG_END, NULL, NULL, NULL, NULL, 0, 0, NULL}
 };
 
@@ -185,12 +185,12 @@ static int		ParseSubcommandOptions(
 			    int *indexPtr, int objc, Tcl_Obj *const objv[]);
 static void		ImgPhotoCmdDeletedProc(ClientData clientData);
 static int		ImgPhotoConfigureModel(Tcl_Interp *interp,
-			    PhotoMaster *modelPtr, int objc,
+			    PhotoModel *modelPtr, int objc,
 			    Tcl_Obj *const objv[], int flags);
-static int		ToggleComplexAlphaIfNeeded(PhotoMaster *mPtr);
-static int		ImgPhotoSetSize(PhotoMaster *modelPtr, int width,
+static int		ToggleComplexAlphaIfNeeded(PhotoModel *mPtr);
+static int		ImgPhotoSetSize(PhotoModel *modelPtr, int width,
 			    int height);
-static char *		ImgGetPhoto(PhotoMaster *modelPtr,
+static char *		ImgGetPhoto(PhotoModel *modelPtr,
 			    Tk_PhotoImageBlock *blockPtr,
 			    struct SubcommandOptions *optPtr);
 static int		MatchFileFormat(Tcl_Interp *interp, Tcl_Channel chan,
@@ -344,21 +344,21 @@ ImgPhotoCreate(
     Tcl_Obj *const objv[],	/* Argument objects for options (doesn't
 				 * include image name or type). */
     const Tk_ImageType *typePtr,/* Pointer to our type record (not used). */
-    Tk_ImageMaster master,	/* Token for image, to be used by us in later
+    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. */
 {
-    PhotoMaster *modelPtr;
+    PhotoModel *modelPtr;
     (void)typePtr;
 
     /*
-     * Allocate and initialize the photo image master record.
+     * Allocate and initialize the photo image model record.
      */
 
-    modelPtr = (PhotoMaster *)ckalloc(sizeof(PhotoMaster));
-    memset(modelPtr, 0, sizeof(PhotoMaster));
-    modelPtr->tkMaster = master;
+    modelPtr = (PhotoModel *)ckalloc(sizeof(PhotoModel));
+    memset(modelPtr, 0, sizeof(PhotoModel));
+    modelPtr->tkModel = model;
     modelPtr->interp = interp;
     modelPtr->imageCmd = Tcl_CreateObjCommand(interp, name, ImgPhotoCmd,
 	    modelPtr, ImgPhotoCmdDeletedProc);
@@ -400,7 +400,7 @@ ImgPhotoCreate(
 
 static int
 ImgPhotoCmd(
-    ClientData clientData,	/* Information about photo master. */
+    ClientData clientData,	/* Information about photo model. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -415,7 +415,7 @@ ImgPhotoCmd(
 	PHOTO_WRITE
     };
 
-    PhotoMaster *modelPtr = (PhotoMaster *)clientData;
+    PhotoModel *modelPtr = (PhotoModel *)clientData;
     int result, index, x, y, width, height;
     struct SubcommandOptions options;
     unsigned char *pixelPtr;
@@ -601,7 +601,7 @@ ImgPhotoCmd(
 	 * has a simple alpha channel.
 	 */
 
-	if (!(((PhotoMaster *) srcHandle)->flags & COMPLEX_ALPHA)) {
+	if (!(((PhotoModel *) srcHandle)->flags & COMPLEX_ALPHA)) {
 	    options.compositingRule |= SOURCE_IS_SIMPLE_ALPHA_PHOTO;
 	}
 
@@ -670,7 +670,7 @@ ImgPhotoCmd(
 		return TCL_ERROR;
 	    }
 	}
-	Tk_ImageChanged(modelPtr->tkMaster, 0, 0, 0, 0,
+	Tk_ImageChanged(modelPtr->tkModel, 0, 0, 0, 0,
 		modelPtr->width, modelPtr->height);
 	if (options.background) {
 	    Tk_FreeColor(options.background);
@@ -1079,7 +1079,7 @@ ImgPhotoCmd(
 	     * Tell the core image code that part of the image has changed.
 	     */
 
-	    Tk_ImageChanged(modelPtr->tkMaster, x, y,
+	    Tk_ImageChanged(modelPtr->tkModel, x, y,
 		    (modelPtr->width - x), (modelPtr->height - y),
 		    modelPtr->width, modelPtr->height);
 	}
@@ -1260,7 +1260,7 @@ ImgPhotoCmd(
 	     * has (potentially) changed.
 	     */
 
-	    Tk_ImageChanged(modelPtr->tkMaster, x, y, 1, 1,
+	    Tk_ImageChanged(modelPtr->tkModel, x, y, 1, 1,
 		    modelPtr->width, modelPtr->height);
 	    modelPtr->flags &= ~IMAGE_CHANGED;
 	    return TCL_OK;
@@ -1763,7 +1763,7 @@ ParseSubcommandOptions(
 static int
 ImgPhotoConfigureModel(
     Tcl_Interp *interp,		/* Interpreter to use for reporting errors. */
-    PhotoMaster *modelPtr,	/* Pointer to data structure describing
+    PhotoModel *modelPtr,	/* Pointer to data structure describing
 				 * overall photo image to (re)configure. */
     int objc,			/* Number of entries in objv. */
     Tcl_Obj *const objv[],	/* Pairs of configuration options for image. */
@@ -2028,7 +2028,7 @@ ImgPhotoConfigureModel(
      * Inform the generic image code that the image has (potentially) changed.
      */
 
-    Tk_ImageChanged(modelPtr->tkMaster, 0, 0, modelPtr->width,
+    Tk_ImageChanged(modelPtr->tkModel, 0, 0, modelPtr->width,
 	    modelPtr->height, modelPtr->width, modelPtr->height);
     modelPtr->flags &= ~IMAGE_CHANGED;
 
@@ -2066,14 +2066,14 @@ ImgPhotoConfigureModel(
  *	None.
  *
  * Side effects:
- *	(Re)sets COMPLEX_ALPHA flag of master.
+ *	(Re)sets COMPLEX_ALPHA flag of model.
  *
  *----------------------------------------------------------------------
  */
 
 static int
 ToggleComplexAlphaIfNeeded(
-    PhotoMaster *mPtr)
+    PhotoModel *mPtr)
 {
     size_t len = (size_t)MAX(mPtr->userWidth, mPtr->width) *
 	    (size_t)MAX(mPtr->userHeight, mPtr->height) * 4;
@@ -2104,7 +2104,7 @@ ToggleComplexAlphaIfNeeded(
  *
  * ImgPhotoDelete --
  *
- *	This function is called by the image code to delete the master
+ *	This function is called by the image code to delete the model
  *	structure for an image.
  *
  * Results:
@@ -2118,10 +2118,10 @@ ToggleComplexAlphaIfNeeded(
 
 static void
 ImgPhotoDelete(
-    ClientData masterData)	/* Pointer to PhotoMaster structure for image.
+    ClientData modelData)	/* Pointer to PhotoModel structure for image.
 				 * Must not have any more instances. */
 {
-    PhotoMaster *modelPtr = (PhotoMaster *)masterData;
+    PhotoModel *modelPtr = (PhotoModel *)modelData;
     PhotoInstance *instancePtr;
 
     while ((instancePtr = modelPtr->instancePtr) != NULL) {
@@ -2131,7 +2131,7 @@ ImgPhotoDelete(
 	Tcl_CancelIdleCall(TkImgDisposeInstance, instancePtr);
 	TkImgDisposeInstance(instancePtr);
     }
-    modelPtr->tkMaster = NULL;
+    modelPtr->tkModel = NULL;
     if (modelPtr->imageCmd != NULL) {
 	Tcl_DeleteCommandFromToken(modelPtr->interp, modelPtr->imageCmd);
     }
@@ -2170,14 +2170,14 @@ ImgPhotoDelete(
 
 static void
 ImgPhotoCmdDeletedProc(
-    ClientData clientData)	/* Pointer to PhotoMaster structure for
+    ClientData clientData)	/* Pointer to PhotoModel structure for
 				 * image. */
 {
-    PhotoMaster *modelPtr = (PhotoMaster *)clientData;
+    PhotoModel *modelPtr = (PhotoModel *)clientData;
 
     modelPtr->imageCmd = NULL;
-    if (modelPtr->tkMaster != NULL) {
-	Tk_DeleteImage(modelPtr->interp, Tk_NameOfImage(modelPtr->tkMaster));
+    if (modelPtr->tkModel != NULL) {
+	Tk_DeleteImage(modelPtr->interp, Tk_NameOfImage(modelPtr->tkModel));
     }
 }
 
@@ -2195,14 +2195,14 @@ ImgPhotoCmdDeletedProc(
  *	with memory allocation.)
  *
  * Side effects:
- *	Storage gets reallocated, for the master and all its instances.
+ *	Storage gets reallocated, for the model and all its instances.
  *
  *----------------------------------------------------------------------
  */
 
 static int
 ImgPhotoSetSize(
-    PhotoMaster *modelPtr,
+    PhotoModel *modelPtr,
     int width, int height)
 {
     unsigned char *newPix32 = NULL;
@@ -2699,7 +2699,7 @@ MatchStringFormat(
  * Tk_FindPhoto --
  *
  *	This function is called to get an opaque handle (actually a
- *	PhotoMaster *) for a given image, which can be used in subsequent
+ *	PhotoModel *) for a given image, which can be used in subsequent
  *	calls to Tk_PhotoPutBlock, etc. The `name' parameter is the name of
  *	the image.
  *
@@ -2721,7 +2721,7 @@ Tk_FindPhoto(
 {
     const Tk_ImageType *typePtr;
     ClientData clientData =
-	    Tk_GetImageMasterData(interp, imageName, &typePtr);
+	    Tk_GetImageModelData(interp, imageName, &typePtr);
 
     if ((typePtr == NULL) || (typePtr->name != tkPhotoImageType.name)) {
 	return NULL;
@@ -2764,7 +2764,7 @@ Tk_PhotoPutBlock(
     int compRule)		/* Compositing rule to use when processing
 				 * transparent pixels. */
 {
-    PhotoMaster *modelPtr = (PhotoMaster *) handle;
+    PhotoModel *modelPtr = (PhotoModel *) handle;
     Tk_PhotoImageBlock sourceBlock;
     unsigned char *memToFree;
     int xEnd, yEnd, greenOffset, blueOffset, alphaOffset;
@@ -3151,7 +3151,7 @@ Tk_PhotoPutBlock(
      * Tell the core image code that this image has changed.
      */
 
-    Tk_ImageChanged(modelPtr->tkMaster, x, y, width, height,
+    Tk_ImageChanged(modelPtr->tkModel, x, y, width, height,
 	    modelPtr->width, modelPtr->height);
 
     if (memToFree) ckfree(memToFree);
@@ -3202,7 +3202,7 @@ Tk_PhotoPutZoomedBlock(
     int compRule)		/* Compositing rule to use when processing
 				 * transparent pixels. */
 {
-    PhotoMaster *modelPtr = (PhotoMaster *) handle;
+    PhotoModel *modelPtr = (PhotoModel *) handle;
     Tk_PhotoImageBlock sourceBlock;
     unsigned char *memToFree;
     int xEnd, yEnd, greenOffset, blueOffset, alphaOffset;
@@ -3507,7 +3507,7 @@ Tk_PhotoPutZoomedBlock(
      * Tell the core image code that this image has changed.
      */
 
-    Tk_ImageChanged(modelPtr->tkMaster, x, y, width, height, modelPtr->width,
+    Tk_ImageChanged(modelPtr->tkModel, x, y, width, height, modelPtr->width,
 	    modelPtr->height);
 
     if (memToFree) ckfree(memToFree);
@@ -3526,7 +3526,7 @@ Tk_PhotoPutZoomedBlock(
  * Tk_DitherPhoto --
  *
  *	This function is called to update an area of each instance's pixmap by
- *	dithering the corresponding area of the image master.
+ *	dithering the corresponding area of the image model.
  *
  * Results:
  *	None.
@@ -3541,13 +3541,13 @@ Tk_PhotoPutZoomedBlock(
 
 void
 Tk_DitherPhoto(
-    Tk_PhotoHandle photo,	/* Image master whose instances are to be
+    Tk_PhotoHandle photo,	/* Image model whose instances are to be
 				 * updated. */
     int x, int y,		/* Coordinates of the top-left pixel in the
 				 * area to be dithered. */
     int width, int height)	/* Dimensions of the area to be dithered. */
 {
-    PhotoMaster *modelPtr = (PhotoMaster *) photo;
+    PhotoModel *modelPtr = (PhotoModel *) photo;
     PhotoInstance *instancePtr;
 
     if ((width <= 0) || (height <= 0)) {
@@ -3620,7 +3620,7 @@ void
 Tk_PhotoBlank(
     Tk_PhotoHandle handle)	/* Handle for the image to be blanked. */
 {
-    PhotoMaster *modelPtr = (PhotoMaster *) handle;
+    PhotoModel *modelPtr = (PhotoModel *) handle;
     PhotoInstance *instancePtr;
 
     modelPtr->ditherX = modelPtr->ditherY = 0;
@@ -3651,7 +3651,7 @@ Tk_PhotoBlank(
      * Tell the core image code that this image has changed.
      */
 
-    Tk_ImageChanged(modelPtr->tkMaster, 0, 0, modelPtr->width,
+    Tk_ImageChanged(modelPtr->tkModel, 0, 0, modelPtr->width,
 	    modelPtr->height, modelPtr->width, modelPtr->height);
 }
 
@@ -3682,7 +3682,7 @@ Tk_PhotoExpand(
     Tk_PhotoHandle handle,	/* Handle for the image to be expanded. */
     int width, int height)	/* Desired minimum dimensions of the image. */
 {
-    PhotoMaster *modelPtr = (PhotoMaster *) handle;
+    PhotoModel *modelPtr = (PhotoModel *) handle;
 
     if (width <= modelPtr->width) {
 	width = modelPtr->width;
@@ -3700,7 +3700,7 @@ Tk_PhotoExpand(
 	    }
 	    return TCL_ERROR;
 	}
-	Tk_ImageChanged(modelPtr->tkMaster, 0, 0, 0, 0, modelPtr->width,
+	Tk_ImageChanged(modelPtr->tkModel, 0, 0, 0, 0, modelPtr->width,
 		modelPtr->height);
     }
     return TCL_OK;
@@ -3730,7 +3730,7 @@ Tk_PhotoGetSize(
 				/* The dimensions of the image are returned
 				 * here. */
 {
-    PhotoMaster *modelPtr = (PhotoMaster *) handle;
+    PhotoModel *modelPtr = (PhotoModel *) handle;
 
     *widthPtr = modelPtr->width;
     *heightPtr = modelPtr->height;
@@ -3762,7 +3762,7 @@ Tk_PhotoSetSize(
 				 * set. */
     int width, int height)	/* New dimensions for the image. */
 {
-    PhotoMaster *modelPtr = (PhotoMaster *) handle;
+    PhotoModel *modelPtr = (PhotoModel *) handle;
 
     modelPtr->userWidth = width;
     modelPtr->userHeight = height;
@@ -3775,7 +3775,7 @@ Tk_PhotoSetSize(
 	}
 	return TCL_ERROR;
     }
-    Tk_ImageChanged(modelPtr->tkMaster, 0, 0, 0, 0,
+    Tk_ImageChanged(modelPtr->tkModel, 0, 0, 0, 0,
 	    modelPtr->width, modelPtr->height);
     return TCL_OK;
 }
@@ -3805,7 +3805,7 @@ TkPhotoGetValidRegion(
     Tk_PhotoHandle handle)	/* Handle for the image whose valid region is
 				 * to obtained. */
 {
-    PhotoMaster *modelPtr = (PhotoMaster *) handle;
+    PhotoModel *modelPtr = (PhotoModel *) handle;
 
     return modelPtr->validRegion;
 }
@@ -3833,7 +3833,7 @@ TkPhotoGetValidRegion(
 
 static char *
 ImgGetPhoto(
-    PhotoMaster *modelPtr,	/* Handle for the photo image from which image
+    PhotoModel *modelPtr,	/* Handle for the photo image from which image
 				 * data is desired. */
     Tk_PhotoImageBlock *blockPtr,
 				/* Information about the address and layout of
@@ -4030,7 +4030,7 @@ Tk_PhotoGetImage(
 				/* Information about the address and layout of
 				 * the image data is returned here. */
 {
-    PhotoMaster *modelPtr = (PhotoMaster *) handle;
+    PhotoModel *modelPtr = (PhotoModel *) handle;
 
     blockPtr->pixelPtr = modelPtr->pix32;
     blockPtr->width = modelPtr->width;
diff --git a/generic/tkImgPhoto.h b/generic/tkImgPhoto.h
index c6e32e3..e65893f 100644
--- a/generic/tkImgPhoto.h
+++ b/generic/tkImgPhoto.h
@@ -145,11 +145,11 @@ struct ColorTable {
 #define MAP_COLORS		8
 
 /*
- * Definition of the data associated with each photo image master.
+ * Definition of the data associated with each photo image model.
  */
 
 struct PhotoModel {
-    Tk_ImageModel tkMaster;	/* Tk's token for image model. NULL means the
+    Tk_ImageModel tkModel;	/* Tk's token for image model. NULL means the
 				 * image is being deleted. */
     Tcl_Interp *interp;		/* Interpreter associated with the application
 				 * using this image. */
@@ -172,7 +172,7 @@ struct PhotoModel {
     TkRegion validRegion;	/* Tk region indicating which parts of the
 				 * image have valid image data. */
     PhotoInstance *instancePtr;	/* First in the list of instances associated
-				 * with this master. */
+				 * with this model. */
 };
 
 /*
@@ -208,7 +208,7 @@ struct PhotoInstance {
     Colormap colormap;		/* The image may only be used in windows with
 				 * this particular colormap. */
     PhotoInstance *nextPtr;	/* Pointer to the next instance in the list of
-				 * instances associated with this master. */
+				 * instances associated with this model. */
 #if TCL_MAJOR_VERSION > 8
     size_t refCount;		/* Number of instances using this structure. */
 #else
@@ -217,7 +217,7 @@ struct PhotoInstance {
     Tk_Uid palette;		/* Palette for these particular instances. */
     double gamma;		/* Gamma value for these instances. */
     Tk_Uid defaultPalette;	/* Default palette to use if a palette is not
-				 * specified for the master. */
+				 * specified for the model. */
     ColorTable *colorTablePtr;	/* Pointer to information about colors
 				 * allocated for image display in windows like
 				 * this one. */
diff --git a/generic/tkInt.h b/generic/tkInt.h
index 48eeca2..2f336d0 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -447,9 +447,9 @@ typedef struct TkDisplay {
      */
 
     int placeInit;		/* 0 means tables below need initializing. */
-    Tcl_HashTable masterTable;	/* Maps from Tk_Window toke to the Master
+    Tcl_HashTable containerTable;	/* Maps from Tk_Window token to the Container
 				 * structure for the window, if it exists. */
-    Tcl_HashTable slaveTable;	/* Maps from Tk_Window toke to the Slave
+    Tcl_HashTable contentTable;	/* Maps from Tk_Window token to the Content
 				 * structure for the window, if it exists. */
 
     /*
diff --git a/generic/tkOldConfig.c b/generic/tkOldConfig.c
index 7400b32..96d386b 100644
--- a/generic/tkOldConfig.c
+++ b/generic/tkOldConfig.c
@@ -1108,7 +1108,7 @@ GetCachedSpecs(
 
 	/*
 	 * Now allocate our working copy's space and copy over the contents
-	 * from the master copy.
+	 * from the main copy.
 	 */
 
 	cachedSpecs = (Tk_ConfigSpec *)ckalloc(entrySpace);
diff --git a/generic/tkPack.c b/generic/tkPack.c
index 999bdd7..ed9624f 100644
--- a/generic/tkPack.c
+++ b/generic/tkPack.c
@@ -35,7 +35,7 @@ typedef struct Packer {
     struct Packer *nextPtr;	/* Next window packed within same master. List
 				 * is priority-ordered: first on list gets
 				 * packed first. */
-    struct Packer *slavePtr;	/* First in list of slaves packed inside this
+    struct Packer *contentPtr;	/* First in list of slaves packed inside this
 				 * window (NULL means no packed slaves). */
     Side side;			/* Side of master against which this window is
 				 * packed. */
@@ -110,7 +110,7 @@ static void		PackLostContentProc(ClientData clientData,
 static const Tk_GeomMgr packerType = {
     "pack",			/* name */
     PackReqProc,		/* requestProc */
-    PackLostContentProc,		/* lostSlaveProc */
+    PackLostContentProc,		/* lostContentProc */
 };
 
 /*
@@ -129,8 +129,8 @@ static int		PackAfter(Tcl_Interp *interp, Packer *prevPtr,
 static void		PackStructureProc(ClientData clientData,
 			    XEvent *eventPtr);
 static void		Unlink(Packer *packPtr);
-static int		XExpansion(Packer *slavePtr, int cavityWidth);
-static int		YExpansion(Packer *slavePtr, int cavityHeight);
+static int		XExpansion(Packer *contentPtr, int cavityWidth);
+static int		YExpansion(Packer *contentPtr, int cavityHeight);
 
 /*
  *------------------------------------------------------------------------
@@ -266,7 +266,7 @@ Tk_PackObjCmd(
 	    return TCL_ERROR;
 	}
 	containerPtr = GetPacker(tkwin2);
-	prevPtr = containerPtr->slavePtr;
+	prevPtr = containerPtr->contentPtr;
 	if (prevPtr != NULL) {
 	    while (prevPtr->nextPtr != NULL) {
 		prevPtr = prevPtr->nextPtr;
@@ -290,7 +290,7 @@ Tk_PackObjCmd(
 	    return TCL_ERROR;
 	}
 	containerPtr = packPtr->containerPtr;
-	prevPtr = containerPtr->slavePtr;
+	prevPtr = containerPtr->contentPtr;
 	if (prevPtr == packPtr) {
 	    prevPtr = NULL;
 	} else {
@@ -316,28 +316,28 @@ Tk_PackObjCmd(
 	return ConfigureContent(interp, tkwin, objc-2, objv+2);
     case PACK_FORGET: {
 	Tk_Window slave;
-	Packer *slavePtr;
+	Packer *contentPtr;
 	int i;
 
 	for (i = 2; i < objc; i++) {
 	    if (TkGetWindowFromObj(interp, tkwin, objv[i], &slave) != TCL_OK) {
 		continue;
 	    }
-	    slavePtr = GetPacker(slave);
-	    if ((slavePtr != NULL) && (slavePtr->containerPtr != NULL)) {
+	    contentPtr = GetPacker(slave);
+	    if ((contentPtr != NULL) && (contentPtr->containerPtr != NULL)) {
 		Tk_ManageGeometry(slave, NULL, NULL);
-		if (slavePtr->containerPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
-		    Tk_UnmaintainGeometry(slavePtr->tkwin,
-			    slavePtr->containerPtr->tkwin);
+		if (contentPtr->containerPtr->tkwin != Tk_Parent(contentPtr->tkwin)) {
+		    Tk_UnmaintainGeometry(contentPtr->tkwin,
+			    contentPtr->containerPtr->tkwin);
 		}
-		Unlink(slavePtr);
-		Tk_UnmapWindow(slavePtr->tkwin);
+		Unlink(contentPtr);
+		Tk_UnmapWindow(contentPtr->tkwin);
 	    }
 	}
 	break;
     }
     case PACK_INFO: {
-	Packer *slavePtr;
+	Packer *contentPtr;
 	Tk_Window slave;
 	Tcl_Obj *infoObj;
 
@@ -348,8 +348,8 @@ Tk_PackObjCmd(
 	if (TkGetWindowFromObj(interp, tkwin, objv[2], &slave) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	slavePtr = GetPacker(slave);
-	if (slavePtr->containerPtr == NULL) {
+	contentPtr = GetPacker(slave);
+	if (contentPtr->containerPtr == NULL) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "window \"%s\" isn't packed", argv2));
 	    Tcl_SetErrorCode(interp, "TK", "PACK", "NOT_PACKED", NULL);
@@ -358,12 +358,12 @@ Tk_PackObjCmd(
 
 	infoObj = Tcl_NewObj();
 	Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-in", -1),
-		Tk_NewWindowObj(slavePtr->containerPtr->tkwin));
+		Tk_NewWindowObj(contentPtr->containerPtr->tkwin));
 	Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-anchor", -1),
-		Tcl_NewStringObj(Tk_NameOfAnchor(slavePtr->anchor), -1));
+		Tcl_NewStringObj(Tk_NameOfAnchor(contentPtr->anchor), -1));
 	Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-expand", -1),
-		Tcl_NewBooleanObj(slavePtr->flags & EXPAND));
-	switch (slavePtr->flags & (FILLX|FILLY)) {
+		Tcl_NewBooleanObj(contentPtr->flags & EXPAND));
+	switch (contentPtr->flags & (FILLX|FILLY)) {
 	case 0:
 	    Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-fill", -1),
 		    Tcl_NewStringObj("none", -1));
@@ -381,12 +381,12 @@ Tk_PackObjCmd(
 		    Tcl_NewStringObj("both", -1));
 	    break;
 	}
-	TkAppendPadAmount(infoObj, "-ipadx", slavePtr->iPadX/2, slavePtr->iPadX);
-	TkAppendPadAmount(infoObj, "-ipady", slavePtr->iPadY/2, slavePtr->iPadY);
-	TkAppendPadAmount(infoObj, "-padx", slavePtr->padLeft,slavePtr->padX);
-	TkAppendPadAmount(infoObj, "-pady", slavePtr->padTop, slavePtr->padY);
+	TkAppendPadAmount(infoObj, "-ipadx", contentPtr->iPadX/2, contentPtr->iPadX);
+	TkAppendPadAmount(infoObj, "-ipady", contentPtr->iPadY/2, contentPtr->iPadY);
+	TkAppendPadAmount(infoObj, "-padx", contentPtr->padLeft,contentPtr->padX);
+	TkAppendPadAmount(infoObj, "-pady", contentPtr->padTop, contentPtr->padY);
 	Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-side", -1),
-		Tcl_NewStringObj(sideNames[slavePtr->side], -1));
+		Tcl_NewStringObj(sideNames[contentPtr->side], -1));
 	Tcl_SetObjResult(interp, infoObj);
 	break;
     }
@@ -416,7 +416,7 @@ Tk_PackObjCmd(
 	     * If we have content windows, we need to register as geometry container.
 	     */
 
-	    if (containerPtr->slavePtr != NULL) {
+	    if (containerPtr->contentPtr != NULL) {
 		if (TkSetGeometryContainer(interp, master, "pack") != TCL_OK) {
 		    return TCL_ERROR;
 		}
@@ -448,7 +448,7 @@ Tk_PackObjCmd(
     case PACK_CONTENT:
     case PACK_SLAVES: {
 	Tk_Window master;
-	Packer *containerPtr, *slavePtr;
+	Packer *containerPtr, *contentPtr;
 	Tcl_Obj *resultObj;
 
 	if (objc != 3) {
@@ -460,10 +460,10 @@ Tk_PackObjCmd(
 	}
 	resultObj = Tcl_NewObj();
 	containerPtr = GetPacker(master);
-	for (slavePtr = containerPtr->slavePtr; slavePtr != NULL;
-		slavePtr = slavePtr->nextPtr) {
+	for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
+		contentPtr = contentPtr->nextPtr) {
 	    Tcl_ListObjAppendElement(NULL, resultObj,
-		    Tk_NewWindowObj(slavePtr->tkwin));
+		    Tk_NewWindowObj(contentPtr->tkwin));
 	}
 	Tcl_SetObjResult(interp, resultObj);
 	break;
@@ -555,13 +555,13 @@ PackLostContentProc(
 				 * stolen away. */
     TCL_UNUSED(Tk_Window))		/* Tk's handle for the content window. */
 {
-    Packer *slavePtr = (Packer *)clientData;
+    Packer *contentPtr = (Packer *)clientData;
 
-    if (slavePtr->containerPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
-	Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->containerPtr->tkwin);
+    if (contentPtr->containerPtr->tkwin != Tk_Parent(contentPtr->tkwin)) {
+	Tk_UnmaintainGeometry(contentPtr->tkwin, contentPtr->containerPtr->tkwin);
     }
-    Unlink(slavePtr);
-    Tk_UnmapWindow(slavePtr->tkwin);
+    Unlink(contentPtr);
+    Tk_UnmapWindow(contentPtr->tkwin);
 }
 
 /*
@@ -589,7 +589,7 @@ ArrangePacking(
 				 * are to be re-layed out. */
 {
     Packer *containerPtr = (Packer *)clientData;
-    Packer *slavePtr;
+    Packer *contentPtr;
     int cavityX, cavityY, cavityWidth, cavityHeight;
 				/* These variables keep track of the
 				 * as-yet-unallocated space remaining in the
@@ -614,7 +614,7 @@ ArrangePacking(
      * so another geometry manager can take over.
      */
 
-    if (containerPtr->slavePtr == NULL) {
+    if (containerPtr->contentPtr == NULL) {
 	return;
     }
 
@@ -652,24 +652,24 @@ ArrangePacking(
 	    Tk_InternalBorderRight(containerPtr->tkwin);
     height = maxHeight = Tk_InternalBorderTop(containerPtr->tkwin) +
 	    Tk_InternalBorderBottom(containerPtr->tkwin);
-    for (slavePtr = containerPtr->slavePtr; slavePtr != NULL;
-	    slavePtr = slavePtr->nextPtr) {
-	if ((slavePtr->side == TOP) || (slavePtr->side == BOTTOM)) {
-	    tmp = Tk_ReqWidth(slavePtr->tkwin) + slavePtr->doubleBw
-		    + slavePtr->padX + slavePtr->iPadX + width;
+    for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
+	    contentPtr = contentPtr->nextPtr) {
+	if ((contentPtr->side == TOP) || (contentPtr->side == BOTTOM)) {
+	    tmp = Tk_ReqWidth(contentPtr->tkwin) + contentPtr->doubleBw
+		    + contentPtr->padX + contentPtr->iPadX + width;
 	    if (tmp > maxWidth) {
 		maxWidth = tmp;
 	    }
-	    height += Tk_ReqHeight(slavePtr->tkwin) + slavePtr->doubleBw
-		    + slavePtr->padY + slavePtr->iPadY;
+	    height += Tk_ReqHeight(contentPtr->tkwin) + contentPtr->doubleBw
+		    + contentPtr->padY + contentPtr->iPadY;
 	} else {
-	    tmp = Tk_ReqHeight(slavePtr->tkwin) + slavePtr->doubleBw
-		    + slavePtr->padY + slavePtr->iPadY + height;
+	    tmp = Tk_ReqHeight(contentPtr->tkwin) + contentPtr->doubleBw
+		    + contentPtr->padY + contentPtr->iPadY + height;
 	    if (tmp > maxHeight) {
 		maxHeight = tmp;
 	    }
-	    width += Tk_ReqWidth(slavePtr->tkwin) + slavePtr->doubleBw
-		    + slavePtr->padX + slavePtr->iPadX;
+	    width += Tk_ReqWidth(contentPtr->tkwin) + contentPtr->doubleBw
+		    + contentPtr->padX + contentPtr->iPadX;
 	}
     }
     if (width > maxWidth) {
@@ -719,14 +719,14 @@ ArrangePacking(
     cavityHeight = Tk_Height(containerPtr->tkwin) -
 	    Tk_InternalBorderTop(containerPtr->tkwin) -
 	    Tk_InternalBorderBottom(containerPtr->tkwin);
-    for (slavePtr = containerPtr->slavePtr; slavePtr != NULL;
-	    slavePtr = slavePtr->nextPtr) {
-	if ((slavePtr->side == TOP) || (slavePtr->side == BOTTOM)) {
+    for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
+	    contentPtr = contentPtr->nextPtr) {
+	if ((contentPtr->side == TOP) || (contentPtr->side == BOTTOM)) {
 	    frameWidth = cavityWidth;
-	    frameHeight = Tk_ReqHeight(slavePtr->tkwin) + slavePtr->doubleBw
-		    + slavePtr->padY + slavePtr->iPadY;
-	    if (slavePtr->flags & EXPAND) {
-		frameHeight += YExpansion(slavePtr, cavityHeight);
+	    frameHeight = Tk_ReqHeight(contentPtr->tkwin) + contentPtr->doubleBw
+		    + contentPtr->padY + contentPtr->iPadY;
+	    if (contentPtr->flags & EXPAND) {
+		frameHeight += YExpansion(contentPtr, cavityHeight);
 	    }
 	    cavityHeight -= frameHeight;
 	    if (cavityHeight < 0) {
@@ -734,7 +734,7 @@ ArrangePacking(
 		cavityHeight = 0;
 	    }
 	    frameX = cavityX;
-	    if (slavePtr->side == TOP) {
+	    if (contentPtr->side == TOP) {
 		frameY = cavityY;
 		cavityY += frameHeight;
 	    } else {
@@ -742,10 +742,10 @@ ArrangePacking(
 	    }
 	} else {
 	    frameHeight = cavityHeight;
-	    frameWidth = Tk_ReqWidth(slavePtr->tkwin) + slavePtr->doubleBw
-		    + slavePtr->padX + slavePtr->iPadX;
-	    if (slavePtr->flags & EXPAND) {
-		frameWidth += XExpansion(slavePtr, cavityWidth);
+	    frameWidth = Tk_ReqWidth(contentPtr->tkwin) + contentPtr->doubleBw
+		    + contentPtr->padX + contentPtr->iPadX;
+	    if (contentPtr->flags & EXPAND) {
+		frameWidth += XExpansion(contentPtr, cavityWidth);
 	    }
 	    cavityWidth -= frameWidth;
 	    if (cavityWidth < 0) {
@@ -753,7 +753,7 @@ ArrangePacking(
 		cavityWidth = 0;
 	    }
 	    frameY = cavityY;
-	    if (slavePtr->side == LEFT) {
+	    if (contentPtr->side == LEFT) {
 		frameX = cavityX;
 		cavityX += frameWidth;
 	    } else {
@@ -770,31 +770,31 @@ ArrangePacking(
 	 * completely ignored except when computing frame size).
 	 */
 
-	if (slavePtr->flags & OLD_STYLE) {
+	if (contentPtr->flags & OLD_STYLE) {
 	    borderX = borderY = 0;
 	    borderTop = borderBtm = 0;
 	    borderLeft = borderRight = 0;
 	} else {
-	    borderX = slavePtr->padX;
-	    borderY = slavePtr->padY;
-	    borderLeft = slavePtr->padLeft;
+	    borderX = contentPtr->padX;
+	    borderY = contentPtr->padY;
+	    borderLeft = contentPtr->padLeft;
 	    borderRight = borderX - borderLeft;
-	    borderTop = slavePtr->padTop;
+	    borderTop = contentPtr->padTop;
 	    borderBtm = borderY - borderTop;
 	}
-	width = Tk_ReqWidth(slavePtr->tkwin) + slavePtr->doubleBw
-		+ slavePtr->iPadX;
-	if ((slavePtr->flags & FILLX)
+	width = Tk_ReqWidth(contentPtr->tkwin) + contentPtr->doubleBw
+		+ contentPtr->iPadX;
+	if ((contentPtr->flags & FILLX)
 		|| (width > (frameWidth - borderX))) {
 	    width = frameWidth - borderX;
 	}
-	height = Tk_ReqHeight(slavePtr->tkwin) + slavePtr->doubleBw
-		+ slavePtr->iPadY;
-	if ((slavePtr->flags & FILLY)
+	height = Tk_ReqHeight(contentPtr->tkwin) + contentPtr->doubleBw
+		+ contentPtr->iPadY;
+	if ((contentPtr->flags & FILLY)
 		|| (height > (frameHeight - borderY))) {
 	    height = frameHeight - borderY;
 	}
-	switch (slavePtr->anchor) {
+	switch (contentPtr->anchor) {
 	case TK_ANCHOR_N:
 	    x = frameX + (borderLeft + frameWidth - width - borderRight)/2;
 	    y = frameY + borderTop;
@@ -834,8 +834,8 @@ ArrangePacking(
 	default:
 	    Tcl_Panic("bad frame factor in ArrangePacking");
 	}
-	width -= slavePtr->doubleBw;
-	height -= slavePtr->doubleBw;
+	width -= contentPtr->doubleBw;
+	height -= contentPtr->doubleBw;
 
 	/*
 	 * The final step is to set the position, size, and mapped/unmapped
@@ -843,15 +843,15 @@ ArrangePacking(
 	 * this here. Otherwise let Tk_MaintainGeometry do the work.
 	 */
 
-	if (containerPtr->tkwin == Tk_Parent(slavePtr->tkwin)) {
+	if (containerPtr->tkwin == Tk_Parent(contentPtr->tkwin)) {
 	    if ((width <= 0) || (height <= 0)) {
-		Tk_UnmapWindow(slavePtr->tkwin);
+		Tk_UnmapWindow(contentPtr->tkwin);
 	    } else {
-		if ((x != Tk_X(slavePtr->tkwin))
-			|| (y != Tk_Y(slavePtr->tkwin))
-			|| (width != Tk_Width(slavePtr->tkwin))
-			|| (height != Tk_Height(slavePtr->tkwin))) {
-		    Tk_MoveResizeWindow(slavePtr->tkwin, x, y, width, height);
+		if ((x != Tk_X(contentPtr->tkwin))
+			|| (y != Tk_Y(contentPtr->tkwin))
+			|| (width != Tk_Width(contentPtr->tkwin))
+			|| (height != Tk_Height(contentPtr->tkwin))) {
+		    Tk_MoveResizeWindow(contentPtr->tkwin, x, y, width, height);
 		}
 		if (abort) {
 		    goto done;
@@ -863,15 +863,15 @@ ArrangePacking(
 		 */
 
 		if (Tk_IsMapped(containerPtr->tkwin)) {
-		    Tk_MapWindow(slavePtr->tkwin);
+		    Tk_MapWindow(contentPtr->tkwin);
 		}
 	    }
 	} else {
 	    if ((width <= 0) || (height <= 0)) {
-		Tk_UnmaintainGeometry(slavePtr->tkwin, containerPtr->tkwin);
-		Tk_UnmapWindow(slavePtr->tkwin);
+		Tk_UnmaintainGeometry(contentPtr->tkwin, containerPtr->tkwin);
+		Tk_UnmapWindow(contentPtr->tkwin);
 	    } else {
-		Tk_MaintainGeometry(slavePtr->tkwin, containerPtr->tkwin,
+		Tk_MaintainGeometry(contentPtr->tkwin, containerPtr->tkwin,
 			x, y, width, height);
 	    }
 	}
@@ -912,7 +912,7 @@ ArrangePacking(
 
 static int
 XExpansion(
-    Packer *slavePtr,	/* First in list of remaining slaves. */
+    Packer *contentPtr,	/* First in list of remaining slaves. */
     int cavityWidth)		/* Horizontal space left for all remaining
 				 * slaves. */
 {
@@ -932,10 +932,10 @@ XExpansion(
 
     minExpand = cavityWidth;
     numExpand = 0;
-    for ( ; slavePtr != NULL; slavePtr = slavePtr->nextPtr) {
-	childWidth = Tk_ReqWidth(slavePtr->tkwin) + slavePtr->doubleBw
-		+ slavePtr->padX + slavePtr->iPadX;
-	if ((slavePtr->side == TOP) || (slavePtr->side == BOTTOM)) {
+    for ( ; contentPtr != NULL; contentPtr = contentPtr->nextPtr) {
+	childWidth = Tk_ReqWidth(contentPtr->tkwin) + contentPtr->doubleBw
+		+ contentPtr->padX + contentPtr->iPadX;
+	if ((contentPtr->side == TOP) || (contentPtr->side == BOTTOM)) {
 	    if (numExpand) {
 		curExpand = (cavityWidth - childWidth)/numExpand;
 		if (curExpand < minExpand) {
@@ -944,7 +944,7 @@ XExpansion(
 	    }
 	} else {
 	    cavityWidth -= childWidth;
-	    if (slavePtr->flags & EXPAND) {
+	    if (contentPtr->flags & EXPAND) {
 		numExpand++;
 	    }
 	}
@@ -978,7 +978,7 @@ XExpansion(
 
 static int
 YExpansion(
-    Packer *slavePtr,	/* First in list of remaining slaves. */
+    Packer *contentPtr,	/* First in list of remaining slaves. */
     int cavityHeight)		/* Vertical space left for all remaining
 				 * slaves. */
 {
@@ -991,10 +991,10 @@ YExpansion(
 
     minExpand = cavityHeight;
     numExpand = 0;
-    for ( ; slavePtr != NULL; slavePtr = slavePtr->nextPtr) {
-	childHeight = Tk_ReqHeight(slavePtr->tkwin) + slavePtr->doubleBw
-		+ slavePtr->padY + slavePtr->iPadY;
-	if ((slavePtr->side == LEFT) || (slavePtr->side == RIGHT)) {
+    for ( ; contentPtr != NULL; contentPtr = contentPtr->nextPtr) {
+	childHeight = Tk_ReqHeight(contentPtr->tkwin) + contentPtr->doubleBw
+		+ contentPtr->padY + contentPtr->iPadY;
+	if ((contentPtr->side == LEFT) || (contentPtr->side == RIGHT)) {
 	    if (numExpand) {
 		curExpand = (cavityHeight - childHeight)/numExpand;
 		if (curExpand < minExpand) {
@@ -1003,7 +1003,7 @@ YExpansion(
 	    }
 	} else {
 	    cavityHeight -= childHeight;
-	    if (slavePtr->flags & EXPAND) {
+	    if (contentPtr->flags & EXPAND) {
 		numExpand++;
 	    }
 	}
@@ -1065,7 +1065,7 @@ GetPacker(
     packPtr->tkwin = tkwin;
     packPtr->containerPtr = NULL;
     packPtr->nextPtr = NULL;
-    packPtr->slavePtr = NULL;
+    packPtr->contentPtr = NULL;
     packPtr->side = TOP;
     packPtr->anchor = TK_ANCHOR_CENTER;
     packPtr->padX = packPtr->padY = 0;
@@ -1286,8 +1286,8 @@ PackAfter(
 
 	    packPtr->containerPtr = containerPtr;
 	    if (prevPtr == NULL) {
-		packPtr->nextPtr = containerPtr->slavePtr;
-		containerPtr->slavePtr = packPtr;
+		packPtr->nextPtr = containerPtr->contentPtr;
+		containerPtr->contentPtr = packPtr;
 	    } else {
 		packPtr->nextPtr = prevPtr->nextPtr;
 		prevPtr->nextPtr = packPtr;
@@ -1347,10 +1347,10 @@ Unlink(
     if (containerPtr == NULL) {
 	return;
     }
-    if (containerPtr->slavePtr == packPtr) {
-	containerPtr->slavePtr = packPtr->nextPtr;
+    if (containerPtr->contentPtr == packPtr) {
+	containerPtr->contentPtr = packPtr->nextPtr;
     } else {
-	for (packPtr2 = containerPtr->slavePtr; ; packPtr2 = packPtr2->nextPtr) {
+	for (packPtr2 = containerPtr->contentPtr; ; packPtr2 = packPtr2->nextPtr) {
 	    if (packPtr2 == NULL) {
 		Tcl_Panic("Unlink couldn't find previous window");
 	    }
@@ -1378,7 +1378,7 @@ Unlink(
      * being no managed children inside it.
      */
 
-    if ((containerPtr->slavePtr == NULL) && (containerPtr->flags & ALLOCED_CONTAINER)) {
+    if ((containerPtr->contentPtr == NULL) && (containerPtr->flags & ALLOCED_CONTAINER)) {
 	TkFreeGeometryContainer(containerPtr->tkwin, "pack");
 	containerPtr->flags &= ~ALLOCED_CONTAINER;
 	Tk_SendVirtualEvent(containerPtr->tkwin, "NoManagedChild", NULL);
@@ -1441,7 +1441,7 @@ PackStructureProc(
     Packer *packPtr = (Packer *)clientData;
 
     if (eventPtr->type == ConfigureNotify) {
-	if ((packPtr->slavePtr != NULL)
+	if ((packPtr->contentPtr != NULL)
 		&& !(packPtr->flags & REQUESTED_REPACK)) {
 	    packPtr->flags |= REQUESTED_REPACK;
 	    Tcl_DoWhenIdle(ArrangePacking, packPtr);
@@ -1455,19 +1455,19 @@ PackStructureProc(
 	    }
 	}
     } else if (eventPtr->type == DestroyNotify) {
-	Packer *slavePtr, *nextPtr;
+	Packer *contentPtr, *nextPtr;
 
 	if (packPtr->containerPtr != NULL) {
 	    Unlink(packPtr);
 	}
 
-	for (slavePtr = packPtr->slavePtr; slavePtr != NULL;
-		slavePtr = nextPtr) {
-	    Tk_ManageGeometry(slavePtr->tkwin, NULL, NULL);
-	    Tk_UnmapWindow(slavePtr->tkwin);
-	    slavePtr->containerPtr = NULL;
-	    nextPtr = slavePtr->nextPtr;
-	    slavePtr->nextPtr = NULL;
+	for (contentPtr = packPtr->contentPtr; contentPtr != NULL;
+		contentPtr = nextPtr) {
+	    Tk_ManageGeometry(contentPtr->tkwin, NULL, NULL);
+	    Tk_UnmapWindow(contentPtr->tkwin);
+	    contentPtr->containerPtr = NULL;
+	    nextPtr = contentPtr->nextPtr;
+	    contentPtr->nextPtr = NULL;
 	}
 
 	if (packPtr->tkwin != NULL) {
@@ -1487,7 +1487,7 @@ PackStructureProc(
 	 * that all of its slaves get remapped.
 	 */
 
-	if ((packPtr->slavePtr != NULL)
+	if ((packPtr->contentPtr != NULL)
 		&& !(packPtr->flags & REQUESTED_REPACK)) {
 	    packPtr->flags |= REQUESTED_REPACK;
 	    Tcl_DoWhenIdle(ArrangePacking, packPtr);
@@ -1500,7 +1500,7 @@ PackStructureProc(
 	 * don't bother to keep redisplaying themselves.
 	 */
 
-	for (packPtr2 = packPtr->slavePtr; packPtr2 != NULL;
+	for (packPtr2 = packPtr->contentPtr; packPtr2 != NULL;
 	     packPtr2 = packPtr2->nextPtr) {
 	    Tk_UnmapWindow(packPtr2->tkwin);
 	}
@@ -1537,7 +1537,7 @@ ConfigureContent(
 				 * "option value" pairs. Caller must make sure
 				 * that there is at least one window name. */
 {
-    Packer *containerPtr, *slavePtr, *prevPtr, *otherPtr;
+    Packer *containerPtr, *contentPtr, *prevPtr, *otherPtr;
     Tk_Window other, slave, parent, ancestor;
     TkWindow *master;
     int i, j, numWindows, tmp, positionGiven;
@@ -1585,8 +1585,8 @@ ConfigureContent(
 	    Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "TOPLEVEL", NULL);
 	    return TCL_ERROR;
 	}
-	slavePtr = GetPacker(slave);
-	slavePtr->flags &= ~OLD_STYLE;
+	contentPtr = GetPacker(slave);
+	contentPtr->flags &= ~OLD_STYLE;
 
 	/*
 	 * If the slave isn't currently packed, reset all of its configuration
@@ -1594,13 +1594,13 @@ ConfigureContent(
 	 * a previous packing).
 	 */
 
-	if (slavePtr->containerPtr == NULL) {
-	    slavePtr->side = TOP;
-	    slavePtr->anchor = TK_ANCHOR_CENTER;
-	    slavePtr->padX = slavePtr->padY = 0;
-	    slavePtr->padLeft = slavePtr->padTop = 0;
-	    slavePtr->iPadX = slavePtr->iPadY = 0;
-	    slavePtr->flags &= ~(FILLX|FILLY|EXPAND);
+	if (contentPtr->containerPtr == NULL) {
+	    contentPtr->side = TOP;
+	    contentPtr->anchor = TK_ANCHOR_CENTER;
+	    contentPtr->padX = contentPtr->padY = 0;
+	    contentPtr->padLeft = contentPtr->padTop = 0;
+	    contentPtr->iPadX = contentPtr->iPadY = 0;
+	    contentPtr->flags &= ~(FILLX|FILLY|EXPAND);
 	}
 
 	for (i = numWindows; i < objc; i+=2) {
@@ -1638,7 +1638,7 @@ ConfigureContent(
 		}
 		break;
 	    case CONF_ANCHOR:
-		if (Tk_GetAnchorFromObj(interp, objv[i+1], &slavePtr->anchor)
+		if (Tk_GetAnchorFromObj(interp, objv[i+1], &contentPtr->anchor)
 			!= TCL_OK) {
 		    return TCL_ERROR;
 		}
@@ -1654,7 +1654,7 @@ ConfigureContent(
 			goto notPacked;
 		    }
 		    containerPtr = otherPtr->containerPtr;
-		    prevPtr = containerPtr->slavePtr;
+		    prevPtr = containerPtr->contentPtr;
 		    if (prevPtr == otherPtr) {
 			prevPtr = NULL;
 		    } else {
@@ -1669,21 +1669,21 @@ ConfigureContent(
 		if (Tcl_GetBooleanFromObj(interp, objv[i+1], &tmp) != TCL_OK) {
 		    return TCL_ERROR;
 		}
-		slavePtr->flags &= ~EXPAND;
+		contentPtr->flags &= ~EXPAND;
 		if (tmp) {
-		    slavePtr->flags |= EXPAND;
+		    contentPtr->flags |= EXPAND;
 		}
 		break;
 	    case CONF_FILL:
 		string = Tcl_GetString(objv[i+1]);
 		if (strcmp(string, "none") == 0) {
-		    slavePtr->flags &= ~(FILLX|FILLY);
+		    contentPtr->flags &= ~(FILLX|FILLY);
 		} else if (strcmp(string, "x") == 0) {
-		    slavePtr->flags = (slavePtr->flags & ~FILLY) | FILLX;
+		    contentPtr->flags = (contentPtr->flags & ~FILLY) | FILLX;
 		} else if (strcmp(string, "y") == 0) {
-		    slavePtr->flags = (slavePtr->flags & ~FILLX) | FILLY;
+		    contentPtr->flags = (contentPtr->flags & ~FILLX) | FILLY;
 		} else if (strcmp(string, "both") == 0) {
-		    slavePtr->flags |= FILLX|FILLY;
+		    contentPtr->flags |= FILLX|FILLY;
 		} else {
 		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 			    "bad fill style \"%s\": must be "
@@ -1699,7 +1699,7 @@ ConfigureContent(
 			return TCL_ERROR;
 		    }
 		    containerPtr = GetPacker(other);
-		    prevPtr = containerPtr->slavePtr;
+		    prevPtr = containerPtr->contentPtr;
 		    if (prevPtr != NULL) {
 			while (prevPtr->nextPtr != NULL) {
 			    prevPtr = prevPtr->nextPtr;
@@ -1717,7 +1717,7 @@ ConfigureContent(
 		    Tcl_SetErrorCode(interp, "TK", "VALUE", "INT_PAD", NULL);
 		    return TCL_ERROR;
 		}
-		slavePtr->iPadX = tmp * 2;
+		contentPtr->iPadX = tmp * 2;
 		break;
 	    case CONF_IPADY:
 		if ((Tk_GetPixelsFromObj(interp, slave, objv[i+1], &tmp)
@@ -1728,17 +1728,17 @@ ConfigureContent(
 		    Tcl_SetErrorCode(interp, "TK", "VALUE", "INT_PAD", NULL);
 		    return TCL_ERROR;
 		}
-		slavePtr->iPadY = tmp * 2;
+		contentPtr->iPadY = tmp * 2;
 		break;
 	    case CONF_PADX:
 		if (TkParsePadAmount(interp, slave, objv[i+1],
-			&slavePtr->padLeft, &slavePtr->padX) != TCL_OK) {
+			&contentPtr->padLeft, &contentPtr->padX) != TCL_OK) {
 		    return TCL_ERROR;
 		}
 		break;
 	    case CONF_PADY:
 		if (TkParsePadAmount(interp, slave, objv[i+1],
-			&slavePtr->padTop, &slavePtr->padY) != TCL_OK) {
+			&contentPtr->padTop, &contentPtr->padY) != TCL_OK) {
 		    return TCL_ERROR;
 		}
 		break;
@@ -1747,7 +1747,7 @@ ConfigureContent(
 			sizeof(char *), "side", TCL_EXACT, &side) != TCL_OK) {
 		    return TCL_ERROR;
 		}
-		slavePtr->side = (Side) side;
+		contentPtr->side = (Side) side;
 		break;
 	    }
 	}
@@ -1758,8 +1758,8 @@ ConfigureContent(
 	 * current packing list.
 	 */
 
-	if (!positionGiven && (slavePtr->containerPtr != NULL)) {
-	    containerPtr = slavePtr->containerPtr;
+	if (!positionGiven && (contentPtr->containerPtr != NULL)) {
+	    containerPtr = contentPtr->containerPtr;
 	    goto scheduleLayout;
 	}
 
@@ -1769,8 +1769,8 @@ ConfigureContent(
 	 * since it won't work anyway.
 	 */
 
-	if (prevPtr == slavePtr) {
-	    containerPtr = slavePtr->containerPtr;
+	if (prevPtr == contentPtr) {
+	    containerPtr = contentPtr->containerPtr;
 	    goto scheduleLayout;
 	}
 
@@ -1782,7 +1782,7 @@ ConfigureContent(
 
 	if (!positionGiven) {
 	    containerPtr = GetPacker(Tk_Parent(slave));
-	    prevPtr = containerPtr->slavePtr;
+	    prevPtr = containerPtr->contentPtr;
 	    if (prevPtr != NULL) {
 		while (prevPtr->nextPtr != NULL) {
 		    prevPtr = prevPtr->nextPtr;
@@ -1839,32 +1839,32 @@ ConfigureContent(
 	 * prevPtr.
 	 */
 
-	if (slavePtr->containerPtr != NULL) {
-	    if ((slavePtr->containerPtr != containerPtr) &&
-		    (slavePtr->containerPtr->tkwin
-		    != Tk_Parent(slavePtr->tkwin))) {
-		Tk_UnmaintainGeometry(slavePtr->tkwin,
-			slavePtr->containerPtr->tkwin);
+	if (contentPtr->containerPtr != NULL) {
+	    if ((contentPtr->containerPtr != containerPtr) &&
+		    (contentPtr->containerPtr->tkwin
+		    != Tk_Parent(contentPtr->tkwin))) {
+		Tk_UnmaintainGeometry(contentPtr->tkwin,
+			contentPtr->containerPtr->tkwin);
 	    }
-	    Unlink(slavePtr);
+	    Unlink(contentPtr);
 	}
 
-	slavePtr->containerPtr = containerPtr;
+	contentPtr->containerPtr = containerPtr;
 	if (prevPtr == NULL) {
-	    slavePtr->nextPtr = containerPtr->slavePtr;
-	    containerPtr->slavePtr = slavePtr;
+	    contentPtr->nextPtr = containerPtr->contentPtr;
+	    containerPtr->contentPtr = contentPtr;
 	} else {
-	    slavePtr->nextPtr = prevPtr->nextPtr;
-	    prevPtr->nextPtr = slavePtr;
+	    contentPtr->nextPtr = prevPtr->nextPtr;
+	    prevPtr->nextPtr = contentPtr;
 	}
-	Tk_ManageGeometry(slave, &packerType, slavePtr);
-	prevPtr = slavePtr;
+	Tk_ManageGeometry(slave, &packerType, contentPtr);
+	prevPtr = contentPtr;
 
 	if (!(containerPtr->flags & DONT_PROPAGATE)) {
 	    if (TkSetGeometryContainer(interp, containerPtr->tkwin, "pack")
 		    != TCL_OK) {
 		Tk_ManageGeometry(slave, NULL, NULL);
-		Unlink(slavePtr);
+		Unlink(contentPtr);
 		return TCL_ERROR;
 	    }
 	    containerPtr->flags |= ALLOCED_CONTAINER;
diff --git a/generic/tkPlace.c b/generic/tkPlace.c
index f113a49..b4b358f 100644
--- a/generic/tkPlace.c
+++ b/generic/tkPlace.c
@@ -35,15 +35,15 @@ typedef enum {BM_INSIDE, BM_OUTSIDE, BM_IGNORE} BorderMode;
  * structure of the following type:
  */
 
-typedef struct Slave {
+typedef struct Content {
     Tk_Window tkwin;		/* Tk's token for window. */
     Tk_Window inTkwin;		/* Token for the -in window. */
-    struct Master *containerPtr;	/* Pointer to information for window relative
+    struct Container *containerPtr;	/* Pointer to information for window relative
 				 * to which tkwin is placed. This isn't
 				 * necessarily the logical parent of tkwin.
 				 * NULL means the container was deleted or never
 				 * assigned. */
-    struct Slave *nextPtr;	/* Next in list of windows placed relative to
+    struct Content *nextPtr;	/* Next in list of windows placed relative to
 				 * same container (NULL for end of list). */
     Tk_OptionTable optionTable;	/* Table that defines configuration options
 				 * available for this command. */
@@ -72,7 +72,7 @@ typedef struct Slave {
     BorderMode borderMode;	/* How to treat borders of container window. */
     int flags;			/* Various flags; see below for bit
 				 * definitions. */
-} Slave;
+} Content;
 
 /*
  * Type masks for options:
@@ -82,34 +82,34 @@ typedef struct Slave {
 
 static const Tk_OptionSpec optionSpecs[] = {
     {TK_OPTION_ANCHOR, "-anchor", NULL, NULL, "nw", TCL_INDEX_NONE,
-	 offsetof(Slave, anchor), 0, 0, 0},
+	 offsetof(Content, anchor), 0, 0, 0},
     {TK_OPTION_STRING_TABLE, "-bordermode", NULL, NULL, "inside", TCL_INDEX_NONE,
-	 offsetof(Slave, borderMode), 0, borderModeStrings, 0},
-    {TK_OPTION_PIXELS, "-height", NULL, NULL, "", offsetof(Slave, heightPtr),
-	 offsetof(Slave, height), TK_OPTION_NULL_OK, 0, 0},
-    {TK_OPTION_WINDOW, "-in", NULL, NULL, "", TCL_INDEX_NONE, offsetof(Slave, inTkwin),
+	 offsetof(Content, borderMode), 0, borderModeStrings, 0},
+    {TK_OPTION_PIXELS, "-height", NULL, NULL, "", offsetof(Content, heightPtr),
+	 offsetof(Content, height), TK_OPTION_NULL_OK, 0, 0},
+    {TK_OPTION_WINDOW, "-in", NULL, NULL, "", TCL_INDEX_NONE, offsetof(Content, inTkwin),
 	 0, 0, IN_MASK},
     {TK_OPTION_DOUBLE, "-relheight", NULL, NULL, "",
-	 offsetof(Slave, relHeightPtr), offsetof(Slave, relHeight),
+	 offsetof(Content, relHeightPtr), offsetof(Content, relHeight),
 	 TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_DOUBLE, "-relwidth", NULL, NULL, "",
-	 offsetof(Slave, relWidthPtr), offsetof(Slave, relWidth),
+	 offsetof(Content, relWidthPtr), offsetof(Content, relWidth),
 	 TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_DOUBLE, "-relx", NULL, NULL, "0", TCL_INDEX_NONE,
-	 offsetof(Slave, relX), 0, 0, 0},
+	 offsetof(Content, relX), 0, 0, 0},
     {TK_OPTION_DOUBLE, "-rely", NULL, NULL, "0", TCL_INDEX_NONE,
-	 offsetof(Slave, relY), 0, 0, 0},
-    {TK_OPTION_PIXELS, "-width", NULL, NULL, "", offsetof(Slave, widthPtr),
-	 offsetof(Slave, width), TK_OPTION_NULL_OK, 0, 0},
-    {TK_OPTION_PIXELS, "-x", NULL, NULL, "0", offsetof(Slave, xPtr),
-	 offsetof(Slave, x), TK_OPTION_NULL_OK, 0, 0},
-    {TK_OPTION_PIXELS, "-y", NULL, NULL, "0", offsetof(Slave, yPtr),
-	 offsetof(Slave, y), TK_OPTION_NULL_OK, 0, 0},
+	 offsetof(Content, relY), 0, 0, 0},
+    {TK_OPTION_PIXELS, "-width", NULL, NULL, "", offsetof(Content, widthPtr),
+	 offsetof(Content, width), TK_OPTION_NULL_OK, 0, 0},
+    {TK_OPTION_PIXELS, "-x", NULL, NULL, "0", offsetof(Content, xPtr),
+	 offsetof(Content, x), TK_OPTION_NULL_OK, 0, 0},
+    {TK_OPTION_PIXELS, "-y", NULL, NULL, "0", offsetof(Content, yPtr),
+	 offsetof(Content, y), TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_END, NULL, NULL, NULL, NULL, 0, TCL_INDEX_NONE, 0, 0, 0}
 };
 
 /*
- * Flag definitions for Slave structures:
+ * Flag definitions for Content structures:
  *
  * CHILD_WIDTH -		1 means -width was specified;
  * CHILD_REL_WIDTH -		1 means -relwidth was specified.
@@ -127,9 +127,9 @@ static const Tk_OptionSpec optionSpecs[] = {
  * structure of the following form:
  */
 
-typedef struct Master {
+typedef struct Container {
     Tk_Window tkwin;		/* Tk's token for container window. */
-    struct Slave *slavePtr;	/* First in linked list of slaves placed
+    struct Content *contentPtr;	/* First in linked list of slaves placed
 				 * relative to this container. */
     int *abortPtr;		/* If non-NULL, it means that there is a nested
 				 * call to RecomputePlacement already working on
@@ -138,7 +138,7 @@ typedef struct Master {
 				 * example, if tkwin or any of its slaves
 				 * is deleted. */
     int flags;			/* See below for bit definitions. */
-} Master;
+} Container;
 
 /*
  * Flag definitions for containers:
@@ -161,28 +161,28 @@ static void		PlaceLostContentProc(ClientData clientData,
 static const Tk_GeomMgr placerType = {
     "place",			/* name */
     PlaceRequestProc,		/* requestProc */
-    PlaceLostContentProc,		/* lostSlaveProc */
+    PlaceLostContentProc,		/* lostContentProc */
 };
 
 /*
  * Forward declarations for functions defined later in this file:
  */
 
-static void		SlaveStructureProc(ClientData clientData,
+static void		ContentStructureProc(ClientData clientData,
 			    XEvent *eventPtr);
 static int		ConfigureContent(Tcl_Interp *interp, Tk_Window tkwin,
 			    Tk_OptionTable table, int objc,
 			    Tcl_Obj *const objv[]);
 static int		PlaceInfoCommand(Tcl_Interp *interp, Tk_Window tkwin);
-static Slave *		CreateSlave(Tk_Window tkwin, Tk_OptionTable table);
-static void		FreeSlave(Slave *slavePtr);
-static Slave *		FindSlave(Tk_Window tkwin);
-static Master *		CreateMaster(Tk_Window tkwin);
-static Master *		FindMaster(Tk_Window tkwin);
+static Content *		CreateContent(Tk_Window tkwin, Tk_OptionTable table);
+static void		FreeContent(Content *contentPtr);
+static Content *		FindContent(Tk_Window tkwin);
+static Container *		CreateContainer(Tk_Window tkwin);
+static Container *		FindContainer(Tk_Window tkwin);
 static void		PlaceStructureProc(ClientData clientData,
 			    XEvent *eventPtr);
 static void		RecomputePlacement(ClientData clientData);
-static void		UnlinkSlave(Slave *slavePtr);
+static void		UnlinkContent(Content *contentPtr);
 
 /*
  *--------------------------------------------------------------
@@ -210,7 +210,7 @@ Tk_PlaceObjCmd(
 {
     Tk_Window main_win = (Tk_Window)clientData;
     Tk_Window tkwin;
-    Slave *slavePtr;
+    Content *contentPtr;
     TkDisplay *dispPtr;
     Tk_OptionTable optionTable;
     static const char *const optionStrings[] = {
@@ -247,8 +247,8 @@ Tk_PlaceObjCmd(
 
 	dispPtr = ((TkWindow *) tkwin)->dispPtr;
 	if (!dispPtr->placeInit) {
-	    Tcl_InitHashTable(&dispPtr->masterTable, TCL_ONE_WORD_KEYS);
-	    Tcl_InitHashTable(&dispPtr->slaveTable, TCL_ONE_WORD_KEYS);
+	    Tcl_InitHashTable(&dispPtr->containerTable, TCL_ONE_WORD_KEYS);
+	    Tcl_InitHashTable(&dispPtr->contentTable, TCL_ONE_WORD_KEYS);
 	    dispPtr->placeInit = 1;
 	}
 
@@ -271,8 +271,8 @@ Tk_PlaceObjCmd(
 
     dispPtr = ((TkWindow *) tkwin)->dispPtr;
     if (!dispPtr->placeInit) {
-	Tcl_InitHashTable(&dispPtr->masterTable, TCL_ONE_WORD_KEYS);
-	Tcl_InitHashTable(&dispPtr->slaveTable, TCL_ONE_WORD_KEYS);
+	Tcl_InitHashTable(&dispPtr->containerTable, TCL_ONE_WORD_KEYS);
+	Tcl_InitHashTable(&dispPtr->contentTable, TCL_ONE_WORD_KEYS);
 	dispPtr->placeInit = 1;
     }
 
@@ -286,11 +286,11 @@ Tk_PlaceObjCmd(
 	if (objc == 3 || objc == 4) {
 	    Tcl_Obj *objPtr;
 
-	    slavePtr = FindSlave(tkwin);
-	    if (slavePtr == NULL) {
+	    contentPtr = FindContent(tkwin);
+	    if (contentPtr == NULL) {
 		return TCL_OK;
 	    }
-	    objPtr = Tk_GetOptionInfo(interp, slavePtr, optionTable,
+	    objPtr = Tk_GetOptionInfo(interp, contentPtr, optionTable,
 		    (objc == 4) ? objv[3] : NULL, tkwin);
 	    if (objPtr == NULL) {
 		return TCL_ERROR;
@@ -305,22 +305,22 @@ Tk_PlaceObjCmd(
 	    Tcl_WrongNumArgs(interp, 2, objv, "pathName");
 	    return TCL_ERROR;
 	}
-	slavePtr = FindSlave(tkwin);
-	if (slavePtr == NULL) {
+	contentPtr = FindContent(tkwin);
+	if (contentPtr == NULL) {
 	    return TCL_OK;
 	}
-	if ((slavePtr->containerPtr != NULL) &&
-		(slavePtr->containerPtr->tkwin != Tk_Parent(slavePtr->tkwin))) {
-	    Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->containerPtr->tkwin);
+	if ((contentPtr->containerPtr != NULL) &&
+		(contentPtr->containerPtr->tkwin != Tk_Parent(contentPtr->tkwin))) {
+	    Tk_UnmaintainGeometry(contentPtr->tkwin, contentPtr->containerPtr->tkwin);
 	}
-	UnlinkSlave(slavePtr);
-	Tcl_DeleteHashEntry(Tcl_FindHashEntry(&dispPtr->slaveTable,
+	UnlinkContent(contentPtr);
+	Tcl_DeleteHashEntry(Tcl_FindHashEntry(&dispPtr->contentTable,
 		tkwin));
-	Tk_DeleteEventHandler(tkwin, StructureNotifyMask, SlaveStructureProc,
-		slavePtr);
+	Tk_DeleteEventHandler(tkwin, StructureNotifyMask, ContentStructureProc,
+		contentPtr);
 	Tk_ManageGeometry(tkwin, NULL, NULL);
 	Tk_UnmapWindow(tkwin);
-	FreeSlave(slavePtr);
+	FreeContent(contentPtr);
 	break;
 
     case PLACE_INFO:
@@ -332,20 +332,20 @@ Tk_PlaceObjCmd(
 
     case PLACE_CONTENT:
     case PLACE_SLAVES: {
-	Master *containerPtr;
+	Container *containerPtr;
 
 	if (objc != 3) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "pathName");
 	    return TCL_ERROR;
 	}
-	containerPtr = FindMaster(tkwin);
+	containerPtr = FindContainer(tkwin);
 	if (containerPtr != NULL) {
 	    Tcl_Obj *listPtr = Tcl_NewObj();
 
-	    for (slavePtr = containerPtr->slavePtr; slavePtr != NULL;
-		    slavePtr = slavePtr->nextPtr) {
+	    for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
+		    contentPtr = contentPtr->nextPtr) {
 		Tcl_ListObjAppendElement(NULL, listPtr,
-			Tk_NewWindowObj(slavePtr->tkwin));
+			Tk_NewWindowObj(contentPtr->tkwin));
 	    }
 	    Tcl_SetObjResult(interp, listPtr);
 	}
@@ -359,33 +359,33 @@ Tk_PlaceObjCmd(
 /*
  *----------------------------------------------------------------------
  *
- * CreateSlave --
+ * CreateContent --
  *
- *	Given a Tk_Window token, find the Slave structure corresponding to
+ *	Given a Tk_Window token, find the Content structure corresponding to
  *	that token, creating a new one if necessary.
  *
  * Results:
- *	Pointer to the Slave structure.
+ *	Pointer to the Content structure.
  *
  * Side effects:
- *	A new Slave structure may be created.
+ *	A new Content structure may be created.
  *
  *----------------------------------------------------------------------
  */
 
-static Slave *
-CreateSlave(
+static Content *
+CreateContent(
     Tk_Window tkwin,		/* Token for desired slave. */
     Tk_OptionTable table)
 {
     Tcl_HashEntry *hPtr;
-    Slave *slavePtr;
+    Content *contentPtr;
     int isNew;
     TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr;
 
-    hPtr = Tcl_CreateHashEntry(&dispPtr->slaveTable, (char *) tkwin, &isNew);
+    hPtr = Tcl_CreateHashEntry(&dispPtr->contentTable, (char *) tkwin, &isNew);
     if (!isNew) {
-	return (Slave *)Tcl_GetHashValue(hPtr);
+	return (Content *)Tcl_GetHashValue(hPtr);
     }
 
     /*
@@ -393,25 +393,25 @@ CreateSlave(
      * populate it with some default values.
      */
 
-    slavePtr = (Slave *)ckalloc(sizeof(Slave));
-    memset(slavePtr, 0, sizeof(Slave));
-    slavePtr->tkwin = tkwin;
-    slavePtr->inTkwin = NULL;
-    slavePtr->anchor = TK_ANCHOR_NW;
-    slavePtr->borderMode = BM_INSIDE;
-    slavePtr->optionTable = table;
-    Tcl_SetHashValue(hPtr, slavePtr);
-    Tk_CreateEventHandler(tkwin, StructureNotifyMask, SlaveStructureProc,
-	    slavePtr);
-    return slavePtr;
+    contentPtr = (Content *)ckalloc(sizeof(Content));
+    memset(contentPtr, 0, sizeof(Content));
+    contentPtr->tkwin = tkwin;
+    contentPtr->inTkwin = NULL;
+    contentPtr->anchor = TK_ANCHOR_NW;
+    contentPtr->borderMode = BM_INSIDE;
+    contentPtr->optionTable = table;
+    Tcl_SetHashValue(hPtr, contentPtr);
+    Tk_CreateEventHandler(tkwin, StructureNotifyMask, ContentStructureProc,
+	    contentPtr);
+    return contentPtr;
 }
 
 /*
  *----------------------------------------------------------------------
  *
- * FreeSlave --
+ * FreeContent --
  *
- *	Frees the resources held by a Slave structure.
+ *	Frees the resources held by a Content structure.
  *
  * Results:
  *	None
@@ -423,25 +423,25 @@ CreateSlave(
  */
 
 static void
-FreeSlave(
-    Slave *slavePtr)
+FreeContent(
+    Content *contentPtr)
 {
-    Tk_FreeConfigOptions((char *) slavePtr, slavePtr->optionTable,
-	    slavePtr->tkwin);
-    ckfree(slavePtr);
+    Tk_FreeConfigOptions((char *) contentPtr, contentPtr->optionTable,
+	    contentPtr->tkwin);
+    ckfree(contentPtr);
 }
 
 /*
  *----------------------------------------------------------------------
  *
- * FindSlave --
+ * FindContent --
  *
- *	Given a Tk_Window token, find the Slave structure corresponding to
+ *	Given a Tk_Window token, find the Content structure corresponding to
  *	that token. This is purely a lookup function; it will not create a
  *	record if one does not yet exist.
  *
  * Results:
- *	Pointer to Slave structure; NULL if none exists.
+ *	Pointer to Content structure; NULL if none exists.
  *
  * Side effects:
  *	None.
@@ -449,24 +449,24 @@ FreeSlave(
  *----------------------------------------------------------------------
  */
 
-static Slave *
-FindSlave(
+static Content *
+FindContent(
     Tk_Window tkwin)		/* Token for desired slave. */
 {
     Tcl_HashEntry *hPtr;
     TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr;
 
-    hPtr = Tcl_FindHashEntry(&dispPtr->slaveTable, tkwin);
+    hPtr = Tcl_FindHashEntry(&dispPtr->contentTable, tkwin);
     if (hPtr == NULL) {
 	return NULL;
     }
-    return (Slave *)Tcl_GetHashValue(hPtr);
+    return (Content *)Tcl_GetHashValue(hPtr);
 }
 
 /*
  *----------------------------------------------------------------------
  *
- * UnlinkSlave --
+ * UnlinkContent --
  *
  *	This function removes a slave window from the chain of slaves in its
  *	container.
@@ -475,31 +475,31 @@ FindSlave(
  *	None.
  *
  * Side effects:
- *	The slave list of slavePtr's container changes.
+ *	The slave list of contentPtr's container changes.
  *
  *----------------------------------------------------------------------
  */
 
 static void
-UnlinkSlave(
-    Slave *slavePtr)		/* Slave structure to be unlinked. */
+UnlinkContent(
+    Content *contentPtr)		/* Content structure to be unlinked. */
 {
-    Master *containerPtr;
-    Slave *prevPtr;
+    Container *containerPtr;
+    Content *prevPtr;
 
-    containerPtr = slavePtr->containerPtr;
+    containerPtr = contentPtr->containerPtr;
     if (containerPtr == NULL) {
 	return;
     }
-    if (containerPtr->slavePtr == slavePtr) {
-	containerPtr->slavePtr = slavePtr->nextPtr;
+    if (containerPtr->contentPtr == contentPtr) {
+	containerPtr->contentPtr = contentPtr->nextPtr;
     } else {
-	for (prevPtr = containerPtr->slavePtr; ; prevPtr = prevPtr->nextPtr) {
+	for (prevPtr = containerPtr->contentPtr; ; prevPtr = prevPtr->nextPtr) {
 	    if (prevPtr == NULL) {
-		Tcl_Panic("UnlinkSlave couldn't find slave to unlink");
+		Tcl_Panic("UnlinkContent couldn't find slave to unlink");
 	    }
-	    if (prevPtr->nextPtr == slavePtr) {
-		prevPtr->nextPtr = slavePtr->nextPtr;
+	    if (prevPtr->nextPtr == contentPtr) {
+		prevPtr->nextPtr = contentPtr->nextPtr;
 		break;
 	    }
 	}
@@ -508,47 +508,47 @@ UnlinkSlave(
     if (containerPtr->abortPtr != NULL) {
 	*containerPtr->abortPtr = 1;
     }
-    slavePtr->containerPtr = NULL;
+    contentPtr->containerPtr = NULL;
 }
 
 /*
  *----------------------------------------------------------------------
  *
- * CreateMaster --
+ * CreateContainer --
  *
- *	Given a Tk_Window token, find the Master structure corresponding to
+ *	Given a Tk_Window token, find the Container structure corresponding to
  *	that token, creating a new one if necessary.
  *
  * Results:
- *	Pointer to the Master structure.
+ *	Pointer to the Container structure.
  *
  * Side effects:
- *	A new Master structure may be created.
+ *	A new Container structure may be created.
  *
  *----------------------------------------------------------------------
  */
 
-static Master *
-CreateMaster(
+static Container *
+CreateContainer(
     Tk_Window tkwin)		/* Token for desired container. */
 {
     Tcl_HashEntry *hPtr;
-    Master *containerPtr;
+    Container *containerPtr;
     int isNew;
     TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr;
 
-    hPtr = Tcl_CreateHashEntry(&dispPtr->masterTable, (char *) tkwin, &isNew);
+    hPtr = Tcl_CreateHashEntry(&dispPtr->containerTable, (char *)tkwin, &isNew);
     if (isNew) {
-	containerPtr = (Master *)ckalloc(sizeof(Master));
+	containerPtr = (Container *)ckalloc(sizeof(Container));
 	containerPtr->tkwin = tkwin;
-	containerPtr->slavePtr = NULL;
+	containerPtr->contentPtr = NULL;
 	containerPtr->abortPtr = NULL;
 	containerPtr->flags = 0;
 	Tcl_SetHashValue(hPtr, containerPtr);
 	Tk_CreateEventHandler(containerPtr->tkwin, StructureNotifyMask,
 		PlaceStructureProc, containerPtr);
     } else {
-	containerPtr = (Master *)Tcl_GetHashValue(hPtr);
+	containerPtr = (Container *)Tcl_GetHashValue(hPtr);
     }
     return containerPtr;
 }
@@ -556,14 +556,14 @@ CreateMaster(
 /*
  *----------------------------------------------------------------------
  *
- * FindMaster --
+ * FindContainer --
  *
- *	Given a Tk_Window token, find the Master structure corresponding to
+ *	Given a Tk_Window token, find the Container structure corresponding to
  *	that token. This is simply a lookup function; a new record will not be
  *	created if one does not already exist.
  *
  * Results:
- *	Pointer to the Master structure; NULL if one does not exist for the
+ *	Pointer to the Container structure; NULL if one does not exist for the
  *	given Tk_Window token.
  *
  * Side effects:
@@ -572,18 +572,18 @@ CreateMaster(
  *----------------------------------------------------------------------
  */
 
-static Master *
-FindMaster(
+static Container *
+FindContainer(
     Tk_Window tkwin)		/* Token for desired container. */
 {
     Tcl_HashEntry *hPtr;
     TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr;
 
-    hPtr = Tcl_FindHashEntry(&dispPtr->masterTable, tkwin);
+    hPtr = Tcl_FindHashEntry(&dispPtr->containerTable, tkwin);
     if (hPtr == NULL) {
 	return NULL;
     }
-    return (Master *)Tcl_GetHashValue(hPtr);
+    return (Container *)Tcl_GetHashValue(hPtr);
 }
 
 /*
@@ -599,7 +599,7 @@ FindMaster(
  *	the interp's result.
  *
  * Side effects:
- *	Information in slavePtr may change, and slavePtr's container is scheduled
+ *	Information in contentPtr may change, and contentPtr's container is scheduled
  *	for reconfiguration.
  *
  *----------------------------------------------------------------------
@@ -613,10 +613,10 @@ ConfigureContent(
     int objc,			/* Number of config arguments. */
     Tcl_Obj *const objv[])	/* Object values for arguments. */
 {
-    Master *containerPtr;
+    Container *containerPtr;
     Tk_SavedOptions savedOptions;
     int mask;
-    Slave *slavePtr;
+    Content *contentPtr;
     Tk_Window containerWin = NULL;
     TkWindow *container;
 
@@ -628,10 +628,10 @@ ConfigureContent(
 	return TCL_ERROR;
     }
 
-    slavePtr = CreateSlave(tkwin, table);
+    contentPtr = CreateContent(tkwin, table);
 
-    if (Tk_SetOptions(interp, slavePtr, table, objc, objv,
-	    slavePtr->tkwin, &savedOptions, &mask) != TCL_OK) {
+    if (Tk_SetOptions(interp, contentPtr, table, objc, objv,
+	    contentPtr->tkwin, &savedOptions, &mask) != TCL_OK) {
 	goto error;
     }
 
@@ -639,37 +639,37 @@ ConfigureContent(
      * Set slave flags. First clear the field, then add bits as needed.
      */
 
-    slavePtr->flags = 0;
-    if (slavePtr->heightPtr) {
-	slavePtr->flags |= CHILD_HEIGHT;
+    contentPtr->flags = 0;
+    if (contentPtr->heightPtr) {
+	contentPtr->flags |= CHILD_HEIGHT;
     }
 
-    if (slavePtr->relHeightPtr) {
-	slavePtr->flags |= CHILD_REL_HEIGHT;
+    if (contentPtr->relHeightPtr) {
+	contentPtr->flags |= CHILD_REL_HEIGHT;
     }
 
-    if (slavePtr->relWidthPtr) {
-	slavePtr->flags |= CHILD_REL_WIDTH;
+    if (contentPtr->relWidthPtr) {
+	contentPtr->flags |= CHILD_REL_WIDTH;
     }
 
-    if (slavePtr->widthPtr) {
-	slavePtr->flags |= CHILD_WIDTH;
+    if (contentPtr->widthPtr) {
+	contentPtr->flags |= CHILD_WIDTH;
     }
 
-    if (!(mask & IN_MASK) && (slavePtr->containerPtr != NULL)) {
+    if (!(mask & IN_MASK) && (contentPtr->containerPtr != NULL)) {
 	/*
 	 * If no -in option was passed and the slave is already placed then
 	 * just recompute the placement.
 	 */
 
-	containerPtr = slavePtr->containerPtr;
+	containerPtr = contentPtr->containerPtr;
 	goto scheduleLayout;
     } else if (mask & IN_MASK) {
 	/* -in changed */
 	Tk_Window tkwin;
 	Tk_Window ancestor;
 
-	tkwin = slavePtr->inTkwin;
+	tkwin = contentPtr->inTkwin;
 
 	/*
 	 * Make sure that the new container is either the logical parent of the
@@ -678,21 +678,21 @@ ConfigureContent(
 	 */
 
 	for (ancestor = tkwin; ; ancestor = Tk_Parent(ancestor)) {
-	    if (ancestor == Tk_Parent(slavePtr->tkwin)) {
+	    if (ancestor == Tk_Parent(contentPtr->tkwin)) {
 		break;
 	    }
 	    if (Tk_TopWinHierarchy(ancestor)) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 			"can't place %s relative to %s",
-			Tk_PathName(slavePtr->tkwin), Tk_PathName(tkwin)));
+			Tk_PathName(contentPtr->tkwin), Tk_PathName(tkwin)));
 		Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "HIERARCHY", NULL);
 		goto error;
 	    }
 	}
-	if (slavePtr->tkwin == tkwin) {
+	if (contentPtr->tkwin == tkwin) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "can't place %s relative to itself",
-		    Tk_PathName(slavePtr->tkwin)));
+		    Tk_PathName(contentPtr->tkwin)));
 	    Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "LOOP", NULL);
 	    goto error;
 	}
@@ -703,32 +703,32 @@ ConfigureContent(
 
 	for (container = (TkWindow *)tkwin; container != NULL;
 	     container = (TkWindow *)TkGetGeomMaster(container)) {
-	    if (container == (TkWindow *)slavePtr->tkwin) {
+	    if (container == (TkWindow *)contentPtr->tkwin) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "can't put %s inside %s, would cause management loop",
-	            Tk_PathName(slavePtr->tkwin), Tk_PathName(tkwin)));
+	            Tk_PathName(contentPtr->tkwin), Tk_PathName(tkwin)));
 		Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "LOOP", NULL);
 		goto error;
 	    }
 	}
-	if (tkwin != Tk_Parent(slavePtr->tkwin)) {
-	    ((TkWindow *)slavePtr->tkwin)->maintainerPtr = (TkWindow *)tkwin;
+	if (tkwin != Tk_Parent(contentPtr->tkwin)) {
+	    ((TkWindow *)contentPtr->tkwin)->maintainerPtr = (TkWindow *)tkwin;
 	}
 
-	if ((slavePtr->containerPtr != NULL)
-		&& (slavePtr->containerPtr->tkwin == tkwin)) {
+	if ((contentPtr->containerPtr != NULL)
+		&& (contentPtr->containerPtr->tkwin == tkwin)) {
 	    /*
 	     * Re-using same old container. Nothing to do.
 	     */
 
-	    containerPtr = slavePtr->containerPtr;
+	    containerPtr = contentPtr->containerPtr;
 	    goto scheduleLayout;
 	}
-	if ((slavePtr->containerPtr != NULL) &&
-		(slavePtr->containerPtr->tkwin != Tk_Parent(slavePtr->tkwin))) {
-	    Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->containerPtr->tkwin);
+	if ((contentPtr->containerPtr != NULL) &&
+		(contentPtr->containerPtr->tkwin != Tk_Parent(contentPtr->tkwin))) {
+	    Tk_UnmaintainGeometry(contentPtr->tkwin, contentPtr->containerPtr->tkwin);
 	}
-	UnlinkSlave(slavePtr);
+	UnlinkContent(contentPtr);
 	containerWin = tkwin;
     }
 
@@ -737,19 +737,19 @@ ConfigureContent(
      */
 
     if (containerWin == NULL) {
-	containerWin = Tk_Parent(slavePtr->tkwin);
-	slavePtr->inTkwin = containerWin;
+	containerWin = Tk_Parent(contentPtr->tkwin);
+	contentPtr->inTkwin = containerWin;
     }
 
     /*
      * Manage the slave window in this container.
      */
 
-    containerPtr = CreateMaster(containerWin);
-    slavePtr->containerPtr = containerPtr;
-    slavePtr->nextPtr = containerPtr->slavePtr;
-    containerPtr->slavePtr = slavePtr;
-    Tk_ManageGeometry(slavePtr->tkwin, &placerType, slavePtr);
+    containerPtr = CreateContainer(containerWin);
+    contentPtr->containerPtr = containerPtr;
+    contentPtr->nextPtr = containerPtr->contentPtr;
+    containerPtr->contentPtr = contentPtr;
+    Tk_ManageGeometry(contentPtr->tkwin, &placerType, contentPtr);
 
     /*
      * Arrange for the container to be re-arranged at the first idle moment.
@@ -796,49 +796,49 @@ PlaceInfoCommand(
     Tcl_Interp *interp,		/* Interp into which to place result. */
     Tk_Window tkwin)		/* Token for the window to get info on. */
 {
-    Slave *slavePtr;
+    Content *contentPtr;
     Tcl_Obj *infoObj;
 
-    slavePtr = FindSlave(tkwin);
-    if (slavePtr == NULL) {
+    contentPtr = FindContent(tkwin);
+    if (contentPtr == NULL) {
 	return TCL_OK;
     }
     infoObj = Tcl_NewObj();
-    if (slavePtr->containerPtr != NULL) {
+    if (contentPtr->containerPtr != NULL) {
 	Tcl_AppendToObj(infoObj, "-in", -1);
 	Tcl_ListObjAppendElement(NULL, infoObj,
-		Tk_NewWindowObj(slavePtr->containerPtr->tkwin));
+		Tk_NewWindowObj(contentPtr->containerPtr->tkwin));
 	Tcl_AppendToObj(infoObj, " ", -1);
     }
     Tcl_AppendPrintfToObj(infoObj,
 	    "-x %d -relx %.4g -y %d -rely %.4g",
-	    slavePtr->x, slavePtr->relX, slavePtr->y, slavePtr->relY);
-    if (slavePtr->flags & CHILD_WIDTH) {
-	Tcl_AppendPrintfToObj(infoObj, " -width %d", slavePtr->width);
+	    contentPtr->x, contentPtr->relX, contentPtr->y, contentPtr->relY);
+    if (contentPtr->flags & CHILD_WIDTH) {
+	Tcl_AppendPrintfToObj(infoObj, " -width %d", contentPtr->width);
     } else {
 	Tcl_AppendToObj(infoObj, " -width {}", -1);
     }
-    if (slavePtr->flags & CHILD_REL_WIDTH) {
+    if (contentPtr->flags & CHILD_REL_WIDTH) {
 	Tcl_AppendPrintfToObj(infoObj,
-		" -relwidth %.4g", slavePtr->relWidth);
+		" -relwidth %.4g", contentPtr->relWidth);
     } else {
 	Tcl_AppendToObj(infoObj, " -relwidth {}", -1);
     }
-    if (slavePtr->flags & CHILD_HEIGHT) {
-	Tcl_AppendPrintfToObj(infoObj, " -height %d", slavePtr->height);
+    if (contentPtr->flags & CHILD_HEIGHT) {
+	Tcl_AppendPrintfToObj(infoObj, " -height %d", contentPtr->height);
     } else {
 	Tcl_AppendToObj(infoObj, " -height {}", -1);
     }
-    if (slavePtr->flags & CHILD_REL_HEIGHT) {
+    if (contentPtr->flags & CHILD_REL_HEIGHT) {
 	Tcl_AppendPrintfToObj(infoObj,
-		" -relheight %.4g", slavePtr->relHeight);
+		" -relheight %.4g", contentPtr->relHeight);
     } else {
 	Tcl_AppendToObj(infoObj, " -relheight {}", -1);
     }
 
     Tcl_AppendPrintfToObj(infoObj, " -anchor %s -bordermode %s",
-	    Tk_NameOfAnchor(slavePtr->anchor),
-	    borderModeStrings[slavePtr->borderMode]);
+	    Tk_NameOfAnchor(contentPtr->anchor),
+	    borderModeStrings[contentPtr->borderMode]);
     Tcl_SetObjResult(interp, infoObj);
     return TCL_OK;
 }
@@ -862,10 +862,10 @@ PlaceInfoCommand(
 
 static void
 RecomputePlacement(
-    ClientData clientData)	/* Pointer to Master record. */
+    ClientData clientData)	/* Pointer to Container record. */
 {
-    Master *containerPtr = (Master *)clientData;
-    Slave *slavePtr;
+    Container *containerPtr = (Container *)clientData;
+    Content *contentPtr;
     int x, y, width, height, tmp;
     int containerWidth, containerHeight, containerX, containerY;
     double x1, y1, x2, y2;
@@ -894,8 +894,8 @@ RecomputePlacement(
      * parent or child. If this happens, we'll be told to abort.
      */
 
-    for (slavePtr = containerPtr->slavePtr; slavePtr != NULL && !abort;
-	    slavePtr = slavePtr->nextPtr) {
+    for (contentPtr = containerPtr->contentPtr; contentPtr != NULL && !abort;
+	    contentPtr = contentPtr->nextPtr) {
 	/*
 	 * Step 1: compute size and borderwidth of container, taking into account
 	 * desired border mode.
@@ -904,13 +904,13 @@ RecomputePlacement(
 	containerX = containerY = 0;
 	containerWidth = Tk_Width(containerPtr->tkwin);
 	containerHeight = Tk_Height(containerPtr->tkwin);
-	if (slavePtr->borderMode == BM_INSIDE) {
+	if (contentPtr->borderMode == BM_INSIDE) {
 	    containerX = Tk_InternalBorderLeft(containerPtr->tkwin);
 	    containerY = Tk_InternalBorderTop(containerPtr->tkwin);
 	    containerWidth -= containerX + Tk_InternalBorderRight(containerPtr->tkwin);
 	    containerHeight -= containerY +
 		    Tk_InternalBorderBottom(containerPtr->tkwin);
-	} else if (slavePtr->borderMode == BM_OUTSIDE) {
+	} else if (contentPtr->borderMode == BM_OUTSIDE) {
 	    containerX = containerY = -Tk_Changes(containerPtr->tkwin)->border_width;
 	    containerWidth -= 2 * containerX;
 	    containerHeight -= 2 * containerY;
@@ -921,16 +921,16 @@ RecomputePlacement(
 	 * and location of anchor point within container.
 	 */
 
-	x1 = slavePtr->x + containerX + (slavePtr->relX*containerWidth);
+	x1 = contentPtr->x + containerX + (contentPtr->relX*containerWidth);
 	x = (int) (x1 + ((x1 > 0) ? 0.5 : -0.5));
-	y1 = slavePtr->y + containerY + (slavePtr->relY*containerHeight);
+	y1 = contentPtr->y + containerY + (contentPtr->relY*containerHeight);
 	y = (int) (y1 + ((y1 > 0) ? 0.5 : -0.5));
-	if (slavePtr->flags & (CHILD_WIDTH|CHILD_REL_WIDTH)) {
+	if (contentPtr->flags & (CHILD_WIDTH|CHILD_REL_WIDTH)) {
 	    width = 0;
-	    if (slavePtr->flags & CHILD_WIDTH) {
-		width += slavePtr->width;
+	    if (contentPtr->flags & CHILD_WIDTH) {
+		width += contentPtr->width;
 	    }
-	    if (slavePtr->flags & CHILD_REL_WIDTH) {
+	    if (contentPtr->flags & CHILD_REL_WIDTH) {
 		/*
 		 * The code below is a bit tricky. In order to round correctly
 		 * when both relX and relWidth are specified, compute the
@@ -939,31 +939,31 @@ RecomputePlacement(
 		 * errors in relX and relWidth accumulate.
 		 */
 
-		x2 = x1 + (slavePtr->relWidth*containerWidth);
+		x2 = x1 + (contentPtr->relWidth*containerWidth);
 		tmp = (int) (x2 + ((x2 > 0) ? 0.5 : -0.5));
 		width += tmp - x;
 	    }
 	} else {
-	    width = Tk_ReqWidth(slavePtr->tkwin)
-		    + 2*Tk_Changes(slavePtr->tkwin)->border_width;
+	    width = Tk_ReqWidth(contentPtr->tkwin)
+		    + 2*Tk_Changes(contentPtr->tkwin)->border_width;
 	}
-	if (slavePtr->flags & (CHILD_HEIGHT|CHILD_REL_HEIGHT)) {
+	if (contentPtr->flags & (CHILD_HEIGHT|CHILD_REL_HEIGHT)) {
 	    height = 0;
-	    if (slavePtr->flags & CHILD_HEIGHT) {
-		height += slavePtr->height;
+	    if (contentPtr->flags & CHILD_HEIGHT) {
+		height += contentPtr->height;
 	    }
-	    if (slavePtr->flags & CHILD_REL_HEIGHT) {
+	    if (contentPtr->flags & CHILD_REL_HEIGHT) {
 		/*
 		 * See note above for rounding errors in width computation.
 		 */
 
-		y2 = y1 + (slavePtr->relHeight*containerHeight);
+		y2 = y1 + (contentPtr->relHeight*containerHeight);
 		tmp = (int) (y2 + ((y2 > 0) ? 0.5 : -0.5));
 		height += tmp - y;
 	    }
 	} else {
-	    height = Tk_ReqHeight(slavePtr->tkwin)
-		    + 2*Tk_Changes(slavePtr->tkwin)->border_width;
+	    height = Tk_ReqHeight(contentPtr->tkwin)
+		    + 2*Tk_Changes(contentPtr->tkwin)->border_width;
 	}
 
 	/*
@@ -972,7 +972,7 @@ RecomputePlacement(
 	 * border mode and container's border.
 	 */
 
-	switch (slavePtr->anchor) {
+	switch (contentPtr->anchor) {
 	case TK_ANCHOR_N:
 	    x -= width/2;
 	    break;
@@ -1011,8 +1011,8 @@ RecomputePlacement(
 	 * height aren't zero.
 	 */
 
-	width -= 2*Tk_Changes(slavePtr->tkwin)->border_width;
-	height -= 2*Tk_Changes(slavePtr->tkwin)->border_width;
+	width -= 2*Tk_Changes(contentPtr->tkwin)->border_width;
+	height -= 2*Tk_Changes(contentPtr->tkwin)->border_width;
 	if (width <= 0) {
 	    width = 1;
 	}
@@ -1027,12 +1027,12 @@ RecomputePlacement(
 	 * re-adjust things as relevant windows map, unmap, and move).
 	 */
 
-	if (containerPtr->tkwin == Tk_Parent(slavePtr->tkwin)) {
-	    if ((x != Tk_X(slavePtr->tkwin))
-		    || (y != Tk_Y(slavePtr->tkwin))
-		    || (width != Tk_Width(slavePtr->tkwin))
-		    || (height != Tk_Height(slavePtr->tkwin))) {
-		Tk_MoveResizeWindow(slavePtr->tkwin, x, y, width, height);
+	if (containerPtr->tkwin == Tk_Parent(contentPtr->tkwin)) {
+	    if ((x != Tk_X(contentPtr->tkwin))
+		    || (y != Tk_Y(contentPtr->tkwin))
+		    || (width != Tk_Width(contentPtr->tkwin))
+		    || (height != Tk_Height(contentPtr->tkwin))) {
+		Tk_MoveResizeWindow(contentPtr->tkwin, x, y, width, height);
 	    }
             if (abort) {
                 break;
@@ -1044,14 +1044,14 @@ RecomputePlacement(
 	     */
 
 	    if (Tk_IsMapped(containerPtr->tkwin)) {
-		Tk_MapWindow(slavePtr->tkwin);
+		Tk_MapWindow(contentPtr->tkwin);
 	    }
 	} else {
 	    if ((width <= 0) || (height <= 0)) {
-		Tk_UnmaintainGeometry(slavePtr->tkwin, containerPtr->tkwin);
-		Tk_UnmapWindow(slavePtr->tkwin);
+		Tk_UnmaintainGeometry(contentPtr->tkwin, containerPtr->tkwin);
+		Tk_UnmapWindow(contentPtr->tkwin);
 	    } else {
-		Tk_MaintainGeometry(slavePtr->tkwin, containerPtr->tkwin,
+		Tk_MaintainGeometry(contentPtr->tkwin, containerPtr->tkwin,
 			x, y, width, height);
 	    }
 	}
@@ -1081,30 +1081,30 @@ RecomputePlacement(
 
 static void
 PlaceStructureProc(
-    ClientData clientData,	/* Pointer to Master structure for window
+    ClientData clientData,	/* Pointer to Container structure for window
 				 * referred to by eventPtr. */
     XEvent *eventPtr)		/* Describes what just happened. */
 {
-    Master *containerPtr = (Master *)clientData;
-    Slave *slavePtr, *nextPtr;
+    Container *containerPtr = (Container *)clientData;
+    Content *contentPtr, *nextPtr;
     TkDisplay *dispPtr = ((TkWindow *) containerPtr->tkwin)->dispPtr;
 
     switch (eventPtr->type) {
     case ConfigureNotify:
-	if ((containerPtr->slavePtr != NULL)
+	if ((containerPtr->contentPtr != NULL)
 		&& !(containerPtr->flags & PARENT_RECONFIG_PENDING)) {
 	    containerPtr->flags |= PARENT_RECONFIG_PENDING;
 	    Tcl_DoWhenIdle(RecomputePlacement, containerPtr);
 	}
 	return;
     case DestroyNotify:
-	for (slavePtr = containerPtr->slavePtr; slavePtr != NULL;
-		slavePtr = nextPtr) {
-	    slavePtr->containerPtr = NULL;
-	    nextPtr = slavePtr->nextPtr;
-	    slavePtr->nextPtr = NULL;
+	for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
+		contentPtr = nextPtr) {
+	    contentPtr->containerPtr = NULL;
+	    nextPtr = contentPtr->nextPtr;
+	    contentPtr->nextPtr = NULL;
 	}
-	Tcl_DeleteHashEntry(Tcl_FindHashEntry(&dispPtr->masterTable,
+	Tcl_DeleteHashEntry(Tcl_FindHashEntry(&dispPtr->containerTable,
 		containerPtr->tkwin));
 	if (containerPtr->flags & PARENT_RECONFIG_PENDING) {
 	    Tcl_CancelIdleCall(RecomputePlacement, containerPtr);
@@ -1121,7 +1121,7 @@ PlaceStructureProc(
 	 * that all of its slaves get remapped.
 	 */
 
-	if ((containerPtr->slavePtr != NULL)
+	if ((containerPtr->contentPtr != NULL)
 		&& !(containerPtr->flags & PARENT_RECONFIG_PENDING)) {
 	    containerPtr->flags |= PARENT_RECONFIG_PENDING;
 	    Tcl_DoWhenIdle(RecomputePlacement, containerPtr);
@@ -1133,9 +1133,9 @@ PlaceStructureProc(
 	 * don't keep redisplaying themselves.
 	 */
 
-	for (slavePtr = containerPtr->slavePtr; slavePtr != NULL;
-		slavePtr = slavePtr->nextPtr) {
-	    Tk_UnmapWindow(slavePtr->tkwin);
+	for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
+		contentPtr = contentPtr->nextPtr) {
+	    Tk_UnmapWindow(contentPtr->tkwin);
 	}
 	return;
     }
@@ -1144,7 +1144,7 @@ PlaceStructureProc(
 /*
  *----------------------------------------------------------------------
  *
- * SlaveStructureProc --
+ * ContentStructureProc --
  *
  *	This function is invoked by the Tk event handler when StructureNotify
  *	events occur for a slave window.
@@ -1159,21 +1159,21 @@ PlaceStructureProc(
  */
 
 static void
-SlaveStructureProc(
-    ClientData clientData,	/* Pointer to Slave structure for window
+ContentStructureProc(
+    ClientData clientData,	/* Pointer to Content structure for window
 				 * referred to by eventPtr. */
     XEvent *eventPtr)		/* Describes what just happened. */
 {
-    Slave *slavePtr = (Slave *)clientData;
-    TkDisplay *dispPtr = ((TkWindow *) slavePtr->tkwin)->dispPtr;
+    Content *contentPtr = (Content *)clientData;
+    TkDisplay *dispPtr = ((TkWindow *) contentPtr->tkwin)->dispPtr;
 
     if (eventPtr->type == DestroyNotify) {
-	if (slavePtr->containerPtr != NULL) {
-	    UnlinkSlave(slavePtr);
+	if (contentPtr->containerPtr != NULL) {
+	    UnlinkContent(contentPtr);
 	}
-	Tcl_DeleteHashEntry(Tcl_FindHashEntry(&dispPtr->slaveTable,
-		slavePtr->tkwin));
-	FreeSlave(slavePtr);
+	Tcl_DeleteHashEntry(Tcl_FindHashEntry(&dispPtr->contentTable,
+		contentPtr->tkwin));
+	FreeContent(contentPtr);
     }
 }
 
@@ -1198,23 +1198,22 @@ SlaveStructureProc(
 static void
 PlaceRequestProc(
     ClientData clientData,	/* Pointer to our record for slave. */
-    Tk_Window tkwin)		/* Window that changed its desired size. */
+    TCL_UNUSED(Tk_Window))		/* Window that changed its desired size. */
 {
-    Slave *slavePtr = (Slave *)clientData;
-    Master *containerPtr;
-    (void)tkwin;
+    Content *contentPtr = (Content *)clientData;
+    Container *containerPtr;
 
-    if ((slavePtr->flags & (CHILD_WIDTH|CHILD_REL_WIDTH))
-	    && (slavePtr->flags & (CHILD_HEIGHT|CHILD_REL_HEIGHT))) {
+    if ((contentPtr->flags & (CHILD_WIDTH|CHILD_REL_WIDTH))
+	    && (contentPtr->flags & (CHILD_HEIGHT|CHILD_REL_HEIGHT))) {
         /*
          * Send a ConfigureNotify to indicate that the size change
          * request was rejected.
          */
 
-        TkDoConfigureNotify((TkWindow *)(slavePtr->tkwin));
+        TkDoConfigureNotify((TkWindow *)(contentPtr->tkwin));
 	return;
     }
-    containerPtr = slavePtr->containerPtr;
+    containerPtr = contentPtr->containerPtr;
     if (containerPtr == NULL) {
 	return;
     }
@@ -1243,23 +1242,23 @@ PlaceRequestProc(
 
 static void
 PlaceLostContentProc(
-    ClientData clientData,	/* Slave structure for slave window that was
+    ClientData clientData,	/* Content structure for slave window that was
 				 * stolen away. */
     Tk_Window tkwin)		/* Tk's handle for the slave window. */
 {
-    Slave *slavePtr = (Slave *)clientData;
-    TkDisplay *dispPtr = ((TkWindow *) slavePtr->tkwin)->dispPtr;
+    Content *contentPtr = (Content *)clientData;
+    TkDisplay *dispPtr = ((TkWindow *) contentPtr->tkwin)->dispPtr;
 
-    if (slavePtr->containerPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
-	Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->containerPtr->tkwin);
+    if (contentPtr->containerPtr->tkwin != Tk_Parent(contentPtr->tkwin)) {
+	Tk_UnmaintainGeometry(contentPtr->tkwin, contentPtr->containerPtr->tkwin);
     }
     Tk_UnmapWindow(tkwin);
-    UnlinkSlave(slavePtr);
-    Tcl_DeleteHashEntry(Tcl_FindHashEntry(&dispPtr->slaveTable,
+    UnlinkContent(contentPtr);
+    Tcl_DeleteHashEntry(Tcl_FindHashEntry(&dispPtr->contentTable,
 	    tkwin));
-    Tk_DeleteEventHandler(tkwin, StructureNotifyMask, SlaveStructureProc,
-	    slavePtr);
-    FreeSlave(slavePtr);
+    Tk_DeleteEventHandler(tkwin, StructureNotifyMask, ContentStructureProc,
+	    contentPtr);
+    FreeContent(contentPtr);
 }
 
 /*
diff --git a/generic/tkTextWind.c b/generic/tkTextWind.c
index b9c69d7..b9f64e0 100644
--- a/generic/tkTextWind.c
+++ b/generic/tkTextWind.c
@@ -28,7 +28,7 @@ static void		EmbWinLostContentProc(ClientData clientData,
 static const Tk_GeomMgr textGeomType = {
     "text",			/* name */
     EmbWinRequestProc,		/* requestProc */
-    EmbWinLostContentProc,	/* lostSlaveProc */
+    EmbWinLostContentProc,	/* lostContentProc */
 };
 
 /*
diff --git a/generic/ttk/ttkManager.c b/generic/ttk/ttkManager.c
index b58be39..0a3f13c 100644
--- a/generic/ttk/ttkManager.c
+++ b/generic/ttk/ttkManager.c
@@ -34,9 +34,9 @@
  * (2) Manager voluntarily relinquishes control
  * (3) Content window is destroyed
  *
- * In case (1), Tk calls the manager's lostSlaveProc.
+ * In case (1), Tk calls the manager's lostContentProc.
  * Case (2) is performed by calling Tk_ManageGeometry(slave,NULL,0);
- * in this case Tk does _not_ call the LostSlaveProc (documented behavior).
+ * in this case Tk does _not_ call the lostContentProc (documented behavior).
  * Tk doesn't handle case (3) either; to account for that we
  * register an event handler on the slave widget to track <Destroy> events.
  */
@@ -174,7 +174,7 @@ static void ContentLostEventHandler(void *clientData, XEvent *eventPtr)
 {
     Ttk_Content *slave = (Ttk_Content *)clientData;
     if (eventPtr->type == DestroyNotify) {
-	slave->manager->managerSpec->tkGeomMgr.lostSlaveProc(
+	slave->manager->managerSpec->tkGeomMgr.lostContentProc(
 	    slave->manager, slave->contentWindow);
     }
 }
@@ -229,7 +229,7 @@ void Ttk_DeleteManager(Ttk_Manager *mgr)
 	mgr->window, ManagerEventMask, ManagerEventHandler, mgr);
 
     while (mgr->nManaged > 0) {
-	Ttk_ForgetSlave(mgr, mgr->nManaged - 1);
+	Ttk_ForgetContent(mgr, mgr->nManaged - 1);
     }
     if (mgr->content) {
 	ckfree(mgr->content);
@@ -350,7 +350,7 @@ void Ttk_InsertContent(
 /* ++ Ttk_ForgetContent --
  * 	Unmanage the specified content window.
  */
-void Ttk_ForgetSlave(Ttk_Manager *mgr, TkSizeT index)
+void Ttk_ForgetContent(Ttk_Manager *mgr, TkSizeT index)
 {
     Tk_Window contentWindow = mgr->content[index]->contentWindow;
     RemoveSlave(mgr, index);
@@ -364,7 +364,7 @@ void Ttk_ForgetSlave(Ttk_Manager *mgr, TkSizeT index)
  * 	Contrary to documentation, Tk_MaintainGeometry doesn't always
  * 	map the content window.
  */
-void Ttk_PlaceSlave(
+void Ttk_PlaceContent(
     Ttk_Manager *mgr, TkSizeT index, int x, int y, int width, int height)
 {
     Ttk_Content *slave = mgr->content[index];
@@ -378,7 +378,7 @@ void Ttk_PlaceSlave(
 /* ++ Ttk_UnmapContent --
  * 	Unmap the specified content window, but leave it managed.
  */
-void Ttk_UnmapSlave(Ttk_Manager *mgr, TkSizeT index)
+void Ttk_UnmapContent(Ttk_Manager *mgr, TkSizeT index)
 {
     Ttk_Content *slave = mgr->content[index];
     Tk_UnmaintainGeometry(slave->contentWindow, mgr->window);
@@ -404,7 +404,7 @@ void Ttk_ManagerSizeChanged(Ttk_Manager *mgr)
 
 /* +++ Accessors.
  */
-TkSizeT Ttk_NumberSlaves(Ttk_Manager *mgr)
+TkSizeT Ttk_NumberContent(Ttk_Manager *mgr)
 {
     return mgr->nManaged;
 }
@@ -433,7 +433,7 @@ TkSizeT Ttk_ContentIndex(Ttk_Manager *mgr, Tk_Window contentWindow)
     return TCL_INDEX_NONE;
 }
 
-/* ++ Ttk_GetSlaveIndexFromObj(interp, mgr, objPtr, indexPtr) --
+/* ++ Ttk_GetContentIndexFromObj(interp, mgr, objPtr, indexPtr) --
  * 	Return the index of the content window specified by objPtr.
  * 	Content windows may be specified as an integer index or
  * 	as the name of the managed window.
@@ -487,7 +487,7 @@ int Ttk_GetContentIndexFromObj(
 /* ++ Ttk_ReorderContent(mgr, fromIndex, toIndex) --
  * 	Change content window order.
  */
-void Ttk_ReorderSlave(Ttk_Manager *mgr, TkSizeT fromIndex, TkSizeT toIndex)
+void Ttk_ReorderContent(Ttk_Manager *mgr, TkSizeT fromIndex, TkSizeT toIndex)
 {
     Ttk_Content *moved = mgr->content[fromIndex];
 
diff --git a/generic/ttk/ttkManager.h b/generic/ttk/ttkManager.h
index 7fd8c84..edcbb09 100644
--- a/generic/ttk/ttkManager.h
+++ b/generic/ttk/ttkManager.h
@@ -38,7 +38,7 @@ typedef struct {			/* Manager hooks */
 /*
  * Default implementations for Tk_GeomMgr hooks:
  */
-#define Ttk_LostContentProc Ttk_LostSlaveProc
+#define Ttk_LostSlaveProc Ttk_LostContentProc
 MODULE_SCOPE void Ttk_GeometryRequestProc(ClientData, Tk_Window slave);
 MODULE_SCOPE void Ttk_LostContentProc(ClientData, Tk_Window slave);
 
@@ -79,7 +79,7 @@ MODULE_SCOPE void Ttk_ManagerLayoutChanged(Ttk_Manager *);
 MODULE_SCOPE TkSizeT Ttk_ContentIndex(Ttk_Manager *, Tk_Window);
     /* Returns: index in content array of specified window, TCL_INDEX_NONE if not found */
 
-#define Ttk_GetContentIndexFromObj Ttk_GetSlaveIndexFromObj
+#define Ttk_GetSlaveIndexFromObj Ttk_GetContentIndexFromObj
 MODULE_SCOPE int Ttk_GetContentIndexFromObj(
     Tcl_Interp *, Ttk_Manager *, Tcl_Obj *, TkSizeT *indexPtr);
 
diff --git a/generic/ttk/ttkNotebook.c b/generic/ttk/ttkNotebook.c
index 384d620..fa3881e 100644
--- a/generic/ttk/ttkNotebook.c
+++ b/generic/ttk/ttkNotebook.c
@@ -257,8 +257,8 @@ error:
 static TkSizeT IdentifyTab(Notebook *nb, int x, int y)
 {
     TkSizeT index;
-    for (index = 0; index < Ttk_NumberSlaves(nb->notebook.mgr); ++index) {
-	Tab *tab = (Tab *)Ttk_SlaveData(nb->notebook.mgr,index);
+    for (index = 0; index < Ttk_NumberContent(nb->notebook.mgr); ++index) {
+	Tab *tab = (Tab *)Ttk_ContentData(nb->notebook.mgr,index);
 	if (	tab->state != TAB_STATE_HIDDEN
 	     && Ttk_BoxContains(tab->parcel, x,y))
 	{
@@ -290,7 +290,7 @@ static void ActivateTab(Notebook *nb, TkSizeT index)
 static Ttk_State TabState(Notebook *nb, TkSizeT index)
 {
     Ttk_State state = nb->core.state;
-    Tab *tab = (Tab *)Ttk_SlaveData(nb->notebook.mgr, index);
+    Tab *tab = (Tab *)Ttk_ContentData(nb->notebook.mgr, index);
     TkSizeT i = 0;
 
     if (index == nb->notebook.currentIndex) {
@@ -302,8 +302,8 @@ static Ttk_State TabState(Notebook *nb, TkSizeT index)
     if (index == nb->notebook.activeIndex) {
 	state |= TTK_STATE_ACTIVE;
     }
-    for (i = 0; i < Ttk_NumberSlaves(nb->notebook.mgr); ++i) {
-	Tab *tab = (Tab *)Ttk_SlaveData(nb->notebook.mgr, i);
+    for (i = 0; i < Ttk_NumberContent(nb->notebook.mgr); ++i) {
+	Tab *tab = (Tab *)Ttk_ContentData(nb->notebook.mgr, i);
 	if (tab->state == TAB_STATE_HIDDEN) {
 	    continue;
 	}
@@ -312,8 +312,8 @@ static Ttk_State TabState(Notebook *nb, TkSizeT index)
 	}
 	break;
     }
-    for (i = Ttk_NumberSlaves(nb->notebook.mgr) - 1; i != TCL_INDEX_NONE; --i) {
-	Tab *tab = (Tab *)Ttk_SlaveData(nb->notebook.mgr, i);
+    for (i = Ttk_NumberContent(nb->notebook.mgr) - 1; i != TCL_INDEX_NONE; --i) {
+	Tab *tab = (Tab *)Ttk_ContentData(nb->notebook.mgr, i);
 	if (tab->state == TAB_STATE_HIDDEN) {
 	    continue;
 	}
@@ -353,8 +353,8 @@ static void TabrowSize(
     int tabrowWidth = 0, tabrowHeight = 0;
     TkSizeT i;
 
-    for (i = 0; i < Ttk_NumberSlaves(nb->notebook.mgr); ++i) {
-	Tab *tab = (Tab *)Ttk_SlaveData(nb->notebook.mgr, i);
+    for (i = 0; i < Ttk_NumberContent(nb->notebook.mgr); ++i) {
+	Tab *tab = (Tab *)Ttk_ContentData(nb->notebook.mgr, i);
 	Ttk_State tabState = TabState(nb,i);
 
 	Ttk_RebindSublayout(tabLayout, tab);
@@ -397,9 +397,9 @@ static int NotebookSize(void *clientData, int *widthPtr, int *heightPtr)
 
     /* Compute max requested size of all slaves:
      */
-    for (i = 0; i < Ttk_NumberSlaves(nb->notebook.mgr); ++i) {
-	Tk_Window slaveWindow = Ttk_SlaveWindow(nb->notebook.mgr, i);
-	Tab *tab = (Tab *)Ttk_SlaveData(nb->notebook.mgr, i);
+    for (i = 0; i < Ttk_NumberContent(nb->notebook.mgr); ++i) {
+	Tk_Window slaveWindow = Ttk_ContentWindow(nb->notebook.mgr, i);
+	Tab *tab = (Tab *)Ttk_ContentData(nb->notebook.mgr, i);
 	int slaveWidth
 	    = Tk_ReqWidth(slaveWindow) + Ttk_PaddingWidth(tab->padding);
 	int slaveHeight
@@ -470,7 +470,7 @@ static void SqueezeTabs(
 	int i;
 
 	for (i = 0; i < nTabs; ++i) {
-	    Tab *tab = (Tab *)Ttk_SlaveData(nb->notebook.mgr,i);
+	    Tab *tab = (Tab *)Ttk_ContentData(nb->notebook.mgr,i);
 	    double ad = slack + tab->width * delta;
 	    tab->width += (int)ad;
 	    slack = ad - (int)ad;
@@ -489,7 +489,7 @@ static void PlaceTabs(
     int i;
 
     for (i = 0; i < nTabs; ++i) {
-	Tab *tab = (Tab *)Ttk_SlaveData(nb->notebook.mgr, i);
+	Tab *tab = (Tab *)Ttk_ContentData(nb->notebook.mgr, i);
 	Ttk_State tabState = TabState(nb, i);
 
 	if (tab->state != TAB_STATE_HIDDEN) {
@@ -573,8 +573,8 @@ static void NotebookDoLayout(void *recordPtr)
  */
 static void NotebookPlaceContent(Notebook *nb, TkSizeT index)
 {
-    Tab *tab = (Tab *)Ttk_SlaveData(nb->notebook.mgr, index);
-    Tk_Window slaveWindow = Ttk_SlaveWindow(nb->notebook.mgr, index);
+    Tab *tab = (Tab *)Ttk_ContentData(nb->notebook.mgr, index);
+    Tk_Window slaveWindow = Ttk_ContentWindow(nb->notebook.mgr, index);
     Ttk_Box slaveBox =
 	Ttk_StickBox(Ttk_PadBox(nb->notebook.clientArea, tab->padding),
 	    Tk_ReqWidth(slaveWindow), Tk_ReqHeight(slaveWindow),tab->sticky);
@@ -602,7 +602,7 @@ static void NotebookPlaceContents(void *recordPtr)
  */
 static void SelectTab(Notebook *nb, TkSizeT index)
 {
-    Tab *tab = (Tab *)Ttk_SlaveData(nb->notebook.mgr, index);
+    Tab *tab = (Tab *)Ttk_ContentData(nb->notebook.mgr, index);
     TkSizeT currentIndex = nb->notebook.currentIndex;
 
     if (index == currentIndex) {
@@ -641,13 +641,13 @@ static void SelectTab(Notebook *nb, TkSizeT index)
  */
 static int NextTab(Notebook *nb, int index)
 {
-    TkSizeT nTabs = Ttk_NumberSlaves(nb->notebook.mgr);
+    TkSizeT nTabs = Ttk_NumberContent(nb->notebook.mgr);
     TkSizeT nextIndex;
 
     /* Scan forward for following usable tab:
      */
     for (nextIndex = index + 1; nextIndex + 1 < nTabs + 1; ++nextIndex) {
-	Tab *tab = (Tab *)Ttk_SlaveData(nb->notebook.mgr, nextIndex);
+	Tab *tab = (Tab *)Ttk_ContentData(nb->notebook.mgr, nextIndex);
 	if (tab->state == TAB_STATE_NORMAL) {
 	    return nextIndex;
 	}
@@ -656,7 +656,7 @@ static int NextTab(Notebook *nb, int index)
     /* Not found -- scan backwards.
      */
     for (nextIndex = index - 1; nextIndex != TCL_INDEX_NONE; --nextIndex) {
-	Tab *tab = (Tab *)Ttk_SlaveData(nb->notebook.mgr, nextIndex);
+	Tab *tab = (Tab *)Ttk_ContentData(nb->notebook.mgr, nextIndex);
 	if (tab->state == TAB_STATE_NORMAL) {
 	    return nextIndex;
 	}
@@ -698,7 +698,7 @@ static void SelectNearestTab(Notebook *nb)
 static void TabRemoved(void *managerData, TkSizeT index)
 {
     Notebook *nb = (Notebook *)managerData;
-    Tab *tab = (Tab *)Ttk_SlaveData(nb->notebook.mgr, index);
+    Tab *tab = (Tab *)Ttk_ContentData(nb->notebook.mgr, index);
 
     if (index == nb->notebook.currentIndex) {
 	SelectNearestTab(nb);
@@ -736,7 +736,7 @@ static int AddTab(
 	return TCL_ERROR;
     }
 #if 0 /* can't happen */
-    if (Ttk_SlaveIndex(nb->notebook.mgr, slaveWindow) != TCL_INDEX_NONE) {
+    if (Ttk_ContentIndex(nb->notebook.mgr, slaveWindow) != TCL_INDEX_NONE) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf("%s already added",
 	    Tk_PathName(slaveWindow)));
 	Tcl_SetErrorCode(interp, "TTK", "NOTEBOOK", "PRESENT", NULL);
@@ -852,7 +852,7 @@ static int FindTabIndex(
     {
 	return TCL_OK;
     }
-    if (*index_rtn == Ttk_NumberSlaves(nb->notebook.mgr)) {
+    if (*index_rtn == Ttk_NumberContent(nb->notebook.mgr)) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"Invalid slave specification %s", string));
 	Tcl_SetErrorCode(interp, "TTK", "SLAVE", "SPEC", NULL);
@@ -873,7 +873,7 @@ static int GetTabIndex(
     Tcl_Interp *interp, Notebook *nb, Tcl_Obj *objPtr, TkSizeT *index_rtn)
 {
     int status = FindTabIndex(interp, nb, objPtr, index_rtn);
-	if (status == TCL_OK && *index_rtn + 1 >= Ttk_NumberSlaves(nb->notebook.mgr) + 1) {
+	if (status == TCL_OK && *index_rtn + 1 >= Ttk_NumberContent(nb->notebook.mgr) + 1) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"Slave index %s out of bounds", Tcl_GetString(objPtr)));
 	    Tcl_SetErrorCode(interp, "TTK", "SLAVE", "INDEX", NULL);
@@ -918,7 +918,7 @@ static int NotebookAddCommand(
 	return AddTab(interp, nb, Ttk_NumberContent(nb->notebook.mgr), slaveWindow, objc-3,objv+3);
     }
 
-    tab = (Tab *)Ttk_SlaveData(nb->notebook.mgr, index);
+    tab = (Tab *)Ttk_ContentData(nb->notebook.mgr, index);
     if (tab->state == TAB_STATE_HIDDEN) {
 	tab->state = TAB_STATE_NORMAL;
     }
@@ -939,7 +939,7 @@ static int NotebookInsertCommand(
 {
     Notebook *nb = (Notebook *)recordPtr;
     TkSizeT current = nb->notebook.currentIndex;
-    TkSizeT nSlaves = Ttk_NumberSlaves(nb->notebook.mgr);
+    TkSizeT nSlaves = Ttk_NumberContent(nb->notebook.mgr);
     TkSizeT srcIndex, destIndex;
 
     if (objc < 4) {
@@ -947,7 +947,7 @@ static int NotebookInsertCommand(
 	return TCL_ERROR;
     }
 
-    if (TCL_OK != Ttk_GetSlaveIndexFromObj(
+    if (TCL_OK != Ttk_GetContentIndexFromObj(
 		interp, nb->notebook.mgr, objv[2], &destIndex)) {
 	return TCL_ERROR;
     }
@@ -970,15 +970,15 @@ static int NotebookInsertCommand(
 		interp, nb->notebook.mgr, objv[3], &srcIndex) != TCL_OK)
     {
 	return TCL_ERROR;
-    } else if (srcIndex + 1 >= Ttk_NumberSlaves(nb->notebook.mgr) + 1) {
-	srcIndex = Ttk_NumberSlaves(nb->notebook.mgr) - 1;
+    } else if (srcIndex + 1 >= Ttk_NumberContent(nb->notebook.mgr) + 1) {
+	srcIndex = Ttk_NumberContent(nb->notebook.mgr) - 1;
     }
 
     /* Move existing slave:
      */
     if (ConfigureTab(interp, nb,
-	     (Tab *)Ttk_SlaveData(nb->notebook.mgr, srcIndex),
-	     Ttk_SlaveWindow(nb->notebook.mgr, srcIndex),
+	     (Tab *)Ttk_ContentData(nb->notebook.mgr, srcIndex),
+		 Ttk_ContentWindow(nb->notebook.mgr, srcIndex),
 	     objc-4,objv+4) != TCL_OK)
     {
 	return TCL_ERROR;
@@ -1048,7 +1048,7 @@ static int NotebookHideCommand(
 	return TCL_ERROR;
     }
 
-    tab = (Tab *)Ttk_SlaveData(nb->notebook.mgr, index);
+    tab = (Tab *)Ttk_ContentData(nb->notebook.mgr, index);
     tab->state = TAB_STATE_HIDDEN;
     if (index == nb->notebook.currentIndex) {
 	SelectNearestTab(nb);
@@ -1088,7 +1088,7 @@ static int NotebookIdentifyCommand(
 
     tabIndex = IdentifyTab(nb, x, y);
     if (tabIndex != TCL_INDEX_NONE) {
-	Tab *tab = (Tab *)Ttk_SlaveData(nb->notebook.mgr, tabIndex);
+	Tab *tab = (Tab *)Ttk_ContentData(nb->notebook.mgr, tabIndex);
 	Ttk_State state = TabState(nb, tabIndex);
 	Ttk_Layout tabLayout = nb->notebook.tabLayout;
 
@@ -1214,8 +1214,8 @@ static int NotebookTabCommand(
 	return TCL_ERROR;
     }
 
-    tab = (Tab *)Ttk_SlaveData(mgr, index);
-    slaveWindow = Ttk_SlaveWindow(mgr, index);
+    tab = (Tab *)Ttk_ContentData(mgr, index);
+    slaveWindow = Ttk_ContentWindow(mgr, index);
 
     if (objc == 3) {
 	return TtkEnumerateOptions(interp, tab,
@@ -1345,7 +1345,7 @@ static Ttk_Layout NotebookGetLayout(
 static void DisplayTab(Notebook *nb, int index, Drawable d)
 {
     Ttk_Layout tabLayout = nb->notebook.tabLayout;
-    Tab *tab = (Tab *)Ttk_SlaveData(nb->notebook.mgr, index);
+    Tab *tab = (Tab *)Ttk_ContentData(nb->notebook.mgr, index);
     Ttk_State state = TabState(nb, index);
 
     if (tab->state != TAB_STATE_HIDDEN) {
@@ -1358,7 +1358,7 @@ static void DisplayTab(Notebook *nb, int index, Drawable d)
 static void NotebookDisplay(void *clientData, Drawable d)
 {
     Notebook *nb = (Notebook *)clientData;
-    TkSizeT nContent = Ttk_NumberSlaves(nb->notebook.mgr);
+    TkSizeT nContent = Ttk_NumberContent(nb->notebook.mgr);
     TkSizeT index;
 
     /* Draw notebook background (base layout):
diff --git a/generic/ttk/ttkPanedwindow.c b/generic/ttk/ttkPanedwindow.c
index eb5142b..5c67ace 100644
--- a/generic/ttk/ttkPanedwindow.c
+++ b/generic/ttk/ttkPanedwindow.c
@@ -188,14 +188,14 @@ error:
 
 static int ShoveUp(Paned *pw, int i, int pos)
 {
-    Pane *pane = (Pane *)Ttk_SlaveData(pw->paned.mgr, i);
+    Pane *pane = (Pane *)Ttk_ContentData(pw->paned.mgr, i);
     int sashThickness = pw->paned.sashThickness;
 
     if (i == 0) {
 	if (pos < 0)
 	    pos = 0;
     } else {
-	Pane *prevPane = (Pane *)Ttk_SlaveData(pw->paned.mgr, i-1);
+	Pane *prevPane = (Pane *)Ttk_ContentData(pw->paned.mgr, i-1);
 	if (pos < prevPane->sashPos + sashThickness)
 	    pos = ShoveUp(pw, i-1, pos - sashThickness) + sashThickness;
     }
@@ -208,13 +208,13 @@ static int ShoveUp(Paned *pw, int i, int pos)
  */
 static int ShoveDown(Paned *pw, TkSizeT i, int pos)
 {
-    Pane *pane = (Pane *)Ttk_SlaveData(pw->paned.mgr,i);
+    Pane *pane = (Pane *)Ttk_ContentData(pw->paned.mgr,i);
     int sashThickness = pw->paned.sashThickness;
 
     if (i == Ttk_NumberContent(pw->paned.mgr) - 1) {
 	pos = pane->sashPos; /* Sentinel value == container window size */
     } else {
-	Pane *nextPane = (Pane *)Ttk_SlaveData(pw->paned.mgr,i+1);
+	Pane *nextPane = (Pane *)Ttk_ContentData(pw->paned.mgr,i+1);
 	if (pos + sashThickness > nextPane->sashPos)
 	    pos = ShoveDown(pw, i+1, pos + sashThickness) - sashThickness;
     }
@@ -238,8 +238,8 @@ static int PanedSize(void *recordPtr, int *widthPtr, int *heightPtr)
 
     if (pw->paned.orient == TTK_ORIENT_HORIZONTAL) {
 	for (index = 0; index < nPanes; ++index) {
-	    Pane *pane = (Pane *)Ttk_SlaveData(pw->paned.mgr, index);
-	    Tk_Window slaveWindow = Ttk_SlaveWindow(pw->paned.mgr, index);
+	    Pane *pane = (Pane *)Ttk_ContentData(pw->paned.mgr, index);
+	    Tk_Window slaveWindow = Ttk_ContentWindow(pw->paned.mgr, index);
 
 	    if (height < Tk_ReqHeight(slaveWindow))
 		height = Tk_ReqHeight(slaveWindow);
@@ -248,8 +248,8 @@ static int PanedSize(void *recordPtr, int *widthPtr, int *heightPtr)
 	width += nSashes * sashThickness;
     } else {
 	for (index = 0; index < nPanes; ++index) {
-	    Pane *pane = (Pane *)Ttk_SlaveData(pw->paned.mgr, index);
-	    Tk_Window slaveWindow = Ttk_SlaveWindow(pw->paned.mgr, index);
+	    Pane *pane = (Pane *)Ttk_ContentData(pw->paned.mgr, index);
+	    Tk_Window slaveWindow = Ttk_ContentWindow(pw->paned.mgr, index);
 
 	    if (width < Tk_ReqWidth(slaveWindow))
 		width = Tk_ReqWidth(slaveWindow);
@@ -277,8 +277,8 @@ static void AdjustPanes(Paned *pw)
     int pos = 0;
     TkSizeT index;
 
-    for (index = 0; index < Ttk_NumberSlaves(pw->paned.mgr); ++index) {
-	Pane *pane = (Pane *)Ttk_SlaveData(pw->paned.mgr, index);
+    for (index = 0; index < Ttk_NumberContent(pw->paned.mgr); ++index) {
+	Pane *pane = (Pane *)Ttk_ContentData(pw->paned.mgr, index);
 	int size = pane->sashPos - pos;
 	pane->reqSize = size >= 0 ? size : 0;
 	pos = pane->sashPos + sashThickness;
@@ -316,7 +316,7 @@ static void PlaceSashes(Paned *pw, int width, int height)
     /* Compute total required size and total available weight:
      */
     for (i = 0; i < nPanes; ++i) {
-	Pane *pane = (Pane *)Ttk_SlaveData(mgr, i);
+	Pane *pane = (Pane *)Ttk_ContentData(mgr, i);
 	reqSize += pane->reqSize;
 	totalWeight += pane->weight * (pane->reqSize != 0);
     }
@@ -340,7 +340,7 @@ static void PlaceSashes(Paned *pw, int width, int height)
      */
     pos = 0;
     for (i = 0; i < nPanes; ++i) {
-	Pane *pane = (Pane *)Ttk_SlaveData(mgr, i);
+	Pane *pane = (Pane *)Ttk_ContentData(mgr, i);
 	int weight = pane->weight * (pane->reqSize != 0);
 	int size = pane->reqSize + delta * weight;
 
@@ -374,8 +374,8 @@ static void PlacePanes(Paned *pw)
     int pos = 0;
     TkSizeT index;
 
-    for (index = 0; index < Ttk_NumberSlaves(pw->paned.mgr); ++index) {
-	Pane *pane = (Pane *)Ttk_SlaveData(pw->paned.mgr, index);
+    for (index = 0; index < Ttk_NumberContent(pw->paned.mgr); ++index) {
+	Pane *pane = (Pane *)Ttk_ContentData(pw->paned.mgr, index);
 	int size = pane->sashPos - pos;
 
 	if (size > 0) {
@@ -406,7 +406,7 @@ static void PanedPlaceContent(void *managerData)
 static void PaneRemoved(void *managerData, TkSizeT index)
 {
     Paned *pw = (Paned *)managerData;
-    Pane *pane = (Pane *)Ttk_SlaveData(pw->paned.mgr, index);
+    Pane *pane = (Pane *)Ttk_ContentData(pw->paned.mgr, index);
     DestroyPane(pw, pane);
 }
 
@@ -419,7 +419,7 @@ static int AddPane(
     if (!Ttk_Maintainable(interp, slaveWindow, pw->core.tkwin)) {
 	return TCL_ERROR;
     }
-    if (Ttk_SlaveIndex(pw->paned.mgr, slaveWindow) != TCL_INDEX_NONE) {
+    if (Ttk_ContentIndex(pw->paned.mgr, slaveWindow) != TCL_INDEX_NONE) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"%s already added", Tk_PathName(slaveWindow)));
 	Tcl_SetErrorCode(interp, "TTK", "PANE", "PRESENT", NULL);
@@ -448,8 +448,8 @@ static int AddPane(
 static int PaneRequest(void *managerData, TkSizeT index, int width, int height)
 {
     Paned *pw = (Paned *)managerData;
-    Pane *pane = (Pane *)Ttk_SlaveData(pw->paned.mgr, index);
-    Tk_Window slaveWindow = Ttk_SlaveWindow(pw->paned.mgr, index);
+    Pane *pane = (Pane *)Ttk_ContentData(pw->paned.mgr, index);
+    Tk_Window slaveWindow = Ttk_ContentWindow(pw->paned.mgr, index);
     int horizontal = pw->paned.orient == TTK_ORIENT_HORIZONTAL;
 
     if (!Tk_IsMapped(slaveWindow)) {
@@ -581,7 +581,7 @@ static Ttk_Layout PanedGetLayout(
  */
 static Ttk_Layout SashLayout(Paned *pw, int index)
 {
-    Pane *pane = (Pane *)Ttk_SlaveData(pw->paned.mgr, index);
+    Pane *pane = (Pane *)Ttk_ContentData(pw->paned.mgr, index);
     int thickness = pw->paned.sashThickness,
 	height = Tk_Height(pw->core.tkwin),
 	width = Tk_Width(pw->core.tkwin),
@@ -604,7 +604,7 @@ static void DrawSash(Paned *pw, int index, Drawable d)
 static void PanedDisplay(void *recordPtr, Drawable d)
 {
     Paned *pw = (Paned *)recordPtr;
-    TkSizeT i, nSlaves = Ttk_NumberSlaves(pw->paned.mgr);
+    TkSizeT i, nSlaves = Ttk_NumberContent(pw->paned.mgr);
 
     TtkWidgetDisplay(recordPtr, d);
     for (i = 1; i < nSlaves; ++i) {
@@ -647,7 +647,7 @@ static int PanedInsertCommand(
     void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
     Paned *pw = (Paned *)recordPtr;
-    TkSizeT nSlaves = Ttk_NumberSlaves(pw->paned.mgr);
+    TkSizeT nSlaves = Ttk_NumberContent(pw->paned.mgr);
     TkSizeT srcIndex, destIndex;
     Tk_Window slaveWindow;
 
@@ -662,7 +662,7 @@ static int PanedInsertCommand(
 	return TCL_ERROR;
     }
 
-    if (TCL_OK != Ttk_GetSlaveIndexFromObj(
+    if (TCL_OK != Ttk_GetContentIndexFromObj(
 		interp,pw->paned.mgr, objv[2], &destIndex))
     {
 	return TCL_ERROR;
@@ -675,12 +675,12 @@ static int PanedInsertCommand(
 
     if (destIndex + 1 >= nSlaves + 1)
 	destIndex  = nSlaves - 1;
-    Ttk_ReorderSlave(pw->paned.mgr, srcIndex, destIndex);
+    Ttk_ReorderContent(pw->paned.mgr, srcIndex, destIndex);
 
     return objc == 4 ? TCL_OK :
 	ConfigurePane(interp, pw,
-		(Pane *)Ttk_SlaveData(pw->paned.mgr, destIndex),
-		Ttk_SlaveWindow(pw->paned.mgr, destIndex),
+		(Pane *)Ttk_ContentData(pw->paned.mgr, destIndex),
+		Ttk_ContentWindow(pw->paned.mgr, destIndex),
 		objc-4, objv+4);
 }
 
@@ -701,8 +701,8 @@ static int PanedForgetCommand(
 		    interp, pw->paned.mgr, objv[2], &paneIndex))
     {
 	return TCL_ERROR;
-    } else if (paneIndex + 1 >= Ttk_NumberSlaves(pw->paned.mgr) + 1) {
-	paneIndex = Ttk_NumberSlaves(pw->paned.mgr) - 1;
+    } else if (paneIndex + 1 >= Ttk_NumberContent(pw->paned.mgr) + 1) {
+	paneIndex = Ttk_NumberContent(pw->paned.mgr) - 1;
     }
     Ttk_ForgetContent(pw->paned.mgr, paneIndex);
 
@@ -739,7 +739,7 @@ static int PanedIdentifyCommand(
 
     pos = pw->paned.orient == TTK_ORIENT_HORIZONTAL ? x : y;
     for (index = 0; index < nSashes; ++index) {
-	Pane *pane = (Pane *)Ttk_SlaveData(pw->paned.mgr, index);
+	Pane *pane = (Pane *)Ttk_ContentData(pw->paned.mgr, index);
 	if (pane->sashPos <= pos && pos <= pane->sashPos + sashThickness) {
 	    /* Found it. */
 	    switch (what) {
@@ -783,12 +783,12 @@ static int PanedPaneCommand(
 		    interp,pw->paned.mgr, objv[2], &paneIndex))
     {
 	return TCL_ERROR;
-    } else if (paneIndex + 1 >= Ttk_NumberSlaves(pw->paned.mgr) + 1) {
-	paneIndex = Ttk_NumberSlaves(pw->paned.mgr) - 1;
+    } else if (paneIndex + 1 >= Ttk_NumberContent(pw->paned.mgr) + 1) {
+	paneIndex = Ttk_NumberContent(pw->paned.mgr) - 1;
     }
 
-    pane = (Pane *)Ttk_SlaveData(pw->paned.mgr, paneIndex);
-    slaveWindow = Ttk_SlaveWindow(pw->paned.mgr, paneIndex);
+    pane = (Pane *)Ttk_ContentData(pw->paned.mgr, paneIndex);
+    slaveWindow = Ttk_ContentWindow(pw->paned.mgr, paneIndex);
 
     switch (objc) {
 	case 3:
@@ -846,7 +846,7 @@ static int PanedSashposCommand(
     if (Tcl_GetIntFromObj(interp, objv[2], &sashIndex) != TCL_OK) {
 	return TCL_ERROR;
     }
-    if (sashIndex < 0 || (TkSizeT)sashIndex + 1 >= Ttk_NumberSlaves(pw->paned.mgr)) {
+    if (sashIndex < 0 || (TkSizeT)sashIndex + 1 >= Ttk_NumberContent(pw->paned.mgr)) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 	    "sash index %d out of range", sashIndex));
 	Tcl_SetErrorCode(interp, "TTK", "PANE", "SASH_INDEX", NULL);
diff --git a/library/tk.tcl b/library/tk.tcl
index 441bd25..85421ef 100644
--- a/library/tk.tcl
+++ b/library/tk.tcl
@@ -627,8 +627,8 @@ proc ::tk::FindAltKeyTarget {path char} {
 	    [string index [$path cget -text] [$path cget -underline]]]} {
 	return $path
     }
-    set subwins [concat [grid slaves $path] [pack slaves $path] \
-	    [place slaves $path]]
+    set subwins [concat [grid content $path] [pack content $path] \
+	    [place content $path]]
     if {$class eq "Canvas"} {
 	foreach item [$path find all] {
 	    if {[$path type $item] eq "window"} {
diff --git a/library/ttk/combobox.tcl b/library/ttk/combobox.tcl
index e339f97..0a7e519 100644
--- a/library/ttk/combobox.tcl
+++ b/library/ttk/combobox.tcl
@@ -197,7 +197,7 @@ proc ttk::combobox::Scroll {cb dir} {
 #	and unpost the listbox.
 #
 proc ttk::combobox::LBSelected {lb} {
-    set cb [LBMaster $lb]
+    set cb [LBMain $lb]
     LBSelect $lb
     Unpost $cb
     focus $cb
@@ -207,14 +207,14 @@ proc ttk::combobox::LBSelected {lb} {
 #	Unpost the listbox.
 #
 proc ttk::combobox::LBCancel {lb} {
-    Unpost [LBMaster $lb]
+    Unpost [LBMain $lb]
 }
 
 ## LBTab -- Tab key binding for combobox listbox.
 #	Set the selection, and navigate to next/prev widget.
 #
 proc ttk::combobox::LBTab {lb dir} {
-    set cb [LBMaster $lb]
+    set cb [LBMain $lb]
     switch -- $dir {
 	next	{ set newFocus [tk_focusNext $cb] }
 	prev	{ set newFocus [tk_focusPrev $cb] }
@@ -414,10 +414,10 @@ proc ttk::combobox::Unpost {cb} {
     grab release $cb.popdown ;# in case of stuck or unexpected grab [#1239190]
 }
 
-## LBMaster $lb --
+## LBMain $lb --
 #	Return the combobox main widget that owns the listbox.
 #
-proc ttk::combobox::LBMaster {lb} {
+proc ttk::combobox::LBMain {lb} {
     winfo parent [winfo parent [winfo parent $lb]]
 }
 
@@ -425,7 +425,7 @@ proc ttk::combobox::LBMaster {lb} {
 #	Transfer listbox selection to combobox value.
 #
 proc ttk::combobox::LBSelect {lb} {
-    set cb [LBMaster $lb]
+    set cb [LBMain $lb]
     set selection [$lb curselection]
     if {[llength $selection] == 1} {
 	SelectEntry $cb [lindex $selection 0]
@@ -442,7 +442,7 @@ proc ttk::combobox::LBSelect {lb} {
 #
 proc ttk::combobox::LBCleanup {lb} {
     variable Values
-    unset Values([LBMaster $lb])
+    unset Values([LBMain $lb])
 }
 
 #*EOF*
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index d4020ca..3f4869b 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -183,7 +183,7 @@ static void TopLevelReqProc(ClientData dummy, Tk_Window tkwin);
 static const Tk_GeomMgr wmMgrType = {
     "wm",			/* name */
     TopLevelReqProc,		/* requestProc */
-    NULL,			/* lostSlaveProc */
+    NULL,			/* lostContentProc */
 };
 
 /*
@@ -2357,13 +2357,13 @@ WmIconifyCmd(
 	return TCL_ERROR;
     } else if (wmPtr->iconFor != NULL) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		"can't iconify %s: it is an icon for %s",
+		"can't iconify \"%s\": it is an icon for \"%s\"",
 		winPtr->pathName, Tk_PathName(wmPtr->iconFor)));
 	Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "ICON", NULL);
 	return TCL_ERROR;
     } else if (winPtr->flags & TK_EMBEDDED) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		"can't iconify %s: it is an embedded window",
+		"can't iconify \"%s\": it is an embedded window",
 		winPtr->pathName));
 	Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "EMBEDDED", NULL);
 	return TCL_ERROR;
@@ -3643,7 +3643,7 @@ WmTransientCmd(
 
 	if (wmPtr->iconFor != NULL) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		    "can't make \"%s\" a transient: it is an icon for %s",
+		    "can't make \"%s\" a transient, it is an icon for %s",
 		    Tcl_GetString(objv[2]), Tk_PathName(wmPtr->iconFor)));
 	    Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "ICON", NULL);
 	    return TCL_ERROR;
@@ -3657,7 +3657,7 @@ WmTransientCmd(
 
 	if (wmPtr2 != NULL && wmPtr2->iconFor != NULL) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		    "can't make \"%s\" a container: it is an icon for %s",
+		    "can't make \"%s\" a container, it is an icon for %s",
 		    Tcl_GetString(objv[3]), Tk_PathName(wmPtr2->iconFor)));
 	    Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "ICON", NULL);
 	    return TCL_ERROR;
@@ -3667,7 +3667,7 @@ WmTransientCmd(
 		w = (TkWindow *)w->wmInfoPtr->container) {
 	    if (w == winPtr) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		    "setting \"%s\" as container creates a transient/container cycle",
+		    "can't set \"%s\" as container, would cause management loop",
 		    Tk_PathName(containerPtr)));
 		Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "SELF", NULL);
 		return TCL_ERROR;
diff --git a/tests/grid.test b/tests/grid.test
index 7651193..22a2214 100644
--- a/tests/grid.test
+++ b/tests/grid.test
@@ -63,10 +63,10 @@ test grid-1.5 {basic argument checking} -body {
 } -returnCodes error -result {can't manage ".": it's a top-level window}
 test grid-1.6 {basic argument checking} -body {
     grid x
-} -returnCodes error -result {can't determine master window}
+} -returnCodes error -result {can't determine container window}
 test grid-1.7 {basic argument checking} -body {
     grid configure x
-} -returnCodes error -result {can't determine master window}
+} -returnCodes error -result {can't determine container window}
 test grid-1.8 {basic argument checking} -body {
     button .b
     grid x .b
@@ -856,13 +856,13 @@ test grid-11.1 {default widget placement} -body {
     grid ^
 } -cleanup {
     grid_reset 11.1
-} -returnCodes error -result {can't use '^', cant find master}
+} -returnCodes error -result {can't use '^', can't find container window}
 test grid-11.2 {default widget placement} -body {
     button .b
     grid .b ^
 } -cleanup {
     grid_reset 11.2
-} -returnCodes error -result {can't find slave to extend with "^"}
+} -returnCodes error -result {can't find content to extend with "^"}
 test grid-11.3 {default widget placement} -body {
     button .b
     grid .b - - .c
@@ -917,7 +917,7 @@ test grid-11.9 {default widget placement} -body {
     grid .f x ^
 } -cleanup {
     grid_reset 11.9
-} -returnCodes error -result {can't find slave to extend with "^"}
+} -returnCodes error -result {can't find content to extend with "^"}
 test grid-11.10 {default widget placement} -body {
     foreach i {1 2 3} {
 	frame .f$i -width 100 -height 50 -highlightthickness 0 -bg red
diff --git a/tests/imgPhoto.test b/tests/imgPhoto.test
index 88e4662..35b6ddb 100644
--- a/tests/imgPhoto.test
+++ b/tests/imgPhoto.test
@@ -32,7 +32,7 @@
 # ImgPhotoCmd                           imgPhoto-4.*, imgPhoto-17.*
 # GetExtension:                         no tests
 # ParseSubcommandOptions:               imgPhoto-1.*
-# ImgPhotoConfigureMaster:              imgPhoto-3.*, imgPhoto-15.*
+# ImgPhotoConfigureModel:              imgPhoto-3.*, imgPhoto-15.*
 # toggleComplexAlphaIfNeeded:           no tests
 # ImgPhotoDelete:                       imgPhoto-8.*
 # ImgPhotoCmdDeleteProc:                imgPhoto-9.*
@@ -253,7 +253,7 @@ test imgPhoto-3.3 {ImgPhotoConfigureModel procedure} -constraints {
     destroy .c
     image delete photo1
 } -result {256 256 {10 10 266 266} {300 10 556 266}}
-test imgPhoto-3.4 {ImgPhotoConfigureMaster: -data <ppm>} -constraints {
+test imgPhoto-3.4 {ImgPhotoConfigureModel: -data <ppm>} -constraints {
     hasTeapotPhoto
 } -setup {
     image create photo photo1 -file $teapotPhotoFile
@@ -264,7 +264,7 @@ test imgPhoto-3.4 {ImgPhotoConfigureMaster: -data <ppm>} -constraints {
 } -cleanup {
     imageCleanup
 } -result {20 20}
-test imgPhoto-3.5 {ImgPhotoConfigureMaster: -data <png>} -constraints {
+test imgPhoto-3.5 {ImgPhotoConfigureModel: -data <png>} -constraints {
     hasTeapotPhoto
 } -setup {
     image create photo photo1 -file $teapotPhotoFile
@@ -275,7 +275,7 @@ test imgPhoto-3.5 {ImgPhotoConfigureMaster: -data <png>} -constraints {
 } -cleanup {
     imageCleanup
 } -result {20 20}
-test imgPhoto-3.6 {ImgPhotoConfigureMaster: -data <default>} -constraints {
+test imgPhoto-3.6 {ImgPhotoConfigureModel: -data <default>} -constraints {
     hasTeapotPhoto
 } -setup {
     image create photo photo1 -file $teapotPhotoFile
diff --git a/tests/packgrid.test b/tests/packgrid.test
index 6dfba25..d0ad855 100644
--- a/tests/packgrid.test
+++ b/tests/packgrid.test
@@ -22,7 +22,7 @@ test packgrid-1.1 {pack and grid in same container window} -setup {
 } -returnCodes error -cleanup {
     destroy .p
     destroy .g
-} -result {cannot use geometry manager pack inside . which already has slaves managed by grid}
+} -result {cannot use geometry manager pack inside . because grid is already managing it's content windows}
 
 test packgrid-1.2 {pack and grid in same container window} -setup {
     grid propagate . true
@@ -36,7 +36,7 @@ test packgrid-1.2 {pack and grid in same container window} -setup {
 } -returnCodes error -cleanup {
     destroy .p
     destroy .g
-} -result {cannot use geometry manager grid inside . which already has slaves managed by pack}
+} -result {cannot use geometry manager grid inside . because pack is already managing it's content windows}
 
 test packgrid-1.3 {pack and grid in same container window} -setup {
     grid propagate . false
@@ -137,7 +137,7 @@ test packgrid-2.1 {pack and grid in same container window, change propagation} -
 } -returnCodes error -cleanup {
     destroy .p
     destroy .g
-} -result {cannot use geometry manager grid inside . which already has slaves managed by pack}
+} -result {cannot use geometry manager grid inside . because pack is already managing it's content windows}
 
 test packgrid-2.2 {pack and grid in same container window, change propagation} -setup {
     grid propagate . true
@@ -153,7 +153,7 @@ test packgrid-2.2 {pack and grid in same container window, change propagation} -
     destroy .p
     update
     destroy .g
-} -result {cannot use geometry manager pack inside . which already has slaves managed by grid}
+} -result {cannot use geometry manager pack inside . because grid is already managing it's content windows}
 
 test packgrid-2.3 {pack and grid in same container window, change propagation} -setup {
     grid propagate . false
@@ -170,7 +170,7 @@ test packgrid-2.3 {pack and grid in same container window, change propagation} -
 } -returnCodes error -cleanup {
     destroy .p
     destroy .g
-} -result {cannot use geometry manager pack inside . which already has slaves managed by grid}
+} -result {cannot use geometry manager pack inside . because grid is already managing it's content windows}
 
 test packgrid-2.4 {pack and grid in same container window, change propagation} -setup {
     grid propagate . false
@@ -186,7 +186,7 @@ test packgrid-2.4 {pack and grid in same container window, change propagation} -
 } -returnCodes error -cleanup {
     destroy .p
     destroy .g
-} -result {cannot use geometry manager grid inside . which already has slaves managed by pack}
+} -result {cannot use geometry manager grid inside . because pack is already managing it's content windows}
 
 test packgrid-3.1 {stealing content} -setup {
     grid propagate . true
@@ -229,7 +229,7 @@ test packgrid-3.3 {stealing content} -setup {
 }  -returnCodes error -cleanup {
     destroy .p
     destroy .g
-} -result {cannot use geometry manager pack inside . which already has slaves managed by grid}
+} -result {cannot use geometry manager pack inside . because grid is already managing it's content windows}
 
 test packgrid-3.4 {stealing content} -setup {
     grid propagate . true
@@ -244,7 +244,7 @@ test packgrid-3.4 {stealing content} -setup {
 }  -returnCodes error -cleanup {
     destroy .p
     destroy .g
-} -result {cannot use geometry manager grid inside . which already has slaves managed by pack}
+} -result {cannot use geometry manager grid inside . because pack is already managing it's content windows}
 
 test packgrid-4.1 {content stolen after container destruction - bug [aa7679685e]} -setup {
     frame .f
diff --git a/tests/unixWm.test b/tests/unixWm.test
index c7b10d0..dbb0ea4 100644
--- a/tests/unixWm.test
+++ b/tests/unixWm.test
@@ -850,7 +850,7 @@ test unixWm-23.4 {Tk_WmCmd procedure, "iconify" option} unix {
     set result [list [catch {wm iconify .t2} msg] $msg]
     destroy .t2
     set result
-} {1 {can't iconify .t2: it is an icon for .t}}
+} {1 {can't iconify ".t2": it is an icon for ".t"}}
 test unixWm-23.5 {Tk_WmCmd procedure, "iconify" option} unix {
     destroy .t2
     toplevel .t2
diff --git a/tests/wm.test b/tests/wm.test
index 285ea9b..ddc395c 100644
--- a/tests/wm.test
+++ b/tests/wm.test
@@ -785,7 +785,7 @@ test wm-iconify-2.3 {Misc errors} -body {
     wm iconify .t2
 } -returnCodes error -cleanup {
     destroy .t2
-} -result {can't iconify .t2: it is an icon for .t}
+} -result {can't iconify ".t2": it is an icon for ".t"}
 # test embedded window for Windows
 test wm-iconify-2.4.1 {Misc errors} -constraints win -setup {
     destroy .t2
@@ -795,7 +795,7 @@ test wm-iconify-2.4.1 {Misc errors} -constraints win -setup {
     wm iconify .t2
 } -returnCodes error -cleanup {
     destroy .t2 .r.f
-} -result {can't iconify .t2: the container does not support the request}
+} -result {can't iconify ".t2": the container does not support the request}
 # test embedded window for other platforms
 test wm-iconify-2.4.2 {Misc errors} -constraints !win -setup {
     destroy .t2
@@ -805,7 +805,7 @@ test wm-iconify-2.4.2 {Misc errors} -constraints !win -setup {
     wm iconify .t2
 } -returnCodes error -cleanup {
     destroy .t2 .r.f
-} -result {can't iconify .t2: it is an embedded window}
+} -result {can't iconify ".t2": it is an embedded window}
 
 test wm-iconify-3.1 {iconify behavior} -body {
     toplevel .t2
@@ -1623,7 +1623,7 @@ test wm-transient-1.5 {usage} -returnCodes error -body {
     wm transient .icon .dummy
 } -cleanup {
     deleteWindows
-} -result {can't make ".icon" a transient: it is an icon for .top}
+} -result {can't make ".icon" a transient, it is an icon for .top}
 test wm-transient-1.6 {usage} -returnCodes error -body {
     toplevel .icon -bg blue
     toplevel .top
@@ -1632,13 +1632,13 @@ test wm-transient-1.6 {usage} -returnCodes error -body {
     wm transient .dummy .icon
 } -cleanup {
     deleteWindows
-} -result {can't make ".icon" a container: it is an icon for .top}
+} -result {can't make ".icon" a container, it is an icon for .top}
 test wm-transient-1.7 {usage} -returnCodes error -body {
     toplevel .top
     wm transient .top .top
 } -cleanup {
     deleteWindows
-} -result {setting ".top" as container creates a transient/container cycle}
+} -result {can't set ".top" as container, would cause management loop}
 test wm-transient-1.8 {usage} -returnCodes error -body {
     toplevel .t1
     toplevel .t2
@@ -1648,14 +1648,14 @@ test wm-transient-1.8 {usage} -returnCodes error -body {
     wm transient .t1 .t3
 } -cleanup {
     deleteWindows
-} -result {setting ".t3" as container creates a transient/container cycle}
+} -result {can't set ".t3" as container, would cause management loop}
 test wm-transient-1.9 {usage} -returnCodes error -body {
     toplevel .top
     frame .top.f
     wm transient .top .top.f
 } -cleanup {
     deleteWindows
-} -result {setting ".top" as container creates a transient/container cycle}
+} -result {can't set ".top" as container, would cause management loop}
 
 test wm-transient-2.1 {basic get/set of toplevel} -setup {
     set results [list]
diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c
index 795a1c5..5e1ed6c 100644
--- a/unix/tkUnixWm.c
+++ b/unix/tkUnixWm.c
@@ -312,12 +312,12 @@ static void		MenubarReqProc(ClientData clientData,
 static const Tk_GeomMgr wmMgrType = {
     "wm",			/* name */
     TopLevelReqProc,		/* requestProc */
-    NULL,			/* lostSlaveProc */
+    NULL,			/* lostContentProc */
 };
 static const Tk_GeomMgr menubarMgrType = {
     "menubar",			/* name */
     MenubarReqProc,		/* requestProc */
-    NULL,			/* lostSlaveProc */
+    NULL,			/* lostContentProc */
 };
 
 /*
@@ -2240,14 +2240,14 @@ WmIconifyCmd(
     }
     if (wmPtr->iconFor != NULL) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		"can't iconify %s: it is an icon for %s",
+		"can't iconify \"%s\": it is an icon for \"%s\"",
 		winPtr->pathName, Tk_PathName(wmPtr->iconFor)));
 	Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "ICON", NULL);
 	return TCL_ERROR;
     }
     if (winPtr->flags & TK_EMBEDDED) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		"can't iconify %s: it is an embedded window",
+		"can't iconify \"%s\": it is an embedded window",
 		winPtr->pathName));
 	Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "EMBEDDED", NULL);
 	return TCL_ERROR;
@@ -3606,7 +3606,7 @@ WmTransientCmd(
 
 	if (wmPtr->iconFor != NULL) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		    "can't make \"%s\" a transient: it is an icon for %s",
+		    "can't make \"%s\" a transient, it is an icon for %s",
 		    Tcl_GetString(objv[2]), Tk_PathName(wmPtr->iconFor)));
 	    Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "ICON", NULL);
 	    return TCL_ERROR;
@@ -3619,7 +3619,7 @@ WmTransientCmd(
 
 	if (wmPtr2->iconFor != NULL) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		    "can't make \"%s\" a container: it is an icon for %s",
+		    "can't make \"%s\" a container, it is an icon for %s",
 		    Tcl_GetString(objv[3]), Tk_PathName(wmPtr2->iconFor)));
 	    Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "ICON", NULL);
 	    return TCL_ERROR;
@@ -3629,7 +3629,7 @@ WmTransientCmd(
 	     w = (TkWindow *)w->wmInfoPtr->masterPtr) {
 	    if (w == winPtr) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		    "setting \"%s\" as container creates a transient/container cycle",
+		    "can't set \"%s\" as container, would cause management loop",
 		    Tk_PathName(masterPtr)));
 		Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "SELF", NULL);
 		return TCL_ERROR;
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index fa04c3b..6241f37 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.c
@@ -364,7 +364,7 @@ static void		RemapWindows(TkWindow *winPtr, HWND parentHWND);
 static const Tk_GeomMgr wmMgrType = {
     "wm",			/* name */
     TopLevelReqProc,		/* requestProc */
-    NULL,			/* lostSlaveProc */
+    NULL,			/* lostContentProc */
 };
 
 typedef struct {
@@ -4140,7 +4140,7 @@ WmIconifyCmd(
     if (winPtr->flags & TK_EMBEDDED) {
 	if (!SendMessageW(wmPtr->wrapper, TK_ICONIFY, 0, 0)) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		    "can't iconify %s: the container does not support the request",
+		    "can't iconify \"%s\": the container does not support the request",
 		    winPtr->pathName));
 	    Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "EMBEDDED", NULL);
 	    return TCL_ERROR;
@@ -4163,7 +4163,7 @@ WmIconifyCmd(
     }
     if (wmPtr->iconFor != NULL) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		"can't iconify %s: it is an icon for %s",
+		"can't iconify \"%s\": it is an icon for \"%s\"",
 		winPtr->pathName, Tk_PathName(wmPtr->iconFor)));
 	Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "ICON", NULL);
 	return TCL_ERROR;
@@ -5592,7 +5592,7 @@ WmTransientCmd(
 
 	if (wmPtr->iconFor != NULL) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		    "can't make \"%s\" a transient: it is an icon for %s",
+		    "can't make \"%s\" a transient, it is an icon for %s",
 		    Tcl_GetString(objv[2]), Tk_PathName(wmPtr->iconFor)));
 	    Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "ICON", NULL);
 	    return TCL_ERROR;
@@ -5602,7 +5602,7 @@ WmTransientCmd(
 
 	if (wmPtr2->iconFor != NULL) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		    "can't make \"%s\" a container: it is an icon for %s",
+		    "can't make \"%s\" a container, it is an icon for %s",
 		    Tcl_GetString(objv[3]), Tk_PathName(wmPtr2->iconFor)));
 	    Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "ICON", NULL);
 	    return TCL_ERROR;
@@ -5611,7 +5611,7 @@ WmTransientCmd(
 	     w = (TkWindow *)w->wmInfoPtr->masterPtr) {
 	    if (w == winPtr) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		    "setting \"%s\" as container creates a transient/container cycle",
+		    "can't set \"%s\" as container, would cause management loop",
 		    Tk_PathName(masterPtr)));
 		Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "SELF", NULL);
 		return TCL_ERROR;
-- 
cgit v0.12


From 7fbdc22e15b48b888546a5df320f8d7ffedb78b1 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 4 Sep 2020 12:38:37 +0000
Subject: TIP #581: grid/pack/place implementation (internal) and documentation

---
 doc/CrtImgType.3      |  38 +--
 doc/ManageGeom.3      |   4 +-
 doc/grid.n            | 202 +++++++-------
 doc/pack.n            | 196 +++++++-------
 doc/panedwindow.n     |   2 +-
 doc/place.n           | 114 ++++----
 doc/selection.n       |   2 +-
 doc/ttk_notebook.n    |  10 +-
 generic/tk.decls      |   4 +-
 generic/tk.h          |  24 +-
 generic/tkConfig.c    |   6 +-
 generic/tkDecls.h     |   8 +-
 generic/tkGrid.c      | 734 +++++++++++++++++++++++++-------------------------
 generic/tkImgPhoto.h  |  12 +-
 generic/tkOldConfig.c |   2 +-
 generic/tkPack.c      | 539 ++++++++++++++++++------------------
 generic/tkPlace.c     | 542 +++++++++++++++++++------------------
 generic/tkTest.c      |  14 +-
 win/rules.vc          |   6 +-
 19 files changed, 1237 insertions(+), 1222 deletions(-)

diff --git a/doc/CrtImgType.3 b/doc/CrtImgType.3
index 8e6b826..ac8c9bb 100644
--- a/doc/CrtImgType.3
+++ b/doc/CrtImgType.3
@@ -76,7 +76,7 @@ The fields of this structure will be described in later subsections
 of this entry.
 .PP
 The second major data structure manipulated by an image manager
-is called an \fIimage master\fR;  it contains overall information
+is called an \fIimage model\fR;  it contains overall information
 about a particular image, such as the values of the configuration
 options specified in an \fBimage create\fR command.
 There will usually be one of these structures for each
@@ -118,8 +118,8 @@ typedef int \fBTk_ImageCreateProc\fR(
         int \fIobjc\fR,
         Tcl_Obj *const \fIobjv\fR[],
         const Tk_ImageType *\fItypePtr\fR,
-        Tk_ImageMaster \fImaster\fR,
-        ClientData *\fImasterDataPtr\fR);
+        Tk_ImageMaster \fImodel\fR,
+        ClientData *\fImodelDataPtr\fR);
 .CE
 The \fIinterp\fR argument is the interpreter in which the \fBimage\fR
 command was invoked, and \fIname\fR is the name for the new image,
@@ -128,15 +128,15 @@ or generated automatically by the \fBimage\fR command.
 The \fIobjc\fR and \fIobjv\fR arguments describe all the configuration
 options for the new image (everything after the name argument to
 \fBimage\fR).
-The \fImaster\fR argument is a token that refers to Tk's information
+The \fImodel\fR argument is a token that refers to Tk's information
 about this image;  the image manager must return this token to
 Tk when invoking the \fBTk_ImageChanged\fR procedure.
 Typically \fIcreateProc\fR will parse \fIobjc\fR and \fIobjv\fR
-and create an image master data structure for the new image.
+and create an image model data structure for the new image.
 \fIcreateProc\fR may store an arbitrary one-word value at
-*\fImasterDataPtr\fR, which will be passed back to the
+*\fImodelDataPtr\fR, which will be passed back to the
 image manager when other callbacks are invoked.
-Typically the value is a pointer to the master data
+Typically the value is a pointer to the model data
 structure for the image.
 .PP
 If \fIcreateProc\fR encounters an error, it should leave an error
@@ -153,11 +153,11 @@ This procedure must match the following prototype:
 .CS
 typedef ClientData \fBTk_ImageGetProc\fR(
         Tk_Window \fItkwin\fR,
-        ClientData \fImasterData\fR);
+        ClientData \fImodelData\fR);
 .CE
 The \fItkwin\fR argument identifies the window in which the
-image will be used and \fImasterData\fR is the value
-returned by \fIcreateProc\fR when the image master was created.
+image will be used and \fImodelData\fR is the value
+returned by \fIcreateProc\fR when the image model was created.
 \fIgetProc\fR will usually create a data structure for the new
 instance, including such things as the resources needed to
 display the image in the given window.
@@ -226,25 +226,25 @@ each of the image's instances.
 \fIdeleteProc\fR must match the following prototype:
 .CS
 typedef void \fBTk_ImageDeleteProc\fR(
-        ClientData \fImasterData\fR);
+        ClientData \fImodelData\fR);
 .CE
-The \fImasterData\fR argument will be the same as the value
-stored in \fI*masterDataPtr\fR by \fIcreateProc\fR when the
+The \fImodelData\fR argument will be the same as the value
+stored in \fI*modelDataPtr\fR by \fIcreateProc\fR when the
 image was created.
 \fIdeleteProc\fR should release any resources associated with
 the image.
-.SH TK_GETIMAGEMASTERDATA
+.SH TK_GETIMAGEMODELDATA
 .PP
 The procedure \fBTk_GetImageMasterData\fR may be invoked to retrieve
 information about an image.  For example, an image manager can use this
-procedure to locate its image master data for an image.
+procedure to locate its image model data for an image.
 If there exists an image named \fIname\fR
 in the interpreter given by \fIinterp\fR, then \fI*typePtrPtr\fR is
 filled in with type information for the image (the \fItypePtr\fR value
 passed to \fBTk_CreateImageType\fR when the image type was registered)
 and the return value is the ClientData value returned by the
 \fIcreateProc\fR when the image was created (this is typically a
-pointer to the image master data structure).  If no such image exists
+pointer to the image model data structure).  If no such image exists
 then NULL is returned and NULL is stored at \fI*typePtrPtr\fR.
 .PP
 .VS "TIP 581"
@@ -261,8 +261,8 @@ typedef int \fBTk_ImageCreateProc\fR(
         int \fIargc\fR,
         char **\fIargv\fR,
         Tk_ImageType *\fItypePtr\fR,
-        Tk_ImageMaster \fImaster\fR,
-        ClientData *\fImasterDataPtr\fR);
+        Tk_ImageMaster \fImodel\fR,
+        ClientData *\fImodelDataPtr\fR);
 .CE
 Legacy programs and libraries dating from those days may still
 contain code that defines extended Tk image types using the old
@@ -293,4 +293,4 @@ interfaces.  Expect their support to go away in Tk 9.
 .SH "SEE ALSO"
 Tk_ImageChanged, Tk_GetImage, Tk_FreeImage, Tk_RedrawImage, Tk_SizeOfImage
 .SH KEYWORDS
-image manager, image type, instance, master
+image manager, image type, instance, model
diff --git a/doc/ManageGeom.3 b/doc/ManageGeom.3
index 520546f..fd2fac9 100644
--- a/doc/ManageGeom.3
+++ b/doc/ManageGeom.3
@@ -32,7 +32,7 @@ Arbitrary one-word value to pass to geometry manager callbacks.
 .PP
 \fBTk_ManageGeometry\fR arranges for a particular geometry manager,
 described by the \fImgrPtr\fR argument, to control the geometry
-of a particular slave window, given by \fItkwin\fR.
+of a particular content window, given by \fItkwin\fR.
 If \fItkwin\fR was previously managed by some other geometry manager,
 the previous manager loses control in favor of the new one.
 If \fImgrPtr\fR is NULL, geometry management is cancelled for
@@ -53,7 +53,7 @@ by the command \fBwinfo manager\fR.
 .PP
 \fIrequestProc\fR is a procedure in the geometry manager that
 will be invoked whenever \fBTk_GeometryRequest\fR is called by the
-slave to change its desired geometry.
+content window to change its desired geometry.
 \fIrequestProc\fR should have arguments and results that match the
 type \fBTk_GeomRequestProc\fR:
 .CS
diff --git a/doc/grid.n b/doc/grid.n
index da48e66..c56ebfd 100644
--- a/doc/grid.n
+++ b/doc/grid.n
@@ -57,9 +57,9 @@ and \fB\-pad\fR.
 If one or more options are provided, then \fIindex\fR may be given as
 a list of column indices to which the configuration options will operate on.
 Indices may be integers, window names or the keyword \fIall\fR. For \fIall\fR
-the options apply to all columns currently occupied be slave windows. For
-a window name, that window must be a slave of this master and the options
-apply to all columns currently occupied be the slave.
+the options apply to all columns currently occupied be content windows. For
+a window name, that window must be a content of this container and the options
+apply to all columns currently occupied be the content.
 The \fB\-minsize\fR option sets the minimum size, in screen units,
 that will be permitted for this column.
 The \fB\-weight\fR option (an integer value)
@@ -80,137 +80,137 @@ added to the largest window contained completely in that column when the
 grid geometry manager requests a size from the containing window.
 If only an option is specified, with no value,
 the current value of that option is returned.
-If only the master window and index is specified, all the current settings
+If only the container window and index is specified, all the current settings
 are returned in a list of
 .QW "\-option value"
 pairs.
 .TP
-\fBgrid configure \fIslave \fR?\fIslave ...\fR? ?\fIoptions\fR?
+\fBgrid configure \fIwindow \fR?\fIwindow ...\fR? ?\fIoptions\fR?
 .
-The arguments consist of the names of one or more slave windows
+The arguments consist of the names of one or more content windows
 followed by pairs of arguments that specify how
-to manage the slaves.
+to manage the content.
 The characters \fB\-\fR,  \fBx\fR and \fB^\fR,
 can be specified instead of a window name to alter the default
-location of a \fIslave\fR, as described in the \fBRELATIVE PLACEMENT\fR
+location of a \fIwindow\fR, as described in the \fBRELATIVE PLACEMENT\fR
 section, below.
 The following options are supported:
 .RS
 .TP
 \fB\-column \fIn\fR
 .
-Insert the slave so that it occupies the \fIn\fRth column in the grid.
+Insert the window so that it occupies the \fIn\fRth column in the grid.
 Column numbers start with 0.  If this option is not supplied, then the
-slave is arranged just to the right of previous slave specified on this
+window is arranged just to the right of previous window specified on this
 call to \fBgrid\fR, or column
 .QW 0
-if it is the first slave.  For each
-\fBx\fR that immediately precedes the \fIslave\fR, the column position
+if it is the first window.  For each
+\fBx\fR that immediately precedes the \fIwindow\fR, the column position
 is incremented by one.  Thus the \fBx\fR represents a blank column
 for this row in the grid.
 .TP
 \fB\-columnspan \fIn\fR
 .
-Insert the slave so that it occupies \fIn\fR columns in the grid.
+Insert the window so that it occupies \fIn\fR columns in the grid.
 The default is one column, unless the window name is followed by a
 \fB\-\fR, in which case the columnspan is incremented once for each immediately
 following \fB\-\fR.
 .TP
-\fB\-in \fIother\fR
+\fB\-in \fIcontainer\fR
 .
-Insert the slave(s) in the master
-window given by \fIother\fR.  The default is the first slave's
+Insert the window(s) in the container
+window given by \fIcontainer\fR.  The default is the first window's
 parent window.
 .TP
 \fB\-ipadx \fIamount\fR
 .
 The \fIamount\fR specifies how much horizontal internal padding to
-leave on each side of the slave(s).  This is space is added
-inside the slave(s) border.
+leave on each side of the content.  This is space is added
+inside the content border.
 The \fIamount\fR must be a valid screen distance, such as \fB2\fR or \fB.5c\fR.
 It defaults to 0.
 .TP
 \fB\-ipady \fIamount\fR
 .
 The \fIamount\fR specifies how much vertical internal padding to
-leave on the top and bottom of the slave(s).
-This space is added inside the slave(s) border.
+leave on the top and bottom of the content.
+This space is added inside the content border.
 The \fIamount\fR  defaults to 0.
 .TP
 \fB\-padx \fIamount\fR
 .
 The \fIamount\fR specifies how much horizontal external padding to
-leave on each side of the slave(s), in screen units.
+leave on each side of the content, in screen units.
 \fIAmount\fR may be a list
 of two values to specify padding for left and right separately.
 The \fIamount\fR defaults to 0.
-This space is added outside the slave(s) border.
+This space is added outside the content border.
 .TP
 \fB\-pady \fIamount\fR
 .
 The \fIamount\fR specifies how much vertical external padding to
-leave on the top and bottom of the slave(s), in screen units.
+leave on the top and bottom of the content, in screen units.
 \fIAmount\fR may be a list
 of two values to specify padding for top and bottom separately.
 The \fIamount\fR defaults to 0.
-This space is added outside the slave(s) border.
+This space is added outside the content border.
 .TP
 \fB\-row \fIn\fR
 .
-Insert the slave so that it occupies the \fIn\fRth row in the grid.
+Insert the content so that it occupies the \fIn\fRth row in the grid.
 Row numbers start with 0.  If this option is not supplied, then the
-slave is arranged on the same row as the previous slave specified on this
+content is arranged on the same row as the previous content specified on this
 call to \fBgrid\fR, or the next row after the highest occupied row
-if this is the first slave.
+if this is the first content.
 .TP
 \fB\-rowspan \fIn\fR
 .
-Insert the slave so that it occupies \fIn\fR rows in the grid.
+Insert the content so that it occupies \fIn\fR rows in the grid.
 The default is one row.  If the next \fBgrid\fR command contains
-\fB^\fR characters instead of \fIslaves\fR that line up with the columns
-of this \fIslave\fR, then the \fBrowspan\fR of this \fIslave\fR is
+\fB^\fR characters instead of \fIcontent\fR that line up with the columns
+of this \fIcontent\fR, then the \fBrowspan\fR of this \fIcontent\fR is
 extended by one.
 .TP
 \fB\-sticky \fIstyle\fR
 .
-If a slave's cell is larger than its requested dimensions, this
-option may be used to position (or stretch) the slave within its cell.
+If a content's cell is larger than its requested dimensions, this
+option may be used to position (or stretch) the content within its cell.
 \fIStyle\fR  is a string that contains zero or more of the characters
 \fBn\fR, \fBs\fR, \fBe\fR or \fBw\fR.
 The string can optionally contains spaces or
 commas, but they are ignored.  Each letter refers to a side (north, south,
-east, or west) that the slave will
+east, or west) that the content will
 .QW stick
 to.  If both \fBn\fR and \fBs\fR (or \fBe\fR and \fBw\fR) are
-specified, the slave will be stretched to fill the entire
+specified, the content will be stretched to fill the entire
 height (or width) of its cavity.  The \fB\-sticky\fR option subsumes the
 combination of \fB\-anchor\fR and \fB\-fill\fR that is used by \fBpack\fR.
 The default is
 .QW "" ,
-which causes the slave to be centered in its cavity, at its requested size.
+which causes the content to be centered in its cavity, at its requested size.
 .LP
-If any of the slaves are already managed by the geometry manager
+If any of the content is already managed by the geometry manager
 then any unspecified options for them retain their previous values rather
 than receiving default values.
 .RE
 .TP
-\fBgrid forget \fIslave \fR?\fIslave ...\fR?
+\fBgrid forget \fIwindow \fR?\fIwindow ...\fR?
 .
-Removes each of the \fIslave\fRs from grid for its
-master and unmaps their windows.
-The slaves will no longer be managed by the grid geometry manager.
+Removes each of the \fIwindow\fRs from grid for its
+container and unmaps their windows.
+The content will no longer be managed by the grid geometry manager.
 The configuration options for that window are forgotten, so that if the
-slave is managed once more by the grid geometry manager, the initial
+window is managed once more by the grid geometry manager, the initial
 default settings are used.
 .TP
-\fBgrid info \fIslave\fR
+\fBgrid info \fIwindow\fR
 .
 Returns a list whose elements are the current configuration state of
-the slave given by \fIslave\fR in the same option-value form that
+the content given by \fIwindow\fR in the same option-value form that
 might be specified to \fBgrid configure\fR.
 The first two elements of the list are
-.QW "\fB\-in \fIother\fR"
-where \fIother\fR is the windows's container window.
+.QW "\fB\-in \fIcontainer\fR"
+where \fIcontainer\fR is the windows's container window.
 .TP
 \fBgrid location \fIwindow x y\fR
 .
@@ -264,91 +264,97 @@ added to the largest window contained completely in that row when the
 grid geometry manager requests a size from the containing window.
 If only an option is specified, with no value,
 the current value of that option is returned.
-If only the master window and index is specified, all the current settings
+If only the container window and index is specified, all the current settings
 are returned in a list of
 .QW "-option value"
 pairs.
 .TP
-\fBgrid remove \fIslave \fR?\fIslave ...\fR?
+\fBgrid remove \fIwindow \fR?\fIwindow ...\fR?
 .
-Removes each of the \fIslave\fRs from grid for its
-master and unmaps their windows.
-The slaves will no longer be managed by the grid geometry manager.
+Removes each of the \fIwindow\fRs from grid for its
+container and unmaps their windows.
+The content will no longer be managed by the grid geometry manager.
 However, the configuration options for that window are remembered,
 so that if the
 slave is managed once more by the grid geometry manager, the previous
 values are retained.
 .TP
-\fBgrid size \fImaster\fR
+\fBgrid size \fIcontainer\fR
 .
-Returns the size of the grid (in columns then rows) for \fImaster\fR.
-The size is determined either by the \fIslave\fR occupying the largest
+Returns the size of the grid (in columns then rows) for \fIcontainer\fR.
+The size is determined either by the \fIcontent\fR occupying the largest
 row or column, or the largest column or row with a \fB\-minsize\fR,
 \fB\-weight\fR, or \fB\-pad\fR that is non-zero.
 .TP
-\fBgrid slaves \fImaster\fR ?\fI\-option value\fR?
+\fBgrid slaves \window\fR ?\fI\-option value\fR?
 .
-If no options are supplied, a list of all of the slaves in \fImaster\fR
-are returned, most recently manages first.
+If no options are supplied, a list of all of the content in \window\fR
+are returned, most recently managed first.
 \fIOption\fR can be either \fB\-row\fR or \fB\-column\fR which
-causes only the slaves in the row (or column) specified by \fIvalue\fR
+causes only the content in the row (or column) specified by \fIvalue\fR
 to be returned.
+.TP
+.VS "TIP 581"
+\fBgrid content \fIwindow\fR ?\fI\-option value\fR?
+.
+Synonym for . \fBgrid slaves \fIwindow\fR ?\fI\-option value\fR?
+.VE "TIP 581"
 .SH "RELATIVE PLACEMENT"
 .PP
 The \fBgrid\fR command contains a limited set of capabilities that
 permit layouts to be created without specifying the row and column
-information for each slave.  This permits slaves to be rearranged,
+information for each content.  This permits content to be rearranged,
 added, or removed without the need to explicitly specify row and
 column information.
-When no column or row information is specified for a \fIslave\fR,
+When no column or row information is specified for a \fIcontent\fR,
 default values are chosen for
 \fB\-column\fR, \fB\-row\fR, \fB\-columnspan\fR and \fB\-rowspan\fR
-at the time the \fIslave\fR is managed. The values are chosen
-based upon the current layout of the grid, the position of the \fIslave\fR
-relative to other \fIslave\fRs in the same grid command, and the presence
+at the time the \fIcontent\fR is managed. The values are chosen
+based upon the current layout of the grid, the position of the \fIcontent\fR
+relative to other \fIcontent\fRs in the same grid command, and the presence
 of the characters \fB\-\fR, \fBx\fR, and \fB^\fR in \fBgrid\fR
-command where \fIslave\fR names are normally expected.
+command where \fIcontent\fR names are normally expected.
 .RS
 .TP
 \fB\-\fR
 .
-This increases the \fB\-columnspan\fR of the \fIslave\fR to the left.  Several
+This increases the \fB\-columnspan\fR of the \fIcontent\fR to the left.  Several
 \fB\-\fR's in a row will successively increase the number of columns spanned. A \fB\-\fR
-may not follow a \fB^\fR or a \fBx\fR, nor may it be the first \fIslave\fR
+may not follow a \fB^\fR or a \fBx\fR, nor may it be the first \fIcontent\fR
 argument to \fBgrid configure\fR.
 .TP
 \fBx\fR
 .
-This leaves an empty column between the \fIslave\fR on the left and
-the \fIslave\fR on the right.
+This leaves an empty column between the \fIcontent\fR on the left and
+the \fIcontent\fR on the right.
 .TP
 \fB^\fR
 .
-This extends the \fB\-rowspan\fR of the \fIslave\fR above the \fB^\fR's
+This extends the \fB\-rowspan\fR of the \fIcontent\fR above the \fB^\fR's
 in the grid.  The number of \fB^\fR's in a row must match the number of
-columns spanned by the \fIslave\fR above it.
+columns spanned by the \fIcontent\fR above it.
 .RE
 .SH "THE GRID ALGORITHM"
 .PP
-The grid geometry manager lays out its slaves in three steps.
-In the first step, the minimum size needed to fit all of the slaves
+The grid geometry manager lays out its content in three steps.
+In the first step, the minimum size needed to fit all of the content
 is computed, then (if propagation is turned on), a request is made
-of the master window to become that size.
+of the container window to become that size.
 In the second step, the requested size is compared against the actual size
-of the master.  If the sizes are different, then spaces is added to or taken
+of the container.  If the sizes are different, then spaces is added to or taken
 away from the layout as needed.
-For the final step, each slave is positioned in its row(s) and column(s)
+For the final step, each content is positioned in its row(s) and column(s)
 based on the setting of its \fIsticky\fR flag.
 .PP
 To compute the minimum size of a layout, the grid geometry manager
-first looks at all slaves whose \fB\-columnspan\fR and \fB\-rowspan\fR values are one,
+first looks at all content whose \fB\-columnspan\fR and \fB\-rowspan\fR values are one,
 and computes the nominal size of each row or column to be either the
 \fIminsize\fR for that row or column, or the sum of the \fIpad\fRding
-plus the size of the largest slave, whichever is greater.  After that
+plus the size of the largest content, whichever is greater.  After that
 the rows or columns in each uniform group adapt to each other.  Then
-the slaves whose row-spans or column-spans are greater than one are
+the content whose row-spans or column-spans are greater than one are
 examined.  If a group of rows or columns need to be increased in size
-in order to accommodate these slaves, then extra space is added to each
+in order to accommodate these content, then extra space is added to each
 row or column in the group according to its \fIweight\fR.  For each
 group whose weights are all zero, the additional space is apportioned
 equally.
@@ -369,11 +375,11 @@ minimum size.  For example, if all rows or columns in a group have the
 same weight, then each row or column will have the same size as the
 largest row or column in the group.
 .PP
-For masters whose size is larger than the requested layout, the additional
+For containers whose size is larger than the requested layout, the additional
 space is apportioned according to the row and column weights.  If all of
-the weights are zero, the layout is placed within its master according to
+the weights are zero, the layout is placed within its container according to
 the \fIanchor\fR value.
-For masters whose size is smaller than the requested layout, space is taken
+For containers whose size is smaller than the requested layout, space is taken
 away from columns and rows according to their weights.  However, once a
 column or row shrinks to its minsize, its weight is taken to be zero.
 If more space needs to be removed from a layout than would be permitted, as
@@ -381,34 +387,34 @@ when all the rows or columns are at their minimum sizes, the layout is
 placed and clipped according to the \fIanchor\fR value.
 .SH "GEOMETRY PROPAGATION"
 .PP
-The grid geometry manager normally computes how large a master must be to
-just exactly meet the needs of its slaves, and it sets the
-requested width and height of the master to these dimensions.
+The grid geometry manager normally computes how large a container must be to
+just exactly meet the needs of its content, and it sets the
+requested width and height of the container to these dimensions.
 This causes geometry information to propagate up through a
 window hierarchy to a top-level window so that the entire
 sub-tree sizes itself to fit the needs of the leaf windows.
 However, the \fBgrid propagate\fR command may be used to
-turn off propagation for one or more masters.
+turn off propagation for one or more containers.
 If propagation is disabled then grid will not set
-the requested width and height of the master window.
-This may be useful if, for example, you wish for a master
+the requested width and height of the container window.
+This may be useful if, for example, you wish for a container
 window to have a fixed size that you specify.
 .SH "RESTRICTIONS ON CONTAINER WINDOWS"
 .PP
-The master for each slave must either be the slave's parent
-(the default) or a descendant of the slave's parent.
+The container for each content must either be the content's parent
+(the default) or a descendant of the content's parent.
 This restriction is necessary to guarantee that the
-slave can be placed over any part of its master that is
-visible without danger of the slave being clipped by its parent.
-In addition, all slaves in one call to \fBgrid\fR must have the same master.
+content can be placed over any part of its container that is
+visible without danger of the content being clipped by its parent.
+In addition, all content in one call to \fBgrid\fR must have the same container.
 .SH "STACKING ORDER"
 .PP
-If the master for a slave is not its parent then you must make sure
-that the slave is higher in the stacking order than the master.
-Otherwise the master will obscure the slave and it will appear as
-if the slave has not been managed correctly.
-The easiest way to make sure the slave is higher than the master is
-to create the master window first:  the most recently created window
+If the container for a content is not its parent then you must make sure
+that the content is higher in the stacking order than the container.
+Otherwise the container will obscure the content and it will appear as
+if the content has not been managed correctly.
+The easiest way to make sure the content is higher than the container is
+to create the container window first:  the most recently created window
 will be highest in the stacking order.
 .SH CREDITS
 .PP
diff --git a/doc/pack.n b/doc/pack.n
index cff5edf..f60bdb2 100644
--- a/doc/pack.n
+++ b/doc/pack.n
@@ -22,16 +22,16 @@ packing them in order around the edges of the parent.
 The \fBpack\fR command can have any of several forms, depending
 on the \fIoption\fR argument:
 .TP
-\fBpack \fIslave \fR?\fIslave ...\fR? ?\fIoptions\fR?
+\fBpack \fIwindow \fR?\fIwindow ...\fR? ?\fIoptions\fR?
 If the first argument to \fBpack\fR is a window name (any value
 starting with
 .QW . ),
 then the command is processed in the same way as \fBpack configure\fR.
 .TP
-\fBpack configure \fIslave \fR?\fIslave ...\fR? ?\fIoptions\fR?
-The arguments consist of the names of one or more slave windows
+\fBpack configure \fIwindow \fR?\fIwindow ...\fR? ?\fIoptions\fR?
+The arguments consist of the names of one or more content windows
 followed by pairs of arguments that specify how
-to manage the slaves.
+to manage the content.
 See \fBTHE PACKER ALGORITHM\fR below for details on how the options
 are used by the packer.
 The following options are supported:
@@ -39,224 +39,230 @@ The following options are supported:
 .TP
 \fB\-after \fIother\fR
 \fIOther\fR must the name of another window.
-Use its master as the master for the slaves, and insert
-the slaves just after \fIother\fR in the packing order.
+Use its container as the container for the content, and insert
+the content just after \fIother\fR in the packing order.
 .TP
 \fB\-anchor \fIanchor\fR
 \fIAnchor\fR must be a valid anchor position such as \fBn\fR
-or \fBsw\fR; it specifies where to position each slave in its
+or \fBsw\fR; it specifies where to position each content in its
 parcel.
 Defaults to \fBcenter\fR.
 .TP
 \fB\-before \fIother\fR
 \fIOther\fR must the name of another window.
-Use its master as the master for the slaves, and insert
-the slaves just before \fIother\fR in the packing order.
+Use its container as the container for the content, and insert
+the content just before \fIother\fR in the packing order.
 .TP
 \fB\-expand \fIboolean\fR
-Specifies whether the slaves should be expanded to consume
-extra space in their master.
+Specifies whether the content should be expanded to consume
+extra space in their container.
 \fIBoolean\fR may have any proper boolean value, such as \fB1\fR
 or \fBno\fR.
 Defaults to 0.
 .TP
 \fB\-fill \fIstyle\fR
-If a slave's parcel is larger than its requested dimensions, this
-option may be used to stretch the slave.
+If a content's parcel is larger than its requested dimensions, this
+option may be used to stretch the content.
 \fIStyle\fR must have one of the following values:
 .RS
 .TP
 \fBnone\fR
-Give the slave its requested dimensions plus any internal padding
+Give the content its requested dimensions plus any internal padding
 requested with \fB\-ipadx\fR or \fB\-ipady\fR.  This is the default.
 .TP
 \fBx\fR
-Stretch the slave horizontally to fill the entire width of its
+Stretch the content horizontally to fill the entire width of its
 parcel (except leave external padding as specified by \fB\-padx\fR).
 .TP
 \fBy\fR
-Stretch the slave vertically to fill the entire height of its
+Stretch the content vertically to fill the entire height of its
 parcel (except leave external padding as specified by \fB\-pady\fR).
 .TP
 \fBboth\fR
-Stretch the slave both horizontally and vertically.
+Stretch the content both horizontally and vertically.
 .RE
 .TP
-\fB\-in \fIother\fR
-Insert the window at the end of the packing order for the content
-window given by \fIother\fR.
+\fB\-in \fIcontainer\fR
+Insert the window at the end of the packing order for the container
+window given by \fIcontainer\fR.
 .TP
 \fB\-ipadx \fIamount\fR
 \fIAmount\fR specifies how much horizontal internal padding to
-leave on each side of the slave(s).
+leave on each side of the content.
 \fIAmount\fR must be a valid screen distance, such as \fB2\fR or \fB.5c\fR.
 It defaults to 0.
 .TP
 \fB\-ipady \fIamount\fR
 \fIAmount\fR specifies how much vertical internal padding to
-leave on each side of the slave(s).
+leave on each side of the content.
 \fIAmount\fR  defaults to 0.
 .TP
 \fB\-padx \fIamount\fR
 \fIAmount\fR specifies how much horizontal external padding to
-leave on each side of the slave(s).  \fIAmount\fR may be a list
+leave on each side of the content.  \fIAmount\fR may be a list
 of two values to specify padding for left and right separately.
 \fIAmount\fR defaults to 0.
 .TP
 \fB\-pady \fIamount\fR
 \fIAmount\fR specifies how much vertical external padding to
-leave on each side of the slave(s).  \fIAmount\fR may be a list
+leave on each side of the content.  \fIAmount\fR may be a list
 of two values to specify padding for top and bottom separately.
 \fIAmount\fR defaults to 0.
 .TP
 \fB\-side \fIside\fR
-Specifies which side of the master the slave(s) will be packed against.
+Specifies which side of the container the content will be packed against.
 Must be \fBleft\fR, \fBright\fR, \fBtop\fR, or \fBbottom\fR.
 Defaults to \fBtop\fR.
 .LP
 If no \fB\-in\fR, \fB\-after\fR or \fB\-before\fR option is specified
-then each of the slaves will be inserted at the end of the packing list
+then each of the content will be inserted at the end of the packing list
 for its parent unless it is already managed by the packer (in which
 case it will be left where it is).
-If one of these options is specified then all the slaves will be
+If one of these options is specified then all the content will be
 inserted at the specified point.
-If any of the slaves are already managed by the geometry manager
+If any of the content are already managed by the geometry manager
 then any unspecified options for them retain their previous values rather
 than receiving default values.
 .RE
 .TP
-\fBpack forget \fIslave \fR?\fIslave ...\fR?
-Removes each of the \fIslave\fRs from the packing order for its
-master and unmaps their windows.
-The slaves will no longer be managed by the packer.
+\fBpack forget \fIwindow \fR?\fIwindow ...\fR?
+Removes each of the \fIwindow\fRs from the packing order for its
+container and unmaps their windows.
+The content will no longer be managed by the packer.
 .TP
-\fBpack info \fIslave\fR
+\fBpack info \fIwindow\fR
 Returns a list whose elements are the current configuration state of
-the slave given by \fIslave\fR in the same option-value form that
+the window given by \fIwindow\fR in the same option-value form that
 might be specified to \fBpack configure\fR.
 The first two elements of the list are
-.QW "\fB\-in \fImaster\fR"
-where \fImaster\fR is the slave's master.
+.QW "\fB\-in \fIcontainer\fR"
+where \fIcontainer\fR is the window's container.
 .TP
-\fBpack propagate \fImaster\fR ?\fIboolean\fR?
+\fBpack propagate \fIcontainer\fR ?\fIboolean\fR?
 If \fIboolean\fR has a true boolean value such as \fB1\fR or \fBon\fR
-then propagation is enabled for \fImaster\fR, which must be a window
+then propagation is enabled for \fIcontainer\fR, which must be a window
 name (see \fBGEOMETRY PROPAGATION\fR below).
 If \fIboolean\fR has a false boolean value then propagation is
-disabled for \fImaster\fR.
+disabled for \fIcontainer\fR.
 In either of these cases an empty string is returned.
 If \fIboolean\fR is omitted then the command returns \fB0\fR or
 \fB1\fR to indicate whether propagation is currently enabled
-for \fImaster\fR.
+for \fIcontainer\fR.
 Propagation is enabled by default.
 .TP
-\fBpack slaves \fImaster\fR
-Returns a list of all of the slaves in the packing order for \fImaster\fR.
-The order of the slaves in the list is the same as their order in
+\fBpack slaves \fIwindow\fR
+Returns a list of all of the content windows in the packing order for \fIwindow\fR.
+The order of the content windows in the list is the same as their order in
 the packing order.
-If \fImaster\fR has no slaves then an empty string is returned.
+If \fIwindow\fR has no content then an empty string is returned.
+.TP
+.VS "TIP 581"
+\fBpack content \fIwindow\fR
+.
+Synonym for . \fBpack slaves \fIwindow\fR
+.VE "TIP 581"
 .SH "THE PACKER ALGORITHM"
 .PP
-For each master the packer maintains an ordered list of slaves
-called the \fIpacking list\fR.
+For each container the packer maintains an ordered list of content
+windows called the \fIpacking list\fR.
 The \fB\-in\fR, \fB\-after\fR, and \fB\-before\fR configuration
-options are used to specify the master for each slave and the slave's
+options are used to specify the container for each content and the content's
 position in the packing list.
-If none of these options is given for a slave then the slave
+If none of these options is given for a content then the content
 is added to the end of the packing list for its parent.
 .PP
-The packer arranges the slaves for a master by scanning the
+The packer arranges the content windows for a container by scanning the
 packing list in order.
-At the time it processes each slave, a rectangular area within
-the master is still unallocated.
-This area is called the \fIcavity\fR;  for the first slave it
-is the entire area of the master.
+At the time it processes each content, a rectangular area within
+the container is still unallocated.
+This area is called the \fIcavity\fR;  for the first content it
+is the entire area of the container.
 .PP
-For each slave the packer carries out the following steps:
+For each content the packer carries out the following steps:
 .IP [1]
-The packer allocates a rectangular \fIparcel\fR for the slave
-along the side of the cavity given by the slave's \fB\-side\fR option.
+The packer allocates a rectangular \fIparcel\fR for the content
+along the side of the cavity given by the content's \fB\-side\fR option.
 If the side is top or bottom then the width of the parcel is
 the width of the cavity and its height is the requested height
-of the slave plus the \fB\-ipady\fR and \fB\-pady\fR options.
+of the content plus the \fB\-ipady\fR and \fB\-pady\fR options.
 For the left or right side the height of the parcel is
 the height of the cavity and the width is the requested width
-of the slave plus the \fB\-ipadx\fR and \fB\-padx\fR options.
+of the content plus the \fB\-ipadx\fR and \fB\-padx\fR options.
 The parcel may be enlarged further because of the \fB\-expand\fR
 option (see \fBEXPANSION\fR below)
 .IP [2]
-The packer chooses the dimensions of the slave.
-The width will normally be the slave's requested width plus
+The packer chooses the dimensions of the content.
+The width will normally be the content's requested width plus
 twice its \fB\-ipadx\fR option and the height will normally be
-the slave's requested height plus twice its \fB\-ipady\fR
+the content's requested height plus twice its \fB\-ipady\fR
 option.
 However, if the \fB\-fill\fR option is \fBx\fR or \fBboth\fR
-then the width of the slave is expanded to fill the width of the parcel,
+then the width of the content is expanded to fill the width of the parcel,
 minus twice the \fB\-padx\fR option.
 If the \fB\-fill\fR option is \fBy\fR or \fBboth\fR
-then the height of the slave is expanded to fill the width of the parcel,
+then the height of the content is expanded to fill the width of the parcel,
 minus twice the \fB\-pady\fR option.
 .IP [3]
-The packer positions the slave over its parcel.
-If the slave is smaller than the parcel then the \fB\-anchor\fR
-option determines where in the parcel the slave will be placed.
+The packer positions the content over its parcel.
+If the content is smaller than the parcel then the \fB\-anchor\fR
+option determines where in the parcel the content will be placed.
 If \fB\-padx\fR or \fB\-pady\fR is non-zero, then the given
 amount of external padding will always be left between the
-slave and the edges of the parcel.
+content and the edges of the parcel.
 .PP
-Once a given slave has been packed, the area of its parcel
+Once a given content has been packed, the area of its parcel
 is subtracted from the cavity, leaving a smaller rectangular
-cavity for the next slave.
-If a slave does not use all of its parcel, the unused space
-in the parcel will not be used by subsequent slaves.
+cavity for the next content.
+If a content does not use all of its parcel, the unused space
+in the parcel will not be used by subsequent content.
 If the cavity should become too small to meet the needs of
-a slave then the slave will be given whatever space is
+a content then the content will be given whatever space is
 left in the cavity.
-If the cavity shrinks to zero size, then all remaining slaves
+If the cavity shrinks to zero size, then all remaining content
 on the packing list will be unmapped from the screen until
-the master window becomes large enough to hold them again.
+the container window becomes large enough to hold them again.
 .SS "EXPANSION"
 .PP
-If a master window is so large that there will be extra space
-left over after all of its slaves have been packed, then the
-extra space is distributed uniformly among all of the slaves
+If a container window is so large that there will be extra space
+left over after all of its content have been packed, then the
+extra space is distributed uniformly among all of the content
 for which the \fB\-expand\fR option is set.
 Extra horizontal space is distributed among the expandable
-slaves whose \fB\-side\fR is \fBleft\fR or \fBright\fR,
+content whose \fB\-side\fR is \fBleft\fR or \fBright\fR,
 and extra vertical space is distributed among the expandable
-slaves whose \fB\-side\fR is \fBtop\fR or \fBbottom\fR.
+content whose \fB\-side\fR is \fBtop\fR or \fBbottom\fR.
 .SS "GEOMETRY PROPAGATION"
 .PP
-The packer normally computes how large a master must be to
-just exactly meet the needs of its slaves, and it sets the
-requested width and height of the master to these dimensions.
+The packer normally computes how large a container must be to
+just exactly meet the needs of its content, and it sets the
+requested width and height of the container to these dimensions.
 This causes geometry information to propagate up through a
 window hierarchy to a top-level window so that the entire
 sub-tree sizes itself to fit the needs of the leaf windows.
 However, the \fBpack propagate\fR command may be used to
-turn off propagation for one or more masters.
+turn off propagation for one or more containers.
 If propagation is disabled then the packer will not set
 the requested width and height of the packer.
-This may be useful if, for example, you wish for a master
+This may be useful if, for example, you wish for a container
 window to have a fixed size that you specify.
 .SH "RESTRICTIONS ON CONTAINER WINDOWS"
 .PP
-The master for each slave must either be the slave's parent
-(the default) or a descendant of the slave's parent.
+The container for each content must either be the content's parent
+(the default) or a descendant of the content's parent.
 This restriction is necessary to guarantee that the
-slave can be placed over any part of its master that is
-visible without danger of the slave being clipped by its parent.
+content can be placed over any part of its container that is
+visible without danger of the content being clipped by its parent.
 .SH "PACKING ORDER"
 .PP
-If the master for a slave is not its parent then you must make sure
-that the slave is higher in the stacking order than the master.
-Otherwise the master will obscure the slave and it will appear as
-if the slave has not been packed correctly.
-The easiest way to make sure the slave is higher than the master is
-to create the master window first:  the most recently created window
+If the container for a content is not its parent then you must make sure
+that the content is higher in the stacking order than the container.
+Otherwise the container will obscure the content and it will appear as
+if the content has not been packed correctly.
+The easiest way to make sure the content is higher than the container is
+to create the container window first:  the most recently created window
 will be highest in the stacking order.
 Or, you can use the \fBraise\fR and \fBlower\fR commands to change
-the stacking order of either the master or the slave.
+the stacking order of either the container or the content.
 .SH EXAMPLE
 .PP
 .CS
diff --git a/doc/panedwindow.n b/doc/panedwindow.n
index 9fc2b72..9fb89d0 100644
--- a/doc/panedwindow.n
+++ b/doc/panedwindow.n
@@ -330,7 +330,7 @@ When a pane is resized from outside (e.g. it is packed to expand and
 fill, and the containing toplevel is resized), space is added to the final
 (rightmost or bottommost) pane in the window.
 .PP
-Unlike slave windows managed by e.g. pack or grid, the panes managed by a
+Unlike child windows managed by e.g. pack or grid, the panes managed by a
 panedwindow do not change width or height to accommodate changes in the
 requested widths or heights of the panes, once these have become mapped.
 Therefore it may be advisable, particularly when creating layouts
diff --git a/doc/place.n b/doc/place.n
index ca30c5d..f52ec53 100644
--- a/doc/place.n
+++ b/doc/place.n
@@ -18,26 +18,26 @@ place \- Geometry manager for fixed or rubber-sheet placement
 .PP
 The placer is a geometry manager for Tk.
 It provides simple fixed placement of windows, where you specify
-the exact size and location of one window, called the \fIslave\fR,
-within another window, called the \fImaster\fR.
+the exact size and location of one window, called the \fIcontent\fR,
+within another window, called the \fIcontainer\fR.
 The placer also provides rubber-sheet placement, where you specify the
-size and location of the slave in terms of the dimensions of
-the master, so that the slave changes size and location
-in response to changes in the size of the master.
+size and location of the content in terms of the dimensions of
+the container, so that the content changes size and location
+in response to changes in the size of the container.
 Lastly, the placer allows you to mix these styles of placement so
-that, for example, the slave has a fixed width and height but is
-centered inside the master.
+that, for example, the content has a fixed width and height but is
+centered inside the container.
 .PP
 .TP
 \fBplace \fIwindow option value \fR?\fIoption value ...\fR?
-Arrange for the placer to manage the geometry of a slave whose
+Arrange for the placer to manage the geometry of a content whose
 pathName is \fIwindow\fR.  The remaining arguments consist of one or
 more \fIoption\-value\fR pairs that specify the way in which
 \fIwindow\fR's geometry is managed.  \fIOption\fR may have any of the
 values accepted by the \fBplace configure\fR command.
 .TP
 \fBplace configure \fIwindow \fR?\fIoption\fR? ?\fIvalue option value ...\fR?
-Query or modify the geometry options of the slave given by
+Query or modify the geometry options of the content given by
 \fIwindow\fR.  If no \fIoption\fR is specified, this command returns a
 list describing the available options (see \fBTk_ConfigureInfo\fR for
 information on the format of this list).  If \fIoption\fR is specified
@@ -59,27 +59,27 @@ The anchor point is in terms of the outer area of \fIwindow\fR
 including its border, if any.
 Thus if \fIwhere\fR is \fBse\fR then the lower-right corner of
 \fIwindow\fR's border will appear at the given (x,y) location
-in the master.
+in the container.
 The anchor position defaults to \fBnw\fR.
 .TP
 \fB\-bordermode \fImode\fR
 \fIMode\fR determines the degree to which borders within the
-master are used in determining the placement of the slave.
+container are used in determining the placement of the content.
 The default and most common value is \fBinside\fR.
-In this case the placer considers the area of the master to
-be the innermost area of the master, inside any border:
+In this case the placer considers the area of the container to
+be the innermost area of the container, inside any border:
 an option of \fB\-x 0\fR corresponds to an x-coordinate just
 inside the border and an option of \fB\-relwidth 1.0\fR
-means \fIwindow\fR will fill the area inside the master's
+means \fIwindow\fR will fill the area inside the container's
 border.
 .RS
 .PP
 If \fImode\fR is \fBoutside\fR then the placer considers
-the area of the master to include its border;
+the area of the container to include its border;
 this mode is typically used when placing \fIwindow\fR
-outside its master, as with the options \fB\-x 0 \-y 0 \-anchor ne\fR.
+outside its container, as with the options \fB\-x 0 \-y 0 \-anchor ne\fR.
 Lastly, \fImode\fR may be specified as \fBignore\fR, in which
-case borders are ignored:  the area of the master is considered
+case borders are ignored:  the area of the container is considered
 to be its official X area, which includes any internal border but
 no external border.  A bordermode of \fBignore\fR is probably
 not very useful.
@@ -94,61 +94,61 @@ If \fIsize\fR is an empty string, or if no \fB\-height\fR or
 \fB\-relheight\fR option is specified, then the height requested
 internally by the window will be used.
 .TP
-\fB\-in \fIother\fR
-\fIOther\fR specifies the path name of the window relative
+\fB\-in \fIcontainer\fR
+\fIContainer\fR specifies the path name of the window relative
 to which \fIwindow\fR is to be placed.
-\fIOther\fR must either be \fIwindow\fR's parent or a descendant
+\fIContainer\fR must either be \fIwindow\fR's parent or a descendant
 of \fIwindow\fR's parent.
-In addition, \fIother\fR and \fIwindow\fR must both be descendants
+In addition, \fIcontainer\fR and \fIwindow\fR must both be descendants
 of the same top-level window.
 These restrictions are necessary to guarantee
-that \fIwindow\fR is visible whenever \fIother\fR is visible.
+that \fIwindow\fR is visible whenever \fIcontainer\fR is visible.
 If this option is not specified then the other window defaults to
 \fIwindow\fR's parent.
 .TP
 \fB\-relheight \fIsize\fR
 \fISize\fR specifies the height for \fIwindow\fR.
 In this case the height is specified as a floating-point number
-relative to the height of the master: 0.5 means \fIwindow\fR will
-be half as high as the master, 1.0 means \fIwindow\fR will have
-the same height as the master, and so on.
-If both \fB\-height\fR and \fB\-relheight\fR are specified for a slave,
+relative to the height of the container: 0.5 means \fIwindow\fR will
+be half as high as the container, 1.0 means \fIwindow\fR will have
+the same height as the container, and so on.
+If both \fB\-height\fR and \fB\-relheight\fR are specified for a content,
 their values are summed.  For example, \fB\-relheight 1.0 \-height \-2\fR
-makes the slave 2 pixels shorter than the master.
+makes the content 2 pixels shorter than the container.
 .TP
 \fB\-relwidth \fIsize\fR
 \fISize\fR specifies the width for \fIwindow\fR.
 In this case the width is specified as a floating-point number
-relative to the width of the master: 0.5 means \fIwindow\fR will
-be half as wide as the master, 1.0 means \fIwindow\fR will have
-the same width as the master, and so on.
-If both \fB\-width\fR and \fB\-relwidth\fR are specified for a slave,
+relative to the width of the container: 0.5 means \fIwindow\fR will
+be half as wide as the container, 1.0 means \fIwindow\fR will have
+the same width as the container, and so on.
+If both \fB\-width\fR and \fB\-relwidth\fR are specified for a content,
 their values are summed.  For example, \fB\-relwidth 1.0 \-width 5\fR
-makes the slave 5 pixels wider than the master.
+makes the content 5 pixels wider than the container.
 .TP
 \fB\-relx \fIlocation\fR
-\fILocation\fR specifies the x-coordinate within the master window
+\fILocation\fR specifies the x-coordinate within the container window
 of the anchor point for \fIwindow\fR.
 In this case the location is specified in a relative fashion
 as a floating-point number:  0.0 corresponds to the left edge
-of the master and 1.0 corresponds to the right edge of the master.
+of the container and 1.0 corresponds to the right edge of the container.
 \fILocation\fR need not be in the range 0.0\-1.0.
-If both \fB\-x\fR and \fB\-relx\fR are specified for a slave
+If both \fB\-x\fR and \fB\-relx\fR are specified for a content
 then their values are summed.  For example, \fB\-relx 0.5 \-x \-2\fR
-positions the left edge of the slave 2 pixels to the left of the
-center of its master.
+positions the left edge of the content 2 pixels to the left of the
+center of its container.
 .TP
 \fB\-rely \fIlocation\fR
-\fILocation\fR specifies the y-coordinate within the master window
+\fILocation\fR specifies the y-coordinate within the container window
 of the anchor point for \fIwindow\fR.
 In this case the value is specified in a relative fashion
 as a floating-point number:  0.0 corresponds to the top edge
-of the master and 1.0 corresponds to the bottom edge of the master.
+of the container and 1.0 corresponds to the bottom edge of the container.
 \fILocation\fR need not be in the range 0.0\-1.0.
-If both \fB\-y\fR and \fB\-rely\fR are specified for a slave
+If both \fB\-y\fR and \fB\-rely\fR are specified for a content
 then their values are summed.  For example, \fB\-rely 0.5 \-x 3\fR
-positions the top edge of the slave 3 pixels below the
-center of its master.
+positions the top edge of the content 3 pixels below the
+center of its container.
 .TP
 \fB\-width \fIsize\fR
 \fISize\fR specifies the width for \fIwindow\fR in screen units
@@ -160,18 +160,18 @@ or \fB\-relwidth\fR option is specified, then the width requested
 internally by the window will be used.
 .TP
 \fB\-x \fIlocation\fR
-\fILocation\fR specifies the x-coordinate within the master window
+\fILocation\fR specifies the x-coordinate within the container window
 of the anchor point for \fIwindow\fR.
 The location is specified in screen units (i.e. any of the forms
 accepted by \fBTk_GetPixels\fR) and need not lie within the bounds
-of the master window.
+of the container window.
 .TP
 \fB\-y \fIlocation\fR
-\fILocation\fR specifies the y-coordinate within the master window
+\fILocation\fR specifies the y-coordinate within the container window
 of the anchor point for \fIwindow\fR.
 The location is specified in screen units (i.e. any of the forms
 accepted by \fBTk_GetPixels\fR) and need not lie within the bounds
-of the master window.
+of the container window.
 .PP
 If the same value is specified separately with
 two different options, such as \fB\-x\fR and \fB\-relx\fR, then
@@ -192,8 +192,14 @@ same form as might be specified to the \fBplace configure\fR
 command.
 .TP
 \fBplace slaves \fIwindow\fR
-Returns a list of all the slave windows for which \fIwindow\fR is the master.
-If there are no slaves for \fIwindow\fR then an empty string is returned.
+Returns a list of all the content windows for which \fIwindow\fR is the container.
+If there is no content for \fIwindow\fR then an empty string is returned.
+.TP
+.VS "TIP 581"
+\fBplace content \fIwindow\fR
+.
+Synonym for . \fBplace slaves \fIwindow\fR
+.VE "TIP 581"
 .PP
 If the configuration of a window has been retrieved with
 \fBplace info\fR, that configuration can be restored later by
@@ -202,8 +208,8 @@ for the window and then invoking \fBplace configure\fR with
 the saved information.
 .SH "FINE POINTS"
 .PP
-It is not necessary for the master window to be the parent
-of the slave window.
+It is not necessary for the container window to be the parent
+of the content window.
 This feature is useful in at least two situations.
 First, for complex window layouts it means you can create a
 hierarchy of subwindows whose only purpose
@@ -221,7 +227,7 @@ can specify options for the real children
 without being aware of the structure of the geometry-management
 hierarchy.
 .PP
-A second reason for having a master different than the slave's
+A second reason for having a container different than the content's
 parent is to tie two siblings together.
 For example, the placer can be used to force a window always to
 be positioned centered just below one of its
@@ -229,12 +235,12 @@ siblings by specifying the configuration
 .CS
 \fB\-in \fIsibling\fB \-relx 0.5 \-rely 1.0 \-anchor n \-bordermode outside\fR
 .CE
-Whenever the sibling is repositioned in the future, the slave
+Whenever the sibling is repositioned in the future, the content
 will be repositioned as well.
 .PP
 Unlike many other geometry managers (such as the packer)
 the placer does not make any attempt to manipulate the geometry of
-the master windows or the parents of slave windows (i.e. it does not
+the container windows or the parents of content windows (i.e. it does not
 set their requested sizes).
 To control the sizes of these windows, make them windows like
 frames and canvases that provide configuration options for this purpose.
@@ -249,7 +255,7 @@ label .l \-text "In the\enMiddle!" \-bg black \-fg white
 .SH "SEE ALSO"
 grid(n), pack(n)
 .SH KEYWORDS
-geometry manager, height, location, master, place, rubber sheet, slave, width
+geometry manager, height, location, container, place, rubber sheet, content, width
 '\" Local Variables:
 '\" mode: nroff
 '\" End:
diff --git a/doc/selection.n b/doc/selection.n
index 6fc23a5..bb4cf09 100644
--- a/doc/selection.n
+++ b/doc/selection.n
@@ -150,7 +150,7 @@ A GUI event, for example \fB<<PasteSelection>>\fR, can copy the \fBPRIMARY\fR se
 .PP
 On X11, the \fBPRIMARY\fR selection is a system-wide feature of the X server, allowing communication between different processes that are X11 clients.
 .PP
-On Windows, the \fBPRIMARY\fR selection is not provided by the system, but only by Tk, and so it is shared only between windows of a parent interpreter and its unsafe child interpreters.  It is not shared between interpreters in different processes or different threads.  Each parent interpreter has a separate \fBPRIMARY\fR selection that is shared only with its unsafe slaves.
+On Windows, the \fBPRIMARY\fR selection is not provided by the system, but only by Tk, and so it is shared only between windows of a parent interpreter and its unsafe child interpreters.  It is not shared between interpreters in different processes or different threads.  Each parent interpreter has a separate \fBPRIMARY\fR selection that is shared only with its unsafe childs.
 .PP
 .SH SECURITY
 .PP
diff --git a/doc/ttk_notebook.n b/doc/ttk_notebook.n
index ae32a44..efbfe6c 100644
--- a/doc/ttk_notebook.n
+++ b/doc/ttk_notebook.n
@@ -20,7 +20,7 @@ ttk::notebook \- Multi-paned container widget
 .SH DESCRIPTION
 A \fBttk::notebook\fR widget manages a collection of windows
 and displays a single one at a time.
-Each slave window is associated with a \fItab\fR,
+Each content window is associated with a \fItab\fR,
 which the user may select to change the currently-displayed window.
 .SO ttk_widget
 \-class	\-cursor	\-takefocus
@@ -56,11 +56,11 @@ Either \fBnormal\fR, \fBdisabled\fR or \fBhidden\fR.
 If \fBdisabled\fR, then the tab is not selectable.
 If \fBhidden\fR, then the tab is not shown.
 .OP \-sticky sticky Sticky
-Specifies how the slave window is positioned within the pane area.
+Specifies how the content window is positioned within the pane area.
 Value is a string containing zero or more of the characters
 \fBn, s, e,\fR or \fBw\fR.
 Each letter refers to a side (north, south, east, or west)
-that the slave window will
+that the content window will
 .QW stick
 to, as per the \fBgrid\fR geometry manager.
 .OP \-padding padding Padding
@@ -86,7 +86,7 @@ any of the following forms:
 .IP \(bu
 An integer between zero and the number of tabs;
 .IP \(bu
-The name of a slave window;
+The name of a content window;
 .IP \(bu
 A positional specification of the form
 .QW @\fIx\fR,\fIy\fR ,
@@ -156,7 +156,7 @@ See \fIttk::widget(n)\fR.
 .TP
 \fIpathname \fBselect\fR ?\fItabid\fR?
 Selects the specified tab.
-The associated slave window will be displayed,
+The associated content window will be displayed,
 and the previously-selected window (if different) is unmapped.
 If \fItabid\fR is omitted, returns the widget name of the
 currently selected pane.
diff --git a/generic/tk.decls b/generic/tk.decls
index 59977ef..3e64878 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -472,7 +472,7 @@ declare 116 {
     Tk_Window Tk_IdToWindow(Display *display, Window window)
 }
 declare 117 {
-    void Tk_ImageChanged(Tk_ImageModel master, int x, int y,
+    void Tk_ImageChanged(Tk_ImageMaster master, int x, int y,
 	    int width, int height, int imageWidth, int imageHeight)
 }
 declare 118 {
@@ -539,7 +539,7 @@ declare 136 {
     CONST84_RETURN char *Tk_NameOfFont(Tk_Font font)
 }
 declare 137 {
-    CONST84_RETURN char *Tk_NameOfImage(Tk_ImageModel imageMaster)
+    CONST84_RETURN char *Tk_NameOfImage(Tk_ImageMaster imageMaster)
 }
 declare 138 {
     CONST84_RETURN char *Tk_NameOfJoinStyle(int join)
diff --git a/generic/tk.h b/generic/tk.h
index ede97ac..50195b9 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -129,7 +129,7 @@ typedef struct Tk_Cursor_ *Tk_Cursor;
 typedef struct Tk_ErrorHandler_ *Tk_ErrorHandler;
 typedef struct Tk_Font_ *Tk_Font;
 typedef struct Tk_Image__ *Tk_Image;
-typedef struct Tk_ImageMaster_ *Tk_ImageModel;
+typedef struct Tk_ImageMaster_ *Tk_ImageMaster;
 typedef struct Tk_OptionTable_ *Tk_OptionTable;
 typedef struct Tk_PostscriptInfo_ *Tk_PostscriptInfo;
 typedef struct Tk_TextLayout_ *Tk_TextLayout;
@@ -624,13 +624,13 @@ typedef struct Tk_GeomMgr {
 				 * to invoke it, or name of widget class that
 				 * allows embedded widgets). */
     Tk_GeomRequestProc *requestProc;
-				/* Procedure to invoke when a slave's
+				/* Procedure to invoke when a content's
 				 * requested geometry changes. */
     Tk_GeomLostContentProc *lostSlaveProc;
-				/* Procedure to invoke when a slave is taken
+				/* Procedure to invoke when content is taken
 				 * away from one geometry manager by another.
 				 * NULL means geometry manager doesn't care
-				 * when slaves are lost. */
+				 * when content lost. */
 } Tk_GeomMgr;
 
 /*
@@ -1230,19 +1230,19 @@ typedef struct Tk_Outline {
 typedef struct Tk_ImageType Tk_ImageType;
 #ifdef USE_OLD_IMAGE
 typedef int (Tk_ImageCreateProc) (Tcl_Interp *interp, char *name, int argc,
-	char **argv, Tk_ImageType *typePtr, Tk_ImageModel model,
-	ClientData *masterDataPtr);
+	char **argv, Tk_ImageType *typePtr, Tk_ImageMaster model,
+	ClientData *clientDataPtr);
 #else
 typedef int (Tk_ImageCreateProc) (Tcl_Interp *interp, CONST86 char *name, int objc,
-	Tcl_Obj *const objv[], CONST86 Tk_ImageType *typePtr, Tk_ImageModel model,
-	ClientData *modelDataPtr);
+	Tcl_Obj *const objv[], CONST86 Tk_ImageType *typePtr, Tk_ImageMaster model,
+	ClientData *clientDataPtr);
 #endif /* USE_OLD_IMAGE */
-typedef ClientData (Tk_ImageGetProc) (Tk_Window tkwin, ClientData masterData);
-typedef void (Tk_ImageDisplayProc) (ClientData instanceData, Display *display,
+typedef ClientData (Tk_ImageGetProc) (Tk_Window tkwin, ClientData clientData);
+typedef void (Tk_ImageDisplayProc) (ClientData clientData, Display *display,
 	Drawable drawable, int imageX, int imageY, int width, int height,
 	int drawableX, int drawableY);
-typedef void (Tk_ImageFreeProc) (ClientData instanceData, Display *display);
-typedef void (Tk_ImageDeleteProc) (ClientData masterData);
+typedef void (Tk_ImageFreeProc) (ClientData clientData, Display *display);
+typedef void (Tk_ImageDeleteProc) (ClientData clientData);
 typedef void (Tk_ImageChangedProc) (ClientData clientData, int x, int y,
 	int width, int height, int imageWidth, int imageHeight);
 typedef int (Tk_ImagePostscriptProc) (ClientData clientData,
diff --git a/generic/tkConfig.c b/generic/tkConfig.c
index 44af1ea..a752674 100644
--- a/generic/tkConfig.c
+++ b/generic/tkConfig.c
@@ -67,7 +67,7 @@ typedef struct TkOption {
 				 * monochrome displays. */
 	struct TkOption *synonymPtr;
 				/* For synonym options, this points to the
-				 * master entry. */
+				 * original entry. */
 	const struct Tk_ObjCustomOption *custom;
 				/* For TK_OPTION_CUSTOM. */
     } extra;
@@ -237,8 +237,8 @@ Tk_CreateOptionTable(
 
 	if (specPtr->type == TK_OPTION_SYNONYM) {
 	    /*
-	     * This is a synonym option; find the master option that it refers
-	     * to and create a pointer from the synonym to the master.
+	     * This is a synonym option; find the original option that it refers
+	     * to and create a pointer from the synonym to the origin.
 	     */
 
 	    for (specPtr2 = templatePtr, i = 0; ; specPtr2++, i++) {
diff --git a/generic/tkDecls.h b/generic/tkDecls.h
index c96039d..b02f286 100644
--- a/generic/tkDecls.h
+++ b/generic/tkDecls.h
@@ -402,7 +402,7 @@ EXTERN void		Tk_HandleEvent(XEvent *eventPtr);
 /* 116 */
 EXTERN Tk_Window	Tk_IdToWindow(Display *display, Window window);
 /* 117 */
-EXTERN void		Tk_ImageChanged(Tk_ImageModel master, int x, int y,
+EXTERN void		Tk_ImageChanged(Tk_ImageMaster master, int x, int y,
 				int width, int height, int imageWidth,
 				int imageHeight);
 /* 118 */
@@ -453,7 +453,7 @@ EXTERN CONST84_RETURN char * Tk_NameOfCursor(Display *display,
 /* 136 */
 EXTERN CONST84_RETURN char * Tk_NameOfFont(Tk_Font font);
 /* 137 */
-EXTERN CONST84_RETURN char * Tk_NameOfImage(Tk_ImageModel imageMaster);
+EXTERN CONST84_RETURN char * Tk_NameOfImage(Tk_ImageMaster imageMaster);
 /* 138 */
 EXTERN CONST84_RETURN char * Tk_NameOfJoinStyle(int join);
 /* 139 */
@@ -993,7 +993,7 @@ typedef struct TkStubs {
     int (*tk_Grab) (Tcl_Interp *interp, Tk_Window tkwin, int grabGlobal); /* 114 */
     void (*tk_HandleEvent) (XEvent *eventPtr); /* 115 */
     Tk_Window (*tk_IdToWindow) (Display *display, Window window); /* 116 */
-    void (*tk_ImageChanged) (Tk_ImageModel master, int x, int y, int width, int height, int imageWidth, int imageHeight); /* 117 */
+    void (*tk_ImageChanged) (Tk_ImageMaster master, int x, int y, int width, int height, int imageWidth, int imageHeight); /* 117 */
     int (*tk_Init) (Tcl_Interp *interp); /* 118 */
     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 */
@@ -1013,7 +1013,7 @@ typedef struct TkStubs {
     CONST84_RETURN char * (*tk_NameOfColor) (XColor *colorPtr); /* 134 */
     CONST84_RETURN char * (*tk_NameOfCursor) (Display *display, Tk_Cursor cursor); /* 135 */
     CONST84_RETURN char * (*tk_NameOfFont) (Tk_Font font); /* 136 */
-    CONST84_RETURN char * (*tk_NameOfImage) (Tk_ImageModel imageMaster); /* 137 */
+    CONST84_RETURN char * (*tk_NameOfImage) (Tk_ImageMaster imageMaster); /* 137 */
     CONST84_RETURN char * (*tk_NameOfJoinStyle) (int join); /* 138 */
     CONST84_RETURN char * (*tk_NameOfJustify) (Tk_Justify justify); /* 139 */
     CONST84_RETURN char * (*tk_NameOfRelief) (int relief); /* 140 */
diff --git a/generic/tkGrid.c b/generic/tkGrid.c
index 9f08b02..75ce1a9 100644
--- a/generic/tkGrid.c
+++ b/generic/tkGrid.c
@@ -80,7 +80,7 @@ typedef struct SlotInfo {
 				 * inproportion to their weights. */
     int pad;			/* Extra padding, in pixels, required for this
 				 * slot. This amount is "added" to the largest
-				 * slave in the slot. */
+				 * content in the slot. */
     Tk_Uid uniform;		/* Value of -uniform option. It is used to
 				 * group slots that should have the same
 				 * size. */
@@ -99,13 +99,13 @@ typedef struct SlotInfo {
  */
 
 typedef struct GridLayout {
-    struct Gridder *binNextPtr;	/* The next slave window in this bin. Each bin
-    				 * contains a list of all slaves whose spans
+    struct Gridder *binNextPtr;	/* The next content window in this bin. Each bin
+    				 * contains a list of all content whose spans
     				 * are >1 and whose right edges fall in this
     				 * slot. */
     int minSize;		/* Minimum size needed for this slot, in
     				 * pixels. This is the space required to hold
-    				 * any slaves contained entirely in this slot,
+    				 * any content contained entirely in this slot,
     				 * adjusted for any slot constrants, such as
     				 * size or padding. */
     int pad;			/* Padding needed for this slot */
@@ -130,11 +130,11 @@ typedef struct GridLayout {
 typedef struct {
     SlotInfo *columnPtr;	/* Pointer to array of column constraints. */
     SlotInfo *rowPtr;		/* Pointer to array of row constraints. */
-    int columnEnd;		/* The last column occupied by any slave. */
+    int columnEnd;		/* The last column occupied by any content. */
     int columnMax;		/* The number of columns with constraints. */
     int columnSpace;		/* The number of slots currently allocated for
     				 * column constraints. */
-    int rowEnd;			/* The last row occupied by any slave. */
+    int rowEnd;			/* The last row occupied by any content. */
     int rowMax;			/* The number of rows with constraints. */
     int rowSpace;		/* The number of slots currently allocated for
     				 * row constraints. */
@@ -144,11 +144,11 @@ typedef struct {
     				 * container. */
     Tk_Anchor anchor;		/* Value of anchor option: specifies where a
 				 * grid without weight should be placed. */
-} GridMaster;
+} GridContainer;
 
 /*
  * For each window that the grid cares about (either because the window is
- * managed by the grid or because the window has slaves that are managed by
+ * managed by the grid or because the window has content that are managed by
  * the grid), there is a structure of the following type:
  */
 
@@ -157,18 +157,18 @@ typedef struct Gridder {
 				 * window has been deleted, but the gridder
 				 * hasn't had a chance to clean up yet because
 				 * the structure is still in use. */
-    struct Gridder *containerPtr;	/* Master window within which this window is
+    struct Gridder *containerPtr;	/* Container window within which this window is
 				 * managed (NULL means this window isn't
 				 * managed by the gridder). */
     struct Gridder *nextPtr;	/* Next window managed within same container.
 				 * List order doesn't matter. */
-    struct Gridder *slavePtr;	/* First in list of slaves managed inside this
-				 * window (NULL means no grid slaves). */
-    GridMaster *containerDataPtr;	/* Additional data for geometry container. */
+    struct Gridder *contentPtr;	/* First in list of content managed inside this
+				 * window (NULL means no grid content). */
+    GridContainer *containerDataPtr;	/* Additional data for geometry container. */
     Tcl_Obj *in;                /* Store container name when removed. */
     int column, row;		/* Location in the grid (starting from
 				 * zero). */
-    int numCols, numRows;	/* Number of columns or rows this slave spans.
+    int numCols, numRows;	/* Number of columns or rows this content spans.
 				 * Should be at least 1. */
     int padX, padY;		/* Total additional pixels to leave around the
 				 * window. Some is of this space is on each
@@ -190,7 +190,7 @@ typedef struct Gridder {
 				 * nested call to ArrangeGrid already working
 				 * on this window. *abortPtr may be set to 1
 				 * to abort that nested call. This happens,
-				 * for example, if tkwin or any of its slaves
+				 * for example, if tkwin or any of its content
 				 * is deleted. */
     int flags;			/* Miscellaneous flags; see below for
 				 * definitions. */
@@ -199,9 +199,9 @@ typedef struct Gridder {
      * These fields are used temporarily for layout calculations only.
      */
 
-    struct Gridder *binNextPtr;	/* Link to next span>1 slave in this bin. */
+    struct Gridder *binNextPtr;	/* Link to next span>1 content in this bin. */
     int size;			/* Nominal size (width or height) in pixels of
-    				 * the slave. This includes the padding. */
+    				 * the content. This includes the padding. */
 } Gridder;
 
 /*
@@ -235,12 +235,12 @@ typedef struct UniformGroup {
  * Flag values for Grid structures:
  *
  * REQUESTED_RELAYOUT		1 means a Tcl_DoWhenIdle request has already
- *				been made to re-arrange all the slaves of this
+ *				been made to re-arrange all the content of this
  *				window.
  * DONT_PROPAGATE		1 means don't set this window's requested
  *				size. 0 means if this window is a container then
  *				Tk will set its requested size to fit the
- *				needs of its slaves.
+ *				needs of its content.
  * ALLOCED_CONTAINER		1 means that Grid has allocated itself as
  *				geometry container for this window.
  */
@@ -253,7 +253,7 @@ typedef struct UniformGroup {
  * Prototypes for procedures used only in this file:
  */
 
-static void		AdjustForSticky(Gridder *slavePtr, int *xPtr,
+static void		AdjustForSticky(Gridder *contentPtr, int *xPtr,
 			    int *yPtr, int *widthPtr, int *heightPtr);
 static int		AdjustOffsets(int width, int elements,
 			    SlotInfo *slotPtr);
@@ -284,22 +284,22 @@ static int		GridRowColumnConfigureCommand(Tk_Window tkwin,
 			    Tcl_Obj *const objv[]);
 static int		GridSizeCommand(Tk_Window tkwin, Tcl_Interp *interp,
 			    int objc, Tcl_Obj *const objv[]);
-static int		GridSlavesCommand(Tk_Window tkwin, Tcl_Interp *interp,
+static int		GridContentCommand(Tk_Window tkwin, Tcl_Interp *interp,
 			    int objc, Tcl_Obj *const objv[]);
 static void		GridStructureProc(ClientData clientData,
 			    XEvent *eventPtr);
-static void		GridLostSlaveProc(ClientData clientData,
+static void		GridLostContentProc(ClientData clientData,
 			    Tk_Window tkwin);
 static void		GridReqProc(ClientData clientData, Tk_Window tkwin);
-static void		InitMasterData(Gridder *containerPtr);
+static void		InitContainerData(Gridder *containerPtr);
 static Tcl_Obj *	NewPairObj(int, int);
 static Tcl_Obj *	NewQuadObj(int, int, int, int);
 static int		ResolveConstraints(Gridder *gridPtr, int rowOrColumn,
 			    int maxOffset);
 static void		SetGridSize(Gridder *gridPtr);
-static int		SetSlaveColumn(Tcl_Interp *interp, Gridder *slavePtr,
+static int		SetContentColumn(Tcl_Interp *interp, Gridder *contentPtr,
 			    int column, int numCols);
-static int		SetSlaveRow(Tcl_Interp *interp, Gridder *slavePtr,
+static int		SetContentRow(Tcl_Interp *interp, Gridder *contentPtr,
 			    int row, int numRows);
 static Tcl_Obj *	StickyToObj(int flags);
 static int		StringToSticky(const char *string);
@@ -308,7 +308,7 @@ static void		Unlink(Gridder *gridPtr);
 static const Tk_GeomMgr gridMgrType = {
     "grid",			/* name */
     GridReqProc,		/* requestProc */
-    GridLostSlaveProc,		/* lostSlaveProc */
+    GridLostContentProc,		/* lostSlaveProc */
 };
 
 /*
@@ -335,7 +335,7 @@ Tk_GridObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tk_Window tkwin = clientData;
+    Tk_Window tkwin = (Tk_Window)clientData;
     static const char *const optionStrings[] = {
 	"anchor", "bbox", "columnconfigure", "configure",
 	"content", "forget", "info", "location", "propagate",
@@ -386,7 +386,7 @@ Tk_GridObjCmd(
 	return GridSizeCommand(tkwin, interp, objc, objv);
     case GRID_CONTENT:
     case GRID_SLAVES:
-	return GridSlavesCommand(tkwin, interp, objc, objv);
+	return GridContentCommand(tkwin, interp, objc, objv);
 
     /*
      * Sample argument combinations:
@@ -434,7 +434,7 @@ GridAnchorCommand(
 {
     Tk_Window container;
     Gridder *containerPtr;
-    GridMaster *gridPtr;
+    GridContainer *gridPtr;
     Tk_Anchor old;
 
     if (objc > 4) {
@@ -455,7 +455,7 @@ GridAnchorCommand(
 	return TCL_OK;
     }
 
-    InitMasterData(containerPtr);
+    InitContainerData(containerPtr);
     gridPtr = containerPtr->containerDataPtr;
     old = gridPtr->anchor;
     if (Tk_GetAnchorFromObj(interp, objv[3], &gridPtr->anchor) != TCL_OK) {
@@ -503,7 +503,7 @@ GridBboxCommand(
 {
     Tk_Window container;
     Gridder *containerPtr;		/* container grid record */
-    GridMaster *gridPtr;	/* pointer to grid data */
+    GridContainer *gridPtr;	/* pointer to grid data */
     int row, column;		/* origin for bounding box */
     int row2, column2;		/* end of bounding box */
     int endX, endY;		/* last column/row in the layout */
@@ -631,67 +631,67 @@ GridForgetRemoveCommand(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tk_Window slave;
-    Gridder *slavePtr;
+    Tk_Window content;
+    Gridder *contentPtr;
     int i;
     const char *string = Tcl_GetString(objv[1]);
     char c = string[0];
 
     for (i = 2; i < objc; i++) {
-	if (TkGetWindowFromObj(interp, tkwin, objv[i], &slave) != TCL_OK) {
+	if (TkGetWindowFromObj(interp, tkwin, objv[i], &content) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 
-	slavePtr = GetGrid(slave);
-	if (slavePtr->containerPtr != NULL) {
+	contentPtr = GetGrid(content);
+	if (contentPtr->containerPtr != NULL) {
 	    /*
 	     * For "forget", reset all the settings to their defaults
 	     */
 
 	    if (c == 'f') {
-		slavePtr->column = -1;
-		slavePtr->row = -1;
-		slavePtr->numCols = 1;
-		slavePtr->numRows = 1;
-		slavePtr->padX = 0;
-		slavePtr->padY = 0;
-		slavePtr->padLeft = 0;
-		slavePtr->padTop = 0;
-		slavePtr->iPadX = 0;
-		slavePtr->iPadY = 0;
-		if (slavePtr->in != NULL) {
-		    Tcl_DecrRefCount(slavePtr->in);
-		    slavePtr->in = NULL;
+		contentPtr->column = -1;
+		contentPtr->row = -1;
+		contentPtr->numCols = 1;
+		contentPtr->numRows = 1;
+		contentPtr->padX = 0;
+		contentPtr->padY = 0;
+		contentPtr->padLeft = 0;
+		contentPtr->padTop = 0;
+		contentPtr->iPadX = 0;
+		contentPtr->iPadY = 0;
+		if (contentPtr->in != NULL) {
+		    Tcl_DecrRefCount(contentPtr->in);
+		    contentPtr->in = NULL;
 		}
-		slavePtr->doubleBw = 2*Tk_Changes(tkwin)->border_width;
-		if (slavePtr->flags & REQUESTED_RELAYOUT) {
-		    Tcl_CancelIdleCall(ArrangeGrid, slavePtr);
+		contentPtr->doubleBw = 2*Tk_Changes(tkwin)->border_width;
+		if (contentPtr->flags & REQUESTED_RELAYOUT) {
+		    Tcl_CancelIdleCall(ArrangeGrid, contentPtr);
 		}
-		slavePtr->flags = 0;
-		slavePtr->sticky = 0;
+		contentPtr->flags = 0;
+		contentPtr->sticky = 0;
 	    } else {
 		/*
 		 * When removing, store name of container to be able to
 		 * restore it later, even if the container is recreated.
 		 */
 
-		if (slavePtr->in != NULL) {
-		    Tcl_DecrRefCount(slavePtr->in);
-		    slavePtr->in = NULL;
+		if (contentPtr->in != NULL) {
+		    Tcl_DecrRefCount(contentPtr->in);
+		    contentPtr->in = NULL;
 		}
-		if (slavePtr->containerPtr != NULL) {
-		    slavePtr->in = Tcl_NewStringObj(
-			    Tk_PathName(slavePtr->containerPtr->tkwin), -1);
-		    Tcl_IncrRefCount(slavePtr->in);
+		if (contentPtr->containerPtr != NULL) {
+		    contentPtr->in = Tcl_NewStringObj(
+			    Tk_PathName(contentPtr->containerPtr->tkwin), -1);
+		    Tcl_IncrRefCount(contentPtr->in);
 		}
 	    }
-	    Tk_ManageGeometry(slave, NULL, NULL);
-	    if (slavePtr->containerPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
-		Tk_UnmaintainGeometry(slavePtr->tkwin,
-			slavePtr->containerPtr->tkwin);
+	    Tk_ManageGeometry(content, NULL, NULL);
+	    if (contentPtr->containerPtr->tkwin != Tk_Parent(contentPtr->tkwin)) {
+		Tk_UnmaintainGeometry(contentPtr->tkwin,
+			contentPtr->containerPtr->tkwin);
 	    }
-	    Unlink(slavePtr);
-	    Tk_UnmapWindow(slavePtr->tkwin);
+	    Unlink(contentPtr);
+	    Tk_UnmapWindow(contentPtr->tkwin);
 	}
     }
     return TCL_OK;
@@ -721,40 +721,40 @@ GridInfoCommand(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Gridder *slavePtr;
-    Tk_Window slave;
+    Gridder *contentPtr;
+    Tk_Window content;
     Tcl_Obj *infoObj;
 
     if (objc != 3) {
 	Tcl_WrongNumArgs(interp, 2, objv, "window");
 	return TCL_ERROR;
     }
-    if (TkGetWindowFromObj(interp, tkwin, objv[2], &slave) != TCL_OK) {
+    if (TkGetWindowFromObj(interp, tkwin, objv[2], &content) != TCL_OK) {
 	return TCL_ERROR;
     }
-    slavePtr = GetGrid(slave);
-    if (slavePtr->containerPtr == NULL) {
+    contentPtr = GetGrid(content);
+    if (contentPtr->containerPtr == NULL) {
 	Tcl_ResetResult(interp);
 	return TCL_OK;
     }
 
     infoObj = Tcl_NewObj();
     Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-in", -1),
-	    TkNewWindowObj(slavePtr->containerPtr->tkwin));
+	    TkNewWindowObj(contentPtr->containerPtr->tkwin));
     Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-column", -1),
-	    Tcl_NewIntObj(slavePtr->column));
+	    Tcl_NewIntObj(contentPtr->column));
     Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-row", -1),
-	    Tcl_NewIntObj(slavePtr->row));
+	    Tcl_NewIntObj(contentPtr->row));
     Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-columnspan", -1),
-	    Tcl_NewIntObj(slavePtr->numCols));
+	    Tcl_NewIntObj(contentPtr->numCols));
     Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-rowspan", -1),
-	    Tcl_NewIntObj(slavePtr->numRows));
-    TkAppendPadAmount(infoObj, "-ipadx", slavePtr->iPadX/2, slavePtr->iPadX);
-    TkAppendPadAmount(infoObj, "-ipady", slavePtr->iPadY/2, slavePtr->iPadY);
-    TkAppendPadAmount(infoObj, "-padx", slavePtr->padLeft, slavePtr->padX);
-    TkAppendPadAmount(infoObj, "-pady", slavePtr->padTop, slavePtr->padY);
+	    Tcl_NewIntObj(contentPtr->numRows));
+    TkAppendPadAmount(infoObj, "-ipadx", contentPtr->iPadX/2, contentPtr->iPadX);
+    TkAppendPadAmount(infoObj, "-ipady", contentPtr->iPadY/2, contentPtr->iPadY);
+    TkAppendPadAmount(infoObj, "-padx", contentPtr->padLeft, contentPtr->padX);
+    TkAppendPadAmount(infoObj, "-pady", contentPtr->padTop, contentPtr->padY);
     Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-sticky", -1),
-	    StickyToObj(slavePtr->sticky));
+	    StickyToObj(contentPtr->sticky));
     Tcl_SetObjResult(interp, infoObj);
     return TCL_OK;
 }
@@ -784,8 +784,8 @@ GridLocationCommand(
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     Tk_Window container;
-    Gridder *containerPtr;		/* Master grid record. */
-    GridMaster *gridPtr;	/* Pointer to grid data. */
+    Gridder *containerPtr;		/* Container grid record. */
+    GridContainer *gridPtr;	/* Pointer to grid data. */
     SlotInfo *slotPtr;
     int x, y;			/* Offset in pixels, from edge of container. */
     int i, j;			/* Corresponding column and row indeces. */
@@ -906,10 +906,10 @@ GridPropagateCommand(
     if (propagate != old) {
 	if (propagate) {
 	    /*
-	     * If we have slaves, we need to register as geometry container.
+	     * If we have content, we need to register as geometry container.
 	     */
 
-	    if (containerPtr->slavePtr != NULL) {
+	    if (containerPtr->contentPtr != NULL) {
 		if (TkSetGeometryContainer(interp, container, "grid")	!= TCL_OK) {
 		    return TCL_ERROR;
 		}
@@ -964,8 +964,8 @@ GridRowColumnConfigureCommand(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tk_Window container, slave;
-    Gridder *containerPtr, *slavePtr;
+    Tk_Window container, content;
+    Gridder *containerPtr, *contentPtr;
     SlotInfo *slotPtr = NULL;
     int slot;			/* the column or row number */
     int slotType;		/* COLUMN or ROW */
@@ -1011,8 +1011,8 @@ GridRowColumnConfigureCommand(
     }
 
     containerPtr = GetGrid(container);
-    first = 0; /* lint */
-    last = 0; /* lint */
+    first = 0;
+    last = 0;
 
     if ((objc == 4) || (objc == 5)) {
 	if (lObjc != 1) {
@@ -1102,32 +1102,32 @@ GridRowColumnConfigureCommand(
     }
 
     for (j = 0; j < lObjc; j++) {
-	int allSlaves = 0;
+	int allContent = 0;
 
 	if (Tcl_GetIntFromObj(NULL, lObjv[j], &slot) == TCL_OK) {
 	    first = slot;
 	    last = slot;
-	    slavePtr = NULL;
+	    contentPtr = NULL;
 	} else if (strcmp(Tcl_GetString(lObjv[j]), "all") == 0) {
 	    /*
 	     * Make sure container is initialised.
 	     */
 
-	    InitMasterData(containerPtr);
+	    InitContainerData(containerPtr);
 
-	    slavePtr = containerPtr->slavePtr;
-	    if (slavePtr == NULL) {
+	    contentPtr = containerPtr->contentPtr;
+	    if (contentPtr == NULL) {
 		continue;
 	    }
-	    allSlaves = 1;
-	} else if (TkGetWindowFromObj(NULL, tkwin, lObjv[j], &slave)
+	    allContent = 1;
+	} else if (TkGetWindowFromObj(NULL, tkwin, lObjv[j], &content)
 		== TCL_OK) {
 	    /*
 	     * Is it gridded in this container?
 	     */
 
-	    slavePtr = GetGrid(slave);
-	    if (slavePtr->containerPtr != containerPtr) {
+	    contentPtr = GetGrid(content);
+	    if (contentPtr->containerPtr != containerPtr) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 			"the window \"%s\" is not managed by \"%s\"",
 			Tcl_GetString(lObjv[j]), Tcl_GetString(objv[2])));
@@ -1148,11 +1148,11 @@ GridRowColumnConfigureCommand(
 	 */
 
 	do {
-	    if (slavePtr != NULL) {
+	    if (contentPtr != NULL) {
 		first = (slotType == COLUMN) ?
-			slavePtr->column : slavePtr->row;
+			contentPtr->column : contentPtr->row;
 		last = first - 1 + ((slotType == COLUMN) ?
-			slavePtr->numCols : slavePtr->numRows);
+			contentPtr->numCols : contentPtr->numRows);
 	    }
 
 	    for (slot = first; slot <= last; slot++) {
@@ -1222,10 +1222,10 @@ GridRowColumnConfigureCommand(
 		    }
 		}
 	    }
-	    if (slavePtr != NULL) {
-		slavePtr = slavePtr->nextPtr;
+	    if (contentPtr != NULL) {
+		contentPtr = contentPtr->nextPtr;
 	    }
-	} while ((allSlaves == 1) && (slavePtr != NULL));
+	} while ((allContent == 1) && (contentPtr != NULL));
     }
     Tcl_DecrRefCount(listCopy);
 
@@ -1299,7 +1299,7 @@ GridSizeCommand(
 {
     Tk_Window container;
     Gridder *containerPtr;
-    GridMaster *gridPtr;	/* pointer to grid data */
+    GridContainer *gridPtr;	/* pointer to grid data */
 
     if (objc != 3) {
 	Tcl_WrongNumArgs(interp, 2, objv, "window");
@@ -1326,23 +1326,23 @@ GridSizeCommand(
 /*
  *----------------------------------------------------------------------
  *
- * GridSlavesCommand --
+ * GridContentCommand --
  *
- *	Implementation of the [grid slaves] subcommand. See the user
+ *	Implementation of the [grid content] subcommand. See the user
  *	documentation for details on what it does.
  *
  * Results:
  *	Standard Tcl result.
  *
  * Side effects:
- *	Places a list of slaves of the specified window in the interpreter's
- *	result field.
+ *	Places a list of content windows of the specified window in the
+ *	interpreter's result field.
  *
  *----------------------------------------------------------------------
  */
 
 static int
-GridSlavesCommand(
+GridContentCommand(
     Tk_Window tkwin,		/* Main window of the application. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
@@ -1350,13 +1350,13 @@ GridSlavesCommand(
 {
     Tk_Window container;
     Gridder *containerPtr;		/* container grid record */
-    Gridder *slavePtr;
+    Gridder *contentPtr;
     int i, value, index;
     int row = -1, column = -1;
     static const char *const optionStrings[] = {
 	"-column", "-row", NULL
     };
-    enum options { SLAVES_COLUMN, SLAVES_ROW };
+    enum options { CONTENT_COLUMN, CONTENT_ROW };
     Tcl_Obj *res;
 
     if ((objc < 3) || ((objc % 2) == 0)) {
@@ -1378,7 +1378,7 @@ GridSlavesCommand(
 	    Tcl_SetErrorCode(interp, "TK", "GRID", "NEG_INDEX", NULL);
 	    return TCL_ERROR;
 	}
-	if (index == SLAVES_COLUMN) {
+	if (index == CONTENT_COLUMN) {
 	    column = value;
 	} else {
 	    row = value;
@@ -1391,17 +1391,17 @@ GridSlavesCommand(
     containerPtr = GetGrid(container);
 
     res = Tcl_NewListObj(0, NULL);
-    for (slavePtr = containerPtr->slavePtr; slavePtr != NULL;
-	    slavePtr = slavePtr->nextPtr) {
-	if ((column >= 0) && (slavePtr->column > column
-		|| slavePtr->column+slavePtr->numCols-1 < column)) {
+    for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
+	    contentPtr = contentPtr->nextPtr) {
+	if ((column >= 0) && (contentPtr->column > column
+		|| contentPtr->column+contentPtr->numCols-1 < column)) {
 	    continue;
 	}
-	if ((row >= 0) && (slavePtr->row > row ||
-		slavePtr->row+slavePtr->numRows-1 < row)) {
+	if ((row >= 0) && (contentPtr->row > row ||
+		contentPtr->row+contentPtr->numRows-1 < row)) {
 	    continue;
 	}
-	Tcl_ListObjAppendElement(interp,res, TkNewWindowObj(slavePtr->tkwin));
+	Tcl_ListObjAppendElement(interp,res, TkNewWindowObj(contentPtr->tkwin));
     }
     Tcl_SetObjResult(interp, res);
     return TCL_OK;
@@ -1429,10 +1429,10 @@ static void
 GridReqProc(
     ClientData clientData,	/* Grid's information about window that got
 				 * new preferred geometry. */
-    Tk_Window tkwin)		/* Other Tk-related information about the
+    TCL_UNUSED(Tk_Window))		/* Other Tk-related information about the
 				 * window. */
 {
-    Gridder *gridPtr = clientData;
+    Gridder *gridPtr = (Gridder *)clientData;
 
     gridPtr = gridPtr->containerPtr;
     if (gridPtr && !(gridPtr->flags & REQUESTED_RELAYOUT)) {
@@ -1444,33 +1444,33 @@ GridReqProc(
 /*
  *----------------------------------------------------------------------
  *
- * GridLostSlaveProc --
+ * GridLostContentProc --
  *
  *	This procedure is invoked by Tk whenever some other geometry claims
- *	control over a slave that used to be managed by us.
+ *	control over a content that used to be managed by us.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	Forgets all grid-related information about the slave.
+ *	Forgets all grid-related information about the content.
  *
  *----------------------------------------------------------------------
  */
 
 static void
-GridLostSlaveProc(
-    ClientData clientData,	/* Grid structure for slave window that was
+GridLostContentProc(
+    ClientData clientData,	/* Grid structure for content window that was
 				 * stolen away. */
-    Tk_Window tkwin)		/* Tk's handle for the slave window. */
+    TCL_UNUSED(Tk_Window))		/* Tk's handle for the content window. */
 {
-    Gridder *slavePtr = clientData;
+    Gridder *contentPtr = (Gridder *)clientData;
 
-    if (slavePtr->containerPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
-	Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->containerPtr->tkwin);
+    if (contentPtr->containerPtr->tkwin != Tk_Parent(contentPtr->tkwin)) {
+	Tk_UnmaintainGeometry(contentPtr->tkwin, contentPtr->containerPtr->tkwin);
     }
-    Unlink(slavePtr);
-    Tk_UnmapWindow(slavePtr->tkwin);
+    Unlink(contentPtr);
+    Tk_UnmapWindow(contentPtr->tkwin);
 }
 
 /*
@@ -1644,12 +1644,12 @@ AdjustOffsets(
  *
  * AdjustForSticky --
  *
- *	This procedure adjusts the size of a slave in its cavity based on its
+ *	This procedure adjusts the size of a content in its cavity based on its
  *	"sticky" flags.
  *
  * Results:
  *	The input x, y, width, and height are changed to represent the desired
- *	coordinates of the slave.
+ *	coordinates of the content.
  *
  * Side effects:
  *	None.
@@ -1659,29 +1659,29 @@ AdjustOffsets(
 
 static void
 AdjustForSticky(
-    Gridder *slavePtr,	/* Slave window to arrange in its cavity. */
+    Gridder *contentPtr,	/* Content window to arrange in its cavity. */
     int *xPtr,		/* Pixel location of the left edge of the cavity. */
     int *yPtr,		/* Pixel location of the top edge of the cavity. */
     int *widthPtr,	/* Width of the cavity (in pixels). */
     int *heightPtr)	/* Height of the cavity (in pixels). */
 {
-    int diffx = 0;	/* Cavity width - slave width. */
-    int diffy = 0;	/* Cavity hight - slave height. */
-    int sticky = slavePtr->sticky;
+    int diffx = 0;	/* Cavity width - content width. */
+    int diffy = 0;	/* Cavity hight - content height. */
+    int sticky = contentPtr->sticky;
 
-    *xPtr += slavePtr->padLeft;
-    *widthPtr -= slavePtr->padX;
-    *yPtr += slavePtr->padTop;
-    *heightPtr -= slavePtr->padY;
+    *xPtr += contentPtr->padLeft;
+    *widthPtr -= contentPtr->padX;
+    *yPtr += contentPtr->padTop;
+    *heightPtr -= contentPtr->padY;
 
-    if (*widthPtr > (Tk_ReqWidth(slavePtr->tkwin) + slavePtr->iPadX)) {
-	diffx = *widthPtr - (Tk_ReqWidth(slavePtr->tkwin) + slavePtr->iPadX);
-	*widthPtr = Tk_ReqWidth(slavePtr->tkwin) + slavePtr->iPadX;
+    if (*widthPtr > (Tk_ReqWidth(contentPtr->tkwin) + contentPtr->iPadX)) {
+	diffx = *widthPtr - (Tk_ReqWidth(contentPtr->tkwin) + contentPtr->iPadX);
+	*widthPtr = Tk_ReqWidth(contentPtr->tkwin) + contentPtr->iPadX;
     }
 
-    if (*heightPtr > (Tk_ReqHeight(slavePtr->tkwin) + slavePtr->iPadY)) {
-	diffy = *heightPtr - (Tk_ReqHeight(slavePtr->tkwin) + slavePtr->iPadY);
-	*heightPtr = Tk_ReqHeight(slavePtr->tkwin) + slavePtr->iPadY;
+    if (*heightPtr > (Tk_ReqHeight(contentPtr->tkwin) + contentPtr->iPadY)) {
+	diffy = *heightPtr - (Tk_ReqHeight(contentPtr->tkwin) + contentPtr->iPadY);
+	*heightPtr = Tk_ReqHeight(contentPtr->tkwin) + contentPtr->iPadY;
     }
 
     if (sticky&STICK_EAST && sticky&STICK_WEST) {
@@ -1712,19 +1712,19 @@ AdjustForSticky(
  *	None.
  *
  * Side effects:
- *	The slaves of containerPtr may get resized or moved.
+ *	The content of containerPtr may get resized or moved.
  *
  *----------------------------------------------------------------------
  */
 
 static void
 ArrangeGrid(
-    ClientData clientData)	/* Structure describing container whose slaves
+    ClientData clientData)	/* Structure describing container whose content
 				 * are to be re-layed out. */
 {
-    Gridder *containerPtr = clientData;
-    Gridder *slavePtr;
-    GridMaster *slotPtr = containerPtr->containerDataPtr;
+    Gridder *containerPtr = (Gridder *)clientData;
+    Gridder *contentPtr;
+    GridContainer *slotPtr = containerPtr->containerDataPtr;
     int abort;
     int width, height;		/* Requested size of layout, in pixels. */
     int realWidth, realHeight;	/* Actual size layout should take-up. */
@@ -1733,13 +1733,13 @@ ArrangeGrid(
     containerPtr->flags &= ~REQUESTED_RELAYOUT;
 
     /*
-     * If the container has no slaves anymore, then don't do anything at all:
+     * If the container has no content anymore, then don't do anything at all:
      * just leave the container's size as-is. Otherwise there is no way to
      * "relinquish" control over the container so another geometry manager can
      * take over.
      */
 
-    if (containerPtr->slavePtr == NULL) {
+    if (containerPtr->contentPtr == NULL) {
 	return;
     }
 
@@ -1813,62 +1813,62 @@ ArrangeGrid(
 	    0, 0, usedX, usedY, &slotPtr->startX, &slotPtr->startY);
 
     /*
-     * Now adjust the actual size of the slave to its cavity by computing the
+     * Now adjust the actual size of the content to its cavity by computing the
      * cavity size, and adjusting the widget according to its stickyness.
      */
 
-    for (slavePtr = containerPtr->slavePtr; slavePtr != NULL && !abort;
-	    slavePtr = slavePtr->nextPtr) {
+    for (contentPtr = containerPtr->contentPtr; contentPtr != NULL && !abort;
+	    contentPtr = contentPtr->nextPtr) {
 	int x, y;			/* Top left coordinate */
-	int width, height;		/* Slot or slave size */
-	int col = slavePtr->column;
-	int row = slavePtr->row;
+	int width, height;		/* Slot or content size */
+	int col = contentPtr->column;
+	int row = contentPtr->row;
 
 	x = (col>0) ? slotPtr->columnPtr[col-1].offset : 0;
 	y = (row>0) ? slotPtr->rowPtr[row-1].offset : 0;
 
-	width = slotPtr->columnPtr[slavePtr->numCols+col-1].offset - x;
-	height = slotPtr->rowPtr[slavePtr->numRows+row-1].offset - y;
+	width = slotPtr->columnPtr[contentPtr->numCols+col-1].offset - x;
+	height = slotPtr->rowPtr[contentPtr->numRows+row-1].offset - y;
 
 	x += slotPtr->startX;
 	y += slotPtr->startY;
 
-	AdjustForSticky(slavePtr, &x, &y, &width, &height);
+	AdjustForSticky(contentPtr, &x, &y, &width, &height);
 
 	/*
 	 * Now put the window in the proper spot. (This was taken directly
-	 * from tkPack.c.) If the slave is a child of the container, then do this
+	 * from tkPack.c.) If the content is a child of the container, then do this
 	 * here. Otherwise let Tk_MaintainGeometry do the work.
 	 */
 
-	if (containerPtr->tkwin == Tk_Parent(slavePtr->tkwin)) {
+	if (containerPtr->tkwin == Tk_Parent(contentPtr->tkwin)) {
 	    if ((width <= 0) || (height <= 0)) {
-		Tk_UnmapWindow(slavePtr->tkwin);
+		Tk_UnmapWindow(contentPtr->tkwin);
 	    } else {
-		if ((x != Tk_X(slavePtr->tkwin))
-			|| (y != Tk_Y(slavePtr->tkwin))
-			|| (width != Tk_Width(slavePtr->tkwin))
-			|| (height != Tk_Height(slavePtr->tkwin))) {
-		    Tk_MoveResizeWindow(slavePtr->tkwin, x, y, width, height);
+		if ((x != Tk_X(contentPtr->tkwin))
+			|| (y != Tk_Y(contentPtr->tkwin))
+			|| (width != Tk_Width(contentPtr->tkwin))
+			|| (height != Tk_Height(contentPtr->tkwin))) {
+		    Tk_MoveResizeWindow(contentPtr->tkwin, x, y, width, height);
 		}
 		if (abort) {
 		    break;
 		}
 
 		/*
-		 * Don't map the slave if the container isn't mapped: wait until
+		 * Don't map the content if the container isn't mapped: wait until
 		 * the container gets mapped later.
 		 */
 
 		if (Tk_IsMapped(containerPtr->tkwin)) {
-		    Tk_MapWindow(slavePtr->tkwin);
+		    Tk_MapWindow(contentPtr->tkwin);
 		}
 	    }
 	} else if ((width <= 0) || (height <= 0)) {
-	    Tk_UnmaintainGeometry(slavePtr->tkwin, containerPtr->tkwin);
-	    Tk_UnmapWindow(slavePtr->tkwin);
+	    Tk_UnmaintainGeometry(contentPtr->tkwin, containerPtr->tkwin);
+	    Tk_UnmapWindow(contentPtr->tkwin);
 	} else {
-	    Tk_MaintainGeometry(slavePtr->tkwin, containerPtr->tkwin, x, y,
+	    Tk_MaintainGeometry(contentPtr->tkwin, containerPtr->tkwin, x, y,
 		    width, height);
 	}
     }
@@ -1905,7 +1905,7 @@ ResolveConstraints(
 				 * pixels, or 0 (not currently used). */
 {
     SlotInfo *slotPtr;	/* Pointer to row/col constraints. */
-    Gridder *slavePtr;	/* List of slave windows in this grid. */
+    Gridder *contentPtr;	/* List of content windows in this grid. */
     int constraintCount;	/* Count of rows or columns that have
 				 * constraints. */
     int slotCount;		/* Last occupied row or column. */
@@ -1914,7 +1914,7 @@ ResolveConstraints(
     GridLayout *layoutPtr;	/* Temporary layout structure. */
     int requiredSize;		/* The natural size of the grid (pixels).
 				 * This is the minimum size needed to
-				 * accommodate all of the slaves at their
+				 * accommodate all of the content at their
 				 * requested sizes. */
     int offset;			/* The pixel offset of the right edge of the
 				 * current slot from the beginning of the
@@ -1957,7 +1957,7 @@ ResolveConstraints(
 
     gridCount = MAX(constraintCount, slotCount);
     if (gridCount >= TYPICAL_SIZE) {
-	layoutPtr = ckalloc(sizeof(GridLayout) * (1+gridCount));
+	layoutPtr = (GridLayout *)ckalloc(sizeof(GridLayout) * (1+gridCount));
     } else {
 	layoutPtr = layoutData;
     }
@@ -1998,29 +1998,29 @@ ResolveConstraints(
 
     /*
      * Step 2.
-     * Slaves with a span of 1 are used to determine the minimum size of each
-     * slot. Slaves whose span is two or more slots don't contribute to the
+     * Content with a span of 1 are used to determine the minimum size of each
+     * slot. Content whose span is two or more slots don't contribute to the
      * minimum size of each slot directly, but can cause slots to grow if
      * their size exceeds the the sizes of the slots they span.
      *
-     * Bin all slaves whose spans are > 1 by their right edges. This allows
+     * Bin all content whose spans are > 1 by their right edges. This allows
      * the computation on minimum and maximum possible layout sizes at each
-     * slot boundary, without the need to re-sort the slaves.
+     * slot boundary, without the need to re-sort the content.
      */
 
     switch (slotType) {
     case COLUMN:
-	for (slavePtr = containerPtr->slavePtr; slavePtr != NULL;
-		slavePtr = slavePtr->nextPtr) {
-	    int rightEdge = slavePtr->column + slavePtr->numCols - 1;
-
-	    slavePtr->size = Tk_ReqWidth(slavePtr->tkwin) + slavePtr->padX
-		    + slavePtr->iPadX + slavePtr->doubleBw;
-	    if (slavePtr->numCols > 1) {
-		slavePtr->binNextPtr = layoutPtr[rightEdge].binNextPtr;
-		layoutPtr[rightEdge].binNextPtr = slavePtr;
+	for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
+		contentPtr = contentPtr->nextPtr) {
+	    int rightEdge = contentPtr->column + contentPtr->numCols - 1;
+
+	    contentPtr->size = Tk_ReqWidth(contentPtr->tkwin) + contentPtr->padX
+		    + contentPtr->iPadX + contentPtr->doubleBw;
+	    if (contentPtr->numCols > 1) {
+		contentPtr->binNextPtr = layoutPtr[rightEdge].binNextPtr;
+		layoutPtr[rightEdge].binNextPtr = contentPtr;
 	    } else if (rightEdge >= 0) {
-		int size = slavePtr->size + layoutPtr[rightEdge].pad;
+		int size = contentPtr->size + layoutPtr[rightEdge].pad;
 
 		if (size > layoutPtr[rightEdge].minSize) {
 		    layoutPtr[rightEdge].minSize = size;
@@ -2029,17 +2029,17 @@ ResolveConstraints(
 	}
 	break;
     case ROW:
-	for (slavePtr = containerPtr->slavePtr; slavePtr != NULL;
-		slavePtr = slavePtr->nextPtr) {
-	    int rightEdge = slavePtr->row + slavePtr->numRows - 1;
-
-	    slavePtr->size = Tk_ReqHeight(slavePtr->tkwin) + slavePtr->padY
-		    + slavePtr->iPadY + slavePtr->doubleBw;
-	    if (slavePtr->numRows > 1) {
-		slavePtr->binNextPtr = layoutPtr[rightEdge].binNextPtr;
-		layoutPtr[rightEdge].binNextPtr = slavePtr;
+	for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
+		contentPtr = contentPtr->nextPtr) {
+	    int rightEdge = contentPtr->row + contentPtr->numRows - 1;
+
+	    contentPtr->size = Tk_ReqHeight(contentPtr->tkwin) + contentPtr->padY
+		    + contentPtr->iPadY + contentPtr->doubleBw;
+	    if (contentPtr->numRows > 1) {
+		contentPtr->binNextPtr = layoutPtr[rightEdge].binNextPtr;
+		layoutPtr[rightEdge].binNextPtr = contentPtr;
 	    } else if (rightEdge >= 0) {
-		int size = slavePtr->size + layoutPtr[rightEdge].pad;
+		int size = contentPtr->size + layoutPtr[rightEdge].pad;
 
 		if (size > layoutPtr[rightEdge].minSize) {
 		    layoutPtr[rightEdge].minSize = size;
@@ -2079,7 +2079,7 @@ ResolveConstraints(
 			    * sizeof(UniformGroup);
 		    size_t newSize = (uniformGroupsAlloced + UNIFORM_PREALLOC)
 			    * sizeof(UniformGroup);
-		    UniformGroup *newUG = ckalloc(newSize);
+		    UniformGroup *newUG = (UniformGroup *)ckalloc(newSize);
 		    UniformGroup *oldUG = uniformGroupPtr;
 
 		    memcpy(newUG, oldUG, oldSize);
@@ -2130,16 +2130,16 @@ ResolveConstraints(
     /*
      * Step 3.
      * Determine the minimum slot offsets going from left to right that would
-     * fit all of the slaves. This determines the minimum
+     * fit all of the content. This determines the minimum
      */
 
     for (offset=0,slot=0; slot < gridCount; slot++) {
 	layoutPtr[slot].minOffset = layoutPtr[slot].minSize + offset;
-	for (slavePtr = layoutPtr[slot].binNextPtr; slavePtr != NULL;
-		slavePtr = slavePtr->binNextPtr) {
+	for (contentPtr = layoutPtr[slot].binNextPtr; contentPtr != NULL;
+		contentPtr = contentPtr->binNextPtr) {
 	    int span = (slotType == COLUMN) ?
-		    slavePtr->numCols : slavePtr->numRows;
-	    int required = slavePtr->size + layoutPtr[slot - span].minOffset;
+		    contentPtr->numCols : contentPtr->numRows;
+	    int required = contentPtr->size + layoutPtr[slot - span].minOffset;
 
 	    if (required > layoutPtr[slot].minOffset) {
 		layoutPtr[slot].minOffset = required;
@@ -2171,11 +2171,11 @@ ResolveConstraints(
 	layoutPtr[slot].maxOffset = offset;
     }
     for (slot=gridCount-1; slot > 0;) {
-	for (slavePtr = layoutPtr[slot].binNextPtr; slavePtr != NULL;
-		slavePtr = slavePtr->binNextPtr) {
+	for (contentPtr = layoutPtr[slot].binNextPtr; contentPtr != NULL;
+		contentPtr = contentPtr->binNextPtr) {
 	    int span = (slotType == COLUMN) ?
-		    slavePtr->numCols : slavePtr->numRows;
-	    int require = offset - slavePtr->size;
+		    contentPtr->numCols : contentPtr->numRows;
+	    int require = offset - contentPtr->size;
 	    int startSlot = slot - span;
 
 	    if (startSlot >=0 && require < layoutPtr[startSlot].maxOffset) {
@@ -2440,14 +2440,14 @@ GetGrid(
 
     hPtr = Tcl_CreateHashEntry(&dispPtr->gridHashTable, (char*) tkwin, &isNew);
     if (!isNew) {
-	return Tcl_GetHashValue(hPtr);
+	return (Gridder *)Tcl_GetHashValue(hPtr);
     }
-    gridPtr = ckalloc(sizeof(Gridder));
+    gridPtr = (Gridder *)ckalloc(sizeof(Gridder));
     gridPtr->tkwin = tkwin;
     gridPtr->containerPtr = NULL;
     gridPtr->containerDataPtr = NULL;
     gridPtr->nextPtr = NULL;
-    gridPtr->slavePtr = NULL;
+    gridPtr->contentPtr = NULL;
     gridPtr->binNextPtr = NULL;
 
     gridPtr->column = -1;
@@ -2479,7 +2479,7 @@ GetGrid(
  *
  * SetGridSize --
  *
- *	This internal procedure sets the size of the grid occupied by slaves.
+ *	This internal procedure sets the size of the grid occupied by content.
  *
  * Results:
  *	None
@@ -2496,13 +2496,13 @@ static void
 SetGridSize(
     Gridder *containerPtr)		/* The geometry container for this grid. */
 {
-    Gridder *slavePtr;	/* Current slave window. */
+    Gridder *contentPtr;	/* Current content window. */
     int maxX = 0, maxY = 0;
 
-    for (slavePtr = containerPtr->slavePtr; slavePtr != NULL;
-	    slavePtr = slavePtr->nextPtr) {
-	maxX = MAX(maxX, slavePtr->numCols + slavePtr->column);
-	maxY = MAX(maxY, slavePtr->numRows + slavePtr->row);
+    for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
+	    contentPtr = contentPtr->nextPtr) {
+	maxX = MAX(maxX, contentPtr->numCols + contentPtr->column);
+	maxY = MAX(maxY, contentPtr->numRows + contentPtr->row);
     }
     containerPtr->containerDataPtr->columnEnd = maxX;
     containerPtr->containerDataPtr->rowEnd = maxY;
@@ -2513,31 +2513,31 @@ SetGridSize(
 /*
  *----------------------------------------------------------------------
  *
- * SetSlaveColumn --
+ * SetContentColumn --
  *
- *	Update column data for a slave, checking that MAX_ELEMENT bound
+ *	Update column data for a content, checking that MAX_ELEMENT bound
  *      is not passed.
  *
  * Results:
  *	TCL_ERROR if out of bounds, TCL_OK otherwise
  *
  * Side effects:
- *	Slave fields are updated.
+ *	Content fields are updated.
  *
  *----------------------------------------------------------------------
  */
 
 static int
-SetSlaveColumn(
+SetContentColumn(
     Tcl_Interp *interp,		/* Interp for error message. */
-    Gridder *slavePtr,		/* Slave to be updated. */
+    Gridder *contentPtr,		/* Content to be updated. */
     int column,			/* New column or -1 to be unchanged. */
     int numCols)		/* New columnspan or -1 to be unchanged. */
 {
     int newColumn, newNumCols, lastCol;
 
-    newColumn = (column >= 0) ? column : slavePtr->column;
-    newNumCols = (numCols >= 1) ? numCols : slavePtr->numCols;
+    newColumn = (column >= 0) ? column : contentPtr->column;
+    newNumCols = (numCols >= 1) ? numCols : contentPtr->numCols;
 
     lastCol = ((newColumn >= 0) ? newColumn : 0) + newNumCols;
     if (lastCol >= MAX_ELEMENT) {
@@ -2546,39 +2546,39 @@ SetSlaveColumn(
 	return TCL_ERROR;
     }
 
-    slavePtr->column = newColumn;
-    slavePtr->numCols = newNumCols;
+    contentPtr->column = newColumn;
+    contentPtr->numCols = newNumCols;
     return TCL_OK;
 }
 
 /*
  *----------------------------------------------------------------------
  *
- * SetSlaveRow --
+ * SetContentRow --
  *
- *	Update row data for a slave, checking that MAX_ELEMENT bound
+ *	Update row data for a content, checking that MAX_ELEMENT bound
  *      is not passed.
  *
  * Results:
  *	TCL_ERROR if out of bounds, TCL_OK otherwise
  *
  * Side effects:
- *	Slave fields are updated.
+ *	Content fields are updated.
  *
  *----------------------------------------------------------------------
  */
 
 static int
-SetSlaveRow(
+SetContentRow(
     Tcl_Interp *interp,		/* Interp for error message. */
-    Gridder *slavePtr,		/* Slave to be updated. */
+    Gridder *contentPtr,		/* Content to be updated. */
     int row,			/* New row or -1 to be unchanged. */
     int numRows)		/* New rowspan or -1 to be unchanged. */
 {
     int newRow, newNumRows, lastRow;
 
-    newRow = (row >= 0) ? row : slavePtr->row;
-    newNumRows = (numRows >= 1) ? numRows : slavePtr->numRows;
+    newRow = (row >= 0) ? row : contentPtr->row;
+    newNumRows = (numRows >= 1) ? numRows : contentPtr->numRows;
 
     lastRow = ((newRow >= 0) ? newRow : 0) + newNumRows;
     if (lastRow >= MAX_ELEMENT) {
@@ -2587,8 +2587,8 @@ SetSlaveRow(
 	return TCL_ERROR;
     }
 
-    slavePtr->row = newRow;
-    slavePtr->numRows = newNumRows;
+    contentPtr->row = newRow;
+    contentPtr->numRows = newNumRows;
     return TCL_OK;
 }
 
@@ -2640,7 +2640,7 @@ CheckSlotData(
      * of the offsets as well.
      */
 
-    InitMasterData(containerPtr);
+    InitContainerData(containerPtr);
     end = (slotType == ROW) ? containerPtr->containerDataPtr->rowMax :
 	    containerPtr->containerDataPtr->columnMax;
     if (checkOnly == CHECK_ONLY) {
@@ -2652,7 +2652,7 @@ CheckSlotData(
 	    int newNumSlot = slot + PREALLOC;
 	    size_t oldSize = numSlot * sizeof(SlotInfo);
 	    size_t newSize = newNumSlot * sizeof(SlotInfo);
-	    SlotInfo *newSI = ckalloc(newSize);
+	    SlotInfo *newSI = (SlotInfo *)ckalloc(newSize);
 	    SlotInfo *oldSI = (slotType == ROW)
 		    ? containerPtr->containerDataPtr->rowPtr
 		    : containerPtr->containerDataPtr->columnPtr;
@@ -2682,7 +2682,7 @@ CheckSlotData(
 /*
  *----------------------------------------------------------------------
  *
- * InitMasterData --
+ * InitContainerData --
  *
  *	This internal procedure is used to allocate and initialize the data
  *	for a geometry container, if the data doesn't exist already.
@@ -2698,21 +2698,21 @@ CheckSlotData(
  */
 
 static void
-InitMasterData(
+InitContainerData(
     Gridder *containerPtr)
 {
     if (containerPtr->containerDataPtr == NULL) {
-	GridMaster *gridPtr = containerPtr->containerDataPtr =
-		ckalloc(sizeof(GridMaster));
+	GridContainer *gridPtr = containerPtr->containerDataPtr =
+		ckalloc(sizeof(GridContainer));
 	size_t size = sizeof(SlotInfo) * TYPICAL_SIZE;
 
 	gridPtr->columnEnd = 0;
 	gridPtr->columnMax = 0;
-	gridPtr->columnPtr = ckalloc(size);
+	gridPtr->columnPtr = (SlotInfo *)ckalloc(size);
 	gridPtr->columnSpace = TYPICAL_SIZE;
 	gridPtr->rowEnd = 0;
 	gridPtr->rowMax = 0;
-	gridPtr->rowPtr = ckalloc(size);
+	gridPtr->rowPtr = (SlotInfo *)ckalloc(size);
 	gridPtr->rowSpace = TYPICAL_SIZE;
 	gridPtr->startX = 0;
 	gridPtr->startY = 0;
@@ -2728,7 +2728,7 @@ InitMasterData(
  *
  * Unlink --
  *
- *	Remove a grid from its container's list of slaves.
+ *	Remove a grid from its container's list of content.
  *
  * Results:
  *	None.
@@ -2742,24 +2742,24 @@ InitMasterData(
 
 static void
 Unlink(
-    Gridder *slavePtr)	/* Window to unlink. */
+    Gridder *contentPtr)	/* Window to unlink. */
 {
-    Gridder *containerPtr, *slavePtr2;
+    Gridder *containerPtr, *contentPtr2;
 
-    containerPtr = slavePtr->containerPtr;
+    containerPtr = contentPtr->containerPtr;
     if (containerPtr == NULL) {
 	return;
     }
 
-    if (containerPtr->slavePtr == slavePtr) {
-	containerPtr->slavePtr = slavePtr->nextPtr;
+    if (containerPtr->contentPtr == contentPtr) {
+	containerPtr->contentPtr = contentPtr->nextPtr;
     } else {
-	for (slavePtr2=containerPtr->slavePtr ; ; slavePtr2=slavePtr2->nextPtr) {
-	    if (slavePtr2 == NULL) {
+	for (contentPtr2=containerPtr->contentPtr ; ; contentPtr2=contentPtr2->nextPtr) {
+	    if (contentPtr2 == NULL) {
 		Tcl_Panic("Unlink couldn't find previous window");
 	    }
-	    if (slavePtr2->nextPtr == slavePtr) {
-		slavePtr2->nextPtr = slavePtr->nextPtr;
+	    if (contentPtr2->nextPtr == contentPtr) {
+		contentPtr2->nextPtr = contentPtr->nextPtr;
 		break;
 	    }
 	}
@@ -2772,15 +2772,15 @@ Unlink(
 	*containerPtr->abortPtr = 1;
     }
 
-    SetGridSize(slavePtr->containerPtr);
-    slavePtr->containerPtr = NULL;
+    SetGridSize(contentPtr->containerPtr);
+    contentPtr->containerPtr = NULL;
 
     /*
-     * If we have emptied this container from slaves it means we are no longer
+     * If we have emptied this container from content it means we are no longer
      * handling it and should mark it as free.
      */
 
-    if ((containerPtr->slavePtr == NULL) && (containerPtr->flags & ALLOCED_CONTAINER)) {
+    if ((containerPtr->contentPtr == NULL) && (containerPtr->flags & ALLOCED_CONTAINER)) {
 	TkFreeGeometryContainer(containerPtr->tkwin, "grid");
 	containerPtr->flags &= ~ALLOCED_CONTAINER;
     }
@@ -2810,7 +2810,7 @@ static void
 DestroyGrid(
     void *memPtr)		/* Info about window that is now dead. */
 {
-    Gridder *gridPtr = memPtr;
+    Gridder *gridPtr = (Gridder *)memPtr;
 
     if (gridPtr->containerDataPtr != NULL) {
 	if (gridPtr->containerDataPtr->rowPtr != NULL) {
@@ -2840,7 +2840,7 @@ DestroyGrid(
  *
  * Side effects:
  *	If a window was just deleted, clean up all its grid-related
- *	information. If it was just resized, re-configure its slaves, if any.
+ *	information. If it was just resized, re-configure its content, if any.
  *
  *----------------------------------------------------------------------
  */
@@ -2851,11 +2851,11 @@ GridStructureProc(
 				 * eventPtr. */
     XEvent *eventPtr)		/* Describes what just happened. */
 {
-    Gridder *gridPtr = clientData;
+    Gridder *gridPtr = (Gridder *)clientData;
     TkDisplay *dispPtr = ((TkWindow *) gridPtr->tkwin)->dispPtr;
 
     if (eventPtr->type == ConfigureNotify) {
-	if ((gridPtr->slavePtr != NULL)
+	if ((gridPtr->contentPtr != NULL)
 		&& !(gridPtr->flags & REQUESTED_RELAYOUT)) {
 	    gridPtr->flags |= REQUESTED_RELAYOUT;
 	    Tcl_DoWhenIdle(ArrangeGrid, gridPtr);
@@ -2869,38 +2869,38 @@ GridStructureProc(
 	    }
 	}
     } else if (eventPtr->type == DestroyNotify) {
-	Gridder *slavePtr, *nextPtr;
+	Gridder *contentPtr, *nextPtr;
 
 	if (gridPtr->containerPtr != NULL) {
 	    Unlink(gridPtr);
 	}
-	for (slavePtr = gridPtr->slavePtr; slavePtr != NULL;
-		slavePtr = nextPtr) {
-	    Tk_ManageGeometry(slavePtr->tkwin, NULL, NULL);
-	    Tk_UnmapWindow(slavePtr->tkwin);
-	    slavePtr->containerPtr = NULL;
-	    nextPtr = slavePtr->nextPtr;
-	    slavePtr->nextPtr = NULL;
+	for (contentPtr = gridPtr->contentPtr; contentPtr != NULL;
+		contentPtr = nextPtr) {
+	    Tk_ManageGeometry(contentPtr->tkwin, NULL, NULL);
+	    Tk_UnmapWindow(contentPtr->tkwin);
+	    contentPtr->containerPtr = NULL;
+	    nextPtr = contentPtr->nextPtr;
+	    contentPtr->nextPtr = NULL;
 	}
 	Tcl_DeleteHashEntry(Tcl_FindHashEntry(&dispPtr->gridHashTable,
-		(char *) gridPtr->tkwin));
+		(char *)gridPtr->tkwin));
 	if (gridPtr->flags & REQUESTED_RELAYOUT) {
 	    Tcl_CancelIdleCall(ArrangeGrid, gridPtr);
 	}
 	gridPtr->tkwin = NULL;
 	Tcl_EventuallyFree(gridPtr, (Tcl_FreeProc *)DestroyGrid);
     } else if (eventPtr->type == MapNotify) {
-	if ((gridPtr->slavePtr != NULL)
+	if ((gridPtr->contentPtr != NULL)
 		&& !(gridPtr->flags & REQUESTED_RELAYOUT)) {
 	    gridPtr->flags |= REQUESTED_RELAYOUT;
 	    Tcl_DoWhenIdle(ArrangeGrid, gridPtr);
 	}
     } else if (eventPtr->type == UnmapNotify) {
-	Gridder *slavePtr;
+	Gridder *contentPtr;
 
-	for (slavePtr = gridPtr->slavePtr; slavePtr != NULL;
-		slavePtr = slavePtr->nextPtr) {
-	    Tk_UnmapWindow(slavePtr->tkwin);
+	for (contentPtr = gridPtr->contentPtr; contentPtr != NULL;
+		contentPtr = contentPtr->nextPtr) {
+	    Tk_UnmapWindow(contentPtr->tkwin);
 	}
     }
 }
@@ -2911,8 +2911,8 @@ GridStructureProc(
  * ConfigureContent --
  *
  *	This implements the guts of the "grid configure" command. Given a list
- *	of slaves and configuration options, it arranges for the grid to
- *	manage the slaves and sets the specified options. Arguments consist
+ *	of content and configuration options, it arranges for the grid to
+ *	manage the content and sets the specified options. Arguments consist
  *	of windows or window shortcuts followed by "-option value" pairs.
  *
  * Results:
@@ -2920,7 +2920,7 @@ GridStructureProc(
  *	and the interp's result is set to contain an error message.
  *
  * Side effects:
- *	Slave windows get taken over by the grid.
+ *	Content windows get taken over by the grid.
  *
  *----------------------------------------------------------------------
  */
@@ -2929,7 +2929,7 @@ static int
 ConfigureContent(
     Tcl_Interp *interp,		/* Interpreter for error reporting. */
     Tk_Window tkwin,		/* Any window in application containing
-				 * slaves. Used to look up slave names. */
+				 * content. Used to look up content names. */
     int objc,			/* Number of elements in argv. */
     Tcl_Obj *const objv[])	/* Argument objects: contains one or more
 				 * window names followed by any number of
@@ -2937,8 +2937,8 @@ ConfigureContent(
 				 * that there is at least one window name. */
 {
     Gridder *containerPtr = NULL;
-    Gridder *slavePtr;
-    Tk_Window other, slave, parent, ancestor;
+    Gridder *contentPtr;
+    Tk_Window other, content, parent, ancestor;
     TkWindow *container;
     int i, j, tmp;
     int numWindows;
@@ -2975,34 +2975,34 @@ ConfigureContent(
 
 	if (firstChar == '.') {
 	    /*
-	     * Check that windows are valid, and locate the first slave's
+	     * Check that windows are valid, and locate the first content's
 	     * parent window (default for -in).
 	     */
 
-	    if (TkGetWindowFromObj(interp, tkwin, objv[i], &slave) != TCL_OK) {
+	    if (TkGetWindowFromObj(interp, tkwin, objv[i], &content) != TCL_OK) {
 		return TCL_ERROR;
 	    }
 	    if (containerPtr == NULL) {
 		/*
-		 * Is there any saved -in from a removed slave?
+		 * Is there any saved -in from a removed content?
 		 * If there is, it becomes default for -in.
 		 * If the stored container does not exist, just ignore it.
 		 */
 
-		struct Gridder *slavePtr = GetGrid(slave);
-		if (slavePtr->in != NULL) {
-		    if (TkGetWindowFromObj(interp, slave, slavePtr->in, &parent)
+		struct Gridder *contentPtr = GetGrid(content);
+		if (contentPtr->in != NULL) {
+		    if (TkGetWindowFromObj(interp, content, contentPtr->in, &parent)
 			    == TCL_OK) {
 			containerPtr = GetGrid(parent);
-			InitMasterData(containerPtr);
+			InitContainerData(containerPtr);
 		    }
 		}
 	    }
 	    if (containerPtr == NULL) {
-		parent = Tk_Parent(slave);
+		parent = Tk_Parent(content);
 		if (parent != NULL) {
 		    containerPtr = GetGrid(parent);
-		    InitMasterData(containerPtr);
+		    InitContainerData(containerPtr);
 		}
 	    }
 	    numWindows++;
@@ -3071,7 +3071,7 @@ ConfigureContent(
 		return TCL_ERROR;
 	    }
 	    containerPtr = GetGrid(other);
-	    InitMasterData(containerPtr);
+	    InitContainerData(containerPtr);
 	} else if (index == CONF_ROW) {
 	    if (Tcl_GetIntFromObj(interp, objv[i+1], &tmp) != TCL_OK
 		    || tmp < 0) {
@@ -3100,10 +3100,10 @@ ConfigureContent(
     }
 
     /*
-     * Iterate over all of the slave windows and short-cuts, parsing options
-     * for each slave. It's a bit wasteful to re-parse the options for each
-     * slave, but things get too messy if we try to parse the arguments just
-     * once at the beginning. For example, if a slave already is managed we
+     * Iterate over all of the content windows and short-cuts, parsing options
+     * for each content. It's a bit wasteful to re-parse the options for each
+     * content, but things get too messy if we try to parse the arguments just
+     * once at the beginning. For example, if a content already is managed we
      * want to just change a few existing values without resetting everything.
      * If there are multiple windows, the -in option only gets processed for
      * the first window.
@@ -3116,7 +3116,7 @@ ConfigureContent(
 
 	/*
 	 * '^' and 'x' cause us to skip a column. '-' is processed as part of
-	 * its preceeding slave.
+	 * its preceeding content.
 	 */
 
 	if ((firstChar == REL_VERT) || (firstChar == REL_SKIP)) {
@@ -3136,27 +3136,27 @@ ConfigureContent(
 	    }
 	}
 
-	if (TkGetWindowFromObj(interp, tkwin, objv[j], &slave) != TCL_OK) {
+	if (TkGetWindowFromObj(interp, tkwin, objv[j], &content) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 
-	if (Tk_TopWinHierarchy(slave)) {
+	if (Tk_TopWinHierarchy(content)) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "can't manage \"%s\": it's a top-level window",
 		    Tcl_GetString(objv[j])));
 	    Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "TOPLEVEL", NULL);
 	    return TCL_ERROR;
 	}
-	slavePtr = GetGrid(slave);
+	contentPtr = GetGrid(content);
 
 	/*
 	 * The following statement is taken from tkPack.c:
 	 *
-	 * "If the slave isn't currently managed, reset all of its
+	 * "If the content isn't currently managed, reset all of its
 	 * configuration information to default values (there could be old
 	 * values left from a previous packer)."
 	 *
-	 * I [D.S.] disagree with this statement. If a slave is disabled
+	 * I [D.S.] disagree with this statement. If a content is disabled
 	 * (using "forget") and then re-enabled, I submit that 90% of the time
 	 * the programmer will want it to retain its old configuration
 	 * information. If the programmer doesn't want this behavior, then the
@@ -3177,7 +3177,7 @@ ConfigureContent(
 		    Tcl_SetErrorCode(interp, "TK", "VALUE", "COLUMN", NULL);
 		    return TCL_ERROR;
 		}
-		if (SetSlaveColumn(interp, slavePtr, tmp, -1) != TCL_OK) {
+		if (SetContentColumn(interp, contentPtr, tmp, -1) != TCL_OK) {
 		    return TCL_ERROR;
 		}
 		break;
@@ -3190,7 +3190,7 @@ ConfigureContent(
 		    Tcl_SetErrorCode(interp, "TK", "VALUE", "SPAN", NULL);
 		    return TCL_ERROR;
 		}
-		if (SetSlaveColumn(interp, slavePtr, -1, tmp) != TCL_OK) {
+		if (SetContentColumn(interp, contentPtr, -1, tmp) != TCL_OK) {
 		    return TCL_ERROR;
 		}
 		break;
@@ -3199,7 +3199,7 @@ ConfigureContent(
 			&other) != TCL_OK) {
 		    return TCL_ERROR;
 		}
-		if (other == slave) {
+		if (other == content) {
 		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			    "window can't be managed in itself", -1));
 		    Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "SELF", NULL);
@@ -3207,7 +3207,7 @@ ConfigureContent(
 		}
 		positionGiven = 1;
 		containerPtr = GetGrid(other);
-		InitMasterData(containerPtr);
+		InitContainerData(containerPtr);
 		break;
 	    case CONF_STICKY: {
 		int sticky = StringToSticky(Tcl_GetString(objv[i+1]));
@@ -3220,11 +3220,11 @@ ConfigureContent(
 		    Tcl_SetErrorCode(interp, "TK", "VALUE", "STICKY", NULL);
 		    return TCL_ERROR;
 		}
-		slavePtr->sticky = sticky;
+		contentPtr->sticky = sticky;
 		break;
 	    }
 	    case CONF_IPADX:
-		if ((Tk_GetPixelsFromObj(NULL, slave, objv[i+1],
+		if ((Tk_GetPixelsFromObj(NULL, content, objv[i+1],
 			&tmp) != TCL_OK) || (tmp < 0)) {
 		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 			    "bad ipadx value \"%s\": must be positive screen distance",
@@ -3232,10 +3232,10 @@ ConfigureContent(
 		    Tcl_SetErrorCode(interp, "TK", "VALUE", "INT_PAD", NULL);
 		    return TCL_ERROR;
 		}
-		slavePtr->iPadX = tmp * 2;
+		contentPtr->iPadX = tmp * 2;
 		break;
 	    case CONF_IPADY:
-		if ((Tk_GetPixelsFromObj(NULL, slave, objv[i+1],
+		if ((Tk_GetPixelsFromObj(NULL, content, objv[i+1],
 			&tmp) != TCL_OK) || (tmp < 0)) {
 		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 			    "bad ipady value \"%s\": must be positive screen distance",
@@ -3243,17 +3243,17 @@ ConfigureContent(
 		    Tcl_SetErrorCode(interp, "TK", "VALUE", "INT_PAD", NULL);
 		    return TCL_ERROR;
 		}
-		slavePtr->iPadY = tmp * 2;
+		contentPtr->iPadY = tmp * 2;
 		break;
 	    case CONF_PADX:
 		if (TkParsePadAmount(interp, tkwin, objv[i+1],
-			&slavePtr->padLeft, &slavePtr->padX) != TCL_OK) {
+			&contentPtr->padLeft, &contentPtr->padX) != TCL_OK) {
 		    return TCL_ERROR;
 		}
 		break;
 	    case CONF_PADY:
 		if (TkParsePadAmount(interp, tkwin, objv[i+1],
-			&slavePtr->padTop, &slavePtr->padY) != TCL_OK) {
+			&contentPtr->padTop, &contentPtr->padY) != TCL_OK) {
 		    return TCL_ERROR;
 		}
 		break;
@@ -3266,7 +3266,7 @@ ConfigureContent(
 		    Tcl_SetErrorCode(interp, "TK", "VALUE", "COLUMN", NULL);
 		    return TCL_ERROR;
 		}
-		if (SetSlaveRow(interp, slavePtr, tmp, -1) != TCL_OK) {
+		if (SetContentRow(interp, contentPtr, tmp, -1) != TCL_OK) {
 		    return TCL_ERROR;
 		}
 		break;
@@ -3279,7 +3279,7 @@ ConfigureContent(
 		    Tcl_SetErrorCode(interp, "TK", "VALUE", "SPAN", NULL);
 		    return TCL_ERROR;
 		}
-		if (SetSlaveRow(interp, slavePtr, -1, tmp) != TCL_OK) {
+		if (SetContentRow(interp, contentPtr, -1, tmp) != TCL_OK) {
 		    return TCL_ERROR;
 		}
 		break;
@@ -3287,12 +3287,12 @@ ConfigureContent(
 	}
 
 	/*
-	 * If no position was specified via -in and the slave is already
+	 * If no position was specified via -in and the content is already
 	 * packed, then leave it in its current location.
 	 */
 
-    	if (!positionGiven && (slavePtr->containerPtr != NULL)) {
-	    containerPtr = slavePtr->containerPtr;
+    	if (!positionGiven && (contentPtr->containerPtr != NULL)) {
+	    containerPtr = contentPtr->containerPtr;
 	    goto scheduleLayout;
     	}
 
@@ -3301,41 +3301,41 @@ ConfigureContent(
 	 * its current location.
 	 */
 
-	if (positionGiven && (containerPtr == slavePtr->containerPtr)) {
+	if (positionGiven && (containerPtr == contentPtr->containerPtr)) {
 	    goto scheduleLayout;
 	}
 
 	/*
 	 * Make sure we have a geometry container. We look at:
 	 *  1)   the -in flag
-	 *  2)   the parent of the first slave.
+	 *  2)   the parent of the first content.
 	 */
 
-	parent = Tk_Parent(slave);
+	parent = Tk_Parent(content);
     	if (containerPtr == NULL) {
 	    containerPtr = GetGrid(parent);
-	    InitMasterData(containerPtr);
+	    InitContainerData(containerPtr);
     	}
 
-	if (slavePtr->containerPtr != NULL && slavePtr->containerPtr != containerPtr) {
-            if (slavePtr->containerPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
-                Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->containerPtr->tkwin);
+	if (contentPtr->containerPtr != NULL && contentPtr->containerPtr != containerPtr) {
+            if (contentPtr->containerPtr->tkwin != Tk_Parent(contentPtr->tkwin)) {
+                Tk_UnmaintainGeometry(contentPtr->tkwin, contentPtr->containerPtr->tkwin);
             }
-	    Unlink(slavePtr);
-	    slavePtr->containerPtr = NULL;
+	    Unlink(contentPtr);
+	    contentPtr->containerPtr = NULL;
 	}
 
-	if (slavePtr->containerPtr == NULL) {
-	    Gridder *tempPtr = containerPtr->slavePtr;
+	if (contentPtr->containerPtr == NULL) {
+	    Gridder *tempPtr = containerPtr->contentPtr;
 
-	    slavePtr->containerPtr = containerPtr;
-	    containerPtr->slavePtr = slavePtr;
-	    slavePtr->nextPtr = tempPtr;
+	    contentPtr->containerPtr = containerPtr;
+	    containerPtr->contentPtr = contentPtr;
+	    contentPtr->nextPtr = tempPtr;
 	}
 
 	/*
-	 * Make sure that the slave's parent is either the container or an
-	 * ancestor of the container, and that the container and slave aren't the
+	 * Make sure that the content's parent is either the container or an
+	 * ancestor of the container, and that the container and content aren't the
 	 * same.
 	 */
 
@@ -3348,7 +3348,7 @@ ConfigureContent(
 			"can't put %s inside %s", Tcl_GetString(objv[j]),
 			Tk_PathName(containerPtr->tkwin)));
 		Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "HIERARCHY", NULL);
-		Unlink(slavePtr);
+		Unlink(contentPtr);
 		return TCL_ERROR;
 	    }
 	}
@@ -3359,26 +3359,26 @@ ConfigureContent(
 
 	for (container = (TkWindow *)containerPtr->tkwin; container != NULL;
 	     container = (TkWindow *)TkGetGeomMaster(container)) {
-	    if (container == (TkWindow *)slave) {
+	    if (container == (TkWindow *)content) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "can't put %s inside %s, would cause management loop",
 	            Tcl_GetString(objv[j]), Tk_PathName(containerPtr->tkwin)));
 		Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "LOOP", NULL);
-		Unlink(slavePtr);
+		Unlink(contentPtr);
 		return TCL_ERROR;
 	    }
 	}
-	if (containerPtr->tkwin != Tk_Parent(slave)) {
-	    ((TkWindow *)slave)->maintainerPtr = (TkWindow *)containerPtr->tkwin;
+	if (containerPtr->tkwin != Tk_Parent(content)) {
+	    ((TkWindow *)content)->maintainerPtr = (TkWindow *)containerPtr->tkwin;
 	}
 
-	Tk_ManageGeometry(slave, &gridMgrType, slavePtr);
+	Tk_ManageGeometry(content, &gridMgrType, contentPtr);
 
 	if (!(containerPtr->flags & DONT_PROPAGATE)) {
 	    if (TkSetGeometryContainer(interp, containerPtr->tkwin, "grid")
 		    != TCL_OK) {
-		Tk_ManageGeometry(slave, NULL, NULL);
-		Unlink(slavePtr);
+		Tk_ManageGeometry(content, NULL, NULL);
+		Unlink(contentPtr);
 		return TCL_ERROR;
 	    }
 	    containerPtr->flags |= ALLOCED_CONTAINER;
@@ -3388,21 +3388,21 @@ ConfigureContent(
 	 * Assign default position information.
 	 */
 
-	if (slavePtr->column == -1) {
-	    if (SetSlaveColumn(interp, slavePtr, defaultColumn,-1) != TCL_OK){
+	if (contentPtr->column == -1) {
+	    if (SetContentColumn(interp, contentPtr, defaultColumn,-1) != TCL_OK){
 		return TCL_ERROR;
 	    }
 	}
-	if (SetSlaveColumn(interp, slavePtr, -1,
-		slavePtr->numCols + defaultColumnSpan - 1) != TCL_OK) {
+	if (SetContentColumn(interp, contentPtr, -1,
+		contentPtr->numCols + defaultColumnSpan - 1) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	if (slavePtr->row == -1) {
-	    if (SetSlaveRow(interp, slavePtr, defaultRow, -1) != TCL_OK) {
+	if (contentPtr->row == -1) {
+	    if (SetContentRow(interp, contentPtr, defaultRow, -1) != TCL_OK) {
 		return TCL_ERROR;
 	    }
 	}
-	defaultColumn += slavePtr->numCols;
+	defaultColumn += contentPtr->numCols;
 	defaultColumnSpan = 1;
 
 	/*
@@ -3480,19 +3480,19 @@ ConfigureContent(
 	lastColumn += numSkip;
 
 	match = 0;
-	for (slavePtr = containerPtr->slavePtr; slavePtr != NULL;
-		slavePtr = slavePtr->nextPtr) {
-
-	    if (slavePtr->column == lastColumn
-		    && slavePtr->row + slavePtr->numRows - 1 == lastRow) {
-		if (slavePtr->numCols <= width) {
-		    if (SetSlaveRow(interp, slavePtr, -1,
-			    slavePtr->numRows + 1) != TCL_OK) {
+	for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
+		contentPtr = contentPtr->nextPtr) {
+
+	    if (contentPtr->column == lastColumn
+		    && contentPtr->row + contentPtr->numRows - 1 == lastRow) {
+		if (contentPtr->numCols <= width) {
+		    if (SetContentRow(interp, contentPtr, -1,
+			    contentPtr->numRows + 1) != TCL_OK) {
 			return TCL_ERROR;
 		    }
 		    match++;
-		    j += slavePtr->numCols - 1;
-		    lastWindow = Tk_PathName(slavePtr->tkwin);
+		    j += contentPtr->numCols - 1;
+		    lastWindow = Tk_PathName(contentPtr->tkwin);
 		    numSkip = 0;
 		    break;
 		}
@@ -3515,11 +3515,11 @@ ConfigureContent(
     SetGridSize(containerPtr);
 
     /*
-     * If we have emptied this container from slaves it means we are no longer
+     * If we have emptied this container from content it means we are no longer
      * handling it and should mark it as free.
      */
 
-    if (containerPtr->slavePtr == NULL && containerPtr->flags & ALLOCED_CONTAINER) {
+    if (containerPtr->contentPtr == NULL && containerPtr->flags & ALLOCED_CONTAINER) {
 	TkFreeGeometryContainer(containerPtr->tkwin, "grid");
 	containerPtr->flags &= ~ALLOCED_CONTAINER;
     }
diff --git a/generic/tkImgPhoto.h b/generic/tkImgPhoto.h
index 90705e9..9cd4195 100644
--- a/generic/tkImgPhoto.h
+++ b/generic/tkImgPhoto.h
@@ -27,11 +27,11 @@
  * Forward declarations of the structures we define.
  */
 
-#define PhotoMaster PhotoModel
+#define PhotoModel PhotoMaster
 typedef struct ColorTableId	ColorTableId;
 typedef struct ColorTable	ColorTable;
 typedef struct PhotoInstance	PhotoInstance;
-typedef struct PhotoModel	PhotoModel;
+typedef struct PhotoMaster	PhotoMaster;
 
 /*
  * A signed 8-bit integral type. If chars are unsigned and the compiler isn't
@@ -141,8 +141,8 @@ struct ColorTable {
  * Definition of the data associated with each photo image master.
  */
 
-struct PhotoModel {
-    Tk_ImageModel tkMaster;	/* Tk's token for image model. NULL means the
+struct PhotoMaster {
+    Tk_ImageMaster tkMaster;	/* Tk's token for image model. NULL means the
 				 * image is being deleted. */
     Tcl_Interp *interp;		/* Interpreter associated with the application
 				 * using this image. */
@@ -169,7 +169,7 @@ struct PhotoModel {
 };
 
 /*
- * Bit definitions for the flags field of a PhotoModel.
+ * Bit definitions for the flags field of a PhotoMaster.
  * COLOR_IMAGE:			1 means that the image has different color
  *				components.
  * IMAGE_CHANGED:		1 means that the instances of this image need
@@ -196,7 +196,7 @@ struct PhotoModel {
  */
 
 struct PhotoInstance {
-    PhotoModel *masterPtr;	/* Pointer to master for image. */
+    PhotoMaster *masterPtr;	/* Pointer to master for image. */
     Display *display;		/* Display for windows using this instance. */
     Colormap colormap;		/* The image may only be used in windows with
 				 * this particular colormap. */
diff --git a/generic/tkOldConfig.c b/generic/tkOldConfig.c
index f20f38f..d05a2c7 100644
--- a/generic/tkOldConfig.c
+++ b/generic/tkOldConfig.c
@@ -1104,7 +1104,7 @@ GetCachedSpecs(
 
 	/*
 	 * Now allocate our working copy's space and copy over the contents
-	 * from the master copy.
+	 * from the origin.
 	 */
 
 	cachedSpecs = ckalloc(entrySpace);
diff --git a/generic/tkPack.c b/generic/tkPack.c
index 0272e5b..28ae74b 100644
--- a/generic/tkPack.c
+++ b/generic/tkPack.c
@@ -20,7 +20,7 @@ static const char *const sideNames[] = {
 
 /*
  * For each window that the packer cares about (either because the window is
- * managed by the packer or because the window has slaves that are managed by
+ * managed by the packer or because the window has content managed by
  * the packer), there is a structure of the following type:
  */
 
@@ -29,15 +29,15 @@ typedef struct Packer {
 				 * window has been deleted, but the packet
 				 * hasn't had a chance to clean up yet because
 				 * the structure is still in use. */
-    struct Packer *containerPtr;	/* Master window within which this window is
+    struct Packer *containerPtr;	/* Container window within which this window is
 				 * packed (NULL means this window isn't
 				 * managed by the packer). */
-    struct Packer *nextPtr;	/* Next window packed within same master. List
+    struct Packer *nextPtr;	/* Next window packed within same container. List
 				 * is priority-ordered: first on list gets
 				 * packed first. */
-    struct Packer *slavePtr;	/* First in list of slaves packed inside this
-				 * window (NULL means no packed slaves). */
-    Side side;			/* Side of master against which this window is
+    struct Packer *contentPtr;	/* First in list of content packed inside this
+				 * window (NULL means no packed content). */
+    Side side;			/* Side of container against which this window is
 				 * packed. */
     Tk_Anchor anchor;		/* If frame allocated for window is larger
 				 * than window needs, this indicates how where
@@ -55,13 +55,13 @@ typedef struct Packer {
 				 * each side). */
     int doubleBw;		/* Twice the window's last known border width.
 				 * If this changes, the window must be
-				 * repacked within its master. */
+				 * repacked within its container. */
     int *abortPtr;		/* If non-NULL, it means that there is a
 				 * nested call to ArrangePacking already
 				 * working on this window. *abortPtr may be
 				 * set to 1 to abort that nested call. This
 				 * happens, for example, if tkwin or any of
-				 * its slaves is deleted. */
+				 * its content is deleted. */
     int flags;			/* Miscellaneous flags; see below for
 				 * definitions. */
 } Packer;
@@ -70,7 +70,7 @@ typedef struct Packer {
  * Flag values for Packer structures:
  *
  * REQUESTED_REPACK:		1 means a Tcl_DoWhenIdle request has already
- *				been made to repack all the slaves of this
+ *				been made to repack all the content of this
  *				window.
  * FILLX:			1 means if frame allocated for window is wider
  *				than window needs, expand window to fill
@@ -78,15 +78,15 @@ typedef struct Packer {
  *				than needed.
  * FILLY:			Same as FILLX, except for height.
  * EXPAND:			1 means this window's frame will absorb any
- *				extra space in the master window.
+ *				extra space in the container window.
  * OLD_STYLE:			1 means this window is being managed with the
  *				old-style packer algorithms (before Tk version
  *				3.3). The main difference is that padding and
  *				filling are done differently.
  * DONT_PROPAGATE:		1 means don't set this window's requested
- *				size. 0 means if this window is a master then
+ *				size. 0 means if this window is a container then
  *				Tk will set its requested size to fit the
- *				needs of its slaves.
+ *				needs of its content.
  * ALLOCED_CONTAINER	1 means that Pack has allocated itself as
  *				geometry container for this window.
  */
@@ -110,7 +110,7 @@ static void		PackLostContentProc(ClientData clientData,
 static const Tk_GeomMgr packerType = {
     "pack",			/* name */
     PackReqProc,		/* requestProc */
-    PackLostContentProc,		/* lostSlaveProc */
+    PackLostContentProc,		/* lostContentProc */
 };
 
 /*
@@ -127,8 +127,8 @@ static int		PackAfter(Tcl_Interp *interp, Packer *prevPtr,
 static void		PackStructureProc(ClientData clientData,
 			    XEvent *eventPtr);
 static void		Unlink(Packer *packPtr);
-static int		XExpansion(Packer *slavePtr, int cavityWidth);
-static int		YExpansion(Packer *slavePtr, int cavityHeight);
+static int		XExpansion(Packer *contentPtr, int cavityWidth);
+static int		YExpansion(Packer *contentPtr, int cavityHeight);
 
 /*
  *------------------------------------------------------------------------
@@ -194,7 +194,7 @@ Tk_PackObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tk_Window tkwin = clientData;
+    Tk_Window tkwin = (Tk_Window)clientData;
     const char *argv2;
     static const char *const optionStrings[] = {
 	/* after, append, before and unpack are deprecated */
@@ -258,7 +258,7 @@ Tk_PackObjCmd(
 	    return TCL_ERROR;
 	}
 	containerPtr = GetPacker(tkwin2);
-	prevPtr = containerPtr->slavePtr;
+	prevPtr = containerPtr->contentPtr;
 	if (prevPtr != NULL) {
 	    while (prevPtr->nextPtr != NULL) {
 		prevPtr = prevPtr->nextPtr;
@@ -282,7 +282,7 @@ Tk_PackObjCmd(
 	    return TCL_ERROR;
 	}
 	containerPtr = packPtr->containerPtr;
-	prevPtr = containerPtr->slavePtr;
+	prevPtr = containerPtr->contentPtr;
 	if (prevPtr == packPtr) {
 	    prevPtr = NULL;
 	} else {
@@ -306,41 +306,41 @@ Tk_PackObjCmd(
 	}
 	return ConfigureContent(interp, tkwin, objc-2, objv+2);
     case PACK_FORGET: {
-	Tk_Window slave;
-	Packer *slavePtr;
+	Tk_Window content;
+	Packer *contentPtr;
 	int i;
 
 	for (i = 2; i < objc; i++) {
-	    if (TkGetWindowFromObj(interp, tkwin, objv[i], &slave) != TCL_OK) {
+	    if (TkGetWindowFromObj(interp, tkwin, objv[i], &content) != TCL_OK) {
 		continue;
 	    }
-	    slavePtr = GetPacker(slave);
-	    if ((slavePtr != NULL) && (slavePtr->containerPtr != NULL)) {
-		Tk_ManageGeometry(slave, NULL, NULL);
-		if (slavePtr->containerPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
-		    Tk_UnmaintainGeometry(slavePtr->tkwin,
-			    slavePtr->containerPtr->tkwin);
+	    contentPtr = GetPacker(content);
+	    if ((contentPtr != NULL) && (contentPtr->containerPtr != NULL)) {
+		Tk_ManageGeometry(content, NULL, NULL);
+		if (contentPtr->containerPtr->tkwin != Tk_Parent(contentPtr->tkwin)) {
+		    Tk_UnmaintainGeometry(contentPtr->tkwin,
+			    contentPtr->containerPtr->tkwin);
 		}
-		Unlink(slavePtr);
-		Tk_UnmapWindow(slavePtr->tkwin);
+		Unlink(contentPtr);
+		Tk_UnmapWindow(contentPtr->tkwin);
 	    }
 	}
 	break;
     }
     case PACK_INFO: {
-	Packer *slavePtr;
-	Tk_Window slave;
+	Packer *contentPtr;
+	Tk_Window content;
 	Tcl_Obj *infoObj;
 
 	if (objc != 3) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "window");
 	    return TCL_ERROR;
 	}
-	if (TkGetWindowFromObj(interp, tkwin, objv[2], &slave) != TCL_OK) {
+	if (TkGetWindowFromObj(interp, tkwin, objv[2], &content) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	slavePtr = GetPacker(slave);
-	if (slavePtr->containerPtr == NULL) {
+	contentPtr = GetPacker(content);
+	if (contentPtr->containerPtr == NULL) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "window \"%s\" isn't packed", argv2));
 	    Tcl_SetErrorCode(interp, "TK", "PACK", "NOT_PACKED", NULL);
@@ -349,12 +349,12 @@ Tk_PackObjCmd(
 
 	infoObj = Tcl_NewObj();
 	Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-in", -1),
-		TkNewWindowObj(slavePtr->containerPtr->tkwin));
+		TkNewWindowObj(contentPtr->containerPtr->tkwin));
 	Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-anchor", -1),
-		Tcl_NewStringObj(Tk_NameOfAnchor(slavePtr->anchor), -1));
+		Tcl_NewStringObj(Tk_NameOfAnchor(contentPtr->anchor), -1));
 	Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-expand", -1),
-		Tcl_NewBooleanObj(slavePtr->flags & EXPAND));
-	switch (slavePtr->flags & (FILLX|FILLY)) {
+		Tcl_NewBooleanObj(contentPtr->flags & EXPAND));
+	switch (contentPtr->flags & (FILLX|FILLY)) {
 	case 0:
 	    Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-fill", -1),
 		    Tcl_NewStringObj("none", -1));
@@ -372,17 +372,17 @@ Tk_PackObjCmd(
 		    Tcl_NewStringObj("both", -1));
 	    break;
 	}
-	TkAppendPadAmount(infoObj, "-ipadx", slavePtr->iPadX/2, slavePtr->iPadX);
-	TkAppendPadAmount(infoObj, "-ipady", slavePtr->iPadY/2, slavePtr->iPadY);
-	TkAppendPadAmount(infoObj, "-padx", slavePtr->padLeft,slavePtr->padX);
-	TkAppendPadAmount(infoObj, "-pady", slavePtr->padTop, slavePtr->padY);
+	TkAppendPadAmount(infoObj, "-ipadx", contentPtr->iPadX/2, contentPtr->iPadX);
+	TkAppendPadAmount(infoObj, "-ipady", contentPtr->iPadY/2, contentPtr->iPadY);
+	TkAppendPadAmount(infoObj, "-padx", contentPtr->padLeft,contentPtr->padX);
+	TkAppendPadAmount(infoObj, "-pady", contentPtr->padTop, contentPtr->padY);
 	Tcl_DictObjPut(NULL, infoObj, Tcl_NewStringObj("-side", -1),
-		Tcl_NewStringObj(sideNames[slavePtr->side], -1));
+		Tcl_NewStringObj(sideNames[contentPtr->side], -1));
 	Tcl_SetObjResult(interp, infoObj);
 	break;
     }
     case PACK_PROPAGATE: {
-	Tk_Window master;
+	Tk_Window container;
 	Packer *containerPtr;
 	int propagate;
 
@@ -390,10 +390,10 @@ Tk_PackObjCmd(
 	    Tcl_WrongNumArgs(interp, 2, objv, "window ?boolean?");
 	    return TCL_ERROR;
 	}
-	if (TkGetWindowFromObj(interp, tkwin, objv[2], &master) != TCL_OK) {
+	if (TkGetWindowFromObj(interp, tkwin, objv[2], &container) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	containerPtr = GetPacker(master);
+	containerPtr = GetPacker(container);
 	if (objc == 3) {
 	    Tcl_SetObjResult(interp,
 		    Tcl_NewBooleanObj(!(containerPtr->flags & DONT_PROPAGATE)));
@@ -407,8 +407,8 @@ Tk_PackObjCmd(
 	     * If we have content windows, we need to register as geometry container.
 	     */
 
-	    if (containerPtr->slavePtr != NULL) {
-		if (TkSetGeometryContainer(interp, master, "pack") != TCL_OK) {
+	    if (containerPtr->contentPtr != NULL) {
+		if (TkSetGeometryContainer(interp, container, "pack") != TCL_OK) {
 		    return TCL_ERROR;
 		}
 		containerPtr->flags |= ALLOCED_CONTAINER;
@@ -416,8 +416,8 @@ Tk_PackObjCmd(
 	    containerPtr->flags &= ~DONT_PROPAGATE;
 
 	    /*
-	     * Repack the master to allow new geometry information to
-	     * propagate upwards to the master's master.
+	     * Repack the container to allow new geometry information to
+	     * propagate upwards to the container's container.
 	     */
 
 	    if (containerPtr->abortPtr != NULL) {
@@ -429,7 +429,7 @@ Tk_PackObjCmd(
 	    }
 	} else {
 	    if (containerPtr->flags & ALLOCED_CONTAINER) {
-		TkFreeGeometryContainer(master, "pack");
+		TkFreeGeometryContainer(container, "pack");
 		containerPtr->flags &= ~ALLOCED_CONTAINER;
 	    }
 	    containerPtr->flags |= DONT_PROPAGATE;
@@ -438,23 +438,23 @@ Tk_PackObjCmd(
     }
     case PACK_CONTENT:
     case PACK_SLAVES: {
-	Tk_Window master;
-	Packer *containerPtr, *slavePtr;
+	Tk_Window container;
+	Packer *containerPtr, *contentPtr;
 	Tcl_Obj *resultObj;
 
 	if (objc != 3) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "window");
 	    return TCL_ERROR;
 	}
-	if (TkGetWindowFromObj(interp, tkwin, objv[2], &master) != TCL_OK) {
+	if (TkGetWindowFromObj(interp, tkwin, objv[2], &container) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	resultObj = Tcl_NewObj();
-	containerPtr = GetPacker(master);
-	for (slavePtr = containerPtr->slavePtr; slavePtr != NULL;
-		slavePtr = slavePtr->nextPtr) {
+	containerPtr = GetPacker(container);
+	for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
+		contentPtr = contentPtr->nextPtr) {
 	    Tcl_ListObjAppendElement(NULL, resultObj,
-		    TkNewWindowObj(slavePtr->tkwin));
+		    TkNewWindowObj(contentPtr->tkwin));
 	}
 	Tcl_SetObjResult(interp, resultObj);
 	break;
@@ -505,15 +505,14 @@ Tk_PackObjCmd(
  *------------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static void
 PackReqProc(
     ClientData clientData,	/* Packer's information about window that got
 				 * new preferred geometry.  */
-    Tk_Window tkwin)		/* Other Tk-related information about the
+    TCL_UNUSED(Tk_Window))		/* Other Tk-related information about the
 				 * window. */
 {
-    Packer *packPtr = clientData;
+    Packer *packPtr = (Packer *)clientData;
 
     packPtr = packPtr->containerPtr;
     if (!(packPtr->flags & REQUESTED_REPACK)) {
@@ -534,25 +533,24 @@ PackReqProc(
  *	None.
  *
  * Side effects:
- *	Forgets all packer-related information about the slave.
+ *	Forgets all packer-related information about the content.
  *
  *------------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static void
 PackLostContentProc(
-    ClientData clientData,	/* Packer structure for slave window that was
+    void *clientData,	/* Packer structure for content window that was
 				 * stolen away. */
-    Tk_Window tkwin)		/* Tk's handle for the slave window. */
+    TCL_UNUSED(Tk_Window))		/* Tk's handle for the content window. */
 {
-    Packer *slavePtr = clientData;
+    Packer *contentPtr = (Packer *)clientData;
 
-    if (slavePtr->containerPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
-	Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->containerPtr->tkwin);
+    if (contentPtr->containerPtr->tkwin != Tk_Parent(contentPtr->tkwin)) {
+	Tk_UnmaintainGeometry(contentPtr->tkwin, contentPtr->containerPtr->tkwin);
     }
-    Unlink(slavePtr);
-    Tk_UnmapWindow(slavePtr->tkwin);
+    Unlink(contentPtr);
+    Tk_UnmapWindow(contentPtr->tkwin);
 }
 
 /*
@@ -569,22 +567,22 @@ PackLostContentProc(
  *	None.
  *
  * Side effects:
- *	The packed slaves of containerPtr may get resized or moved.
+ *	The packed content of containerPtr may get resized or moved.
  *
  *------------------------------------------------------------------------
  */
 
 static void
 ArrangePacking(
-    ClientData clientData)	/* Structure describing master whose slaves
+    ClientData clientData)	/* Structure describing container whose content
 				 * are to be re-layed out. */
 {
-    Packer *containerPtr = clientData;
-    Packer *slavePtr;
+    Packer *containerPtr = (Packer *)clientData;
+    Packer *contentPtr;
     int cavityX, cavityY, cavityWidth, cavityHeight;
 				/* These variables keep track of the
 				 * as-yet-unallocated space remaining in the
-				 * middle of the master window. */
+				 * middle of the container window. */
     int frameX, frameY, frameWidth, frameHeight;
 				/* These variables keep track of the frame
 				 * allocated to the current window. */
@@ -600,11 +598,12 @@ ArrangePacking(
     containerPtr->flags &= ~REQUESTED_REPACK;
 
     /*
-     * If the master has no slaves anymore, then don't do anything at all:
-     * just leave the master's size as-is.
+     * If the container has no content anymore, then leave the container size as-is.
+     * Otherwise there is no way to "relinquish" control over the container
+     * so another geometry manager can take over.
      */
 
-    if (containerPtr->slavePtr == NULL) {
+    if (containerPtr->contentPtr == NULL) {
 	return;
     }
 
@@ -622,18 +621,18 @@ ArrangePacking(
     Tcl_Preserve(containerPtr);
 
     /*
-     * Pass #1: scan all the slaves to figure out the total amount of space
+     * Pass #1: scan all the content to figure out the total amount of space
      * needed. Two separate width and height values are computed:
      *
      * width -		Holds the sum of the widths (plus padding) of all the
-     *			slaves seen so far that were packed LEFT or RIGHT.
+     *			content seen so far that were packed LEFT or RIGHT.
      * height -		Holds the sum of the heights (plus padding) of all the
-     *			slaves seen so far that were packed TOP or BOTTOM.
+     *			content seen so far that were packed TOP or BOTTOM.
      *
-     * maxWidth -	Gradually builds up the width needed by the master to
-     *			just barely satisfy all the slave's needs. For each
-     *			slave, the code computes the width needed for all the
-     *			slaves so far and updates maxWidth if the new value is
+     * maxWidth -	Gradually builds up the width needed by the container to
+     *			just barely satisfy all the content's needs. For each
+     *			content, the code computes the width needed for all the
+     *			content so far and updates maxWidth if the new value is
      *			greater.
      * maxHeight -	Same as maxWidth, except keeps height info.
      */
@@ -642,24 +641,24 @@ ArrangePacking(
 	    Tk_InternalBorderRight(containerPtr->tkwin);
     height = maxHeight = Tk_InternalBorderTop(containerPtr->tkwin) +
 	    Tk_InternalBorderBottom(containerPtr->tkwin);
-    for (slavePtr = containerPtr->slavePtr; slavePtr != NULL;
-	    slavePtr = slavePtr->nextPtr) {
-	if ((slavePtr->side == TOP) || (slavePtr->side == BOTTOM)) {
-	    tmp = Tk_ReqWidth(slavePtr->tkwin) + slavePtr->doubleBw
-		    + slavePtr->padX + slavePtr->iPadX + width;
+    for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
+	    contentPtr = contentPtr->nextPtr) {
+	if ((contentPtr->side == TOP) || (contentPtr->side == BOTTOM)) {
+	    tmp = Tk_ReqWidth(contentPtr->tkwin) + contentPtr->doubleBw
+		    + contentPtr->padX + contentPtr->iPadX + width;
 	    if (tmp > maxWidth) {
 		maxWidth = tmp;
 	    }
-	    height += Tk_ReqHeight(slavePtr->tkwin) + slavePtr->doubleBw
-		    + slavePtr->padY + slavePtr->iPadY;
+	    height += Tk_ReqHeight(contentPtr->tkwin) + contentPtr->doubleBw
+		    + contentPtr->padY + contentPtr->iPadY;
 	} else {
-	    tmp = Tk_ReqHeight(slavePtr->tkwin) + slavePtr->doubleBw
-		    + slavePtr->padY + slavePtr->iPadY + height;
+	    tmp = Tk_ReqHeight(contentPtr->tkwin) + contentPtr->doubleBw
+		    + contentPtr->padY + contentPtr->iPadY + height;
 	    if (tmp > maxHeight) {
 		maxHeight = tmp;
 	    }
-	    width += Tk_ReqWidth(slavePtr->tkwin) + slavePtr->doubleBw
-		    + slavePtr->padX + slavePtr->iPadX;
+	    width += Tk_ReqWidth(contentPtr->tkwin) + contentPtr->doubleBw
+		    + contentPtr->padX + contentPtr->iPadX;
 	}
     }
     if (width > maxWidth) {
@@ -677,10 +676,10 @@ ArrangePacking(
     }
 
     /*
-     * If the total amount of space needed in the master window has changed,
+     * If the total amount of space needed in the container window has changed,
      * and if we're propagating geometry information, then notify the next
      * geometry manager up and requeue ourselves to start again after the
-     * master has had a chance to resize us.
+     * container has had a chance to resize us.
      */
 
     if (((maxWidth != Tk_ReqWidth(containerPtr->tkwin))
@@ -693,7 +692,7 @@ ArrangePacking(
     }
 
     /*
-     * Pass #2: scan the slaves a second time assigning new sizes. The
+     * Pass #2: scan the content a second time assigning new sizes. The
      * "cavity" variables keep track of the unclaimed space in the cavity of
      * the window; this shrinks inward as we allocate windows around the
      * edges. The "frame" variables keep track of the space allocated to the
@@ -709,14 +708,14 @@ ArrangePacking(
     cavityHeight = Tk_Height(containerPtr->tkwin) -
 	    Tk_InternalBorderTop(containerPtr->tkwin) -
 	    Tk_InternalBorderBottom(containerPtr->tkwin);
-    for (slavePtr = containerPtr->slavePtr; slavePtr != NULL;
-	    slavePtr = slavePtr->nextPtr) {
-	if ((slavePtr->side == TOP) || (slavePtr->side == BOTTOM)) {
+    for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
+	    contentPtr = contentPtr->nextPtr) {
+	if ((contentPtr->side == TOP) || (contentPtr->side == BOTTOM)) {
 	    frameWidth = cavityWidth;
-	    frameHeight = Tk_ReqHeight(slavePtr->tkwin) + slavePtr->doubleBw
-		    + slavePtr->padY + slavePtr->iPadY;
-	    if (slavePtr->flags & EXPAND) {
-		frameHeight += YExpansion(slavePtr, cavityHeight);
+	    frameHeight = Tk_ReqHeight(contentPtr->tkwin) + contentPtr->doubleBw
+		    + contentPtr->padY + contentPtr->iPadY;
+	    if (contentPtr->flags & EXPAND) {
+		frameHeight += YExpansion(contentPtr, cavityHeight);
 	    }
 	    cavityHeight -= frameHeight;
 	    if (cavityHeight < 0) {
@@ -724,7 +723,7 @@ ArrangePacking(
 		cavityHeight = 0;
 	    }
 	    frameX = cavityX;
-	    if (slavePtr->side == TOP) {
+	    if (contentPtr->side == TOP) {
 		frameY = cavityY;
 		cavityY += frameHeight;
 	    } else {
@@ -732,10 +731,10 @@ ArrangePacking(
 	    }
 	} else {
 	    frameHeight = cavityHeight;
-	    frameWidth = Tk_ReqWidth(slavePtr->tkwin) + slavePtr->doubleBw
-		    + slavePtr->padX + slavePtr->iPadX;
-	    if (slavePtr->flags & EXPAND) {
-		frameWidth += XExpansion(slavePtr, cavityWidth);
+	    frameWidth = Tk_ReqWidth(contentPtr->tkwin) + contentPtr->doubleBw
+		    + contentPtr->padX + contentPtr->iPadX;
+	    if (contentPtr->flags & EXPAND) {
+		frameWidth += XExpansion(contentPtr, cavityWidth);
 	    }
 	    cavityWidth -= frameWidth;
 	    if (cavityWidth < 0) {
@@ -743,7 +742,7 @@ ArrangePacking(
 		cavityWidth = 0;
 	    }
 	    frameY = cavityY;
-	    if (slavePtr->side == LEFT) {
+	    if (contentPtr->side == LEFT) {
 		frameX = cavityX;
 		cavityX += frameWidth;
 	    } else {
@@ -760,31 +759,31 @@ ArrangePacking(
 	 * completely ignored except when computing frame size).
 	 */
 
-	if (slavePtr->flags & OLD_STYLE) {
+	if (contentPtr->flags & OLD_STYLE) {
 	    borderX = borderY = 0;
 	    borderTop = borderBtm = 0;
 	    borderLeft = borderRight = 0;
 	} else {
-	    borderX = slavePtr->padX;
-	    borderY = slavePtr->padY;
-	    borderLeft = slavePtr->padLeft;
+	    borderX = contentPtr->padX;
+	    borderY = contentPtr->padY;
+	    borderLeft = contentPtr->padLeft;
 	    borderRight = borderX - borderLeft;
-	    borderTop = slavePtr->padTop;
+	    borderTop = contentPtr->padTop;
 	    borderBtm = borderY - borderTop;
 	}
-	width = Tk_ReqWidth(slavePtr->tkwin) + slavePtr->doubleBw
-		+ slavePtr->iPadX;
-	if ((slavePtr->flags & FILLX)
+	width = Tk_ReqWidth(contentPtr->tkwin) + contentPtr->doubleBw
+		+ contentPtr->iPadX;
+	if ((contentPtr->flags & FILLX)
 		|| (width > (frameWidth - borderX))) {
 	    width = frameWidth - borderX;
 	}
-	height = Tk_ReqHeight(slavePtr->tkwin) + slavePtr->doubleBw
-		+ slavePtr->iPadY;
-	if ((slavePtr->flags & FILLY)
+	height = Tk_ReqHeight(contentPtr->tkwin) + contentPtr->doubleBw
+		+ contentPtr->iPadY;
+	if ((contentPtr->flags & FILLY)
 		|| (height > (frameHeight - borderY))) {
 	    height = frameHeight - borderY;
 	}
-	switch (slavePtr->anchor) {
+	switch (contentPtr->anchor) {
 	case TK_ANCHOR_N:
 	    x = frameX + (borderLeft + frameWidth - width - borderRight)/2;
 	    y = frameY + borderTop;
@@ -824,44 +823,44 @@ ArrangePacking(
 	default:
 	    Tcl_Panic("bad frame factor in ArrangePacking");
 	}
-	width -= slavePtr->doubleBw;
-	height -= slavePtr->doubleBw;
+	width -= contentPtr->doubleBw;
+	height -= contentPtr->doubleBw;
 
 	/*
 	 * The final step is to set the position, size, and mapped/unmapped
-	 * state of the slave. If the slave is a child of the master, then do
+	 * state of the content. If the content is a child of the container, then do
 	 * this here. Otherwise let Tk_MaintainGeometry do the work.
 	 */
 
-	if (containerPtr->tkwin == Tk_Parent(slavePtr->tkwin)) {
+	if (containerPtr->tkwin == Tk_Parent(contentPtr->tkwin)) {
 	    if ((width <= 0) || (height <= 0)) {
-		Tk_UnmapWindow(slavePtr->tkwin);
+		Tk_UnmapWindow(contentPtr->tkwin);
 	    } else {
-		if ((x != Tk_X(slavePtr->tkwin))
-			|| (y != Tk_Y(slavePtr->tkwin))
-			|| (width != Tk_Width(slavePtr->tkwin))
-			|| (height != Tk_Height(slavePtr->tkwin))) {
-		    Tk_MoveResizeWindow(slavePtr->tkwin, x, y, width, height);
+		if ((x != Tk_X(contentPtr->tkwin))
+			|| (y != Tk_Y(contentPtr->tkwin))
+			|| (width != Tk_Width(contentPtr->tkwin))
+			|| (height != Tk_Height(contentPtr->tkwin))) {
+		    Tk_MoveResizeWindow(contentPtr->tkwin, x, y, width, height);
 		}
 		if (abort) {
 		    goto done;
 		}
 
 		/*
-		 * Don't map the slave if the master isn't mapped: wait until
-		 * the master gets mapped later.
+		 * Don't map the content if the container isn't mapped: wait until
+		 * the container gets mapped later.
 		 */
 
 		if (Tk_IsMapped(containerPtr->tkwin)) {
-		    Tk_MapWindow(slavePtr->tkwin);
+		    Tk_MapWindow(contentPtr->tkwin);
 		}
 	    }
 	} else {
 	    if ((width <= 0) || (height <= 0)) {
-		Tk_UnmaintainGeometry(slavePtr->tkwin, containerPtr->tkwin);
-		Tk_UnmapWindow(slavePtr->tkwin);
+		Tk_UnmaintainGeometry(contentPtr->tkwin, containerPtr->tkwin);
+		Tk_UnmapWindow(contentPtr->tkwin);
 	    } else {
-		Tk_MaintainGeometry(slavePtr->tkwin, containerPtr->tkwin,
+		Tk_MaintainGeometry(contentPtr->tkwin, containerPtr->tkwin,
 			x, y, width, height);
 	    }
 	}
@@ -887,7 +886,7 @@ ArrangePacking(
  *
  * XExpansion --
  *
- *	Given a list of packed slaves, the first of which is packed on the
+ *	Given a list of packed content, the first of which is packed on the
  *	left or right and is expandable, compute how much to expand the child.
  *
  * Results:
@@ -902,9 +901,9 @@ ArrangePacking(
 
 static int
 XExpansion(
-    Packer *slavePtr,	/* First in list of remaining slaves. */
+    Packer *contentPtr,	/* First in list of remaining content. */
     int cavityWidth)		/* Horizontal space left for all remaining
-				 * slaves. */
+				 * content. */
 {
     int numExpand, minExpand, curExpand;
     int childWidth;
@@ -922,10 +921,10 @@ XExpansion(
 
     minExpand = cavityWidth;
     numExpand = 0;
-    for ( ; slavePtr != NULL; slavePtr = slavePtr->nextPtr) {
-	childWidth = Tk_ReqWidth(slavePtr->tkwin) + slavePtr->doubleBw
-		+ slavePtr->padX + slavePtr->iPadX;
-	if ((slavePtr->side == TOP) || (slavePtr->side == BOTTOM)) {
+    for ( ; contentPtr != NULL; contentPtr = contentPtr->nextPtr) {
+	childWidth = Tk_ReqWidth(contentPtr->tkwin) + contentPtr->doubleBw
+		+ contentPtr->padX + contentPtr->iPadX;
+	if ((contentPtr->side == TOP) || (contentPtr->side == BOTTOM)) {
 	    if (numExpand) {
 		curExpand = (cavityWidth - childWidth)/numExpand;
 		if (curExpand < minExpand) {
@@ -934,7 +933,7 @@ XExpansion(
 	    }
 	} else {
 	    cavityWidth -= childWidth;
-	    if (slavePtr->flags & EXPAND) {
+	    if (contentPtr->flags & EXPAND) {
 		numExpand++;
 	    }
 	}
@@ -953,7 +952,7 @@ XExpansion(
  *
  * YExpansion --
  *
- *	Given a list of packed slaves, the first of which is packed on the top
+ *	Given a list of packed content, the first of which is packed on the top
  *	or bottom and is expandable, compute how much to expand the child.
  *
  * Results:
@@ -968,9 +967,9 @@ XExpansion(
 
 static int
 YExpansion(
-    Packer *slavePtr,	/* First in list of remaining slaves. */
+    Packer *contentPtr,	/* First in list of remaining content. */
     int cavityHeight)		/* Vertical space left for all remaining
-				 * slaves. */
+				 * content. */
 {
     int numExpand, minExpand, curExpand;
     int childHeight;
@@ -981,10 +980,10 @@ YExpansion(
 
     minExpand = cavityHeight;
     numExpand = 0;
-    for ( ; slavePtr != NULL; slavePtr = slavePtr->nextPtr) {
-	childHeight = Tk_ReqHeight(slavePtr->tkwin) + slavePtr->doubleBw
-		+ slavePtr->padY + slavePtr->iPadY;
-	if ((slavePtr->side == LEFT) || (slavePtr->side == RIGHT)) {
+    for ( ; contentPtr != NULL; contentPtr = contentPtr->nextPtr) {
+	childHeight = Tk_ReqHeight(contentPtr->tkwin) + contentPtr->doubleBw
+		+ contentPtr->padY + contentPtr->iPadY;
+	if ((contentPtr->side == LEFT) || (contentPtr->side == RIGHT)) {
 	    if (numExpand) {
 		curExpand = (cavityHeight - childHeight)/numExpand;
 		if (curExpand < minExpand) {
@@ -993,7 +992,7 @@ YExpansion(
 	    }
 	} else {
 	    cavityHeight -= childHeight;
-	    if (slavePtr->flags & EXPAND) {
+	    if (contentPtr->flags & EXPAND) {
 		numExpand++;
 	    }
 	}
@@ -1049,13 +1048,13 @@ GetPacker(
     hPtr = Tcl_CreateHashEntry(&dispPtr->packerHashTable, (char *) tkwin,
 	    &isNew);
     if (!isNew) {
-	return Tcl_GetHashValue(hPtr);
+	return (Packer *)Tcl_GetHashValue(hPtr);
     }
-    packPtr = ckalloc(sizeof(Packer));
+    packPtr = (Packer *)ckalloc(sizeof(Packer));
     packPtr->tkwin = tkwin;
     packPtr->containerPtr = NULL;
     packPtr->nextPtr = NULL;
-    packPtr->slavePtr = NULL;
+    packPtr->contentPtr = NULL;
     packPtr->side = TOP;
     packPtr->anchor = TK_ANCHOR_CENTER;
     packPtr->padX = packPtr->padY = 0;
@@ -1076,7 +1075,7 @@ GetPacker(
  * PackAfter --
  *
  *	This function does most of the real work of adding one or more windows
- *	into the packing order for its master.
+ *	into the packing order for its container.
  *
  * Results:
  *	A standard Tcl return value.
@@ -1094,7 +1093,7 @@ PackAfter(
     Packer *prevPtr,		/* Pack windows in argv just after this
 				 * window; NULL means pack as first child of
 				 * containerPtr. */
-    Packer *containerPtr,		/* Master in which to pack windows. */
+    Packer *containerPtr,		/* Container in which to pack windows. */
     int objc,			/* Number of elements in objv. */
     Tcl_Obj *const objv[])	/* Array of lists, each containing 2 elements:
 				 * window name and side against which to
@@ -1170,8 +1169,8 @@ PackAfter(
 	packPtr->flags |= OLD_STYLE;
 	for (index = 0 ; index < optionCount; index++) {
 	    Tcl_Obj *curOptPtr = options[index];
-	    const char *curOpt = Tcl_GetString(curOptPtr);
-	    size_t length = curOptPtr->length;
+	    int length;
+	    const char *curOpt = Tcl_GetStringFromObj(curOptPtr, &length);
 
 	    c = curOpt[0];
 
@@ -1228,7 +1227,7 @@ PackAfter(
 		packPtr->iPadY = 0;
 		index++;
 	    } else if ((c == 'f') && (length > 1)
-		    && (strncmp(curOpt, "frame", (size_t) length) == 0)) {
+		    && (strncmp(curOpt, "frame", length) == 0)) {
 		if (optionCount < (index+2)) {
 		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			    "wrong # args: \"frame\""
@@ -1269,14 +1268,14 @@ PackAfter(
 	    }
 
 	    /*
-	     * Add the window in the correct place in its master's packing
+	     * Add the window in the correct place in its container's packing
 	     * order, then make sure that the window is managed by us.
 	     */
 
 	    packPtr->containerPtr = containerPtr;
 	    if (prevPtr == NULL) {
-		packPtr->nextPtr = containerPtr->slavePtr;
-		containerPtr->slavePtr = packPtr;
+		packPtr->nextPtr = containerPtr->contentPtr;
+		containerPtr->contentPtr = packPtr;
 	    } else {
 		packPtr->nextPtr = prevPtr->nextPtr;
 		prevPtr->nextPtr = packPtr;
@@ -1296,7 +1295,7 @@ PackAfter(
     }
 
     /*
-     * Arrange for the master to be re-packed at the first idle moment.
+     * Arrange for the container to be re-packed at the first idle moment.
      */
 
     if (containerPtr->abortPtr != NULL) {
@@ -1314,13 +1313,13 @@ PackAfter(
  *
  * Unlink --
  *
- *	Remove a packer from its master's list of slaves.
+ *	Remove a packer from its container's list of content.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	The master will be scheduled for repacking.
+ *	The container will be scheduled for repacking.
  *
  *----------------------------------------------------------------------
  */
@@ -1335,10 +1334,10 @@ Unlink(
     if (containerPtr == NULL) {
 	return;
     }
-    if (containerPtr->slavePtr == packPtr) {
-	containerPtr->slavePtr = packPtr->nextPtr;
+    if (containerPtr->contentPtr == packPtr) {
+	containerPtr->contentPtr = packPtr->nextPtr;
     } else {
-	for (packPtr2 = containerPtr->slavePtr; ; packPtr2 = packPtr2->nextPtr) {
+	for (packPtr2 = containerPtr->contentPtr; ; packPtr2 = packPtr2->nextPtr) {
 	    if (packPtr2 == NULL) {
 		Tcl_Panic("Unlink couldn't find previous window");
 	    }
@@ -1359,11 +1358,11 @@ Unlink(
     packPtr->containerPtr = NULL;
 
     /*
-     * If we have emptied this master from slaves it means we are no longer
+     * If we have emptied this container from content it means we are no longer
      * handling it and should mark it as free.
      */
 
-    if ((containerPtr->slavePtr == NULL) && (containerPtr->flags & ALLOCED_CONTAINER)) {
+    if ((containerPtr->contentPtr == NULL) && (containerPtr->flags & ALLOCED_CONTAINER)) {
 	TkFreeGeometryContainer(containerPtr->tkwin, "pack");
 	containerPtr->flags &= ~ALLOCED_CONTAINER;
     }
@@ -1393,7 +1392,7 @@ DestroyPacker(
     void *memPtr)		/* Info about packed window that is now
 				 * dead. */
 {
-    Packer *packPtr = memPtr;
+    Packer *packPtr = (Packer *)memPtr;
 
     ckfree(packPtr);
 }
@@ -1411,7 +1410,7 @@ DestroyPacker(
  *
  * Side effects:
  *	If a window was just deleted, clean up all its packer-related
- *	information. If it was just resized, repack its slaves, if any.
+ *	information. If it was just resized, repack its content, if any.
  *
  *----------------------------------------------------------------------
  */
@@ -1422,10 +1421,10 @@ PackStructureProc(
 				 * eventPtr. */
     XEvent *eventPtr)		/* Describes what just happened. */
 {
-    Packer *packPtr = clientData;
+    Packer *packPtr = (Packer *)clientData;
 
     if (eventPtr->type == ConfigureNotify) {
-	if ((packPtr->slavePtr != NULL)
+	if ((packPtr->contentPtr != NULL)
 		&& !(packPtr->flags & REQUESTED_REPACK)) {
 	    packPtr->flags |= REQUESTED_REPACK;
 	    Tcl_DoWhenIdle(ArrangePacking, packPtr);
@@ -1439,25 +1438,25 @@ PackStructureProc(
 	    }
 	}
     } else if (eventPtr->type == DestroyNotify) {
-	Packer *slavePtr, *nextPtr;
+	Packer *contentPtr, *nextPtr;
 
 	if (packPtr->containerPtr != NULL) {
 	    Unlink(packPtr);
 	}
 
-	for (slavePtr = packPtr->slavePtr; slavePtr != NULL;
-		slavePtr = nextPtr) {
-	    Tk_ManageGeometry(slavePtr->tkwin, NULL, NULL);
-	    Tk_UnmapWindow(slavePtr->tkwin);
-	    slavePtr->containerPtr = NULL;
-	    nextPtr = slavePtr->nextPtr;
-	    slavePtr->nextPtr = NULL;
+	for (contentPtr = packPtr->contentPtr; contentPtr != NULL;
+		contentPtr = nextPtr) {
+	    Tk_ManageGeometry(contentPtr->tkwin, NULL, NULL);
+	    Tk_UnmapWindow(contentPtr->tkwin);
+	    contentPtr->containerPtr = NULL;
+	    nextPtr = contentPtr->nextPtr;
+	    contentPtr->nextPtr = NULL;
 	}
 
 	if (packPtr->tkwin != NULL) {
 	    TkDisplay *dispPtr = ((TkWindow *) packPtr->tkwin)->dispPtr;
             Tcl_DeleteHashEntry(Tcl_FindHashEntry(&dispPtr->packerHashTable,
-		    (char *) packPtr->tkwin));
+		    (void *)packPtr->tkwin));
 	}
 
 	if (packPtr->flags & REQUESTED_REPACK) {
@@ -1467,11 +1466,11 @@ PackStructureProc(
 	Tcl_EventuallyFree(packPtr, (Tcl_FreeProc *) DestroyPacker);
     } else if (eventPtr->type == MapNotify) {
 	/*
-	 * When a master gets mapped, must redo the geometry computation so
-	 * that all of its slaves get remapped.
+	 * When a container gets mapped, must redo the geometry computation so
+	 * that all of its content get remapped.
 	 */
 
-	if ((packPtr->slavePtr != NULL)
+	if ((packPtr->contentPtr != NULL)
 		&& !(packPtr->flags & REQUESTED_REPACK)) {
 	    packPtr->flags |= REQUESTED_REPACK;
 	    Tcl_DoWhenIdle(ArrangePacking, packPtr);
@@ -1480,11 +1479,11 @@ PackStructureProc(
 	Packer *packPtr2;
 
 	/*
-	 * Unmap all of the slaves when the master gets unmapped, so that they
+	 * Unmap all of the content when the container gets unmapped, so that they
 	 * don't bother to keep redisplaying themselves.
 	 */
 
-	for (packPtr2 = packPtr->slavePtr; packPtr2 != NULL;
+	for (packPtr2 = packPtr->contentPtr; packPtr2 != NULL;
 	     packPtr2 = packPtr2->nextPtr) {
 	    Tk_UnmapWindow(packPtr2->tkwin);
 	}
@@ -1497,15 +1496,15 @@ PackStructureProc(
  * ConfigureContent --
  *
  *	This implements the guts of the "pack configure" command. Given a list
- *	of slaves and configuration options, it arranges for the packer to
- *	manage the slaves and sets the specified options.
+ *	of content and configuration options, it arranges for the packer to
+ *	manage the content and sets the specified options.
  *
  * Results:
  *	TCL_OK is returned if all went well. Otherwise, TCL_ERROR is returned
  *	and the interp's result is set to contain an error message.
  *
  * Side effects:
- *	Slave windows get taken over by the packer.
+ *	Content windows get taken over by the packer.
  *
  *----------------------------------------------------------------------
  */
@@ -1514,16 +1513,16 @@ static int
 ConfigureContent(
     Tcl_Interp *interp,		/* Interpreter for error reporting. */
     Tk_Window tkwin,		/* Any window in application containing
-				 * slaves. Used to look up slave names. */
+				 * content. Used to look up content names. */
     int objc,			/* Number of elements in argv. */
     Tcl_Obj *const objv[])	/* Argument objects: contains one or more
 				 * window names followed by any number of
 				 * "option value" pairs. Caller must make sure
 				 * that there is at least one window name. */
 {
-    Packer *containerPtr, *slavePtr, *prevPtr, *otherPtr;
-    Tk_Window other, slave, parent, ancestor;
-    TkWindow *master;
+    Packer *containerPtr, *contentPtr, *prevPtr, *otherPtr;
+    Tk_Window other, content, parent, ancestor;
+    TkWindow *container;
     int i, j, numWindows, tmp, positionGiven;
     const char *string;
     static const char *const optionStrings[] = {
@@ -1546,10 +1545,10 @@ ConfigureContent(
     }
 
     /*
-     * Iterate over all of the slave windows, parsing the configuration
-     * options for each slave. It's a bit wasteful to re-parse the options for
-     * each slave, but things get too messy if we try to parse the arguments
-     * just once at the beginning. For example, if a slave already is packed
+     * Iterate over all of the content windows, parsing the configuration
+     * options for each content. It's a bit wasteful to re-parse the options for
+     * each content, but things get too messy if we try to parse the arguments
+     * just once at the beginning. For example, if a content already is packed
      * we want to just change a few existing values without resetting
      * everything. If there are multiple windows, the -after, -before, and -in
      * options only get processed for the first window.
@@ -1559,32 +1558,32 @@ ConfigureContent(
     prevPtr = NULL;
     positionGiven = 0;
     for (j = 0; j < numWindows; j++) {
-	if (TkGetWindowFromObj(interp, tkwin, objv[j], &slave) != TCL_OK) {
+	if (TkGetWindowFromObj(interp, tkwin, objv[j], &content) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	if (Tk_TopWinHierarchy(slave)) {
+	if (Tk_TopWinHierarchy(content)) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "can't pack \"%s\": it's a top-level window",
 		    Tcl_GetString(objv[j])));
 	    Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "TOPLEVEL", NULL);
 	    return TCL_ERROR;
 	}
-	slavePtr = GetPacker(slave);
-	slavePtr->flags &= ~OLD_STYLE;
+	contentPtr = GetPacker(content);
+	contentPtr->flags &= ~OLD_STYLE;
 
 	/*
-	 * If the slave isn't currently packed, reset all of its configuration
+	 * If the content isn't currently packed, reset all of its configuration
 	 * information to default values (there could be old values left from
 	 * a previous packing).
 	 */
 
-	if (slavePtr->containerPtr == NULL) {
-	    slavePtr->side = TOP;
-	    slavePtr->anchor = TK_ANCHOR_CENTER;
-	    slavePtr->padX = slavePtr->padY = 0;
-	    slavePtr->padLeft = slavePtr->padTop = 0;
-	    slavePtr->iPadX = slavePtr->iPadY = 0;
-	    slavePtr->flags &= ~(FILLX|FILLY|EXPAND);
+	if (contentPtr->containerPtr == NULL) {
+	    contentPtr->side = TOP;
+	    contentPtr->anchor = TK_ANCHOR_CENTER;
+	    contentPtr->padX = contentPtr->padY = 0;
+	    contentPtr->padLeft = contentPtr->padTop = 0;
+	    contentPtr->iPadX = contentPtr->iPadY = 0;
+	    contentPtr->flags &= ~(FILLX|FILLY|EXPAND);
 	}
 
 	for (i = numWindows; i < objc; i+=2) {
@@ -1622,7 +1621,7 @@ ConfigureContent(
 		}
 		break;
 	    case CONF_ANCHOR:
-		if (Tk_GetAnchorFromObj(interp, objv[i+1], &slavePtr->anchor)
+		if (Tk_GetAnchorFromObj(interp, objv[i+1], &contentPtr->anchor)
 			!= TCL_OK) {
 		    return TCL_ERROR;
 		}
@@ -1638,7 +1637,7 @@ ConfigureContent(
 			goto notPacked;
 		    }
 		    containerPtr = otherPtr->containerPtr;
-		    prevPtr = containerPtr->slavePtr;
+		    prevPtr = containerPtr->contentPtr;
 		    if (prevPtr == otherPtr) {
 			prevPtr = NULL;
 		    } else {
@@ -1653,21 +1652,21 @@ ConfigureContent(
 		if (Tcl_GetBooleanFromObj(interp, objv[i+1], &tmp) != TCL_OK) {
 		    return TCL_ERROR;
 		}
-		slavePtr->flags &= ~EXPAND;
+		contentPtr->flags &= ~EXPAND;
 		if (tmp) {
-		    slavePtr->flags |= EXPAND;
+		    contentPtr->flags |= EXPAND;
 		}
 		break;
 	    case CONF_FILL:
 		string = Tcl_GetString(objv[i+1]);
 		if (strcmp(string, "none") == 0) {
-		    slavePtr->flags &= ~(FILLX|FILLY);
+		    contentPtr->flags &= ~(FILLX|FILLY);
 		} else if (strcmp(string, "x") == 0) {
-		    slavePtr->flags = (slavePtr->flags & ~FILLY) | FILLX;
+		    contentPtr->flags = (contentPtr->flags & ~FILLY) | FILLX;
 		} else if (strcmp(string, "y") == 0) {
-		    slavePtr->flags = (slavePtr->flags & ~FILLX) | FILLY;
+		    contentPtr->flags = (contentPtr->flags & ~FILLX) | FILLY;
 		} else if (strcmp(string, "both") == 0) {
-		    slavePtr->flags |= FILLX|FILLY;
+		    contentPtr->flags |= FILLX|FILLY;
 		} else {
 		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 			    "bad fill style \"%s\": must be "
@@ -1683,7 +1682,7 @@ ConfigureContent(
 			return TCL_ERROR;
 		    }
 		    containerPtr = GetPacker(other);
-		    prevPtr = containerPtr->slavePtr;
+		    prevPtr = containerPtr->contentPtr;
 		    if (prevPtr != NULL) {
 			while (prevPtr->nextPtr != NULL) {
 			    prevPtr = prevPtr->nextPtr;
@@ -1693,7 +1692,7 @@ ConfigureContent(
 		}
 		break;
 	    case CONF_IPADX:
-		if ((Tk_GetPixelsFromObj(interp, slave, objv[i+1], &tmp)
+		if ((Tk_GetPixelsFromObj(interp, content, objv[i+1], &tmp)
 			!= TCL_OK) || (tmp < 0)) {
 		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 			    "bad ipadx value \"%s\": must be positive screen"
@@ -1701,10 +1700,10 @@ ConfigureContent(
 		    Tcl_SetErrorCode(interp, "TK", "VALUE", "INT_PAD", NULL);
 		    return TCL_ERROR;
 		}
-		slavePtr->iPadX = tmp * 2;
+		contentPtr->iPadX = tmp * 2;
 		break;
 	    case CONF_IPADY:
-		if ((Tk_GetPixelsFromObj(interp, slave, objv[i+1], &tmp)
+		if ((Tk_GetPixelsFromObj(interp, content, objv[i+1], &tmp)
 			!= TCL_OK) || (tmp < 0)) {
 		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 			    "bad ipady value \"%s\": must be positive screen"
@@ -1712,17 +1711,17 @@ ConfigureContent(
 		    Tcl_SetErrorCode(interp, "TK", "VALUE", "INT_PAD", NULL);
 		    return TCL_ERROR;
 		}
-		slavePtr->iPadY = tmp * 2;
+		contentPtr->iPadY = tmp * 2;
 		break;
 	    case CONF_PADX:
-		if (TkParsePadAmount(interp, slave, objv[i+1],
-			&slavePtr->padLeft, &slavePtr->padX) != TCL_OK) {
+		if (TkParsePadAmount(interp, content, objv[i+1],
+			&contentPtr->padLeft, &contentPtr->padX) != TCL_OK) {
 		    return TCL_ERROR;
 		}
 		break;
 	    case CONF_PADY:
-		if (TkParsePadAmount(interp, slave, objv[i+1],
-			&slavePtr->padTop, &slavePtr->padY) != TCL_OK) {
+		if (TkParsePadAmount(interp, content, objv[i+1],
+			&contentPtr->padTop, &contentPtr->padY) != TCL_OK) {
 		    return TCL_ERROR;
 		}
 		break;
@@ -1731,42 +1730,42 @@ ConfigureContent(
 			sizeof(char *), "side", TCL_EXACT, &side) != TCL_OK) {
 		    return TCL_ERROR;
 		}
-		slavePtr->side = (Side) side;
+		contentPtr->side = (Side) side;
 		break;
 	    }
 	}
 
 	/*
-	 * If no position in a packing list was specified and the slave is
+	 * If no position in a packing list was specified and the content is
 	 * already packed, then leave it in its current location in its
 	 * current packing list.
 	 */
 
-	if (!positionGiven && (slavePtr->containerPtr != NULL)) {
-	    containerPtr = slavePtr->containerPtr;
+	if (!positionGiven && (contentPtr->containerPtr != NULL)) {
+	    containerPtr = contentPtr->containerPtr;
 	    goto scheduleLayout;
 	}
 
 	/*
-	 * If the slave is going to be put back after itself or the same -in
+	 * If the content is going to be put back after itself or the same -in
 	 * window is passed in again, then just skip the whole operation,
 	 * since it won't work anyway.
 	 */
 
-	if (prevPtr == slavePtr) {
-	    containerPtr = slavePtr->containerPtr;
+	if (prevPtr == contentPtr) {
+	    containerPtr = contentPtr->containerPtr;
 	    goto scheduleLayout;
 	}
 
 	/*
 	 * If none of the "-in", "-before", or "-after" options has been
-	 * specified, arrange for the slave to go at the end of the order for
+	 * specified, arrange for the content to go at the end of the order for
 	 * its parent.
 	 */
 
 	if (!positionGiven) {
-	    containerPtr = GetPacker(Tk_Parent(slave));
-	    prevPtr = containerPtr->slavePtr;
+	    containerPtr = GetPacker(Tk_Parent(content));
+	    prevPtr = containerPtr->contentPtr;
 	    if (prevPtr != NULL) {
 		while (prevPtr->nextPtr != NULL) {
 		    prevPtr = prevPtr->nextPtr;
@@ -1775,12 +1774,12 @@ ConfigureContent(
 	}
 
 	/*
-	 * Make sure that the slave's parent is either the master or an
-	 * ancestor of the master, and that the master and slave aren't the
+	 * Make sure that the content's parent is either the container or an
+	 * ancestor of the container, and that the container and content aren't the
 	 * same.
 	 */
 
-	parent = Tk_Parent(slave);
+	parent = Tk_Parent(content);
 	for (ancestor = containerPtr->tkwin; ; ancestor = Tk_Parent(ancestor)) {
 	    if (ancestor == parent) {
 		break;
@@ -1793,7 +1792,7 @@ ConfigureContent(
 		return TCL_ERROR;
 	    }
 	}
-	if (slave == containerPtr->tkwin) {
+	if (content == containerPtr->tkwin) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "can't pack %s inside itself", Tcl_GetString(objv[j])));
 	    Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "SELF", NULL);
@@ -1804,9 +1803,9 @@ ConfigureContent(
 	 * Check for management loops.
 	 */
 
-	for (master = (TkWindow *)containerPtr->tkwin; master != NULL;
-	     master = (TkWindow *)TkGetGeomMaster(master)) {
-	    if (master == (TkWindow *)slave) {
+	for (container = (TkWindow *)containerPtr->tkwin; container != NULL;
+	     container = (TkWindow *)TkGetGeomMaster(container)) {
+	    if (container == (TkWindow *)content) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "can't put %s inside %s, would cause management loop",
 	            Tcl_GetString(objv[j]), Tk_PathName(containerPtr->tkwin)));
@@ -1814,48 +1813,48 @@ ConfigureContent(
 		return TCL_ERROR;
 	    }
 	}
-	if (containerPtr->tkwin != Tk_Parent(slave)) {
-	    ((TkWindow *)slave)->maintainerPtr = (TkWindow *)containerPtr->tkwin;
+	if (containerPtr->tkwin != Tk_Parent(content)) {
+	    ((TkWindow *)content)->maintainerPtr = (TkWindow *)containerPtr->tkwin;
 	}
 
 	/*
-	 * Unpack the slave if it's currently packed, then position it after
+	 * Unpack the content if it's currently packed, then position it after
 	 * prevPtr.
 	 */
 
-	if (slavePtr->containerPtr != NULL) {
-	    if ((slavePtr->containerPtr != containerPtr) &&
-		    (slavePtr->containerPtr->tkwin
-		    != Tk_Parent(slavePtr->tkwin))) {
-		Tk_UnmaintainGeometry(slavePtr->tkwin,
-			slavePtr->containerPtr->tkwin);
+	if (contentPtr->containerPtr != NULL) {
+	    if ((contentPtr->containerPtr != containerPtr) &&
+		    (contentPtr->containerPtr->tkwin
+		    != Tk_Parent(contentPtr->tkwin))) {
+		Tk_UnmaintainGeometry(contentPtr->tkwin,
+			contentPtr->containerPtr->tkwin);
 	    }
-	    Unlink(slavePtr);
+	    Unlink(contentPtr);
 	}
 
-	slavePtr->containerPtr = containerPtr;
+	contentPtr->containerPtr = containerPtr;
 	if (prevPtr == NULL) {
-	    slavePtr->nextPtr = containerPtr->slavePtr;
-	    containerPtr->slavePtr = slavePtr;
+	    contentPtr->nextPtr = containerPtr->contentPtr;
+	    containerPtr->contentPtr = contentPtr;
 	} else {
-	    slavePtr->nextPtr = prevPtr->nextPtr;
-	    prevPtr->nextPtr = slavePtr;
+	    contentPtr->nextPtr = prevPtr->nextPtr;
+	    prevPtr->nextPtr = contentPtr;
 	}
-	Tk_ManageGeometry(slave, &packerType, slavePtr);
-	prevPtr = slavePtr;
+	Tk_ManageGeometry(content, &packerType, contentPtr);
+	prevPtr = contentPtr;
 
 	if (!(containerPtr->flags & DONT_PROPAGATE)) {
 	    if (TkSetGeometryContainer(interp, containerPtr->tkwin, "pack")
 		    != TCL_OK) {
-		Tk_ManageGeometry(slave, NULL, NULL);
-		Unlink(slavePtr);
+		Tk_ManageGeometry(content, NULL, NULL);
+		Unlink(contentPtr);
 		return TCL_ERROR;
 	    }
 	    containerPtr->flags |= ALLOCED_CONTAINER;
 	}
 
 	/*
-	 * Arrange for the master to be re-packed at the first idle moment.
+	 * Arrange for the container to be re-packed at the first idle moment.
 	 */
 
     scheduleLayout:
diff --git a/generic/tkPlace.c b/generic/tkPlace.c
index d044fa9..615eb9e 100644
--- a/generic/tkPlace.c
+++ b/generic/tkPlace.c
@@ -35,15 +35,15 @@ typedef enum {BM_INSIDE, BM_OUTSIDE, BM_IGNORE} BorderMode;
  * structure of the following type:
  */
 
-typedef struct Slave {
+typedef struct Content {
     Tk_Window tkwin;		/* Tk's token for window. */
     Tk_Window inTkwin;		/* Token for the -in window. */
-    struct Master *containerPtr;	/* Pointer to information for window relative
+    struct Container *containerPtr;	/* Pointer to information for window relative
 				 * to which tkwin is placed. This isn't
 				 * necessarily the logical parent of tkwin.
 				 * NULL means the container was deleted or never
 				 * assigned. */
-    struct Slave *nextPtr;	/* Next in list of windows placed relative to
+    struct Content *nextPtr;	/* Next in list of windows placed relative to
 				 * same container (NULL for end of list). */
     Tk_OptionTable optionTable;	/* Table that defines configuration options
 				 * available for this command. */
@@ -72,7 +72,7 @@ typedef struct Slave {
     BorderMode borderMode;	/* How to treat borders of container window. */
     int flags;			/* Various flags; see below for bit
 				 * definitions. */
-} Slave;
+} Content;
 
 /*
  * Type masks for options:
@@ -82,34 +82,34 @@ typedef struct Slave {
 
 static const Tk_OptionSpec optionSpecs[] = {
     {TK_OPTION_ANCHOR, "-anchor", NULL, NULL, "nw", -1,
-	 Tk_Offset(Slave, anchor), 0, 0, 0},
+	 Tk_Offset(Content, anchor), 0, 0, 0},
     {TK_OPTION_STRING_TABLE, "-bordermode", NULL, NULL, "inside", -1,
-	 Tk_Offset(Slave, borderMode), 0, borderModeStrings, 0},
-    {TK_OPTION_PIXELS, "-height", NULL, NULL, "", Tk_Offset(Slave, heightPtr),
-	 Tk_Offset(Slave, height), TK_OPTION_NULL_OK, 0, 0},
-    {TK_OPTION_WINDOW, "-in", NULL, NULL, "", -1, Tk_Offset(Slave, inTkwin),
+	 Tk_Offset(Content, borderMode), 0, borderModeStrings, 0},
+    {TK_OPTION_PIXELS, "-height", NULL, NULL, "", Tk_Offset(Content, heightPtr),
+	 Tk_Offset(Content, height), TK_OPTION_NULL_OK, 0, 0},
+    {TK_OPTION_WINDOW, "-in", NULL, NULL, "", -1, Tk_Offset(Content, inTkwin),
 	 0, 0, IN_MASK},
     {TK_OPTION_DOUBLE, "-relheight", NULL, NULL, "",
-	 Tk_Offset(Slave, relHeightPtr), Tk_Offset(Slave, relHeight),
+	 Tk_Offset(Content, relHeightPtr), Tk_Offset(Content, relHeight),
 	 TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_DOUBLE, "-relwidth", NULL, NULL, "",
-	 Tk_Offset(Slave, relWidthPtr), Tk_Offset(Slave, relWidth),
+	 Tk_Offset(Content, relWidthPtr), Tk_Offset(Content, relWidth),
 	 TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_DOUBLE, "-relx", NULL, NULL, "0", -1,
-	 Tk_Offset(Slave, relX), 0, 0, 0},
+	 Tk_Offset(Content, relX), 0, 0, 0},
     {TK_OPTION_DOUBLE, "-rely", NULL, NULL, "0", -1,
-	 Tk_Offset(Slave, relY), 0, 0, 0},
-    {TK_OPTION_PIXELS, "-width", NULL, NULL, "", Tk_Offset(Slave, widthPtr),
-	 Tk_Offset(Slave, width), TK_OPTION_NULL_OK, 0, 0},
-    {TK_OPTION_PIXELS, "-x", NULL, NULL, "0", Tk_Offset(Slave, xPtr),
-	 Tk_Offset(Slave, x), TK_OPTION_NULL_OK, 0, 0},
-    {TK_OPTION_PIXELS, "-y", NULL, NULL, "0", Tk_Offset(Slave, yPtr),
-	 Tk_Offset(Slave, y), TK_OPTION_NULL_OK, 0, 0},
+	 Tk_Offset(Content, relY), 0, 0, 0},
+    {TK_OPTION_PIXELS, "-width", NULL, NULL, "", Tk_Offset(Content, widthPtr),
+	 Tk_Offset(Content, width), TK_OPTION_NULL_OK, 0, 0},
+    {TK_OPTION_PIXELS, "-x", NULL, NULL, "0", Tk_Offset(Content, xPtr),
+	 Tk_Offset(Content, x), TK_OPTION_NULL_OK, 0, 0},
+    {TK_OPTION_PIXELS, "-y", NULL, NULL, "0", Tk_Offset(Content, yPtr),
+	 Tk_Offset(Content, y), TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_END, NULL, NULL, NULL, NULL, 0, -1, 0, 0, 0}
 };
 
 /*
- * Flag definitions for Slave structures:
+ * Flag definitions for Content structures:
  *
  * CHILD_WIDTH -		1 means -width was specified;
  * CHILD_REL_WIDTH -		1 means -relwidth was specified.
@@ -123,22 +123,22 @@ static const Tk_OptionSpec optionSpecs[] = {
 #define CHILD_REL_HEIGHT	8
 
 /*
- * For each container window that has a slave managed by the placer there is a
+ * For each container window that has a content managed by the placer there is a
  * structure of the following form:
  */
 
-typedef struct Master {
+typedef struct Container {
     Tk_Window tkwin;		/* Tk's token for container window. */
-    struct Slave *slavePtr;	/* First in linked list of slaves placed
+    struct Content *contentPtr;	/* First in linked list of content placed
 				 * relative to this container. */
     int *abortPtr;		/* If non-NULL, it means that there is a nested
 				 * call to RecomputePlacement already working on
 				 * this window.  *abortPtr may be set to 1 to
 				 * abort that nested call.  This happens, for
-				 * example, if tkwin or any of its slaves
+				 * example, if tkwin or any of its content
 				 * is deleted. */
     int flags;			/* See below for bit definitions. */
-} Master;
+} Container;
 
 /*
  * Flag definitions for containers:
@@ -161,28 +161,28 @@ static void		PlaceLostContentProc(ClientData clientData,
 static const Tk_GeomMgr placerType = {
     "place",			/* name */
     PlaceRequestProc,		/* requestProc */
-    PlaceLostContentProc,		/* lostSlaveProc */
+    PlaceLostContentProc,		/* lostContentProc */
 };
 
 /*
  * Forward declarations for functions defined later in this file:
  */
 
-static void		SlaveStructureProc(ClientData clientData,
+static void		ContentStructureProc(ClientData clientData,
 			    XEvent *eventPtr);
 static int		ConfigureContent(Tcl_Interp *interp, Tk_Window tkwin,
 			    Tk_OptionTable table, int objc,
 			    Tcl_Obj *const objv[]);
 static int		PlaceInfoCommand(Tcl_Interp *interp, Tk_Window tkwin);
-static Slave *		CreateSlave(Tk_Window tkwin, Tk_OptionTable table);
-static void		FreeSlave(Slave *slavePtr);
-static Slave *		FindSlave(Tk_Window tkwin);
-static Master *		CreateMaster(Tk_Window tkwin);
-static Master *		FindMaster(Tk_Window tkwin);
+static Content *		CreateContent(Tk_Window tkwin, Tk_OptionTable table);
+static void		FreeContent(Content *contentPtr);
+static Content *		FindContent(Tk_Window tkwin);
+static Container *		CreateContainer(Tk_Window tkwin);
+static Container *		FindContainer(Tk_Window tkwin);
 static void		PlaceStructureProc(ClientData clientData,
 			    XEvent *eventPtr);
 static void		RecomputePlacement(ClientData clientData);
-static void		UnlinkSlave(Slave *slavePtr);
+static void		UnlinkContent(Content *contentPtr);
 
 /*
  *--------------------------------------------------------------
@@ -208,9 +208,9 @@ Tk_PlaceObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tk_Window main_win = clientData;
+    Tk_Window main_win = (Tk_Window)clientData;
     Tk_Window tkwin;
-    Slave *slavePtr;
+    Content *contentPtr;
     TkDisplay *dispPtr;
     Tk_OptionTable optionTable;
     static const char *const optionStrings[] = {
@@ -286,11 +286,11 @@ Tk_PlaceObjCmd(
 	if (objc == 3 || objc == 4) {
 	    Tcl_Obj *objPtr;
 
-	    slavePtr = FindSlave(tkwin);
-	    if (slavePtr == NULL) {
+	    contentPtr = FindContent(tkwin);
+	    if (contentPtr == NULL) {
 		return TCL_OK;
 	    }
-	    objPtr = Tk_GetOptionInfo(interp, (char *) slavePtr, optionTable,
+	    objPtr = Tk_GetOptionInfo(interp, (char *)contentPtr, optionTable,
 		    (objc == 4) ? objv[3] : NULL, tkwin);
 	    if (objPtr == NULL) {
 		return TCL_ERROR;
@@ -305,22 +305,22 @@ Tk_PlaceObjCmd(
 	    Tcl_WrongNumArgs(interp, 2, objv, "pathName");
 	    return TCL_ERROR;
 	}
-	slavePtr = FindSlave(tkwin);
-	if (slavePtr == NULL) {
+	contentPtr = FindContent(tkwin);
+	if (contentPtr == NULL) {
 	    return TCL_OK;
 	}
-	if ((slavePtr->containerPtr != NULL) &&
-		(slavePtr->containerPtr->tkwin != Tk_Parent(slavePtr->tkwin))) {
-	    Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->containerPtr->tkwin);
+	if ((contentPtr->containerPtr != NULL) &&
+		(contentPtr->containerPtr->tkwin != Tk_Parent(contentPtr->tkwin))) {
+	    Tk_UnmaintainGeometry(contentPtr->tkwin, contentPtr->containerPtr->tkwin);
 	}
-	UnlinkSlave(slavePtr);
+	UnlinkContent(contentPtr);
 	Tcl_DeleteHashEntry(Tcl_FindHashEntry(&dispPtr->slaveTable,
-		(char *) tkwin));
-	Tk_DeleteEventHandler(tkwin, StructureNotifyMask, SlaveStructureProc,
-		slavePtr);
+		(void *)tkwin));
+	Tk_DeleteEventHandler(tkwin, StructureNotifyMask, ContentStructureProc,
+		contentPtr);
 	Tk_ManageGeometry(tkwin, NULL, NULL);
 	Tk_UnmapWindow(tkwin);
-	FreeSlave(slavePtr);
+	FreeContent(contentPtr);
 	break;
 
     case PLACE_INFO:
@@ -332,20 +332,20 @@ Tk_PlaceObjCmd(
 
     case PLACE_CONTENT:
     case PLACE_SLAVES: {
-	Master *containerPtr;
+	Container *containerPtr;
 
 	if (objc != 3) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "pathName");
 	    return TCL_ERROR;
 	}
-	containerPtr = FindMaster(tkwin);
+	containerPtr = FindContainer(tkwin);
 	if (containerPtr != NULL) {
 	    Tcl_Obj *listPtr = Tcl_NewObj();
 
-	    for (slavePtr = containerPtr->slavePtr; slavePtr != NULL;
-		    slavePtr = slavePtr->nextPtr) {
+	    for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
+		    contentPtr = contentPtr->nextPtr) {
 		Tcl_ListObjAppendElement(NULL, listPtr,
-			TkNewWindowObj(slavePtr->tkwin));
+			TkNewWindowObj(contentPtr->tkwin));
 	    }
 	    Tcl_SetObjResult(interp, listPtr);
 	}
@@ -359,59 +359,59 @@ Tk_PlaceObjCmd(
 /*
  *----------------------------------------------------------------------
  *
- * CreateSlave --
+ * CreateContent --
  *
- *	Given a Tk_Window token, find the Slave structure corresponding to
+ *	Given a Tk_Window token, find the Content structure corresponding to
  *	that token, creating a new one if necessary.
  *
  * Results:
- *	Pointer to the Slave structure.
+ *	Pointer to the Content structure.
  *
  * Side effects:
- *	A new Slave structure may be created.
+ *	A new Content structure may be created.
  *
  *----------------------------------------------------------------------
  */
 
-static Slave *
-CreateSlave(
-    Tk_Window tkwin,		/* Token for desired slave. */
+static Content *
+CreateContent(
+    Tk_Window tkwin,		/* Token for desired content. */
     Tk_OptionTable table)
 {
     Tcl_HashEntry *hPtr;
-    Slave *slavePtr;
+    Content *contentPtr;
     int isNew;
     TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr;
 
     hPtr = Tcl_CreateHashEntry(&dispPtr->slaveTable, (char *) tkwin, &isNew);
     if (!isNew) {
-	return Tcl_GetHashValue(hPtr);
+	return (Content *)Tcl_GetHashValue(hPtr);
     }
 
     /*
-     * No preexisting slave structure for that window, so make a new one and
+     * No preexisting content structure for that window, so make a new one and
      * populate it with some default values.
      */
 
-    slavePtr = ckalloc(sizeof(Slave));
-    memset(slavePtr, 0, sizeof(Slave));
-    slavePtr->tkwin = tkwin;
-    slavePtr->inTkwin = NULL;
-    slavePtr->anchor = TK_ANCHOR_NW;
-    slavePtr->borderMode = BM_INSIDE;
-    slavePtr->optionTable = table;
-    Tcl_SetHashValue(hPtr, slavePtr);
-    Tk_CreateEventHandler(tkwin, StructureNotifyMask, SlaveStructureProc,
-	    slavePtr);
-    return slavePtr;
+    contentPtr = (Content *)ckalloc(sizeof(Content));
+    memset(contentPtr, 0, sizeof(Content));
+    contentPtr->tkwin = tkwin;
+    contentPtr->inTkwin = NULL;
+    contentPtr->anchor = TK_ANCHOR_NW;
+    contentPtr->borderMode = BM_INSIDE;
+    contentPtr->optionTable = table;
+    Tcl_SetHashValue(hPtr, contentPtr);
+    Tk_CreateEventHandler(tkwin, StructureNotifyMask, ContentStructureProc,
+	    contentPtr);
+    return contentPtr;
 }
 
 /*
  *----------------------------------------------------------------------
  *
- * FreeSlave --
+ * FreeContent --
  *
- *	Frees the resources held by a Slave structure.
+ *	Frees the resources held by a Content structure.
  *
  * Results:
  *	None
@@ -423,25 +423,25 @@ CreateSlave(
  */
 
 static void
-FreeSlave(
-    Slave *slavePtr)
+FreeContent(
+    Content *contentPtr)
 {
-    Tk_FreeConfigOptions((char *) slavePtr, slavePtr->optionTable,
-	    slavePtr->tkwin);
-    ckfree(slavePtr);
+    Tk_FreeConfigOptions((char *) contentPtr, contentPtr->optionTable,
+	    contentPtr->tkwin);
+    ckfree(contentPtr);
 }
 
 /*
  *----------------------------------------------------------------------
  *
- * FindSlave --
+ * FindContent --
  *
- *	Given a Tk_Window token, find the Slave structure corresponding to
+ *	Given a Tk_Window token, find the Content structure corresponding to
  *	that token. This is purely a lookup function; it will not create a
  *	record if one does not yet exist.
  *
  * Results:
- *	Pointer to Slave structure; NULL if none exists.
+ *	Pointer to Content structure; NULL if none exists.
  *
  * Side effects:
  *	None.
@@ -449,9 +449,9 @@ FreeSlave(
  *----------------------------------------------------------------------
  */
 
-static Slave *
-FindSlave(
-    Tk_Window tkwin)		/* Token for desired slave. */
+static Content *
+FindContent(
+    Tk_Window tkwin)		/* Token for desired content. */
 {
     Tcl_HashEntry *hPtr;
     TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr;
@@ -460,46 +460,46 @@ FindSlave(
     if (hPtr == NULL) {
 	return NULL;
     }
-    return Tcl_GetHashValue(hPtr);
+    return (Content *)Tcl_GetHashValue(hPtr);
 }
 
 /*
  *----------------------------------------------------------------------
  *
- * UnlinkSlave --
+ * UnlinkContent --
  *
- *	This function removes a slave window from the chain of slaves in its
+ *	This function removes a content window from the chain of content in its
  *	container.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	The slave list of slavePtr's container changes.
+ *	The content list of contentPtr's container changes.
  *
  *----------------------------------------------------------------------
  */
 
 static void
-UnlinkSlave(
-    Slave *slavePtr)		/* Slave structure to be unlinked. */
+UnlinkContent(
+    Content *contentPtr)		/* Content structure to be unlinked. */
 {
-    Master *containerPtr;
-    Slave *prevPtr;
+    Container *containerPtr;
+    Content *prevPtr;
 
-    containerPtr = slavePtr->containerPtr;
+    containerPtr = contentPtr->containerPtr;
     if (containerPtr == NULL) {
 	return;
     }
-    if (containerPtr->slavePtr == slavePtr) {
-	containerPtr->slavePtr = slavePtr->nextPtr;
+    if (containerPtr->contentPtr == contentPtr) {
+	containerPtr->contentPtr = contentPtr->nextPtr;
     } else {
-	for (prevPtr = containerPtr->slavePtr; ; prevPtr = prevPtr->nextPtr) {
+	for (prevPtr = containerPtr->contentPtr; ; prevPtr = prevPtr->nextPtr) {
 	    if (prevPtr == NULL) {
-		Tcl_Panic("UnlinkSlave couldn't find slave to unlink");
+		Tcl_Panic("UnlinkContent couldn't find slave to unlink");
 	    }
-	    if (prevPtr->nextPtr == slavePtr) {
-		prevPtr->nextPtr = slavePtr->nextPtr;
+	    if (prevPtr->nextPtr == contentPtr) {
+		prevPtr->nextPtr = contentPtr->nextPtr;
 		break;
 	    }
 	}
@@ -508,47 +508,47 @@ UnlinkSlave(
     if (containerPtr->abortPtr != NULL) {
 	*containerPtr->abortPtr = 1;
     }
-    slavePtr->containerPtr = NULL;
+    contentPtr->containerPtr = NULL;
 }
 
 /*
  *----------------------------------------------------------------------
  *
- * CreateMaster --
+ * CreateContainer --
  *
- *	Given a Tk_Window token, find the Master structure corresponding to
+ *	Given a Tk_Window token, find the Container structure corresponding to
  *	that token, creating a new one if necessary.
  *
  * Results:
- *	Pointer to the Master structure.
+ *	Pointer to the Container structure.
  *
  * Side effects:
- *	A new Master structure may be created.
+ *	A new Container structure may be created.
  *
  *----------------------------------------------------------------------
  */
 
-static Master *
-CreateMaster(
+static Container *
+CreateContainer(
     Tk_Window tkwin)		/* Token for desired container. */
 {
     Tcl_HashEntry *hPtr;
-    Master *containerPtr;
+    Container *containerPtr;
     int isNew;
     TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr;
 
-    hPtr = Tcl_CreateHashEntry(&dispPtr->masterTable, (char *) tkwin, &isNew);
+    hPtr = Tcl_CreateHashEntry(&dispPtr->masterTable, (char *)tkwin, &isNew);
     if (isNew) {
-	containerPtr = ckalloc(sizeof(Master));
+	containerPtr = (Container *)ckalloc(sizeof(Container));
 	containerPtr->tkwin = tkwin;
-	containerPtr->slavePtr = NULL;
+	containerPtr->contentPtr = NULL;
 	containerPtr->abortPtr = NULL;
 	containerPtr->flags = 0;
 	Tcl_SetHashValue(hPtr, containerPtr);
 	Tk_CreateEventHandler(containerPtr->tkwin, StructureNotifyMask,
 		PlaceStructureProc, containerPtr);
     } else {
-	containerPtr = Tcl_GetHashValue(hPtr);
+	containerPtr = (Container *)Tcl_GetHashValue(hPtr);
     }
     return containerPtr;
 }
@@ -556,14 +556,14 @@ CreateMaster(
 /*
  *----------------------------------------------------------------------
  *
- * FindMaster --
+ * FindContainer --
  *
- *	Given a Tk_Window token, find the Master structure corresponding to
+ *	Given a Tk_Window token, find the Container structure corresponding to
  *	that token. This is simply a lookup function; a new record will not be
  *	created if one does not already exist.
  *
  * Results:
- *	Pointer to the Master structure; NULL if one does not exist for the
+ *	Pointer to the Container structure; NULL if one does not exist for the
  *	given Tk_Window token.
  *
  * Side effects:
@@ -572,8 +572,8 @@ CreateMaster(
  *----------------------------------------------------------------------
  */
 
-static Master *
-FindMaster(
+static Container *
+FindContainer(
     Tk_Window tkwin)		/* Token for desired container. */
 {
     Tcl_HashEntry *hPtr;
@@ -583,7 +583,7 @@ FindMaster(
     if (hPtr == NULL) {
 	return NULL;
     }
-    return Tcl_GetHashValue(hPtr);
+    return (Container *)Tcl_GetHashValue(hPtr);
 }
 
 /*
@@ -599,7 +599,7 @@ FindMaster(
  *	the interp's result.
  *
  * Side effects:
- *	Information in slavePtr may change, and slavePtr's container is scheduled
+ *	Information in contentPtr may change, and contentPtr's container is scheduled
  *	for reconfiguration.
  *
  *----------------------------------------------------------------------
@@ -613,10 +613,10 @@ ConfigureContent(
     int objc,			/* Number of config arguments. */
     Tcl_Obj *const objv[])	/* Object values for arguments. */
 {
-    Master *containerPtr;
+    Container *containerPtr;
     Tk_SavedOptions savedOptions;
     int mask;
-    Slave *slavePtr;
+    Content *contentPtr;
     Tk_Window containerWin = NULL;
     TkWindow *container;
 
@@ -628,71 +628,71 @@ ConfigureContent(
 	return TCL_ERROR;
     }
 
-    slavePtr = CreateSlave(tkwin, table);
+    contentPtr = CreateContent(tkwin, table);
 
-    if (Tk_SetOptions(interp, (char *) slavePtr, table, objc, objv,
-	    slavePtr->tkwin, &savedOptions, &mask) != TCL_OK) {
+    if (Tk_SetOptions(interp, (char *)contentPtr, table, objc, objv,
+	    contentPtr->tkwin, &savedOptions, &mask) != TCL_OK) {
 	goto error;
     }
 
     /*
-     * Set slave flags. First clear the field, then add bits as needed.
+     * Set content flags. First clear the field, then add bits as needed.
      */
 
-    slavePtr->flags = 0;
-    if (slavePtr->heightPtr) {
-	slavePtr->flags |= CHILD_HEIGHT;
+    contentPtr->flags = 0;
+    if (contentPtr->heightPtr) {
+	contentPtr->flags |= CHILD_HEIGHT;
     }
 
-    if (slavePtr->relHeightPtr) {
-	slavePtr->flags |= CHILD_REL_HEIGHT;
+    if (contentPtr->relHeightPtr) {
+	contentPtr->flags |= CHILD_REL_HEIGHT;
     }
 
-    if (slavePtr->relWidthPtr) {
-	slavePtr->flags |= CHILD_REL_WIDTH;
+    if (contentPtr->relWidthPtr) {
+	contentPtr->flags |= CHILD_REL_WIDTH;
     }
 
-    if (slavePtr->widthPtr) {
-	slavePtr->flags |= CHILD_WIDTH;
+    if (contentPtr->widthPtr) {
+	contentPtr->flags |= CHILD_WIDTH;
     }
 
-    if (!(mask & IN_MASK) && (slavePtr->containerPtr != NULL)) {
+    if (!(mask & IN_MASK) && (contentPtr->containerPtr != NULL)) {
 	/*
-	 * If no -in option was passed and the slave is already placed then
+	 * If no -in option was passed and the content is already placed then
 	 * just recompute the placement.
 	 */
 
-	containerPtr = slavePtr->containerPtr;
+	containerPtr = contentPtr->containerPtr;
 	goto scheduleLayout;
     } else if (mask & IN_MASK) {
 	/* -in changed */
 	Tk_Window tkwin;
 	Tk_Window ancestor;
 
-	tkwin = slavePtr->inTkwin;
+	tkwin = contentPtr->inTkwin;
 
 	/*
 	 * Make sure that the new container is either the logical parent of the
-	 * slave or a descendant of that window, and that the container and slave
+	 * content or a descendant of that window, and that the container and content
 	 * aren't the same.
 	 */
 
 	for (ancestor = tkwin; ; ancestor = Tk_Parent(ancestor)) {
-	    if (ancestor == Tk_Parent(slavePtr->tkwin)) {
+	    if (ancestor == Tk_Parent(contentPtr->tkwin)) {
 		break;
 	    }
 	    if (Tk_TopWinHierarchy(ancestor)) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 			"can't place %s relative to %s",
-			Tk_PathName(slavePtr->tkwin), Tk_PathName(tkwin)));
+			Tk_PathName(contentPtr->tkwin), Tk_PathName(tkwin)));
 		Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "HIERARCHY", NULL);
 		goto error;
 	    }
 	}
-	if (slavePtr->tkwin == tkwin) {
+	if (contentPtr->tkwin == tkwin) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "can't place %s relative to itself",
-		    Tk_PathName(slavePtr->tkwin)));
+		    Tk_PathName(contentPtr->tkwin)));
 	    Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "LOOP", NULL);
 	    goto error;
 	}
@@ -703,53 +703,53 @@ ConfigureContent(
 
 	for (container = (TkWindow *)tkwin; container != NULL;
 	     container = (TkWindow *)TkGetGeomMaster(container)) {
-	    if (container == (TkWindow *)slavePtr->tkwin) {
+	    if (container == (TkWindow *)contentPtr->tkwin) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "can't put %s inside %s, would cause management loop",
-	            Tk_PathName(slavePtr->tkwin), Tk_PathName(tkwin)));
+	            Tk_PathName(contentPtr->tkwin), Tk_PathName(tkwin)));
 		Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "LOOP", NULL);
 		goto error;
 	    }
 	}
-	if (tkwin != Tk_Parent(slavePtr->tkwin)) {
-	    ((TkWindow *)slavePtr->tkwin)->maintainerPtr = (TkWindow *)tkwin;
+	if (tkwin != Tk_Parent(contentPtr->tkwin)) {
+	    ((TkWindow *)contentPtr->tkwin)->maintainerPtr = (TkWindow *)tkwin;
 	}
 
-	if ((slavePtr->containerPtr != NULL)
-		&& (slavePtr->containerPtr->tkwin == tkwin)) {
+	if ((contentPtr->containerPtr != NULL)
+		&& (contentPtr->containerPtr->tkwin == tkwin)) {
 	    /*
 	     * Re-using same old container. Nothing to do.
 	     */
 
-	    containerPtr = slavePtr->containerPtr;
+	    containerPtr = contentPtr->containerPtr;
 	    goto scheduleLayout;
 	}
-	if ((slavePtr->containerPtr != NULL) &&
-		(slavePtr->containerPtr->tkwin != Tk_Parent(slavePtr->tkwin))) {
-	    Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->containerPtr->tkwin);
+	if ((contentPtr->containerPtr != NULL) &&
+		(contentPtr->containerPtr->tkwin != Tk_Parent(contentPtr->tkwin))) {
+	    Tk_UnmaintainGeometry(contentPtr->tkwin, contentPtr->containerPtr->tkwin);
 	}
-	UnlinkSlave(slavePtr);
+	UnlinkContent(contentPtr);
 	containerWin = tkwin;
     }
 
     /*
-     * If there's no container specified for this slave, use its Tk_Parent.
+     * If there's no container specified for this content, use its Tk_Parent.
      */
 
     if (containerWin == NULL) {
-	containerWin = Tk_Parent(slavePtr->tkwin);
-	slavePtr->inTkwin = containerWin;
+	containerWin = Tk_Parent(contentPtr->tkwin);
+	contentPtr->inTkwin = containerWin;
     }
 
     /*
-     * Manage the slave window in this container.
+     * Manage the content window in this container.
      */
 
-    containerPtr = CreateMaster(containerWin);
-    slavePtr->containerPtr = containerPtr;
-    slavePtr->nextPtr = containerPtr->slavePtr;
-    containerPtr->slavePtr = slavePtr;
-    Tk_ManageGeometry(slavePtr->tkwin, &placerType, slavePtr);
+    containerPtr = CreateContainer(containerWin);
+    contentPtr->containerPtr = containerPtr;
+    contentPtr->nextPtr = containerPtr->contentPtr;
+    containerPtr->contentPtr = contentPtr;
+    Tk_ManageGeometry(contentPtr->tkwin, &placerType, contentPtr);
 
     /*
      * Arrange for the container to be re-arranged at the first idle moment.
@@ -796,49 +796,49 @@ PlaceInfoCommand(
     Tcl_Interp *interp,		/* Interp into which to place result. */
     Tk_Window tkwin)		/* Token for the window to get info on. */
 {
-    Slave *slavePtr;
+    Content *contentPtr;
     Tcl_Obj *infoObj;
 
-    slavePtr = FindSlave(tkwin);
-    if (slavePtr == NULL) {
+    contentPtr = FindContent(tkwin);
+    if (contentPtr == NULL) {
 	return TCL_OK;
     }
     infoObj = Tcl_NewObj();
-    if (slavePtr->containerPtr != NULL) {
+    if (contentPtr->containerPtr != NULL) {
 	Tcl_AppendToObj(infoObj, "-in", -1);
 	Tcl_ListObjAppendElement(NULL, infoObj,
-		TkNewWindowObj(slavePtr->containerPtr->tkwin));
+		TkNewWindowObj(contentPtr->containerPtr->tkwin));
 	Tcl_AppendToObj(infoObj, " ", -1);
     }
     Tcl_AppendPrintfToObj(infoObj,
 	    "-x %d -relx %.4g -y %d -rely %.4g",
-	    slavePtr->x, slavePtr->relX, slavePtr->y, slavePtr->relY);
-    if (slavePtr->flags & CHILD_WIDTH) {
-	Tcl_AppendPrintfToObj(infoObj, " -width %d", slavePtr->width);
+	    contentPtr->x, contentPtr->relX, contentPtr->y, contentPtr->relY);
+    if (contentPtr->flags & CHILD_WIDTH) {
+	Tcl_AppendPrintfToObj(infoObj, " -width %d", contentPtr->width);
     } else {
 	Tcl_AppendToObj(infoObj, " -width {}", -1);
     }
-    if (slavePtr->flags & CHILD_REL_WIDTH) {
+    if (contentPtr->flags & CHILD_REL_WIDTH) {
 	Tcl_AppendPrintfToObj(infoObj,
-		" -relwidth %.4g", slavePtr->relWidth);
+		" -relwidth %.4g", contentPtr->relWidth);
     } else {
 	Tcl_AppendToObj(infoObj, " -relwidth {}", -1);
     }
-    if (slavePtr->flags & CHILD_HEIGHT) {
-	Tcl_AppendPrintfToObj(infoObj, " -height %d", slavePtr->height);
+    if (contentPtr->flags & CHILD_HEIGHT) {
+	Tcl_AppendPrintfToObj(infoObj, " -height %d", contentPtr->height);
     } else {
 	Tcl_AppendToObj(infoObj, " -height {}", -1);
     }
-    if (slavePtr->flags & CHILD_REL_HEIGHT) {
+    if (contentPtr->flags & CHILD_REL_HEIGHT) {
 	Tcl_AppendPrintfToObj(infoObj,
-		" -relheight %.4g", slavePtr->relHeight);
+		" -relheight %.4g", contentPtr->relHeight);
     } else {
 	Tcl_AppendToObj(infoObj, " -relheight {}", -1);
     }
 
     Tcl_AppendPrintfToObj(infoObj, " -anchor %s -bordermode %s",
-	    Tk_NameOfAnchor(slavePtr->anchor),
-	    borderModeStrings[slavePtr->borderMode]);
+	    Tk_NameOfAnchor(contentPtr->anchor),
+	    borderModeStrings[contentPtr->borderMode]);
     Tcl_SetObjResult(interp, infoObj);
     return TCL_OK;
 }
@@ -849,7 +849,7 @@ PlaceInfoCommand(
  * RecomputePlacement --
  *
  *	This function is called as a when-idle handler. It recomputes the
- *	geometries of all the slaves of a given container.
+ *	geometries of all the content of a given container.
  *
  * Results:
  *	None.
@@ -862,10 +862,10 @@ PlaceInfoCommand(
 
 static void
 RecomputePlacement(
-    ClientData clientData)	/* Pointer to Master record. */
+    ClientData clientData)	/* Pointer to Container record. */
 {
-    Master *containerPtr = clientData;
-    Slave *slavePtr;
+    Container *containerPtr = (Container *)clientData;
+    Content *contentPtr;
     int x, y, width, height, tmp;
     int containerWidth, containerHeight, containerX, containerY;
     double x1, y1, x2, y2;
@@ -888,14 +888,14 @@ RecomputePlacement(
     Tcl_Preserve(containerPtr);
 
     /*
-     * Iterate over all the slaves for the container. Each slave's geometry can
-     * be computed independently of the other slaves. Changes to the window's
+     * Iterate over all the content for the container. Each content's geometry can
+     * be computed independently of the other content. Changes to the window's
      * structure could cause almost anything to happen, including deleting the
      * parent or child. If this happens, we'll be told to abort.
      */
 
-    for (slavePtr = containerPtr->slavePtr; slavePtr != NULL && !abort;
-	    slavePtr = slavePtr->nextPtr) {
+    for (contentPtr = containerPtr->contentPtr; contentPtr != NULL && !abort;
+	    contentPtr = contentPtr->nextPtr) {
 	/*
 	 * Step 1: compute size and borderwidth of container, taking into account
 	 * desired border mode.
@@ -904,33 +904,33 @@ RecomputePlacement(
 	containerX = containerY = 0;
 	containerWidth = Tk_Width(containerPtr->tkwin);
 	containerHeight = Tk_Height(containerPtr->tkwin);
-	if (slavePtr->borderMode == BM_INSIDE) {
+	if (contentPtr->borderMode == BM_INSIDE) {
 	    containerX = Tk_InternalBorderLeft(containerPtr->tkwin);
 	    containerY = Tk_InternalBorderTop(containerPtr->tkwin);
 	    containerWidth -= containerX + Tk_InternalBorderRight(containerPtr->tkwin);
 	    containerHeight -= containerY +
 		    Tk_InternalBorderBottom(containerPtr->tkwin);
-	} else if (slavePtr->borderMode == BM_OUTSIDE) {
+	} else if (contentPtr->borderMode == BM_OUTSIDE) {
 	    containerX = containerY = -Tk_Changes(containerPtr->tkwin)->border_width;
 	    containerWidth -= 2 * containerX;
 	    containerHeight -= 2 * containerY;
 	}
 
 	/*
-	 * Step 2: compute size of slave (outside dimensions including border)
+	 * Step 2: compute size of content (outside dimensions including border)
 	 * and location of anchor point within container.
 	 */
 
-	x1 = slavePtr->x + containerX + (slavePtr->relX*containerWidth);
+	x1 = contentPtr->x + containerX + (contentPtr->relX*containerWidth);
 	x = (int) (x1 + ((x1 > 0) ? 0.5 : -0.5));
-	y1 = slavePtr->y + containerY + (slavePtr->relY*containerHeight);
+	y1 = contentPtr->y + containerY + (contentPtr->relY*containerHeight);
 	y = (int) (y1 + ((y1 > 0) ? 0.5 : -0.5));
-	if (slavePtr->flags & (CHILD_WIDTH|CHILD_REL_WIDTH)) {
+	if (contentPtr->flags & (CHILD_WIDTH|CHILD_REL_WIDTH)) {
 	    width = 0;
-	    if (slavePtr->flags & CHILD_WIDTH) {
-		width += slavePtr->width;
+	    if (contentPtr->flags & CHILD_WIDTH) {
+		width += contentPtr->width;
 	    }
-	    if (slavePtr->flags & CHILD_REL_WIDTH) {
+	    if (contentPtr->flags & CHILD_REL_WIDTH) {
 		/*
 		 * The code below is a bit tricky. In order to round correctly
 		 * when both relX and relWidth are specified, compute the
@@ -939,40 +939,40 @@ RecomputePlacement(
 		 * errors in relX and relWidth accumulate.
 		 */
 
-		x2 = x1 + (slavePtr->relWidth*containerWidth);
+		x2 = x1 + (contentPtr->relWidth*containerWidth);
 		tmp = (int) (x2 + ((x2 > 0) ? 0.5 : -0.5));
 		width += tmp - x;
 	    }
 	} else {
-	    width = Tk_ReqWidth(slavePtr->tkwin)
-		    + 2*Tk_Changes(slavePtr->tkwin)->border_width;
+	    width = Tk_ReqWidth(contentPtr->tkwin)
+		    + 2*Tk_Changes(contentPtr->tkwin)->border_width;
 	}
-	if (slavePtr->flags & (CHILD_HEIGHT|CHILD_REL_HEIGHT)) {
+	if (contentPtr->flags & (CHILD_HEIGHT|CHILD_REL_HEIGHT)) {
 	    height = 0;
-	    if (slavePtr->flags & CHILD_HEIGHT) {
-		height += slavePtr->height;
+	    if (contentPtr->flags & CHILD_HEIGHT) {
+		height += contentPtr->height;
 	    }
-	    if (slavePtr->flags & CHILD_REL_HEIGHT) {
+	    if (contentPtr->flags & CHILD_REL_HEIGHT) {
 		/*
 		 * See note above for rounding errors in width computation.
 		 */
 
-		y2 = y1 + (slavePtr->relHeight*containerHeight);
+		y2 = y1 + (contentPtr->relHeight*containerHeight);
 		tmp = (int) (y2 + ((y2 > 0) ? 0.5 : -0.5));
 		height += tmp - y;
 	    }
 	} else {
-	    height = Tk_ReqHeight(slavePtr->tkwin)
-		    + 2*Tk_Changes(slavePtr->tkwin)->border_width;
+	    height = Tk_ReqHeight(contentPtr->tkwin)
+		    + 2*Tk_Changes(contentPtr->tkwin)->border_width;
 	}
 
 	/*
 	 * Step 3: adjust the x and y positions so that the desired anchor
-	 * point on the slave appears at that position. Also adjust for the
+	 * point on the content appears at that position. Also adjust for the
 	 * border mode and container's border.
 	 */
 
-	switch (slavePtr->anchor) {
+	switch (contentPtr->anchor) {
 	case TK_ANCHOR_N:
 	    x -= width/2;
 	    break;
@@ -1011,8 +1011,8 @@ RecomputePlacement(
 	 * height aren't zero.
 	 */
 
-	width -= 2*Tk_Changes(slavePtr->tkwin)->border_width;
-	height -= 2*Tk_Changes(slavePtr->tkwin)->border_width;
+	width -= 2*Tk_Changes(contentPtr->tkwin)->border_width;
+	height -= 2*Tk_Changes(contentPtr->tkwin)->border_width;
 	if (width <= 0) {
 	    width = 1;
 	}
@@ -1021,37 +1021,37 @@ RecomputePlacement(
 	}
 
 	/*
-	 * Step 5: reconfigure the window and map it if needed. If the slave
-	 * is a child of the container, we do this ourselves. If the slave isn't
+	 * Step 5: reconfigure the window and map it if needed. If the content
+	 * is a child of the container, we do this ourselves. If the content isn't
 	 * a child of the container, let Tk_MaintainGeometry do the work (it will
 	 * re-adjust things as relevant windows map, unmap, and move).
 	 */
 
-	if (containerPtr->tkwin == Tk_Parent(slavePtr->tkwin)) {
-	    if ((x != Tk_X(slavePtr->tkwin))
-		    || (y != Tk_Y(slavePtr->tkwin))
-		    || (width != Tk_Width(slavePtr->tkwin))
-		    || (height != Tk_Height(slavePtr->tkwin))) {
-		Tk_MoveResizeWindow(slavePtr->tkwin, x, y, width, height);
+	if (containerPtr->tkwin == Tk_Parent(contentPtr->tkwin)) {
+	    if ((x != Tk_X(contentPtr->tkwin))
+		    || (y != Tk_Y(contentPtr->tkwin))
+		    || (width != Tk_Width(contentPtr->tkwin))
+		    || (height != Tk_Height(contentPtr->tkwin))) {
+		Tk_MoveResizeWindow(contentPtr->tkwin, x, y, width, height);
 	    }
             if (abort) {
                 break;
             }
 
 	    /*
-	     * Don't map the slave unless the container is mapped: the slave will
+	     * Don't map the content unless the container is mapped: the content will
 	     * get mapped later, when the container is mapped.
 	     */
 
 	    if (Tk_IsMapped(containerPtr->tkwin)) {
-		Tk_MapWindow(slavePtr->tkwin);
+		Tk_MapWindow(contentPtr->tkwin);
 	    }
 	} else {
 	    if ((width <= 0) || (height <= 0)) {
-		Tk_UnmaintainGeometry(slavePtr->tkwin, containerPtr->tkwin);
-		Tk_UnmapWindow(slavePtr->tkwin);
+		Tk_UnmaintainGeometry(contentPtr->tkwin, containerPtr->tkwin);
+		Tk_UnmapWindow(contentPtr->tkwin);
 	    } else {
-		Tk_MaintainGeometry(slavePtr->tkwin, containerPtr->tkwin,
+		Tk_MaintainGeometry(contentPtr->tkwin, containerPtr->tkwin,
 			x, y, width, height);
 	    }
 	}
@@ -1074,35 +1074,35 @@ RecomputePlacement(
  *
  * Side effects:
  *	Structures get cleaned up if the window was deleted. If the window was
- *	resized then slave geometries get recomputed.
+ *	resized then content geometries get recomputed.
  *
  *----------------------------------------------------------------------
  */
 
 static void
 PlaceStructureProc(
-    ClientData clientData,	/* Pointer to Master structure for window
+    ClientData clientData,	/* Pointer to Container structure for window
 				 * referred to by eventPtr. */
     XEvent *eventPtr)		/* Describes what just happened. */
 {
-    Master *containerPtr = clientData;
-    Slave *slavePtr, *nextPtr;
+    Container *containerPtr = (Container *)clientData;
+    Content *contentPtr, *nextPtr;
     TkDisplay *dispPtr = ((TkWindow *) containerPtr->tkwin)->dispPtr;
 
     switch (eventPtr->type) {
     case ConfigureNotify:
-	if ((containerPtr->slavePtr != NULL)
+	if ((containerPtr->contentPtr != NULL)
 		&& !(containerPtr->flags & PARENT_RECONFIG_PENDING)) {
 	    containerPtr->flags |= PARENT_RECONFIG_PENDING;
 	    Tcl_DoWhenIdle(RecomputePlacement, containerPtr);
 	}
 	return;
     case DestroyNotify:
-	for (slavePtr = containerPtr->slavePtr; slavePtr != NULL;
-		slavePtr = nextPtr) {
-	    slavePtr->containerPtr = NULL;
-	    nextPtr = slavePtr->nextPtr;
-	    slavePtr->nextPtr = NULL;
+	for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
+		contentPtr = nextPtr) {
+	    contentPtr->containerPtr = NULL;
+	    nextPtr = contentPtr->nextPtr;
+	    contentPtr->nextPtr = NULL;
 	}
 	Tcl_DeleteHashEntry(Tcl_FindHashEntry(&dispPtr->masterTable,
 		(char *) containerPtr->tkwin));
@@ -1118,10 +1118,10 @@ PlaceStructureProc(
     case MapNotify:
 	/*
 	 * When a container gets mapped, must redo the geometry computation so
-	 * that all of its slaves get remapped.
+	 * that all of its content get remapped.
 	 */
 
-	if ((containerPtr->slavePtr != NULL)
+	if ((containerPtr->contentPtr != NULL)
 		&& !(containerPtr->flags & PARENT_RECONFIG_PENDING)) {
 	    containerPtr->flags |= PARENT_RECONFIG_PENDING;
 	    Tcl_DoWhenIdle(RecomputePlacement, containerPtr);
@@ -1129,13 +1129,13 @@ PlaceStructureProc(
 	return;
     case UnmapNotify:
 	/*
-	 * Unmap all of the slaves when the container gets unmapped, so that they
+	 * Unmap all of the content when the container gets unmapped, so that they
 	 * don't keep redisplaying themselves.
 	 */
 
-	for (slavePtr = containerPtr->slavePtr; slavePtr != NULL;
-		slavePtr = slavePtr->nextPtr) {
-	    Tk_UnmapWindow(slavePtr->tkwin);
+	for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
+		contentPtr = contentPtr->nextPtr) {
+	    Tk_UnmapWindow(contentPtr->tkwin);
 	}
 	return;
     }
@@ -1144,10 +1144,10 @@ PlaceStructureProc(
 /*
  *----------------------------------------------------------------------
  *
- * SlaveStructureProc --
+ * ContentStructureProc --
  *
  *	This function is invoked by the Tk event handler when StructureNotify
- *	events occur for a slave window.
+ *	events occur for a content window.
  *
  * Results:
  *	None.
@@ -1159,21 +1159,21 @@ PlaceStructureProc(
  */
 
 static void
-SlaveStructureProc(
-    ClientData clientData,	/* Pointer to Slave structure for window
+ContentStructureProc(
+    ClientData clientData,	/* Pointer to Content structure for window
 				 * referred to by eventPtr. */
     XEvent *eventPtr)		/* Describes what just happened. */
 {
-    Slave *slavePtr = clientData;
-    TkDisplay *dispPtr = ((TkWindow *) slavePtr->tkwin)->dispPtr;
+    Content *contentPtr = (Content *)clientData;
+    TkDisplay *dispPtr = ((TkWindow *) contentPtr->tkwin)->dispPtr;
 
     if (eventPtr->type == DestroyNotify) {
-	if (slavePtr->containerPtr != NULL) {
-	    UnlinkSlave(slavePtr);
+	if (contentPtr->containerPtr != NULL) {
+	    UnlinkContent(contentPtr);
 	}
 	Tcl_DeleteHashEntry(Tcl_FindHashEntry(&dispPtr->slaveTable,
-		(char *) slavePtr->tkwin));
-	FreeSlave(slavePtr);
+		(char *) contentPtr->tkwin));
+	FreeContent(contentPtr);
     }
 }
 
@@ -1182,7 +1182,7 @@ SlaveStructureProc(
  *
  * PlaceRequestProc --
  *
- *	This function is invoked by Tk whenever a slave managed by us changes
+ *	This function is invoked by Tk whenever a content managed by us changes
  *	its requested geometry.
  *
  * Results:
@@ -1195,26 +1195,25 @@ SlaveStructureProc(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static void
 PlaceRequestProc(
-    ClientData clientData,	/* Pointer to our record for slave. */
-    Tk_Window tkwin)		/* Window that changed its desired size. */
+    ClientData clientData,	/* Pointer to our record for content. */
+    TCL_UNUSED(Tk_Window))		/* Window that changed its desired size. */
 {
-    Slave *slavePtr = clientData;
-    Master *containerPtr;
+    Content *contentPtr = (Content *)clientData;
+    Container *containerPtr;
 
-    if ((slavePtr->flags & (CHILD_WIDTH|CHILD_REL_WIDTH))
-	    && (slavePtr->flags & (CHILD_HEIGHT|CHILD_REL_HEIGHT))) {
+    if ((contentPtr->flags & (CHILD_WIDTH|CHILD_REL_WIDTH))
+	    && (contentPtr->flags & (CHILD_HEIGHT|CHILD_REL_HEIGHT))) {
         /*
          * Send a ConfigureNotify to indicate that the size change
          * request was rejected.
          */
 
-        TkDoConfigureNotify((TkWindow *)(slavePtr->tkwin));
+        TkDoConfigureNotify((TkWindow *)(contentPtr->tkwin));
 	return;
     }
-    containerPtr = slavePtr->containerPtr;
+    containerPtr = contentPtr->containerPtr;
     if (containerPtr == NULL) {
 	return;
     }
@@ -1241,26 +1240,25 @@ PlaceRequestProc(
  *--------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static void
 PlaceLostContentProc(
-    ClientData clientData,	/* Slave structure for slave window that was
+    ClientData clientData,	/* Content structure for content window that was
 				 * stolen away. */
-    Tk_Window tkwin)		/* Tk's handle for the slave window. */
+    Tk_Window tkwin)		/* Tk's handle for the content window. */
 {
-    Slave *slavePtr = clientData;
-    TkDisplay *dispPtr = ((TkWindow *) slavePtr->tkwin)->dispPtr;
+    Content *contentPtr = (Content *)clientData;
+    TkDisplay *dispPtr = ((TkWindow *) contentPtr->tkwin)->dispPtr;
 
-    if (slavePtr->containerPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
-	Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->containerPtr->tkwin);
+    if (contentPtr->containerPtr->tkwin != Tk_Parent(contentPtr->tkwin)) {
+	Tk_UnmaintainGeometry(contentPtr->tkwin, contentPtr->containerPtr->tkwin);
     }
     Tk_UnmapWindow(tkwin);
-    UnlinkSlave(slavePtr);
+    UnlinkContent(contentPtr);
     Tcl_DeleteHashEntry(Tcl_FindHashEntry(&dispPtr->slaveTable,
 	    (char *) tkwin));
-    Tk_DeleteEventHandler(tkwin, StructureNotifyMask, SlaveStructureProc,
-	    slavePtr);
-    FreeSlave(slavePtr);
+    Tk_DeleteEventHandler(tkwin, StructureNotifyMask, ContentStructureProc,
+	    contentPtr);
+    FreeContent(contentPtr);
 }
 
 /*
diff --git a/generic/tkTest.c b/generic/tkTest.c
index bb7bde5..3c17407 100644
--- a/generic/tkTest.c
+++ b/generic/tkTest.c
@@ -1062,14 +1062,14 @@ TestobjconfigObjCmd(
     }
 
     case TWO_WINDOWS: {
-	typedef struct SlaveRecord {
+	typedef struct ContentRecord {
 	    TrivialCommandHeader header;
 	    Tcl_Obj *windowPtr;
-	} SlaveRecord;
-	SlaveRecord *recordPtr;
-	static const Tk_OptionSpec slaveSpecs[] = {
+	} ContentRecord;
+	ContentRecord *recordPtr;
+	static const Tk_OptionSpec contentSpecs[] = {
 	    {TK_OPTION_WINDOW, "-window", "window", "Window", ".bar",
-		Tk_Offset(SlaveRecord, windowPtr), -1, TK_CONFIG_NULL_OK, NULL, 0},
+		Tk_Offset(ContentRecord, windowPtr), -1, TK_CONFIG_NULL_OK, NULL, 0},
 	    {TK_OPTION_END, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0}
 	};
 	Tk_Window tkwin = Tk_CreateWindowFromPath(interp,
@@ -1080,10 +1080,10 @@ TestobjconfigObjCmd(
 	}
 	Tk_SetClass(tkwin, "Test");
 
-	recordPtr = ckalloc(sizeof(SlaveRecord));
+	recordPtr = ckalloc(sizeof(ContentRecord));
 	recordPtr->header.interp = interp;
 	recordPtr->header.optionTable = Tk_CreateOptionTable(interp,
-		slaveSpecs);
+		contentSpecs);
 	tables[index] = recordPtr->header.optionTable;
 	recordPtr->header.tkwin = tkwin;
 	recordPtr->windowPtr = NULL;
diff --git a/win/rules.vc b/win/rules.vc
index d4765b9..6dca6d9 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -514,7 +514,7 @@ CFG_ENCODING	= \"cp1252\"
 # information about supported compiler options etc.
 #
 # Tcl itself will always use the nmakehlp.c program which is
-# in its own source. This is the "master" copy and kept updated.
+# in its own source. It will be kept updated there.
 #
 # Extensions built against an installed Tcl will use the installed
 # copy of Tcl's nmakehlp.c if there is one and their own version
@@ -1669,7 +1669,7 @@ default-shell: default-setup $(PROJECT)
 !ifdef RCFILE
 
 # Note: don't use $** in below rule because there may be other dependencies
-# and only the "master" rc must be passed to the resource compiler
+# and only the "main" rc must be passed to the resource compiler
 $(TMP_DIR)\$(PROJECT).res: $(RCDIR)\$(PROJECT).rc
 	$(RESCMD) $(RCDIR)\$(PROJECT).rc
 
@@ -1723,7 +1723,7 @@ DISABLE_IMPLICIT_RULES = 0
 
 !if !$(DISABLE_IMPLICIT_RULES)
 # Implicit rule definitions - only for building library objects. For stubs and
-# main application, the master makefile should define explicit rules.
+# main application, the makefile should define explicit rules.
 
 {$(ROOT)}.c{$(TMP_DIR)}.obj::
 	$(CCPKGCMD) @<<
-- 
cgit v0.12


From 3b22ceb0af03432acd3eef120a2e085358c48328 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Fri, 4 Sep 2020 18:00:32 +0000
Subject: Straighten out a lot of convoluted code in tkMacOSXMouseEvent.c

---
 macosx/tkMacOSXMouseEvent.c | 195 +++++++++++++++++++-------------------------
 1 file changed, 85 insertions(+), 110 deletions(-)

diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index be08a29..81fc841 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -42,9 +42,9 @@ enum {
  * window attribute pointing to the active window.  As of 10.8 this behavior
  * had changed.  The new behavior was that if the mouse were ever moved outside
  * of a window, all subsequent NSMouseMoved NSEvents would have a Nil window
- * attribute.  To work around this the TKApplication remembers the last non-Nil
- * window that it received in a mouse event. If it receives an NSEvent with a
- * Nil window attribute then the saved window is used.
+ * attribute until the mouse returned to the window.  In 11.1 it changed again.
+ * The window attribute can be non-nil, but referencing a window which does not
+ * belong to the application.
  */
 
 @implementation TKApplication(TKMouseEvent)
@@ -53,10 +53,10 @@ enum {
     NSWindow *eventWindow = [theEvent window];
     NSEventType eventType = [theEvent type];
     TkWindow *winPtr = NULL, *grabWinPtr;
-    Tk_Window tkwin;
+    Tk_Window tkwin = None, capture, target;
     NSPoint local, global;
     NSInteger button = -1;
-    [NSEvent stopPeriodicEvents];
+    int win_x, win_y;
 
 #ifdef TK_MAC_DEBUG_EVENTS
     TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, theEvent);
@@ -76,11 +76,11 @@ enum {
     case NSMouseExited:
 	[(TKWindow *)eventWindow setMouseInResizeArea:NO];
 	break;
+    case NSMouseMoved:
     case NSCursorUpdate:
     case NSLeftMouseUp:
     case NSRightMouseUp:
     case NSOtherMouseUp:
-    case NSMouseMoved:
     case NSTabletPoint:
     case NSTabletProximity:
     case NSScrollWheel:
@@ -90,112 +90,64 @@ enum {
     }
 
     /*
-     * Compute the mouse position in Tk screen coordinates (global) and in the
-     * Tk coordinates of its containing Tk Window (local). If a grab is in effect,
-     * the local coordinates should be relative to the grab window.
+     * Do not send ButtonPress XEvents for MouseDown NSEvents that start a
+     * resize.  (The MouseUp will be handled during LiveResize.)  See
+     * ticket [d72abe6b54].
      */
 
-    if (eventWindow) {
-	local = [theEvent locationInWindow];
+    if (eventType == NSLeftMouseDown &&
+	[(TKWindow *)eventWindow mouseInResizeArea] &&
+	([eventWindow styleMask] & NSResizableWindowMask)) {
+	return theEvent;
+    }
 
-	/*
-	 * Do not send ButtonPress XEvents for MouseDown NSEvents that start a
-	 * resize.  (The MouseUp will be handled during LiveResize.)  See
-	 * ticket [d72abe6b54].
-	 */
+    /*
+     * Find an appropriate NSWindow to attach to this event, and its
+     * associated Tk window.
+     */
 
-	if (eventType == NSLeftMouseDown &&
-	    [(TKWindow *)eventWindow mouseInResizeArea] &&
-	    ([eventWindow styleMask] & NSResizableWindowMask) &&
-	    [NSApp macOSVersion] > 100600) {
-		return theEvent;
-	}
-	global = [eventWindow tkConvertPointToScreen: local];
-	tkwin = TkMacOSXGetCapture();
-	if (tkwin) {
-	    winPtr = (TkWindow *) tkwin;
-	    eventWindow = TkMacOSXGetNSWindowForDrawable(winPtr->window);
-	    if (eventWindow) {
-		local = [eventWindow tkConvertPointFromScreen: global];
-	    } else {
-		return theEvent;
-	    }
+    capture = TkMacOSXGetCapture();
+    if (capture) {
+	winPtr = (TkWindow *) capture;
+	eventWindow = TkMacOSXGetNSWindowForDrawable(winPtr->window);
+	if (!eventWindow) {
+	    return theEvent;
 	}
-	local.y = [eventWindow frame].size.height - local.y;
-	global.y = TkMacOSXZeroScreenHeight() - global.y;
     } else {
-
-	/*
-	 * If the event has no NSWindow, the location is in screen coordinates.
-	 */
-
-	global = [theEvent locationInWindow];
-	tkwin = TkMacOSXGetCapture();
-	if (tkwin) {
-	    winPtr = (TkWindow *) tkwin;
-	    eventWindow = TkMacOSXGetNSWindowForDrawable(winPtr->window);
-	} else {
-	    eventWindow = [NSApp mainWindow];
+	if (eventWindow) {
+	    winPtr = TkMacOSXGetTkWindow(eventWindow);
 	}
-	if (!eventWindow) {
-	    return theEvent;
+	if (!winPtr) {
+	    eventWindow = [NSApp mainWindow];
+	    winPtr = TkMacOSXGetTkWindow(eventWindow);
 	}
-	local = [eventWindow tkConvertPointFromScreen: global];
-	local.y = [eventWindow frame].size.height - local.y;
-	global.y = TkMacOSXZeroScreenHeight() - global.y;
-    }
-
-    /*
-     * If we still don't have a window, try using the toplevel that
-     * manages the NSWindow.
-     */
-
-    if (!tkwin) {
-	winPtr = TkMacOSXGetTkWindow(eventWindow);
-	tkwin = (Tk_Window)winPtr;
     }
-    if (!tkwin) {
+    if (!winPtr) {
 
 	/*
-	 * We can't find a window for this event.  We have to ignore it.
+	 * We couldn't find a Tk window for this event.  We have to ignore it.
 	 */
 
 #ifdef TK_MAC_DEBUG_EVENTS
-	TkMacOSXDbgMsg("tkwin == NULL");
+	TkMacOSXDbgMsg("Event received with no Tk window.");
 #endif
 	return theEvent;
     }
+    tkwin = (Tk_Window) winPtr;
 
     /*
-     * Ignore the event if a local grab is in effect and the Tk event window is
-     * not in the grabber's subtree.
-     */
-
-    grabWinPtr = winPtr->dispPtr->grabWinPtr;
-    if (grabWinPtr && /* There is a grab in effect ... */
-	!winPtr->dispPtr->grabFlags && /* and it is a local grab ... */
-	grabWinPtr->mainPtr == winPtr->mainPtr){ /* in the same application. */
-	Tk_Window tkwin2, tkEventWindow = Tk_CoordsToWindow(global.x, global.y, tkwin);
-	if (!tkEventWindow) {
-	    return theEvent;
-	}
-	for (tkwin2 = tkEventWindow;
-	     !Tk_IsTopLevel(tkwin2);
-	     tkwin2 = Tk_Parent(tkwin2)) {
-	    if (tkwin2 == (Tk_Window)grabWinPtr) {
-		break;
-	    }
-	}
-	if (tkwin2 != (Tk_Window)grabWinPtr) {
-	    return theEvent;
-	}
-    }
-
-    /*
-     * Convert local from NSWindow flipped coordinates to the toplevel's
-     * coordinates.
+     * Compute the mouse position in local (window) and global (screen)
+     * coordinates.  These are Tk coordinates, meaning that the local origin is
+     * at the top left corner of the containing toplevel and the global origin
+     * is at top left corner of the primary screen.
      */
 
+    global = [NSEvent mouseLocation];
+    local = [eventWindow convertPointFromScreen: global];
+    global.x = floor(global.x);
+    global.y = floor(TkMacOSXZeroScreenHeight() - global.y);
+    local.x = floor(local.x);
+    local.y = floor([eventWindow frame].size.height - local.y);
     if (Tk_IsEmbedded(winPtr)) {
 	TkWindow *contPtr = TkpGetOtherWindow(winPtr);
 	if (Tk_IsTopLevel(contPtr)) {
@@ -212,15 +164,38 @@ enum {
     }
 
     /*
-     * Use the toplevel coordinates to find the containing Tk window.  Then
-     * convert local into the coordinates of that window.  (The converted
-     * local coordinates are only needed for scrollwheel events.)
+     * Use the local coordinates to find the Tk window which should receive
+     * this event.  Also convert local into the coordinates of that window.
+     * (The converted local coordinates are only needed for scrollwheel
+     * events.)
      */
 
-    int win_x, win_y;
-    tkwin = Tk_TopCoordsToWindow(tkwin, local.x, local.y, &win_x, &win_y);
-    local.x = win_x;
-    local.y = win_y;
+    target = Tk_TopCoordsToWindow(tkwin, local.x, local.y, &win_x, &win_y);
+
+    /*
+     * Ignore the event if a local grab is in effect and the Tk window is
+     * not in the grabber's subtree.
+     */
+
+    grabWinPtr = winPtr->dispPtr->grabWinPtr;
+    if (grabWinPtr && /* There is a grab in effect ... */
+	!winPtr->dispPtr->grabFlags && /* and it is a local grab ... */
+	grabWinPtr->mainPtr == winPtr->mainPtr){ /* in the same application. */
+	Tk_Window tkwin2;
+	if (!target) {
+	    return theEvent;
+	}
+	for (tkwin2 = target;
+	     !Tk_IsTopLevel(tkwin2);
+	     tkwin2 = Tk_Parent(tkwin2)) {
+	    if (tkwin2 == (Tk_Window)grabWinPtr) {
+		break;
+	    }
+	}
+	if (tkwin2 != (Tk_Window)grabWinPtr) {
+	    return theEvent;
+	}
+    }
 
     /*
      *  Generate an XEvent for this mouse event.
@@ -259,31 +234,32 @@ enum {
 
 	/*
 	 * For normal mouse events, Tk_UpdatePointer will send the XEvent.
+	 * Unfortunately, it will also recompute the local coordinates.
 	 */
 
 #ifdef TK_MAC_DEBUG_EVENTS
-	TKLog(@"UpdatePointer %p x %f.0 y %f.0 %d",
-		tkwin, global.x, global.y, state);
+	TKLog(@"UpdatePointer %p x %.1f y %.1f %d",
+		target, global.x, global.y, state);
 #endif
-	Tk_UpdatePointer(tkwin, global.x, global.y, state);
+
+	Tk_UpdatePointer(target, global.x, global.y, state);
     } else {
+	CGFloat delta;
+	int coarseDelta;
+	XEvent xEvent;
 
 	/*
 	 * For scroll wheel events we need to send the XEvent here.
 	 */
 
-	CGFloat delta;
-	int coarseDelta;
-	XEvent xEvent;
-
 	xEvent.type = MouseWheelEvent;
-	xEvent.xbutton.x = local.x;
-	xEvent.xbutton.y = local.y;
+	xEvent.xbutton.x = win_x;
+	xEvent.xbutton.y = win_y;
 	xEvent.xbutton.x_root = global.x;
 	xEvent.xbutton.y_root = global.y;
 	xEvent.xany.send_event = false;
-	xEvent.xany.display = Tk_Display(tkwin);
-	xEvent.xany.window = Tk_WindowId(tkwin);
+	xEvent.xany.display = Tk_Display(target);
+	xEvent.xany.window = Tk_WindowId(target);
 
 	delta = [theEvent deltaY];
 	if (delta != 0.0) {
@@ -650,7 +626,6 @@ TkpSetCapture(
     while (winPtr && !Tk_IsTopLevel(winPtr)) {
 	winPtr = winPtr->parentPtr;
     }
-    [NSEvent stopPeriodicEvents];
     captureWinPtr = (Tk_Window)winPtr;
 }
 
-- 
cgit v0.12


From 0879001fd49dfc052a3012652070d0e51095de84 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Fri, 4 Sep 2020 21:11:15 +0000
Subject: Remove a hash table that was not needed

---
 generic/tkInt.decls      |  14 +++--
 generic/tkIntPlatDecls.h |  17 ++----
 generic/tkStubInit.c     |   4 +-
 macosx/tkMacOSXPrivate.h |  19 +++++-
 macosx/tkMacOSXWm.c      | 146 ++++++++++++-----------------------------------
 5 files changed, 72 insertions(+), 128 deletions(-)

diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index a160541..6cb33d3 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -956,9 +956,10 @@ declare 24 aqua {
 declare 25 aqua {
     void TkMacOSXMenuClick(void)
 }
-declare 26 aqua {
-    void TkMacOSXRegisterOffScreenWindow(Window window, void *portPtr)
-}
+# 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)
 }
@@ -977,9 +978,10 @@ declare 31 aqua {
 declare 32 aqua {
     void TkMacOSXUpdateClipRgn(TkWindow *winPtr)
 }
-declare 33 aqua {
-    void TkMacOSXUnregisterMacWindow(void *portPtr)
-}
+# This was not implemented.  Perhaps meant to be OffScreen ?
+#declare 33 aqua {
+#    void TkMacOSXUnregisterMacWindow(void *portPtr)
+#}
 declare 34 aqua {
     int TkMacOSXUseMenuID(short macID)
 }
diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h
index 8221d7a..2f15ae7 100644
--- a/generic/tkIntPlatDecls.h
+++ b/generic/tkIntPlatDecls.h
@@ -199,9 +199,7 @@ EXTERN void		TkMacOSXMakeRealWindowExist(TkWindow *winPtr);
 EXTERN void *		TkMacOSXMakeStippleMap(Drawable d1, Drawable d2);
 /* 25 */
 EXTERN void		TkMacOSXMenuClick(void);
-/* 26 */
-EXTERN void		TkMacOSXRegisterOffScreenWindow(Window window,
-				void *portPtr);
+/* Slot 26 is reserved */
 /* 27 */
 EXTERN int		TkMacOSXResizable(TkWindow *winPtr);
 /* 28 */
@@ -214,8 +212,7 @@ EXTERN void		TkMacOSXSetUpClippingRgn(Drawable drawable);
 EXTERN void		TkMacOSXSetUpGraphicsPort(GC gc, void *destPort);
 /* 32 */
 EXTERN void		TkMacOSXUpdateClipRgn(TkWindow *winPtr);
-/* 33 */
-EXTERN void		TkMacOSXUnregisterMacWindow(void *portPtr);
+/* Slot 33 is reserved */
 /* 34 */
 EXTERN int		TkMacOSXUseMenuID(short macID);
 /* 35 */
@@ -420,14 +417,14 @@ typedef struct TkIntPlatStubs {
     void (*tkMacOSXMakeRealWindowExist) (TkWindow *winPtr); /* 23 */
     void * (*tkMacOSXMakeStippleMap) (Drawable d1, Drawable d2); /* 24 */
     void (*tkMacOSXMenuClick) (void); /* 25 */
-    void (*tkMacOSXRegisterOffScreenWindow) (Window window, void *portPtr); /* 26 */
+    void (*reserved26)(void);
     int (*tkMacOSXResizable) (TkWindow *winPtr); /* 27 */
     void (*tkMacOSXSetHelpMenuItemCount) (void); /* 28 */
     void (*tkMacOSXSetScrollbarGrow) (TkWindow *winPtr, int flag); /* 29 */
     void (*tkMacOSXSetUpClippingRgn) (Drawable drawable); /* 30 */
     void (*tkMacOSXSetUpGraphicsPort) (GC gc, void *destPort); /* 31 */
     void (*tkMacOSXUpdateClipRgn) (TkWindow *winPtr); /* 32 */
-    void (*tkMacOSXUnregisterMacWindow) (void *portPtr); /* 33 */
+    void (*reserved33)(void);
     int (*tkMacOSXUseMenuID) (short macID); /* 34 */
     TkRegion (*tkMacOSXVisableClipRgn) (TkWindow *winPtr); /* 35 */
     void (*tkMacOSXWinBounds) (TkWindow *winPtr, void *geometry); /* 36 */
@@ -657,8 +654,7 @@ extern const TkIntPlatStubs *tkIntPlatStubsPtr;
 	(tkIntPlatStubsPtr->tkMacOSXMakeStippleMap) /* 24 */
 #define TkMacOSXMenuClick \
 	(tkIntPlatStubsPtr->tkMacOSXMenuClick) /* 25 */
-#define TkMacOSXRegisterOffScreenWindow \
-	(tkIntPlatStubsPtr->tkMacOSXRegisterOffScreenWindow) /* 26 */
+/* Slot 26 is reserved */
 #define TkMacOSXResizable \
 	(tkIntPlatStubsPtr->tkMacOSXResizable) /* 27 */
 #define TkMacOSXSetHelpMenuItemCount \
@@ -671,8 +667,7 @@ extern const TkIntPlatStubs *tkIntPlatStubsPtr;
 	(tkIntPlatStubsPtr->tkMacOSXSetUpGraphicsPort) /* 31 */
 #define TkMacOSXUpdateClipRgn \
 	(tkIntPlatStubsPtr->tkMacOSXUpdateClipRgn) /* 32 */
-#define TkMacOSXUnregisterMacWindow \
-	(tkIntPlatStubsPtr->tkMacOSXUnregisterMacWindow) /* 33 */
+/* Slot 33 is reserved */
 #define TkMacOSXUseMenuID \
 	(tkIntPlatStubsPtr->tkMacOSXUseMenuID) /* 34 */
 #define TkMacOSXVisableClipRgn \
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index c69ecac..546b2e4 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -582,14 +582,14 @@ static const TkIntPlatStubs tkIntPlatStubs = {
     TkMacOSXMakeRealWindowExist, /* 23 */
     TkMacOSXMakeStippleMap, /* 24 */
     TkMacOSXMenuClick, /* 25 */
-    TkMacOSXRegisterOffScreenWindow, /* 26 */
+    0, /* 26 */
     TkMacOSXResizable, /* 27 */
     TkMacOSXSetHelpMenuItemCount, /* 28 */
     TkMacOSXSetScrollbarGrow, /* 29 */
     TkMacOSXSetUpClippingRgn, /* 30 */
     TkMacOSXSetUpGraphicsPort, /* 31 */
     TkMacOSXUpdateClipRgn, /* 32 */
-    TkMacOSXUnregisterMacWindow, /* 33 */
+    0, /* 33 */
     TkMacOSXUseMenuID, /* 34 */
     TkMacOSXVisableClipRgn, /* 35 */
     TkMacOSXWinBounds, /* 36 */
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h
index ef753e5..fc221b0 100644
--- a/macosx/tkMacOSXPrivate.h
+++ b/macosx/tkMacOSXPrivate.h
@@ -440,19 +440,36 @@ VISIBILITY_HIDDEN
 #ifdef __i386__
     /* The Objective C runtime used on i386 requires this. */
     Bool _mouseInResizeArea;
+    Window _tkWindow;
 #endif
 }
 @property Bool mouseInResizeArea;
+@property Window tkWindow;
 @end
 
 @interface TKWindow(TKWm)
 - (void)    tkLayoutChanged;
 @end
 
-@interface NSDrawerWindow : NSWindow
+@interface TKDrawerWindow : NSWindow
 {
     id _i1, _i2;
+#ifdef __i386__
+    /* The Objective C runtime used on i386 requires this. */
+    Window _tkWindow;
+#endif
+}
+@property Window tkWindow;
+@end
+
+@interface TKPanel : NSPanel
+{
+#ifdef __i386__
+    /* The Objective C runtime used on i386 requires this. */
+    Window _tkWindow;
+#endif
 }
+@property Window tkWindow;
 @end
 
 #pragma mark NSMenu & NSMenuItem Utilities
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 12ce7b2..41e2894 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -193,13 +193,6 @@ static const Tk_GeomMgr wmMgrType = {
 static int tkMacOSXWmAttrNotifyVal = 0;
 
 /*
- * Hash table for Mac Window -> TkWindow mapping.
- */
-
-static Tcl_HashTable windowTable;
-static int windowHashInit = false;
-
-/*
  * Forward declarations for procedures defined in this file:
  */
 
@@ -360,12 +353,21 @@ static void             RemoveTransient(TkWindow *winPtr);
 
 #pragma mark -
 
-#pragma mark TKWindow(TKWm)
+@implementation TKPanel: NSPanel
+@synthesize tkWindow = _tkWindow;
+@end
+
+@implementation TKDrawerWindow: NSWindow
+@synthesize tkWindow = _tkWindow;
+@end
 
 @implementation TKWindow: NSWindow
 @synthesize mouseInResizeArea = _mouseInResizeArea;
+@synthesize tkWindow = _tkWindow;
 @end
 
+#pragma mark TKWindow(TKWm)
+
 @implementation TKWindow(TKWm)
 
 /*
@@ -886,7 +888,7 @@ TkWmDeadWindow(
     TkWindow *winPtr)		/* Top-level window that's being deleted. */
 {
     WmInfo *wmPtr = winPtr->wmInfoPtr, *wmPtr2;
-    NSWindow *ourNSWindow;
+    TKWindow *deadNSWindow;
 
     if (wmPtr == NULL) {
 	return;
@@ -965,27 +967,27 @@ TkWmDeadWindow(
      * the parent.  Then close and release the NSWindow.
      */
 
-    ourNSWindow = wmPtr->window;
-    if (ourNSWindow && !Tk_IsEmbedded(winPtr)) {
-	NSWindow *parent = [ourNSWindow parentWindow];
-	TkMacOSXUnregisterMacWindow(ourNSWindow);
+    deadNSWindow = (TKWindow *)wmPtr->window;
+    if (deadNSWindow && !Tk_IsEmbedded(winPtr)) {
+	NSWindow *parent = [deadNSWindow parentWindow];
+	[deadNSWindow setTkWindow:None];
         if (winPtr->window) {
             ((MacDrawable *) winPtr->window)->view = nil;
         }
 	wmPtr->window = NULL;
 
 	if (parent) {
-	    [parent removeChildWindow:ourNSWindow];
+	    [parent removeChildWindow:deadNSWindow];
 	}
 
 #if DEBUG_ZOMBIES > 1
 	{
-	    const char *title = [[ourNSWindow title] UTF8String];
+	    const char *title = [[deadNSWindow title] UTF8String];
 	    if (title == nil) {
 		title = "unnamed window";
 	    }
 	    fprintf(stderr, ">>>> Closing <%s>. Count is: %lu\n", title,
-		    [ourNSWindow retainCount]);
+		    [deadNSWindow retainCount]);
 	}
 #endif
 
@@ -1012,7 +1014,7 @@ TkWmDeadWindow(
 	    wmPtr2 = winPtr2->wmInfoPtr;
 	    isOnScreen = (wmPtr2->hints.initial_state != IconicState &&
 			  wmPtr2->hints.initial_state != WithdrawnState);
-	    if (w != ourNSWindow && isOnScreen && [w canBecomeKeyWindow]) {
+	    if (w != deadNSWindow && isOnScreen && [w canBecomeKeyWindow]) {
 		[w makeKeyAndOrderFront:NSApp];
 		break;
 	    }
@@ -1022,12 +1024,12 @@ TkWmDeadWindow(
 	 * Prevent zombies on systems with a TouchBar.
 	 */
 
-	if (ourNSWindow == [NSApp keyWindow]) {
+	if (deadNSWindow == [NSApp keyWindow]) {
 	    [NSApp _setKeyWindow:nil];
 	    [NSApp _setMainWindow:nil];
 	}
-	[ourNSWindow close];
-	[ourNSWindow release];
+	[deadNSWindow close];
+	[deadNSWindow release];
 	[NSApp _resetAutoreleasePool];
 
 #if DEBUG_ZOMBIES > 1
@@ -5383,7 +5385,8 @@ TkGetTransientMaster(
  *
  * TkMacOSXGetXWindow --
  *
- *	Returns the X window Id associated with the given NSWindow*.
+ *	Stub function that returns the X window Id associated with the
+ *      given NSWindow*.
  *
  * Results:
  *	The window id is returned. None is returned if not a Tk window.
@@ -5398,16 +5401,9 @@ Window
 TkMacOSXGetXWindow(
     void *macWinPtr)
 {
-    Tcl_HashEntry *hPtr;
-
-    if (!macWinPtr || !windowHashInit) {
-	return None;
-    }
-    hPtr = Tcl_FindHashEntry(&windowTable, macWinPtr);
-    if (hPtr == NULL) {
-	return None;
-    }
-    return (Window) Tcl_GetHashValue(hPtr);
+    TKWindow *w = (TKWindow *)macWinPtr;
+    Window window = (Window) TkMacOSXGetTkWindow(w);
+    return window ? window : None;
 }
 
 /*
@@ -5430,11 +5426,14 @@ TkWindow*
 TkMacOSXGetTkWindow(
     NSWindow *w)
 {
-    Window window = TkMacOSXGetXWindow(w);
+    Window window = None;
     TkDisplay *dispPtr = TkGetDisplayList();
-
+    if ([w respondsToSelector: @selector (tkWindow)]) {
+	window = [(TKWindow *)w tkWindow];
+    }
     return (window != None ?
 	    (TkWindow *)Tk_IdToWindow(dispPtr->display, window) : NULL);
+
 }
 
 /*
@@ -6110,16 +6109,16 @@ TkMacOSXMakeRealWindowExist(
 		NSUnifiedTitleAndToolbarWindowMask : 0) |
 	((attributes & kWindowSideTitlebarAttribute) ? 1 << 9 : 0) |
 	(attributes >> WM_NSMASK_SHIFT);
-    Class winClass = (macClass == kDrawerWindowClass ? [NSDrawerWindow class] :
+    Class winClass = (macClass == kDrawerWindowClass ? [TKDrawerWindow class] :
 	    (styleMask & (NSUtilityWindowMask|NSDocModalWindowMask|
-	    NSNonactivatingPanelMask|NSHUDWindowMask)) ? [NSPanel class] :
+	    NSNonactivatingPanelMask|NSHUDWindowMask)) ? [TKPanel class] :
 	    [TKWindow class]);
     NSRect structureRect = [winClass frameRectForContentRect:NSZeroRect
 	    styleMask:styleMask];
     NSRect contentRect = NSMakeRect(5 - structureRect.origin.x,
 	    TkMacOSXZeroScreenHeight() - (TkMacOSXZeroScreenTop() + 5 +
 	    structureRect.origin.y + structureRect.size.height + 200), 200, 200);
-    NSWindow *window = [[winClass alloc] initWithContentRect:contentRect
+    TKWindow *window = [[winClass alloc] initWithContentRect:contentRect
 	    styleMask:styleMask backing:NSBackingStoreBuffered defer:YES];
     if (!window) {
     	Tcl_Panic("couldn't allocate new Mac window");
@@ -6132,7 +6131,7 @@ TkMacOSXMakeRealWindowExist(
     [window setAcceptsMouseMovedEvents:YES];
     [window setReleasedWhenClosed:NO];
     if (styleMask & NSUtilityWindowMask) {
-	[(NSPanel*)window setFloatingPanel:YES];
+	[(TKPanel*)window setFloatingPanel:YES];
     }
     if ((styleMask & (NSTexturedBackgroundWindowMask|NSHUDWindowMask)) &&
 	    !(styleMask & NSDocModalWindowMask)) {
@@ -6152,7 +6151,7 @@ TkMacOSXMakeRealWindowExist(
     geometry.origin.y = TkMacOSXZeroScreenHeight() - (geometry.origin.y +
 	    geometry.size.height);
     [window setFrame:geometry display:YES];
-    TkMacOSXRegisterOffScreenWindow((Window) macWin, window);
+    [window setTkWindow: (Window) macWin];
 
     macWin->flags |= TK_HOST_EXISTS;
     if (overrideRedirect) {
@@ -6205,75 +6204,6 @@ TkpRedrawWidget(Tk_Window tkwin) {
     }
 }
 
-/*
- *----------------------------------------------------------------------
- *
- * TkMacOSXRegisterOffScreenWindow --
- *
- *	This function adds the passed in Off Screen Port to the hash table that
- *	maps Mac windows to root X windows.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	An entry is added to the windowTable hash table.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TkMacOSXRegisterOffScreenWindow(
-    Window window,		/* Window structure. */
-    void *portPtr)		/* Pointer to a Mac Window. */
-{
-    Tcl_HashEntry *valueHashPtr;
-    int isNew;
-
-    if (!windowHashInit) {
-	Tcl_InitHashTable(&windowTable, TCL_ONE_WORD_KEYS);
-	windowHashInit = true;
-    }
-    valueHashPtr = Tcl_CreateHashEntry(&windowTable, (char *) portPtr, &isNew);
-    if (!isNew) {
-	Tcl_Panic("Same macintosh window allocated twice!");
-    }
-    Tcl_SetHashValue(valueHashPtr, window);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TkMacOSXUnregisterMacWindow --
- *
- *	Given a macintosh port window, this function removes the association
- *	between this window and the root X window that Tk cares about.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	An entry is removed from the windowTable hash table.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TkMacOSXUnregisterMacWindow(
-    void *macWinPtr)	/* Reference to a Mac Window */
-{
-    Tcl_HashEntry *entryPtr;
-
-    if (!windowHashInit) {
-	Tcl_Panic("TkMacOSXUnregisterMacWindow: unmapping before inited");
-    }
-    entryPtr = Tcl_FindHashEntry(&windowTable, macWinPtr);
-    if (!entryPtr) {
-	TkMacOSXDbgMsg("Failed to find window %p", macWinPtr);
-    } else {
-	Tcl_DeleteHashEntry(entryPtr);
-    }
-}
 
 /*
  *----------------------------------------------------------------------
@@ -6884,7 +6814,7 @@ ApplyWindowAttributeFlagChanges(
 	if ((wmPtr->flags & WM_TOPMOST) != (oldFlags & WM_TOPMOST)) {
 	    [macWindow setLevel:(wmPtr->flags & WM_TOPMOST) ?
 		    kCGUtilityWindowLevel : ([macWindow isKindOfClass:
-		    [NSPanel class]] && [macWindow isFloatingPanel] ?
+		    [TKPanel class]] && [macWindow isFloatingPanel] ?
 		    kCGFloatingWindowLevel : kCGNormalWindowLevel)];
 	}
 
-- 
cgit v0.12


From 5efe561d378b27a0a98a3b99ea7de2e38a6da3e1 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Sat, 5 Sep 2020 17:02:04 +0000
Subject: Deal with coordinate conversion on older macs.  Edit comments.

---
 macosx/tkMacOSXMouseEvent.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index 81fc841..4bdf455 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -76,11 +76,11 @@ enum {
     case NSMouseExited:
 	[(TKWindow *)eventWindow setMouseInResizeArea:NO];
 	break;
-    case NSMouseMoved:
-    case NSCursorUpdate:
     case NSLeftMouseUp:
     case NSRightMouseUp:
     case NSOtherMouseUp:
+    case NSMouseMoved:	
+    case NSCursorUpdate:
     case NSTabletPoint:
     case NSTabletProximity:
     case NSScrollWheel:
@@ -95,7 +95,7 @@ enum {
      * ticket [d72abe6b54].
      */
 
-    if (eventType == NSLeftMouseDown &&
+    if ((eventType == NSLeftMouseDown) &&
 	[(TKWindow *)eventWindow mouseInResizeArea] &&
 	([eventWindow styleMask] & NSResizableWindowMask)) {
 	return theEvent;
@@ -143,7 +143,7 @@ enum {
      */
 
     global = [NSEvent mouseLocation];
-    local = [eventWindow convertPointFromScreen: global];
+    local = [eventWindow tkConvertPointFromScreen: global];
     global.x = floor(global.x);
     global.y = floor(TkMacOSXZeroScreenHeight() - global.y);
     local.x = floor(local.x);
@@ -202,6 +202,13 @@ enum {
      */
 
     unsigned int state = 0;
+
+    /*
+     * For mouseDown events we set the single bit for that button in the state.
+     * Otherwise the button state is 0.  Hopefully this allows TkUpdatePointer
+     * to maintain its button state correctly.
+     */
+
     if (button > 0) {
 	state |= TkGetButtonMask(button);
     }
@@ -233,8 +240,9 @@ enum {
     if (eventType != NSScrollWheel) {
 
 	/*
-	 * For normal mouse events, Tk_UpdatePointer will send the XEvent.
-	 * Unfortunately, it will also recompute the local coordinates.
+	 * For normal mouse events, Tk_UpdatePointer will send the appropriate
+	 * XEvents using its cached state information.  Unfortunately, it will
+	 * also recompute the local coordinates.
 	 */
 
 #ifdef TK_MAC_DEBUG_EVENTS
-- 
cgit v0.12


From deb22dbee2982870a5144c9e5ceaa5cd2b8cc32e Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Sat, 5 Sep 2020 20:06:27 +0000
Subject: Deal with the nested tracking areas in the title bar.

---
 macosx/tkMacOSXMouseEvent.c | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index 4bdf455..3121c87 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -57,10 +57,17 @@ enum {
     NSPoint local, global;
     NSInteger button = -1;
     int win_x, win_y;
+    Bool inTitleBar = NO;
 
 #ifdef TK_MAC_DEBUG_EVENTS
     TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, theEvent);
 #endif
+    
+    if (eventWindow) {
+	NSRect viewFrame = [[eventWindow contentView] frame];
+	NSPoint location = [theEvent locationInWindow];
+	inTitleBar = viewFrame.size.height < location.y;
+    }
     switch (eventType) {
     case NSLeftMouseDown:
     case NSRightMouseDown:
@@ -71,10 +78,15 @@ enum {
 	button = [theEvent buttonNumber] + Button1;
 	break;
     case NSMouseEntered:
-	[(TKWindow *)eventWindow setMouseInResizeArea:YES];
-	break;
+	if (!inTitleBar) {
+	    [(TKWindow *)eventWindow setMouseInResizeArea:YES];
+	    break;
+	}
     case NSMouseExited:
-	[(TKWindow *)eventWindow setMouseInResizeArea:NO];
+	if (! inTitleBar) {
+	    [(TKWindow *)eventWindow setMouseInResizeArea:NO];
+	    break;
+	}
 	break;
     case NSLeftMouseUp:
     case NSRightMouseUp:
@@ -90,9 +102,8 @@ enum {
     }
 
     /*
-     * Do not send ButtonPress XEvents for MouseDown NSEvents that start a
-     * resize.  (The MouseUp will be handled during LiveResize.)  See
-     * ticket [d72abe6b54].
+     * Ignore button presses that start a resize.  (The release will be handled
+     * during LiveResize.)  See ticket [d72abe6b54].
      */
 
     if ((eventType == NSLeftMouseDown) &&
@@ -102,6 +113,15 @@ enum {
     }
 
     /*
+     * Ignore button presses and releases that occur in the title bar.
+     */
+    
+    if ((eventType == NSLeftMouseDown || eventType == NSLeftMouseUp) &&
+	inTitleBar) {
+	return theEvent;
+    }
+
+    /*
      * Find an appropriate NSWindow to attach to this event, and its
      * associated Tk window.
      */
-- 
cgit v0.12


From d10c9fecddbfd053dbabca48b2c47785a1204b2f Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Sat, 5 Sep 2020 20:33:03 +0000
Subject: One more trick.

---
 macosx/tkMacOSXMouseEvent.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index 3121c87..a12848f 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -62,7 +62,7 @@ enum {
 #ifdef TK_MAC_DEBUG_EVENTS
     TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, theEvent);
 #endif
-    
+
     if (eventWindow) {
 	NSRect viewFrame = [[eventWindow contentView] frame];
 	NSPoint location = [theEvent locationInWindow];
@@ -80,18 +80,15 @@ enum {
     case NSMouseEntered:
 	if (!inTitleBar) {
 	    [(TKWindow *)eventWindow setMouseInResizeArea:YES];
-	    break;
 	}
+	break;
     case NSMouseExited:
-	if (! inTitleBar) {
-	    [(TKWindow *)eventWindow setMouseInResizeArea:NO];
-	    break;
-	}
+	[(TKWindow *)eventWindow setMouseInResizeArea:NO];
 	break;
     case NSLeftMouseUp:
     case NSRightMouseUp:
     case NSOtherMouseUp:
-    case NSMouseMoved:	
+    case NSMouseMoved:
     case NSCursorUpdate:
     case NSTabletPoint:
     case NSTabletProximity:
@@ -115,7 +112,7 @@ enum {
     /*
      * Ignore button presses and releases that occur in the title bar.
      */
-    
+
     if ((eventType == NSLeftMouseDown || eventType == NSLeftMouseUp) &&
 	inTitleBar) {
 	return theEvent;
-- 
cgit v0.12


From a3727ee19e1dd52c7fb30f53f67bc24a853f8458 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Sat, 5 Sep 2020 22:00:16 +0000
Subject: Supply the missing description of TkpWarpPointer.

---
 macosx/tkMacOSXMouseEvent.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index a12848f..30ba1bf 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -607,6 +607,23 @@ GenerateButtonEvent(
     return true;
 }
 
+/*
+ *----------------------------------------------------------------------
+ *
+ * TkpWarpPointer --
+ *
+ *	Move the mouse cursor to the screen location specified by the warpX and
+ *	warpY fields of a TkDisplay.
+ *
+ * Results:
+ *	None
+ *
+ * Side effects:
+ *	The mouse cursor is moved.
+ *
+ *----------------------------------------------------------------------
+ */
+
 void
 TkpWarpPointer(
     TkDisplay *dispPtr)
-- 
cgit v0.12


From e04db4716d431f93bff03c37a5e5b21d264dc846 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 6 Sep 2020 16:11:18 +0000
Subject: Re-introduce TkMacOSXGetTkWindow() as macro

---
 macosx/tkMacOSXKeyEvent.c    | 12 ++++++------
 macosx/tkMacOSXMenus.c       |  2 +-
 macosx/tkMacOSXPrivate.h     |  1 +
 macosx/tkMacOSXWindowEvent.c | 42 +++++++++++++++++++++---------------------
 macosx/tkMacOSXWm.c          | 16 ++++++++--------
 5 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/macosx/tkMacOSXKeyEvent.c b/macosx/tkMacOSXKeyEvent.c
index 78d2680..fdf4e66 100644
--- a/macosx/tkMacOSXKeyEvent.c
+++ b/macosx/tkMacOSXKeyEvent.c
@@ -50,8 +50,8 @@ static NSUInteger textInputModifiers;
     TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, theEvent);
 #endif
     NSWindow *w = [theEvent window];
-    Tk_Window tkwin = Tk_MacOSXGetTkWindow(w);
-    TkWindow *winPtr = (TkWindow *)tkwin, *grabWinPtr, *focusWinPtr;
+    TkWindow *winPtr = TkMacOSXGetTkWindow(w), *grabWinPtr, *focusWinPtr;
+    Tk_Window tkwin = (Tk_Window)winPtr;
     NSEventType type = [theEvent type];
     NSUInteger virtual = [theEvent keyCode];
     NSUInteger modifiers = ([theEvent modifierFlags] &
@@ -285,8 +285,8 @@ static NSUInteger textInputModifiers;
     int i, len, state;
     XEvent xEvent;
     NSString *str, *keystr, *lower;
-    Tk_Window tkwin = Tk_MacOSXGetTkWindow([self window]);
-    TkWindow *winPtr = (TkWindow *)tkwin;
+    TkWindow *winPtr = TkMacOSXGetTkWindow([self window]);
+    Tk_Window tkwin = (Tk_Window)winPtr;
     Bool sendingIMEText = NO;
 
     str = ([aString isKindOfClass: [NSAttributedString class]]) ?
@@ -392,7 +392,7 @@ static NSUInteger textInputModifiers;
 	selectedRange: (NSRange)selRange
      replacementRange: (NSRange)repRange
 {
-    TkWindow *winPtr = (TkWindow *)Tk_MacOSXGetTkWindow([self window]);
+    TkWindow *winPtr = TkMacOSXGetTkWindow([self window]);
     Tk_Window focusWin = (Tk_Window)winPtr->dispPtr->focusPtr;
     NSString *temp;
     NSString *str;
@@ -497,7 +497,7 @@ static NSUInteger textInputModifiers;
     }
     processingCompose = NO;
     if (aSelector == @selector (deleteBackward:)) {
-	TkWindow *winPtr = (TkWindow *)Tk_MacOSXGetTkWindow([self window]);
+	TkWindow *winPtr = TkMacOSXGetTkWindow([self window]);
 	Tk_Window focusWin = (Tk_Window)winPtr->dispPtr->focusPtr;
 	TkSendVirtualEvent(focusWin, "TkAccentBackspace", NULL);
     }
diff --git a/macosx/tkMacOSXMenus.c b/macosx/tkMacOSXMenus.c
index 8833eb0..a1519f5 100644
--- a/macosx/tkMacOSXMenus.c
+++ b/macosx/tkMacOSXMenus.c
@@ -409,7 +409,7 @@ GenerateEditEvent(
 {
     XVirtualEvent event;
     int x, y;
-    TkWindow *winPtr = (TkWindow *)Tk_MacOSXGetTkWindow([NSApp keyWindow]);
+    TkWindow *winPtr = TkMacOSXGetTkWindow([NSApp keyWindow]);
     Tk_Window tkwin;
 
     if (!winPtr) {
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h
index 091b795..2de3067 100644
--- a/macosx/tkMacOSXPrivate.h
+++ b/macosx/tkMacOSXPrivate.h
@@ -257,6 +257,7 @@ MODULE_SCOPE void	TkMacOSXRestoreDrawingContext(
 			    TkMacOSXDrawingContext *dcPtr);
 MODULE_SCOPE void	TkMacOSXSetColorInContext(GC gc, unsigned long pixel,
 			    CGContextRef context);
+#define TkMacOSXGetTkWindow(window) (TkWindow *)Tk_MacOSXGetTkWindow(window)
 #define TkMacOSXGetNSWindowForDrawable(drawable) ((NSWindow*)TkMacOSXDrawable(drawable))
 #define TkMacOSXGetNSViewForDrawable(macWin) (NSView *)Tk_MacOSXGetNSViewForDrawable((Drawable)(macWin))
 MODULE_SCOPE void	TkMacOSXWinCGBounds(TkWindow *winPtr, CGRect *bounds);
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 68547e6..3d9120f 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -55,7 +55,7 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
     BOOL activate = [[notification name]
 	    isEqualToString:NSWindowDidBecomeKeyNotification];
     NSWindow *w = [notification object];
-    TkWindow *winPtr = (TkWindow *)Tk_MacOSXGetTkWindow(w);
+    TkWindow *winPtr = TkMacOSXGetTkWindow(w);
 
     if (winPtr && Tk_IsMapped(winPtr)) {
 	GenerateActivateEvents(winPtr, activate);
@@ -70,7 +70,7 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
     BOOL movedOnly = [[notification name]
 	    isEqualToString:NSWindowDidMoveNotification];
     NSWindow *w = [notification object];
-    TkWindow *winPtr = (TkWindow *)Tk_MacOSXGetTkWindow(w);
+    TkWindow *winPtr = TkMacOSXGetTkWindow(w);
 
     if (winPtr) {
 	WmInfo *wmPtr = winPtr->wmInfoPtr;
@@ -106,7 +106,7 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
     TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification);
 #endif
     NSWindow *w = [notification object];
-    TkWindow *winPtr = (TkWindow *)Tk_MacOSXGetTkWindow(w);
+    TkWindow *winPtr = TkMacOSXGetTkWindow(w);
 
     if (winPtr) {
 	winPtr->wmInfoPtr->hints.initial_state =
@@ -179,10 +179,10 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
     TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification);
 #endif
     NSWindow *w = [notification object];
-    Tk_Window tkwin = Tk_MacOSXGetTkWindow(w);
+    TkWindow *winPtr = TkMacOSXGetTkWindow(w);
 
-    if (tkwin) {
-	Tk_UnmapWindow(tkwin);
+    if (winPtr) {
+	Tk_UnmapWindow((Tk_Window)winPtr);
     }
 }
 
@@ -191,10 +191,10 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
 #ifdef TK_MAC_DEBUG_NOTIFICATIONS
     TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, w);
 #endif
-    Tk_Window tkwin = Tk_MacOSXGetTkWindow(w);
+    TkWindow *winPtr = TkMacOSXGetTkWindow(w);
 
-    if (tkwin) {
-	TkGenWMDestroyEvent(tkwin);
+    if (winPtr) {
+	TkGenWMDestroyEvent((Tk_Window)winPtr);
     }
 
     /*
@@ -202,14 +202,14 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
      * can always return NO from -windowShouldClose: for a Tk window.
      */
 
-    return (tkwin ? NO : YES);
+    return (winPtr ? NO : YES);
 }
 
 - (void) windowBecameVisible: (NSNotification *) notification
 {
     NSWindow *window = [notification object];
-    Tk_Window tkwin = Tk_MacOSXGetTkWindow(window);
-    if (tkwin) {
+    TkWindow *winPtr = TkMacOSXGetTkWindow(window);
+    if (winPtr) {
 	TKContentView *view = [window contentView];
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
 	if (@available(macOS 10.14, *)) {
@@ -225,7 +225,7 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
 - (void) windowMapped: (NSNotification *) notification
 {
     NSWindow *w = [notification object];
-    TkWindow *winPtr = (TkWindow *)Tk_MacOSXGetTkWindow(w);
+    TkWindow *winPtr = TkMacOSXGetTkWindow(w);
 
     if (winPtr) {
 	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {}
@@ -249,7 +249,7 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
 {
     TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification);
     NSWindow *w = [notification object];
-    TkWindow *winPtr = (TkWindow *)Tk_MacOSXGetTkWindow(w);
+    TkWindow *winPtr = TkMacOSXGetTkWindow(w);
 
     if (winPtr) {
 	//Tk_UnmapWindow((Tk_Window)winPtr);
@@ -310,7 +310,7 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
      */
 
     for (NSWindow *win in [NSApp windows]) {
-	TkWindow *winPtr = (TkWindow *)Tk_MacOSXGetTkWindow(win);
+	TkWindow *winPtr = TkMacOSXGetTkWindow(win);
 	if (!winPtr || !winPtr->wmInfoPtr) {
 	    continue;
 	}
@@ -933,7 +933,7 @@ ConfigureRestrictProc(
     (void)rect;
 
 #ifdef TK_MAC_DEBUG_DRAWING
-    TkWindow *winPtr = (TkWindow *)Tk_MacOSXGetTkWindow([self window]);
+    TkWindow *winPtr = TkMacOSXGetTkWindow([self window]);
     if (winPtr) {
 	fprintf(stderr, "drawRect: drawing %s in %s\n",
 	    Tk_PathName(winPtr), NSStringFromRect(rect).UTF8String);
@@ -966,7 +966,7 @@ ConfigureRestrictProc(
 {
     [super setFrameSize: newsize];
     NSWindow *w = [self window];
-    TkWindow *winPtr = (TkWindow *)Tk_MacOSXGetTkWindow(w);
+    TkWindow *winPtr = TkMacOSXGetTkWindow(w);
     Tk_Window tkwin = (Tk_Window)winPtr;
 
     if (![self inLiveResize] &&
@@ -1038,7 +1038,7 @@ ConfigureRestrictProc(
     unsigned long serial;
     int updatesNeeded;
     CGRect updateBounds;
-    TkWindow *winPtr = (TkWindow *)Tk_MacOSXGetTkWindow([self window]);
+    TkWindow *winPtr = TkMacOSXGetTkWindow([self window]);
     ClientData oldArg;
     Tk_RestrictProc *oldProc;
     if (!winPtr) {
@@ -1109,7 +1109,7 @@ static const char *const accentNames[] = {
 
 - (void) viewDidChangeEffectiveAppearance
 {
-    Tk_Window tkwin = Tk_MacOSXGetTkWindow([self window]);
+    Tk_Window tkwin = (Tk_Window)TkMacOSXGetTkWindow([self window]);
     if (!tkwin) {
 	return;
     }
@@ -1178,8 +1178,8 @@ static const char *const accentNames[] = {
 #endif
     XVirtualEvent event;
     int x, y;
-    Tk_Window tkwin = Tk_MacOSXGetTkWindow([self window]);
-    TkWindow *winPtr = (TkWindow *)tkwin;
+    TkWindow *winPtr = TkMacOSXGetTkWindow([self window]);
+    Tk_Window tkwin = (Tk_Window)winPtr;
     (void)sender;
 
     if (!winPtr){
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 7a2b7c4..fe33a0c 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -378,7 +378,7 @@ static void             RemoveTransient(TkWindow *winPtr);
 
 - (void) tkLayoutChanged
 {
-    TkWindow *winPtr = (TkWindow *)Tk_MacOSXGetTkWindow(self);
+    TkWindow *winPtr = TkMacOSXGetTkWindow(self);
 
     if (winPtr) {
 	NSRect frameRect;
@@ -407,7 +407,7 @@ static void             RemoveTransient(TkWindow *winPtr);
 #if !(MAC_OS_X_VERSION_MAX_ALLOWED < 101200)
 - (void)toggleTabBar:(id)sender
 {
-    TkWindow *winPtr = (TkWindow *)Tk_MacOSXGetTkWindow(self);
+    TkWindow *winPtr = TkMacOSXGetTkWindow(self);
     if (!winPtr) {
 	return;
     }
@@ -420,7 +420,7 @@ static void             RemoveTransient(TkWindow *winPtr);
                     toSize:(NSSize)frameSize
 {
     NSRect currentFrame = [sender frame];
-    TkWindow *winPtr = (TkWindow *)Tk_MacOSXGetTkWindow(sender);
+    TkWindow *winPtr = TkMacOSXGetTkWindow(sender);
     if (winPtr) {
 	if (winPtr->wmInfoPtr->flags & WM_WIDTH_NOT_RESIZABLE) {
 	    frameSize.width = currentFrame.size.width;
@@ -434,7 +434,7 @@ static void             RemoveTransient(TkWindow *winPtr);
 
 - (BOOL) canBecomeKeyWindow
 {
-    TkWindow *winPtr = (TkWindow *)Tk_MacOSXGetTkWindow(self);
+    TkWindow *winPtr = TkMacOSXGetTkWindow(self);
 
     if (!winPtr || !winPtr->wmInfoPtr) {
 	return NO;
@@ -618,7 +618,7 @@ FrontWindowAtPoint(
     TkWindow *winPtr = NULL;
 
     for (NSWindow *w in windows) {
-	winPtr = (TkWindow *)Tk_MacOSXGetTkWindow(w);
+	winPtr = TkMacOSXGetTkWindow(w);
 	if (winPtr) {
 	    WmInfo *wmPtr = winPtr->wmInfoPtr;
 	    NSRect windowFrame = [w frame];
@@ -1002,7 +1002,7 @@ TkWmDeadWindow(
 	 */
 
 	for (NSWindow *w in [NSApp orderedWindows]) {
-	    TkWindow *winPtr2 = (TkWindow *)Tk_MacOSXGetTkWindow(w);
+	    TkWindow *winPtr2 = TkMacOSXGetTkWindow(w);
 	    BOOL isOnScreen;
 
 	    if (!winPtr2 || !winPtr2->wmInfoPtr) {
@@ -5490,7 +5490,7 @@ TkMacOSXZoomToplevel(
     short zoomPart)		/* Either inZoomIn or inZoomOut */
 {
     NSWindow *window = whichWindow;
-    TkWindow *winPtr = (TkWindow *)Tk_MacOSXGetTkWindow(window);
+    TkWindow *winPtr = TkMacOSXGetTkWindow(window);
     WmInfo *wmPtr;
 
     if (!winPtr || !winPtr->wmInfoPtr) {
@@ -6480,7 +6480,7 @@ TkMacOSXWindowOffset(
     int *xOffset,
     int *yOffset)
 {
-    TkWindow *winPtr = (TkWindow *)Tk_MacOSXGetTkWindow(wRef);
+    TkWindow *winPtr = TkMacOSXGetTkWindow(wRef);
 
     if (winPtr && winPtr->wmInfoPtr) {
 	*xOffset = winPtr->wmInfoPtr->xInParent;
-- 
cgit v0.12


From 57cb5d1b7215c1c676e7213748bcd65096f52af3 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 6 Sep 2020 16:23:06 +0000
Subject: Split long line

---
 macosx/tkMacOSXWm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index d97ef64..b1998bc 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -5846,7 +5846,8 @@ WmWinTabbingId(
 	result = Tcl_NewStringObj(idString.UTF8String, [idString length]);
     }
     if (result == NULL) {
-	NSLog(@"Failed to read tabbing identifier; try calling update idletasks before getting/setting the tabbing identifier of the window.");
+	NSLog(@"Failed to read tabbing identifier; try calling update idletasks"
+	      " before getting/setting the tabbing identifier of the window.");
 	return TCL_OK;
     }
     Tcl_SetObjResult(interp, result);
-- 
cgit v0.12


From c7622ae4dc2d427140072764e7b49861d0ed9627 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Sun, 6 Sep 2020 16:36:00 +0000
Subject: Maintain our own button state so we can provide Tk_UpdatePointer with
 the data that it expects.

---
 macosx/tkMacOSXMouseEvent.c | 72 ++++++++++++++++++++++++++-------------------
 1 file changed, 42 insertions(+), 30 deletions(-)

diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index 30ba1bf..40e6332 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -24,6 +24,7 @@ typedef struct {
     Point global;
     Point local;
 } MouseEventData;
+
 static Tk_Window captureWinPtr = NULL;	/* Current capture window; may be
 					 * NULL. */
 
@@ -52,12 +53,14 @@ enum {
 {
     NSWindow *eventWindow = [theEvent window];
     NSEventType eventType = [theEvent type];
+    NSInteger button = [theEvent buttonNumber] + Button1;
     TkWindow *winPtr = NULL, *grabWinPtr;
     Tk_Window tkwin = None, capture, target;
     NSPoint local, global;
-    NSInteger button = -1;
     int win_x, win_y;
     Bool inTitleBar = NO;
+    static int validPresses = 0, ignoredPresses = 0;
+    unsigned int buttonState = 0;
 
 #ifdef TK_MAC_DEBUG_EVENTS
     TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, theEvent);
@@ -69,13 +72,16 @@ enum {
 	inTitleBar = viewFrame.size.height < location.y;
     }
     switch (eventType) {
-    case NSLeftMouseDown:
+    case NSRightMouseUp:
+    case NSOtherMouseUp:
+	buttonState &= ~TkGetButtonMask(button);
+	break;
     case NSRightMouseDown:
     case NSOtherMouseDown:
     case NSLeftMouseDragged:
     case NSRightMouseDragged:
     case NSOtherMouseDragged:
-	button = [theEvent buttonNumber] + Button1;
+	buttonState |= TkGetButtonMask(button);
 	break;
     case NSMouseEntered:
 	if (!inTitleBar) {
@@ -86,8 +92,7 @@ enum {
 	[(TKWindow *)eventWindow setMouseInResizeArea:NO];
 	break;
     case NSLeftMouseUp:
-    case NSRightMouseUp:
-    case NSOtherMouseUp:
+    case NSLeftMouseDown:
     case NSMouseMoved:
     case NSCursorUpdate:
     case NSTabletPoint:
@@ -99,23 +104,41 @@ enum {
     }
 
     /*
-     * Ignore button presses that start a resize.  (The release will be handled
-     * during LiveResize.)  See ticket [d72abe6b54].
+     * Update the button state.  We ignore left button presses that start a
+     * resize or occur in the title bar.  See tickets [d72abe6b54] and
+     * [39cbacb9e8].
      */
 
-    if ((eventType == NSLeftMouseDown) &&
-	[(TKWindow *)eventWindow mouseInResizeArea] &&
-	([eventWindow styleMask] & NSResizableWindowMask)) {
-	return theEvent;
-    }
+    if (eventType == NSLeftMouseDown) {
+	if ([(TKWindow *)eventWindow mouseInResizeArea] &&
+	    ([eventWindow styleMask] & NSResizableWindowMask)) {
 
-    /*
-     * Ignore button presses and releases that occur in the title bar.
-     */
+	    /* 
+	     * When the left button is pressed in the resize area, we receive
+	     * NSMouseDown, but when it is released we do not receive
+	     * NSMouseUp.  So ignore the event and clear the button state but
+	     * do not change the ignoredPresses count.
+	     */
 
-    if ((eventType == NSLeftMouseDown || eventType == NSLeftMouseUp) &&
-	inTitleBar) {
-	return theEvent;
+	    buttonState &= ~TkGetButtonMask(Button1);
+	    return theEvent;
+	}
+	if (inTitleBar) {
+	    ignoredPresses++;
+	    return theEvent;
+	}
+	validPresses++;
+	buttonState |= TkGetButtonMask(Button1);
+    }
+    if (eventType == NSLeftMouseUp) {
+	if (ignoredPresses > 0) {
+	    ignoredPresses--;
+	} else if (validPresses > 0) {
+	    validPresses--;
+	}
+	if (validPresses == 0) {
+	    buttonState &= ~TkGetButtonMask(Button1);
+	}
     }
 
     /*
@@ -218,18 +241,7 @@ enum {
      *  Generate an XEvent for this mouse event.
      */
 
-    unsigned int state = 0;
-
-    /*
-     * For mouseDown events we set the single bit for that button in the state.
-     * Otherwise the button state is 0.  Hopefully this allows TkUpdatePointer
-     * to maintain its button state correctly.
-     */
-
-    if (button > 0) {
-	state |= TkGetButtonMask(button);
-    }
-
+    unsigned int state = buttonState;
     NSUInteger modifiers = [theEvent modifierFlags];
 
     if (modifiers & NSAlphaShiftKeyMask) {
-- 
cgit v0.12


From ed3e00f106834b22064086e15e4062321d07b8ca Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Sun, 6 Sep 2020 18:52:05 +0000
Subject: Fix [4e1e290760]: [NSColor whiteColor] is yellow without a
 colorspace.

---
 macosx/tkMacOSXColor.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index 8885792..208fc8b 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -318,19 +318,15 @@ GetRGBA(
 #if MAC_OS_X_VERSION_MIN_REQUIRED < 101400
 	    color = [[NSColor colorForControlTint: [NSColor currentControlTint]]
 			      colorUsingColorSpace:sRGB];
-	    [color getComponents: rgba];
 #endif
-	    break;
-	}
-	if (entry->index == selectedTabTextIndex) {
+	} else if (entry->index == selectedTabTextIndex) {
 	    int OSVersion = [NSApp macOSVersion];
 	    if (OSVersion > 100600 && OSVersion < 110000) {
-		color = [NSColor whiteColor];
-		[color getComponents: rgba];
-		break;
+		color = [[NSColor whiteColor] colorUsingColorSpace:sRGB];
 	    }
+	} else {
+	    color = [[NSColor valueForKey:entry->selector] colorUsingColorSpace:sRGB];
 	}
-	color = [[NSColor valueForKey:entry->selector] colorUsingColorSpace:sRGB];
 	[color getComponents: rgba];
 	break;
     case clearColor:
-- 
cgit v0.12


From 26cc1c7a65e49782d799cd635733bb0a132545eb Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Sun, 6 Sep 2020 20:35:28 +0000
Subject: Don't process events which have no meaning to Tk.

---
 macosx/tkMacOSXMouseEvent.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index 40e6332..493e63f 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -78,9 +78,6 @@ enum {
 	break;
     case NSRightMouseDown:
     case NSOtherMouseDown:
-    case NSLeftMouseDragged:
-    case NSRightMouseDragged:
-    case NSOtherMouseDragged:
 	buttonState |= TkGetButtonMask(button);
 	break;
     case NSMouseEntered:
@@ -94,12 +91,17 @@ enum {
     case NSLeftMouseUp:
     case NSLeftMouseDown:
     case NSMouseMoved:
+    case NSScrollWheel:
+#if 0
     case NSCursorUpdate:
+    case NSLeftMouseDragged:
+    case NSRightMouseDragged:
+    case NSOtherMouseDragged:
     case NSTabletPoint:
     case NSTabletProximity:
-    case NSScrollWheel:
+#endif
 	break;
-    default: /* Unrecognized mouse event. */
+    default: /* This type of event is ignored. */
 	return theEvent;
     }
 
@@ -113,7 +115,7 @@ enum {
 	if ([(TKWindow *)eventWindow mouseInResizeArea] &&
 	    ([eventWindow styleMask] & NSResizableWindowMask)) {
 
-	    /* 
+	    /*
 	     * When the left button is pressed in the resize area, we receive
 	     * NSMouseDown, but when it is released we do not receive
 	     * NSMouseUp.  So ignore the event and clear the button state but
-- 
cgit v0.12


From aa5d50309de13f1aadf5549364beed42c5092d38 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Sun, 6 Sep 2020 21:57:38 +0000
Subject: We do need to process MouseDragged events, though, since they appear
 in place of MouseMoved events.

---
 macosx/tkMacOSXMouseEvent.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index 493e63f..dceb678 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -76,6 +76,9 @@ enum {
     case NSOtherMouseUp:
 	buttonState &= ~TkGetButtonMask(button);
 	break;
+    case NSLeftMouseDragged:
+    case NSRightMouseDragged:
+    case NSOtherMouseDragged:
     case NSRightMouseDown:
     case NSOtherMouseDown:
 	buttonState |= TkGetButtonMask(button);
@@ -94,9 +97,6 @@ enum {
     case NSScrollWheel:
 #if 0
     case NSCursorUpdate:
-    case NSLeftMouseDragged:
-    case NSRightMouseDragged:
-    case NSOtherMouseDragged:
     case NSTabletPoint:
     case NSTabletProximity:
 #endif
-- 
cgit v0.12


From 0e5e252c47d4b11c94b2ca25e1f01a4123c85e98 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Sun, 6 Sep 2020 22:59:56 +0000
Subject: Don't process events for non-Tk windows.

---
 macosx/tkMacOSXMouseEvent.c | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index dceb678..05c4e0f 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -53,24 +53,37 @@ enum {
 {
     NSWindow *eventWindow = [theEvent window];
     NSEventType eventType = [theEvent type];
-    NSInteger button = [theEvent buttonNumber] + Button1;
+    NSRect viewFrame = [[eventWindow contentView] frame];
     TkWindow *winPtr = NULL, *grabWinPtr;
     Tk_Window tkwin = None, capture, target;
     NSPoint local, global;
-    int win_x, win_y;
+    NSInteger button;
     Bool inTitleBar = NO;
-    static int validPresses = 0, ignoredPresses = 0;
+    int win_x, win_y;
     unsigned int buttonState = 0;
+    static int validPresses = 0, ignoredPresses = 0;
 
 #ifdef TK_MAC_DEBUG_EVENTS
     TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, theEvent);
 #endif
 
+    /*
+     * If this event is not for a Tk toplevel, just pass it up the responder
+     * chain.
+     */
+
+    if (![eventWindow isMemberOfClass:[TKWindow class]]) {
+	return theEvent;
+    }
+
+    /*
+     * Check if the event is located in the titlebar.
+     */
+
     if (eventWindow) {
-	NSRect viewFrame = [[eventWindow contentView] frame];
-	NSPoint location = [theEvent locationInWindow];
-	inTitleBar = viewFrame.size.height < location.y;
+	inTitleBar = viewFrame.size.height < [theEvent locationInWindow].y;
     }
+    button = [theEvent buttonNumber] + Button1;
     switch (eventType) {
     case NSRightMouseUp:
     case NSOtherMouseUp:
-- 
cgit v0.12


From bc231dc106f1dbdad5eb6bf83f1a2ef179fb72ff Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Mon, 7 Sep 2020 16:04:07 +0000
Subject: Work around the fact that we do need to process synthesized mouse
 events for testing

---
 macosx/tkMacOSXMouseEvent.c | 10 +++++++---
 macosx/tkMacOSXTest.c       |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index 05c4e0f..15ae5ce 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -68,12 +68,16 @@ enum {
 #endif
 
     /*
-     * If this event is not for a Tk toplevel, just pass it up the responder
-     * chain.
+     * If this event is not for a Tk toplevel, it should just be passed up the
+     * responder chain.  However, there is an exception for synthesized events,
+     * which are used in testing.  Those events are recognized by having their
+     * (unused) pressure field set to the impossible value -1.0.
      */
 
     if (![eventWindow isMemberOfClass:[TKWindow class]]) {
-	return theEvent;
+	if (eventWindow && [eventWindow pressure] != -1.0) {
+	    return theEvent;
+	}
     }
 
     /*
diff --git a/macosx/tkMacOSXTest.c b/macosx/tkMacOSXTest.c
index 434504f..cefcfad 100644
--- a/macosx/tkMacOSXTest.c
+++ b/macosx/tkMacOSXTest.c
@@ -229,7 +229,7 @@ PressButtonObjCmd(
     pt.x = loc.x = x;
     pt.y = y;
     loc.y = ScreenHeight - y;
-    wNum = 0;
+    wNum = -1;
     CGWarpMouseCursorPosition(pt);
     motion = [NSEvent mouseEventWithType:NSMouseMoved
 	location:loc
-- 
cgit v0.12


From 5c986033d8fb50cfcdeb184c2884afa5fa352f42 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Mon, 7 Sep 2020 16:08:38 +0000
Subject: Edit a comment.

---
 macosx/tkMacOSXTest.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/macosx/tkMacOSXTest.c b/macosx/tkMacOSXTest.c
index cefcfad..9faeff8 100644
--- a/macosx/tkMacOSXTest.c
+++ b/macosx/tkMacOSXTest.c
@@ -175,9 +175,11 @@ TkTestLogDisplay(
  * PressButtonObjCmd --
  *
  *	This Tcl command simulates a button press at a specific screen
- *      location.  It injects NSEvents into the NSApplication event queue,
- *      as opposed to adding events to the Tcl queue as event generate
- *      would do.  One application is for testing the grab command.
+ *      location.  It injects NSEvents into the NSApplication event queue, as
+ *      opposed to adding events to the Tcl queue as event generate would do.
+ *      One application is for testing the grab command. These events have
+ *      pressure = -1.0 as a signal indicating that they should not be ignored
+ *      by [NSApp tkProcessMouseEvent].
  *
  * Results:
  *	A standard Tcl result.
@@ -229,7 +231,7 @@ PressButtonObjCmd(
     pt.x = loc.x = x;
     pt.y = y;
     loc.y = ScreenHeight - y;
-    wNum = -1;
+    wNum = 0;
     CGWarpMouseCursorPosition(pt);
     motion = [NSEvent mouseEventWithType:NSMouseMoved
 	location:loc
@@ -239,7 +241,7 @@ PressButtonObjCmd(
 	context:nil
 	eventNumber:0
 	clickCount:1
-	pressure:0.0];
+	pressure:-1.0];
     [NSApp postEvent:motion atStart:NO];
     press = [NSEvent mouseEventWithType:NSLeftMouseDown
 	location:loc
@@ -249,7 +251,7 @@ PressButtonObjCmd(
 	context:nil
 	eventNumber:1
 	clickCount:1
-	pressure:0.0];
+	pressure:-1.0];
     [NSApp postEvent:press atStart:NO];
     release = [NSEvent mouseEventWithType:NSLeftMouseUp
 	location:loc
@@ -259,7 +261,7 @@ PressButtonObjCmd(
 	context:nil
 	eventNumber:2
 	clickCount:1
-	pressure:0.0];
+	pressure:-1.0];
     [NSApp postEvent:release atStart:NO];
     return TCL_OK;
 }
-- 
cgit v0.12


From 42fdbf1e581d12fe5d3a33e37b66c2dce3898a17 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Mon, 7 Sep 2020 18:35:22 +0000
Subject: fix a typo

---
 macosx/tkMacOSXMouseEvent.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index 15ae5ce..a93486f 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -75,7 +75,7 @@ enum {
      */
 
     if (![eventWindow isMemberOfClass:[TKWindow class]]) {
-	if (eventWindow && [eventWindow pressure] != -1.0) {
+	if (eventWindow && [theEvent pressure] != -1.0) {
 	    return theEvent;
 	}
     }
-- 
cgit v0.12


From 79152064c9c4eec29aea266f35af0b6b8cca7213 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Mon, 7 Sep 2020 19:57:03 +0000
Subject: Remove virtual events for changes to the accent color in Mojave,
 because Apple had not completely fixed the bugs with KVOs for NSUserDefaults.

---
 macosx/tkMacOSXWindowEvent.c | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 3d9120f..7977e0f 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -211,8 +211,8 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
     TkWindow *winPtr = TkMacOSXGetTkWindow(window);
     if (winPtr) {
 	TKContentView *view = [window contentView];
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
-	if (@available(macOS 10.14, *)) {
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101500
+	if (@available(macOS 10.15, *)) {
 	    [view viewDidChangeEffectiveAppearance];
 	}
 #endif
@@ -1122,6 +1122,20 @@ static const char *const accentNames[] = {
 			        objectAtIndex:3];
     static const char *defaultColor = NULL;
 
+    if (effectiveAppearanceName == NSAppearanceNameAqua) {
+	TkSendVirtualEvent(tkwin, "LightAqua", NULL);
+    } else if (effectiveAppearanceName == NSAppearanceNameDarkAqua) {
+	TkSendVirtualEvent(tkwin, "DarkAqua", NULL);
+    }
+    if ([NSApp macOSVersion] < 101500) {
+
+	/*
+	 * Mojave cannot handle the KVO shenanigans that we need for the
+	 * highlight and accent color notifications.
+	 */
+
+	return;
+    }
     if (!defaultColor) {
 	defaultColor = [NSApp macOSVersion] < 110000 ? "Blue" : "Multicolor";
 
@@ -1144,11 +1158,6 @@ static const char *const accentNames[] = {
 	     effectiveAppearanceName.UTF8String, accentName,
 	     highlightName);
     TkSendVirtualEvent(tkwin, "AppearanceChanged", Tcl_NewStringObj(data, -1));
-    if (effectiveAppearanceName == NSAppearanceNameAqua) {
-	TkSendVirtualEvent(tkwin, "LightAqua", NULL);
-    } else if (effectiveAppearanceName == NSAppearanceNameDarkAqua) {
-	TkSendVirtualEvent(tkwin, "DarkAqua", NULL);
-    }
 }
 
 - (void)observeValueForKeyPath:(NSString *)keyPath
-- 
cgit v0.12


From c73062a071b1f4dc9d76d4ea787a0681315cbcf5 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Mon, 7 Sep 2020 20:38:06 +0000
Subject: Adjustments to viewDidChangeEffectiveAppearance

---
 macosx/tkMacOSXWindowEvent.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 7977e0f..9e6c3dd 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -1114,12 +1114,7 @@ static const char *const accentNames[] = {
 	return;
     }
     NSAppearanceName effectiveAppearanceName = [[self effectiveAppearance] name];
-    const char *accentName, *highlightName;
     NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults];
-    NSString *accent = [preferences stringForKey:@"AppleAccentColor"];
-    NSString *highlight = [[[preferences stringForKey:@"AppleHighlightColor"]
-			        componentsSeparatedByString: @" "]
-			        objectAtIndex:3];
     static const char *defaultColor = NULL;
 
     if (effectiveAppearanceName == NSAppearanceNameAqua) {
@@ -1150,9 +1145,12 @@ static const char *const accentNames[] = {
 			 options:NSKeyValueObservingOptionNew
 			 context:NULL];
     }
-    accentName = accent ? accentNames[1 + accent.intValue] : defaultColor;
-    highlightName = highlight ? highlight.UTF8String: defaultColor;
-
+    NSString *accent = [preferences stringForKey:@"AppleAccentColor"];
+    NSArray *words = [[preferences stringForKey:@"AppleHighlightColor"]
+			        componentsSeparatedByString: @" "];
+    NSString *highlight = [words count] > 3 ? [words objectAtIndex:3] : nil;
+    const char *accentName = accent ? accentNames[1 + accent.intValue] : defaultColor;
+    const char *highlightName = highlight ? highlight.UTF8String: defaultColor;
     char data[256];
     snprintf(data, 256, "Appearance %s Accent %s Highlight %s",
 	     effectiveAppearanceName.UTF8String, accentName,
-- 
cgit v0.12


From 6f2824501d0987043c6456d5ab00adbb4300b682 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Tue, 8 Sep 2020 01:39:09 +0000
Subject: Kill off the last extraneous button event, produced by
 NSMouseDragged.

---
 macosx/tkMacOSXMouseEvent.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index 44a8e83..9e57e7d 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -128,7 +128,7 @@ enum {
      * [39cbacb9e8].
      */
 
-    if (eventType == NSLeftMouseDown) {
+    if (eventType == NSLeftMouseDown || eventType == NSLeftMouseDragged) {
 	if ([(TKWindow *)eventWindow mouseInResizeArea] &&
 	    ([eventWindow styleMask] & NSResizableWindowMask)) {
 
-- 
cgit v0.12


From dc2c36cea500db6933ade16c3252cef0a66ab26d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 8 Sep 2020 06:23:40 +0000
Subject: Simplify throughout: ButtonPress -> Button, KeyPress -> Key (or
 remove it because it is the default anyway) Use 'in' operator in stead of
 'lsearch -exact' when possible

---
 library/clrpick.tcl           |  6 ++--
 library/console.tcl           |  2 +-
 library/demos/knightstour.tcl |  2 +-
 library/fontchooser.tcl       |  2 +-
 library/listbox.tcl           |  6 ++--
 library/menu.tcl              |  2 +-
 library/tk.tcl                |  6 ++--
 library/ttk/button.tcl        | 14 ++++-----
 library/ttk/combobox.tcl      | 24 +++++++--------
 library/ttk/entry.tcl         | 72 +++++++++++++++++++++----------------------
 library/ttk/menubutton.tcl    | 14 ++++-----
 library/ttk/notebook.tcl      | 28 ++++++++---------
 library/ttk/panedwindow.tcl   |  2 +-
 library/ttk/scale.tcl         |  8 ++---
 library/ttk/scrollbar.tcl     | 14 ++++-----
 library/ttk/sizegrip.tcl      |  2 +-
 library/ttk/spinbox.tcl       |  6 ++--
 library/ttk/treeview.tcl      | 28 ++++++++---------
 library/ttk/utils.tcl         | 14 ++++-----
 tests/constraints.tcl         |  8 ++---
 20 files changed, 130 insertions(+), 130 deletions(-)

diff --git a/library/clrpick.tcl b/library/clrpick.tcl
index 600be16..e408d03 100644
--- a/library/clrpick.tcl
+++ b/library/clrpick.tcl
@@ -396,7 +396,7 @@ proc ::tk::dialog::color::DrawColorScale {w c {create 0}} {
 
 	# Draw the selection polygons
 	CreateSelector $w $sel $c
-	$sel bind $data($c,index) <ButtonPress-1> \
+	$sel bind $data($c,index) <Button-1> \
 		[list tk::dialog::color::StartMove $w $sel $c %x $data(selPad) 1]
 	$sel bind $data($c,index) <B1-Motion> \
 		[list tk::dialog::color::MoveSelector $w $sel $c %x $data(selPad)]
@@ -409,14 +409,14 @@ proc ::tk::dialog::color::DrawColorScale {w c {create 0}} {
 	set data($c,clickRegion) [$sel create rectangle 0 0 \
 		$data(canvasWidth) $height -fill {} -outline {}]
 
-	bind $col <ButtonPress-1> \
+	bind $col <Button-1> \
 		[list tk::dialog::color::StartMove $w $sel $c %x $data(colorPad)]
 	bind $col <B1-Motion> \
 		[list tk::dialog::color::MoveSelector $w $sel $c %x $data(colorPad)]
 	bind $col <ButtonRelease-1> \
 		[list tk::dialog::color::ReleaseMouse $w $sel $c %x $data(colorPad)]
 
-	$sel bind $data($c,clickRegion) <ButtonPress-1> \
+	$sel bind $data($c,clickRegion) <Button-1> \
 		[list tk::dialog::color::StartMove $w $sel $c %x $data(selPad)]
 	$sel bind $data($c,clickRegion) <B1-Motion> \
 		[list tk::dialog::color::MoveSelector $w $sel $c %x $data(selPad)]
diff --git a/library/console.tcl b/library/console.tcl
index 6527607..4e2b9d0 100644
--- a/library/console.tcl
+++ b/library/console.tcl
@@ -131,7 +131,7 @@ proc ::tk::ConsoleInit {} {
         default { set preferred {} }
     }
     foreach {family size} $preferred {
-        if {[lsearch -exact $families $family] != -1} {
+        if {$family in $families} {
             font configure TkConsoleFont -family $family -size $size
             break
         }
diff --git a/library/demos/knightstour.tcl b/library/demos/knightstour.tcl
index 3c29720..b5cffa8 100644
--- a/library/demos/knightstour.tcl
+++ b/library/demos/knightstour.tcl
@@ -218,7 +218,7 @@ proc CreateGUI {} {
             -fill black -activefill "#600000"
     }
     $c moveto knight {*}[lrange [$c coords [expr {1 + int(rand() * 64)}]] 0 1]
-    $c bind knight <ButtonPress-1> [namespace code [list DragStart %W %x %y]]
+    $c bind knight <Button-1> [namespace code [list DragStart %W %x %y]]
     $c bind knight <Motion> [namespace code [list DragMotion %W %x %y]]
     $c bind knight <ButtonRelease-1> [namespace code [list DragEnd %W %x %y]]
 
diff --git a/library/fontchooser.tcl b/library/fontchooser.tcl
index 3e2b6df..9197aea 100644
--- a/library/fontchooser.tcl
+++ b/library/fontchooser.tcl
@@ -121,7 +121,7 @@ proc ::tk::fontchooser::Configure {args} {
     if {[string trim $S(-title)] eq ""} {
         set S(-title) [::msgcat::mc "Font"]
     }
-    if {[winfo exists $S(W)] && [lsearch $args -font] != -1} {
+    if {[winfo exists $S(W)] && ("-font" in $args)} {
 	Init $S(-font)
 	event generate $S(-parent) <<TkFontchooserFontChanged>>
     }
diff --git a/library/listbox.tcl b/library/listbox.tcl
index a094883..9e628a8 100644
--- a/library/listbox.tcl
+++ b/library/listbox.tcl
@@ -311,13 +311,13 @@ proc ::tk::ListboxMotion {w el} {
 		set Priv(listboxSelection) [$w curselection]
 	    }
 	    while {($i < $el) && ($i < $anchor)} {
-		if {[lsearch $Priv(listboxSelection) $i] >= 0} {
+		if {$i in $Priv(listboxSelection)} {
 		    $w selection set $i
 		}
 		incr i
 	    }
 	    while {($i > $el) && ($i > $anchor)} {
-		if {[lsearch $Priv(listboxSelection) $i] >= 0} {
+		if {$i in $Priv(listboxSelection)} {
 		    $w selection set $i
 		}
 		incr i -1
@@ -517,7 +517,7 @@ proc ::tk::ListboxCancel w {
     }
     $w selection clear $first $last
     while {$first <= $last} {
-	if {[lsearch $Priv(listboxSelection) $first] >= 0} {
+	if {$first in $Priv(listboxSelection)} {
 	    $w selection set $first
 	}
 	incr first
diff --git a/library/menu.tcl b/library/menu.tcl
index 9d6370a..c4991f8 100644
--- a/library/menu.tcl
+++ b/library/menu.tcl
@@ -138,7 +138,7 @@ bind Menu <Leave> {
 bind Menu <Motion> {
     tk::MenuMotion %W %x %y %s
 }
-bind Menu <ButtonPress> {
+bind Menu <Button> {
     tk::MenuButtonDown %W
 }
 bind Menu <ButtonRelease> {
diff --git a/library/tk.tcl b/library/tk.tcl
index abe34ab..3657511 100644
--- a/library/tk.tcl
+++ b/library/tk.tcl
@@ -400,7 +400,7 @@ switch -exact -- [tk windowingsystem] {
 	event add <<NextPara>>		<Control-Down>
 	event add <<SelectPrevPara>>	<Control-Shift-Up>
 	event add <<SelectNextPara>>	<Control-Shift-Down>
-	event add <<ToggleSelection>>	<Control-ButtonPress-1>
+	event add <<ToggleSelection>>	<Control-Button-1>
 
 	# Some OS's define a goofy (as in, not <Shift-Tab>) keysym that is
 	# returned when the user presses <Shift-Tab>. In order for tab
@@ -449,7 +449,7 @@ switch -exact -- [tk windowingsystem] {
 	event add <<NextPara>>		<Control-Down>
 	event add <<SelectPrevPara>>	<Control-Shift-Up>
 	event add <<SelectNextPara>>	<Control-Shift-Down>
-	event add <<ToggleSelection>>	<Control-ButtonPress-1>
+	event add <<ToggleSelection>>	<Control-Button-1>
     }
     "aqua" {
 	event add <<Cut>>		<Command-Key-x> <Key-F2> <Command-Lock-Key-X>
@@ -486,7 +486,7 @@ switch -exact -- [tk windowingsystem] {
 	event add <<NextPara>>		<Option-Down>
 	event add <<SelectPrevPara>>	<Shift-Option-Up>
 	event add <<SelectNextPara>>	<Shift-Option-Down>
-	event add <<ToggleSelection>>	<Command-ButtonPress-1>
+	event add <<ToggleSelection>>	<Command-Button-1>
     }
 }
 
diff --git a/library/ttk/button.tcl b/library/ttk/button.tcl
index 24065c2..e8c24a1 100644
--- a/library/ttk/button.tcl
+++ b/library/ttk/button.tcl
@@ -9,7 +9,7 @@
 # we get a <Leave> event then, which turns off the "active" state)
 #
 # Normally, <ButtonRelease> and <ButtonN-Enter/Leave> events are
-# delivered to the widget which received the initial <ButtonPress>
+# delivered to the widget which received the initial <Button>
 # event.  However, Tk [grab]s (#1223103) and menu interactions
 # (#1222605) can interfere with this.  To guard against spurious
 # <Button1-Enter> events, the <Button1-Enter> binding only sets
@@ -20,10 +20,10 @@ namespace eval ttk::button {}
 
 bind TButton <Enter> 		{ %W instate !disabled {%W state active} }
 bind TButton <Leave>		{ %W state !active }
-bind TButton <Key-space>	{ ttk::button::activate %W }
+bind TButton <space>		{ ttk::button::activate %W }
 bind TButton <<Invoke>> 	{ ttk::button::activate %W }
 
-bind TButton <ButtonPress-1> \
+bind TButton <Button-1> \
     { %W instate !disabled { ttk::clickToFocus %W; %W state pressed } }
 bind TButton <ButtonRelease-1> \
     { %W instate pressed { %W state !pressed; %W instate !disabled { %W invoke } } }
@@ -39,11 +39,11 @@ ttk::copyBindings TButton TRadiobutton
 
 # ...plus a few more:
 
-bind TRadiobutton <KeyPress-Up> 	{ ttk::button::RadioTraverse %W -1 }
-bind TRadiobutton <KeyPress-Down> 	{ ttk::button::RadioTraverse %W +1 }
+bind TRadiobutton <Up>  		{ ttk::button::RadioTraverse %W -1 }
+bind TRadiobutton <Down> 		{ ttk::button::RadioTraverse %W +1 }
 
-# bind TCheckbutton <KeyPress-plus> { %W select }
-# bind TCheckbutton <KeyPress-minus> { %W deselect }
+# bind TCheckbutton <plus> { %W select }
+# bind TCheckbutton <minus> { %W deselect }
 
 # activate --
 #	Simulate a button press: temporarily set the state to 'pressed',
diff --git a/library/ttk/combobox.tcl b/library/ttk/combobox.tcl
index 2378643..e339f97 100644
--- a/library/ttk/combobox.tcl
+++ b/library/ttk/combobox.tcl
@@ -45,13 +45,13 @@ namespace eval ttk::combobox {
 
 ttk::copyBindings TEntry TCombobox
 
-bind TCombobox <KeyPress-Down> 		{ ttk::combobox::Post %W }
-bind TCombobox <KeyPress-Escape> 	{ ttk::combobox::Unpost %W }
+bind TCombobox <Down> 			{ ttk::combobox::Post %W }
+bind TCombobox <Escape> 		{ ttk::combobox::Unpost %W }
 
-bind TCombobox <ButtonPress-1> 		{ ttk::combobox::Press "" %W %x %y }
-bind TCombobox <Shift-ButtonPress-1>	{ ttk::combobox::Press "s" %W %x %y }
-bind TCombobox <Double-ButtonPress-1> 	{ ttk::combobox::Press "2" %W %x %y }
-bind TCombobox <Triple-ButtonPress-1> 	{ ttk::combobox::Press "3" %W %x %y }
+bind TCombobox <Button-1> 		{ ttk::combobox::Press "" %W %x %y }
+bind TCombobox <Shift-Button-1>		{ ttk::combobox::Press "s" %W %x %y }
+bind TCombobox <Double-Button-1> 	{ ttk::combobox::Press "2" %W %x %y }
+bind TCombobox <Triple-Button-1> 	{ ttk::combobox::Press "3" %W %x %y }
 bind TCombobox <B1-Motion>		{ ttk::combobox::Drag %W %x }
 bind TCombobox <Motion>			{ ttk::combobox::Motion %W %x %y }
 
@@ -62,9 +62,9 @@ bind TCombobox <<TraverseIn>> 		{ ttk::combobox::TraverseIn %W }
 ### Combobox listbox bindings.
 #
 bind ComboboxListbox <ButtonRelease-1>	{ ttk::combobox::LBSelected %W }
-bind ComboboxListbox <KeyPress-Return>	{ ttk::combobox::LBSelected %W }
-bind ComboboxListbox <KeyPress-Escape>  { ttk::combobox::LBCancel %W }
-bind ComboboxListbox <KeyPress-Tab>	{ ttk::combobox::LBTab %W next }
+bind ComboboxListbox <Return>		{ ttk::combobox::LBSelected %W }
+bind ComboboxListbox <Escape>		{ ttk::combobox::LBCancel %W }
+bind ComboboxListbox <Tab>		{ ttk::combobox::LBTab %W next }
 bind ComboboxListbox <<PrevWindow>>	{ ttk::combobox::LBTab %W prev }
 bind ComboboxListbox <Destroy>		{ ttk::combobox::LBCleanup %W }
 bind ComboboxListbox <Motion>		{ ttk::combobox::LBHover %W %x %y }
@@ -82,7 +82,7 @@ switch -- [tk windowingsystem] {
 #
 bind ComboboxPopdown	<Map>		{ ttk::combobox::MapPopdown %W }
 bind ComboboxPopdown	<Unmap>		{ ttk::combobox::UnmapPopdown %W }
-bind ComboboxPopdown	<ButtonPress> \
+bind ComboboxPopdown	<Button> \
 			{ ttk::combobox::Unpost [winfo parent %W] }
 
 ### Option database settings.
@@ -106,7 +106,7 @@ switch -- [tk windowingsystem] {
 ### Binding procedures.
 #
 
-## Press $mode $x $y -- ButtonPress binding for comboboxes.
+## Press $mode $x $y -- Button binding for comboboxes.
 #	Either post/unpost the listbox, or perform Entry widget binding,
 #	depending on widget state and location of button press.
 #
@@ -135,7 +135,7 @@ proc ttk::combobox::Press {mode w x y} {
 }
 
 ## Drag -- B1-Motion binding for comboboxes.
-#	If the initial ButtonPress event was handled by Entry binding,
+#	If the initial Button event was handled by Entry binding,
 #	perform Entry widget drag binding; otherwise nothing.
 #
 proc ttk::combobox::Drag {w x}  {
diff --git a/library/ttk/entry.tcl b/library/ttk/entry.tcl
index 1ee6005..4cdb5ac 100644
--- a/library/ttk/entry.tcl
+++ b/library/ttk/entry.tcl
@@ -40,20 +40,20 @@ option add *TEntry.cursor [ttk::cursor text] widgetDefault
 #
 # Removed the following standard Tk bindings:
 #
-# <Control-Key-space>, <Control-Shift-Key-space>,
-# <Key-Select>,  <Shift-Key-Select>:
+# <Control-space>, <Control-Shift-space>,
+# <Select>,  <Shift-Select>:
 #	Ttk entry widget doesn't use selection anchor.
-# <Key-Insert>:
+# <Insert>:
 #	Inserts PRIMARY selection (on non-Windows platforms).
 #	This is inconsistent with typical platform bindings.
-# <Double-Shift-ButtonPress-1>, <Triple-Shift-ButtonPress-1>:
+# <Double-Shift-Button-1>, <Triple-Shift-Button-1>:
 #	These don't do the right thing to start with.
-# <Meta-Key-b>, <Meta-Key-d>, <Meta-Key-f>,
-# <Meta-Key-BackSpace>, <Meta-Key-Delete>:
+# <Meta-b>, <Meta-d>, <Meta-f>,
+# <Meta-BackSpace>, <Meta-Delete>:
 #	Judgment call.  If <Meta> happens to be assigned to the Alt key,
 #	these could conflict with application accelerators.
 #	(Plus, who has a Meta key these days?)
-# <Control-Key-t>:
+# <Control-t>:
 #	Another judgment call.  If anyone misses this, let me know
 #	and I'll put it back.
 #
@@ -68,15 +68,15 @@ bind TEntry <<Clear>> 			{ ttk::entry::Clear %W }
 ## Button1 bindings:
 #	Used for selection and navigation.
 #
-bind TEntry <ButtonPress-1> 		{ ttk::entry::Press %W %x }
-bind TEntry <Shift-ButtonPress-1>	{ ttk::entry::Shift-Press %W %x }
-bind TEntry <Double-ButtonPress-1> 	{ ttk::entry::Select %W %x word }
-bind TEntry <Triple-ButtonPress-1> 	{ ttk::entry::Select %W %x line }
+bind TEntry <Button-1> 			{ ttk::entry::Press %W %x }
+bind TEntry <Shift-Button-1>		{ ttk::entry::Shift-Press %W %x }
+bind TEntry <Double-Button-1> 		{ ttk::entry::Select %W %x word }
+bind TEntry <Triple-Button-1> 		{ ttk::entry::Select %W %x line }
 bind TEntry <B1-Motion>			{ ttk::entry::Drag %W %x }
 
-bind TEntry <B1-Leave> 		{ ttk::entry::DragOut %W %m }
-bind TEntry <B1-Enter>		{ ttk::entry::DragIn %W }
-bind TEntry <ButtonRelease-1>	{ ttk::entry::Release %W }
+bind TEntry <B1-Leave> 			{ ttk::entry::DragOut %W %m }
+bind TEntry <B1-Enter>			{ ttk::entry::DragIn %W }
+bind TEntry <ButtonRelease-1>		{ ttk::entry::Release %W }
 
 bind TEntry <<ToggleSelection>> {
     %W instate {!readonly !disabled} { %W icursor @%x ; focus %W }
@@ -88,13 +88,13 @@ bind TEntry <<ToggleSelection>> {
 #	is mapped to <<PasteSelection>> in tk.tcl.
 #
 if {[tk windowingsystem] ne "aqua"} {
-    bind TEntry <ButtonPress-2> 		{ ttk::entry::ScanMark %W %x }
+    bind TEntry <Button-2> 		{ ttk::entry::ScanMark %W %x }
     bind TEntry <B2-Motion> 		{ ttk::entry::ScanDrag %W %x }
-    bind TEntry <ButtonRelease-2>		{ ttk::entry::ScanRelease %W %x }
+    bind TEntry <ButtonRelease-2>	{ ttk::entry::ScanRelease %W %x }
 } else {
-    bind TEntry <ButtonPress-3> 		{ ttk::entry::ScanMark %W %x }
+    bind TEntry <Button-3> 		{ ttk::entry::ScanMark %W %x }
     bind TEntry <B3-Motion> 		{ ttk::entry::ScanDrag %W %x }
-    bind TEntry <ButtonRelease-3>		{ ttk::entry::ScanRelease %W %x }
+    bind TEntry <ButtonRelease-3>	{ ttk::entry::ScanRelease %W %x }
 }
 bind TEntry <<PasteSelection>>		{ ttk::entry::ScanRelease %W %x }
 
@@ -121,26 +121,26 @@ bind TEntry <<TraverseIn>> 	{ %W selection range 0 end; %W icursor end }
 
 ## Edit bindings:
 #
-bind TEntry <KeyPress> 			{ ttk::entry::Insert %W %A }
-bind TEntry <Key-Delete>		{ ttk::entry::Delete %W }
-bind TEntry <Key-BackSpace> 		{ ttk::entry::Backspace %W }
+bind TEntry <Key> 			{ ttk::entry::Insert %W %A }
+bind TEntry <Delete>			{ ttk::entry::Delete %W }
+bind TEntry <BackSpace> 		{ ttk::entry::Backspace %W }
 
 # Ignore all Alt, Meta, and Control keypresses unless explicitly bound.
-# Otherwise, the <KeyPress> class binding will fire and insert the character.
+# Otherwise, the <Key> class binding will fire and insert the character.
 # Ditto for Escape, Return, and Tab.
 #
-bind TEntry <Alt-KeyPress>		{# nothing}
-bind TEntry <Meta-KeyPress>		{# nothing}
-bind TEntry <Control-KeyPress> 		{# nothing}
-bind TEntry <Key-Escape> 		{# nothing}
-bind TEntry <Key-Return> 		{# nothing}
-bind TEntry <Key-KP_Enter> 		{# nothing}
-bind TEntry <Key-Tab> 			{# nothing}
+bind TEntry <Alt-Key>			{# nothing}
+bind TEntry <Meta-Key>			{# nothing}
+bind TEntry <Control-Key> 		{# nothing}
+bind TEntry <Escape> 			{# nothing}
+bind TEntry <Return> 			{# nothing}
+bind TEntry <KP_Enter> 			{# nothing}
+bind TEntry <Tab> 			{# nothing}
 
 # Argh.  Apparently on Windows, the NumLock modifier is interpreted
 # as a Command modifier.
 if {[tk windowingsystem] eq "aqua"} {
-    bind TEntry <Command-KeyPress>	{# nothing}
+    bind TEntry <Command-Key>		{# nothing}
 }
 # Tk-on-Cocoa generates characters for these two keys. [Bug 2971663]
 bind TEntry <<PrevLine>>		{# nothing}
@@ -148,9 +148,9 @@ bind TEntry <<NextLine>>		{# nothing}
 
 ## Additional emacs-like bindings:
 #
-bind TEntry <Control-Key-d>		{ ttk::entry::Delete %W }
-bind TEntry <Control-Key-h>		{ ttk::entry::Backspace %W }
-bind TEntry <Control-Key-k>		{ %W delete insert end }
+bind TEntry <Control-d>			{ ttk::entry::Delete %W }
+bind TEntry <Control-h>			{ ttk::entry::Backspace %W }
+bind TEntry <Control-k>			{ %W delete insert end }
 
 # Bindings for IME text input.
 
@@ -358,7 +358,7 @@ proc ttk::entry::Extend {w where} {
 # Triple-clicking enters "line-select" mode.
 #
 
-## Press -- ButtonPress-1 binding.
+## Press -- Button-1 binding.
 #	Set the insertion cursor, claim the input focus, set up for
 #	future drag operations.
 #
@@ -375,7 +375,7 @@ proc ttk::entry::Press {w x} {
     set State(anchor) [$w index insert]
 }
 
-## Shift-Press -- Shift-ButtonPress-1 binding.
+## Shift-Press -- Shift-Button-1 binding.
 #	Extends the selection, sets anchor for future drag operations.
 #
 proc ttk::entry::Shift-Press {w x} {
@@ -524,7 +524,7 @@ proc ttk::entry::LineSelect {w _ _} {
 ### Button 2 binding procedures.
 #
 
-## ScanMark -- ButtonPress-2 binding.
+## ScanMark -- Button-2 binding.
 #	Marks the start of a scan or primary transfer operation.
 #
 proc ttk::entry::ScanMark {w x} {
diff --git a/library/ttk/menubutton.tcl b/library/ttk/menubutton.tcl
index bb947c2..a245df8 100644
--- a/library/ttk/menubutton.tcl
+++ b/library/ttk/menubutton.tcl
@@ -5,7 +5,7 @@
 #
 # Pulldown: Press menubutton, drag over menu, release to activate menu entry
 # Popdown: Click menubutton to post menu
-# Keyboard: <Key-space> or accelerator key to post menu
+# Keyboard: <space> or accelerator key to post menu
 #
 # (In addition, when menu system is active, "dropdown" -- menu posts
 # on mouse-over.  Ttk menubuttons don't implement this).
@@ -19,7 +19,7 @@
 # This won't work for Ttk menubuttons in pulldown mode,
 # since we need to process the final <ButtonRelease> event,
 # and this might be delivered to the menu.  So instead we
-# rely on the passive grab that occurs on <ButtonPress> events,
+# rely on the passive grab that occurs on <Button> events,
 # and transition to popdown mode when the mouse is released
 # or dragged outside the menubutton.
 #
@@ -46,15 +46,15 @@ namespace eval ttk {
 
 bind TMenubutton <Enter>	{ %W instate !disabled {%W state active } }
 bind TMenubutton <Leave>	{ %W state !active }
-bind TMenubutton <Key-space> 	{ ttk::menubutton::Popdown %W }
+bind TMenubutton <space>	{ ttk::menubutton::Popdown %W }
 bind TMenubutton <<Invoke>> 	{ ttk::menubutton::Popdown %W }
 
 if {[tk windowingsystem] eq "x11"} {
-    bind TMenubutton <ButtonPress-1>  	{ ttk::menubutton::Pulldown %W }
+    bind TMenubutton <Button-1>  	{ ttk::menubutton::Pulldown %W }
     bind TMenubutton <ButtonRelease-1>	{ ttk::menubutton::TransferGrab %W }
     bind TMenubutton <B1-Leave> 	{ ttk::menubutton::TransferGrab %W }
 } else {
-    bind TMenubutton <ButtonPress-1>  \
+    bind TMenubutton <Button-1>  \
 	{ %W state pressed ; ttk::menubutton::Popdown %W }
     bind TMenubutton <ButtonRelease-1>  \
 	{ if {[winfo exists %W]} { %W state !pressed } }
@@ -224,11 +224,11 @@ proc ttk::menubutton::TransferGrab {mb} {
 # FindMenuEntry --
 #	Hack to support tk_optionMenus.
 #	Returns the index of the menu entry with a matching -label,
-#	-1 if not found.
+#	"" if not found.
 #
 proc ttk::menubutton::FindMenuEntry {menu s} {
     set last [$menu index last]
-    if {$last eq "none"} {
+    if {$last eq "none" || $last eq ""} {
 	return ""
     }
     for {set i 0} {$i <= $last} {incr i} {
diff --git a/library/ttk/notebook.tcl b/library/ttk/notebook.tcl
index 92efe40..c5340a5 100644
--- a/library/ttk/notebook.tcl
+++ b/library/ttk/notebook.tcl
@@ -6,11 +6,11 @@ namespace eval ttk::notebook {
     variable TLNotebooks ;# See enableTraversal
 }
 
-bind TNotebook <ButtonPress-1>		{ ttk::notebook::Press %W %x %y }
-bind TNotebook <Key-Right>		{ ttk::notebook::CycleTab %W  1; break }
-bind TNotebook <Key-Left>		{ ttk::notebook::CycleTab %W -1; break }
-bind TNotebook <Control-Key-Tab>	{ ttk::notebook::CycleTab %W  1; break }
-bind TNotebook <Control-Shift-Key-Tab>	{ ttk::notebook::CycleTab %W -1; break }
+bind TNotebook <Button-1>		{ ttk::notebook::Press %W %x %y }
+bind TNotebook <Right>			{ ttk::notebook::CycleTab %W  1; break }
+bind TNotebook <Left>			{ ttk::notebook::CycleTab %W -1; break }
+bind TNotebook <Control-Tab>		{ ttk::notebook::CycleTab %W  1; break }
+bind TNotebook <Control-Shift-Tab>	{ ttk::notebook::CycleTab %W -1; break }
 catch {
 bind TNotebook <Control-ISO_Left_Tab>	{ ttk::notebook::CycleTab %W -1; break }
 }
@@ -43,7 +43,7 @@ proc ttk::notebook::ActivateTab {w tab} {
 }
 
 # Press $nb $x $y --
-#	ButtonPress-1 binding for notebook widgets.
+#	Button-1 binding for notebook widgets.
 #	Activate the tab under the mouse cursor, if any.
 #
 proc ttk::notebook::Press {w x y} {
@@ -105,18 +105,18 @@ proc ttk::notebook::enableTraversal {nb} {
     if {![info exists TLNotebooks($top)]} {
 	# Augment $top bindings:
 	#
-	bind $top <Control-Key-Next>         {+ttk::notebook::TLCycleTab %W  1}
-	bind $top <Control-Key-Prior>        {+ttk::notebook::TLCycleTab %W -1}
-	bind $top <Control-Key-Tab> 	     {+ttk::notebook::TLCycleTab %W  1}
-	bind $top <Control-Shift-Key-Tab>    {+ttk::notebook::TLCycleTab %W -1}
+	bind $top <Control-Next>             {+ttk::notebook::TLCycleTab %W  1}
+	bind $top <Control-Prior>            {+ttk::notebook::TLCycleTab %W -1}
+	bind $top <Control-Tab> 	     {+ttk::notebook::TLCycleTab %W  1}
+	bind $top <Control-Shift-Tab>        {+ttk::notebook::TLCycleTab %W -1}
 	catch {
-	bind $top <Control-Key-ISO_Left_Tab> {+ttk::notebook::TLCycleTab %W -1}
+	bind $top <Control-ISO_Left_Tab>     {+ttk::notebook::TLCycleTab %W -1}
 	}
 	if {[tk windowingsystem] eq "aqua"} {
-	    bind $top <Option-KeyPress> \
+	    bind $top <Option-Key> \
 		+[list ttk::notebook::MnemonicActivation $top %K]
 	} else {
-	    bind $top <Alt-KeyPress> \
+	    bind $top <Alt-Key> \
 		+[list ttk::notebook::MnemonicActivation $top %K]
 	}
 	bind $top <Destroy> {+ttk::notebook::TLCleanup %W}
@@ -182,7 +182,7 @@ proc ttk::notebook::TLCycleTab {w dir} {
 }
 
 # MnemonicActivation $nb $key --
-#	Alt-KeyPress binding procedure for mnemonic activation.
+#	Alt-Key binding procedure for mnemonic activation.
 #	Scan all notebooks in specified toplevel for a tab with the
 #	the specified mnemonic.  If found, activate it and return TCL_BREAK.
 #
diff --git a/library/ttk/panedwindow.tcl b/library/ttk/panedwindow.tcl
index ba47003..0fd9bd7 100644
--- a/library/ttk/panedwindow.tcl
+++ b/library/ttk/panedwindow.tcl
@@ -15,7 +15,7 @@ namespace eval ttk::panedwindow {
 
 ## Bindings:
 #
-bind TPanedwindow <ButtonPress-1> 	{ ttk::panedwindow::Press %W %x %y }
+bind TPanedwindow <Button-1> 		{ ttk::panedwindow::Press %W %x %y }
 bind TPanedwindow <B1-Motion>		{ ttk::panedwindow::Drag %W %x %y }
 bind TPanedwindow <ButtonRelease-1> 	{ ttk::panedwindow::Release %W %x %y }
 
diff --git a/library/ttk/scale.tcl b/library/ttk/scale.tcl
index 62c85bf..61c4136 100644
--- a/library/ttk/scale.tcl
+++ b/library/ttk/scale.tcl
@@ -9,15 +9,15 @@ namespace eval ttk::scale {
     }
 }
 
-bind TScale <ButtonPress-1>   { ttk::scale::Press %W %x %y }
+bind TScale <Button-1>        { ttk::scale::Press %W %x %y }
 bind TScale <B1-Motion>       { ttk::scale::Drag %W %x %y }
 bind TScale <ButtonRelease-1> { ttk::scale::Release %W %x %y }
 
-bind TScale <ButtonPress-2>   { ttk::scale::Jump %W %x %y }
+bind TScale <Button-2>        { ttk::scale::Jump %W %x %y }
 bind TScale <B2-Motion>       { ttk::scale::Drag %W %x %y }
 bind TScale <ButtonRelease-2> { ttk::scale::Release %W %x %y }
 
-bind TScale <ButtonPress-3>   { ttk::scale::Jump %W %x %y }
+bind TScale <Button-3>        { ttk::scale::Jump %W %x %y }
 bind TScale <B3-Motion>       { ttk::scale::Drag %W %x %y }
 bind TScale <ButtonRelease-3> { ttk::scale::Release %W %x %y }
 
@@ -52,7 +52,7 @@ proc ttk::scale::Press {w x y} {
     }
 }
 
-# scale::Jump -- ButtonPress-2/3 binding for scale acts like
+# scale::Jump -- Button-2/3 binding for scale acts like
 #	Press except that clicking in the trough jumps to the
 #	clicked position.
 proc ttk::scale::Jump {w x y} {
diff --git a/library/ttk/scrollbar.tcl b/library/ttk/scrollbar.tcl
index e939426..1213450 100644
--- a/library/ttk/scrollbar.tcl
+++ b/library/ttk/scrollbar.tcl
@@ -9,11 +9,11 @@ namespace eval ttk::scrollbar {
     # State(first)	-- value of -first at start of drag.
 }
 
-bind TScrollbar <ButtonPress-1> 	{ ttk::scrollbar::Press %W %x %y }
+bind TScrollbar <Button-1> 		{ ttk::scrollbar::Press %W %x %y }
 bind TScrollbar <B1-Motion>		{ ttk::scrollbar::Drag %W %x %y }
 bind TScrollbar <ButtonRelease-1>	{ ttk::scrollbar::Release %W %x %y }
 
-bind TScrollbar <ButtonPress-2> 	{ ttk::scrollbar::Jump %W %x %y }
+bind TScrollbar <Button-2> 		{ ttk::scrollbar::Jump %W %x %y }
 bind TScrollbar <B2-Motion>		{ ttk::scrollbar::Drag %W %x %y }
 bind TScrollbar <ButtonRelease-2>	{ ttk::scrollbar::Release %W %x %y }
 
@@ -29,7 +29,7 @@ switch [tk windowingsystem] {
     x11 {
         lappend eventList <Button-4> <Button-5> \
                 <Shift-Button-4> <Shift-Button-5>
-        # For tk 8.7, the event list should be extended by
+        # For tk 8.7, the event list will be extended by
         # <Button-6> <Button-7>
     }
 }
@@ -59,7 +59,7 @@ proc ttk::scrollbar::Press {w x y} {
     set State(yPress) $y
 
     switch -glob -- [$w identify $x $y] {
-    	*uparrow -
+	*uparrow -
 	*leftarrow {
 	    ttk::Repeatedly Scroll $w -1 units
 	}
@@ -67,7 +67,7 @@ proc ttk::scrollbar::Press {w x y} {
 	*rightarrow {
 	    ttk::Repeatedly Scroll $w  1 units
 	}
-        *grip -
+	*grip -
 	*thumb {
 	    set State(first) [lindex [$w get] 0]
 	}
@@ -105,7 +105,7 @@ proc ttk::scrollbar::Release {w x y} {
     ttk::CancelRepeat
 }
 
-# scrollbar::Jump -- ButtonPress-2 binding for scrollbars.
+# scrollbar::Jump -- Button-2 binding for scrollbars.
 # 	Behaves exactly like scrollbar::Press, except that
 #	clicking in the trough jumps to the the selected position.
 #
@@ -113,7 +113,7 @@ proc ttk::scrollbar::Jump {w x y} {
     variable State
 
     switch -glob -- [$w identify $x $y] {
-        *grip -
+	*grip -
 	*thumb -
 	*trough {
 	    set State(first) [$w fraction $x $y]
diff --git a/library/ttk/sizegrip.tcl b/library/ttk/sizegrip.tcl
index 24a67c6..080ab2d 100644
--- a/library/ttk/sizegrip.tcl
+++ b/library/ttk/sizegrip.tcl
@@ -32,7 +32,7 @@ namespace eval ttk::sizegrip {
     }
 }
 
-bind TSizegrip <ButtonPress-1> 		{ ttk::sizegrip::Press	%W %X %Y }
+bind TSizegrip <Button-1> 		{ ttk::sizegrip::Press	%W %X %Y }
 bind TSizegrip <B1-Motion> 		{ ttk::sizegrip::Drag 	%W %X %Y }
 bind TSizegrip <ButtonRelease-1> 	{ ttk::sizegrip::Release %W %X %Y }
 
diff --git a/library/ttk/spinbox.tcl b/library/ttk/spinbox.tcl
index 344ee60..33936d9 100644
--- a/library/ttk/spinbox.tcl
+++ b/library/ttk/spinbox.tcl
@@ -12,13 +12,13 @@ namespace eval ttk::spinbox { }
 ttk::copyBindings TEntry TSpinbox
 
 bind TSpinbox <Motion>			{ ttk::spinbox::Motion %W %x %y }
-bind TSpinbox <ButtonPress-1> 		{ ttk::spinbox::Press %W %x %y }
+bind TSpinbox <Button-1> 		{ ttk::spinbox::Press %W %x %y }
 bind TSpinbox <ButtonRelease-1> 	{ ttk::spinbox::Release %W }
 bind TSpinbox <Double-Button-1> 	{ ttk::spinbox::DoubleClick %W %x %y }
 bind TSpinbox <Triple-Button-1> 	{} ;# disable TEntry triple-click
 
-bind TSpinbox <KeyPress-Up>		{ event generate %W <<Increment>> }
-bind TSpinbox <KeyPress-Down> 		{ event generate %W <<Decrement>> }
+bind TSpinbox <Up>			{ event generate %W <<Increment>> }
+bind TSpinbox <Down> 			{ event generate %W <<Decrement>> }
 
 bind TSpinbox <<Increment>>		{ ttk::spinbox::Spin %W +1 }
 bind TSpinbox <<Decrement>> 		{ ttk::spinbox::Spin %W -1 }
diff --git a/library/ttk/treeview.tcl b/library/ttk/treeview.tcl
index 1aaae78..62fc630 100644
--- a/library/ttk/treeview.tcl
+++ b/library/ttk/treeview.tcl
@@ -28,20 +28,20 @@ namespace eval ttk::treeview {
 bind Treeview	<Motion> 		{ ttk::treeview::Motion %W %x %y }
 bind Treeview	<B1-Leave>		{ #nothing }
 bind Treeview	<Leave>			{ ttk::treeview::ActivateHeading {} {}}
-bind Treeview	<ButtonPress-1> 	{ ttk::treeview::Press %W %x %y }
-bind Treeview	<Double-ButtonPress-1> 	{ ttk::treeview::DoubleClick %W %x %y }
+bind Treeview	<Button-1> 		{ ttk::treeview::Press %W %x %y }
+bind Treeview	<Double-Button-1> 	{ ttk::treeview::DoubleClick %W %x %y }
 bind Treeview	<ButtonRelease-1> 	{ ttk::treeview::Release %W %x %y }
 bind Treeview	<B1-Motion> 		{ ttk::treeview::Drag %W %x %y }
-bind Treeview 	<KeyPress-Up>    	{ ttk::treeview::Keynav %W up }
-bind Treeview 	<KeyPress-Down>  	{ ttk::treeview::Keynav %W down }
-bind Treeview 	<KeyPress-Right> 	{ ttk::treeview::Keynav %W right }
-bind Treeview 	<KeyPress-Left>  	{ ttk::treeview::Keynav %W left }
-bind Treeview	<KeyPress-Prior>	{ %W yview scroll -1 pages }
-bind Treeview	<KeyPress-Next> 	{ %W yview scroll  1 pages }
-bind Treeview	<KeyPress-Return>	{ ttk::treeview::ToggleFocus %W }
-bind Treeview	<KeyPress-space>	{ ttk::treeview::ToggleFocus %W }
-
-bind Treeview	<Shift-ButtonPress-1> \
+bind Treeview 	<Up>    		{ ttk::treeview::Keynav %W up }
+bind Treeview 	<Down>  		{ ttk::treeview::Keynav %W down }
+bind Treeview 	<Right> 		{ ttk::treeview::Keynav %W right }
+bind Treeview 	<Left>  		{ ttk::treeview::Keynav %W left }
+bind Treeview	<Prior>			{ %W yview scroll -1 pages }
+bind Treeview	<Next> 			{ %W yview scroll  1 pages }
+bind Treeview	<Return>		{ ttk::treeview::ToggleFocus %W }
+bind Treeview	<space>			{ ttk::treeview::ToggleFocus %W }
+
+bind Treeview	<Shift-Button-1> \
 		{ ttk::treeview::Select %W %x %y extend }
 bind Treeview	<<ToggleSelection>> \
 		{ ttk::treeview::Select %W %x %y toggle }
@@ -155,7 +155,7 @@ proc ttk::treeview::Select {w x y op} {
     }
 }
 
-## DoubleClick -- Double-ButtonPress-1 binding.
+## DoubleClick -- Double-Button-1 binding.
 #
 proc ttk::treeview::DoubleClick {w x y} {
     if {[set row [$w identify row $x $y]] ne ""} {
@@ -165,7 +165,7 @@ proc ttk::treeview::DoubleClick {w x y} {
     }
 }
 
-## Press -- ButtonPress binding.
+## Press -- Button binding.
 #
 proc ttk::treeview::Press {w x y} {
     focus $w
diff --git a/library/ttk/utils.tcl b/library/ttk/utils.tcl
index 101162f..7a5cc71 100644
--- a/library/ttk/utils.tcl
+++ b/library/ttk/utils.tcl
@@ -58,7 +58,7 @@ proc ttk::traverseTo {w} {
 }
 
 ## ttk::clickToFocus $w --
-#	Utility routine, used in <ButtonPress-1> bindings --
+#	Utility routine, used in <Button-1> bindings --
 #	Assign keyboard focus to the specified widget if -takefocus is enabled.
 #
 proc ttk::clickToFocus {w} {
@@ -298,8 +298,8 @@ proc ttk::copyBindings {from to} {
 
 proc ttk::bindMouseWheel {bindtag callback} {
     if {[tk windowingsystem] eq "x11"} {
-	bind $bindtag <ButtonPress-4> "$callback -1"
-	bind $bindtag <ButtonPress-5> "$callback +1"
+	bind $bindtag <Button-4> "$callback -1"
+	bind $bindtag <Button-5> "$callback +1"
     }
     if {[tk windowingsystem] eq "aqua"} {
 	bind $bindtag <MouseWheel> [append callback { [expr {-(%D)}]} ]
@@ -318,10 +318,10 @@ proc ttk::bindMouseWheel {bindtag callback} {
 #
 
 if {[tk windowingsystem] eq "x11"} {
-    bind TtkScrollable <ButtonPress-4>       { %W yview scroll -5 units }
-    bind TtkScrollable <ButtonPress-5>       { %W yview scroll  5 units }
-    bind TtkScrollable <Shift-ButtonPress-4> { %W xview scroll -5 units }
-    bind TtkScrollable <Shift-ButtonPress-5> { %W xview scroll  5 units }
+    bind TtkScrollable <Button-4>       { %W yview scroll -5 units }
+    bind TtkScrollable <Button-5>       { %W yview scroll  5 units }
+    bind TtkScrollable <Shift-Button-4> { %W xview scroll -5 units }
+    bind TtkScrollable <Shift-Button-5> { %W xview scroll  5 units }
 }
 if {[tk windowingsystem] eq "aqua"} {
     bind TtkScrollable <MouseWheel> \
diff --git a/tests/constraints.tcl b/tests/constraints.tcl
index ff036f3..9b48e8d 100644
--- a/tests/constraints.tcl
+++ b/tests/constraints.tcl
@@ -197,8 +197,8 @@ testConstraint noExceed [expr {
 }]
 
 # constraints for testing facilities defined in the tktest executable...
-testConstraint testImageType [expr {[lsearch [image types] test] >= 0}]
-testConstraint testOldImageType [expr {[lsearch [image types] oldtest] >= 0}]
+testConstraint testImageType [expr {"test" in [image types]}]
+testConstraint testOldImageType [expr {"oldtest" in [image types]}]
 testConstraint testbitmap    [llength [info commands testbitmap]]
 testConstraint testborder    [llength [info commands testborder]]
 testConstraint testcbind     [llength [info commands testcbind]]
@@ -247,10 +247,10 @@ testConstraint pseudocolor8 [expr {
 }]
 destroy .t
 testConstraint haveTruecolor24 [expr {
-    [lsearch -exact [winfo visualsavailable .] {truecolor 24}] >= 0
+    {truecolor 24} in [winfo visualsavailable .]
 }]
 testConstraint haveGrayscale8 [expr {
-    [lsearch -exact [winfo visualsavailable .] {grayscale 8}] >= 0
+    {grayscale 8} in [winfo visualsavailable .]
 }]
 testConstraint defaultPseudocolor8 [expr {
     ([winfo visual .] eq "pseudocolor") && ([winfo depth .] == 8)
-- 
cgit v0.12


From 3b31d9630f305b2f6b73e57e147541bc13aa1057 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 8 Sep 2020 06:25:09 +0000
Subject: TIP #581: master -> container and slave -> content in ttk (mainly)

---
 doc/ImgChanged.3             |   6 +-
 doc/MaintGeom.3              |  86 ++++++++++----------
 doc/grid.n                   |   5 +-
 generic/tk.decls             |  10 +--
 generic/tkCanvWind.c         |  16 ++--
 generic/tkDecls.h            |  20 ++---
 generic/tkFrame.c            |  16 ++--
 generic/tkGeometry.c         |  72 ++++++++--------
 generic/tkImgPhInstance.c    | 146 ++++++++++++++++-----------------
 generic/tkImgPhoto.c         |  18 ++--
 generic/tkImgPhoto.h         |  10 +--
 generic/ttk/ttkFrame.c       |  49 ++++++-----
 generic/ttk/ttkGenStubs.tcl  |  59 ++++++++++++--
 generic/ttk/ttkManager.c     | 141 ++++++++++++++++----------------
 generic/ttk/ttkManager.h     |  14 ++--
 generic/ttk/ttkNotebook.c    | 190 ++++++++++++++++++++++---------------------
 generic/ttk/ttkPanedwindow.c | 184 +++++++++++++++++++++--------------------
 generic/ttk/ttkTheme.c       | 117 ++++++++++++++------------
 18 files changed, 618 insertions(+), 541 deletions(-)

diff --git a/doc/ImgChanged.3 b/doc/ImgChanged.3
index aa56548..6d8ae91 100644
--- a/doc/ImgChanged.3
+++ b/doc/ImgChanged.3
@@ -14,10 +14,10 @@ Tk_ImageChanged \- notify widgets that image needs to be redrawn
 .nf
 \fB#include <tk.h>\fR
 .sp
-\fBTk_ImageChanged\fR(\fIimageMaster, x, y, width, height, imageWidth, imageHeight\fR)
+\fBTk_ImageChanged\fR(\fImodel, x, y, width, height, imageWidth, imageHeight\fR)
 .SH ARGUMENTS
 .AS Tk_ImageMaster imageHeight
-.AP Tk_ImageMaster imageMaster in
+.AP Tk_ImageMaster model in
 Token for image, which was passed to image's \fIcreateProc\fR when
 the image was created.
 .AP int x in
@@ -42,7 +42,7 @@ whenever anything happens that requires the image to be redrawn.
 As a result of calling \fBTk_ImageChanged\fR, any widgets using
 the image are notified so that they can redisplay themselves
 appropriately.
-The \fIimageMaster\fR argument identifies the image, and
+The \fImodel\fR argument identifies the image, and
 \fIx\fR, \fIy\fR, \fIwidth\fR, and \fIheight\fR
 specify a rectangular region within the image that needs to
 be redrawn.
diff --git a/doc/MaintGeom.3 b/doc/MaintGeom.3
index d1c2d1c..a509b0b 100644
--- a/doc/MaintGeom.3
+++ b/doc/MaintGeom.3
@@ -14,67 +14,67 @@ Tk_MaintainGeometry, Tk_UnmaintainGeometry \- maintain geometry of one window re
 .nf
 \fB#include <tk.h>\fR
 .sp
-\fBTk_MaintainGeometry\fR(\fIslave, master, x, y, width, height\fR)
+\fBTk_MaintainGeometry\fR(\fIwindow, container, x, y, width, height\fR)
 .sp
-\fBTk_UnmaintainGeometry\fR(\fIslave, master\fR)
+\fBTk_UnmaintainGeometry\fR(\fIwindow, container\fR)
 .SH ARGUMENTS
-.AS Tk_Window master
-.AP Tk_Window slave in
+.AS Tk_Window container
+.AP Tk_Window window in
 Window whose geometry is to be controlled.
-.AP Tk_Window master in
-Window relative to which \fIslave\fR's geometry will be controlled.
+.AP Tk_Window container in
+Window relative to which \fIwindow\fR's geometry will be controlled.
 .AP int x in
-Desired x-coordinate of \fIslave\fR in \fImaster\fR, measured in pixels
-from the inside of \fImaster\fR's left border to the outside of
-\fIslave\fR's left border.
+Desired x-coordinate of \fIwindow\fR in \fIcontainer\fR, measured in pixels
+from the inside of \fIcontainer\fR's left border to the outside of
+\fIwindow\fR's left border.
 .AP int y in
-Desired y-coordinate of \fIslave\fR in \fImaster\fR, measured in pixels
-from the inside of \fImaster\fR's top border to the outside of
-\fIslave\fR's top border.
+Desired y-coordinate of \fIwindow\fR in \fIcontainer\fR, measured in pixels
+from the inside of \fIcontainer\fR's top border to the outside of
+\fIwindow\fR's top border.
 .AP int width in
-Desired width for \fIslave\fR, in pixels.
+Desired width for \fIwindow\fR, in pixels.
 .AP int height in
-Desired height for \fIslave\fR, in pixels.
+Desired height for \fIwindow\fR, in pixels.
 .BE
 .SH DESCRIPTION
 .PP
 \fBTk_MaintainGeometry\fR and \fBTk_UnmaintainGeometry\fR make it
-easier for geometry managers to deal with slaves whose masters are not
+easier for geometry managers to deal with windows whose containers are not
 their parents.
-Three problems arise if the master for a slave is not its parent:
+Three problems arise if the container for a window is not its parent:
 .IP [1]
-The x- and y-position of the slave must be translated from the
-coordinate system of the master to that of the parent before
-positioning the slave.
+The x- and y-position of the window must be translated from the
+coordinate system of the container to that of the parent before
+positioning the window.
 .IP [2]
-If the master window, or any of its ancestors up to the slave's
-parent, is moved, then the slave must be repositioned within its
+If the container window, or any of its ancestors up to the window's
+parent, is moved, then the window must be repositioned within its
 parent in order to maintain the correct position relative to the
-master.
+container.
 .IP [3]
-If the master or one of its ancestors is mapped or unmapped, then
-the slave must be mapped or unmapped to correspond.
+If the container or one of its ancestors is mapped or unmapped, then
+the window must be mapped or unmapped to correspond.
 .LP
-None of these problems is an issue if the parent and master are
-the same.  For example, if the master or one of its ancestors
-is unmapped, the slave is automatically removed by the screen
+None of these problems is an issue if the parent and container are
+the same.  For example, if the container or one of its ancestors
+is unmapped, the window is automatically removed by the screen
 by X.
 .PP
-\fBTk_MaintainGeometry\fR deals with these problems for slaves
-whose masters are not their parents, as well as handling the simpler
-case of slaves whose masters are their parents.
+\fBTk_MaintainGeometry\fR deals with these problems for windows
+whose containers are not their parents, as well as handling the simpler
+case of windows whose container are their parents.
 \fBTk_MaintainGeometry\fR is typically called by a window manager
-once it has decided where a slave should be positioned relative
-to its master.
+once it has decided where a window should be positioned relative
+to its container.
 \fBTk_MaintainGeometry\fR translates the coordinates to the
-coordinate system of \fIslave\fR's parent and then moves and
-resizes the slave appropriately.
+coordinate system of \fIwindow\fR's parent and then moves and
+resizes the window appropriately.
 Furthermore, it remembers the desired position and creates event
-handlers to monitor the master and all of its ancestors up
-to (but not including) the slave's parent.
+handlers to monitor the container and all of its ancestors up
+to (but not including) the window's parent.
 If any of these windows is moved, mapped, or unmapped,
-the slave will be adjusted so that it is mapped only when the
-master is mapped and its geometry relative to the master
+the window will be adjusted so that it is mapped only when the
+container is mapped and its geometry relative to the container
 remains as specified by \fIx\fR, \fIy\fR, \fIwidth\fR, and
 \fIheight\fR.
 .PP
@@ -83,17 +83,17 @@ if it decides that it does not want the window to appear on the
 screen under any conditions, it calls \fBTk_UnmaintainGeometry\fR.
 \fBTk_UnmaintainGeometry\fR unmaps the window and cancels any
 previous calls to \fBTk_MaintainGeometry\fR for the
-\fImaster\fR\-\fIslave\fR pair, so that the slave's
+\fIcontainer\fR\-\fIwindow\fR pair, so that the window's
 geometry and mapped state are no longer maintained
 automatically.
 \fBTk_UnmaintainGeometry\fR need not be called by a geometry
-manager if the slave, the master, or any of the master's ancestors
+manager if the window, the container, or any of the container's ancestors
 is destroyed:  Tk will call it automatically.
 .PP
 If \fBTk_MaintainGeometry\fR is called repeatedly for the same
-\fImaster\fR\-\fIslave\fR pair, the information from the most
+\fIcontainer\fR\-\fIwindow\fR pair, the information from the most
 recent call supersedes any older information.
-If \fBTk_UnmaintainGeometry\fR is called for a \fImaster\fR\-\fIslave\fR
+If \fBTk_UnmaintainGeometry\fR is called for a \fIcontainer\fR\-\fIwindow\fR
 pair that is is not currently managed, the call has no effect.
 .SH KEYWORDS
-geometry manager, map, master, parent, position, slave, unmap
+geometry manager, map, container, parent, position, window, unmap
diff --git a/doc/grid.n b/doc/grid.n
index c56ebfd..b4f7699 100644
--- a/doc/grid.n
+++ b/doc/grid.n
@@ -275,9 +275,8 @@ Removes each of the \fIwindow\fRs from grid for its
 container and unmaps their windows.
 The content will no longer be managed by the grid geometry manager.
 However, the configuration options for that window are remembered,
-so that if the
-slave is managed once more by the grid geometry manager, the previous
-values are retained.
+so that if the content window is managed once more by the grid
+geometry manager, the previous values are retained.
 .TP
 \fBgrid size \fIcontainer\fR
 .
diff --git a/generic/tk.decls b/generic/tk.decls
index 3e64878..1a26d27 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -472,7 +472,7 @@ declare 116 {
     Tk_Window Tk_IdToWindow(Display *display, Window window)
 }
 declare 117 {
-    void Tk_ImageChanged(Tk_ImageMaster master, int x, int y,
+    void Tk_ImageChanged(Tk_ImageMaster model, int x, int y,
 	    int width, int height, int imageWidth, int imageHeight)
 }
 declare 118 {
@@ -486,8 +486,8 @@ declare 120 {
 	    int width, int height)
 }
 declare 121 {
-    void Tk_MaintainGeometry(Tk_Window slave,
-	    Tk_Window master, int x, int y, int width, int height)
+    void Tk_MaintainGeometry(Tk_Window window,
+	    Tk_Window container, int x, int y, int width, int height)
 }
 declare 122 {
     Tk_Window Tk_MainWindow(Tcl_Interp *interp)
@@ -539,7 +539,7 @@ declare 136 {
     CONST84_RETURN char *Tk_NameOfFont(Tk_Font font)
 }
 declare 137 {
-    CONST84_RETURN char *Tk_NameOfImage(Tk_ImageMaster imageMaster)
+    CONST84_RETURN char *Tk_NameOfImage(Tk_ImageMaster model)
 }
 declare 138 {
     CONST84_RETURN char *Tk_NameOfJoinStyle(int join)
@@ -692,7 +692,7 @@ declare 180 {
     void Tk_Ungrab(Tk_Window tkwin)
 }
 declare 181 {
-    void Tk_UnmaintainGeometry(Tk_Window slave, Tk_Window master)
+    void Tk_UnmaintainGeometry(Tk_Window window, Tk_Window container)
 }
 declare 182 {
     void Tk_UnmapWindow(Tk_Window tkwin)
diff --git a/generic/tkCanvWind.c b/generic/tkCanvWind.c
index f73546f..4047b0f 100644
--- a/generic/tkCanvWind.c
+++ b/generic/tkCanvWind.c
@@ -85,7 +85,7 @@ static void		TranslateWinItem(Tk_Canvas canvas,
 static int		WinItemCoords(Tcl_Interp *interp,
 			    Tk_Canvas canvas, Tk_Item *itemPtr, int objc,
 			    Tcl_Obj *const objv[]);
-static void		WinItemLostSlaveProc(ClientData clientData,
+static void		WinItemLostContentProc(ClientData clientData,
 			    Tk_Window tkwin);
 static void		WinItemRequestProc(ClientData clientData,
 			    Tk_Window tkwin);
@@ -141,7 +141,7 @@ Tk_ItemType tkWindowType = {
 static const Tk_GeomMgr canvasGeomType = {
     "canvas",				/* name */
     WinItemRequestProc,			/* requestProc */
-    WinItemLostSlaveProc,		/* lostSlaveProc */
+    WinItemLostContentProc,		/* lostSlaveProc */
 };
 
 /*
@@ -1053,26 +1053,26 @@ WinItemRequestProc(
 /*
  *--------------------------------------------------------------
  *
- * WinItemLostSlaveProc --
+ * WinItemLostContentProc --
  *
  *	This function is invoked by Tk whenever some other geometry claims
- *	control over a slave that used to be managed by us.
+ *	control over a content window that used to be managed by us.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	Forgets all canvas-related information about the slave.
+ *	Forgets all canvas-related information about the content window.
  *
  *--------------------------------------------------------------
  */
 
 	/* ARGSUSED */
 static void
-WinItemLostSlaveProc(
-    ClientData clientData,	/* WindowItem structure for slave window that
+WinItemLostContentProc(
+    ClientData clientData,	/* WindowItem structure for content window that
 				 * was stolen away. */
-    Tk_Window tkwin)		/* Tk's handle for the slave window. */
+    Tk_Window tkwin)		/* Tk's handle for the content window. */
 {
     WindowItem *winItemPtr = clientData;
     Tk_Window canvasTkwin = Tk_CanvasTkwin(winItemPtr->canvas);
diff --git a/generic/tkDecls.h b/generic/tkDecls.h
index b02f286..38114c0 100644
--- a/generic/tkDecls.h
+++ b/generic/tkDecls.h
@@ -402,7 +402,7 @@ EXTERN void		Tk_HandleEvent(XEvent *eventPtr);
 /* 116 */
 EXTERN Tk_Window	Tk_IdToWindow(Display *display, Window window);
 /* 117 */
-EXTERN void		Tk_ImageChanged(Tk_ImageMaster master, int x, int y,
+EXTERN void		Tk_ImageChanged(Tk_ImageMaster model, int x, int y,
 				int width, int height, int imageWidth,
 				int imageHeight);
 /* 118 */
@@ -413,8 +413,8 @@ EXTERN Atom		Tk_InternAtom(Tk_Window tkwin, const char *name);
 EXTERN int		Tk_IntersectTextLayout(Tk_TextLayout layout, int x,
 				int y, int width, int height);
 /* 121 */
-EXTERN void		Tk_MaintainGeometry(Tk_Window slave,
-				Tk_Window master, int x, int y, int width,
+EXTERN void		Tk_MaintainGeometry(Tk_Window window,
+				Tk_Window container, int x, int y, int width,
 				int height);
 /* 122 */
 EXTERN Tk_Window	Tk_MainWindow(Tcl_Interp *interp);
@@ -453,7 +453,7 @@ EXTERN CONST84_RETURN char * Tk_NameOfCursor(Display *display,
 /* 136 */
 EXTERN CONST84_RETURN char * Tk_NameOfFont(Tk_Font font);
 /* 137 */
-EXTERN CONST84_RETURN char * Tk_NameOfImage(Tk_ImageMaster imageMaster);
+EXTERN CONST84_RETURN char * Tk_NameOfImage(Tk_ImageMaster model);
 /* 138 */
 EXTERN CONST84_RETURN char * Tk_NameOfJoinStyle(int join);
 /* 139 */
@@ -582,8 +582,8 @@ EXTERN void		Tk_UnderlineTextLayout(Display *display,
 /* 180 */
 EXTERN void		Tk_Ungrab(Tk_Window tkwin);
 /* 181 */
-EXTERN void		Tk_UnmaintainGeometry(Tk_Window slave,
-				Tk_Window master);
+EXTERN void		Tk_UnmaintainGeometry(Tk_Window window,
+				Tk_Window container);
 /* 182 */
 EXTERN void		Tk_UnmapWindow(Tk_Window tkwin);
 /* 183 */
@@ -993,11 +993,11 @@ typedef struct TkStubs {
     int (*tk_Grab) (Tcl_Interp *interp, Tk_Window tkwin, int grabGlobal); /* 114 */
     void (*tk_HandleEvent) (XEvent *eventPtr); /* 115 */
     Tk_Window (*tk_IdToWindow) (Display *display, Window window); /* 116 */
-    void (*tk_ImageChanged) (Tk_ImageMaster master, int x, int y, int width, int height, int imageWidth, int imageHeight); /* 117 */
+    void (*tk_ImageChanged) (Tk_ImageMaster model, int x, int y, int width, int height, int imageWidth, int imageHeight); /* 117 */
     int (*tk_Init) (Tcl_Interp *interp); /* 118 */
     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 slave, Tk_Window master, int x, int y, int width, int height); /* 121 */
+    void (*tk_MaintainGeometry) (Tk_Window window, Tk_Window container, int x, int y, int width, int height); /* 121 */
     Tk_Window (*tk_MainWindow) (Tcl_Interp *interp); /* 122 */
     void (*tk_MakeWindowExist) (Tk_Window tkwin); /* 123 */
     void (*tk_ManageGeometry) (Tk_Window tkwin, const Tk_GeomMgr *mgrPtr, ClientData clientData); /* 124 */
@@ -1013,7 +1013,7 @@ typedef struct TkStubs {
     CONST84_RETURN char * (*tk_NameOfColor) (XColor *colorPtr); /* 134 */
     CONST84_RETURN char * (*tk_NameOfCursor) (Display *display, Tk_Cursor cursor); /* 135 */
     CONST84_RETURN char * (*tk_NameOfFont) (Tk_Font font); /* 136 */
-    CONST84_RETURN char * (*tk_NameOfImage) (Tk_ImageMaster imageMaster); /* 137 */
+    CONST84_RETURN char * (*tk_NameOfImage) (Tk_ImageMaster model); /* 137 */
     CONST84_RETURN char * (*tk_NameOfJoinStyle) (int join); /* 138 */
     CONST84_RETURN char * (*tk_NameOfJustify) (Tk_Justify justify); /* 139 */
     CONST84_RETURN char * (*tk_NameOfRelief) (int relief); /* 140 */
@@ -1057,7 +1057,7 @@ typedef struct TkStubs {
     void (*tk_UnderlineChars) (Display *display, Drawable drawable, GC gc, Tk_Font tkfont, const char *source, int x, int y, int firstByte, int lastByte); /* 178 */
     void (*tk_UnderlineTextLayout) (Display *display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, int underline); /* 179 */
     void (*tk_Ungrab) (Tk_Window tkwin); /* 180 */
-    void (*tk_UnmaintainGeometry) (Tk_Window slave, Tk_Window master); /* 181 */
+    void (*tk_UnmaintainGeometry) (Tk_Window window, Tk_Window container); /* 181 */
     void (*tk_UnmapWindow) (Tk_Window tkwin); /* 182 */
     void (*tk_UnsetGrid) (Tk_Window tkwin); /* 183 */
     void (*tk_UpdatePointer) (Tk_Window tkwin, int x, int y, int state); /* 184 */
diff --git a/generic/tkFrame.c b/generic/tkFrame.c
index ce7dc8c..1112f81 100644
--- a/generic/tkFrame.c
+++ b/generic/tkFrame.c
@@ -314,7 +314,7 @@ static void		DisplayFrame(ClientData clientData);
 static void		FrameCmdDeletedProc(ClientData clientData);
 static void		FrameEventProc(ClientData clientData,
 			    XEvent *eventPtr);
-static void		FrameLostSlaveProc(ClientData clientData,
+static void		FrameLostContentProc(ClientData clientData,
 			    Tk_Window tkwin);
 static void		FrameRequestProc(ClientData clientData,
 			    Tk_Window tkwin);
@@ -346,7 +346,7 @@ static const Tk_ClassProcs frameClass = {
 static const Tk_GeomMgr frameGeomType = {
     "labelframe",		/* name */
     FrameRequestProc,		/* requestProc */
-    FrameLostSlaveProc		/* lostSlaveProc */
+    FrameLostContentProc		/* lostSlaveProc */
 };
 
 /*
@@ -1914,25 +1914,25 @@ FrameRequestProc(
 /*
  *--------------------------------------------------------------
  *
- * FrameLostSlaveProc --
+ * FrameLostContentProc --
  *
  *	This function is invoked by Tk whenever some other geometry claims
- *	control over a slave that used to be managed by us.
+ *	control over a content window that used to be managed by us.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	Forgets all frame-related information about the slave.
+ *	Forgets all frame-related information about the content window.
  *
  *--------------------------------------------------------------
  */
 
 static void
-FrameLostSlaveProc(
-    ClientData clientData,	/* Frame structure for slave window that was
+FrameLostContentProc(
+    ClientData clientData,	/* Frame structure for content window that was
 				 * stolen away. */
-    Tk_Window tkwin)		/* Tk's handle for the slave window. */
+    Tk_Window tkwin)		/* Tk's handle for the content window. */
 {
     Frame *framePtr = clientData;
     Labelframe *labelframePtr = clientData;
diff --git a/generic/tkGeometry.c b/generic/tkGeometry.c
index a8c3f2b..b70e66a 100644
--- a/generic/tkGeometry.c
+++ b/generic/tkGeometry.c
@@ -15,11 +15,11 @@
 
 /*
  * Data structures of the following type are used by Tk_MaintainGeometry. For
- * each slave managed by Tk_MaintainGeometry, there is one of these structures
- * associated with its master.
+ * each content managed by Tk_MaintainGeometry, there is one of these structures
+ * associated with its container.
  */
 
-typedef struct MaintainSlave {
+typedef struct MaintainContent {
     Tk_Window slave;		/* The slave window being positioned. */
     Tk_Window master;		/* The master that determines slave's
 				 * position; it must be a descendant of
@@ -27,17 +27,17 @@ typedef struct MaintainSlave {
     int x, y;			/* Desired position of slave relative to
 				 * master. */
     int width, height;		/* Desired dimensions of slave. */
-    struct MaintainSlave *nextPtr;
+    struct MaintainContent *nextPtr;
 				/* Next in list of Maintains associated with
 				 * master. */
-} MaintainSlave;
+} MaintainContent;
 
 /*
- * For each window that has been specified as a master to Tk_MaintainGeometry,
+ * For each window that has been specified as a content to Tk_MaintainGeometry,
  * there is a structure of the following type:
  */
 
-typedef struct MaintainMaster {
+typedef struct MaintainContainer {
     Tk_Window ancestor;		/* The lowest ancestor of this window for
 				 * which we have *not* created a
 				 * StructureNotify handler. May be the same as
@@ -45,18 +45,18 @@ typedef struct MaintainMaster {
     int checkScheduled;		/* Non-zero means that there is already a call
 				 * to MaintainCheckProc scheduled as an idle
 				 * handler. */
-    MaintainSlave *slavePtr;	/* First in list of all slaves associated with
-				 * this master. */
-} MaintainMaster;
+    MaintainContent *slavePtr;	/* First in list of all content associated with
+				 * this container. */
+} MaintainContainer;
 
 /*
  * Prototypes for static procedures in this file:
  */
 
 static void		MaintainCheckProc(ClientData clientData);
-static void		MaintainMasterProc(ClientData clientData,
+static void		MaintainContainerProc(ClientData clientData,
 			    XEvent *eventPtr);
-static void		MaintainSlaveProc(ClientData clientData,
+static void		MaintainContentProc(ClientData clientData,
 			    XEvent *eventPtr);
 
 /*
@@ -418,8 +418,8 @@ Tk_MaintainGeometry(
     int width, int height)	/* Desired dimensions for slave. */
 {
     Tcl_HashEntry *hPtr;
-    MaintainMaster *masterPtr;
-    MaintainSlave *slavePtr;
+    MaintainContainer *masterPtr;
+    MaintainContent *slavePtr;
     int isNew, map;
     Tk_Window ancestor, parent;
     TkDisplay *dispPtr = ((TkWindow *) master)->dispPtr;
@@ -455,7 +455,7 @@ Tk_MaintainGeometry(
     }
 
     /*
-     * See if there is already a MaintainMaster structure for the master; if
+     * See if there is already a MaintainContainer structure for the master; if
      * not, then create one.
      */
 
@@ -465,7 +465,7 @@ Tk_MaintainGeometry(
     if (!isNew) {
 	masterPtr = Tcl_GetHashValue(hPtr);
     } else {
-	masterPtr = ckalloc(sizeof(MaintainMaster));
+	masterPtr = ckalloc(sizeof(MaintainContainer));
 	masterPtr->ancestor = master;
 	masterPtr->checkScheduled = 0;
 	masterPtr->slavePtr = NULL;
@@ -473,7 +473,7 @@ Tk_MaintainGeometry(
     }
 
     /*
-     * Create a MaintainSlave structure for the slave if there isn't already
+     * Create a MaintainContent structure for the slave if there isn't already
      * one.
      */
 
@@ -483,12 +483,12 @@ Tk_MaintainGeometry(
 	    goto gotSlave;
 	}
     }
-    slavePtr = ckalloc(sizeof(MaintainSlave));
+    slavePtr = ckalloc(sizeof(MaintainContent));
     slavePtr->slave = slave;
     slavePtr->master = master;
     slavePtr->nextPtr = masterPtr->slavePtr;
     masterPtr->slavePtr = slavePtr;
-    Tk_CreateEventHandler(slave, StructureNotifyMask, MaintainSlaveProc,
+    Tk_CreateEventHandler(slave, StructureNotifyMask, MaintainContentProc,
 	    slavePtr);
 
     /*
@@ -502,7 +502,7 @@ Tk_MaintainGeometry(
 	    ancestor = Tk_Parent(ancestor)) {
 	if (ancestor == masterPtr->ancestor) {
 	    Tk_CreateEventHandler(ancestor, StructureNotifyMask,
-		    MaintainMasterProc, masterPtr);
+		    MaintainContainerProc, masterPtr);
 	    masterPtr->ancestor = Tk_Parent(ancestor);
 	}
     }
@@ -567,8 +567,8 @@ Tk_UnmaintainGeometry(
 				 * slave's parent. */
 {
     Tcl_HashEntry *hPtr;
-    MaintainMaster *masterPtr;
-    MaintainSlave *slavePtr, *prevPtr;
+    MaintainContainer *masterPtr;
+    MaintainContent *slavePtr, *prevPtr;
     Tk_Window ancestor;
     TkDisplay *dispPtr = ((TkWindow *) slave)->dispPtr;
 
@@ -613,13 +613,13 @@ Tk_UnmaintainGeometry(
 	}
     }
     Tk_DeleteEventHandler(slavePtr->slave, StructureNotifyMask,
-	    MaintainSlaveProc, slavePtr);
+	    MaintainContentProc, slavePtr);
     ckfree(slavePtr);
     if (masterPtr->slavePtr == NULL) {
 	if (masterPtr->ancestor != NULL) {
 	    for (ancestor = master; ; ancestor = Tk_Parent(ancestor)) {
 		Tk_DeleteEventHandler(ancestor, StructureNotifyMask,
-			MaintainMasterProc, masterPtr);
+			MaintainContainerProc, masterPtr);
 		if (ancestor == masterPtr->ancestor) {
 		    break;
 		}
@@ -636,7 +636,7 @@ Tk_UnmaintainGeometry(
 /*
  *----------------------------------------------------------------------
  *
- * MaintainMasterProc --
+ * MaintainContainerProc --
  *
  *	This procedure is invoked by the Tk event dispatcher in response to
  *	StructureNotify events on the master or one of its ancestors, on
@@ -655,13 +655,13 @@ Tk_UnmaintainGeometry(
  */
 
 static void
-MaintainMasterProc(
-    ClientData clientData,	/* Pointer to MaintainMaster structure for the
+MaintainContainerProc(
+    ClientData clientData,	/* Pointer to MaintainContainer structure for the
 				 * master window. */
     XEvent *eventPtr)		/* Describes what just happened. */
 {
-    MaintainMaster *masterPtr = clientData;
-    MaintainSlave *slavePtr;
+    MaintainContainer *masterPtr = clientData;
+    MaintainContent *slavePtr;
     int done;
 
     if ((eventPtr->type == ConfigureNotify)
@@ -692,7 +692,7 @@ MaintainMasterProc(
 /*
  *----------------------------------------------------------------------
  *
- * MaintainSlaveProc --
+ * MaintainContentProc --
  *
  *	This procedure is invoked by the Tk event dispatcher in response to
  *	StructureNotify events on a slave being managed by
@@ -709,12 +709,12 @@ MaintainMasterProc(
  */
 
 static void
-MaintainSlaveProc(
-    ClientData clientData,	/* Pointer to MaintainSlave structure for
+MaintainContentProc(
+    ClientData clientData,	/* Pointer to MaintainContent structure for
 				 * master-slave pair. */
     XEvent *eventPtr)		/* Describes what just happened. */
 {
-    MaintainSlave *slavePtr = clientData;
+    MaintainContent *slavePtr = clientData;
 
     if (eventPtr->type == DestroyNotify) {
 	Tk_UnmaintainGeometry(slavePtr->slave, slavePtr->master);
@@ -743,11 +743,11 @@ MaintainSlaveProc(
 
 static void
 MaintainCheckProc(
-    ClientData clientData)	/* Pointer to MaintainMaster structure for the
+    ClientData clientData)	/* Pointer to MaintainContainer structure for the
 				 * master window. */
 {
-    MaintainMaster *masterPtr = clientData;
-    MaintainSlave *slavePtr;
+    MaintainContainer *masterPtr = clientData;
+    MaintainContent *slavePtr;
     Tk_Window ancestor, parent;
     int x, y, map;
 
diff --git a/generic/tkImgPhInstance.c b/generic/tkImgPhInstance.c
index a8e5b5e..a40ee7f 100644
--- a/generic/tkImgPhInstance.c
+++ b/generic/tkImgPhInstance.c
@@ -59,8 +59,8 @@ static int imgPhotoColorHashInitialized;
  * TkImgPhotoConfigureInstance --
  *
  *	This function is called to create displaying information for a photo
- *	image instance based on the configuration information in the master.
- *	It is invoked both when new instances are created and when the master
+ *	image instance based on the configuration information in the model.
+ *	It is invoked both when new instances are created and when the model
  *	is reconfigured.
  *
  * Results:
@@ -77,25 +77,25 @@ void
 TkImgPhotoConfigureInstance(
     PhotoInstance *instancePtr)	/* Instance to reconfigure. */
 {
-    PhotoModel *masterPtr = instancePtr->masterPtr;
+    PhotoModel *modelPtr = instancePtr->masterPtr;
     XImage *imagePtr;
     int bitsPerPixel;
     ColorTable *colorTablePtr;
     XRectangle validBox;
 
     /*
-     * If the -palette configuration option has been set for the master, use
+     * If the -palette configuration option has been set for the model, use
      * the value specified for our palette, but only if it is a valid palette
-     * for our windows. Use the gamma value specified the master.
+     * for our windows. Use the gamma value specified the model.
      */
 
-    if ((masterPtr->palette && masterPtr->palette[0])
-	    && IsValidPalette(instancePtr, masterPtr->palette)) {
-	instancePtr->palette = masterPtr->palette;
+    if ((modelPtr->palette && modelPtr->palette[0])
+	    && IsValidPalette(instancePtr, modelPtr->palette)) {
+	instancePtr->palette = modelPtr->palette;
     } else {
 	instancePtr->palette = instancePtr->defaultPalette;
     }
-    instancePtr->gamma = masterPtr->gamma;
+    instancePtr->gamma = modelPtr->gamma;
 
     /*
      * If we don't currently have a color table, or if the one we have no
@@ -159,15 +159,15 @@ TkImgPhotoConfigureInstance(
     }
 
     /*
-     * If the user has specified a width and/or height for the master which is
+     * If the user has specified a width and/or height for the model which is
      * different from our current width/height, set the size to the values
      * specified by the user. If we have no pixmap, we do this also, since it
      * has the side effect of allocating a pixmap for us.
      */
 
     if ((instancePtr->pixels == None) || (instancePtr->error == NULL)
-	    || (instancePtr->width != masterPtr->width)
-	    || (instancePtr->height != masterPtr->height)) {
+	    || (instancePtr->width != modelPtr->width)
+	    || (instancePtr->height != modelPtr->height)) {
 	TkImgPhotoInstanceSetSize(instancePtr);
     }
 
@@ -175,9 +175,9 @@ TkImgPhotoConfigureInstance(
      * Redither this instance if necessary.
      */
 
-    if ((masterPtr->flags & IMAGE_CHANGED)
+    if ((modelPtr->flags & IMAGE_CHANGED)
 	    || (instancePtr->colorTablePtr != colorTablePtr)) {
-	TkClipBox(masterPtr->validRegion, &validBox);
+	TkClipBox(modelPtr->validRegion, &validBox);
 	if ((validBox.width > 0) && (validBox.height > 0)) {
 	    TkImgDitherInstance(instancePtr, validBox.x, validBox.y,
 		    validBox.width, validBox.height);
@@ -207,10 +207,10 @@ ClientData
 TkImgPhotoGet(
     Tk_Window tkwin,		/* Window in which the instance will be
 				 * used. */
-    ClientData masterData)	/* Pointer to our master structure for the
+    ClientData modelData)	/* Pointer to our model structure for the
 				 * image. */
 {
-    PhotoModel *masterPtr = masterData;
+    PhotoModel *modelPtr = modelData;
     PhotoInstance *instancePtr;
     Colormap colormap;
     int mono, nRed, nGreen, nBlue, numVisuals;
@@ -247,7 +247,7 @@ TkImgPhotoGet(
      */
 
     colormap = Tk_Colormap(tkwin);
-    for (instancePtr = masterPtr->instancePtr; instancePtr != NULL;
+    for (instancePtr = modelPtr->instancePtr; instancePtr != NULL;
 	    instancePtr = instancePtr->nextPtr) {
 	if ((colormap == instancePtr->colormap)
 		&& (Tk_Display(tkwin) == instancePtr->display)) {
@@ -277,7 +277,7 @@ TkImgPhotoGet(
      */
 
     instancePtr = ckalloc(sizeof(PhotoInstance));
-    instancePtr->masterPtr = masterPtr;
+    instancePtr->masterPtr = modelPtr;
     instancePtr->display = Tk_Display(tkwin);
     instancePtr->colormap = Tk_Colormap(tkwin);
     Tk_PreserveColormap(instancePtr->display, instancePtr->colormap);
@@ -288,8 +288,8 @@ TkImgPhotoGet(
     instancePtr->width = 0;
     instancePtr->height = 0;
     instancePtr->imagePtr = 0;
-    instancePtr->nextPtr = masterPtr->instancePtr;
-    masterPtr->instancePtr = instancePtr;
+    instancePtr->nextPtr = modelPtr->instancePtr;
+    modelPtr->instancePtr = instancePtr;
 
     /*
      * Obtain information about the visual and decide on the default palette.
@@ -349,8 +349,8 @@ TkImgPhotoGet(
      * Make a GC with background = black and foreground = white.
      */
 
-    white = Tk_GetColor(masterPtr->interp, tkwin, "white");
-    black = Tk_GetColor(masterPtr->interp, tkwin, "black");
+    white = Tk_GetColor(modelPtr->interp, tkwin, "white");
+    black = Tk_GetColor(modelPtr->interp, tkwin, "black");
     gcValues.foreground = (white != NULL)? white->pixel:
 	    WhitePixelOfScreen(Tk_Screen(tkwin));
     gcValues.background = (black != NULL)? black->pixel:
@@ -373,8 +373,8 @@ TkImgPhotoGet(
      */
 
     if (instancePtr->nextPtr == NULL) {
-	Tk_ImageChanged(masterPtr->tkMaster, 0, 0, 0, 0,
-		masterPtr->width, masterPtr->height);
+	Tk_ImageChanged(modelPtr->tkMaster, 0, 0, 0, 0,
+		modelPtr->width, modelPtr->height);
     }
 
     return instancePtr;
@@ -434,7 +434,7 @@ BlendComplexAlpha(
 {
     int x, y, line;
     unsigned long pixel;
-    unsigned char r, g, b, alpha, unalpha, *masterPtr;
+    unsigned char r, g, b, alpha, unalpha, *modelPtr;
     unsigned char *alphaAr = iPtr->masterPtr->pix32;
 
     /*
@@ -494,8 +494,8 @@ BlendComplexAlpha(
 	for (y = 0; y < height; y++) {
 	    line = (y + yOffset) * iPtr->masterPtr->width;
 	    for (x = 0; x < width; x++) {
-		masterPtr = alphaAr + ((line + x + xOffset) * 4);
-		alpha = masterPtr[3];
+		modelPtr = alphaAr + ((line + x + xOffset) * 4);
+		alpha = modelPtr[3];
 
 		/*
 		 * Ignore pixels that are fully transparent
@@ -507,9 +507,9 @@ BlendComplexAlpha(
 		     * 24 and 32 bit displays, but this seems "fast enough".
 		     */
 
-		    r = masterPtr[0];
-		    g = masterPtr[1];
-		    b = masterPtr[2];
+		    r = modelPtr[0];
+		    g = modelPtr[1];
+		    b = modelPtr[2];
 		    if (alpha != 255) {
 			/*
 			 * Only blend pixels that have some transparency
@@ -537,8 +537,8 @@ BlendComplexAlpha(
     for (y = 0; y < height; y++) {
 	line = (y + yOffset) * iPtr->masterPtr->width;
 	for (x = 0; x < width; x++) {
-	    masterPtr = alphaAr + ((line + x + xOffset) * 4);
-	    alpha = masterPtr[3];
+	    modelPtr = alphaAr + ((line + x + xOffset) * 4);
+	    alpha = modelPtr[3];
 
 	    /*
 	     * Ignore pixels that are fully transparent
@@ -550,9 +550,9 @@ BlendComplexAlpha(
 		 * and 32 bit displays, but this seems "fast enough".
 		 */
 
-		r = masterPtr[0];
-		g = masterPtr[1];
-		b = masterPtr[2];
+		r = modelPtr[0];
+		g = modelPtr[1];
+		b = modelPtr[2];
 		if (alpha != 255) {
 		    /*
 		     * Only blend pixels that have some transparency
@@ -679,7 +679,7 @@ TkImgPhotoDisplay(
 	Tk_DeleteErrorHandler(handler);
     } else {
 	/*
-	 * masterPtr->region describes which parts of the image contain valid
+	 * modelPtr->region describes which parts of the image contain valid
 	 * data. We set this region as the clip mask for the gc, setting its
 	 * origin appropriately, and use it when drawing the image.
 	 */
@@ -768,23 +768,23 @@ void
 TkImgPhotoInstanceSetSize(
     PhotoInstance *instancePtr)	/* Instance whose size is to be changed. */
 {
-    PhotoModel *masterPtr;
+    PhotoModel *modelPtr;
     schar *newError, *errSrcPtr, *errDestPtr;
     int h, offset;
     XRectangle validBox;
     Pixmap newPixmap;
 
-    masterPtr = instancePtr->masterPtr;
-    TkClipBox(masterPtr->validRegion, &validBox);
+    modelPtr = instancePtr->masterPtr;
+    TkClipBox(modelPtr->validRegion, &validBox);
 
-    if ((instancePtr->width != masterPtr->width)
-	    || (instancePtr->height != masterPtr->height)
+    if ((instancePtr->width != modelPtr->width)
+	    || (instancePtr->height != modelPtr->height)
 	    || (instancePtr->pixels == None)) {
 	newPixmap = Tk_GetPixmap(instancePtr->display,
 		RootWindow(instancePtr->display,
 			instancePtr->visualInfo.screen),
-		(masterPtr->width > 0) ? masterPtr->width: 1,
-		(masterPtr->height > 0) ? masterPtr->height: 1,
+		(modelPtr->width > 0) ? modelPtr->width: 1,
+		(modelPtr->height > 0) ? modelPtr->height: 1,
 		instancePtr->visualInfo.depth);
 	if (!newPixmap) {
 	    Tcl_Panic("Fail to create pixmap with Tk_GetPixmap in TkImgPhotoInstanceSetSize");
@@ -814,17 +814,17 @@ TkImgPhotoInstanceSetSize(
 	instancePtr->pixels = newPixmap;
     }
 
-    if ((instancePtr->width != masterPtr->width)
-	    || (instancePtr->height != masterPtr->height)
+    if ((instancePtr->width != modelPtr->width)
+	    || (instancePtr->height != modelPtr->height)
 	    || (instancePtr->error == NULL)) {
-	if (masterPtr->height > 0 && masterPtr->width > 0) {
+	if (modelPtr->height > 0 && modelPtr->width > 0) {
 	    /*
 	     * TODO: use attemptckalloc() here once there is a strategy that
 	     * will allow us to recover from failure. Right now, there's no
 	     * such possibility.
 	     */
 
-	    newError = ckalloc(masterPtr->height * masterPtr->width
+	    newError = ckalloc(modelPtr->height * modelPtr->width
 		    * 3 * sizeof(schar));
 
 	    /*
@@ -833,21 +833,21 @@ TkImgPhotoInstanceSetSize(
 	     */
 
 	    if ((instancePtr->error != NULL)
-		    && ((instancePtr->width == masterPtr->width)
-		    || (validBox.width == masterPtr->width))) {
+		    && ((instancePtr->width == modelPtr->width)
+		    || (validBox.width == modelPtr->width))) {
 		if (validBox.y > 0) {
 		    memset(newError, 0, (size_t)
-			    validBox.y * masterPtr->width * 3 * sizeof(schar));
+			    validBox.y * modelPtr->width * 3 * sizeof(schar));
 		}
 		h = validBox.y + validBox.height;
-		if (h < masterPtr->height) {
-		    memset(newError + h*masterPtr->width*3, 0,
-			    (size_t) (masterPtr->height - h)
-			    * masterPtr->width * 3 * sizeof(schar));
+		if (h < modelPtr->height) {
+		    memset(newError + h*modelPtr->width*3, 0,
+			    (size_t) (modelPtr->height - h)
+			    * modelPtr->width * 3 * sizeof(schar));
 		}
 	    } else {
 		memset(newError, 0, (size_t)
-			masterPtr->height * masterPtr->width *3*sizeof(schar));
+			modelPtr->height * modelPtr->width *3*sizeof(schar));
 	    }
 	} else {
 	    newError = NULL;
@@ -859,22 +859,22 @@ TkImgPhotoInstanceSetSize(
 	     * array.
 	     */
 
-	    if (masterPtr->width == instancePtr->width) {
-		offset = validBox.y * masterPtr->width * 3;
+	    if (modelPtr->width == instancePtr->width) {
+		offset = validBox.y * modelPtr->width * 3;
 		memcpy(newError + offset, instancePtr->error + offset,
 			(size_t) (validBox.height
-			* masterPtr->width * 3 * sizeof(schar)));
+			* modelPtr->width * 3 * sizeof(schar)));
 
 	    } else if (validBox.width > 0 && validBox.height > 0) {
 		errDestPtr = newError +
-			(validBox.y * masterPtr->width + validBox.x) * 3;
+			(validBox.y * modelPtr->width + validBox.x) * 3;
 		errSrcPtr = instancePtr->error +
 			(validBox.y * instancePtr->width + validBox.x) * 3;
 
 		for (h = validBox.height; h > 0; --h) {
 		    memcpy(errDestPtr, errSrcPtr,
 			    validBox.width * 3 * sizeof(schar));
-		    errDestPtr += masterPtr->width * 3;
+		    errDestPtr += modelPtr->width * 3;
 		    errSrcPtr += instancePtr->width * 3;
 		}
 	    }
@@ -884,8 +884,8 @@ TkImgPhotoInstanceSetSize(
 	instancePtr->error = newError;
     }
 
-    instancePtr->width = masterPtr->width;
-    instancePtr->height = masterPtr->height;
+    instancePtr->width = modelPtr->width;
+    instancePtr->height = modelPtr->height;
 }
 
 /*
@@ -1617,7 +1617,7 @@ TkImgDisposeInstance(
  * TkImgDitherInstance --
  *
  *	This function is called to update an area of an instance's pixmap by
- *	dithering the corresponding area of the master.
+ *	dithering the corresponding area of the model.
  *
  * Results:
  *	None.
@@ -1635,7 +1635,7 @@ TkImgDitherInstance(
 				 * block to be dithered. */
     int width, int height)	/* Dimensions of the block to be dithered. */
 {
-    PhotoModel *masterPtr = instancePtr->masterPtr;
+    PhotoModel *modelPtr = instancePtr->masterPtr;
     ColorTable *colorPtr = instancePtr->colorTablePtr;
     XImage *imagePtr;
     int nLines, bigEndian, i, c, x, y, xEnd, doDithering = 1;
@@ -1693,8 +1693,8 @@ TkImgDitherInstance(
     bigEndian = imagePtr->bitmap_bit_order == MSBFirst;
     firstBit = bigEndian? (1 << (imagePtr->bitmap_unit - 1)): 1;
 
-    lineLength = masterPtr->width * 3;
-    srcLinePtr = masterPtr->pix32 + (yStart * masterPtr->width + xStart) * 4;
+    lineLength = modelPtr->width * 3;
+    srcLinePtr = modelPtr->pix32 + (yStart * modelPtr->width + xStart) * 4;
     errLinePtr = instancePtr->error + yStart * lineLength + xStart * 3;
     xEnd = xStart + width;
 
@@ -1749,7 +1749,7 @@ TkImgDitherInstance(
 				    c += errPtr[-lineLength-3];
 				}
 				c += errPtr[-lineLength] * 5;
-				if ((x + 1) < masterPtr->width) {
+				if ((x + 1) < modelPtr->width) {
 				    c += errPtr[-lineLength+3] * 3;
 				}
 			    }
@@ -1820,7 +1820,7 @@ TkImgDitherInstance(
 		/*
 		 * Multibit monochrome window. The operation here is similar
 		 * to the color window case above, except that there is only
-		 * one component. If the master image is in color, use the
+		 * one component. If the model image is in color, use the
 		 * luminance computed as
 		 *	0.344 * red + 0.5 * green + 0.156 * blue.
 		 */
@@ -1832,13 +1832,13 @@ TkImgDitherInstance(
 			    c += errPtr[-lineLength-1];
 			}
 			c += errPtr[-lineLength] * 5;
-			if (x + 1 < masterPtr->width) {
+			if (x + 1 < modelPtr->width) {
 			    c += errPtr[-lineLength+1] * 3;
 			}
 		    }
 		    c = ((c + 2056) >> 4) - 128;
 
-		    if (masterPtr->flags & COLOR_IMAGE) {
+		    if (modelPtr->flags & COLOR_IMAGE) {
 			c += (unsigned) (srcPtr[0] * 11 + srcPtr[1] * 16
 				+ srcPtr[2] * 5 + 16) >> 5;
 		    } else {
@@ -1905,13 +1905,13 @@ TkImgDitherInstance(
 			    c += errPtr[-lineLength-1];
 			}
 			c += errPtr[-lineLength] * 5;
-			if (x + 1 < masterPtr->width) {
+			if (x + 1 < modelPtr->width) {
 			    c += errPtr[-lineLength+1] * 3;
 			}
 		    }
 		    c = ((c + 2056) >> 4) - 128;
 
-		    if (masterPtr->flags & COLOR_IMAGE) {
+		    if (modelPtr->flags & COLOR_IMAGE) {
 			c += (unsigned)(srcPtr[0] * 11 + srcPtr[1] * 16
 				+ srcPtr[2] * 5 + 16) >> 5;
 		    } else {
@@ -1934,7 +1934,7 @@ TkImgDitherInstance(
 		}
 		*destLongPtr = word;
 	    }
-	    srcLinePtr += masterPtr->width * 4;
+	    srcLinePtr += modelPtr->width * 4;
 	    errLinePtr += lineLength;
 	    dstLinePtr += bytesPerLine;
 	}
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c
index 765b8a2..afbf7b0 100644
--- a/generic/tkImgPhoto.c
+++ b/generic/tkImgPhoto.c
@@ -339,7 +339,7 @@ ImgPhotoCreate(
     PhotoModel *modelPtr;
 
     /*
-     * Allocate and initialize the photo image master record.
+     * Allocate and initialize the photo image model record.
      */
 
     modelPtr = ckalloc(sizeof(PhotoModel));
@@ -386,7 +386,7 @@ ImgPhotoCreate(
 
 static int
 ImgPhotoCmd(
-    ClientData clientData,	/* Information about photo master. */
+    ClientData clientData,	/* Information about photo model. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -2083,7 +2083,7 @@ ImgPhotoConfigureModel(
  *	None.
  *
  * Side effects:
- *	(Re)sets COMPLEX_ALPHA flag of master.
+ *	(Re)sets COMPLEX_ALPHA flag of model.
  *
  *----------------------------------------------------------------------
  */
@@ -2121,7 +2121,7 @@ ToggleComplexAlphaIfNeeded(
  *
  * ImgPhotoDelete --
  *
- *	This function is called by the image code to delete the master
+ *	This function is called by the image code to delete the model
  *	structure for an image.
  *
  * Results:
@@ -2135,10 +2135,10 @@ ToggleComplexAlphaIfNeeded(
 
 static void
 ImgPhotoDelete(
-    ClientData masterData)	/* Pointer to PhotoModel structure for image.
+    ClientData modelData)	/* Pointer to PhotoModel structure for image.
 				 * Must not have any more instances. */
 {
-    PhotoModel *modelPtr = masterData;
+    PhotoModel *modelPtr = modelData;
     PhotoInstance *instancePtr;
 
     while ((instancePtr = modelPtr->instancePtr) != NULL) {
@@ -2212,7 +2212,7 @@ ImgPhotoCmdDeletedProc(
  *	with memory allocation.)
  *
  * Side effects:
- *	Storage gets reallocated, for the master and all its instances.
+ *	Storage gets reallocated, for the model and all its instances.
  *
  *----------------------------------------------------------------------
  */
@@ -3486,7 +3486,7 @@ Tk_PhotoPutZoomedBlock(
  * Tk_DitherPhoto --
  *
  *	This function is called to update an area of each instance's pixmap by
- *	dithering the corresponding area of the image master.
+ *	dithering the corresponding area of the image model.
  *
  * Results:
  *	None.
@@ -3501,7 +3501,7 @@ Tk_PhotoPutZoomedBlock(
 
 void
 Tk_DitherPhoto(
-    Tk_PhotoHandle photo,	/* Image master whose instances are to be
+    Tk_PhotoHandle photo,	/* Image model whose instances are to be
 				 * updated. */
     int x, int y,		/* Coordinates of the top-left pixel in the
 				 * area to be dithered. */
diff --git a/generic/tkImgPhoto.h b/generic/tkImgPhoto.h
index 9cd4195..994fa40 100644
--- a/generic/tkImgPhoto.h
+++ b/generic/tkImgPhoto.h
@@ -138,7 +138,7 @@ struct ColorTable {
 #define MAP_COLORS		8
 
 /*
- * Definition of the data associated with each photo image master.
+ * Definition of the data associated with each photo image model.
  */
 
 struct PhotoMaster {
@@ -165,7 +165,7 @@ struct PhotoMaster {
     TkRegion validRegion;	/* Tk region indicating which parts of the
 				 * image have valid image data. */
     PhotoInstance *instancePtr;	/* First in the list of instances associated
-				 * with this master. */
+				 * with this model. */
 };
 
 /*
@@ -196,17 +196,17 @@ struct PhotoMaster {
  */
 
 struct PhotoInstance {
-    PhotoMaster *masterPtr;	/* Pointer to master for image. */
+    PhotoMaster *masterPtr;	/* Pointer to model for image. */
     Display *display;		/* Display for windows using this instance. */
     Colormap colormap;		/* The image may only be used in windows with
 				 * this particular colormap. */
     PhotoInstance *nextPtr;	/* Pointer to the next instance in the list of
-				 * instances associated with this master. */
+				 * instances associated with this model. */
     int refCount;		/* Number of instances using this structure. */
     Tk_Uid palette;		/* Palette for these particular instances. */
     double gamma;		/* Gamma value for these instances. */
     Tk_Uid defaultPalette;	/* Default palette to use if a palette is not
-				 * specified for the master. */
+				 * specified for the model. */
     ColorTable *colorTablePtr;	/* Pointer to information about colors
 				 * allocated for image display in windows like
 				 * this one. */
diff --git a/generic/ttk/ttkFrame.c b/generic/ttk/ttkFrame.c
index 931c037..b8b3477 100644
--- a/generic/ttk/ttkFrame.c
+++ b/generic/ttk/ttkFrame.c
@@ -88,9 +88,12 @@ static Ttk_Padding FrameMargins(Frame *framePtr)
  * 	The frame doesn't request a size of its own by default,
  * 	but it does have an internal border.  See also <<NOTE-SIZE>>
  */
-static int FrameSize(void *recordPtr, int *widthPtr, int *heightPtr)
+static int FrameSize(
+    void *recordPtr,
+    TCL_UNUSED(int *),
+    TCL_UNUSED(int *))
 {
-    Frame *framePtr = recordPtr;
+    Frame *framePtr = (Frame *)recordPtr;
     Ttk_SetMargins(framePtr->core.tkwin, FrameMargins(framePtr));
     return 0;
 }
@@ -111,7 +114,7 @@ static int FrameSize(void *recordPtr, int *widthPtr, int *heightPtr)
 
 static int FrameConfigure(Tcl_Interp *interp, void *recordPtr, int mask)
 {
-    Frame *framePtr = recordPtr;
+    Frame *framePtr = (Frame *)recordPtr;
     int width, height;
 
     /*
@@ -337,9 +340,12 @@ LabelframeLabelSize(Labelframe *lframePtr, int *widthPtr, int *heightPtr)
  * 	Like the frame, this doesn't request a size of its own
  * 	but it does have internal padding and a minimum size.
  */
-static int LabelframeSize(void *recordPtr, int *widthPtr, int *heightPtr)
+static int LabelframeSize(
+    void *recordPtr,
+    TCL_UNUSED(int *),
+    TCL_UNUSED(int *))
 {
-    Labelframe *lframePtr = recordPtr;
+    Labelframe *lframePtr = (Labelframe *)recordPtr;
     WidgetCore *corePtr = &lframePtr->core;
     Ttk_Padding margins;
     LabelframeStyle style;
@@ -384,7 +390,7 @@ static int LabelframeSize(void *recordPtr, int *widthPtr, int *heightPtr)
 static Ttk_Layout LabelframeGetLayout(
     Tcl_Interp *interp, Ttk_Theme theme, void *recordPtr)
 {
-    Labelframe *lf = recordPtr;
+    Labelframe *lf = (Labelframe *)recordPtr;
     Ttk_Layout frameLayout = TtkWidgetGetLayout(interp, theme, recordPtr);
     Ttk_Layout labelLayout;
 
@@ -415,7 +421,7 @@ static Ttk_Layout LabelframeGetLayout(
 
 static void LabelframeDoLayout(void *recordPtr)
 {
-    Labelframe *lframePtr = recordPtr;
+    Labelframe *lframePtr = (Labelframe *)recordPtr;
     WidgetCore *corePtr = &lframePtr->core;
     int lw, lh;			/* Label width and height */
     LabelframeStyle style;
@@ -461,7 +467,7 @@ static void LabelframeDoLayout(void *recordPtr)
 
 static void LabelframeDisplay(void *recordPtr, Drawable d)
 {
-    Labelframe *lframePtr = recordPtr;
+    Labelframe *lframePtr = (Labelframe *)recordPtr;
     Ttk_DrawLayout(lframePtr->core.layout, lframePtr->core.state, d);
     if (lframePtr->label.labelLayout) {
 	Ttk_DrawLayout(lframePtr->label.labelLayout, lframePtr->core.state, d);
@@ -476,22 +482,22 @@ static void LabelframeDisplay(void *recordPtr, Drawable d)
  */
 static void LabelframePlaceContent(void *recordPtr)
 {
-    Labelframe *lframe = recordPtr;
+    Labelframe *lframe = (Labelframe *)recordPtr;
 
     if (Ttk_NumberContent(lframe->label.mgr) == 1) {
 	Ttk_Box b;
 	LabelframeDoLayout(recordPtr);
 	b = lframe->label.labelParcel;
-	/* ASSERT: slave #0 is lframe->label.labelWidget */
+	/* ASSERT: content #0 is lframe->label.labelWidget */
 	Ttk_PlaceContent(lframe->label.mgr, 0, b.x,b.y,b.width,b.height);
     }
 }
 
 static int LabelRequest(
-    void *managerData,
-    int index,
-    int width,
-    int height)
+    TCL_UNUSED(void *),
+    TCL_UNUSED(int),
+    TCL_UNUSED(int),
+    TCL_UNUSED(int))
 {
     return 1;
 }
@@ -501,13 +507,14 @@ static int LabelRequest(
  *
  * <<NOTE-LABELREMOVED>>:
  * 	This routine is also called when the widget voluntarily forgets
- * 	the slave in LabelframeConfigure.
+ * 	the window in LabelframeConfigure.
  */
 static void LabelRemoved(
     void *managerData,
     TCL_UNUSED(int))
 {
-    Labelframe *lframe = managerData;
+    Labelframe *lframe = (Labelframe *)managerData;
+
     lframe->label.labelWidget = 0;
 }
 
@@ -522,9 +529,11 @@ static Ttk_ManagerSpec LabelframeManagerSpec = {
 /* LabelframeInitialize --
  * 	Initialization hook.
  */
-static void LabelframeInitialize(Tcl_Interp *interp, void *recordPtr)
+static void LabelframeInitialize(
+    TCL_UNUSED(Tcl_Interp *),
+    void *recordPtr)
 {
-    Labelframe *lframe = recordPtr;
+    Labelframe *lframe = (Labelframe *)recordPtr;
 
     lframe->label.mgr = Ttk_CreateManager(
 	&LabelframeManagerSpec, lframe, lframe->core.tkwin);
@@ -538,7 +547,7 @@ static void LabelframeInitialize(Tcl_Interp *interp, void *recordPtr)
  */
 static void LabelframeCleanup(void *recordPtr)
 {
-    Labelframe *lframe = recordPtr;
+    Labelframe *lframe = (Labelframe *)recordPtr;
     Ttk_DeleteManager(lframe->label.mgr);
     if (lframe->label.labelLayout) {
 	Ttk_FreeLayout(lframe->label.labelLayout);
@@ -569,7 +578,7 @@ static void RaiseLabelWidget(Labelframe *lframe)
  */
 static int LabelframeConfigure(Tcl_Interp *interp,void *recordPtr,int mask)
 {
-    Labelframe *lframePtr = recordPtr;
+    Labelframe *lframePtr = (Labelframe *)recordPtr;
     Tk_Window labelWidget = lframePtr->label.labelWidget;
     Ttk_PositionSpec unused;
 
diff --git a/generic/ttk/ttkGenStubs.tcl b/generic/ttk/ttkGenStubs.tcl
index 8047e3f..6aabd61 100644
--- a/generic/ttk/ttkGenStubs.tcl
+++ b/generic/ttk/ttkGenStubs.tcl
@@ -284,18 +284,26 @@ proc genStubs::rewriteFile {file text} {
 # Results:
 #	Returns the original text inside an appropriate #ifdef.
 
-proc genStubs::addPlatformGuard {plat iftxt {eltxt {}}} {
+proc genStubs::addPlatformGuard {plat iftxt {eltxt {}} {withCygwin 0}} {
     set text ""
     switch $plat {
 	win {
-	    append text "#ifdef _WIN32 /* WIN */\n${iftxt}"
+	    append text "#if defined(_WIN32)"
+	    if {$withCygwin} {
+		append text " || defined(__CYGWIN__)"
+	    }
+	    append text " /* WIN */\n${iftxt}"
 	    if {$eltxt ne ""} {
 		append text "#else /* WIN */\n${eltxt}"
 	    }
 	    append text "#endif /* WIN */\n"
 	}
 	unix {
-	    append text "#if !defined(_WIN32) && !defined(MAC_OSX_TCL)\
+	    append text "#if !defined(_WIN32)"
+	    if {$withCygwin} {
+		append text " && !defined(__CYGWIN__)"
+	    }
+	    append text " && !defined(MAC_OSX_TCL)\
 		    /* UNIX */\n${iftxt}"
 	    if {$eltxt ne ""} {
 		append text "#else /* UNIX */\n${eltxt}"
@@ -317,7 +325,11 @@ proc genStubs::addPlatformGuard {plat iftxt {eltxt {}}} {
 	    append text "#endif /* AQUA */\n"
 	}
 	x11 {
-	    append text "#if !(defined(_WIN32) || defined(MAC_OSX_TK))\
+	    append text "#if !(defined(_WIN32)"
+	    if {$withCygwin} {
+		append text " || defined(__CYGWIN__)"
+	    }
+	    append text " || defined(MAC_OSX_TK))\
 		    /* X11 */\n${iftxt}"
 	    if {$eltxt ne ""} {
 		append text "#else /* X11 */\n${eltxt}"
@@ -450,12 +462,23 @@ proc genStubs::parseArg {arg} {
 
 proc genStubs::makeDecl {name decl index} {
     variable scspec
+    variable stubs
+    variable libraryName
     lassign $decl rtype fname args
 
     append text "/* $index */\n"
-    set line "$scspec $rtype"
+    if {[info exists stubs($name,deprecated,$index)]} {
+	append text "[string toupper $libraryName]_DEPRECATED(\"$stubs($name,deprecated,$index)\")\n"
+	set line "$rtype"
+    } elseif {[string range $rtype end-5 end] eq "MP_WUR"} {
+	set line "$scspec [string trim [string range $rtype 0 end-6]]"
+    } else {
+	set line "$scspec $rtype"
+    }
     set count [expr {2 - ([string length $line] / 8)}]
-    append line [string range "\t\t\t" 0 $count]
+    if {$count >= 0} {
+	append line [string range "\t\t\t" 0 $count]
+    }
     set pad [expr {24 - [string length $line]}]
     if {$pad <= 0} {
 	append line " "
@@ -494,6 +517,9 @@ proc genStubs::makeDecl {name decl index} {
 		set sep ", "
 	    }
 	    append line ", ...)"
+	    if {[lindex $args end] eq "{const char *} format"} {
+		append line " TCL_FORMAT_PRINTF(" [expr {[llength $args] - 1}] ", " [llength $args] ")"
+	    }
 	}
 	default {
 	    set sep "("
@@ -517,6 +543,9 @@ proc genStubs::makeDecl {name decl index} {
 	    append line ")"
 	}
     }
+    if {[string range $rtype end-5 end] eq "MP_WUR"} {
+	append line " MP_WUR"
+    }
     return "$text$line;\n"
 }
 
@@ -561,17 +590,27 @@ proc genStubs::makeMacro {name decl index} {
 
 proc genStubs::makeSlot {name decl index} {
     lassign $decl rtype fname args
+    variable stubs
 
     set lfname [string tolower [string index $fname 0]]
     append lfname [string range $fname 1 end]
 
     set text "    "
+    if {[info exists stubs($name,deprecated,$index)]} {
+	append text "TCL_DEPRECATED_API(\"$stubs($name,deprecated,$index)\") "
+    } elseif {[info exists stubs($name,nostub,$index)]} {
+	append text "TCL_DEPRECATED_API(\"$stubs($name,nostub,$index)\") "
+    }
     if {$args eq ""} {
 	append text $rtype " *" $lfname "; /* $index */\n"
 	return $text
     }
     if {[string range $rtype end-8 end] eq "__stdcall"} {
 	append text [string trim [string range $rtype 0 end-9]] " (__stdcall *" $lfname ") "
+    } elseif {[string range $rtype 0 11] eq "TCL_NORETURN"} {
+	append text "TCL_NORETURN1 " [string trim [string range $rtype 12 end]] " (*" $lfname ") "
+    } elseif {[string range $rtype end-5 end] eq "MP_WUR"} {
+	append text [string trim [string range $rtype 0 end-6]] " (*" $lfname ") "
     } else {
 	append text $rtype " (*" $lfname ") "
     }
@@ -591,6 +630,9 @@ proc genStubs::makeSlot {name decl index} {
 		set sep ", "
 	    }
 	    append text ", ...)"
+	    if {[lindex $args end] eq "{const char *} format"} {
+		append text " TCL_FORMAT_PRINTF(" [expr {[llength $args] - 1}] ", " [llength $args] ")"
+	    }
 	}
 	default {
 	    set sep "("
@@ -606,6 +648,9 @@ proc genStubs::makeSlot {name decl index} {
 	}
     }
 
+    if {[string range $rtype end-5 end] eq "MP_WUR"} {
+	append text " MP_WUR"
+    }
     append text "; /* $index */\n"
     return $text
 }
@@ -837,7 +882,7 @@ proc genStubs::emitInit {name textVar} {
     }
     foreach intf [array names interfaces] {
 	if {[info exists hooks($intf)]} {
-	    if {[lsearch -exact $hooks($intf) $name] >= 0} {
+	    if {$name in $hooks($intf)} {
 		set root 0
 		break
 	    }
diff --git a/generic/ttk/ttkManager.c b/generic/ttk/ttkManager.c
index 8fa7860..42f1812 100644
--- a/generic/ttk/ttkManager.c
+++ b/generic/ttk/ttkManager.c
@@ -11,7 +11,7 @@
 /*------------------------------------------------------------------------
  * +++ The Geometry Propagation Dance.
  *
- * When a slave window requests a new size or some other parameter changes,
+ * When a content window requests a new size or some other parameter changes,
  * the manager recomputes the required size for the container window and calls
  * Tk_GeometryRequest().  This is scheduled as an idle handler so multiple
  * updates can be processed as a single batch.
@@ -19,7 +19,7 @@
  * If all goes well, the container's manager will process the request
  * (and so on up the chain to the toplevel window), and the container
  * window will eventually receive a <Configure> event.  At this point
- * it recomputes the size and position of all slaves and places them.
+ * it recomputes the size and position of all content windows and places them.
  *
  * If all does not go well, however, the container's request may be ignored
  * (typically because the top-level window has a fixed, user-specified size).
@@ -36,23 +36,23 @@
  * (3) Content window is destroyed
  *
  * In case (1), Tk calls the manager's lostSlaveProc.
- * Case (2) is performed by calling Tk_ManageGeometry(slave,NULL,0);
- * in this case Tk does _not_ call the LostSlaveProc (documented behavior).
+ * Case (2) is performed by calling Tk_ManageGeometry(window,NULL,0);
+ * in this case Tk does _not_ call the lostSlaveProc (documented behavior).
  * Tk doesn't handle case (3) either; to account for that we
- * register an event handler on the slave widget to track <Destroy> events.
+ * register an event handler on the content window to track <Destroy> events.
  */
 
 /* ++ Data structures.
  */
 typedef struct
 {
-    Tk_Window 		contentWindow;
+    Tk_Window 		window;
     Ttk_Manager 	*manager;
     void 		*data;
     unsigned		flags;
 } Ttk_Content;
 
-/* slave->flags bits:
+/* content->flags bits:
  */
 #define CONTENT_MAPPED 	0x1	/* content windows to be mapped when container is */
 
@@ -60,7 +60,7 @@ struct TtkManager_
 {
     Ttk_ManagerSpec	*managerSpec;
     void 		*managerData;
-    Tk_Window   	containerWindow;
+    Tk_Window   	window;
     unsigned		flags;
     int 	 	nContent;
     Ttk_Content 		**content;
@@ -96,14 +96,14 @@ static void RecomputeSize(Ttk_Manager *mgr)
     int width = 1, height = 1;
 
     if (mgr->managerSpec->RequestedSize(mgr->managerData, &width, &height)) {
-	Tk_GeometryRequest(mgr->containerWindow, width, height);
+	Tk_GeometryRequest(mgr->window, width, height);
 	ScheduleUpdate(mgr, MGR_RELAYOUT_REQUIRED);
     }
     mgr->flags &= ~MGR_RESIZE_REQUIRED;
 }
 
 /* ++ RecomputeLayout --
- * 	Recompute geometry of all slaves.
+ * 	Recompute geometry of all content windows.
  */
 static void RecomputeLayout(Ttk_Manager *mgr)
 {
@@ -136,8 +136,8 @@ static void ManagerIdleProc(ClientData clientData)
  */
 
 /* ++ ManagerEventHandler --
- * 	Recompute slave layout when container widget is resized.
- * 	Keep the slave's map state in sync with the container's.
+ * 	Recompute content layout when container widget is resized.
+ * 	Keep the content's map state in sync with the container's.
  */
 static const int ManagerEventMask = StructureNotifyMask;
 static void ManagerEventHandler(ClientData clientData, XEvent *eventPtr)
@@ -152,45 +152,44 @@ static void ManagerEventHandler(ClientData clientData, XEvent *eventPtr)
 	    break;
 	case MapNotify:
 	    for (i = 0; i < mgr->nContent; ++i) {
-		Ttk_Content *slave = mgr->content[i];
-		if (slave->flags & CONTENT_MAPPED) {
-		    Tk_MapWindow(slave->contentWindow);
+		Ttk_Content *content = mgr->content[i];
+		if (content->flags & CONTENT_MAPPED) {
+		    Tk_MapWindow(content->window);
 		}
 	    }
 	    break;
 	case UnmapNotify:
 	    for (i = 0; i < mgr->nContent; ++i) {
-		Ttk_Content *slave = mgr->content[i];
-		Tk_UnmapWindow(slave->contentWindow);
+		Ttk_Content *content = mgr->content[i];
+		Tk_UnmapWindow(content->window);
 	    }
 	    break;
     }
 }
 
-/* ++ LostContentEventHandler --
- * 	Notifies manager when a slave is destroyed
+/* ++ ContentLostEventHandler --
+ * 	Notifies manager when a content window is destroyed
  * 	(see <<NOTE-LOSTCONTENT>>).
  */
-static const unsigned SlaveEventMask = StructureNotifyMask;
-static void LostContentEventHandler(ClientData clientData, XEvent *eventPtr)
+static void ContentLostEventHandler(void *clientData, XEvent *eventPtr)
 {
-    Ttk_Content *slave = (Ttk_Content *)clientData;
+    Ttk_Content *content = (Ttk_Content *)clientData;
     if (eventPtr->type == DestroyNotify) {
-	slave->manager->managerSpec->tkGeomMgr.lostSlaveProc(
-	    slave->manager, slave->contentWindow);
+	content->manager->managerSpec->tkGeomMgr.lostSlaveProc(
+	    content->manager, content->window);
     }
 }
 
 /*------------------------------------------------------------------------
- * +++ Slave initialization and cleanup.
+ * +++ Content initialization and cleanup.
  */
 
 static Ttk_Content *NewContent(
-    Ttk_Manager *mgr, Tk_Window contentWindow, void *data)
+    Ttk_Manager *mgr, Tk_Window window, void *data)
 {
     Ttk_Content *content = (Ttk_Content *)ckalloc(sizeof(Ttk_Content));
 
-    content->contentWindow = contentWindow;
+    content->window = window;
     content->manager = mgr;
     content->flags = 0;
     content->data = data;
@@ -198,7 +197,7 @@ static Ttk_Content *NewContent(
     return content;
 }
 
-static void DeleteSlave(Ttk_Content *content)
+static void DeleteContent(Ttk_Content *content)
 {
     ckfree(content);
 }
@@ -208,19 +207,19 @@ static void DeleteSlave(Ttk_Content *content)
  */
 
 Ttk_Manager *Ttk_CreateManager(
-    Ttk_ManagerSpec *managerSpec, void *managerData, Tk_Window containerWindow)
+    Ttk_ManagerSpec *managerSpec, void *managerData, Tk_Window window)
 {
     Ttk_Manager *mgr = (Ttk_Manager *)ckalloc(sizeof(*mgr));
 
     mgr->managerSpec 	= managerSpec;
     mgr->managerData	= managerData;
-    mgr->containerWindow	= containerWindow;
+    mgr->window	= window;
     mgr->nContent 	= 0;
     mgr->content 	= NULL;
     mgr->flags  	= 0;
 
     Tk_CreateEventHandler(
-	mgr->containerWindow, ManagerEventMask, ManagerEventHandler, mgr);
+	mgr->window, ManagerEventMask, ManagerEventHandler, mgr);
 
     return mgr;
 }
@@ -228,7 +227,7 @@ Ttk_Manager *Ttk_CreateManager(
 void Ttk_DeleteManager(Ttk_Manager *mgr)
 {
     Tk_DeleteEventHandler(
-	mgr->containerWindow, ManagerEventMask, ManagerEventHandler, mgr);
+	mgr->window, ManagerEventMask, ManagerEventHandler, mgr);
 
     while (mgr->nContent > 0) {
 	Ttk_ForgetContent(mgr, mgr->nContent - 1);
@@ -243,7 +242,7 @@ void Ttk_DeleteManager(Ttk_Manager *mgr)
 }
 
 /*------------------------------------------------------------------------
- * +++ Slave management.
+ * +++ Content window management.
  */
 
 /* ++ InsertContent --
@@ -261,26 +260,26 @@ static void InsertContent(Ttk_Manager *mgr, Ttk_Content *content, int index)
 
     mgr->content[index] = content;
 
-    Tk_ManageGeometry(content->contentWindow,
+    Tk_ManageGeometry(content->window,
 	&mgr->managerSpec->tkGeomMgr, mgr);
 
-    Tk_CreateEventHandler(content->contentWindow,
-	SlaveEventMask, LostContentEventHandler, content);
+    Tk_CreateEventHandler(content->window,
+	StructureNotifyMask, ContentLostEventHandler, content);
 
     ScheduleUpdate(mgr, MGR_RESIZE_REQUIRED);
 }
 
-/* RemoveSlave --
- * 	Unmanage and delete the slave.
+/* RemoveContent --
+ * 	Unmanage and delete the content window.
  *
  * NOTES/ASSUMPTIONS:
  *
  * [1] It's safe to call Tk_UnmapWindow / Tk_UnmaintainGeometry even if this
- * routine is called from the slave's DestroyNotify event handler.
+ * routine is called from the content window's DestroyNotify event handler.
  */
-static void RemoveSlave(Ttk_Manager *mgr, int index)
+static void RemoveContent(Ttk_Manager *mgr, int index)
 {
-    Ttk_Content *slave = mgr->content[index];
+    Ttk_Content *content = mgr->content[index];
     int i;
 
     /* Notify manager:
@@ -297,13 +296,13 @@ static void RemoveSlave(Ttk_Manager *mgr, int index)
     /* Clean up:
      */
     Tk_DeleteEventHandler(
-	slave->contentWindow, SlaveEventMask, LostContentEventHandler, slave);
+	content->window, StructureNotifyMask, ContentLostEventHandler, content);
 
     /* Note [1] */
-    Tk_UnmaintainGeometry(slave->contentWindow, mgr->containerWindow);
-    Tk_UnmapWindow(slave->contentWindow);
+    Tk_UnmaintainGeometry(content->window, mgr->window);
+    Tk_UnmapWindow(content->window);
 
-    DeleteSlave(slave);
+    DeleteContent(content);
 
     ScheduleUpdate(mgr, MGR_RESIZE_REQUIRED);
 }
@@ -312,12 +311,12 @@ static void RemoveSlave(Ttk_Manager *mgr, int index)
  * +++ Tk_GeomMgr hooks.
  */
 
-void Ttk_GeometryRequestProc(ClientData clientData, Tk_Window contentWindow)
+void Ttk_GeometryRequestProc(ClientData clientData, Tk_Window window)
 {
     Ttk_Manager *mgr = (Ttk_Manager *)clientData;
-    int index = Ttk_ContentIndex(mgr, contentWindow);
-    int reqWidth = Tk_ReqWidth(contentWindow);
-    int reqHeight= Tk_ReqHeight(contentWindow);
+    int index = Ttk_ContentIndex(mgr, window);
+    int reqWidth = Tk_ReqWidth(window);
+    int reqHeight= Tk_ReqHeight(window);
 
     if (mgr->managerSpec->SlaveRequest(
 		mgr->managerData, index, reqWidth, reqHeight))
@@ -326,13 +325,13 @@ void Ttk_GeometryRequestProc(ClientData clientData, Tk_Window contentWindow)
     }
 }
 
-void Ttk_LostContentProc(ClientData clientData, Tk_Window contentWindow)
+void Ttk_LostContentProc(ClientData clientData, Tk_Window window)
 {
     Ttk_Manager *mgr = (Ttk_Manager *)clientData;
-    int index = Ttk_ContentIndex(mgr, contentWindow);
+    int index = Ttk_ContentIndex(mgr, window);
 
     /* ASSERT: index >= 0 */
-    RemoveSlave(mgr, index);
+    RemoveContent(mgr, index);
 }
 
 /*------------------------------------------------------------------------
@@ -345,8 +344,8 @@ void Ttk_LostContentProc(ClientData clientData, Tk_Window contentWindow)
 void Ttk_InsertContent(
     Ttk_Manager *mgr, int index, Tk_Window tkwin, void *data)
 {
-    Ttk_Content *slave = NewContent(mgr, tkwin, data);
-    InsertContent(mgr, slave, index);
+    Ttk_Content *content = NewContent(mgr, tkwin, data);
+    InsertContent(mgr, content, index);
 }
 
 /* ++ Ttk_ForgetContent --
@@ -354,9 +353,9 @@ void Ttk_InsertContent(
  */
 void Ttk_ForgetContent(Ttk_Manager *mgr, int index)
 {
-    Tk_Window contentWindow = mgr->content[index]->contentWindow;
-    RemoveSlave(mgr, index);
-    Tk_ManageGeometry(contentWindow, NULL, 0);
+    Tk_Window window = mgr->content[index]->window;
+    RemoveContent(mgr, index);
+    Tk_ManageGeometry(window, NULL, 0);
 }
 
 /* ++ Ttk_PlaceContent --
@@ -369,11 +368,11 @@ void Ttk_ForgetContent(Ttk_Manager *mgr, int index)
 void Ttk_PlaceContent(
     Ttk_Manager *mgr, int index, int x, int y, int width, int height)
 {
-    Ttk_Content *slave = mgr->content[index];
-    Tk_MaintainGeometry(slave->contentWindow,mgr->containerWindow,x,y,width,height);
-    slave->flags |= CONTENT_MAPPED;
-    if (Tk_IsMapped(mgr->containerWindow)) {
-	Tk_MapWindow(slave->contentWindow);
+    Ttk_Content *content = mgr->content[index];
+    Tk_MaintainGeometry(content->window,mgr->window,x,y,width,height);
+    content->flags |= CONTENT_MAPPED;
+    if (Tk_IsMapped(mgr->window)) {
+	Tk_MapWindow(content->window);
     }
 }
 
@@ -382,13 +381,13 @@ void Ttk_PlaceContent(
  */
 void Ttk_UnmapContent(Ttk_Manager *mgr, int index)
 {
-    Ttk_Content *slave = mgr->content[index];
-    Tk_UnmaintainGeometry(slave->contentWindow, mgr->containerWindow);
-    slave->flags &= ~CONTENT_MAPPED;
+    Ttk_Content *content = mgr->content[index];
+    Tk_UnmaintainGeometry(content->window, mgr->window);
+    content->flags &= ~CONTENT_MAPPED;
     /* Contrary to documentation, Tk_UnmaintainGeometry doesn't always
      * unmap the content window:
      */
-    Tk_UnmapWindow(slave->contentWindow);
+    Tk_UnmapWindow(content->window);
 }
 
 /* LayoutChanged, SizeChanged --
@@ -416,7 +415,7 @@ void *Ttk_ContentData(Ttk_Manager *mgr, int index)
 }
 Tk_Window Ttk_ContentWindow(Ttk_Manager *mgr, int index)
 {
-    return mgr->content[index]->contentWindow;
+    return mgr->content[index]->window;
 }
 
 /*------------------------------------------------------------------------
@@ -426,11 +425,11 @@ Tk_Window Ttk_ContentWindow(Ttk_Manager *mgr, int index)
 /* ++ Ttk_ContentIndex --
  * 	Returns the index of specified content window, -1 if not found.
  */
-int Ttk_ContentIndex(Ttk_Manager *mgr, Tk_Window contentWindow)
+int Ttk_ContentIndex(Ttk_Manager *mgr, Tk_Window window)
 {
     int index;
     for (index = 0; index < mgr->nContent; ++index)
-	if (mgr->content[index]->contentWindow == contentWindow)
+	if (mgr->content[index]->window == window)
 	    return index;
     return -1;
 }
@@ -467,12 +466,12 @@ int Ttk_GetContentIndexFromObj(
     /* Try interpreting as a slave window name;
      */
     if ((*string == '.') &&
-	    (tkwin = Tk_NameToWindow(interp, string, mgr->containerWindow))) {
+	    (tkwin = Tk_NameToWindow(interp, string, mgr->window))) {
 	index = Ttk_ContentIndex(mgr, tkwin);
 	if (index < 0) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "%s is not managed by %s", string,
-		    Tk_PathName(mgr->containerWindow)));
+		    Tk_PathName(mgr->window)));
 	    Tcl_SetErrorCode(interp, "TTK", "SLAVE", "MANAGER", NULL);
 	    return TCL_ERROR;
 	}
diff --git a/generic/ttk/ttkManager.h b/generic/ttk/ttkManager.h
index c4c46ed..d487dea 100644
--- a/generic/ttk/ttkManager.h
+++ b/generic/ttk/ttkManager.h
@@ -16,14 +16,14 @@ typedef struct TtkManager_ Ttk_Manager;
  *
  * RequestedSize computes the requested size of the container window.
  *
- * PlaceSlaves sets the position and size of all managed slaves
+ * PlaceSlaves sets the position and size of all managed content windows
  * by calling Ttk_PlaceContent().
  *
- * SlaveRemoved() is called immediately before a slave is removed.
- * NB: the associated slave window may have been destroyed when this
+ * SlaveRemoved() is called immediately before a content window is removed.
+ * NB: the associated content window may have been destroyed when this
  * routine is called.
  *
- * SlaveRequest() is called when a slave requests a size change.
+ * SlaveRequest() is called when a content window requests a size change.
  * It should return 1 if the request should propagate, 0 otherwise.
  */
 typedef struct {			/* Manager hooks */
@@ -39,8 +39,8 @@ typedef struct {			/* Manager hooks */
  * Default implementations for Tk_GeomMgr hooks:
  */
 #define Ttk_LostContentProc Ttk_LostSlaveProc
-MODULE_SCOPE void Ttk_GeometryRequestProc(ClientData, Tk_Window slave);
-MODULE_SCOPE void Ttk_LostContentProc(ClientData, Tk_Window slave);
+MODULE_SCOPE void Ttk_GeometryRequestProc(ClientData, Tk_Window window);
+MODULE_SCOPE void Ttk_LostContentProc(ClientData, Tk_Window window);
 
 /*
  * Public API:
@@ -77,7 +77,7 @@ MODULE_SCOPE void Ttk_ManagerLayoutChanged(Ttk_Manager *);
  */
 #define Ttk_ContentIndex Ttk_SlaveIndex
 MODULE_SCOPE int Ttk_ContentIndex(Ttk_Manager *, Tk_Window);
-    /* Returns: index in slave array of specified window, -1 if not found */
+    /* Returns: index in content array of specified window, -1 if not found */
 
 #define Ttk_GetContentIndexFromObj Ttk_GetSlaveIndexFromObj
 MODULE_SCOPE int Ttk_GetContentIndexFromObj(
diff --git a/generic/ttk/ttkNotebook.c b/generic/ttk/ttkNotebook.c
index d94b4ed..bd7c7ba 100644
--- a/generic/ttk/ttkNotebook.c
+++ b/generic/ttk/ttkNotebook.c
@@ -57,7 +57,7 @@ typedef struct
  * relevant to the tab.
  *
  * PaneOptionSpecs includes additional options for child window placement
- * and is used to configure the slave.
+ * and is used to configure the content window.
  */
 static Tk_OptionSpec TabOptionSpecs[] =
 {
@@ -102,7 +102,7 @@ typedef struct
     int activeIndex;		/* index of currently active tab */
     Ttk_Layout tabLayout;	/* Sublayout for tabs */
 
-    Ttk_Box clientArea;		/* Where to pack slave widgets */
+    Ttk_Box clientArea;		/* Where to pack content widgets */
 } NotebookPart;
 
 typedef struct
@@ -191,13 +191,13 @@ static void NotebookStyleOptions(Notebook *nb, NotebookStyle *nbstyle)
  * +++ Tab management.
  */
 
-static Tab *CreateTab(Tcl_Interp *interp, Notebook *nb, Tk_Window slaveWindow)
+static Tab *CreateTab(Tcl_Interp *interp, Notebook *nb, Tk_Window window)
 {
     Tk_OptionTable optionTable = nb->notebook.paneOptionTable;
-    void *record = ckalloc(sizeof(Tab));
+    Tab *record = (Tab *)ckalloc(sizeof(Tab));
     memset(record, 0, sizeof(Tab));
 
-    if (Tk_InitOptions(interp, record, optionTable, slaveWindow) != TCL_OK) {
+    if (Tk_InitOptions(interp, (char *)record, optionTable, window) != TCL_OK) {
 	ckfree(record);
 	return NULL;
     }
@@ -213,7 +213,7 @@ static void DestroyTab(Notebook *nb, Tab *tab)
 }
 
 static int ConfigureTab(
-    Tcl_Interp *interp, Notebook *nb, Tab *tab, Tk_Window slaveWindow,
+    Tcl_Interp *interp, Notebook *nb, Tab *tab, Tk_Window window,
     int objc, Tcl_Obj *const objv[])
 {
     Ttk_Sticky sticky = tab->sticky;
@@ -222,7 +222,7 @@ static int ConfigureTab(
     int mask = 0;
 
     if (Tk_SetOptions(interp, (void *)tab, nb->notebook.paneOptionTable,
-	    objc, objv, slaveWindow, &savedOptions, &mask) != TCL_OK)
+	    objc, objv, window, &savedOptions, &mask) != TCL_OK)
     {
 	return TCL_ERROR;
     }
@@ -234,7 +234,7 @@ static int ConfigureTab(
     {
 	goto error;
     }
-    if (Ttk_GetPaddingFromObj(interp, slaveWindow, tab->paddingObj, &padding)
+    if (Ttk_GetPaddingFromObj(interp, window, tab->paddingObj, &padding)
 	    != TCL_OK)
     {
 	goto error;
@@ -262,7 +262,7 @@ static int IdentifyTab(Notebook *nb, int x, int y)
 {
     int index;
     for (index = 0; index < Ttk_NumberContent(nb->notebook.mgr); ++index) {
-	Tab *tab = Ttk_ContentData(nb->notebook.mgr,index);
+	Tab *tab = (Tab *)Ttk_ContentData(nb->notebook.mgr,index);
 	if (	tab->state != TAB_STATE_HIDDEN
 	     && Ttk_BoxContains(tab->parcel, x,y))
 	{
@@ -294,7 +294,7 @@ static void ActivateTab(Notebook *nb, int index)
 static Ttk_State TabState(Notebook *nb, int index)
 {
     Ttk_State state = nb->core.state;
-    Tab *tab = Ttk_ContentData(nb->notebook.mgr, index);
+    Tab *tab = (Tab *)Ttk_ContentData(nb->notebook.mgr, index);
     int i = 0;
 
     if (index == nb->notebook.currentIndex) {
@@ -307,7 +307,7 @@ static Ttk_State TabState(Notebook *nb, int index)
 	state |= TTK_STATE_ACTIVE;
     }
     for (i = 0; i < Ttk_NumberContent(nb->notebook.mgr); ++i) {
-	Tab *tab = Ttk_ContentData(nb->notebook.mgr, i);
+	Tab *tab = (Tab *)Ttk_ContentData(nb->notebook.mgr, i);
 	if (tab->state == TAB_STATE_HIDDEN) {
 	    continue;
 	}
@@ -316,8 +316,8 @@ static Ttk_State TabState(Notebook *nb, int index)
 	}
 	break;
     }
-    for (i = Ttk_NumberContent(nb->notebook.mgr) - 1; i >= 0; --i) {
-	Tab *tab = Ttk_ContentData(nb->notebook.mgr, i);
+    for (i = Ttk_NumberContent(nb->notebook.mgr) - 1; i != -1; --i) {
+	Tab *tab = (Tab *)Ttk_ContentData(nb->notebook.mgr, i);
 	if (tab->state == TAB_STATE_HIDDEN) {
 	    continue;
 	}
@@ -358,7 +358,7 @@ static void TabrowSize(
     int i;
 
     for (i = 0; i < Ttk_NumberContent(nb->notebook.mgr); ++i) {
-	Tab *tab = Ttk_ContentData(nb->notebook.mgr, i);
+	Tab *tab = (Tab *)Ttk_ContentData(nb->notebook.mgr, i);
 	Ttk_State tabState = TabState(nb,i);
 
 	Ttk_RebindSublayout(tabLayout, tab);
@@ -382,13 +382,13 @@ static void TabrowSize(
  *
  * Total height is tab height + client area height + pane internal padding
  * Total width is max(client width, tab width) + pane internal padding
- * Client area size determined by max size of slaves,
+ * Client area size determined by max size of content windows,
  * overridden by -width and/or -height if nonzero.
  */
 
 static int NotebookSize(void *clientData, int *widthPtr, int *heightPtr)
 {
-    Notebook *nb = clientData;
+    Notebook *nb = (Notebook *)clientData;
     NotebookStyle nbstyle;
     Ttk_Padding padding;
     Ttk_Element clientNode = Ttk_FindElement(nb->core.layout, "client");
@@ -399,18 +399,18 @@ static int NotebookSize(void *clientData, int *widthPtr, int *heightPtr)
 
     NotebookStyleOptions(nb, &nbstyle);
 
-    /* Compute max requested size of all slaves:
+    /* Compute max requested size of all content windows:
      */
     for (i = 0; i < Ttk_NumberContent(nb->notebook.mgr); ++i) {
-	Tk_Window slaveWindow = Ttk_ContentWindow(nb->notebook.mgr, i);
-	Tab *tab = Ttk_ContentData(nb->notebook.mgr, i);
-	int slaveWidth
-	    = Tk_ReqWidth(slaveWindow) + Ttk_PaddingWidth(tab->padding);
-	int slaveHeight
-	    = Tk_ReqHeight(slaveWindow) + Ttk_PaddingHeight(tab->padding);
+	Tk_Window window = Ttk_ContentWindow(nb->notebook.mgr, i);
+	Tab *tab = (Tab *)Ttk_ContentData(nb->notebook.mgr, i);
+	int width
+	    = Tk_ReqWidth(window) + Ttk_PaddingWidth(tab->padding);
+	int height
+	    = Tk_ReqHeight(window) + Ttk_PaddingHeight(tab->padding);
 
-	clientWidth = MAX(clientWidth, slaveWidth);
-	clientHeight = MAX(clientHeight, slaveHeight);
+	clientWidth = MAX(clientWidth, width);
+	clientHeight = MAX(clientHeight, height);
     }
 
     /* Client width/height overridable by widget options:
@@ -474,7 +474,7 @@ static void SqueezeTabs(
 	int i;
 
 	for (i = 0; i < nTabs; ++i) {
-	    Tab *tab = Ttk_ContentData(nb->notebook.mgr,i);
+	    Tab *tab = (Tab *)Ttk_ContentData(nb->notebook.mgr,i);
 	    double ad = slack + tab->width * delta;
 	    tab->width += (int)ad;
 	    slack = ad - (int)ad;
@@ -493,7 +493,7 @@ static void PlaceTabs(
     int i;
 
     for (i = 0; i < nTabs; ++i) {
-	Tab *tab = Ttk_ContentData(nb->notebook.mgr, i);
+	Tab *tab = (Tab *)Ttk_ContentData(nb->notebook.mgr, i);
 	Ttk_State tabState = TabState(nb, i);
 
 	if (tab->state != TAB_STATE_HIDDEN) {
@@ -517,11 +517,11 @@ static void PlaceTabs(
  *	Computes notebook layout and places tabs.
  *
  * Side effects:
- * 	Sets clientArea, used to place slave panes.
+ * 	Sets clientArea, used to place panes.
  */
 static void NotebookDoLayout(void *recordPtr)
 {
-    Notebook *nb = recordPtr;
+    Notebook *nb = (Notebook *)recordPtr;
     Tk_Window nbwin = nb->core.tkwin;
     Ttk_Box cavity = Ttk_WinBox(nbwin);
     int tabrowWidth = 0, tabrowHeight = 0;
@@ -577,14 +577,14 @@ static void NotebookDoLayout(void *recordPtr)
  */
 static void NotebookPlaceContent(Notebook *nb, int index)
 {
-    Tab *tab = Ttk_ContentData(nb->notebook.mgr, index);
-    Tk_Window slaveWindow = Ttk_ContentWindow(nb->notebook.mgr, index);
-    Ttk_Box slaveBox =
+    Tab *tab = (Tab *)Ttk_ContentData(nb->notebook.mgr, index);
+    Tk_Window window = Ttk_ContentWindow(nb->notebook.mgr, index);
+    Ttk_Box box =
 	Ttk_StickBox(Ttk_PadBox(nb->notebook.clientArea, tab->padding),
-	    Tk_ReqWidth(slaveWindow), Tk_ReqHeight(slaveWindow),tab->sticky);
+	    Tk_ReqWidth(window), Tk_ReqHeight(window),tab->sticky);
 
     Ttk_PlaceContent(nb->notebook.mgr, index,
-	slaveBox.x, slaveBox.y, slaveBox.width, slaveBox.height);
+	box.x, box.y, box.width, box.height);
 }
 
 /* NotebookPlaceContents --
@@ -592,7 +592,7 @@ static void NotebookPlaceContent(Notebook *nb, int index)
  */
 static void NotebookPlaceContents(void *recordPtr)
 {
-    Notebook *nb = recordPtr;
+    Notebook *nb = (Notebook *)recordPtr;
     int currentIndex = nb->notebook.currentIndex;
     if (currentIndex >= 0) {
 	NotebookDoLayout(nb);
@@ -606,7 +606,7 @@ static void NotebookPlaceContents(void *recordPtr)
  */
 static void SelectTab(Notebook *nb, int index)
 {
-    Tab *tab = Ttk_ContentData(nb->notebook.mgr,index);
+    Tab *tab = (Tab *)Ttk_ContentData(nb->notebook.mgr, index);
     int currentIndex = nb->notebook.currentIndex;
 
     if (index == currentIndex) {
@@ -651,7 +651,7 @@ static int NextTab(Notebook *nb, int index)
     /* Scan forward for following usable tab:
      */
     for (nextIndex = index + 1; nextIndex < nTabs; ++nextIndex) {
-	Tab *tab = Ttk_ContentData(nb->notebook.mgr, nextIndex);
+	Tab *tab = (Tab *)Ttk_ContentData(nb->notebook.mgr, nextIndex);
 	if (tab->state == TAB_STATE_NORMAL) {
 	    return nextIndex;
 	}
@@ -660,7 +660,7 @@ static int NextTab(Notebook *nb, int index)
     /* Not found -- scan backwards.
      */
     for (nextIndex = index - 1; nextIndex >= 0; --nextIndex) {
-	Tab *tab = Ttk_ContentData(nb->notebook.mgr, nextIndex);
+	Tab *tab = (Tab *)Ttk_ContentData(nb->notebook.mgr, nextIndex);
 	if (tab->state == TAB_STATE_NORMAL) {
 	    return nextIndex;
 	}
@@ -697,12 +697,12 @@ static void SelectNearestTab(Notebook *nb)
 
 /* TabRemoved -- GM TabRemoved hook.
  * 	Select the next tab if the current one is being removed.
- * 	Adjust currentIndex to account for removed slave.
+ * 	Adjust currentIndex to account for removed content window.
  */
 static void TabRemoved(void *managerData, int index)
 {
-    Notebook *nb = managerData;
-    Tab *tab = Ttk_ContentData(nb->notebook.mgr, index);
+    Notebook *nb = (Notebook *)managerData;
+    Tab *tab = (Tab *)Ttk_ContentData(nb->notebook.mgr, index);
 
     if (index == nb->notebook.currentIndex) {
 	SelectNearestTab(nb);
@@ -717,7 +717,11 @@ static void TabRemoved(void *managerData, int index)
     TtkRedisplayWidget(&nb->core);
 }
 
-static int TabRequest(void *managerData, int index, int width, int height)
+static int TabRequest(
+    TCL_UNUSED(void *),
+    TCL_UNUSED(int),
+    TCL_UNUSED(int),
+    TCL_UNUSED(int))
 {
     return 1;
 }
@@ -727,17 +731,17 @@ static int TabRequest(void *managerData, int index, int width, int height)
  */
 static int AddTab(
     Tcl_Interp *interp, Notebook *nb,
-    int destIndex, Tk_Window slaveWindow,
+    int destIndex, Tk_Window window,
     int objc, Tcl_Obj *const objv[])
 {
     Tab *tab;
-    if (!Ttk_Maintainable(interp, slaveWindow, nb->core.tkwin)) {
+    if (!Ttk_Maintainable(interp, window, nb->core.tkwin)) {
 	return TCL_ERROR;
     }
 #if 0 /* can't happen */
-    if (Ttk_ContentIndex(nb->notebook.mgr, slaveWindow) >= 0) {
+    if (Ttk_ContentIndex(nb->notebook.mgr, window) >= 0) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf("%s already added",
-	    Tk_PathName(slaveWindow)));
+	    Tk_PathName(window)));
 	Tcl_SetErrorCode(interp, "TTK", "NOTEBOOK", "PRESENT", NULL);
 	return TCL_ERROR;
     }
@@ -745,16 +749,16 @@ static int AddTab(
 
     /* Create and insert tab.
      */
-    tab = CreateTab(interp, nb, slaveWindow);
+    tab = CreateTab(interp, nb, window);
     if (!tab) {
 	return TCL_ERROR;
     }
-    if (ConfigureTab(interp, nb, tab, slaveWindow, objc, objv) != TCL_OK) {
+    if (ConfigureTab(interp, nb, tab, window, objc, objv) != TCL_OK) {
 	DestroyTab(nb, tab);
 	return TCL_ERROR;
     }
 
-    Ttk_InsertContent(nb->notebook.mgr, destIndex, slaveWindow, tab);
+    Ttk_InsertContent(nb->notebook.mgr, destIndex, window, tab);
 
     /* Adjust indices and/or autoselect first tab:
      */
@@ -789,7 +793,7 @@ static const int NotebookEventMask
     ;
 static void NotebookEventHandler(ClientData clientData, XEvent *eventPtr)
 {
-    Notebook *nb = clientData;
+    Notebook *nb = (Notebook *)clientData;
 
     if (eventPtr->type == DestroyNotify) { /* Remove self */
 	Tk_DeleteEventHandler(nb->core.tkwin,
@@ -813,7 +817,7 @@ static void NotebookEventHandler(ClientData clientData, XEvent *eventPtr)
  *	+ positional specifications @x,y,
  *	+ "current",
  *	+ numeric indices [0..nTabs],
- *	+ slave window names
+ *	+ content window names
  *
  *	Stores index of specified tab in *index_rtn, -1 if not found.
  *
@@ -885,8 +889,8 @@ static int GetTabIndex(
 static int NotebookAddCommand(
     void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
-    Notebook *nb = recordPtr;
-    Tk_Window slaveWindow;
+    Notebook *nb = (Notebook *)recordPtr;
+    Tk_Window window;
     int index;
     Tab *tab;
 
@@ -895,21 +899,21 @@ static int NotebookAddCommand(
 	return TCL_ERROR;
     }
 
-    slaveWindow = Tk_NameToWindow(interp,Tcl_GetString(objv[2]),nb->core.tkwin);
-    if (!slaveWindow) {
+    window = Tk_NameToWindow(interp,Tcl_GetString(objv[2]),nb->core.tkwin);
+    if (!window) {
 	return TCL_ERROR;
     }
-    index = Ttk_ContentIndex(nb->notebook.mgr, slaveWindow);
+    index = Ttk_ContentIndex(nb->notebook.mgr, window);
 
     if (index < 0) { /* New tab */
-	return AddTab(interp, nb, Ttk_NumberContent(nb->notebook.mgr), slaveWindow, objc-3,objv+3);
+	return AddTab(interp, nb, Ttk_NumberContent(nb->notebook.mgr), window, objc-3,objv+3);
     }
 
-    tab = Ttk_ContentData(nb->notebook.mgr, index);
+    tab = (Tab *)Ttk_ContentData(nb->notebook.mgr, index);
     if (tab->state == TAB_STATE_HIDDEN) {
 	tab->state = TAB_STATE_NORMAL;
     }
-    if (ConfigureTab(interp, nb, tab, slaveWindow, objc-3,objv+3) != TCL_OK) {
+    if (ConfigureTab(interp, nb, tab, window, objc-3,objv+3) != TCL_OK) {
 	return TCL_ERROR;
     }
 
@@ -924,7 +928,7 @@ static int NotebookAddCommand(
 static int NotebookInsertCommand(
     void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
-    Notebook *nb = recordPtr;
+    Notebook *nb = (Notebook *)recordPtr;
     int current = nb->notebook.currentIndex;
     int nContent = Ttk_NumberContent(nb->notebook.mgr);
     int srcIndex, destIndex;
@@ -942,18 +946,18 @@ static int NotebookInsertCommand(
     }
 
     if (Tcl_GetString(objv[3])[0] == '.') {
-	/* Window name -- could be new or existing slave.
+	/* Window name -- could be new or existing content window.
 	 */
-	Tk_Window slaveWindow =
+	Tk_Window window =
 	    Tk_NameToWindow(interp,Tcl_GetString(objv[3]),nb->core.tkwin);
 
-	if (!slaveWindow) {
+	if (!window) {
 	    return TCL_ERROR;
 	}
 
-	srcIndex = Ttk_ContentIndex(nb->notebook.mgr, slaveWindow);
-	if (srcIndex < 0) {	/* New slave */
-	    return AddTab(interp, nb, destIndex, slaveWindow, objc-4,objv+4);
+	srcIndex = Ttk_ContentIndex(nb->notebook.mgr, window);
+	if (srcIndex < 0) {	/* New content window */
+	    return AddTab(interp, nb, destIndex, window, objc-4,objv+4);
 	}
     } else if (Ttk_GetContentIndexFromObj(
 		interp, nb->notebook.mgr, objv[3], &srcIndex) != TCL_OK)
@@ -961,10 +965,10 @@ static int NotebookInsertCommand(
 	return TCL_ERROR;
     }
 
-    /* Move existing slave:
+    /* Move existing content window:
      */
     if (ConfigureTab(interp, nb,
-	     Ttk_ContentData(nb->notebook.mgr,srcIndex),
+	     (Tab *)Ttk_ContentData(nb->notebook.mgr,srcIndex),
 		 Ttk_ContentWindow(nb->notebook.mgr,srcIndex),
 	     objc-4,objv+4) != TCL_OK)
     {
@@ -998,7 +1002,7 @@ static int NotebookInsertCommand(
 static int NotebookForgetCommand(
     void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
-    Notebook *nb = recordPtr;
+    Notebook *nb = (Notebook *)recordPtr;
     int index;
 
     if (objc != 3) {
@@ -1022,7 +1026,7 @@ static int NotebookForgetCommand(
 static int NotebookHideCommand(
     void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
-    Notebook *nb = recordPtr;
+    Notebook *nb = (Notebook *)recordPtr;
     int index;
     Tab *tab;
 
@@ -1035,7 +1039,7 @@ static int NotebookHideCommand(
 	return TCL_ERROR;
     }
 
-    tab = Ttk_ContentData(nb->notebook.mgr, index);
+    tab = (Tab *)Ttk_ContentData(nb->notebook.mgr, index);
     tab->state = TAB_STATE_HIDDEN;
     if (index == nb->notebook.currentIndex) {
 	SelectNearestTab(nb);
@@ -1055,16 +1059,17 @@ static int NotebookIdentifyCommand(
     static const char *whatTable[] = { "element", "tab", NULL };
     enum { IDENTIFY_ELEMENT, IDENTIFY_TAB };
     int what = IDENTIFY_ELEMENT;
-    Notebook *nb = recordPtr;
+    Notebook *nb = (Notebook *)recordPtr;
     Ttk_Element element = NULL;
-    int x, y, tabIndex;
+    int x, y;
+    int tabIndex;
 
     if (objc < 4 || objc > 5) {
 	Tcl_WrongNumArgs(interp, 2,objv, "?what? x y");
 	return TCL_ERROR;
     }
 
-    if (   Tcl_GetIntFromObj(interp, objv[objc-2], &x) != TCL_OK
+    if (Tcl_GetIntFromObj(interp, objv[objc-2], &x) != TCL_OK
 	|| Tcl_GetIntFromObj(interp, objv[objc-1], &y) != TCL_OK
 	|| (objc == 5 && Tcl_GetIndexFromObjStruct(interp, objv[2], whatTable,
 		sizeof(char *), "option", 0, &what) != TCL_OK)
@@ -1074,7 +1079,7 @@ static int NotebookIdentifyCommand(
 
     tabIndex = IdentifyTab(nb, x, y);
     if (tabIndex >= 0) {
-	Tab *tab = Ttk_ContentData(nb->notebook.mgr, tabIndex);
+	Tab *tab = (Tab *)Ttk_ContentData(nb->notebook.mgr, tabIndex);
 	Ttk_State state = TabState(nb, tabIndex);
 	Ttk_Layout tabLayout = nb->notebook.tabLayout;
 
@@ -1109,8 +1114,9 @@ static int NotebookIdentifyCommand(
 static int NotebookIndexCommand(
     void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
-    Notebook *nb = recordPtr;
-    int index, status;
+    Notebook *nb = (Notebook *)recordPtr;
+    int index;
+    int status;
 
     if (objc != 3) {
 	Tcl_WrongNumArgs(interp, 2, objv, "tab");
@@ -1141,7 +1147,7 @@ static int NotebookIndexCommand(
 static int NotebookSelectCommand(
     void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
-    Notebook *nb = recordPtr;
+    Notebook *nb = (Notebook *)recordPtr;
 
     if (objc == 2) {
 	if (nb->notebook.currentIndex >= 0) {
@@ -1167,7 +1173,7 @@ static int NotebookSelectCommand(
 static int NotebookTabsCommand(
     void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
-    Notebook *nb = recordPtr;
+    Notebook *nb = (Notebook *)recordPtr;
     Ttk_Manager *mgr = nb->notebook.mgr;
     Tcl_Obj *result;
     int i;
@@ -1192,10 +1198,10 @@ static int NotebookTabsCommand(
 static int NotebookTabCommand(
     void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
-    Notebook *nb = recordPtr;
+    Notebook *nb = (Notebook *)recordPtr;
     Ttk_Manager *mgr = nb->notebook.mgr;
     int index;
-    Tk_Window slaveWindow;
+    Tk_Window window;
     Tab *tab;
 
     if (objc < 3) {
@@ -1207,18 +1213,18 @@ static int NotebookTabCommand(
 	return TCL_ERROR;
     }
 
-    tab = Ttk_ContentData(mgr, index);
-    slaveWindow = Ttk_ContentWindow(mgr, index);
+    tab = (Tab *)Ttk_ContentData(mgr, index);
+    window = Ttk_ContentWindow(mgr, index);
 
     if (objc == 3) {
 	return TtkEnumerateOptions(interp, tab,
-	    PaneOptionSpecs, nb->notebook.paneOptionTable, slaveWindow);
+	    PaneOptionSpecs, nb->notebook.paneOptionTable, window);
     } else if (objc == 4) {
 	return TtkGetOptionValue(interp, tab, objv[3],
-	    nb->notebook.paneOptionTable, slaveWindow);
+	    nb->notebook.paneOptionTable, window);
     } /* else */
 
-    if (ConfigureTab(interp, nb, tab, slaveWindow, objc-3,objv+3) != TCL_OK) {
+    if (ConfigureTab(interp, nb, tab, window, objc-3,objv+3) != TCL_OK) {
 	return TCL_ERROR;
     }
 
@@ -1257,7 +1263,7 @@ static const Ttk_Ensemble NotebookCommands[] = {
 
 static void NotebookInitialize(Tcl_Interp *interp, void *recordPtr)
 {
-    Notebook *nb = recordPtr;
+    Notebook *nb = (Notebook *)recordPtr;
 
     nb->notebook.mgr = Ttk_CreateManager(
 	    &NotebookManagerSpec, recordPtr, nb->core.tkwin);
@@ -1277,7 +1283,7 @@ static void NotebookInitialize(Tcl_Interp *interp, void *recordPtr)
 
 static void NotebookCleanup(void *recordPtr)
 {
-    Notebook *nb = recordPtr;
+    Notebook *nb = (Notebook *)recordPtr;
 
     Ttk_DeleteManager(nb->notebook.mgr);
     if (nb->notebook.tabLayout)
@@ -1286,7 +1292,7 @@ static void NotebookCleanup(void *recordPtr)
 
 static int NotebookConfigure(Tcl_Interp *interp, void *clientData, int mask)
 {
-    Notebook *nb = clientData;
+    Notebook *nb = (Notebook *)clientData;
 
     /*
      * Error-checks:
@@ -1310,7 +1316,7 @@ static int NotebookConfigure(Tcl_Interp *interp, void *clientData, int mask)
 static Ttk_Layout NotebookGetLayout(
     Tcl_Interp *interp, Ttk_Theme theme, void *recordPtr)
 {
-    Notebook *nb = recordPtr;
+    Notebook *nb = (Notebook *)recordPtr;
     Ttk_Layout notebookLayout = TtkWidgetGetLayout(interp, theme, recordPtr);
     Ttk_Layout tabLayout;
 
@@ -1338,7 +1344,7 @@ static Ttk_Layout NotebookGetLayout(
 static void DisplayTab(Notebook *nb, int index, Drawable d)
 {
     Ttk_Layout tabLayout = nb->notebook.tabLayout;
-    Tab *tab = Ttk_ContentData(nb->notebook.mgr, index);
+    Tab *tab = (Tab *)Ttk_ContentData(nb->notebook.mgr, index);
     Ttk_State state = TabState(nb, index);
 
     if (tab->state != TAB_STATE_HIDDEN) {
@@ -1350,7 +1356,7 @@ static void DisplayTab(Notebook *nb, int index, Drawable d)
 
 static void NotebookDisplay(void *clientData, Drawable d)
 {
-    Notebook *nb = clientData;
+    Notebook *nb = (Notebook *)clientData;
     int nContent = Ttk_NumberContent(nb->notebook.mgr);
     int index;
 
diff --git a/generic/ttk/ttkPanedwindow.c b/generic/ttk/ttkPanedwindow.c
index 85f0b26..fa0d5c8 100644
--- a/generic/ttk/ttkPanedwindow.c
+++ b/generic/ttk/ttkPanedwindow.c
@@ -29,7 +29,7 @@
  * gives the same result as changing the size by X+Y pixels
  * in one step).
  *
- * The request size is initially set to the slave window's requested size.
+ * The request size is initially set to the content window's requested size.
  * When the user drags a sash, each pane's request size is set to its
  * actual size.  This ensures that panes "stay put" on the next resize.
  *
@@ -78,13 +78,13 @@ typedef struct {
 static Tk_OptionSpec PanedOptionSpecs[] = {
     {TK_OPTION_STRING_TABLE, "-orient", "orient", "Orient", "vertical",
 	Tk_Offset(Paned,paned.orientObj), Tk_Offset(Paned,paned.orient),
-	0,(void *)ttkOrientStrings,READONLY_OPTION|STYLE_CHANGED },
+	0, (void *)ttkOrientStrings, READONLY_OPTION|STYLE_CHANGED },
     {TK_OPTION_INT, "-width", "width", "Width", "0",
 	-1,Tk_Offset(Paned,paned.width),
-	0,0,GEOMETRY_CHANGED },
+	0, 0, GEOMETRY_CHANGED },
     {TK_OPTION_INT, "-height", "height", "Height", "0",
 	-1,Tk_Offset(Paned,paned.height),
-	0,0,GEOMETRY_CHANGED },
+	0, 0, GEOMETRY_CHANGED },
 
     WIDGET_TAKEFOCUS_FALSE,
     WIDGET_INHERIT_OPTIONS(ttkCoreOptionSpecs)
@@ -108,21 +108,21 @@ static Tk_OptionSpec PaneOptionSpecs[] = {
 /* CreatePane --
  * 	Create a new pane record.
  */
-static Pane *CreatePane(Tcl_Interp *interp, Paned *pw, Tk_Window slaveWindow)
+static Pane *CreatePane(Tcl_Interp *interp, Paned *pw, Tk_Window window)
 {
     Tk_OptionTable optionTable = pw->paned.paneOptionTable;
     void *record = ckalloc(sizeof(Pane));
-    Pane *pane = record;
+    Pane *pane = (Pane *)record;
 
     memset(record, 0, sizeof(Pane));
-    if (Tk_InitOptions(interp, record, optionTable, slaveWindow) != TCL_OK) {
+    if (Tk_InitOptions(interp, record, optionTable, window) != TCL_OK) {
 	ckfree(record);
 	return NULL;
     }
 
     pane->reqSize
 	= pw->paned.orient == TTK_ORIENT_HORIZONTAL
-	? Tk_ReqWidth(slaveWindow) : Tk_ReqHeight(slaveWindow);
+	? Tk_ReqWidth(window) : Tk_ReqHeight(window);
 
     return pane;
 }
@@ -141,7 +141,7 @@ static void DestroyPane(Paned *pw, Pane *pane)
  * 	Set pane options.
  */
 static int ConfigurePane(
-    Tcl_Interp *interp, Paned *pw, Pane *pane, Tk_Window slaveWindow,
+    Tcl_Interp *interp, Paned *pw, Pane *pane, Tk_Window window,
     int objc, Tcl_Obj *const objv[])
 {
     Ttk_Manager *mgr = pw->paned.mgr;
@@ -149,7 +149,7 @@ static int ConfigurePane(
     int mask = 0;
 
     if (Tk_SetOptions(interp, (void*)pane, pw->paned.paneOptionTable,
-	    objc, objv, slaveWindow, &savedOptions, &mask) != TCL_OK)
+	    objc, objv, window, &savedOptions, &mask) != TCL_OK)
     {
 	return TCL_ERROR;
     }
@@ -189,14 +189,14 @@ error:
 
 static int ShoveUp(Paned *pw, int i, int pos)
 {
-    Pane *pane = Ttk_ContentData(pw->paned.mgr, i);
+    Pane *pane = (Pane *)Ttk_ContentData(pw->paned.mgr, i);
     int sashThickness = pw->paned.sashThickness;
 
     if (i == 0) {
 	if (pos < 0)
 	    pos = 0;
     } else {
-	Pane *prevPane = Ttk_ContentData(pw->paned.mgr, i-1);
+	Pane *prevPane = (Pane *)Ttk_ContentData(pw->paned.mgr, i-1);
 	if (pos < prevPane->sashPos + sashThickness)
 	    pos = ShoveUp(pw, i-1, pos - sashThickness) + sashThickness;
     }
@@ -209,13 +209,13 @@ static int ShoveUp(Paned *pw, int i, int pos)
  */
 static int ShoveDown(Paned *pw, int i, int pos)
 {
-    Pane *pane = Ttk_ContentData(pw->paned.mgr,i);
+    Pane *pane = (Pane *)Ttk_ContentData(pw->paned.mgr,i);
     int sashThickness = pw->paned.sashThickness;
 
     if (i == Ttk_NumberContent(pw->paned.mgr) - 1) {
 	pos = pane->sashPos; /* Sentinel value == container window size */
     } else {
-	Pane *nextPane = Ttk_ContentData(pw->paned.mgr,i+1);
+	Pane *nextPane = (Pane *)Ttk_ContentData(pw->paned.mgr,i+1);
 	if (pos + sashThickness > nextPane->sashPos)
 	    pos = ShoveDown(pw, i+1, pos + sashThickness) - sashThickness;
     }
@@ -230,7 +230,7 @@ static int ShoveDown(Paned *pw, int i, int pos)
  */
 static int PanedSize(void *recordPtr, int *widthPtr, int *heightPtr)
 {
-    Paned *pw = recordPtr;
+    Paned *pw = (Paned *)recordPtr;
     int nPanes = Ttk_NumberContent(pw->paned.mgr);
     int nSashes = nPanes - 1;
     int sashThickness = pw->paned.sashThickness;
@@ -239,21 +239,21 @@ static int PanedSize(void *recordPtr, int *widthPtr, int *heightPtr)
 
     if (pw->paned.orient == TTK_ORIENT_HORIZONTAL) {
 	for (index = 0; index < nPanes; ++index) {
-	    Pane *pane = Ttk_ContentData(pw->paned.mgr, index);
-	    Tk_Window slaveWindow = Ttk_ContentWindow(pw->paned.mgr, index);
+	    Pane *pane = (Pane *)Ttk_ContentData(pw->paned.mgr, index);
+	    Tk_Window window = Ttk_ContentWindow(pw->paned.mgr, index);
 
-	    if (height < Tk_ReqHeight(slaveWindow))
-		height = Tk_ReqHeight(slaveWindow);
+	    if (height < Tk_ReqHeight(window))
+		height = Tk_ReqHeight(window);
 	    width += pane->reqSize;
 	}
 	width += nSashes * sashThickness;
     } else {
 	for (index = 0; index < nPanes; ++index) {
-	    Pane *pane = Ttk_ContentData(pw->paned.mgr, index);
-	    Tk_Window slaveWindow = Ttk_ContentWindow(pw->paned.mgr, index);
+	    Pane *pane = (Pane *)Ttk_ContentData(pw->paned.mgr, index);
+	    Tk_Window window = Ttk_ContentWindow(pw->paned.mgr, index);
 
-	    if (width < Tk_ReqWidth(slaveWindow))
-		width = Tk_ReqWidth(slaveWindow);
+	    if (width < Tk_ReqWidth(window))
+		width = Tk_ReqWidth(window);
 	    height += pane->reqSize;
 	}
 	height += nSashes * sashThickness;
@@ -279,7 +279,7 @@ static void AdjustPanes(Paned *pw)
     int index;
 
     for (index = 0; index < Ttk_NumberContent(pw->paned.mgr); ++index) {
-	Pane *pane = Ttk_ContentData(pw->paned.mgr, index);
+	Pane *pane = (Pane *)Ttk_ContentData(pw->paned.mgr, index);
 	int size = pane->sashPos - pos;
 	pane->reqSize = size >= 0 ? size : 0;
 	pos = pane->sashPos + sashThickness;
@@ -317,7 +317,7 @@ static void PlaceSashes(Paned *pw, int width, int height)
     /* Compute total required size and total available weight:
      */
     for (i = 0; i < nPanes; ++i) {
-	Pane *pane = Ttk_ContentData(mgr, i);
+	Pane *pane = (Pane *)Ttk_ContentData(mgr, i);
 	reqSize += pane->reqSize;
 	totalWeight += pane->weight * (pane->reqSize != 0);
     }
@@ -341,7 +341,7 @@ static void PlaceSashes(Paned *pw, int width, int height)
      */
     pos = 0;
     for (i = 0; i < nPanes; ++i) {
-	Pane *pane = Ttk_ContentData(mgr, i);
+	Pane *pane = (Pane *)Ttk_ContentData(mgr, i);
 	int weight = pane->weight * (pane->reqSize != 0);
 	int size = pane->reqSize + delta * weight;
 
@@ -365,7 +365,7 @@ static void PlaceSashes(Paned *pw, int width, int height)
 }
 
 /* PlacePanes --
- *	Places slave panes based on sash positions.
+ *	Places panes based on sash positions.
  */
 static void PlacePanes(Paned *pw)
 {
@@ -376,7 +376,7 @@ static void PlacePanes(Paned *pw)
     int index;
 
     for (index = 0; index < Ttk_NumberContent(pw->paned.mgr); ++index) {
-	Pane *pane = Ttk_ContentData(pw->paned.mgr, index);
+	Pane *pane = (Pane *)Ttk_ContentData(pw->paned.mgr, index);
 	int size = pane->sashPos - pos;
 
 	if (size > 0) {
@@ -399,61 +399,61 @@ static void PlacePanes(Paned *pw)
 
 static void PanedPlaceContent(void *managerData)
 {
-    Paned *pw = managerData;
+    Paned *pw = (Paned *)managerData;
     PlaceSashes(pw, Tk_Width(pw->core.tkwin), Tk_Height(pw->core.tkwin));
     PlacePanes(pw);
 }
 
 static void PaneRemoved(void *managerData, int index)
 {
-    Paned *pw = managerData;
-    Pane *pane = Ttk_ContentData(pw->paned.mgr, index);
+    Paned *pw = (Paned *)managerData;
+    Pane *pane = (Pane *)Ttk_ContentData(pw->paned.mgr, index);
     DestroyPane(pw, pane);
 }
 
 static int AddPane(
     Tcl_Interp *interp, Paned *pw,
-    int destIndex, Tk_Window slaveWindow,
+    int destIndex, Tk_Window window,
     int objc, Tcl_Obj *const objv[])
 {
     Pane *pane;
-    if (!Ttk_Maintainable(interp, slaveWindow, pw->core.tkwin)) {
+    if (!Ttk_Maintainable(interp, window, pw->core.tkwin)) {
 	return TCL_ERROR;
     }
-    if (Ttk_ContentIndex(pw->paned.mgr, slaveWindow) >= 0) {
+    if (Ttk_ContentIndex(pw->paned.mgr, window) >= 0) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		"%s already added", Tk_PathName(slaveWindow)));
+		"%s already added", Tk_PathName(window)));
 	Tcl_SetErrorCode(interp, "TTK", "PANE", "PRESENT", NULL);
 	return TCL_ERROR;
     }
 
-    pane = CreatePane(interp, pw, slaveWindow);
+    pane = CreatePane(interp, pw, window);
     if (!pane) {
 	return TCL_ERROR;
     }
-    if (ConfigurePane(interp, pw, pane, slaveWindow, objc, objv) != TCL_OK) {
+    if (ConfigurePane(interp, pw, pane, window, objc, objv) != TCL_OK) {
 	DestroyPane(pw, pane);
 	return TCL_ERROR;
     }
 
-    Ttk_InsertContent(pw->paned.mgr, destIndex, slaveWindow, pane);
+    Ttk_InsertContent(pw->paned.mgr, destIndex, window, pane);
     return TCL_OK;
 }
 
 /* PaneRequest --
- * 	Only update pane request size if slave is currently unmapped.
- * 	Geometry requests from mapped slaves are not directly honored
+ * 	Only update pane request size if pane is currently unmapped.
+ * 	Geometry requests from mapped panes are not directly honored
  * 	in order to avoid unexpected pane resizes (esp. while the
  * 	user is dragging a sash [#1325286]).
  */
 static int PaneRequest(void *managerData, int index, int width, int height)
 {
-    Paned *pw = managerData;
-    Pane *pane = Ttk_ContentData(pw->paned.mgr, index);
-    Tk_Window slaveWindow = Ttk_ContentWindow(pw->paned.mgr, index);
+    Paned *pw = (Paned *)managerData;
+    Pane *pane = (Pane *)Ttk_ContentData(pw->paned.mgr, index);
+    Tk_Window window = Ttk_ContentWindow(pw->paned.mgr, index);
     int horizontal = pw->paned.orient == TTK_ORIENT_HORIZONTAL;
 
-    if (!Tk_IsMapped(slaveWindow)) {
+    if (!Tk_IsMapped(window)) {
 	pane->reqSize = horizontal ? width : height;
     }
     return 1;
@@ -483,7 +483,7 @@ static Ttk_ManagerSpec PanedManagerSpec = {
 static const unsigned PanedEventMask = LeaveWindowMask;
 static void PanedEventProc(ClientData clientData, XEvent *eventPtr)
 {
-    WidgetCore *corePtr = clientData;
+    WidgetCore *corePtr = (WidgetCore *)clientData;
     if (   eventPtr->type == LeaveNotify
 	&& eventPtr->xcrossing.detail == NotifyInferior)
     {
@@ -497,7 +497,7 @@ static void PanedEventProc(ClientData clientData, XEvent *eventPtr)
 
 static void PanedInitialize(Tcl_Interp *interp, void *recordPtr)
 {
-    Paned *pw = recordPtr;
+    Paned *pw = (Paned *)recordPtr;
 
     Tk_CreateEventHandler(pw->core.tkwin,
 	PanedEventMask, PanedEventProc, recordPtr);
@@ -509,7 +509,7 @@ static void PanedInitialize(Tcl_Interp *interp, void *recordPtr)
 
 static void PanedCleanup(void *recordPtr)
 {
-    Paned *pw = recordPtr;
+    Paned *pw = (Paned *)recordPtr;
 
     if (pw->paned.sashLayout)
 	Ttk_FreeLayout(pw->paned.sashLayout);
@@ -520,9 +520,12 @@ static void PanedCleanup(void *recordPtr)
 
 /* Post-configuration hook.
  */
-static int PanedPostConfigure(Tcl_Interp *interp, void *clientData, int mask)
+static int PanedPostConfigure(
+    TCL_UNUSED(Tcl_Interp *),
+    void *clientData,
+    int mask)
 {
-    Paned *pw = clientData;
+    Paned *pw = (Paned *)clientData;
 
     if (mask & GEOMETRY_CHANGED) {
 	/* User has changed -width or -height.
@@ -543,7 +546,7 @@ static int PanedPostConfigure(Tcl_Interp *interp, void *clientData, int mask)
 static Ttk_Layout PanedGetLayout(
     Tcl_Interp *interp, Ttk_Theme themePtr, void *recordPtr)
 {
-    Paned *pw = recordPtr;
+    Paned *pw = (Paned *)recordPtr;
     Ttk_Layout panedLayout = TtkWidgetGetLayout(interp, themePtr, recordPtr);
 
     if (panedLayout) {
@@ -581,7 +584,7 @@ static Ttk_Layout PanedGetLayout(
  */
 static Ttk_Layout SashLayout(Paned *pw, int index)
 {
-    Pane *pane = Ttk_ContentData(pw->paned.mgr, index);
+    Pane *pane = (Pane *)Ttk_ContentData(pw->paned.mgr, index);
     int thickness = pw->paned.sashThickness,
 	height = Tk_Height(pw->core.tkwin),
 	width = Tk_Width(pw->core.tkwin),
@@ -603,7 +606,7 @@ static void DrawSash(Paned *pw, int index, Drawable d)
 
 static void PanedDisplay(void *recordPtr, Drawable d)
 {
-    Paned *pw = recordPtr;
+    Paned *pw = (Paned *)recordPtr;
     int i, nSashes = Ttk_NumberContent(pw->paned.mgr) - 1;
 
     TtkWidgetDisplay(recordPtr, d);
@@ -621,59 +624,59 @@ static void PanedDisplay(void *recordPtr, Drawable d)
 static int PanedAddCommand(
     void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
-    Paned *pw = recordPtr;
-    Tk_Window slaveWindow;
+    Paned *pw = (Paned *)recordPtr;
+    Tk_Window window;
 
     if (objc < 3) {
 	Tcl_WrongNumArgs(interp, 2, objv, "window");
 	return TCL_ERROR;
     }
 
-    slaveWindow = Tk_NameToWindow(
+    window = Tk_NameToWindow(
 	interp, Tcl_GetString(objv[2]), pw->core.tkwin);
 
-    if (!slaveWindow) {
+    if (!window) {
 	return TCL_ERROR;
     }
 
-    return AddPane(interp, pw, Ttk_NumberContent(pw->paned.mgr), slaveWindow,
+    return AddPane(interp, pw, Ttk_NumberContent(pw->paned.mgr), window,
 	    objc - 3, objv + 3);
 }
 
-/* $pw insert $index $slave ?-option value ...?
- * 	Insert new slave, or move existing one.
+/* $pw insert $index $window ?-option value ...?
+ * 	Insert new content window, or move existing one.
  */
 static int PanedInsertCommand(
     void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
-    Paned *pw = recordPtr;
+    Paned *pw = (Paned *)recordPtr;
     int nContent = Ttk_NumberContent(pw->paned.mgr);
     int srcIndex, destIndex;
-    Tk_Window slaveWindow;
+    Tk_Window window;
 
     if (objc < 4) {
 	Tcl_WrongNumArgs(interp, 2,objv, "index slave ?-option value ...?");
 	return TCL_ERROR;
     }
 
-    slaveWindow = Tk_NameToWindow(
+    window = Tk_NameToWindow(
 	interp, Tcl_GetString(objv[3]), pw->core.tkwin);
-    if (!slaveWindow) {
+    if (!window) {
 	return TCL_ERROR;
     }
 
     if (!strcmp(Tcl_GetString(objv[2]), "end")) {
 	destIndex = Ttk_NumberContent(pw->paned.mgr);
     } else if (TCL_OK != Ttk_GetContentIndexFromObj(
-		interp,pw->paned.mgr,objv[2],&destIndex))
+		interp,pw->paned.mgr, objv[2], &destIndex))
     {
 	return TCL_ERROR;
     }
 
-    srcIndex = Ttk_ContentIndex(pw->paned.mgr, slaveWindow);
-    if (srcIndex < 0) { /* New slave: */
-	return AddPane(interp, pw, destIndex, slaveWindow, objc-4, objv+4);
-    } /* else -- move existing slave: */
+    srcIndex = Ttk_ContentIndex(pw->paned.mgr, window);
+    if (srcIndex < 0) { /* New content: */
+	return AddPane(interp, pw, destIndex, window, objc-4, objv+4);
+    } /* else -- move existing content: */
 
     if (destIndex >= nContent)
 	destIndex  = nContent - 1;
@@ -681,9 +684,9 @@ static int PanedInsertCommand(
 
     return objc == 4 ? TCL_OK :
 	ConfigurePane(interp, pw,
-		Ttk_ContentData(pw->paned.mgr, destIndex),
+		(Pane *)Ttk_ContentData(pw->paned.mgr, destIndex),
 		Ttk_ContentWindow(pw->paned.mgr, destIndex),
-		objc-4,objv+4);
+		objc-4, objv+4);
 }
 
 /* $pw forget $pane
@@ -691,7 +694,7 @@ static int PanedInsertCommand(
 static int PanedForgetCommand(
     void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
-    Paned *pw = recordPtr;
+    Paned *pw = (Paned *)recordPtr;
     int paneIndex;
 
     if (objc != 3) {
@@ -718,7 +721,7 @@ static int PanedIdentifyCommand(
     static const char *whatTable[] = { "element", "sash", NULL };
     enum { IDENTIFY_ELEMENT, IDENTIFY_SASH };
     int what = IDENTIFY_SASH;
-    Paned *pw = recordPtr;
+    Paned *pw = (Paned *)recordPtr;
     int sashThickness = pw->paned.sashThickness;
     int nSashes = Ttk_NumberContent(pw->paned.mgr) - 1;
     int x, y, pos;
@@ -739,7 +742,7 @@ static int PanedIdentifyCommand(
 
     pos = pw->paned.orient == TTK_ORIENT_HORIZONTAL ? x : y;
     for (index = 0; index < nSashes; ++index) {
-	Pane *pane = Ttk_ContentData(pw->paned.mgr, index);
+	Pane *pane = (Pane *)Ttk_ContentData(pw->paned.mgr, index);
 	if (pane->sashPos <= pos && pos <= pane->sashPos + sashThickness) {
 	    /* Found it. */
 	    switch (what) {
@@ -769,9 +772,9 @@ static int PanedIdentifyCommand(
 static int PanedPaneCommand(
     void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
-    Paned *pw = recordPtr;
+    Paned *pw = (Paned *)recordPtr;
     int paneIndex;
-    Tk_Window slaveWindow;
+    Tk_Window window;
     Pane *pane;
 
     if (objc < 3) {
@@ -780,23 +783,23 @@ static int PanedPaneCommand(
     }
 
     if (TCL_OK != Ttk_GetContentIndexFromObj(
-		    interp,pw->paned.mgr,objv[2],&paneIndex))
+		    interp,pw->paned.mgr, objv[2], &paneIndex))
     {
 	return TCL_ERROR;
     }
 
-    pane = Ttk_ContentData(pw->paned.mgr, paneIndex);
-    slaveWindow = Ttk_ContentWindow(pw->paned.mgr, paneIndex);
+    pane = (Pane *)Ttk_ContentData(pw->paned.mgr, paneIndex);
+    window = Ttk_ContentWindow(pw->paned.mgr, paneIndex);
 
     switch (objc) {
 	case 3:
 	    return TtkEnumerateOptions(interp, pane, PaneOptionSpecs,
-			pw->paned.paneOptionTable, slaveWindow);
+			pw->paned.paneOptionTable, window);
 	case 4:
 	    return TtkGetOptionValue(interp, pane, objv[3],
-			pw->paned.paneOptionTable, slaveWindow);
+			pw->paned.paneOptionTable, window);
 	default:
-	    return ConfigurePane(interp, pw, pane, slaveWindow, objc-3,objv+3);
+	    return ConfigurePane(interp, pw, pane, window, objc-3,objv+3);
     }
 }
 
@@ -806,7 +809,7 @@ static int PanedPaneCommand(
 static int PanedPanesCommand(
     void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
-    Paned *pw = recordPtr;
+    Paned *pw = (Paned *)recordPtr;
     Ttk_Manager *mgr = pw->paned.mgr;
     Tcl_Obj *panes;
     int i;
@@ -833,7 +836,7 @@ static int PanedPanesCommand(
 static int PanedSashposCommand(
     void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
-    Paned *pw = recordPtr;
+    Paned *pw = (Paned *)recordPtr;
     int sashIndex, position = -1;
     Pane *pane;
 
@@ -851,7 +854,7 @@ static int PanedSashposCommand(
 	return TCL_ERROR;
     }
 
-    pane = Ttk_ContentData(pw->paned.mgr, sashIndex);
+    pane = (Pane *)Ttk_ContentData(pw->paned.mgr, sashIndex);
 
     if (objc == 3) {
 	Tcl_SetObjResult(interp, Tcl_NewIntObj(pane->sashPos));
@@ -924,15 +927,20 @@ typedef struct {
 static Ttk_ElementOptionSpec SashElementOptions[] = {
     { "-sashthickness", TK_OPTION_INT,
 	    Tk_Offset(SashElement,thicknessObj), "5" },
-    { NULL, 0, 0, NULL }
+    { NULL, TK_OPTION_BOOLEAN, 0, NULL }
 };
 
 static void SashElementSize(
-    void *clientData, void *elementRecord, Tk_Window tkwin,
-    int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr)
+    TCL_UNUSED(void *),
+    void *elementRecord,
+    TCL_UNUSED(Tk_Window),
+    int *widthPtr,
+    int *heightPtr,
+    TCL_UNUSED(Ttk_Padding *))
 {
-    SashElement *sash = elementRecord;
+    SashElement *sash = (SashElement *)elementRecord;
     int thickness = DEFAULT_SASH_THICKNESS;
+
     Tcl_GetIntFromObj(NULL, sash->thicknessObj, &thickness);
     *widthPtr = *heightPtr = thickness;
 }
diff --git a/generic/ttk/ttkTheme.c b/generic/ttk/ttkTheme.c
index 8723b94..00cb50b 100644
--- a/generic/ttk/ttkTheme.c
+++ b/generic/ttk/ttkTheme.c
@@ -37,7 +37,7 @@ typedef struct Ttk_Style_
 
 static Style *NewStyle(void)
 {
-    Style *stylePtr = ckalloc(sizeof(Style));
+    Style *stylePtr = (Style *)ckalloc(sizeof(Style));
 
     stylePtr->styleName = NULL;
     stylePtr->parentStyle = NULL;
@@ -56,7 +56,7 @@ static void FreeStyle(Style *stylePtr)
 
     entryPtr = Tcl_FirstHashEntry(&stylePtr->settingsTable, &search);
     while (entryPtr != NULL) {
-	Ttk_StateMap stateMap = Tcl_GetHashValue(entryPtr);
+	Ttk_StateMap stateMap = (Ttk_StateMap)Tcl_GetHashValue(entryPtr);
 	Tcl_DecrRefCount(stateMap);
 	entryPtr = Tcl_NextHashEntry(&search);
     }
@@ -64,7 +64,7 @@ static void FreeStyle(Style *stylePtr)
 
     entryPtr = Tcl_FirstHashEntry(&stylePtr->defaultsTable, &search);
     while (entryPtr != NULL) {
-	Tcl_Obj *defaultValue = Tcl_GetHashValue(entryPtr);
+	Tcl_Obj *defaultValue = (Tcl_Obj *)Tcl_GetHashValue(entryPtr);
 	Tcl_DecrRefCount(defaultValue);
 	entryPtr = Tcl_NextHashEntry(&search);
     }
@@ -85,7 +85,7 @@ Tcl_Obj *Ttk_StyleMap(Ttk_Style style, const char *optionName, Ttk_State state)
 	Tcl_HashEntry *entryPtr =
 	    Tcl_FindHashEntry(&style->settingsTable, optionName);
 	if (entryPtr) {
-	    Ttk_StateMap stateMap = Tcl_GetHashValue(entryPtr);
+	    Ttk_StateMap stateMap = (Ttk_StateMap)Tcl_GetHashValue(entryPtr);
 	    return Ttk_StateMapLookup(NULL, stateMap, state);
 	}
 	style = style->parentStyle;
@@ -103,7 +103,7 @@ Tcl_Obj *Ttk_StyleDefault(Ttk_Style style, const char *optionName)
 	Tcl_HashEntry *entryPtr =
 	    Tcl_FindHashEntry(&style->defaultsTable, optionName);
 	if (entryPtr)
-	    return Tcl_GetHashValue(entryPtr);
+	    return (Tcl_Obj *)Tcl_GetHashValue(entryPtr);
 	style= style->parentStyle;
     }
     return 0;
@@ -176,7 +176,7 @@ static const Tk_OptionSpec *TTKGetOptionSpec(
 static OptionMap
 BuildOptionMap(Ttk_ElementClass *elementClass, Tk_OptionTable optionTable)
 {
-    OptionMap optionMap = ckalloc(
+    OptionMap optionMap = (OptionMap)ckalloc(
 	    sizeof(const Tk_OptionSpec) * elementClass->nResources + 1);
     int i;
 
@@ -204,7 +204,7 @@ GetOptionMap(Ttk_ElementClass *elementClass, Tk_OptionTable optionTable)
 	optionMap = BuildOptionMap(elementClass, optionTable);
 	Tcl_SetHashValue(entryPtr, optionMap);
     } else {
-	optionMap = Tcl_GetHashValue(entryPtr);
+	optionMap = (OptionMap)Tcl_GetHashValue(entryPtr);
     }
 
     return optionMap;
@@ -218,7 +218,7 @@ GetOptionMap(Ttk_ElementClass *elementClass, Tk_OptionTable optionTable)
 static Ttk_ElementClass *
 NewElementClass(const char *name, Ttk_ElementSpec *specPtr,void *clientData)
 {
-    Ttk_ElementClass *elementClass = ckalloc(sizeof(Ttk_ElementClass));
+    Ttk_ElementClass *elementClass = (Ttk_ElementClass *)ckalloc(sizeof(Ttk_ElementClass));
     int i;
 
     elementClass->name = name;
@@ -234,7 +234,7 @@ NewElementClass(const char *name, Ttk_ElementSpec *specPtr,void *clientData)
 
     /* Initialize default values:
      */
-    elementClass->defaultValues =
+    elementClass->defaultValues = (Tcl_Obj **)
 	ckalloc(elementClass->nResources * sizeof(Tcl_Obj *) + 1);
     for (i=0; i < elementClass->nResources; ++i) {
         const char *defaultValue = specPtr->options[i].defaultValue;
@@ -291,8 +291,13 @@ static void FreeElementClass(Ttk_ElementClass *elementClass)
  * +++ Themes.
  */
 
-static int ThemeEnabled(Ttk_Theme theme, void *clientData) { return 1; }
+static int ThemeEnabled(
+    TCL_UNUSED(Ttk_Theme),
+    TCL_UNUSED(void *))
+{
     /* Default ThemeEnabledProc -- always return true */
+    return 1;
+}
 
 typedef struct Ttk_Theme_
 {
@@ -307,7 +312,7 @@ typedef struct Ttk_Theme_
 
 static Theme *NewTheme(Ttk_ResourceCache cache, Ttk_Theme parent)
 {
-    Theme *themePtr = ckalloc(sizeof(Theme));
+    Theme *themePtr = (Theme *)ckalloc(sizeof(Theme));
     Tcl_HashEntry *entryPtr;
     int unused;
 
@@ -324,7 +329,7 @@ static Theme *NewTheme(Ttk_ResourceCache cache, Ttk_Theme parent)
     entryPtr = Tcl_CreateHashEntry(&themePtr->styleTable, ".", &unused);
     themePtr->rootStyle = NewStyle();
     themePtr->rootStyle->styleName =
-	Tcl_GetHashKey(&themePtr->styleTable, entryPtr);
+	(const char *)Tcl_GetHashKey(&themePtr->styleTable, entryPtr);
     themePtr->rootStyle->cache = themePtr->cache;
     Tcl_SetHashValue(entryPtr, themePtr->rootStyle);
 
@@ -341,7 +346,7 @@ static void FreeTheme(Theme *themePtr)
      */
     entryPtr = Tcl_FirstHashEntry(&themePtr->elementTable, &search);
     while (entryPtr != NULL) {
-	Ttk_ElementClass *elementClass = Tcl_GetHashValue(entryPtr);
+	Ttk_ElementClass *elementClass = (Ttk_ElementClass *)Tcl_GetHashValue(entryPtr);
 	FreeElementClass(elementClass);
 	entryPtr = Tcl_NextHashEntry(&search);
     }
@@ -352,7 +357,7 @@ static void FreeTheme(Theme *themePtr)
      */
     entryPtr = Tcl_FirstHashEntry(&themePtr->styleTable, &search);
     while (entryPtr != NULL) {
-	Style *stylePtr = Tcl_GetHashValue(entryPtr);
+	Style *stylePtr = (Style *)Tcl_GetHashValue(entryPtr);
 	FreeStyle(stylePtr);
 	entryPtr = Tcl_NextHashEntry(&search);
     }
@@ -403,9 +408,11 @@ static void ThemeChangedProc(void *);	/* Forward */
 /* Ttk_StylePkgFree --
  *	Cleanup procedure for StylePackageData.
  */
-static void Ttk_StylePkgFree(ClientData clientData, Tcl_Interp *interp)
+static void Ttk_StylePkgFree(
+    ClientData clientData,
+    TCL_UNUSED(Tcl_Interp *))
 {
-    StylePackageData *pkgPtr = clientData;
+    StylePackageData *pkgPtr = (StylePackageData *)clientData;
     Tcl_HashSearch search;
     Tcl_HashEntry *entryPtr;
     Cleanup *cleanup;
@@ -422,7 +429,7 @@ static void Ttk_StylePkgFree(ClientData clientData, Tcl_Interp *interp)
      */
     entryPtr = Tcl_FirstHashEntry(&pkgPtr->themeTable, &search);
     while (entryPtr != NULL) {
-	Theme *themePtr = Tcl_GetHashValue(entryPtr);
+	Theme *themePtr = (Theme *)Tcl_GetHashValue(entryPtr);
 	FreeTheme(themePtr);
 	entryPtr = Tcl_NextHashEntry(&search);
     }
@@ -464,7 +471,7 @@ static void Ttk_StylePkgFree(ClientData clientData, Tcl_Interp *interp)
 
 static StylePackageData *GetStylePackageData(Tcl_Interp *interp)
 {
-    return Tcl_GetAssocData(interp, PKG_ASSOC_KEY, NULL);
+    return (StylePackageData *)Tcl_GetAssocData(interp, PKG_ASSOC_KEY, NULL);
 }
 
 /*
@@ -479,8 +486,8 @@ static StylePackageData *GetStylePackageData(Tcl_Interp *interp)
 void Ttk_RegisterCleanup(
     Tcl_Interp *interp, ClientData clientData, Ttk_CleanupProc *cleanupProc)
 {
-    StylePackageData *pkgPtr = GetStylePackageData(interp);
-    Cleanup *cleanup = ckalloc(sizeof(*cleanup));
+    StylePackageData *pkgPtr = (StylePackageData *)GetStylePackageData(interp);
+    Cleanup *cleanup = (Cleanup *)ckalloc(sizeof(*cleanup));
 
     cleanup->clientData = clientData;
     cleanup->cleanupProc = cleanupProc;
@@ -503,7 +510,7 @@ void Ttk_RegisterCleanup(
 static void ThemeChangedProc(ClientData clientData)
 {
     static char ThemeChangedScript[] = "ttk::ThemeChanged";
-    StylePackageData *pkgPtr = clientData;
+    StylePackageData *pkgPtr = (StylePackageData *)clientData;
 
     int code = Tcl_EvalEx(pkgPtr->interp, ThemeChangedScript, -1, TCL_EVAL_GLOBAL);
     if (code != TCL_OK) {
@@ -583,7 +590,7 @@ void Ttk_SetThemeEnabledProc(
 
 static Ttk_Theme LookupTheme(
     Tcl_Interp *interp,		/* where to leave error messages */
-    StylePackageData *pkgPtr,	/* style package master record */
+    StylePackageData *pkgPtr,	/* style package record */
     const char *name)		/* theme name */
 {
     Tcl_HashEntry *entryPtr;
@@ -596,7 +603,7 @@ static Ttk_Theme LookupTheme(
 	return NULL;
     }
 
-    return Tcl_GetHashValue(entryPtr);
+    return (Ttk_Theme)Tcl_GetHashValue(entryPtr);
 }
 
 /*
@@ -704,12 +711,12 @@ Ttk_Style Ttk_GetStyle(Ttk_Theme themePtr, const char *styleName)
 	    stylePtr->parentStyle = themePtr->rootStyle;
 	}
 
-	stylePtr->styleName = Tcl_GetHashKey(&themePtr->styleTable, entryPtr);
+	stylePtr->styleName = (const char *)Tcl_GetHashKey(&themePtr->styleTable, entryPtr);
 	stylePtr->cache = stylePtr->parentStyle->cache;
 	Tcl_SetHashValue(entryPtr, stylePtr);
 	return stylePtr;
     }
-    return Tcl_GetHashValue(entryPtr);
+    return (Ttk_Style)Tcl_GetHashValue(entryPtr);
 }
 
 /* FindLayoutTemplate --
@@ -755,7 +762,7 @@ Ttk_ElementClass *Ttk_GetElement(Ttk_Theme themePtr, const char *elementName)
      */
     entryPtr = Tcl_FindHashEntry(&themePtr->elementTable, elementName);
     if (entryPtr) {
-	return Tcl_GetHashValue(entryPtr);
+	return (Ttk_ElementClass *)Tcl_GetHashValue(entryPtr);
     }
 
     /*
@@ -766,7 +773,7 @@ Ttk_ElementClass *Ttk_GetElement(Ttk_Theme themePtr, const char *elementName)
 	entryPtr = Tcl_FindHashEntry(&themePtr->elementTable, dot);
     }
     if (entryPtr) {
-	return Tcl_GetHashValue(entryPtr);
+	return (Ttk_ElementClass *)Tcl_GetHashValue(entryPtr);
     }
 
     /*
@@ -782,7 +789,7 @@ Ttk_ElementClass *Ttk_GetElement(Ttk_Theme themePtr, const char *elementName)
      */
     entryPtr = Tcl_FindHashEntry(&themePtr->elementTable, "");
     /* ASSERT: entryPtr != 0 */
-    return Tcl_GetHashValue(entryPtr);
+    return (Ttk_ElementClass *)Tcl_GetHashValue(entryPtr);
 }
 
 const char *Ttk_ElementClassName(Ttk_ElementClass *elementClass)
@@ -799,7 +806,7 @@ int Ttk_RegisterElementFactory(
     Ttk_ElementFactory factory, void *clientData)
 {
     StylePackageData *pkgPtr = GetStylePackageData(interp);
-    FactoryRec *recPtr = ckalloc(sizeof(*recPtr));
+    FactoryRec *recPtr = (FactoryRec *)ckalloc(sizeof(*recPtr));
     Tcl_HashEntry *entryPtr;
     int newEntry;
 
@@ -820,7 +827,7 @@ int Ttk_RegisterElementFactory(
  * 	(style element create $name) "from" $theme ?$element?
  */
 static int Ttk_CloneElement(
-    Tcl_Interp *interp, void *clientData,
+    Tcl_Interp *interp, TCL_UNUSED(void *),
     Ttk_Theme theme, const char *elementName,
     int objc, Tcl_Obj *const objv[])
 {
@@ -895,7 +902,7 @@ Ttk_ElementClass *Ttk_RegisterElement(
 	return 0;
     }
 
-    name = Tcl_GetHashKey(&theme->elementTable, entryPtr);
+    name = (char *)Tcl_GetHashKey(&theme->elementTable, entryPtr);
     elementClass = NewElementClass(name, specPtr, clientData);
     Tcl_SetHashValue(entryPtr, elementClass);
 
@@ -984,7 +991,7 @@ int InitializeElementRecord(
     int i;
     for (i=0; i<nResources; ++i, ++elementOption) {
 	Tcl_Obj **dest = (Tcl_Obj **)
-	    (elementRecord + elementOption->offset);
+	    ((char *)elementRecord + elementOption->offset);
 	const char *optionName = elementOption->optionName;
 	Tcl_Obj *dynamicSetting = Ttk_StyleMap(style, optionName, state);
 	Tcl_Obj *widgetValue = 0;
@@ -992,7 +999,7 @@ int InitializeElementRecord(
 
 	if (optionMap[i]) {
 	    widgetValue = *(Tcl_Obj **)
-		(widgetRecord + optionMap[i]->objOffset);
+		((char *)widgetRecord + optionMap[i]->objOffset);
 	}
 
 	if (widgetValue) {
@@ -1134,7 +1141,7 @@ int TtkEnumerateHashTable(Tcl_Interp *interp, Tcl_HashTable *ht)
     Tcl_HashEntry *entryPtr = Tcl_FirstHashEntry(ht, &search);
 
     while (entryPtr != NULL) {
-	Tcl_Obj *nameObj = Tcl_NewStringObj(Tcl_GetHashKey(ht, entryPtr),-1);
+	Tcl_Obj *nameObj = Tcl_NewStringObj((const char *)Tcl_GetHashKey(ht, entryPtr),-1);
 	Tcl_ListObjAppendElement(interp, result, nameObj);
 	entryPtr = Tcl_NextHashEntry(&search);
     }
@@ -1154,8 +1161,8 @@ static Tcl_Obj* HashTableToDict(Tcl_HashTable *ht)
     Tcl_HashEntry *entryPtr = Tcl_FirstHashEntry(ht, &search);
 
     while (entryPtr != NULL) {
-	Tcl_Obj *nameObj = Tcl_NewStringObj(Tcl_GetHashKey(ht, entryPtr),-1);
-	Tcl_Obj *valueObj = Tcl_GetHashValue(entryPtr);
+	Tcl_Obj *nameObj = Tcl_NewStringObj((const char *)Tcl_GetHashKey(ht, entryPtr),-1);
+	Tcl_Obj *valueObj = (Tcl_Obj *)Tcl_GetHashValue(entryPtr);
 	Tcl_ListObjAppendElement(NULL, result, nameObj);
 	Tcl_ListObjAppendElement(NULL, result, valueObj);
 	entryPtr = Tcl_NextHashEntry(&search);
@@ -1176,7 +1183,7 @@ StyleMapCmd(
     int objc,				/* Number of arguments */
     Tcl_Obj *const objv[])		/* Argument objects */
 {
-    StylePackageData *pkgPtr = clientData;
+    StylePackageData *pkgPtr = (StylePackageData *)clientData;
     Ttk_Theme theme = pkgPtr->currentTheme;
     const char *styleName;
     Style *stylePtr;
@@ -1240,7 +1247,7 @@ usage:
 static int StyleConfigureCmd(
     ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
-    StylePackageData *pkgPtr = clientData;
+    StylePackageData *pkgPtr = (StylePackageData *)clientData;
     Ttk_Theme theme = pkgPtr->currentTheme;
     const char *styleName;
     Style *stylePtr;
@@ -1295,7 +1302,7 @@ usage:
 static int StyleLookupCmd(
     ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
-    StylePackageData *pkgPtr = clientData;
+    StylePackageData *pkgPtr = (StylePackageData *)clientData;
     Ttk_Theme theme = pkgPtr->currentTheme;
     Ttk_Style style = NULL;
     const char *optionName;
@@ -1337,7 +1344,7 @@ static int StyleLookupCmd(
 static int StyleThemeCurrentCmd(
     ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj * const objv[])
 {
-    StylePackageData *pkgPtr = clientData;
+    StylePackageData *pkgPtr = (StylePackageData *)clientData;
     Tcl_HashSearch search;
     Tcl_HashEntry *entryPtr = NULL;
     const char *name = NULL;
@@ -1349,9 +1356,9 @@ static int StyleThemeCurrentCmd(
 
     entryPtr = Tcl_FirstHashEntry(&pkgPtr->themeTable, &search);
     while (entryPtr != NULL) {
-	Theme *ptr = Tcl_GetHashValue(entryPtr);
+	Theme *ptr = (Theme *)Tcl_GetHashValue(entryPtr);
 	if (ptr == pkgPtr->currentTheme) {
-	    name = Tcl_GetHashKey(&pkgPtr->themeTable, entryPtr);
+	    name = (char *)Tcl_GetHashKey(&pkgPtr->themeTable, entryPtr);
 	    break;
 	}
 	entryPtr = Tcl_NextHashEntry(&search);
@@ -1373,7 +1380,7 @@ static int StyleThemeCurrentCmd(
 static int StyleThemeCreateCmd(
     ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
-    StylePackageData *pkgPtr = clientData;
+    StylePackageData *pkgPtr = (StylePackageData *)clientData;
     static const char *optStrings[] =
     	 { "-parent", "-settings", NULL };
     enum { OP_PARENT, OP_SETTINGS };
@@ -1435,9 +1442,13 @@ static int StyleThemeCreateCmd(
  * 	Return list of registered themes.
  */
 static int StyleThemeNamesCmd(
-    ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+    ClientData clientData,
+    Tcl_Interp *interp,
+    TCL_UNUSED(int),
+    TCL_UNUSED(Tcl_Obj *const *))
 {
-    StylePackageData *pkgPtr = clientData;
+    StylePackageData *pkgPtr = (StylePackageData *)clientData;
+
     return TtkEnumerateHashTable(interp, &pkgPtr->themeTable);
 }
 
@@ -1453,7 +1464,7 @@ StyleThemeSettingsCmd(
     int objc,				/* Number of arguments */
     Tcl_Obj *const objv[])		/* Argument objects */
 {
-    StylePackageData *pkgPtr = clientData;
+    StylePackageData *pkgPtr = (StylePackageData *)clientData;
     Ttk_Theme oldTheme = pkgPtr->currentTheme;
     Ttk_Theme newTheme;
     int status;
@@ -1479,7 +1490,7 @@ StyleThemeSettingsCmd(
 static int StyleElementCreateCmd(
     ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
-    StylePackageData *pkgPtr = clientData;
+    StylePackageData *pkgPtr = (StylePackageData *)clientData;
     Ttk_Theme theme = pkgPtr->currentTheme;
     const char *elementName, *factoryName;
     Tcl_HashEntry *entryPtr;
@@ -1502,7 +1513,7 @@ static int StyleElementCreateCmd(
 	return TCL_ERROR;
     }
 
-    recPtr = Tcl_GetHashValue(entryPtr);
+    recPtr = (FactoryRec *)Tcl_GetHashValue(entryPtr);
 
     return recPtr->factory(interp, recPtr->clientData,
 	    theme, elementName, objc - 5, objv + 5);
@@ -1514,7 +1525,7 @@ static int StyleElementCreateCmd(
 static int StyleElementNamesCmd(
     ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
-    StylePackageData *pkgPtr = clientData;
+    StylePackageData *pkgPtr = (StylePackageData *)clientData;
     Ttk_Theme theme = pkgPtr->currentTheme;
 
     if (objc != 3) {
@@ -1530,7 +1541,7 @@ static int StyleElementNamesCmd(
 static int StyleElementOptionsCmd(
     ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
-    StylePackageData *pkgPtr = clientData;
+    StylePackageData *pkgPtr = (StylePackageData *)clientData;
     Ttk_Theme theme = pkgPtr->currentTheme;
     const char *elementName;
     Ttk_ElementClass *elementClass;
@@ -1568,7 +1579,7 @@ static int StyleElementOptionsCmd(
 static int StyleLayoutCmd(
     ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
-    StylePackageData *pkgPtr = clientData;
+    StylePackageData *pkgPtr = (StylePackageData *)clientData;
     Ttk_Theme theme = pkgPtr->currentTheme;
     const char *layoutName;
     Ttk_LayoutTemplate layoutTemplate;
@@ -1611,7 +1622,7 @@ StyleThemeUseCmd(
     int objc,				/* Number of arguments */
     Tcl_Obj *const objv[])		/* Argument objects */
 {
-    StylePackageData *pkgPtr = clientData;
+    StylePackageData *pkgPtr = (StylePackageData *)clientData;
     Ttk_Theme theme;
 
     if (objc < 3 || objc > 4) {
@@ -1706,7 +1717,7 @@ void Ttk_StylePkgInit(Tcl_Interp *interp)
 {
     Tcl_Namespace *nsPtr;
 
-    StylePackageData *pkgPtr = ckalloc(sizeof(StylePackageData));
+    StylePackageData *pkgPtr = (StylePackageData *)ckalloc(sizeof(StylePackageData));
 
     pkgPtr->interp = interp;
     Tcl_InitHashTable(&pkgPtr->themeTable, TCL_STRING_KEYS);
-- 
cgit v0.12


From 2c80218636b778e62c7c0707c891553b83a79a26 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 8 Sep 2020 11:02:00 +0000
Subject: Move up TkUnusedStubEntry a little. New test function "menubarheight"
 for MacOSX (backported from 8.6)

---
 generic/tk.decls         |  3 +++
 generic/tkInt.decls      |  4 +--
 generic/tkIntDecls.h     | 12 ++++++---
 generic/tkIntXlibDecls.h |  4 +--
 generic/tkPlatDecls.h    | 25 +++++++++++++++++++
 generic/tkStubInit.c     | 10 +++++++-
 macosx/tkMacOSXTest.c    | 65 ++++++++++++++++++++++++++++++++++++++++--------
 macosx/tkMacOSXXStubs.c  |  2 +-
 8 files changed, 105 insertions(+), 20 deletions(-)

diff --git a/generic/tk.decls b/generic/tk.decls
index 2825111..7f3d093 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -1141,6 +1141,9 @@ declare 9 aqua {
 declare 10 aqua {
     int Tk_MacOSXIsAppInFront(void)
 }
+declare 16 aqua {
+    void TkUnusedStubEntry(void)
+}
 
 ##############################################################################
 
diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index 2b04cc1..d056110 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -568,7 +568,7 @@ declare 180 {
     char *TkSmoothPrintProc(ClientData clientData, Tk_Window tkwin,
 	    char *widgRec, int offset, Tcl_FreeProc **freeProcPtr)
 }
-declare 184 {
+declare 186 {
     void TkUnusedStubEntry(void)
 }
 
@@ -1718,7 +1718,7 @@ declare 90 aqua {
 	    Window **w4, unsigned int *ui)
 }
 declare 91 aqua {
-    int XSync(Display *display, Bool flag)
+    int XSync(Display *display, Bool discard)
 }
 declare 158 aqua {
     void TkUnusedStubEntry(void)
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h
index 9dea8d4..d0a091d 100644
--- a/generic/tkIntDecls.h
+++ b/generic/tkIntDecls.h
@@ -969,9 +969,11 @@ EXTERN char *		TkSmoothPrintProc(ClientData clientData,
 /* Slot 181 is reserved */
 /* Slot 182 is reserved */
 /* Slot 183 is reserved */
+/* Slot 184 is reserved */
+/* Slot 185 is reserved */
 #ifndef TkUnusedStubEntry_TCL_DECLARED
 #define TkUnusedStubEntry_TCL_DECLARED
-/* 184 */
+/* 186 */
 EXTERN void		TkUnusedStubEntry(void);
 #endif
 
@@ -1190,7 +1192,9 @@ typedef struct TkIntStubs {
     VOID *reserved181;
     VOID *reserved182;
     VOID *reserved183;
-    void (*tkUnusedStubEntry) (void); /* 184 */
+    VOID *reserved184;
+    VOID *reserved185;
+    void (*tkUnusedStubEntry) (void); /* 186 */
 } TkIntStubs;
 
 extern TkIntStubs *tkIntStubsPtr;
@@ -1863,9 +1867,11 @@ extern TkIntStubs *tkIntStubsPtr;
 /* Slot 181 is reserved */
 /* Slot 182 is reserved */
 /* Slot 183 is reserved */
+/* Slot 184 is reserved */
+/* Slot 185 is reserved */
 #ifndef TkUnusedStubEntry
 #define TkUnusedStubEntry \
-	(tkIntStubsPtr->tkUnusedStubEntry) /* 184 */
+	(tkIntStubsPtr->tkUnusedStubEntry) /* 186 */
 #endif
 
 #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index 010dd9c..700aa3d 100644
--- a/generic/tkIntXlibDecls.h
+++ b/generic/tkIntXlibDecls.h
@@ -1299,7 +1299,7 @@ EXTERN Status		XQueryTree(Display *d, Window w1, Window *w2,
 #ifndef XSync_TCL_DECLARED
 #define XSync_TCL_DECLARED
 /* 91 */
-EXTERN int		XSync(Display *display, Bool flag);
+EXTERN int		XSync(Display *display, Bool discard);
 #endif
 /* Slot 92 is reserved */
 /* Slot 93 is reserved */
@@ -1631,7 +1631,7 @@ typedef struct TkIntXlibStubs {
     void (*xQueryColor) (Display *display, Colormap colormap, XColor *def_in_out); /* 88 */
     void (*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 flag); /* 91 */
+    int (*xSync) (Display *display, Bool discard); /* 91 */
     VOID *reserved92;
     VOID *reserved93;
     VOID *reserved94;
diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h
index eb3d74d..9112f58 100644
--- a/generic/tkPlatDecls.h
+++ b/generic/tkPlatDecls.h
@@ -129,6 +129,16 @@ EXTERN void		Tk_MacOSXSetupTkNotifier(void);
 /* 10 */
 EXTERN int		Tk_MacOSXIsAppInFront(void);
 #endif
+/* Slot 11 is reserved */
+/* Slot 12 is reserved */
+/* Slot 13 is reserved */
+/* Slot 14 is reserved */
+/* Slot 15 is reserved */
+#ifndef TkUnusedStubEntry_TCL_DECLARED
+#define TkUnusedStubEntry_TCL_DECLARED
+/* 16 */
+EXTERN void		TkUnusedStubEntry(void);
+#endif
 #endif /* AQUA */
 
 typedef struct TkPlatStubs {
@@ -155,6 +165,12 @@ typedef struct TkPlatStubs {
     VOID * (*tkMacOSXGetRootControl) (Drawable drawable); /* 8 */
     void (*tk_MacOSXSetupTkNotifier) (void); /* 9 */
     int (*tk_MacOSXIsAppInFront) (void); /* 10 */
+    VOID *reserved11;
+    VOID *reserved12;
+    VOID *reserved13;
+    VOID *reserved14;
+    VOID *reserved15;
+    void (*tkUnusedStubEntry) (void); /* 16 */
 #endif /* AQUA */
 } TkPlatStubs;
 
@@ -241,6 +257,15 @@ extern TkPlatStubs *tkPlatStubsPtr;
 #define Tk_MacOSXIsAppInFront \
 	(tkPlatStubsPtr->tk_MacOSXIsAppInFront) /* 10 */
 #endif
+/* Slot 11 is reserved */
+/* Slot 12 is reserved */
+/* Slot 13 is reserved */
+/* Slot 14 is reserved */
+/* Slot 15 is reserved */
+#ifndef TkUnusedStubEntry
+#define TkUnusedStubEntry \
+	(tkPlatStubsPtr->tkUnusedStubEntry) /* 16 */
+#endif
 #endif /* AQUA */
 
 #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 3f6d348..6054d50 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -481,7 +481,9 @@ TkIntStubs tkIntStubs = {
     NULL, /* 181 */
     NULL, /* 182 */
     NULL, /* 183 */
-    TkUnusedStubEntry, /* 184 */
+    NULL, /* 184 */
+    NULL, /* 185 */
+    TkUnusedStubEntry, /* 186 */
 };
 
 TkIntPlatStubs tkIntPlatStubs = {
@@ -961,6 +963,12 @@ TkPlatStubs tkPlatStubs = {
     TkMacOSXGetRootControl, /* 8 */
     Tk_MacOSXSetupTkNotifier, /* 9 */
     Tk_MacOSXIsAppInFront, /* 10 */
+    NULL, /* 11 */
+    NULL, /* 12 */
+    NULL, /* 13 */
+    NULL, /* 14 */
+    NULL, /* 15 */
+    TkUnusedStubEntry, /* 16 */
 #endif /* AQUA */
 };
 
diff --git a/macosx/tkMacOSXTest.c b/macosx/tkMacOSXTest.c
index 0e43785..a8ae788 100644
--- a/macosx/tkMacOSXTest.c
+++ b/macosx/tkMacOSXTest.c
@@ -13,14 +13,20 @@
  */
 
 #include "tkMacOSXPrivate.h"
+#include "tkMacOSXWm.h"
+
 
 /*
  * Forward declarations of procedures defined later in this file:
  */
 
-static int		DebuggerCmd (ClientData dummy, Tcl_Interp *interp,
-			    int argc, const char **argv);
-MODULE_SCOPE int	TkplatformtestInit(Tcl_Interp *interp);
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1080
+static int		DebuggerObjCmd(ClientData dummy, Tcl_Interp *interp,
+					int objc, Tcl_Obj *const objv[]);
+#endif
+static int		MenuBarHeightObjCmd(ClientData dummy, Tcl_Interp *interp,
+					int objc, Tcl_Obj *const *objv);
+
 
 /*
  *----------------------------------------------------------------------
@@ -47,18 +53,20 @@ TkplatformtestInit(
      * Add commands for platform specific tests on MacOS here.
      */
 
-    Tcl_CreateCommand(interp, "debugger", DebuggerCmd,
-	    (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
-
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1080
+    Tcl_CreateObjCommand(interp, "debugger", DebuggerObjCmd, NULL, NULL);
+#endif
+    Tcl_CreateObjCommand(interp, "menubarheight", MenuBarHeightObjCmd, NULL, NULL);
     return TCL_OK;
 }
 
 /*
  *----------------------------------------------------------------------
  *
- * DebuggerCmd --
+ * DebuggerObjCmd --
  *
- *	This procedure simply calls the low level debugger.
+ *	This procedure simply calls the low level debugger, which was
+ *      deprecated in OSX 10.8.
  *
  * Results:
  *	A standard Tcl result.
@@ -69,16 +77,51 @@ TkplatformtestInit(
  *----------------------------------------------------------------------
  */
 
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1080
 static int
-DebuggerCmd(
+DebuggerObjCmd(
     ClientData clientData,		/* Not used. */
     Tcl_Interp *interp,			/* Not used. */
-    int argc,				/* Not used. */
-    const char **argv)			/* Not used. */
+    int objc,				/* Not used. */
+    Tcl_Obj *const objv[])			/* Not used. */
 {
     Debugger();
     return TCL_OK;
 }
+#endif
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * MenuBarHeightObjCmd --
+ *
+ *	This procedure calls [NSMenu menuBarHeight] and returns the result
+ *      as an integer.  Windows can never be placed to overlap the MenuBar,
+ *      so tests need to be aware of its size.
+ *
+ * Results:
+ *	A standard Tcl result.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int
+MenuBarHeightObjCmd(
+    ClientData clientData,		/* Not used. */
+    Tcl_Interp *interp,			/* Not used. */
+    int objc,				/* Not used. */
+    Tcl_Obj *const objv[])			/* Not used. */
+{
+    static int height = 0;
+    if (height == 0) {
+	height = (int) [[NSApp mainMenu] menuBarHeight];
+    }
+    Tcl_SetObjResult(interp, Tcl_NewIntObj(height));
+    return TCL_OK;
+}
 
 /*
  * Local Variables:
diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c
index a541945..b6b1659 100644
--- a/macosx/tkMacOSXXStubs.c
+++ b/macosx/tkMacOSXXStubs.c
@@ -719,7 +719,7 @@ Tk_FreeXId(
 int
 XSync(
     Display *display,
-    Bool flag)
+    Bool discard)
 {
     TkMacOSXFlushWindows();
     display->request++;
-- 
cgit v0.12


From 95aa66aaac53bd1a8b29fd542ec754556343c7a9 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 8 Sep 2020 13:44:33 +0000
Subject: Don't fill stub entries for TkpWillDrawWidget/TkpRedrawWidget with 0
 on XQuarz so they can be called by extensions

---
 generic/tkIntDecls.h |  2 +-
 generic/tkStubInit.c | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h
index 1018e93..7057411 100644
--- a/generic/tkIntDecls.h
+++ b/generic/tkIntDecls.h
@@ -1217,7 +1217,7 @@ extern const TkIntStubs *tkIntStubsPtr;
 
 #endif /* UNIX */
 
-#if !defined(MAC_OSX_TK) || defined(MAC_OSX_TCL)
+#if !defined(MAC_OSX_TK)
 #   undef TkpWillDrawWidget
 #   undef TkpRedrawWidget
 #   define TkpWillDrawWidget(w) 0
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index bd7af4f..ee79926 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -59,11 +59,17 @@ MODULE_SCOPE const TkStubs tkStubs;
 #define TkGenWMConfigureEvent_ TkGenWMConfigureEvent
 #define TkGenerateActivateEvents_ TkGenerateActivateEvents
 
-#if !defined(MAC_OSX_TK) || defined(MAC_OSX_TCL)
+#if !defined(MAC_OSX_TK)
 #   undef TkpWillDrawWidget
 #   undef TkpRedrawWidget
-#   define TkpWillDrawWidget 0
-#   define TkpRedrawWidget 0
+static int
+doNothing(void)
+{
+    /* dummy implementation, no need to do anything */
+    return 0;
+}
+#   define TkpWillDrawWidget ((int (*)(Tk_Window))(void *)doNothing)
+#   define TkpRedrawWidget ((void (*)(Tk_Window))(void *)doNothing)
 #endif
 
 #if defined(MAC_OSX_TK)
-- 
cgit v0.12


From 4afcd874022affaf0e48efc97d18afae0ba56adc Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 8 Sep 2020 15:14:37 +0000
Subject: Let's try to run GUI testcases on X11 (Xenial/Bionic/Focal/MacOS)

---
 .travis.yml | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 95c0727..d478d61 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,7 @@ addons:
       - gcc-multilib
       - tcl-dev
       - libx11-dev
+      - xvfb
   homebrew:
     packages:
       - tcl-tk
@@ -25,6 +26,10 @@ jobs:
       compiler: gcc
       env:
         - BUILD_DIR=unix
+      script: &x11gui
+        - make binaries libraries tktest
+        - make install
+        - xvfb-run make test
     - name: "Linux/GCC/Shared/no-xft"
       os: linux
       dist: focal
@@ -32,6 +37,21 @@ jobs:
       env:
         - BUILD_DIR=unix
         - CFGOPT="--disable-xft"
+      script: *x11gui
+    - name: "Linux/GCC/Shared/bionic"
+      os: linux
+      dist: bionic
+      compiler: gcc
+      env:
+        - BUILD_DIR=unix
+      script: *x11gui
+    - name: "Linux/GCC/Shared/xenial"
+      os: linux
+      dist: xenial
+      compiler: gcc
+      env:
+        - BUILD_DIR=unix
+      script: *x11gui
     - name: "Linux/GCC/Static"
       os: linux
       dist: focal
@@ -112,7 +132,7 @@ jobs:
         - BUILD_DIR=unix
         - CFGOPT="--enable-symbols"
 # Testing on Mac, various styles
-    - name: "macOS/Clang/Xcode 11.6/Shared"
+    - name: "macOS/Clang/Xcode 11.7/Shared"
       os: osx
       osx_image: xcode11.7
       env:
@@ -122,7 +142,7 @@ jobs:
         - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1)
       script: &mactest
         - make binaries libraries tktest
-    - name: "macOS/Clang/Xcode 11.6/Static"
+    - name: "macOS/Clang/Xcode 11.7/Static"
       os: osx
       osx_image: xcode11.7
       env:
@@ -131,7 +151,7 @@ jobs:
       install:
         - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1)
       script: *mactest
-    - name: "macOS/Clang/Xcode 11.6/Debug"
+    - name: "macOS/Clang/Xcode 11.7/Debug"
       os: osx
       osx_image: xcode11.7
       env:
@@ -140,7 +160,7 @@ jobs:
       install:
         - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1)
       script: *mactest
-    - name: "macOS/Clang/Xcode 11.6/Shared/XQuartz"
+    - name: "macOS/Clang/Xcode 11.7/Shared/XQuartz"
       os: osx
       osx_image: xcode11.7
       env:
@@ -148,7 +168,9 @@ jobs:
         - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --disable-corefoundation --x-includes=/opt/X11/include --x-libraries=/opt/X11/lib CFLAGS=-I/usr/local/opt/tcl-tk/include"
       install:
         - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1)
-      script: *mactest
+      script:
+        - make binaries libraries tktest
+        - Xvfb :1337 & make test DISPLAY=:1337
 # Older MacOS versions
     - name: "macOS/Clang/Xcode 11/Shared"
       os: osx
-- 
cgit v0.12


From 1a994da88e43dfeb7fd04825dd7552fe775efb80 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 8 Sep 2020 15:20:39 +0000
Subject: Move TkUnusedStubEntry up a little more

---
 generic/tk.decls         |    2 +-
 generic/tkDecls.h        | 1626 ++++------------------------------------------
 generic/tkIntDecls.h     |  985 +++-------------------------
 generic/tkIntPlatDecls.h |  652 ++-----------------
 generic/tkIntXlibDecls.h | 1287 ++++--------------------------------
 generic/tkPlatDecls.h    |  122 +---
 generic/tkStubInit.c     |  371 +++++------
 7 files changed, 615 insertions(+), 4430 deletions(-)

diff --git a/generic/tk.decls b/generic/tk.decls
index 7f3d093..1b59d27 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -1067,7 +1067,7 @@ declare 272 {
 declare 273 {
     void Tk_CreateOldPhotoImageFormat(Tk_PhotoImageFormat *formatPtr)
 }
-declare 275 {
+declare 280 {
     void TkUnusedStubEntry(void)
 }
 
diff --git a/generic/tkDecls.h b/generic/tkDecls.h
index 00a3dde..a7d184a 100644
--- a/generic/tkDecls.h
+++ b/generic/tkDecls.h
@@ -33,1679 +33,865 @@ extern "C" {
  * Exported function declarations:
  */
 
-#ifndef Tk_MainLoop_TCL_DECLARED
-#define Tk_MainLoop_TCL_DECLARED
 /* 0 */
 EXTERN void		Tk_MainLoop(void);
-#endif
-#ifndef Tk_3DBorderColor_TCL_DECLARED
-#define Tk_3DBorderColor_TCL_DECLARED
 /* 1 */
 EXTERN XColor *		Tk_3DBorderColor(Tk_3DBorder border);
-#endif
-#ifndef Tk_3DBorderGC_TCL_DECLARED
-#define Tk_3DBorderGC_TCL_DECLARED
 /* 2 */
 EXTERN GC		Tk_3DBorderGC(Tk_Window tkwin, Tk_3DBorder border,
 				int which);
-#endif
-#ifndef Tk_3DHorizontalBevel_TCL_DECLARED
-#define Tk_3DHorizontalBevel_TCL_DECLARED
 /* 3 */
 EXTERN void		Tk_3DHorizontalBevel(Tk_Window tkwin,
 				Drawable drawable, Tk_3DBorder border, int x,
 				int y, int width, int height, int leftIn,
 				int rightIn, int topBevel, int relief);
-#endif
-#ifndef Tk_3DVerticalBevel_TCL_DECLARED
-#define Tk_3DVerticalBevel_TCL_DECLARED
 /* 4 */
 EXTERN void		Tk_3DVerticalBevel(Tk_Window tkwin,
 				Drawable drawable, Tk_3DBorder border, int x,
 				int y, int width, int height, int leftBevel,
 				int relief);
-#endif
-#ifndef Tk_AddOption_TCL_DECLARED
-#define Tk_AddOption_TCL_DECLARED
 /* 5 */
-EXTERN void		Tk_AddOption(Tk_Window tkwin, CONST char *name,
-				CONST char *value, int priority);
-#endif
-#ifndef Tk_BindEvent_TCL_DECLARED
-#define Tk_BindEvent_TCL_DECLARED
+EXTERN void		Tk_AddOption(Tk_Window tkwin, const char *name,
+				const char *value, int priority);
 /* 6 */
 EXTERN void		Tk_BindEvent(Tk_BindingTable bindingTable,
 				XEvent *eventPtr, Tk_Window tkwin,
 				int numObjects, ClientData *objectPtr);
-#endif
-#ifndef Tk_CanvasDrawableCoords_TCL_DECLARED
-#define Tk_CanvasDrawableCoords_TCL_DECLARED
 /* 7 */
 EXTERN void		Tk_CanvasDrawableCoords(Tk_Canvas canvas, double x,
 				double y, short *drawableXPtr,
 				short *drawableYPtr);
-#endif
-#ifndef Tk_CanvasEventuallyRedraw_TCL_DECLARED
-#define Tk_CanvasEventuallyRedraw_TCL_DECLARED
 /* 8 */
 EXTERN void		Tk_CanvasEventuallyRedraw(Tk_Canvas canvas, int x1,
 				int y1, int x2, int y2);
-#endif
-#ifndef Tk_CanvasGetCoord_TCL_DECLARED
-#define Tk_CanvasGetCoord_TCL_DECLARED
 /* 9 */
 EXTERN int		Tk_CanvasGetCoord(Tcl_Interp *interp,
-				Tk_Canvas canvas, CONST char *str,
+				Tk_Canvas canvas, const char *str,
 				double *doublePtr);
-#endif
-#ifndef Tk_CanvasGetTextInfo_TCL_DECLARED
-#define Tk_CanvasGetTextInfo_TCL_DECLARED
 /* 10 */
 EXTERN Tk_CanvasTextInfo * Tk_CanvasGetTextInfo(Tk_Canvas canvas);
-#endif
-#ifndef Tk_CanvasPsBitmap_TCL_DECLARED
-#define Tk_CanvasPsBitmap_TCL_DECLARED
 /* 11 */
 EXTERN int		Tk_CanvasPsBitmap(Tcl_Interp *interp,
 				Tk_Canvas canvas, Pixmap bitmap, int x,
 				int y, int width, int height);
-#endif
-#ifndef Tk_CanvasPsColor_TCL_DECLARED
-#define Tk_CanvasPsColor_TCL_DECLARED
 /* 12 */
 EXTERN int		Tk_CanvasPsColor(Tcl_Interp *interp,
 				Tk_Canvas canvas, XColor *colorPtr);
-#endif
-#ifndef Tk_CanvasPsFont_TCL_DECLARED
-#define Tk_CanvasPsFont_TCL_DECLARED
 /* 13 */
 EXTERN int		Tk_CanvasPsFont(Tcl_Interp *interp, Tk_Canvas canvas,
 				Tk_Font font);
-#endif
-#ifndef Tk_CanvasPsPath_TCL_DECLARED
-#define Tk_CanvasPsPath_TCL_DECLARED
 /* 14 */
 EXTERN void		Tk_CanvasPsPath(Tcl_Interp *interp, Tk_Canvas canvas,
 				double *coordPtr, int numPoints);
-#endif
-#ifndef Tk_CanvasPsStipple_TCL_DECLARED
-#define Tk_CanvasPsStipple_TCL_DECLARED
 /* 15 */
 EXTERN int		Tk_CanvasPsStipple(Tcl_Interp *interp,
 				Tk_Canvas canvas, Pixmap bitmap);
-#endif
-#ifndef Tk_CanvasPsY_TCL_DECLARED
-#define Tk_CanvasPsY_TCL_DECLARED
 /* 16 */
 EXTERN double		Tk_CanvasPsY(Tk_Canvas canvas, double y);
-#endif
-#ifndef Tk_CanvasSetStippleOrigin_TCL_DECLARED
-#define Tk_CanvasSetStippleOrigin_TCL_DECLARED
 /* 17 */
 EXTERN void		Tk_CanvasSetStippleOrigin(Tk_Canvas canvas, GC gc);
-#endif
-#ifndef Tk_CanvasTagsParseProc_TCL_DECLARED
-#define Tk_CanvasTagsParseProc_TCL_DECLARED
 /* 18 */
 EXTERN int		Tk_CanvasTagsParseProc(ClientData clientData,
 				Tcl_Interp *interp, Tk_Window tkwin,
-				CONST char *value, char *widgRec, int offset);
-#endif
-#ifndef Tk_CanvasTagsPrintProc_TCL_DECLARED
-#define Tk_CanvasTagsPrintProc_TCL_DECLARED
+				const char *value, char *widgRec, int offset);
 /* 19 */
 EXTERN char *		Tk_CanvasTagsPrintProc(ClientData clientData,
 				Tk_Window tkwin, char *widgRec, int offset,
 				Tcl_FreeProc **freeProcPtr);
-#endif
-#ifndef Tk_CanvasTkwin_TCL_DECLARED
-#define Tk_CanvasTkwin_TCL_DECLARED
 /* 20 */
 EXTERN Tk_Window	Tk_CanvasTkwin(Tk_Canvas canvas);
-#endif
-#ifndef Tk_CanvasWindowCoords_TCL_DECLARED
-#define Tk_CanvasWindowCoords_TCL_DECLARED
 /* 21 */
 EXTERN void		Tk_CanvasWindowCoords(Tk_Canvas canvas, double x,
 				double y, short *screenXPtr,
 				short *screenYPtr);
-#endif
-#ifndef Tk_ChangeWindowAttributes_TCL_DECLARED
-#define Tk_ChangeWindowAttributes_TCL_DECLARED
 /* 22 */
 EXTERN void		Tk_ChangeWindowAttributes(Tk_Window tkwin,
 				unsigned long valueMask,
 				XSetWindowAttributes *attsPtr);
-#endif
-#ifndef Tk_CharBbox_TCL_DECLARED
-#define Tk_CharBbox_TCL_DECLARED
 /* 23 */
 EXTERN int		Tk_CharBbox(Tk_TextLayout layout, int index,
 				int *xPtr, int *yPtr, int *widthPtr,
 				int *heightPtr);
-#endif
-#ifndef Tk_ClearSelection_TCL_DECLARED
-#define Tk_ClearSelection_TCL_DECLARED
 /* 24 */
 EXTERN void		Tk_ClearSelection(Tk_Window tkwin, Atom selection);
-#endif
-#ifndef Tk_ClipboardAppend_TCL_DECLARED
-#define Tk_ClipboardAppend_TCL_DECLARED
 /* 25 */
 EXTERN int		Tk_ClipboardAppend(Tcl_Interp *interp,
 				Tk_Window tkwin, Atom target, Atom format,
 				char *buffer);
-#endif
-#ifndef Tk_ClipboardClear_TCL_DECLARED
-#define Tk_ClipboardClear_TCL_DECLARED
 /* 26 */
 EXTERN int		Tk_ClipboardClear(Tcl_Interp *interp,
 				Tk_Window tkwin);
-#endif
-#ifndef Tk_ConfigureInfo_TCL_DECLARED
-#define Tk_ConfigureInfo_TCL_DECLARED
 /* 27 */
 EXTERN int		Tk_ConfigureInfo(Tcl_Interp *interp, Tk_Window tkwin,
 				Tk_ConfigSpec *specs, char *widgRec,
-				CONST char *argvName, int flags);
-#endif
-#ifndef Tk_ConfigureValue_TCL_DECLARED
-#define Tk_ConfigureValue_TCL_DECLARED
+				const char *argvName, int flags);
 /* 28 */
 EXTERN int		Tk_ConfigureValue(Tcl_Interp *interp,
 				Tk_Window tkwin, Tk_ConfigSpec *specs,
-				char *widgRec, CONST char *argvName,
+				char *widgRec, const char *argvName,
 				int flags);
-#endif
-#ifndef Tk_ConfigureWidget_TCL_DECLARED
-#define Tk_ConfigureWidget_TCL_DECLARED
 /* 29 */
 EXTERN int		Tk_ConfigureWidget(Tcl_Interp *interp,
 				Tk_Window tkwin, Tk_ConfigSpec *specs,
 				int argc, CONST84 char **argv, char *widgRec,
 				int flags);
-#endif
-#ifndef Tk_ConfigureWindow_TCL_DECLARED
-#define Tk_ConfigureWindow_TCL_DECLARED
 /* 30 */
 EXTERN void		Tk_ConfigureWindow(Tk_Window tkwin,
 				unsigned int valueMask,
 				XWindowChanges *valuePtr);
-#endif
-#ifndef Tk_ComputeTextLayout_TCL_DECLARED
-#define Tk_ComputeTextLayout_TCL_DECLARED
 /* 31 */
-EXTERN Tk_TextLayout	Tk_ComputeTextLayout(Tk_Font font, CONST char *str,
+EXTERN Tk_TextLayout	Tk_ComputeTextLayout(Tk_Font font, const char *str,
 				int numChars, int wrapLength,
 				Tk_Justify justify, int flags, int *widthPtr,
 				int *heightPtr);
-#endif
-#ifndef Tk_CoordsToWindow_TCL_DECLARED
-#define Tk_CoordsToWindow_TCL_DECLARED
 /* 32 */
 EXTERN Tk_Window	Tk_CoordsToWindow(int rootX, int rootY,
 				Tk_Window tkwin);
-#endif
-#ifndef Tk_CreateBinding_TCL_DECLARED
-#define Tk_CreateBinding_TCL_DECLARED
 /* 33 */
 EXTERN unsigned long	Tk_CreateBinding(Tcl_Interp *interp,
 				Tk_BindingTable bindingTable,
-				ClientData object, CONST char *eventStr,
-				CONST char *command, int append);
-#endif
-#ifndef Tk_CreateBindingTable_TCL_DECLARED
-#define Tk_CreateBindingTable_TCL_DECLARED
+				ClientData object, const char *eventStr,
+				const char *command, int append);
 /* 34 */
 EXTERN Tk_BindingTable	Tk_CreateBindingTable(Tcl_Interp *interp);
-#endif
-#ifndef Tk_CreateErrorHandler_TCL_DECLARED
-#define Tk_CreateErrorHandler_TCL_DECLARED
 /* 35 */
 EXTERN Tk_ErrorHandler	Tk_CreateErrorHandler(Display *display, int errNum,
 				int request, int minorCode,
 				Tk_ErrorProc *errorProc,
 				ClientData clientData);
-#endif
-#ifndef Tk_CreateEventHandler_TCL_DECLARED
-#define Tk_CreateEventHandler_TCL_DECLARED
 /* 36 */
 EXTERN void		Tk_CreateEventHandler(Tk_Window token,
 				unsigned long mask, Tk_EventProc *proc,
 				ClientData clientData);
-#endif
-#ifndef Tk_CreateGenericHandler_TCL_DECLARED
-#define Tk_CreateGenericHandler_TCL_DECLARED
 /* 37 */
 EXTERN void		Tk_CreateGenericHandler(Tk_GenericProc *proc,
 				ClientData clientData);
-#endif
-#ifndef Tk_CreateImageType_TCL_DECLARED
-#define Tk_CreateImageType_TCL_DECLARED
 /* 38 */
 EXTERN void		Tk_CreateImageType(Tk_ImageType *typePtr);
-#endif
-#ifndef Tk_CreateItemType_TCL_DECLARED
-#define Tk_CreateItemType_TCL_DECLARED
 /* 39 */
 EXTERN void		Tk_CreateItemType(Tk_ItemType *typePtr);
-#endif
-#ifndef Tk_CreatePhotoImageFormat_TCL_DECLARED
-#define Tk_CreatePhotoImageFormat_TCL_DECLARED
 /* 40 */
 EXTERN void		Tk_CreatePhotoImageFormat(
 				Tk_PhotoImageFormat *formatPtr);
-#endif
-#ifndef Tk_CreateSelHandler_TCL_DECLARED
-#define Tk_CreateSelHandler_TCL_DECLARED
 /* 41 */
 EXTERN void		Tk_CreateSelHandler(Tk_Window tkwin, Atom selection,
 				Atom target, Tk_SelectionProc *proc,
 				ClientData clientData, Atom format);
-#endif
-#ifndef Tk_CreateWindow_TCL_DECLARED
-#define Tk_CreateWindow_TCL_DECLARED
 /* 42 */
 EXTERN Tk_Window	Tk_CreateWindow(Tcl_Interp *interp, Tk_Window parent,
-				CONST char *name, CONST char *screenName);
-#endif
-#ifndef Tk_CreateWindowFromPath_TCL_DECLARED
-#define Tk_CreateWindowFromPath_TCL_DECLARED
+				const char *name, const char *screenName);
 /* 43 */
 EXTERN Tk_Window	Tk_CreateWindowFromPath(Tcl_Interp *interp,
-				Tk_Window tkwin, CONST char *pathName,
-				CONST char *screenName);
-#endif
-#ifndef Tk_DefineBitmap_TCL_DECLARED
-#define Tk_DefineBitmap_TCL_DECLARED
+				Tk_Window tkwin, const char *pathName,
+				const char *screenName);
 /* 44 */
-EXTERN int		Tk_DefineBitmap(Tcl_Interp *interp, CONST char *name,
-				CONST char *source, int width, int height);
-#endif
-#ifndef Tk_DefineCursor_TCL_DECLARED
-#define Tk_DefineCursor_TCL_DECLARED
+EXTERN int		Tk_DefineBitmap(Tcl_Interp *interp, const char *name,
+				const char *source, int width, int height);
 /* 45 */
 EXTERN void		Tk_DefineCursor(Tk_Window window, Tk_Cursor cursor);
-#endif
-#ifndef Tk_DeleteAllBindings_TCL_DECLARED
-#define Tk_DeleteAllBindings_TCL_DECLARED
 /* 46 */
 EXTERN void		Tk_DeleteAllBindings(Tk_BindingTable bindingTable,
 				ClientData object);
-#endif
-#ifndef Tk_DeleteBinding_TCL_DECLARED
-#define Tk_DeleteBinding_TCL_DECLARED
 /* 47 */
 EXTERN int		Tk_DeleteBinding(Tcl_Interp *interp,
 				Tk_BindingTable bindingTable,
-				ClientData object, CONST char *eventStr);
-#endif
-#ifndef Tk_DeleteBindingTable_TCL_DECLARED
-#define Tk_DeleteBindingTable_TCL_DECLARED
+				ClientData object, const char *eventStr);
 /* 48 */
 EXTERN void		Tk_DeleteBindingTable(Tk_BindingTable bindingTable);
-#endif
-#ifndef Tk_DeleteErrorHandler_TCL_DECLARED
-#define Tk_DeleteErrorHandler_TCL_DECLARED
 /* 49 */
 EXTERN void		Tk_DeleteErrorHandler(Tk_ErrorHandler handler);
-#endif
-#ifndef Tk_DeleteEventHandler_TCL_DECLARED
-#define Tk_DeleteEventHandler_TCL_DECLARED
 /* 50 */
 EXTERN void		Tk_DeleteEventHandler(Tk_Window token,
 				unsigned long mask, Tk_EventProc *proc,
 				ClientData clientData);
-#endif
-#ifndef Tk_DeleteGenericHandler_TCL_DECLARED
-#define Tk_DeleteGenericHandler_TCL_DECLARED
 /* 51 */
 EXTERN void		Tk_DeleteGenericHandler(Tk_GenericProc *proc,
 				ClientData clientData);
-#endif
-#ifndef Tk_DeleteImage_TCL_DECLARED
-#define Tk_DeleteImage_TCL_DECLARED
 /* 52 */
-EXTERN void		Tk_DeleteImage(Tcl_Interp *interp, CONST char *name);
-#endif
-#ifndef Tk_DeleteSelHandler_TCL_DECLARED
-#define Tk_DeleteSelHandler_TCL_DECLARED
+EXTERN void		Tk_DeleteImage(Tcl_Interp *interp, const char *name);
 /* 53 */
 EXTERN void		Tk_DeleteSelHandler(Tk_Window tkwin, Atom selection,
 				Atom target);
-#endif
-#ifndef Tk_DestroyWindow_TCL_DECLARED
-#define Tk_DestroyWindow_TCL_DECLARED
 /* 54 */
 EXTERN void		Tk_DestroyWindow(Tk_Window tkwin);
-#endif
-#ifndef Tk_DisplayName_TCL_DECLARED
-#define Tk_DisplayName_TCL_DECLARED
 /* 55 */
 EXTERN CONST84_RETURN char * Tk_DisplayName(Tk_Window tkwin);
-#endif
-#ifndef Tk_DistanceToTextLayout_TCL_DECLARED
-#define Tk_DistanceToTextLayout_TCL_DECLARED
 /* 56 */
 EXTERN int		Tk_DistanceToTextLayout(Tk_TextLayout layout, int x,
 				int y);
-#endif
-#ifndef Tk_Draw3DPolygon_TCL_DECLARED
-#define Tk_Draw3DPolygon_TCL_DECLARED
 /* 57 */
 EXTERN void		Tk_Draw3DPolygon(Tk_Window tkwin, Drawable drawable,
 				Tk_3DBorder border, XPoint *pointPtr,
 				int numPoints, int borderWidth,
 				int leftRelief);
-#endif
-#ifndef Tk_Draw3DRectangle_TCL_DECLARED
-#define Tk_Draw3DRectangle_TCL_DECLARED
 /* 58 */
 EXTERN void		Tk_Draw3DRectangle(Tk_Window tkwin,
 				Drawable drawable, Tk_3DBorder border, int x,
 				int y, int width, int height,
 				int borderWidth, int relief);
-#endif
-#ifndef Tk_DrawChars_TCL_DECLARED
-#define Tk_DrawChars_TCL_DECLARED
 /* 59 */
 EXTERN void		Tk_DrawChars(Display *display, Drawable drawable,
-				GC gc, Tk_Font tkfont, CONST char *source,
+				GC gc, Tk_Font tkfont, const char *source,
 				int numBytes, int x, int y);
-#endif
-#ifndef Tk_DrawFocusHighlight_TCL_DECLARED
-#define Tk_DrawFocusHighlight_TCL_DECLARED
 /* 60 */
 EXTERN void		Tk_DrawFocusHighlight(Tk_Window tkwin, GC gc,
 				int width, Drawable drawable);
-#endif
-#ifndef Tk_DrawTextLayout_TCL_DECLARED
-#define Tk_DrawTextLayout_TCL_DECLARED
 /* 61 */
 EXTERN void		Tk_DrawTextLayout(Display *display,
 				Drawable drawable, GC gc,
 				Tk_TextLayout layout, int x, int y,
 				int firstChar, int lastChar);
-#endif
-#ifndef Tk_Fill3DPolygon_TCL_DECLARED
-#define Tk_Fill3DPolygon_TCL_DECLARED
 /* 62 */
 EXTERN void		Tk_Fill3DPolygon(Tk_Window tkwin, Drawable drawable,
 				Tk_3DBorder border, XPoint *pointPtr,
 				int numPoints, int borderWidth,
 				int leftRelief);
-#endif
-#ifndef Tk_Fill3DRectangle_TCL_DECLARED
-#define Tk_Fill3DRectangle_TCL_DECLARED
 /* 63 */
 EXTERN void		Tk_Fill3DRectangle(Tk_Window tkwin,
 				Drawable drawable, Tk_3DBorder border, int x,
 				int y, int width, int height,
 				int borderWidth, int relief);
-#endif
-#ifndef Tk_FindPhoto_TCL_DECLARED
-#define Tk_FindPhoto_TCL_DECLARED
 /* 64 */
 EXTERN Tk_PhotoHandle	Tk_FindPhoto(Tcl_Interp *interp,
-				CONST char *imageName);
-#endif
-#ifndef Tk_FontId_TCL_DECLARED
-#define Tk_FontId_TCL_DECLARED
+				const char *imageName);
 /* 65 */
 EXTERN Font		Tk_FontId(Tk_Font font);
-#endif
-#ifndef Tk_Free3DBorder_TCL_DECLARED
-#define Tk_Free3DBorder_TCL_DECLARED
 /* 66 */
 EXTERN void		Tk_Free3DBorder(Tk_3DBorder border);
-#endif
-#ifndef Tk_FreeBitmap_TCL_DECLARED
-#define Tk_FreeBitmap_TCL_DECLARED
 /* 67 */
 EXTERN void		Tk_FreeBitmap(Display *display, Pixmap bitmap);
-#endif
-#ifndef Tk_FreeColor_TCL_DECLARED
-#define Tk_FreeColor_TCL_DECLARED
 /* 68 */
 EXTERN void		Tk_FreeColor(XColor *colorPtr);
-#endif
-#ifndef Tk_FreeColormap_TCL_DECLARED
-#define Tk_FreeColormap_TCL_DECLARED
 /* 69 */
 EXTERN void		Tk_FreeColormap(Display *display, Colormap colormap);
-#endif
-#ifndef Tk_FreeCursor_TCL_DECLARED
-#define Tk_FreeCursor_TCL_DECLARED
 /* 70 */
 EXTERN void		Tk_FreeCursor(Display *display, Tk_Cursor cursor);
-#endif
-#ifndef Tk_FreeFont_TCL_DECLARED
-#define Tk_FreeFont_TCL_DECLARED
 /* 71 */
 EXTERN void		Tk_FreeFont(Tk_Font f);
-#endif
-#ifndef Tk_FreeGC_TCL_DECLARED
-#define Tk_FreeGC_TCL_DECLARED
 /* 72 */
 EXTERN void		Tk_FreeGC(Display *display, GC gc);
-#endif
-#ifndef Tk_FreeImage_TCL_DECLARED
-#define Tk_FreeImage_TCL_DECLARED
 /* 73 */
 EXTERN void		Tk_FreeImage(Tk_Image image);
-#endif
-#ifndef Tk_FreeOptions_TCL_DECLARED
-#define Tk_FreeOptions_TCL_DECLARED
 /* 74 */
 EXTERN void		Tk_FreeOptions(Tk_ConfigSpec *specs, char *widgRec,
 				Display *display, int needFlags);
-#endif
-#ifndef Tk_FreePixmap_TCL_DECLARED
-#define Tk_FreePixmap_TCL_DECLARED
 /* 75 */
 EXTERN void		Tk_FreePixmap(Display *display, Pixmap pixmap);
-#endif
-#ifndef Tk_FreeTextLayout_TCL_DECLARED
-#define Tk_FreeTextLayout_TCL_DECLARED
 /* 76 */
 EXTERN void		Tk_FreeTextLayout(Tk_TextLayout textLayout);
-#endif
-#ifndef Tk_FreeXId_TCL_DECLARED
-#define Tk_FreeXId_TCL_DECLARED
 /* 77 */
 EXTERN void		Tk_FreeXId(Display *display, XID xid);
-#endif
-#ifndef Tk_GCForColor_TCL_DECLARED
-#define Tk_GCForColor_TCL_DECLARED
 /* 78 */
 EXTERN GC		Tk_GCForColor(XColor *colorPtr, Drawable drawable);
-#endif
-#ifndef Tk_GeometryRequest_TCL_DECLARED
-#define Tk_GeometryRequest_TCL_DECLARED
 /* 79 */
 EXTERN void		Tk_GeometryRequest(Tk_Window tkwin, int reqWidth,
 				int reqHeight);
-#endif
-#ifndef Tk_Get3DBorder_TCL_DECLARED
-#define Tk_Get3DBorder_TCL_DECLARED
 /* 80 */
 EXTERN Tk_3DBorder	Tk_Get3DBorder(Tcl_Interp *interp, Tk_Window tkwin,
 				Tk_Uid colorName);
-#endif
-#ifndef Tk_GetAllBindings_TCL_DECLARED
-#define Tk_GetAllBindings_TCL_DECLARED
 /* 81 */
 EXTERN void		Tk_GetAllBindings(Tcl_Interp *interp,
 				Tk_BindingTable bindingTable,
 				ClientData object);
-#endif
-#ifndef Tk_GetAnchor_TCL_DECLARED
-#define Tk_GetAnchor_TCL_DECLARED
 /* 82 */
-EXTERN int		Tk_GetAnchor(Tcl_Interp *interp, CONST char *str,
+EXTERN int		Tk_GetAnchor(Tcl_Interp *interp, const char *str,
 				Tk_Anchor *anchorPtr);
-#endif
-#ifndef Tk_GetAtomName_TCL_DECLARED
-#define Tk_GetAtomName_TCL_DECLARED
 /* 83 */
 EXTERN CONST84_RETURN char * Tk_GetAtomName(Tk_Window tkwin, Atom atom);
-#endif
-#ifndef Tk_GetBinding_TCL_DECLARED
-#define Tk_GetBinding_TCL_DECLARED
 /* 84 */
 EXTERN CONST84_RETURN char * Tk_GetBinding(Tcl_Interp *interp,
 				Tk_BindingTable bindingTable,
-				ClientData object, CONST char *eventStr);
-#endif
-#ifndef Tk_GetBitmap_TCL_DECLARED
-#define Tk_GetBitmap_TCL_DECLARED
+				ClientData object, const char *eventStr);
 /* 85 */
 EXTERN Pixmap		Tk_GetBitmap(Tcl_Interp *interp, Tk_Window tkwin,
-				CONST char *str);
-#endif
-#ifndef Tk_GetBitmapFromData_TCL_DECLARED
-#define Tk_GetBitmapFromData_TCL_DECLARED
+				const char *str);
 /* 86 */
 EXTERN Pixmap		Tk_GetBitmapFromData(Tcl_Interp *interp,
-				Tk_Window tkwin, CONST char *source,
+				Tk_Window tkwin, const char *source,
 				int width, int height);
-#endif
-#ifndef Tk_GetCapStyle_TCL_DECLARED
-#define Tk_GetCapStyle_TCL_DECLARED
 /* 87 */
-EXTERN int		Tk_GetCapStyle(Tcl_Interp *interp, CONST char *str,
+EXTERN int		Tk_GetCapStyle(Tcl_Interp *interp, const char *str,
 				int *capPtr);
-#endif
-#ifndef Tk_GetColor_TCL_DECLARED
-#define Tk_GetColor_TCL_DECLARED
 /* 88 */
 EXTERN XColor *		Tk_GetColor(Tcl_Interp *interp, Tk_Window tkwin,
 				Tk_Uid name);
-#endif
-#ifndef Tk_GetColorByValue_TCL_DECLARED
-#define Tk_GetColorByValue_TCL_DECLARED
 /* 89 */
 EXTERN XColor *		Tk_GetColorByValue(Tk_Window tkwin, XColor *colorPtr);
-#endif
-#ifndef Tk_GetColormap_TCL_DECLARED
-#define Tk_GetColormap_TCL_DECLARED
 /* 90 */
 EXTERN Colormap		Tk_GetColormap(Tcl_Interp *interp, Tk_Window tkwin,
-				CONST char *str);
-#endif
-#ifndef Tk_GetCursor_TCL_DECLARED
-#define Tk_GetCursor_TCL_DECLARED
+				const char *str);
 /* 91 */
 EXTERN Tk_Cursor	Tk_GetCursor(Tcl_Interp *interp, Tk_Window tkwin,
 				Tk_Uid str);
-#endif
-#ifndef Tk_GetCursorFromData_TCL_DECLARED
-#define Tk_GetCursorFromData_TCL_DECLARED
 /* 92 */
 EXTERN Tk_Cursor	Tk_GetCursorFromData(Tcl_Interp *interp,
-				Tk_Window tkwin, CONST char *source,
-				CONST char *mask, int width, int height,
+				Tk_Window tkwin, const char *source,
+				const char *mask, int width, int height,
 				int xHot, int yHot, Tk_Uid fg, Tk_Uid bg);
-#endif
-#ifndef Tk_GetFont_TCL_DECLARED
-#define Tk_GetFont_TCL_DECLARED
 /* 93 */
 EXTERN Tk_Font		Tk_GetFont(Tcl_Interp *interp, Tk_Window tkwin,
-				CONST char *str);
-#endif
-#ifndef Tk_GetFontFromObj_TCL_DECLARED
-#define Tk_GetFontFromObj_TCL_DECLARED
+				const char *str);
 /* 94 */
 EXTERN Tk_Font		Tk_GetFontFromObj(Tk_Window tkwin, Tcl_Obj *objPtr);
-#endif
-#ifndef Tk_GetFontMetrics_TCL_DECLARED
-#define Tk_GetFontMetrics_TCL_DECLARED
 /* 95 */
 EXTERN void		Tk_GetFontMetrics(Tk_Font font,
 				Tk_FontMetrics *fmPtr);
-#endif
-#ifndef Tk_GetGC_TCL_DECLARED
-#define Tk_GetGC_TCL_DECLARED
 /* 96 */
 EXTERN GC		Tk_GetGC(Tk_Window tkwin, unsigned long valueMask,
 				XGCValues *valuePtr);
-#endif
-#ifndef Tk_GetImage_TCL_DECLARED
-#define Tk_GetImage_TCL_DECLARED
 /* 97 */
 EXTERN Tk_Image		Tk_GetImage(Tcl_Interp *interp, Tk_Window tkwin,
-				CONST char *name,
+				const char *name,
 				Tk_ImageChangedProc *changeProc,
 				ClientData clientData);
-#endif
-#ifndef Tk_GetImageMasterData_TCL_DECLARED
-#define Tk_GetImageMasterData_TCL_DECLARED
 /* 98 */
 EXTERN ClientData	Tk_GetImageMasterData(Tcl_Interp *interp,
-				CONST char *name, Tk_ImageType **typePtrPtr);
-#endif
-#ifndef Tk_GetItemTypes_TCL_DECLARED
-#define Tk_GetItemTypes_TCL_DECLARED
+				const char *name, Tk_ImageType **typePtrPtr);
 /* 99 */
 EXTERN Tk_ItemType *	Tk_GetItemTypes(void);
-#endif
-#ifndef Tk_GetJoinStyle_TCL_DECLARED
-#define Tk_GetJoinStyle_TCL_DECLARED
 /* 100 */
-EXTERN int		Tk_GetJoinStyle(Tcl_Interp *interp, CONST char *str,
+EXTERN int		Tk_GetJoinStyle(Tcl_Interp *interp, const char *str,
 				int *joinPtr);
-#endif
-#ifndef Tk_GetJustify_TCL_DECLARED
-#define Tk_GetJustify_TCL_DECLARED
 /* 101 */
-EXTERN int		Tk_GetJustify(Tcl_Interp *interp, CONST char *str,
+EXTERN int		Tk_GetJustify(Tcl_Interp *interp, const char *str,
 				Tk_Justify *justifyPtr);
-#endif
-#ifndef Tk_GetNumMainWindows_TCL_DECLARED
-#define Tk_GetNumMainWindows_TCL_DECLARED
 /* 102 */
 EXTERN int		Tk_GetNumMainWindows(void);
-#endif
-#ifndef Tk_GetOption_TCL_DECLARED
-#define Tk_GetOption_TCL_DECLARED
 /* 103 */
-EXTERN Tk_Uid		Tk_GetOption(Tk_Window tkwin, CONST char *name,
-				CONST char *className);
-#endif
-#ifndef Tk_GetPixels_TCL_DECLARED
-#define Tk_GetPixels_TCL_DECLARED
+EXTERN Tk_Uid		Tk_GetOption(Tk_Window tkwin, const char *name,
+				const char *className);
 /* 104 */
 EXTERN int		Tk_GetPixels(Tcl_Interp *interp, Tk_Window tkwin,
-				CONST char *str, int *intPtr);
-#endif
-#ifndef Tk_GetPixmap_TCL_DECLARED
-#define Tk_GetPixmap_TCL_DECLARED
+				const char *str, int *intPtr);
 /* 105 */
 EXTERN Pixmap		Tk_GetPixmap(Display *display, Drawable d, int width,
 				int height, int depth);
-#endif
-#ifndef Tk_GetRelief_TCL_DECLARED
-#define Tk_GetRelief_TCL_DECLARED
 /* 106 */
-EXTERN int		Tk_GetRelief(Tcl_Interp *interp, CONST char *name,
+EXTERN int		Tk_GetRelief(Tcl_Interp *interp, const char *name,
 				int *reliefPtr);
-#endif
-#ifndef Tk_GetRootCoords_TCL_DECLARED
-#define Tk_GetRootCoords_TCL_DECLARED
 /* 107 */
 EXTERN void		Tk_GetRootCoords(Tk_Window tkwin, int *xPtr,
 				int *yPtr);
-#endif
-#ifndef Tk_GetScrollInfo_TCL_DECLARED
-#define Tk_GetScrollInfo_TCL_DECLARED
 /* 108 */
 EXTERN int		Tk_GetScrollInfo(Tcl_Interp *interp, int argc,
 				CONST84 char **argv, double *dblPtr,
 				int *intPtr);
-#endif
-#ifndef Tk_GetScreenMM_TCL_DECLARED
-#define Tk_GetScreenMM_TCL_DECLARED
 /* 109 */
 EXTERN int		Tk_GetScreenMM(Tcl_Interp *interp, Tk_Window tkwin,
-				CONST char *str, double *doublePtr);
-#endif
-#ifndef Tk_GetSelection_TCL_DECLARED
-#define Tk_GetSelection_TCL_DECLARED
+				const char *str, double *doublePtr);
 /* 110 */
 EXTERN int		Tk_GetSelection(Tcl_Interp *interp, Tk_Window tkwin,
 				Atom selection, Atom target,
 				Tk_GetSelProc *proc, ClientData clientData);
-#endif
-#ifndef Tk_GetUid_TCL_DECLARED
-#define Tk_GetUid_TCL_DECLARED
 /* 111 */
-EXTERN Tk_Uid		Tk_GetUid(CONST char *str);
-#endif
-#ifndef Tk_GetVisual_TCL_DECLARED
-#define Tk_GetVisual_TCL_DECLARED
+EXTERN Tk_Uid		Tk_GetUid(const char *str);
 /* 112 */
 EXTERN Visual *		Tk_GetVisual(Tcl_Interp *interp, Tk_Window tkwin,
-				CONST char *str, int *depthPtr,
+				const char *str, int *depthPtr,
 				Colormap *colormapPtr);
-#endif
-#ifndef Tk_GetVRootGeometry_TCL_DECLARED
-#define Tk_GetVRootGeometry_TCL_DECLARED
 /* 113 */
 EXTERN void		Tk_GetVRootGeometry(Tk_Window tkwin, int *xPtr,
 				int *yPtr, int *widthPtr, int *heightPtr);
-#endif
-#ifndef Tk_Grab_TCL_DECLARED
-#define Tk_Grab_TCL_DECLARED
 /* 114 */
 EXTERN int		Tk_Grab(Tcl_Interp *interp, Tk_Window tkwin,
 				int grabGlobal);
-#endif
-#ifndef Tk_HandleEvent_TCL_DECLARED
-#define Tk_HandleEvent_TCL_DECLARED
 /* 115 */
 EXTERN void		Tk_HandleEvent(XEvent *eventPtr);
-#endif
-#ifndef Tk_IdToWindow_TCL_DECLARED
-#define Tk_IdToWindow_TCL_DECLARED
 /* 116 */
 EXTERN Tk_Window	Tk_IdToWindow(Display *display, Window window);
-#endif
-#ifndef Tk_ImageChanged_TCL_DECLARED
-#define Tk_ImageChanged_TCL_DECLARED
 /* 117 */
 EXTERN void		Tk_ImageChanged(Tk_ImageMaster master, int x, int y,
 				int width, int height, int imageWidth,
 				int imageHeight);
-#endif
-#ifndef Tk_Init_TCL_DECLARED
-#define Tk_Init_TCL_DECLARED
 /* 118 */
 EXTERN int		Tk_Init(Tcl_Interp *interp);
-#endif
-#ifndef Tk_InternAtom_TCL_DECLARED
-#define Tk_InternAtom_TCL_DECLARED
 /* 119 */
-EXTERN Atom		Tk_InternAtom(Tk_Window tkwin, CONST char *name);
-#endif
-#ifndef Tk_IntersectTextLayout_TCL_DECLARED
-#define Tk_IntersectTextLayout_TCL_DECLARED
+EXTERN Atom		Tk_InternAtom(Tk_Window tkwin, const char *name);
 /* 120 */
 EXTERN int		Tk_IntersectTextLayout(Tk_TextLayout layout, int x,
 				int y, int width, int height);
-#endif
-#ifndef Tk_MaintainGeometry_TCL_DECLARED
-#define Tk_MaintainGeometry_TCL_DECLARED
 /* 121 */
 EXTERN void		Tk_MaintainGeometry(Tk_Window slave,
 				Tk_Window master, int x, int y, int width,
 				int height);
-#endif
-#ifndef Tk_MainWindow_TCL_DECLARED
-#define Tk_MainWindow_TCL_DECLARED
 /* 122 */
 EXTERN Tk_Window	Tk_MainWindow(Tcl_Interp *interp);
-#endif
-#ifndef Tk_MakeWindowExist_TCL_DECLARED
-#define Tk_MakeWindowExist_TCL_DECLARED
 /* 123 */
 EXTERN void		Tk_MakeWindowExist(Tk_Window tkwin);
-#endif
-#ifndef Tk_ManageGeometry_TCL_DECLARED
-#define Tk_ManageGeometry_TCL_DECLARED
 /* 124 */
 EXTERN void		Tk_ManageGeometry(Tk_Window tkwin,
-				CONST Tk_GeomMgr *mgrPtr,
+				const Tk_GeomMgr *mgrPtr,
 				ClientData clientData);
-#endif
-#ifndef Tk_MapWindow_TCL_DECLARED
-#define Tk_MapWindow_TCL_DECLARED
 /* 125 */
 EXTERN void		Tk_MapWindow(Tk_Window tkwin);
-#endif
-#ifndef Tk_MeasureChars_TCL_DECLARED
-#define Tk_MeasureChars_TCL_DECLARED
 /* 126 */
-EXTERN int		Tk_MeasureChars(Tk_Font tkfont, CONST char *source,
+EXTERN int		Tk_MeasureChars(Tk_Font tkfont, const char *source,
 				int numBytes, int maxPixels, int flags,
 				int *lengthPtr);
-#endif
-#ifndef Tk_MoveResizeWindow_TCL_DECLARED
-#define Tk_MoveResizeWindow_TCL_DECLARED
 /* 127 */
 EXTERN void		Tk_MoveResizeWindow(Tk_Window tkwin, int x, int y,
 				int width, int height);
-#endif
-#ifndef Tk_MoveWindow_TCL_DECLARED
-#define Tk_MoveWindow_TCL_DECLARED
 /* 128 */
 EXTERN void		Tk_MoveWindow(Tk_Window tkwin, int x, int y);
-#endif
-#ifndef Tk_MoveToplevelWindow_TCL_DECLARED
-#define Tk_MoveToplevelWindow_TCL_DECLARED
 /* 129 */
 EXTERN void		Tk_MoveToplevelWindow(Tk_Window tkwin, int x, int y);
-#endif
-#ifndef Tk_NameOf3DBorder_TCL_DECLARED
-#define Tk_NameOf3DBorder_TCL_DECLARED
 /* 130 */
 EXTERN CONST84_RETURN char * Tk_NameOf3DBorder(Tk_3DBorder border);
-#endif
-#ifndef Tk_NameOfAnchor_TCL_DECLARED
-#define Tk_NameOfAnchor_TCL_DECLARED
 /* 131 */
 EXTERN CONST84_RETURN char * Tk_NameOfAnchor(Tk_Anchor anchor);
-#endif
-#ifndef Tk_NameOfBitmap_TCL_DECLARED
-#define Tk_NameOfBitmap_TCL_DECLARED
 /* 132 */
 EXTERN CONST84_RETURN char * Tk_NameOfBitmap(Display *display, Pixmap bitmap);
-#endif
-#ifndef Tk_NameOfCapStyle_TCL_DECLARED
-#define Tk_NameOfCapStyle_TCL_DECLARED
 /* 133 */
 EXTERN CONST84_RETURN char * Tk_NameOfCapStyle(int cap);
-#endif
-#ifndef Tk_NameOfColor_TCL_DECLARED
-#define Tk_NameOfColor_TCL_DECLARED
 /* 134 */
 EXTERN CONST84_RETURN char * Tk_NameOfColor(XColor *colorPtr);
-#endif
-#ifndef Tk_NameOfCursor_TCL_DECLARED
-#define Tk_NameOfCursor_TCL_DECLARED
 /* 135 */
 EXTERN CONST84_RETURN char * Tk_NameOfCursor(Display *display,
 				Tk_Cursor cursor);
-#endif
-#ifndef Tk_NameOfFont_TCL_DECLARED
-#define Tk_NameOfFont_TCL_DECLARED
 /* 136 */
 EXTERN CONST84_RETURN char * Tk_NameOfFont(Tk_Font font);
-#endif
-#ifndef Tk_NameOfImage_TCL_DECLARED
-#define Tk_NameOfImage_TCL_DECLARED
 /* 137 */
 EXTERN CONST84_RETURN char * Tk_NameOfImage(Tk_ImageMaster imageMaster);
-#endif
-#ifndef Tk_NameOfJoinStyle_TCL_DECLARED
-#define Tk_NameOfJoinStyle_TCL_DECLARED
 /* 138 */
 EXTERN CONST84_RETURN char * Tk_NameOfJoinStyle(int join);
-#endif
-#ifndef Tk_NameOfJustify_TCL_DECLARED
-#define Tk_NameOfJustify_TCL_DECLARED
 /* 139 */
 EXTERN CONST84_RETURN char * Tk_NameOfJustify(Tk_Justify justify);
-#endif
-#ifndef Tk_NameOfRelief_TCL_DECLARED
-#define Tk_NameOfRelief_TCL_DECLARED
 /* 140 */
 EXTERN CONST84_RETURN char * Tk_NameOfRelief(int relief);
-#endif
-#ifndef Tk_NameToWindow_TCL_DECLARED
-#define Tk_NameToWindow_TCL_DECLARED
 /* 141 */
 EXTERN Tk_Window	Tk_NameToWindow(Tcl_Interp *interp,
-				CONST char *pathName, Tk_Window tkwin);
-#endif
-#ifndef Tk_OwnSelection_TCL_DECLARED
-#define Tk_OwnSelection_TCL_DECLARED
+				const char *pathName, Tk_Window tkwin);
 /* 142 */
 EXTERN void		Tk_OwnSelection(Tk_Window tkwin, Atom selection,
 				Tk_LostSelProc *proc, ClientData clientData);
-#endif
-#ifndef Tk_ParseArgv_TCL_DECLARED
-#define Tk_ParseArgv_TCL_DECLARED
 /* 143 */
 EXTERN int		Tk_ParseArgv(Tcl_Interp *interp, Tk_Window tkwin,
 				int *argcPtr, CONST84 char **argv,
 				Tk_ArgvInfo *argTable, int flags);
-#endif
-#ifndef Tk_PhotoPutBlock_NoComposite_TCL_DECLARED
-#define Tk_PhotoPutBlock_NoComposite_TCL_DECLARED
 /* 144 */
 EXTERN void		Tk_PhotoPutBlock_NoComposite(Tk_PhotoHandle handle,
 				Tk_PhotoImageBlock *blockPtr, int x, int y,
 				int width, int height);
-#endif
-#ifndef Tk_PhotoPutZoomedBlock_NoComposite_TCL_DECLARED
-#define Tk_PhotoPutZoomedBlock_NoComposite_TCL_DECLARED
 /* 145 */
 EXTERN 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);
-#endif
-#ifndef Tk_PhotoGetImage_TCL_DECLARED
-#define Tk_PhotoGetImage_TCL_DECLARED
 /* 146 */
 EXTERN int		Tk_PhotoGetImage(Tk_PhotoHandle handle,
 				Tk_PhotoImageBlock *blockPtr);
-#endif
-#ifndef Tk_PhotoBlank_TCL_DECLARED
-#define Tk_PhotoBlank_TCL_DECLARED
 /* 147 */
 EXTERN void		Tk_PhotoBlank(Tk_PhotoHandle handle);
-#endif
-#ifndef Tk_PhotoExpand_Panic_TCL_DECLARED
-#define Tk_PhotoExpand_Panic_TCL_DECLARED
 /* 148 */
 EXTERN void		Tk_PhotoExpand_Panic(Tk_PhotoHandle handle,
 				int width, int height);
-#endif
-#ifndef Tk_PhotoGetSize_TCL_DECLARED
-#define Tk_PhotoGetSize_TCL_DECLARED
 /* 149 */
 EXTERN void		Tk_PhotoGetSize(Tk_PhotoHandle handle, int *widthPtr,
 				int *heightPtr);
-#endif
-#ifndef Tk_PhotoSetSize_Panic_TCL_DECLARED
-#define Tk_PhotoSetSize_Panic_TCL_DECLARED
 /* 150 */
 EXTERN void		Tk_PhotoSetSize_Panic(Tk_PhotoHandle handle,
 				int width, int height);
-#endif
-#ifndef Tk_PointToChar_TCL_DECLARED
-#define Tk_PointToChar_TCL_DECLARED
 /* 151 */
 EXTERN int		Tk_PointToChar(Tk_TextLayout layout, int x, int y);
-#endif
-#ifndef Tk_PostscriptFontName_TCL_DECLARED
-#define Tk_PostscriptFontName_TCL_DECLARED
 /* 152 */
 EXTERN int		Tk_PostscriptFontName(Tk_Font tkfont,
 				Tcl_DString *dsPtr);
-#endif
-#ifndef Tk_PreserveColormap_TCL_DECLARED
-#define Tk_PreserveColormap_TCL_DECLARED
 /* 153 */
 EXTERN void		Tk_PreserveColormap(Display *display,
 				Colormap colormap);
-#endif
-#ifndef Tk_QueueWindowEvent_TCL_DECLARED
-#define Tk_QueueWindowEvent_TCL_DECLARED
 /* 154 */
 EXTERN void		Tk_QueueWindowEvent(XEvent *eventPtr,
 				Tcl_QueuePosition position);
-#endif
-#ifndef Tk_RedrawImage_TCL_DECLARED
-#define Tk_RedrawImage_TCL_DECLARED
 /* 155 */
 EXTERN void		Tk_RedrawImage(Tk_Image image, int imageX,
 				int imageY, int width, int height,
 				Drawable drawable, int drawableX,
 				int drawableY);
-#endif
-#ifndef Tk_ResizeWindow_TCL_DECLARED
-#define Tk_ResizeWindow_TCL_DECLARED
 /* 156 */
 EXTERN void		Tk_ResizeWindow(Tk_Window tkwin, int width,
 				int height);
-#endif
-#ifndef Tk_RestackWindow_TCL_DECLARED
-#define Tk_RestackWindow_TCL_DECLARED
 /* 157 */
 EXTERN int		Tk_RestackWindow(Tk_Window tkwin, int aboveBelow,
 				Tk_Window other);
-#endif
-#ifndef Tk_RestrictEvents_TCL_DECLARED
-#define Tk_RestrictEvents_TCL_DECLARED
 /* 158 */
 EXTERN Tk_RestrictProc * Tk_RestrictEvents(Tk_RestrictProc *proc,
 				ClientData arg, ClientData *prevArgPtr);
-#endif
-#ifndef Tk_SafeInit_TCL_DECLARED
-#define Tk_SafeInit_TCL_DECLARED
 /* 159 */
 EXTERN int		Tk_SafeInit(Tcl_Interp *interp);
-#endif
-#ifndef Tk_SetAppName_TCL_DECLARED
-#define Tk_SetAppName_TCL_DECLARED
 /* 160 */
-EXTERN CONST char *	Tk_SetAppName(Tk_Window tkwin, CONST char *name);
-#endif
-#ifndef Tk_SetBackgroundFromBorder_TCL_DECLARED
-#define Tk_SetBackgroundFromBorder_TCL_DECLARED
+EXTERN const char *	Tk_SetAppName(Tk_Window tkwin, const char *name);
 /* 161 */
 EXTERN void		Tk_SetBackgroundFromBorder(Tk_Window tkwin,
 				Tk_3DBorder border);
-#endif
-#ifndef Tk_SetClass_TCL_DECLARED
-#define Tk_SetClass_TCL_DECLARED
 /* 162 */
-EXTERN void		Tk_SetClass(Tk_Window tkwin, CONST char *className);
-#endif
-#ifndef Tk_SetGrid_TCL_DECLARED
-#define Tk_SetGrid_TCL_DECLARED
+EXTERN void		Tk_SetClass(Tk_Window tkwin, const char *className);
 /* 163 */
 EXTERN void		Tk_SetGrid(Tk_Window tkwin, int reqWidth,
 				int reqHeight, int gridWidth, int gridHeight);
-#endif
-#ifndef Tk_SetInternalBorder_TCL_DECLARED
-#define Tk_SetInternalBorder_TCL_DECLARED
 /* 164 */
 EXTERN void		Tk_SetInternalBorder(Tk_Window tkwin, int width);
-#endif
-#ifndef Tk_SetWindowBackground_TCL_DECLARED
-#define Tk_SetWindowBackground_TCL_DECLARED
 /* 165 */
 EXTERN void		Tk_SetWindowBackground(Tk_Window tkwin,
 				unsigned long pixel);
-#endif
-#ifndef Tk_SetWindowBackgroundPixmap_TCL_DECLARED
-#define Tk_SetWindowBackgroundPixmap_TCL_DECLARED
 /* 166 */
 EXTERN void		Tk_SetWindowBackgroundPixmap(Tk_Window tkwin,
 				Pixmap pixmap);
-#endif
-#ifndef Tk_SetWindowBorder_TCL_DECLARED
-#define Tk_SetWindowBorder_TCL_DECLARED
 /* 167 */
 EXTERN void		Tk_SetWindowBorder(Tk_Window tkwin,
 				unsigned long pixel);
-#endif
-#ifndef Tk_SetWindowBorderWidth_TCL_DECLARED
-#define Tk_SetWindowBorderWidth_TCL_DECLARED
 /* 168 */
 EXTERN void		Tk_SetWindowBorderWidth(Tk_Window tkwin, int width);
-#endif
-#ifndef Tk_SetWindowBorderPixmap_TCL_DECLARED
-#define Tk_SetWindowBorderPixmap_TCL_DECLARED
 /* 169 */
 EXTERN void		Tk_SetWindowBorderPixmap(Tk_Window tkwin,
 				Pixmap pixmap);
-#endif
-#ifndef Tk_SetWindowColormap_TCL_DECLARED
-#define Tk_SetWindowColormap_TCL_DECLARED
 /* 170 */
 EXTERN void		Tk_SetWindowColormap(Tk_Window tkwin,
 				Colormap colormap);
-#endif
-#ifndef Tk_SetWindowVisual_TCL_DECLARED
-#define Tk_SetWindowVisual_TCL_DECLARED
 /* 171 */
 EXTERN int		Tk_SetWindowVisual(Tk_Window tkwin, Visual *visual,
 				int depth, Colormap colormap);
-#endif
-#ifndef Tk_SizeOfBitmap_TCL_DECLARED
-#define Tk_SizeOfBitmap_TCL_DECLARED
 /* 172 */
 EXTERN void		Tk_SizeOfBitmap(Display *display, Pixmap bitmap,
 				int *widthPtr, int *heightPtr);
-#endif
-#ifndef Tk_SizeOfImage_TCL_DECLARED
-#define Tk_SizeOfImage_TCL_DECLARED
 /* 173 */
 EXTERN void		Tk_SizeOfImage(Tk_Image image, int *widthPtr,
 				int *heightPtr);
-#endif
-#ifndef Tk_StrictMotif_TCL_DECLARED
-#define Tk_StrictMotif_TCL_DECLARED
 /* 174 */
 EXTERN int		Tk_StrictMotif(Tk_Window tkwin);
-#endif
-#ifndef Tk_TextLayoutToPostscript_TCL_DECLARED
-#define Tk_TextLayoutToPostscript_TCL_DECLARED
 /* 175 */
 EXTERN void		Tk_TextLayoutToPostscript(Tcl_Interp *interp,
 				Tk_TextLayout layout);
-#endif
-#ifndef Tk_TextWidth_TCL_DECLARED
-#define Tk_TextWidth_TCL_DECLARED
 /* 176 */
-EXTERN int		Tk_TextWidth(Tk_Font font, CONST char *str,
+EXTERN int		Tk_TextWidth(Tk_Font font, const char *str,
 				int numBytes);
-#endif
-#ifndef Tk_UndefineCursor_TCL_DECLARED
-#define Tk_UndefineCursor_TCL_DECLARED
 /* 177 */
 EXTERN void		Tk_UndefineCursor(Tk_Window window);
-#endif
-#ifndef Tk_UnderlineChars_TCL_DECLARED
-#define Tk_UnderlineChars_TCL_DECLARED
 /* 178 */
 EXTERN void		Tk_UnderlineChars(Display *display,
 				Drawable drawable, GC gc, Tk_Font tkfont,
-				CONST char *source, int x, int y,
+				const char *source, int x, int y,
 				int firstByte, int lastByte);
-#endif
-#ifndef Tk_UnderlineTextLayout_TCL_DECLARED
-#define Tk_UnderlineTextLayout_TCL_DECLARED
 /* 179 */
 EXTERN void		Tk_UnderlineTextLayout(Display *display,
 				Drawable drawable, GC gc,
 				Tk_TextLayout layout, int x, int y,
 				int underline);
-#endif
-#ifndef Tk_Ungrab_TCL_DECLARED
-#define Tk_Ungrab_TCL_DECLARED
 /* 180 */
 EXTERN void		Tk_Ungrab(Tk_Window tkwin);
-#endif
-#ifndef Tk_UnmaintainGeometry_TCL_DECLARED
-#define Tk_UnmaintainGeometry_TCL_DECLARED
 /* 181 */
 EXTERN void		Tk_UnmaintainGeometry(Tk_Window slave,
 				Tk_Window master);
-#endif
-#ifndef Tk_UnmapWindow_TCL_DECLARED
-#define Tk_UnmapWindow_TCL_DECLARED
 /* 182 */
 EXTERN void		Tk_UnmapWindow(Tk_Window tkwin);
-#endif
-#ifndef Tk_UnsetGrid_TCL_DECLARED
-#define Tk_UnsetGrid_TCL_DECLARED
 /* 183 */
 EXTERN void		Tk_UnsetGrid(Tk_Window tkwin);
-#endif
-#ifndef Tk_UpdatePointer_TCL_DECLARED
-#define Tk_UpdatePointer_TCL_DECLARED
 /* 184 */
 EXTERN void		Tk_UpdatePointer(Tk_Window tkwin, int x, int y,
 				int state);
-#endif
-#ifndef Tk_AllocBitmapFromObj_TCL_DECLARED
-#define Tk_AllocBitmapFromObj_TCL_DECLARED
 /* 185 */
 EXTERN Pixmap		Tk_AllocBitmapFromObj(Tcl_Interp *interp,
 				Tk_Window tkwin, Tcl_Obj *objPtr);
-#endif
-#ifndef Tk_Alloc3DBorderFromObj_TCL_DECLARED
-#define Tk_Alloc3DBorderFromObj_TCL_DECLARED
 /* 186 */
 EXTERN Tk_3DBorder	Tk_Alloc3DBorderFromObj(Tcl_Interp *interp,
 				Tk_Window tkwin, Tcl_Obj *objPtr);
-#endif
-#ifndef Tk_AllocColorFromObj_TCL_DECLARED
-#define Tk_AllocColorFromObj_TCL_DECLARED
 /* 187 */
 EXTERN XColor *		Tk_AllocColorFromObj(Tcl_Interp *interp,
 				Tk_Window tkwin, Tcl_Obj *objPtr);
-#endif
-#ifndef Tk_AllocCursorFromObj_TCL_DECLARED
-#define Tk_AllocCursorFromObj_TCL_DECLARED
 /* 188 */
 EXTERN Tk_Cursor	Tk_AllocCursorFromObj(Tcl_Interp *interp,
 				Tk_Window tkwin, Tcl_Obj *objPtr);
-#endif
-#ifndef Tk_AllocFontFromObj_TCL_DECLARED
-#define Tk_AllocFontFromObj_TCL_DECLARED
 /* 189 */
 EXTERN Tk_Font		Tk_AllocFontFromObj(Tcl_Interp *interp,
 				Tk_Window tkwin, Tcl_Obj *objPtr);
-#endif
-#ifndef Tk_CreateOptionTable_TCL_DECLARED
-#define Tk_CreateOptionTable_TCL_DECLARED
 /* 190 */
 EXTERN Tk_OptionTable	Tk_CreateOptionTable(Tcl_Interp *interp,
-				CONST Tk_OptionSpec *templatePtr);
-#endif
-#ifndef Tk_DeleteOptionTable_TCL_DECLARED
-#define Tk_DeleteOptionTable_TCL_DECLARED
+				const Tk_OptionSpec *templatePtr);
 /* 191 */
 EXTERN void		Tk_DeleteOptionTable(Tk_OptionTable optionTable);
-#endif
-#ifndef Tk_Free3DBorderFromObj_TCL_DECLARED
-#define Tk_Free3DBorderFromObj_TCL_DECLARED
 /* 192 */
 EXTERN void		Tk_Free3DBorderFromObj(Tk_Window tkwin,
 				Tcl_Obj *objPtr);
-#endif
-#ifndef Tk_FreeBitmapFromObj_TCL_DECLARED
-#define Tk_FreeBitmapFromObj_TCL_DECLARED
 /* 193 */
 EXTERN void		Tk_FreeBitmapFromObj(Tk_Window tkwin,
 				Tcl_Obj *objPtr);
-#endif
-#ifndef Tk_FreeColorFromObj_TCL_DECLARED
-#define Tk_FreeColorFromObj_TCL_DECLARED
 /* 194 */
 EXTERN void		Tk_FreeColorFromObj(Tk_Window tkwin, Tcl_Obj *objPtr);
-#endif
-#ifndef Tk_FreeConfigOptions_TCL_DECLARED
-#define Tk_FreeConfigOptions_TCL_DECLARED
 /* 195 */
 EXTERN void		Tk_FreeConfigOptions(char *recordPtr,
 				Tk_OptionTable optionToken, Tk_Window tkwin);
-#endif
-#ifndef Tk_FreeSavedOptions_TCL_DECLARED
-#define Tk_FreeSavedOptions_TCL_DECLARED
 /* 196 */
 EXTERN void		Tk_FreeSavedOptions(Tk_SavedOptions *savePtr);
-#endif
-#ifndef Tk_FreeCursorFromObj_TCL_DECLARED
-#define Tk_FreeCursorFromObj_TCL_DECLARED
 /* 197 */
 EXTERN void		Tk_FreeCursorFromObj(Tk_Window tkwin,
 				Tcl_Obj *objPtr);
-#endif
-#ifndef Tk_FreeFontFromObj_TCL_DECLARED
-#define Tk_FreeFontFromObj_TCL_DECLARED
 /* 198 */
 EXTERN void		Tk_FreeFontFromObj(Tk_Window tkwin, Tcl_Obj *objPtr);
-#endif
-#ifndef Tk_Get3DBorderFromObj_TCL_DECLARED
-#define Tk_Get3DBorderFromObj_TCL_DECLARED
 /* 199 */
 EXTERN Tk_3DBorder	Tk_Get3DBorderFromObj(Tk_Window tkwin,
 				Tcl_Obj *objPtr);
-#endif
-#ifndef Tk_GetAnchorFromObj_TCL_DECLARED
-#define Tk_GetAnchorFromObj_TCL_DECLARED
 /* 200 */
 EXTERN int		Tk_GetAnchorFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, Tk_Anchor *anchorPtr);
-#endif
-#ifndef Tk_GetBitmapFromObj_TCL_DECLARED
-#define Tk_GetBitmapFromObj_TCL_DECLARED
 /* 201 */
 EXTERN Pixmap		Tk_GetBitmapFromObj(Tk_Window tkwin, Tcl_Obj *objPtr);
-#endif
-#ifndef Tk_GetColorFromObj_TCL_DECLARED
-#define Tk_GetColorFromObj_TCL_DECLARED
 /* 202 */
 EXTERN XColor *		Tk_GetColorFromObj(Tk_Window tkwin, Tcl_Obj *objPtr);
-#endif
-#ifndef Tk_GetCursorFromObj_TCL_DECLARED
-#define Tk_GetCursorFromObj_TCL_DECLARED
 /* 203 */
 EXTERN Tk_Cursor	Tk_GetCursorFromObj(Tk_Window tkwin, Tcl_Obj *objPtr);
-#endif
-#ifndef Tk_GetOptionInfo_TCL_DECLARED
-#define Tk_GetOptionInfo_TCL_DECLARED
 /* 204 */
 EXTERN Tcl_Obj *	Tk_GetOptionInfo(Tcl_Interp *interp, char *recordPtr,
 				Tk_OptionTable optionTable, Tcl_Obj *namePtr,
 				Tk_Window tkwin);
-#endif
-#ifndef Tk_GetOptionValue_TCL_DECLARED
-#define Tk_GetOptionValue_TCL_DECLARED
 /* 205 */
 EXTERN Tcl_Obj *	Tk_GetOptionValue(Tcl_Interp *interp,
 				char *recordPtr, Tk_OptionTable optionTable,
 				Tcl_Obj *namePtr, Tk_Window tkwin);
-#endif
-#ifndef Tk_GetJustifyFromObj_TCL_DECLARED
-#define Tk_GetJustifyFromObj_TCL_DECLARED
 /* 206 */
 EXTERN int		Tk_GetJustifyFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, Tk_Justify *justifyPtr);
-#endif
-#ifndef Tk_GetMMFromObj_TCL_DECLARED
-#define Tk_GetMMFromObj_TCL_DECLARED
 /* 207 */
 EXTERN int		Tk_GetMMFromObj(Tcl_Interp *interp, Tk_Window tkwin,
 				Tcl_Obj *objPtr, double *doublePtr);
-#endif
-#ifndef Tk_GetPixelsFromObj_TCL_DECLARED
-#define Tk_GetPixelsFromObj_TCL_DECLARED
 /* 208 */
 EXTERN int		Tk_GetPixelsFromObj(Tcl_Interp *interp,
 				Tk_Window tkwin, Tcl_Obj *objPtr,
 				int *intPtr);
-#endif
-#ifndef Tk_GetReliefFromObj_TCL_DECLARED
-#define Tk_GetReliefFromObj_TCL_DECLARED
 /* 209 */
 EXTERN int		Tk_GetReliefFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, int *resultPtr);
-#endif
-#ifndef Tk_GetScrollInfoObj_TCL_DECLARED
-#define Tk_GetScrollInfoObj_TCL_DECLARED
 /* 210 */
 EXTERN int		Tk_GetScrollInfoObj(Tcl_Interp *interp, int objc,
-				Tcl_Obj *CONST objv[], double *dblPtr,
+				Tcl_Obj *const objv[], double *dblPtr,
 				int *intPtr);
-#endif
-#ifndef Tk_InitOptions_TCL_DECLARED
-#define Tk_InitOptions_TCL_DECLARED
 /* 211 */
 EXTERN int		Tk_InitOptions(Tcl_Interp *interp, char *recordPtr,
 				Tk_OptionTable optionToken, Tk_Window tkwin);
-#endif
-#ifndef Tk_MainEx_TCL_DECLARED
-#define Tk_MainEx_TCL_DECLARED
 /* 212 */
 EXTERN void		Tk_MainEx(int argc, char **argv,
 				Tcl_AppInitProc *appInitProc,
 				Tcl_Interp *interp);
-#endif
-#ifndef Tk_RestoreSavedOptions_TCL_DECLARED
-#define Tk_RestoreSavedOptions_TCL_DECLARED
 /* 213 */
 EXTERN void		Tk_RestoreSavedOptions(Tk_SavedOptions *savePtr);
-#endif
-#ifndef Tk_SetOptions_TCL_DECLARED
-#define Tk_SetOptions_TCL_DECLARED
 /* 214 */
 EXTERN int		Tk_SetOptions(Tcl_Interp *interp, char *recordPtr,
 				Tk_OptionTable optionTable, int objc,
-				Tcl_Obj *CONST objv[], Tk_Window tkwin,
+				Tcl_Obj *const objv[], Tk_Window tkwin,
 				Tk_SavedOptions *savePtr, int *maskPtr);
-#endif
-#ifndef Tk_InitConsoleChannels_TCL_DECLARED
-#define Tk_InitConsoleChannels_TCL_DECLARED
 /* 215 */
 EXTERN void		Tk_InitConsoleChannels(Tcl_Interp *interp);
-#endif
-#ifndef Tk_CreateConsoleWindow_TCL_DECLARED
-#define Tk_CreateConsoleWindow_TCL_DECLARED
 /* 216 */
 EXTERN int		Tk_CreateConsoleWindow(Tcl_Interp *interp);
-#endif
-#ifndef Tk_CreateSmoothMethod_TCL_DECLARED
-#define Tk_CreateSmoothMethod_TCL_DECLARED
 /* 217 */
 EXTERN void		Tk_CreateSmoothMethod(Tcl_Interp *interp,
 				Tk_SmoothMethod *method);
-#endif
 /* Slot 218 is reserved */
 /* Slot 219 is reserved */
-#ifndef Tk_GetDash_TCL_DECLARED
-#define Tk_GetDash_TCL_DECLARED
 /* 220 */
-EXTERN int		Tk_GetDash(Tcl_Interp *interp, CONST char *value,
+EXTERN int		Tk_GetDash(Tcl_Interp *interp, const char *value,
 				Tk_Dash *dash);
-#endif
-#ifndef Tk_CreateOutline_TCL_DECLARED
-#define Tk_CreateOutline_TCL_DECLARED
 /* 221 */
 EXTERN void		Tk_CreateOutline(Tk_Outline *outline);
-#endif
-#ifndef Tk_DeleteOutline_TCL_DECLARED
-#define Tk_DeleteOutline_TCL_DECLARED
 /* 222 */
 EXTERN void		Tk_DeleteOutline(Display *display,
 				Tk_Outline *outline);
-#endif
-#ifndef Tk_ConfigOutlineGC_TCL_DECLARED
-#define Tk_ConfigOutlineGC_TCL_DECLARED
 /* 223 */
 EXTERN int		Tk_ConfigOutlineGC(XGCValues *gcValues,
 				Tk_Canvas canvas, Tk_Item *item,
 				Tk_Outline *outline);
-#endif
-#ifndef Tk_ChangeOutlineGC_TCL_DECLARED
-#define Tk_ChangeOutlineGC_TCL_DECLARED
 /* 224 */
 EXTERN int		Tk_ChangeOutlineGC(Tk_Canvas canvas, Tk_Item *item,
 				Tk_Outline *outline);
-#endif
-#ifndef Tk_ResetOutlineGC_TCL_DECLARED
-#define Tk_ResetOutlineGC_TCL_DECLARED
 /* 225 */
 EXTERN int		Tk_ResetOutlineGC(Tk_Canvas canvas, Tk_Item *item,
 				Tk_Outline *outline);
-#endif
-#ifndef Tk_CanvasPsOutline_TCL_DECLARED
-#define Tk_CanvasPsOutline_TCL_DECLARED
 /* 226 */
 EXTERN int		Tk_CanvasPsOutline(Tk_Canvas canvas, Tk_Item *item,
 				Tk_Outline *outline);
-#endif
-#ifndef Tk_SetTSOrigin_TCL_DECLARED
-#define Tk_SetTSOrigin_TCL_DECLARED
 /* 227 */
 EXTERN void		Tk_SetTSOrigin(Tk_Window tkwin, GC gc, int x, int y);
-#endif
-#ifndef Tk_CanvasGetCoordFromObj_TCL_DECLARED
-#define Tk_CanvasGetCoordFromObj_TCL_DECLARED
 /* 228 */
 EXTERN int		Tk_CanvasGetCoordFromObj(Tcl_Interp *interp,
 				Tk_Canvas canvas, Tcl_Obj *obj,
 				double *doublePtr);
-#endif
-#ifndef Tk_CanvasSetOffset_TCL_DECLARED
-#define Tk_CanvasSetOffset_TCL_DECLARED
 /* 229 */
 EXTERN void		Tk_CanvasSetOffset(Tk_Canvas canvas, GC gc,
 				Tk_TSOffset *offset);
-#endif
-#ifndef Tk_DitherPhoto_TCL_DECLARED
-#define Tk_DitherPhoto_TCL_DECLARED
 /* 230 */
 EXTERN void		Tk_DitherPhoto(Tk_PhotoHandle handle, int x, int y,
 				int width, int height);
-#endif
-#ifndef Tk_PostscriptBitmap_TCL_DECLARED
-#define Tk_PostscriptBitmap_TCL_DECLARED
 /* 231 */
 EXTERN int		Tk_PostscriptBitmap(Tcl_Interp *interp,
 				Tk_Window tkwin, Tk_PostscriptInfo psInfo,
 				Pixmap bitmap, int startX, int startY,
 				int width, int height);
-#endif
-#ifndef Tk_PostscriptColor_TCL_DECLARED
-#define Tk_PostscriptColor_TCL_DECLARED
 /* 232 */
 EXTERN int		Tk_PostscriptColor(Tcl_Interp *interp,
 				Tk_PostscriptInfo psInfo, XColor *colorPtr);
-#endif
-#ifndef Tk_PostscriptFont_TCL_DECLARED
-#define Tk_PostscriptFont_TCL_DECLARED
 /* 233 */
 EXTERN int		Tk_PostscriptFont(Tcl_Interp *interp,
 				Tk_PostscriptInfo psInfo, Tk_Font font);
-#endif
-#ifndef Tk_PostscriptImage_TCL_DECLARED
-#define Tk_PostscriptImage_TCL_DECLARED
 /* 234 */
 EXTERN int		Tk_PostscriptImage(Tk_Image image,
 				Tcl_Interp *interp, Tk_Window tkwin,
 				Tk_PostscriptInfo psinfo, int x, int y,
 				int width, int height, int prepass);
-#endif
-#ifndef Tk_PostscriptPath_TCL_DECLARED
-#define Tk_PostscriptPath_TCL_DECLARED
 /* 235 */
 EXTERN void		Tk_PostscriptPath(Tcl_Interp *interp,
 				Tk_PostscriptInfo psInfo, double *coordPtr,
 				int numPoints);
-#endif
-#ifndef Tk_PostscriptStipple_TCL_DECLARED
-#define Tk_PostscriptStipple_TCL_DECLARED
 /* 236 */
 EXTERN int		Tk_PostscriptStipple(Tcl_Interp *interp,
 				Tk_Window tkwin, Tk_PostscriptInfo psInfo,
 				Pixmap bitmap);
-#endif
-#ifndef Tk_PostscriptY_TCL_DECLARED
-#define Tk_PostscriptY_TCL_DECLARED
 /* 237 */
 EXTERN double		Tk_PostscriptY(double y, Tk_PostscriptInfo psInfo);
-#endif
-#ifndef Tk_PostscriptPhoto_TCL_DECLARED
-#define Tk_PostscriptPhoto_TCL_DECLARED
 /* 238 */
 EXTERN int		Tk_PostscriptPhoto(Tcl_Interp *interp,
 				Tk_PhotoImageBlock *blockPtr,
 				Tk_PostscriptInfo psInfo, int width,
 				int height);
-#endif
-#ifndef Tk_CreateClientMessageHandler_TCL_DECLARED
-#define Tk_CreateClientMessageHandler_TCL_DECLARED
 /* 239 */
 EXTERN void		Tk_CreateClientMessageHandler(
 				Tk_ClientMessageProc *proc);
-#endif
-#ifndef Tk_DeleteClientMessageHandler_TCL_DECLARED
-#define Tk_DeleteClientMessageHandler_TCL_DECLARED
 /* 240 */
 EXTERN void		Tk_DeleteClientMessageHandler(
 				Tk_ClientMessageProc *proc);
-#endif
-#ifndef Tk_CreateAnonymousWindow_TCL_DECLARED
-#define Tk_CreateAnonymousWindow_TCL_DECLARED
 /* 241 */
 EXTERN Tk_Window	Tk_CreateAnonymousWindow(Tcl_Interp *interp,
-				Tk_Window parent, CONST char *screenName);
-#endif
-#ifndef Tk_SetClassProcs_TCL_DECLARED
-#define Tk_SetClassProcs_TCL_DECLARED
+				Tk_Window parent, const char *screenName);
 /* 242 */
 EXTERN void		Tk_SetClassProcs(Tk_Window tkwin,
 				Tk_ClassProcs *procs,
 				ClientData instanceData);
-#endif
-#ifndef Tk_SetInternalBorderEx_TCL_DECLARED
-#define Tk_SetInternalBorderEx_TCL_DECLARED
 /* 243 */
 EXTERN void		Tk_SetInternalBorderEx(Tk_Window tkwin, int left,
 				int right, int top, int bottom);
-#endif
-#ifndef Tk_SetMinimumRequestSize_TCL_DECLARED
-#define Tk_SetMinimumRequestSize_TCL_DECLARED
 /* 244 */
 EXTERN void		Tk_SetMinimumRequestSize(Tk_Window tkwin,
 				int minWidth, int minHeight);
-#endif
-#ifndef Tk_SetCaretPos_TCL_DECLARED
-#define Tk_SetCaretPos_TCL_DECLARED
 /* 245 */
 EXTERN void		Tk_SetCaretPos(Tk_Window tkwin, int x, int y,
 				int height);
-#endif
-#ifndef Tk_PhotoPutBlock_Panic_TCL_DECLARED
-#define Tk_PhotoPutBlock_Panic_TCL_DECLARED
 /* 246 */
 EXTERN void		Tk_PhotoPutBlock_Panic(Tk_PhotoHandle handle,
 				Tk_PhotoImageBlock *blockPtr, int x, int y,
 				int width, int height, int compRule);
-#endif
-#ifndef Tk_PhotoPutZoomedBlock_Panic_TCL_DECLARED
-#define Tk_PhotoPutZoomedBlock_Panic_TCL_DECLARED
 /* 247 */
 EXTERN 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);
-#endif
-#ifndef Tk_CollapseMotionEvents_TCL_DECLARED
-#define Tk_CollapseMotionEvents_TCL_DECLARED
 /* 248 */
 EXTERN int		Tk_CollapseMotionEvents(Display *display,
 				int collapse);
-#endif
-#ifndef Tk_RegisterStyleEngine_TCL_DECLARED
-#define Tk_RegisterStyleEngine_TCL_DECLARED
 /* 249 */
-EXTERN Tk_StyleEngine	Tk_RegisterStyleEngine(CONST char *name,
+EXTERN Tk_StyleEngine	Tk_RegisterStyleEngine(const char *name,
 				Tk_StyleEngine parent);
-#endif
-#ifndef Tk_GetStyleEngine_TCL_DECLARED
-#define Tk_GetStyleEngine_TCL_DECLARED
 /* 250 */
-EXTERN Tk_StyleEngine	Tk_GetStyleEngine(CONST char *name);
-#endif
-#ifndef Tk_RegisterStyledElement_TCL_DECLARED
-#define Tk_RegisterStyledElement_TCL_DECLARED
+EXTERN Tk_StyleEngine	Tk_GetStyleEngine(const char *name);
 /* 251 */
 EXTERN int		Tk_RegisterStyledElement(Tk_StyleEngine engine,
 				Tk_ElementSpec *templatePtr);
-#endif
-#ifndef Tk_GetElementId_TCL_DECLARED
-#define Tk_GetElementId_TCL_DECLARED
 /* 252 */
-EXTERN int		Tk_GetElementId(CONST char *name);
-#endif
-#ifndef Tk_CreateStyle_TCL_DECLARED
-#define Tk_CreateStyle_TCL_DECLARED
+EXTERN int		Tk_GetElementId(const char *name);
 /* 253 */
-EXTERN Tk_Style		Tk_CreateStyle(CONST char *name,
+EXTERN Tk_Style		Tk_CreateStyle(const char *name,
 				Tk_StyleEngine engine, ClientData clientData);
-#endif
-#ifndef Tk_GetStyle_TCL_DECLARED
-#define Tk_GetStyle_TCL_DECLARED
 /* 254 */
-EXTERN Tk_Style		Tk_GetStyle(Tcl_Interp *interp, CONST char *name);
-#endif
-#ifndef Tk_FreeStyle_TCL_DECLARED
-#define Tk_FreeStyle_TCL_DECLARED
+EXTERN Tk_Style		Tk_GetStyle(Tcl_Interp *interp, const char *name);
 /* 255 */
 EXTERN void		Tk_FreeStyle(Tk_Style style);
-#endif
-#ifndef Tk_NameOfStyle_TCL_DECLARED
-#define Tk_NameOfStyle_TCL_DECLARED
 /* 256 */
-EXTERN CONST char *	Tk_NameOfStyle(Tk_Style style);
-#endif
-#ifndef Tk_AllocStyleFromObj_TCL_DECLARED
-#define Tk_AllocStyleFromObj_TCL_DECLARED
+EXTERN const char *	Tk_NameOfStyle(Tk_Style style);
 /* 257 */
 EXTERN Tk_Style		Tk_AllocStyleFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr);
-#endif
-#ifndef Tk_GetStyleFromObj_TCL_DECLARED
-#define Tk_GetStyleFromObj_TCL_DECLARED
 /* 258 */
 EXTERN Tk_Style		Tk_GetStyleFromObj(Tcl_Obj *objPtr);
-#endif
-#ifndef Tk_FreeStyleFromObj_TCL_DECLARED
-#define Tk_FreeStyleFromObj_TCL_DECLARED
 /* 259 */
 EXTERN void		Tk_FreeStyleFromObj(Tcl_Obj *objPtr);
-#endif
-#ifndef Tk_GetStyledElement_TCL_DECLARED
-#define Tk_GetStyledElement_TCL_DECLARED
 /* 260 */
 EXTERN Tk_StyledElement	 Tk_GetStyledElement(Tk_Style style, int elementId,
 				Tk_OptionTable optionTable);
-#endif
-#ifndef Tk_GetElementSize_TCL_DECLARED
-#define Tk_GetElementSize_TCL_DECLARED
 /* 261 */
 EXTERN void		Tk_GetElementSize(Tk_Style style,
 				Tk_StyledElement element, char *recordPtr,
 				Tk_Window tkwin, int width, int height,
 				int inner, int *widthPtr, int *heightPtr);
-#endif
-#ifndef Tk_GetElementBox_TCL_DECLARED
-#define Tk_GetElementBox_TCL_DECLARED
 /* 262 */
 EXTERN void		Tk_GetElementBox(Tk_Style style,
 				Tk_StyledElement element, char *recordPtr,
 				Tk_Window tkwin, int x, int y, int width,
 				int height, int inner, int *xPtr, int *yPtr,
 				int *widthPtr, int *heightPtr);
-#endif
-#ifndef Tk_GetElementBorderWidth_TCL_DECLARED
-#define Tk_GetElementBorderWidth_TCL_DECLARED
 /* 263 */
 EXTERN int		Tk_GetElementBorderWidth(Tk_Style style,
 				Tk_StyledElement element, char *recordPtr,
 				Tk_Window tkwin);
-#endif
-#ifndef Tk_DrawElement_TCL_DECLARED
-#define Tk_DrawElement_TCL_DECLARED
 /* 264 */
 EXTERN void		Tk_DrawElement(Tk_Style style,
 				Tk_StyledElement element, char *recordPtr,
 				Tk_Window tkwin, Drawable d, int x, int y,
 				int width, int height, int state);
-#endif
-#ifndef Tk_PhotoExpand_TCL_DECLARED
-#define Tk_PhotoExpand_TCL_DECLARED
 /* 265 */
 EXTERN int		Tk_PhotoExpand(Tcl_Interp *interp,
 				Tk_PhotoHandle handle, int width, int height);
-#endif
-#ifndef Tk_PhotoPutBlock_TCL_DECLARED
-#define Tk_PhotoPutBlock_TCL_DECLARED
 /* 266 */
 EXTERN int		Tk_PhotoPutBlock(Tcl_Interp *interp,
 				Tk_PhotoHandle handle,
 				Tk_PhotoImageBlock *blockPtr, int x, int y,
 				int width, int height, int compRule);
-#endif
-#ifndef Tk_PhotoPutZoomedBlock_TCL_DECLARED
-#define Tk_PhotoPutZoomedBlock_TCL_DECLARED
 /* 267 */
 EXTERN int		Tk_PhotoPutZoomedBlock(Tcl_Interp *interp,
 				Tk_PhotoHandle handle,
 				Tk_PhotoImageBlock *blockPtr, int x, int y,
 				int width, int height, int zoomX, int zoomY,
 				int subsampleX, int subsampleY, int compRule);
-#endif
-#ifndef Tk_PhotoSetSize_TCL_DECLARED
-#define Tk_PhotoSetSize_TCL_DECLARED
 /* 268 */
 EXTERN int		Tk_PhotoSetSize(Tcl_Interp *interp,
 				Tk_PhotoHandle handle, int width, int height);
-#endif
-#ifndef Tk_GetUserInactiveTime_TCL_DECLARED
-#define Tk_GetUserInactiveTime_TCL_DECLARED
 /* 269 */
 EXTERN long		Tk_GetUserInactiveTime(Display *dpy);
-#endif
-#ifndef Tk_ResetUserInactiveTime_TCL_DECLARED
-#define Tk_ResetUserInactiveTime_TCL_DECLARED
 /* 270 */
 EXTERN void		Tk_ResetUserInactiveTime(Display *dpy);
-#endif
-#ifndef Tk_Interp_TCL_DECLARED
-#define Tk_Interp_TCL_DECLARED
 /* 271 */
 EXTERN Tcl_Interp *	Tk_Interp(Tk_Window tkwin);
-#endif
-#ifndef Tk_CreateOldImageType_TCL_DECLARED
-#define Tk_CreateOldImageType_TCL_DECLARED
 /* 272 */
 EXTERN void		Tk_CreateOldImageType(Tk_ImageType *typePtr);
-#endif
-#ifndef Tk_CreateOldPhotoImageFormat_TCL_DECLARED
-#define Tk_CreateOldPhotoImageFormat_TCL_DECLARED
 /* 273 */
 EXTERN void		Tk_CreateOldPhotoImageFormat(
 				Tk_PhotoImageFormat *formatPtr);
-#endif
 /* Slot 274 is reserved */
-#ifndef TkUnusedStubEntry_TCL_DECLARED
-#define TkUnusedStubEntry_TCL_DECLARED
-/* 275 */
+/* Slot 275 is reserved */
+/* Slot 276 is reserved */
+/* Slot 277 is reserved */
+/* Slot 278 is reserved */
+/* Slot 279 is reserved */
+/* 280 */
 EXTERN void		TkUnusedStubEntry(void);
-#endif
 
-typedef struct TkStubHooks {
-    struct TkPlatStubs *tkPlatStubs;
-    struct TkIntStubs *tkIntStubs;
-    struct TkIntPlatStubs *tkIntPlatStubs;
-    struct TkIntXlibStubs *tkIntXlibStubs;
+typedef struct {
+    const struct TkPlatStubs *tkPlatStubs;
+    const struct TkIntStubs *tkIntStubs;
+    const struct TkIntPlatStubs *tkIntPlatStubs;
+    const struct TkIntXlibStubs *tkIntXlibStubs;
 } TkStubHooks;
 
 typedef struct TkStubs {
     int magic;
-    struct TkStubHooks *hooks;
+    const TkStubHooks *hooks;
 
     void (*tk_MainLoop) (void); /* 0 */
     XColor * (*tk_3DBorderColor) (Tk_3DBorder border); /* 1 */
     GC (*tk_3DBorderGC) (Tk_Window tkwin, Tk_3DBorder border, int which); /* 2 */
     void (*tk_3DHorizontalBevel) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int leftIn, int rightIn, int topBevel, int relief); /* 3 */
     void (*tk_3DVerticalBevel) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int leftBevel, int relief); /* 4 */
-    void (*tk_AddOption) (Tk_Window tkwin, CONST char *name, CONST char *value, int priority); /* 5 */
+    void (*tk_AddOption) (Tk_Window tkwin, const char *name, const char *value, int priority); /* 5 */
     void (*tk_BindEvent) (Tk_BindingTable bindingTable, XEvent *eventPtr, Tk_Window tkwin, int numObjects, ClientData *objectPtr); /* 6 */
     void (*tk_CanvasDrawableCoords) (Tk_Canvas canvas, double x, double y, short *drawableXPtr, short *drawableYPtr); /* 7 */
     void (*tk_CanvasEventuallyRedraw) (Tk_Canvas canvas, int x1, int y1, int x2, int y2); /* 8 */
-    int (*tk_CanvasGetCoord) (Tcl_Interp *interp, Tk_Canvas canvas, CONST char *str, double *doublePtr); /* 9 */
+    int (*tk_CanvasGetCoord) (Tcl_Interp *interp, Tk_Canvas canvas, const char *str, double *doublePtr); /* 9 */
     Tk_CanvasTextInfo * (*tk_CanvasGetTextInfo) (Tk_Canvas canvas); /* 10 */
     int (*tk_CanvasPsBitmap) (Tcl_Interp *interp, Tk_Canvas canvas, Pixmap bitmap, int x, int y, int width, int height); /* 11 */
     int (*tk_CanvasPsColor) (Tcl_Interp *interp, Tk_Canvas canvas, XColor *colorPtr); /* 12 */
@@ -1714,7 +900,7 @@ typedef struct TkStubs {
     int (*tk_CanvasPsStipple) (Tcl_Interp *interp, Tk_Canvas canvas, Pixmap bitmap); /* 15 */
     double (*tk_CanvasPsY) (Tk_Canvas canvas, double y); /* 16 */
     void (*tk_CanvasSetStippleOrigin) (Tk_Canvas canvas, GC gc); /* 17 */
-    int (*tk_CanvasTagsParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, CONST char *value, char *widgRec, int offset); /* 18 */
+    int (*tk_CanvasTagsParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset); /* 18 */
     char * (*tk_CanvasTagsPrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 19 */
     Tk_Window (*tk_CanvasTkwin) (Tk_Canvas canvas); /* 20 */
     void (*tk_CanvasWindowCoords) (Tk_Canvas canvas, double x, double y, short *screenXPtr, short *screenYPtr); /* 21 */
@@ -1723,13 +909,13 @@ typedef struct TkStubs {
     void (*tk_ClearSelection) (Tk_Window tkwin, Atom selection); /* 24 */
     int (*tk_ClipboardAppend) (Tcl_Interp *interp, Tk_Window tkwin, Atom target, Atom format, char *buffer); /* 25 */
     int (*tk_ClipboardClear) (Tcl_Interp *interp, Tk_Window tkwin); /* 26 */
-    int (*tk_ConfigureInfo) (Tcl_Interp *interp, Tk_Window tkwin, Tk_ConfigSpec *specs, char *widgRec, CONST char *argvName, int flags); /* 27 */
-    int (*tk_ConfigureValue) (Tcl_Interp *interp, Tk_Window tkwin, Tk_ConfigSpec *specs, char *widgRec, CONST char *argvName, int flags); /* 28 */
+    int (*tk_ConfigureInfo) (Tcl_Interp *interp, Tk_Window tkwin, Tk_ConfigSpec *specs, char *widgRec, const char *argvName, int flags); /* 27 */
+    int (*tk_ConfigureValue) (Tcl_Interp *interp, Tk_Window tkwin, Tk_ConfigSpec *specs, char *widgRec, const char *argvName, int flags); /* 28 */
     int (*tk_ConfigureWidget) (Tcl_Interp *interp, Tk_Window tkwin, Tk_ConfigSpec *specs, int argc, CONST84 char **argv, char *widgRec, int flags); /* 29 */
     void (*tk_ConfigureWindow) (Tk_Window tkwin, unsigned int valueMask, XWindowChanges *valuePtr); /* 30 */
-    Tk_TextLayout (*tk_ComputeTextLayout) (Tk_Font font, CONST char *str, int numChars, int wrapLength, Tk_Justify justify, int flags, int *widthPtr, int *heightPtr); /* 31 */
+    Tk_TextLayout (*tk_ComputeTextLayout) (Tk_Font font, const char *str, int numChars, int wrapLength, Tk_Justify justify, int flags, int *widthPtr, int *heightPtr); /* 31 */
     Tk_Window (*tk_CoordsToWindow) (int rootX, int rootY, Tk_Window tkwin); /* 32 */
-    unsigned long (*tk_CreateBinding) (Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, CONST char *eventStr, CONST char *command, int append); /* 33 */
+    unsigned long (*tk_CreateBinding) (Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, const char *eventStr, const char *command, int append); /* 33 */
     Tk_BindingTable (*tk_CreateBindingTable) (Tcl_Interp *interp); /* 34 */
     Tk_ErrorHandler (*tk_CreateErrorHandler) (Display *display, int errNum, int request, int minorCode, Tk_ErrorProc *errorProc, ClientData clientData); /* 35 */
     void (*tk_CreateEventHandler) (Tk_Window token, unsigned long mask, Tk_EventProc *proc, ClientData clientData); /* 36 */
@@ -1738,29 +924,29 @@ typedef struct TkStubs {
     void (*tk_CreateItemType) (Tk_ItemType *typePtr); /* 39 */
     void (*tk_CreatePhotoImageFormat) (Tk_PhotoImageFormat *formatPtr); /* 40 */
     void (*tk_CreateSelHandler) (Tk_Window tkwin, Atom selection, Atom target, Tk_SelectionProc *proc, ClientData clientData, Atom format); /* 41 */
-    Tk_Window (*tk_CreateWindow) (Tcl_Interp *interp, Tk_Window parent, CONST char *name, CONST char *screenName); /* 42 */
-    Tk_Window (*tk_CreateWindowFromPath) (Tcl_Interp *interp, Tk_Window tkwin, CONST char *pathName, CONST char *screenName); /* 43 */
-    int (*tk_DefineBitmap) (Tcl_Interp *interp, CONST char *name, CONST char *source, int width, int height); /* 44 */
+    Tk_Window (*tk_CreateWindow) (Tcl_Interp *interp, Tk_Window parent, const char *name, const char *screenName); /* 42 */
+    Tk_Window (*tk_CreateWindowFromPath) (Tcl_Interp *interp, Tk_Window tkwin, const char *pathName, const char *screenName); /* 43 */
+    int (*tk_DefineBitmap) (Tcl_Interp *interp, const char *name, const char *source, int width, int height); /* 44 */
     void (*tk_DefineCursor) (Tk_Window window, Tk_Cursor cursor); /* 45 */
     void (*tk_DeleteAllBindings) (Tk_BindingTable bindingTable, ClientData object); /* 46 */
-    int (*tk_DeleteBinding) (Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, CONST char *eventStr); /* 47 */
+    int (*tk_DeleteBinding) (Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, const char *eventStr); /* 47 */
     void (*tk_DeleteBindingTable) (Tk_BindingTable bindingTable); /* 48 */
     void (*tk_DeleteErrorHandler) (Tk_ErrorHandler handler); /* 49 */
     void (*tk_DeleteEventHandler) (Tk_Window token, unsigned long mask, Tk_EventProc *proc, ClientData clientData); /* 50 */
     void (*tk_DeleteGenericHandler) (Tk_GenericProc *proc, ClientData clientData); /* 51 */
-    void (*tk_DeleteImage) (Tcl_Interp *interp, CONST char *name); /* 52 */
+    void (*tk_DeleteImage) (Tcl_Interp *interp, const char *name); /* 52 */
     void (*tk_DeleteSelHandler) (Tk_Window tkwin, Atom selection, Atom target); /* 53 */
     void (*tk_DestroyWindow) (Tk_Window tkwin); /* 54 */
     CONST84_RETURN char * (*tk_DisplayName) (Tk_Window tkwin); /* 55 */
     int (*tk_DistanceToTextLayout) (Tk_TextLayout layout, int x, int y); /* 56 */
     void (*tk_Draw3DPolygon) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, XPoint *pointPtr, int numPoints, int borderWidth, int leftRelief); /* 57 */
     void (*tk_Draw3DRectangle) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int borderWidth, int relief); /* 58 */
-    void (*tk_DrawChars) (Display *display, Drawable drawable, GC gc, Tk_Font tkfont, CONST char *source, int numBytes, int x, int y); /* 59 */
+    void (*tk_DrawChars) (Display *display, Drawable drawable, GC gc, Tk_Font tkfont, const char *source, int numBytes, int x, int y); /* 59 */
     void (*tk_DrawFocusHighlight) (Tk_Window tkwin, GC gc, int width, Drawable drawable); /* 60 */
     void (*tk_DrawTextLayout) (Display *display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, int firstChar, int lastChar); /* 61 */
     void (*tk_Fill3DPolygon) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, XPoint *pointPtr, int numPoints, int borderWidth, int leftRelief); /* 62 */
     void (*tk_Fill3DRectangle) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int borderWidth, int relief); /* 63 */
-    Tk_PhotoHandle (*tk_FindPhoto) (Tcl_Interp *interp, CONST char *imageName); /* 64 */
+    Tk_PhotoHandle (*tk_FindPhoto) (Tcl_Interp *interp, const char *imageName); /* 64 */
     Font (*tk_FontId) (Tk_Font font); /* 65 */
     void (*tk_Free3DBorder) (Tk_3DBorder border); /* 66 */
     void (*tk_FreeBitmap) (Display *display, Pixmap bitmap); /* 67 */
@@ -1778,51 +964,51 @@ typedef struct TkStubs {
     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 */
     void (*tk_GetAllBindings) (Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object); /* 81 */
-    int (*tk_GetAnchor) (Tcl_Interp *interp, CONST char *str, Tk_Anchor *anchorPtr); /* 82 */
+    int (*tk_GetAnchor) (Tcl_Interp *interp, const char *str, Tk_Anchor *anchorPtr); /* 82 */
     CONST84_RETURN char * (*tk_GetAtomName) (Tk_Window tkwin, Atom atom); /* 83 */
-    CONST84_RETURN char * (*tk_GetBinding) (Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, CONST char *eventStr); /* 84 */
-    Pixmap (*tk_GetBitmap) (Tcl_Interp *interp, Tk_Window tkwin, CONST char *str); /* 85 */
-    Pixmap (*tk_GetBitmapFromData) (Tcl_Interp *interp, Tk_Window tkwin, CONST char *source, int width, int height); /* 86 */
-    int (*tk_GetCapStyle) (Tcl_Interp *interp, CONST char *str, int *capPtr); /* 87 */
+    CONST84_RETURN char * (*tk_GetBinding) (Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, const char *eventStr); /* 84 */
+    Pixmap (*tk_GetBitmap) (Tcl_Interp *interp, Tk_Window tkwin, const char *str); /* 85 */
+    Pixmap (*tk_GetBitmapFromData) (Tcl_Interp *interp, Tk_Window tkwin, const char *source, int width, int height); /* 86 */
+    int (*tk_GetCapStyle) (Tcl_Interp *interp, const char *str, int *capPtr); /* 87 */
     XColor * (*tk_GetColor) (Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid name); /* 88 */
     XColor * (*tk_GetColorByValue) (Tk_Window tkwin, XColor *colorPtr); /* 89 */
-    Colormap (*tk_GetColormap) (Tcl_Interp *interp, Tk_Window tkwin, CONST char *str); /* 90 */
+    Colormap (*tk_GetColormap) (Tcl_Interp *interp, Tk_Window tkwin, const char *str); /* 90 */
     Tk_Cursor (*tk_GetCursor) (Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid str); /* 91 */
-    Tk_Cursor (*tk_GetCursorFromData) (Tcl_Interp *interp, Tk_Window tkwin, CONST char *source, CONST char *mask, int width, int height, int xHot, int yHot, Tk_Uid fg, Tk_Uid bg); /* 92 */
-    Tk_Font (*tk_GetFont) (Tcl_Interp *interp, Tk_Window tkwin, CONST char *str); /* 93 */
+    Tk_Cursor (*tk_GetCursorFromData) (Tcl_Interp *interp, Tk_Window tkwin, const char *source, const char *mask, int width, int height, int xHot, int yHot, Tk_Uid fg, Tk_Uid bg); /* 92 */
+    Tk_Font (*tk_GetFont) (Tcl_Interp *interp, Tk_Window tkwin, const char *str); /* 93 */
     Tk_Font (*tk_GetFontFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 94 */
     void (*tk_GetFontMetrics) (Tk_Font font, Tk_FontMetrics *fmPtr); /* 95 */
     GC (*tk_GetGC) (Tk_Window tkwin, unsigned long valueMask, XGCValues *valuePtr); /* 96 */
-    Tk_Image (*tk_GetImage) (Tcl_Interp *interp, Tk_Window tkwin, CONST char *name, Tk_ImageChangedProc *changeProc, ClientData clientData); /* 97 */
-    ClientData (*tk_GetImageMasterData) (Tcl_Interp *interp, CONST char *name, Tk_ImageType **typePtrPtr); /* 98 */
+    Tk_Image (*tk_GetImage) (Tcl_Interp *interp, Tk_Window tkwin, const char *name, Tk_ImageChangedProc *changeProc, ClientData clientData); /* 97 */
+    ClientData (*tk_GetImageMasterData) (Tcl_Interp *interp, const char *name, Tk_ImageType **typePtrPtr); /* 98 */
     Tk_ItemType * (*tk_GetItemTypes) (void); /* 99 */
-    int (*tk_GetJoinStyle) (Tcl_Interp *interp, CONST char *str, int *joinPtr); /* 100 */
-    int (*tk_GetJustify) (Tcl_Interp *interp, CONST char *str, Tk_Justify *justifyPtr); /* 101 */
+    int (*tk_GetJoinStyle) (Tcl_Interp *interp, const char *str, int *joinPtr); /* 100 */
+    int (*tk_GetJustify) (Tcl_Interp *interp, const char *str, Tk_Justify *justifyPtr); /* 101 */
     int (*tk_GetNumMainWindows) (void); /* 102 */
-    Tk_Uid (*tk_GetOption) (Tk_Window tkwin, CONST char *name, CONST char *className); /* 103 */
-    int (*tk_GetPixels) (Tcl_Interp *interp, Tk_Window tkwin, CONST char *str, int *intPtr); /* 104 */
+    Tk_Uid (*tk_GetOption) (Tk_Window tkwin, const char *name, const char *className); /* 103 */
+    int (*tk_GetPixels) (Tcl_Interp *interp, Tk_Window tkwin, const char *str, int *intPtr); /* 104 */
     Pixmap (*tk_GetPixmap) (Display *display, Drawable d, int width, int height, int depth); /* 105 */
-    int (*tk_GetRelief) (Tcl_Interp *interp, CONST char *name, int *reliefPtr); /* 106 */
+    int (*tk_GetRelief) (Tcl_Interp *interp, const char *name, int *reliefPtr); /* 106 */
     void (*tk_GetRootCoords) (Tk_Window tkwin, int *xPtr, int *yPtr); /* 107 */
     int (*tk_GetScrollInfo) (Tcl_Interp *interp, int argc, CONST84 char **argv, double *dblPtr, int *intPtr); /* 108 */
-    int (*tk_GetScreenMM) (Tcl_Interp *interp, Tk_Window tkwin, CONST char *str, double *doublePtr); /* 109 */
+    int (*tk_GetScreenMM) (Tcl_Interp *interp, Tk_Window tkwin, const char *str, double *doublePtr); /* 109 */
     int (*tk_GetSelection) (Tcl_Interp *interp, Tk_Window tkwin, Atom selection, Atom target, Tk_GetSelProc *proc, ClientData clientData); /* 110 */
-    Tk_Uid (*tk_GetUid) (CONST char *str); /* 111 */
-    Visual * (*tk_GetVisual) (Tcl_Interp *interp, Tk_Window tkwin, CONST char *str, int *depthPtr, Colormap *colormapPtr); /* 112 */
+    Tk_Uid (*tk_GetUid) (const char *str); /* 111 */
+    Visual * (*tk_GetVisual) (Tcl_Interp *interp, Tk_Window tkwin, const char *str, int *depthPtr, Colormap *colormapPtr); /* 112 */
     void (*tk_GetVRootGeometry) (Tk_Window tkwin, int *xPtr, int *yPtr, int *widthPtr, int *heightPtr); /* 113 */
     int (*tk_Grab) (Tcl_Interp *interp, Tk_Window tkwin, int grabGlobal); /* 114 */
     void (*tk_HandleEvent) (XEvent *eventPtr); /* 115 */
     Tk_Window (*tk_IdToWindow) (Display *display, Window window); /* 116 */
     void (*tk_ImageChanged) (Tk_ImageMaster master, int x, int y, int width, int height, int imageWidth, int imageHeight); /* 117 */
     int (*tk_Init) (Tcl_Interp *interp); /* 118 */
-    Atom (*tk_InternAtom) (Tk_Window tkwin, CONST char *name); /* 119 */
+    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 slave, Tk_Window master, int x, int y, int width, int height); /* 121 */
     Tk_Window (*tk_MainWindow) (Tcl_Interp *interp); /* 122 */
     void (*tk_MakeWindowExist) (Tk_Window tkwin); /* 123 */
-    void (*tk_ManageGeometry) (Tk_Window tkwin, CONST Tk_GeomMgr *mgrPtr, ClientData clientData); /* 124 */
+    void (*tk_ManageGeometry) (Tk_Window tkwin, const Tk_GeomMgr *mgrPtr, ClientData clientData); /* 124 */
     void (*tk_MapWindow) (Tk_Window tkwin); /* 125 */
-    int (*tk_MeasureChars) (Tk_Font tkfont, CONST char *source, int numBytes, int maxPixels, int flags, int *lengthPtr); /* 126 */
+    int (*tk_MeasureChars) (Tk_Font tkfont, const char *source, int numBytes, int maxPixels, int flags, int *lengthPtr); /* 126 */
     void (*tk_MoveResizeWindow) (Tk_Window tkwin, int x, int y, int width, int height); /* 127 */
     void (*tk_MoveWindow) (Tk_Window tkwin, int x, int y); /* 128 */
     void (*tk_MoveToplevelWindow) (Tk_Window tkwin, int x, int y); /* 129 */
@@ -1837,7 +1023,7 @@ typedef struct TkStubs {
     CONST84_RETURN char * (*tk_NameOfJoinStyle) (int join); /* 138 */
     CONST84_RETURN char * (*tk_NameOfJustify) (Tk_Justify justify); /* 139 */
     CONST84_RETURN char * (*tk_NameOfRelief) (int relief); /* 140 */
-    Tk_Window (*tk_NameToWindow) (Tcl_Interp *interp, CONST char *pathName, Tk_Window tkwin); /* 141 */
+    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, ClientData clientData); /* 142 */
     int (*tk_ParseArgv) (Tcl_Interp *interp, Tk_Window tkwin, int *argcPtr, CONST84 char **argv, Tk_ArgvInfo *argTable, int flags); /* 143 */
     void (*tk_PhotoPutBlock_NoComposite) (Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height); /* 144 */
@@ -1856,9 +1042,9 @@ typedef struct TkStubs {
     int (*tk_RestackWindow) (Tk_Window tkwin, int aboveBelow, Tk_Window other); /* 157 */
     Tk_RestrictProc * (*tk_RestrictEvents) (Tk_RestrictProc *proc, ClientData arg, ClientData *prevArgPtr); /* 158 */
     int (*tk_SafeInit) (Tcl_Interp *interp); /* 159 */
-    CONST char * (*tk_SetAppName) (Tk_Window tkwin, CONST char *name); /* 160 */
+    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 */
+    void (*tk_SetClass) (Tk_Window tkwin, const char *className); /* 162 */
     void (*tk_SetGrid) (Tk_Window tkwin, int reqWidth, int reqHeight, int gridWidth, int gridHeight); /* 163 */
     void (*tk_SetInternalBorder) (Tk_Window tkwin, int width); /* 164 */
     void (*tk_SetWindowBackground) (Tk_Window tkwin, unsigned long pixel); /* 165 */
@@ -1872,9 +1058,9 @@ typedef struct TkStubs {
     void (*tk_SizeOfImage) (Tk_Image image, int *widthPtr, int *heightPtr); /* 173 */
     int (*tk_StrictMotif) (Tk_Window tkwin); /* 174 */
     void (*tk_TextLayoutToPostscript) (Tcl_Interp *interp, Tk_TextLayout layout); /* 175 */
-    int (*tk_TextWidth) (Tk_Font font, CONST char *str, int numBytes); /* 176 */
+    int (*tk_TextWidth) (Tk_Font font, const char *str, int numBytes); /* 176 */
     void (*tk_UndefineCursor) (Tk_Window window); /* 177 */
-    void (*tk_UnderlineChars) (Display *display, Drawable drawable, GC gc, Tk_Font tkfont, CONST char *source, int x, int y, int firstByte, int lastByte); /* 178 */
+    void (*tk_UnderlineChars) (Display *display, Drawable drawable, GC gc, Tk_Font tkfont, const char *source, int x, int y, int firstByte, int lastByte); /* 178 */
     void (*tk_UnderlineTextLayout) (Display *display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, int underline); /* 179 */
     void (*tk_Ungrab) (Tk_Window tkwin); /* 180 */
     void (*tk_UnmaintainGeometry) (Tk_Window slave, Tk_Window master); /* 181 */
@@ -1886,7 +1072,7 @@ typedef struct TkStubs {
     XColor * (*tk_AllocColorFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr); /* 187 */
     Tk_Cursor (*tk_AllocCursorFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr); /* 188 */
     Tk_Font (*tk_AllocFontFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr); /* 189 */
-    Tk_OptionTable (*tk_CreateOptionTable) (Tcl_Interp *interp, CONST Tk_OptionSpec *templatePtr); /* 190 */
+    Tk_OptionTable (*tk_CreateOptionTable) (Tcl_Interp *interp, const Tk_OptionSpec *templatePtr); /* 190 */
     void (*tk_DeleteOptionTable) (Tk_OptionTable optionTable); /* 191 */
     void (*tk_Free3DBorderFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 192 */
     void (*tk_FreeBitmapFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 193 */
@@ -1906,17 +1092,17 @@ typedef struct TkStubs {
     int (*tk_GetMMFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr, double *doublePtr); /* 207 */
     int (*tk_GetPixelsFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr, int *intPtr); /* 208 */
     int (*tk_GetReliefFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *resultPtr); /* 209 */
-    int (*tk_GetScrollInfoObj) (Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], double *dblPtr, int *intPtr); /* 210 */
+    int (*tk_GetScrollInfoObj) (Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], double *dblPtr, int *intPtr); /* 210 */
     int (*tk_InitOptions) (Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionToken, Tk_Window tkwin); /* 211 */
     void (*tk_MainEx) (int argc, char **argv, Tcl_AppInitProc *appInitProc, Tcl_Interp *interp); /* 212 */
     void (*tk_RestoreSavedOptions) (Tk_SavedOptions *savePtr); /* 213 */
-    int (*tk_SetOptions) (Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionTable, int objc, Tcl_Obj *CONST objv[], Tk_Window tkwin, Tk_SavedOptions *savePtr, int *maskPtr); /* 214 */
+    int (*tk_SetOptions) (Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionTable, int 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 (*tk_CreateSmoothMethod) (Tcl_Interp *interp, Tk_SmoothMethod *method); /* 217 */
-    VOID *reserved218;
-    VOID *reserved219;
-    int (*tk_GetDash) (Tcl_Interp *interp, CONST char *value, Tk_Dash *dash); /* 220 */
+    void (*reserved218)(void);
+    void (*reserved219)(void);
+    int (*tk_GetDash) (Tcl_Interp *interp, const char *value, Tk_Dash *dash); /* 220 */
     void (*tk_CreateOutline) (Tk_Outline *outline); /* 221 */
     void (*tk_DeleteOutline) (Display *display, Tk_Outline *outline); /* 222 */
     int (*tk_ConfigOutlineGC) (XGCValues *gcValues, Tk_Canvas canvas, Tk_Item *item, Tk_Outline *outline); /* 223 */
@@ -1937,7 +1123,7 @@ typedef struct TkStubs {
     int (*tk_PostscriptPhoto) (Tcl_Interp *interp, Tk_PhotoImageBlock *blockPtr, Tk_PostscriptInfo psInfo, int width, int height); /* 238 */
     void (*tk_CreateClientMessageHandler) (Tk_ClientMessageProc *proc); /* 239 */
     void (*tk_DeleteClientMessageHandler) (Tk_ClientMessageProc *proc); /* 240 */
-    Tk_Window (*tk_CreateAnonymousWindow) (Tcl_Interp *interp, Tk_Window parent, CONST char *screenName); /* 241 */
+    Tk_Window (*tk_CreateAnonymousWindow) (Tcl_Interp *interp, Tk_Window parent, const char *screenName); /* 241 */
     void (*tk_SetClassProcs) (Tk_Window tkwin, Tk_ClassProcs *procs, ClientData instanceData); /* 242 */
     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 */
@@ -1945,14 +1131,14 @@ typedef struct TkStubs {
     void (*tk_PhotoPutBlock_Panic) (Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int compRule); /* 246 */
     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 */
     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 */
+    Tk_StyleEngine (*tk_RegisterStyleEngine) (const char *name, Tk_StyleEngine parent); /* 249 */
+    Tk_StyleEngine (*tk_GetStyleEngine) (const char *name); /* 250 */
     int (*tk_RegisterStyledElement) (Tk_StyleEngine engine, Tk_ElementSpec *templatePtr); /* 251 */
-    int (*tk_GetElementId) (CONST char *name); /* 252 */
-    Tk_Style (*tk_CreateStyle) (CONST char *name, Tk_StyleEngine engine, ClientData clientData); /* 253 */
-    Tk_Style (*tk_GetStyle) (Tcl_Interp *interp, CONST char *name); /* 254 */
+    int (*tk_GetElementId) (const char *name); /* 252 */
+    Tk_Style (*tk_CreateStyle) (const char *name, Tk_StyleEngine engine, ClientData clientData); /* 253 */
+    Tk_Style (*tk_GetStyle) (Tcl_Interp *interp, const char *name); /* 254 */
     void (*tk_FreeStyle) (Tk_Style style); /* 255 */
-    CONST char * (*tk_NameOfStyle) (Tk_Style style); /* 256 */
+    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 */
@@ -1970,1119 +1156,583 @@ typedef struct TkStubs {
     Tcl_Interp * (*tk_Interp) (Tk_Window tkwin); /* 271 */
     void (*tk_CreateOldImageType) (Tk_ImageType *typePtr); /* 272 */
     void (*tk_CreateOldPhotoImageFormat) (Tk_PhotoImageFormat *formatPtr); /* 273 */
-    VOID *reserved274;
-    void (*tkUnusedStubEntry) (void); /* 275 */
+    void (*reserved274)(void);
+    void (*reserved275)(void);
+    void (*reserved276)(void);
+    void (*reserved277)(void);
+    void (*reserved278)(void);
+    void (*reserved279)(void);
+    void (*tkUnusedStubEntry) (void); /* 280 */
 } TkStubs;
 
-extern TkStubs *tkStubsPtr;
+extern const TkStubs *tkStubsPtr;
 
 #ifdef __cplusplus
 }
 #endif
 
-#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
+#if defined(USE_TK_STUBS)
 
 /*
  * Inline function declarations:
  */
 
-#ifndef Tk_MainLoop
 #define Tk_MainLoop \
 	(tkStubsPtr->tk_MainLoop) /* 0 */
-#endif
-#ifndef Tk_3DBorderColor
 #define Tk_3DBorderColor \
 	(tkStubsPtr->tk_3DBorderColor) /* 1 */
-#endif
-#ifndef Tk_3DBorderGC
 #define Tk_3DBorderGC \
 	(tkStubsPtr->tk_3DBorderGC) /* 2 */
-#endif
-#ifndef Tk_3DHorizontalBevel
 #define Tk_3DHorizontalBevel \
 	(tkStubsPtr->tk_3DHorizontalBevel) /* 3 */
-#endif
-#ifndef Tk_3DVerticalBevel
 #define Tk_3DVerticalBevel \
 	(tkStubsPtr->tk_3DVerticalBevel) /* 4 */
-#endif
-#ifndef Tk_AddOption
 #define Tk_AddOption \
 	(tkStubsPtr->tk_AddOption) /* 5 */
-#endif
-#ifndef Tk_BindEvent
 #define Tk_BindEvent \
 	(tkStubsPtr->tk_BindEvent) /* 6 */
-#endif
-#ifndef Tk_CanvasDrawableCoords
 #define Tk_CanvasDrawableCoords \
 	(tkStubsPtr->tk_CanvasDrawableCoords) /* 7 */
-#endif
-#ifndef Tk_CanvasEventuallyRedraw
 #define Tk_CanvasEventuallyRedraw \
 	(tkStubsPtr->tk_CanvasEventuallyRedraw) /* 8 */
-#endif
-#ifndef Tk_CanvasGetCoord
 #define Tk_CanvasGetCoord \
 	(tkStubsPtr->tk_CanvasGetCoord) /* 9 */
-#endif
-#ifndef Tk_CanvasGetTextInfo
 #define Tk_CanvasGetTextInfo \
 	(tkStubsPtr->tk_CanvasGetTextInfo) /* 10 */
-#endif
-#ifndef Tk_CanvasPsBitmap
 #define Tk_CanvasPsBitmap \
 	(tkStubsPtr->tk_CanvasPsBitmap) /* 11 */
-#endif
-#ifndef Tk_CanvasPsColor
 #define Tk_CanvasPsColor \
 	(tkStubsPtr->tk_CanvasPsColor) /* 12 */
-#endif
-#ifndef Tk_CanvasPsFont
 #define Tk_CanvasPsFont \
 	(tkStubsPtr->tk_CanvasPsFont) /* 13 */
-#endif
-#ifndef Tk_CanvasPsPath
 #define Tk_CanvasPsPath \
 	(tkStubsPtr->tk_CanvasPsPath) /* 14 */
-#endif
-#ifndef Tk_CanvasPsStipple
 #define Tk_CanvasPsStipple \
 	(tkStubsPtr->tk_CanvasPsStipple) /* 15 */
-#endif
-#ifndef Tk_CanvasPsY
 #define Tk_CanvasPsY \
 	(tkStubsPtr->tk_CanvasPsY) /* 16 */
-#endif
-#ifndef Tk_CanvasSetStippleOrigin
 #define Tk_CanvasSetStippleOrigin \
 	(tkStubsPtr->tk_CanvasSetStippleOrigin) /* 17 */
-#endif
-#ifndef Tk_CanvasTagsParseProc
 #define Tk_CanvasTagsParseProc \
 	(tkStubsPtr->tk_CanvasTagsParseProc) /* 18 */
-#endif
-#ifndef Tk_CanvasTagsPrintProc
 #define Tk_CanvasTagsPrintProc \
 	(tkStubsPtr->tk_CanvasTagsPrintProc) /* 19 */
-#endif
-#ifndef Tk_CanvasTkwin
 #define Tk_CanvasTkwin \
 	(tkStubsPtr->tk_CanvasTkwin) /* 20 */
-#endif
-#ifndef Tk_CanvasWindowCoords
 #define Tk_CanvasWindowCoords \
 	(tkStubsPtr->tk_CanvasWindowCoords) /* 21 */
-#endif
-#ifndef Tk_ChangeWindowAttributes
 #define Tk_ChangeWindowAttributes \
 	(tkStubsPtr->tk_ChangeWindowAttributes) /* 22 */
-#endif
-#ifndef Tk_CharBbox
 #define Tk_CharBbox \
 	(tkStubsPtr->tk_CharBbox) /* 23 */
-#endif
-#ifndef Tk_ClearSelection
 #define Tk_ClearSelection \
 	(tkStubsPtr->tk_ClearSelection) /* 24 */
-#endif
-#ifndef Tk_ClipboardAppend
 #define Tk_ClipboardAppend \
 	(tkStubsPtr->tk_ClipboardAppend) /* 25 */
-#endif
-#ifndef Tk_ClipboardClear
 #define Tk_ClipboardClear \
 	(tkStubsPtr->tk_ClipboardClear) /* 26 */
-#endif
-#ifndef Tk_ConfigureInfo
 #define Tk_ConfigureInfo \
 	(tkStubsPtr->tk_ConfigureInfo) /* 27 */
-#endif
-#ifndef Tk_ConfigureValue
 #define Tk_ConfigureValue \
 	(tkStubsPtr->tk_ConfigureValue) /* 28 */
-#endif
-#ifndef Tk_ConfigureWidget
 #define Tk_ConfigureWidget \
 	(tkStubsPtr->tk_ConfigureWidget) /* 29 */
-#endif
-#ifndef Tk_ConfigureWindow
 #define Tk_ConfigureWindow \
 	(tkStubsPtr->tk_ConfigureWindow) /* 30 */
-#endif
-#ifndef Tk_ComputeTextLayout
 #define Tk_ComputeTextLayout \
 	(tkStubsPtr->tk_ComputeTextLayout) /* 31 */
-#endif
-#ifndef Tk_CoordsToWindow
 #define Tk_CoordsToWindow \
 	(tkStubsPtr->tk_CoordsToWindow) /* 32 */
-#endif
-#ifndef Tk_CreateBinding
 #define Tk_CreateBinding \
 	(tkStubsPtr->tk_CreateBinding) /* 33 */
-#endif
-#ifndef Tk_CreateBindingTable
 #define Tk_CreateBindingTable \
 	(tkStubsPtr->tk_CreateBindingTable) /* 34 */
-#endif
-#ifndef Tk_CreateErrorHandler
 #define Tk_CreateErrorHandler \
 	(tkStubsPtr->tk_CreateErrorHandler) /* 35 */
-#endif
-#ifndef Tk_CreateEventHandler
 #define Tk_CreateEventHandler \
 	(tkStubsPtr->tk_CreateEventHandler) /* 36 */
-#endif
-#ifndef Tk_CreateGenericHandler
 #define Tk_CreateGenericHandler \
 	(tkStubsPtr->tk_CreateGenericHandler) /* 37 */
-#endif
-#ifndef Tk_CreateImageType
 #define Tk_CreateImageType \
 	(tkStubsPtr->tk_CreateImageType) /* 38 */
-#endif
-#ifndef Tk_CreateItemType
 #define Tk_CreateItemType \
 	(tkStubsPtr->tk_CreateItemType) /* 39 */
-#endif
-#ifndef Tk_CreatePhotoImageFormat
 #define Tk_CreatePhotoImageFormat \
 	(tkStubsPtr->tk_CreatePhotoImageFormat) /* 40 */
-#endif
-#ifndef Tk_CreateSelHandler
 #define Tk_CreateSelHandler \
 	(tkStubsPtr->tk_CreateSelHandler) /* 41 */
-#endif
-#ifndef Tk_CreateWindow
 #define Tk_CreateWindow \
 	(tkStubsPtr->tk_CreateWindow) /* 42 */
-#endif
-#ifndef Tk_CreateWindowFromPath
 #define Tk_CreateWindowFromPath \
 	(tkStubsPtr->tk_CreateWindowFromPath) /* 43 */
-#endif
-#ifndef Tk_DefineBitmap
 #define Tk_DefineBitmap \
 	(tkStubsPtr->tk_DefineBitmap) /* 44 */
-#endif
-#ifndef Tk_DefineCursor
 #define Tk_DefineCursor \
 	(tkStubsPtr->tk_DefineCursor) /* 45 */
-#endif
-#ifndef Tk_DeleteAllBindings
 #define Tk_DeleteAllBindings \
 	(tkStubsPtr->tk_DeleteAllBindings) /* 46 */
-#endif
-#ifndef Tk_DeleteBinding
 #define Tk_DeleteBinding \
 	(tkStubsPtr->tk_DeleteBinding) /* 47 */
-#endif
-#ifndef Tk_DeleteBindingTable
 #define Tk_DeleteBindingTable \
 	(tkStubsPtr->tk_DeleteBindingTable) /* 48 */
-#endif
-#ifndef Tk_DeleteErrorHandler
 #define Tk_DeleteErrorHandler \
 	(tkStubsPtr->tk_DeleteErrorHandler) /* 49 */
-#endif
-#ifndef Tk_DeleteEventHandler
 #define Tk_DeleteEventHandler \
 	(tkStubsPtr->tk_DeleteEventHandler) /* 50 */
-#endif
-#ifndef Tk_DeleteGenericHandler
 #define Tk_DeleteGenericHandler \
 	(tkStubsPtr->tk_DeleteGenericHandler) /* 51 */
-#endif
-#ifndef Tk_DeleteImage
 #define Tk_DeleteImage \
 	(tkStubsPtr->tk_DeleteImage) /* 52 */
-#endif
-#ifndef Tk_DeleteSelHandler
 #define Tk_DeleteSelHandler \
 	(tkStubsPtr->tk_DeleteSelHandler) /* 53 */
-#endif
-#ifndef Tk_DestroyWindow
 #define Tk_DestroyWindow \
 	(tkStubsPtr->tk_DestroyWindow) /* 54 */
-#endif
-#ifndef Tk_DisplayName
 #define Tk_DisplayName \
 	(tkStubsPtr->tk_DisplayName) /* 55 */
-#endif
-#ifndef Tk_DistanceToTextLayout
 #define Tk_DistanceToTextLayout \
 	(tkStubsPtr->tk_DistanceToTextLayout) /* 56 */
-#endif
-#ifndef Tk_Draw3DPolygon
 #define Tk_Draw3DPolygon \
 	(tkStubsPtr->tk_Draw3DPolygon) /* 57 */
-#endif
-#ifndef Tk_Draw3DRectangle
 #define Tk_Draw3DRectangle \
 	(tkStubsPtr->tk_Draw3DRectangle) /* 58 */
-#endif
-#ifndef Tk_DrawChars
 #define Tk_DrawChars \
 	(tkStubsPtr->tk_DrawChars) /* 59 */
-#endif
-#ifndef Tk_DrawFocusHighlight
 #define Tk_DrawFocusHighlight \
 	(tkStubsPtr->tk_DrawFocusHighlight) /* 60 */
-#endif
-#ifndef Tk_DrawTextLayout
 #define Tk_DrawTextLayout \
 	(tkStubsPtr->tk_DrawTextLayout) /* 61 */
-#endif
-#ifndef Tk_Fill3DPolygon
 #define Tk_Fill3DPolygon \
 	(tkStubsPtr->tk_Fill3DPolygon) /* 62 */
-#endif
-#ifndef Tk_Fill3DRectangle
 #define Tk_Fill3DRectangle \
 	(tkStubsPtr->tk_Fill3DRectangle) /* 63 */
-#endif
-#ifndef Tk_FindPhoto
 #define Tk_FindPhoto \
 	(tkStubsPtr->tk_FindPhoto) /* 64 */
-#endif
-#ifndef Tk_FontId
 #define Tk_FontId \
 	(tkStubsPtr->tk_FontId) /* 65 */
-#endif
-#ifndef Tk_Free3DBorder
 #define Tk_Free3DBorder \
 	(tkStubsPtr->tk_Free3DBorder) /* 66 */
-#endif
-#ifndef Tk_FreeBitmap
 #define Tk_FreeBitmap \
 	(tkStubsPtr->tk_FreeBitmap) /* 67 */
-#endif
-#ifndef Tk_FreeColor
 #define Tk_FreeColor \
 	(tkStubsPtr->tk_FreeColor) /* 68 */
-#endif
-#ifndef Tk_FreeColormap
 #define Tk_FreeColormap \
 	(tkStubsPtr->tk_FreeColormap) /* 69 */
-#endif
-#ifndef Tk_FreeCursor
 #define Tk_FreeCursor \
 	(tkStubsPtr->tk_FreeCursor) /* 70 */
-#endif
-#ifndef Tk_FreeFont
 #define Tk_FreeFont \
 	(tkStubsPtr->tk_FreeFont) /* 71 */
-#endif
-#ifndef Tk_FreeGC
 #define Tk_FreeGC \
 	(tkStubsPtr->tk_FreeGC) /* 72 */
-#endif
-#ifndef Tk_FreeImage
 #define Tk_FreeImage \
 	(tkStubsPtr->tk_FreeImage) /* 73 */
-#endif
-#ifndef Tk_FreeOptions
 #define Tk_FreeOptions \
 	(tkStubsPtr->tk_FreeOptions) /* 74 */
-#endif
-#ifndef Tk_FreePixmap
 #define Tk_FreePixmap \
 	(tkStubsPtr->tk_FreePixmap) /* 75 */
-#endif
-#ifndef Tk_FreeTextLayout
 #define Tk_FreeTextLayout \
 	(tkStubsPtr->tk_FreeTextLayout) /* 76 */
-#endif
-#ifndef Tk_FreeXId
 #define Tk_FreeXId \
 	(tkStubsPtr->tk_FreeXId) /* 77 */
-#endif
-#ifndef Tk_GCForColor
 #define Tk_GCForColor \
 	(tkStubsPtr->tk_GCForColor) /* 78 */
-#endif
-#ifndef Tk_GeometryRequest
 #define Tk_GeometryRequest \
 	(tkStubsPtr->tk_GeometryRequest) /* 79 */
-#endif
-#ifndef Tk_Get3DBorder
 #define Tk_Get3DBorder \
 	(tkStubsPtr->tk_Get3DBorder) /* 80 */
-#endif
-#ifndef Tk_GetAllBindings
 #define Tk_GetAllBindings \
 	(tkStubsPtr->tk_GetAllBindings) /* 81 */
-#endif
-#ifndef Tk_GetAnchor
 #define Tk_GetAnchor \
 	(tkStubsPtr->tk_GetAnchor) /* 82 */
-#endif
-#ifndef Tk_GetAtomName
 #define Tk_GetAtomName \
 	(tkStubsPtr->tk_GetAtomName) /* 83 */
-#endif
-#ifndef Tk_GetBinding
 #define Tk_GetBinding \
 	(tkStubsPtr->tk_GetBinding) /* 84 */
-#endif
-#ifndef Tk_GetBitmap
 #define Tk_GetBitmap \
 	(tkStubsPtr->tk_GetBitmap) /* 85 */
-#endif
-#ifndef Tk_GetBitmapFromData
 #define Tk_GetBitmapFromData \
 	(tkStubsPtr->tk_GetBitmapFromData) /* 86 */
-#endif
-#ifndef Tk_GetCapStyle
 #define Tk_GetCapStyle \
 	(tkStubsPtr->tk_GetCapStyle) /* 87 */
-#endif
-#ifndef Tk_GetColor
 #define Tk_GetColor \
 	(tkStubsPtr->tk_GetColor) /* 88 */
-#endif
-#ifndef Tk_GetColorByValue
 #define Tk_GetColorByValue \
 	(tkStubsPtr->tk_GetColorByValue) /* 89 */
-#endif
-#ifndef Tk_GetColormap
 #define Tk_GetColormap \
 	(tkStubsPtr->tk_GetColormap) /* 90 */
-#endif
-#ifndef Tk_GetCursor
 #define Tk_GetCursor \
 	(tkStubsPtr->tk_GetCursor) /* 91 */
-#endif
-#ifndef Tk_GetCursorFromData
 #define Tk_GetCursorFromData \
 	(tkStubsPtr->tk_GetCursorFromData) /* 92 */
-#endif
-#ifndef Tk_GetFont
 #define Tk_GetFont \
 	(tkStubsPtr->tk_GetFont) /* 93 */
-#endif
-#ifndef Tk_GetFontFromObj
 #define Tk_GetFontFromObj \
 	(tkStubsPtr->tk_GetFontFromObj) /* 94 */
-#endif
-#ifndef Tk_GetFontMetrics
 #define Tk_GetFontMetrics \
 	(tkStubsPtr->tk_GetFontMetrics) /* 95 */
-#endif
-#ifndef Tk_GetGC
 #define Tk_GetGC \
 	(tkStubsPtr->tk_GetGC) /* 96 */
-#endif
-#ifndef Tk_GetImage
 #define Tk_GetImage \
 	(tkStubsPtr->tk_GetImage) /* 97 */
-#endif
-#ifndef Tk_GetImageMasterData
 #define Tk_GetImageMasterData \
 	(tkStubsPtr->tk_GetImageMasterData) /* 98 */
-#endif
-#ifndef Tk_GetItemTypes
 #define Tk_GetItemTypes \
 	(tkStubsPtr->tk_GetItemTypes) /* 99 */
-#endif
-#ifndef Tk_GetJoinStyle
 #define Tk_GetJoinStyle \
 	(tkStubsPtr->tk_GetJoinStyle) /* 100 */
-#endif
-#ifndef Tk_GetJustify
 #define Tk_GetJustify \
 	(tkStubsPtr->tk_GetJustify) /* 101 */
-#endif
-#ifndef Tk_GetNumMainWindows
 #define Tk_GetNumMainWindows \
 	(tkStubsPtr->tk_GetNumMainWindows) /* 102 */
-#endif
-#ifndef Tk_GetOption
 #define Tk_GetOption \
 	(tkStubsPtr->tk_GetOption) /* 103 */
-#endif
-#ifndef Tk_GetPixels
 #define Tk_GetPixels \
 	(tkStubsPtr->tk_GetPixels) /* 104 */
-#endif
-#ifndef Tk_GetPixmap
 #define Tk_GetPixmap \
 	(tkStubsPtr->tk_GetPixmap) /* 105 */
-#endif
-#ifndef Tk_GetRelief
 #define Tk_GetRelief \
 	(tkStubsPtr->tk_GetRelief) /* 106 */
-#endif
-#ifndef Tk_GetRootCoords
 #define Tk_GetRootCoords \
 	(tkStubsPtr->tk_GetRootCoords) /* 107 */
-#endif
-#ifndef Tk_GetScrollInfo
 #define Tk_GetScrollInfo \
 	(tkStubsPtr->tk_GetScrollInfo) /* 108 */
-#endif
-#ifndef Tk_GetScreenMM
 #define Tk_GetScreenMM \
 	(tkStubsPtr->tk_GetScreenMM) /* 109 */
-#endif
-#ifndef Tk_GetSelection
 #define Tk_GetSelection \
 	(tkStubsPtr->tk_GetSelection) /* 110 */
-#endif
-#ifndef Tk_GetUid
 #define Tk_GetUid \
 	(tkStubsPtr->tk_GetUid) /* 111 */
-#endif
-#ifndef Tk_GetVisual
 #define Tk_GetVisual \
 	(tkStubsPtr->tk_GetVisual) /* 112 */
-#endif
-#ifndef Tk_GetVRootGeometry
 #define Tk_GetVRootGeometry \
 	(tkStubsPtr->tk_GetVRootGeometry) /* 113 */
-#endif
-#ifndef Tk_Grab
 #define Tk_Grab \
 	(tkStubsPtr->tk_Grab) /* 114 */
-#endif
-#ifndef Tk_HandleEvent
 #define Tk_HandleEvent \
 	(tkStubsPtr->tk_HandleEvent) /* 115 */
-#endif
-#ifndef Tk_IdToWindow
 #define Tk_IdToWindow \
 	(tkStubsPtr->tk_IdToWindow) /* 116 */
-#endif
-#ifndef Tk_ImageChanged
 #define Tk_ImageChanged \
 	(tkStubsPtr->tk_ImageChanged) /* 117 */
-#endif
-#ifndef Tk_Init
 #define Tk_Init \
 	(tkStubsPtr->tk_Init) /* 118 */
-#endif
-#ifndef Tk_InternAtom
 #define Tk_InternAtom \
 	(tkStubsPtr->tk_InternAtom) /* 119 */
-#endif
-#ifndef Tk_IntersectTextLayout
 #define Tk_IntersectTextLayout \
 	(tkStubsPtr->tk_IntersectTextLayout) /* 120 */
-#endif
-#ifndef Tk_MaintainGeometry
 #define Tk_MaintainGeometry \
 	(tkStubsPtr->tk_MaintainGeometry) /* 121 */
-#endif
-#ifndef Tk_MainWindow
 #define Tk_MainWindow \
 	(tkStubsPtr->tk_MainWindow) /* 122 */
-#endif
-#ifndef Tk_MakeWindowExist
 #define Tk_MakeWindowExist \
 	(tkStubsPtr->tk_MakeWindowExist) /* 123 */
-#endif
-#ifndef Tk_ManageGeometry
 #define Tk_ManageGeometry \
 	(tkStubsPtr->tk_ManageGeometry) /* 124 */
-#endif
-#ifndef Tk_MapWindow
 #define Tk_MapWindow \
 	(tkStubsPtr->tk_MapWindow) /* 125 */
-#endif
-#ifndef Tk_MeasureChars
 #define Tk_MeasureChars \
 	(tkStubsPtr->tk_MeasureChars) /* 126 */
-#endif
-#ifndef Tk_MoveResizeWindow
 #define Tk_MoveResizeWindow \
 	(tkStubsPtr->tk_MoveResizeWindow) /* 127 */
-#endif
-#ifndef Tk_MoveWindow
 #define Tk_MoveWindow \
 	(tkStubsPtr->tk_MoveWindow) /* 128 */
-#endif
-#ifndef Tk_MoveToplevelWindow
 #define Tk_MoveToplevelWindow \
 	(tkStubsPtr->tk_MoveToplevelWindow) /* 129 */
-#endif
-#ifndef Tk_NameOf3DBorder
 #define Tk_NameOf3DBorder \
 	(tkStubsPtr->tk_NameOf3DBorder) /* 130 */
-#endif
-#ifndef Tk_NameOfAnchor
 #define Tk_NameOfAnchor \
 	(tkStubsPtr->tk_NameOfAnchor) /* 131 */
-#endif
-#ifndef Tk_NameOfBitmap
 #define Tk_NameOfBitmap \
 	(tkStubsPtr->tk_NameOfBitmap) /* 132 */
-#endif
-#ifndef Tk_NameOfCapStyle
 #define Tk_NameOfCapStyle \
 	(tkStubsPtr->tk_NameOfCapStyle) /* 133 */
-#endif
-#ifndef Tk_NameOfColor
 #define Tk_NameOfColor \
 	(tkStubsPtr->tk_NameOfColor) /* 134 */
-#endif
-#ifndef Tk_NameOfCursor
 #define Tk_NameOfCursor \
 	(tkStubsPtr->tk_NameOfCursor) /* 135 */
-#endif
-#ifndef Tk_NameOfFont
 #define Tk_NameOfFont \
 	(tkStubsPtr->tk_NameOfFont) /* 136 */
-#endif
-#ifndef Tk_NameOfImage
 #define Tk_NameOfImage \
 	(tkStubsPtr->tk_NameOfImage) /* 137 */
-#endif
-#ifndef Tk_NameOfJoinStyle
 #define Tk_NameOfJoinStyle \
 	(tkStubsPtr->tk_NameOfJoinStyle) /* 138 */
-#endif
-#ifndef Tk_NameOfJustify
 #define Tk_NameOfJustify \
 	(tkStubsPtr->tk_NameOfJustify) /* 139 */
-#endif
-#ifndef Tk_NameOfRelief
 #define Tk_NameOfRelief \
 	(tkStubsPtr->tk_NameOfRelief) /* 140 */
-#endif
-#ifndef Tk_NameToWindow
 #define Tk_NameToWindow \
 	(tkStubsPtr->tk_NameToWindow) /* 141 */
-#endif
-#ifndef Tk_OwnSelection
 #define Tk_OwnSelection \
 	(tkStubsPtr->tk_OwnSelection) /* 142 */
-#endif
-#ifndef Tk_ParseArgv
 #define Tk_ParseArgv \
 	(tkStubsPtr->tk_ParseArgv) /* 143 */
-#endif
-#ifndef Tk_PhotoPutBlock_NoComposite
 #define Tk_PhotoPutBlock_NoComposite \
 	(tkStubsPtr->tk_PhotoPutBlock_NoComposite) /* 144 */
-#endif
-#ifndef Tk_PhotoPutZoomedBlock_NoComposite
 #define Tk_PhotoPutZoomedBlock_NoComposite \
 	(tkStubsPtr->tk_PhotoPutZoomedBlock_NoComposite) /* 145 */
-#endif
-#ifndef Tk_PhotoGetImage
 #define Tk_PhotoGetImage \
 	(tkStubsPtr->tk_PhotoGetImage) /* 146 */
-#endif
-#ifndef Tk_PhotoBlank
 #define Tk_PhotoBlank \
 	(tkStubsPtr->tk_PhotoBlank) /* 147 */
-#endif
-#ifndef Tk_PhotoExpand_Panic
 #define Tk_PhotoExpand_Panic \
 	(tkStubsPtr->tk_PhotoExpand_Panic) /* 148 */
-#endif
-#ifndef Tk_PhotoGetSize
 #define Tk_PhotoGetSize \
 	(tkStubsPtr->tk_PhotoGetSize) /* 149 */
-#endif
-#ifndef Tk_PhotoSetSize_Panic
 #define Tk_PhotoSetSize_Panic \
 	(tkStubsPtr->tk_PhotoSetSize_Panic) /* 150 */
-#endif
-#ifndef Tk_PointToChar
 #define Tk_PointToChar \
 	(tkStubsPtr->tk_PointToChar) /* 151 */
-#endif
-#ifndef Tk_PostscriptFontName
 #define Tk_PostscriptFontName \
 	(tkStubsPtr->tk_PostscriptFontName) /* 152 */
-#endif
-#ifndef Tk_PreserveColormap
 #define Tk_PreserveColormap \
 	(tkStubsPtr->tk_PreserveColormap) /* 153 */
-#endif
-#ifndef Tk_QueueWindowEvent
 #define Tk_QueueWindowEvent \
 	(tkStubsPtr->tk_QueueWindowEvent) /* 154 */
-#endif
-#ifndef Tk_RedrawImage
 #define Tk_RedrawImage \
 	(tkStubsPtr->tk_RedrawImage) /* 155 */
-#endif
-#ifndef Tk_ResizeWindow
 #define Tk_ResizeWindow \
 	(tkStubsPtr->tk_ResizeWindow) /* 156 */
-#endif
-#ifndef Tk_RestackWindow
 #define Tk_RestackWindow \
 	(tkStubsPtr->tk_RestackWindow) /* 157 */
-#endif
-#ifndef Tk_RestrictEvents
 #define Tk_RestrictEvents \
 	(tkStubsPtr->tk_RestrictEvents) /* 158 */
-#endif
-#ifndef Tk_SafeInit
 #define Tk_SafeInit \
 	(tkStubsPtr->tk_SafeInit) /* 159 */
-#endif
-#ifndef Tk_SetAppName
 #define Tk_SetAppName \
 	(tkStubsPtr->tk_SetAppName) /* 160 */
-#endif
-#ifndef Tk_SetBackgroundFromBorder
 #define Tk_SetBackgroundFromBorder \
 	(tkStubsPtr->tk_SetBackgroundFromBorder) /* 161 */
-#endif
-#ifndef Tk_SetClass
 #define Tk_SetClass \
 	(tkStubsPtr->tk_SetClass) /* 162 */
-#endif
-#ifndef Tk_SetGrid
 #define Tk_SetGrid \
 	(tkStubsPtr->tk_SetGrid) /* 163 */
-#endif
-#ifndef Tk_SetInternalBorder
 #define Tk_SetInternalBorder \
 	(tkStubsPtr->tk_SetInternalBorder) /* 164 */
-#endif
-#ifndef Tk_SetWindowBackground
 #define Tk_SetWindowBackground \
 	(tkStubsPtr->tk_SetWindowBackground) /* 165 */
-#endif
-#ifndef Tk_SetWindowBackgroundPixmap
 #define Tk_SetWindowBackgroundPixmap \
 	(tkStubsPtr->tk_SetWindowBackgroundPixmap) /* 166 */
-#endif
-#ifndef Tk_SetWindowBorder
 #define Tk_SetWindowBorder \
 	(tkStubsPtr->tk_SetWindowBorder) /* 167 */
-#endif
-#ifndef Tk_SetWindowBorderWidth
 #define Tk_SetWindowBorderWidth \
 	(tkStubsPtr->tk_SetWindowBorderWidth) /* 168 */
-#endif
-#ifndef Tk_SetWindowBorderPixmap
 #define Tk_SetWindowBorderPixmap \
 	(tkStubsPtr->tk_SetWindowBorderPixmap) /* 169 */
-#endif
-#ifndef Tk_SetWindowColormap
 #define Tk_SetWindowColormap \
 	(tkStubsPtr->tk_SetWindowColormap) /* 170 */
-#endif
-#ifndef Tk_SetWindowVisual
 #define Tk_SetWindowVisual \
 	(tkStubsPtr->tk_SetWindowVisual) /* 171 */
-#endif
-#ifndef Tk_SizeOfBitmap
 #define Tk_SizeOfBitmap \
 	(tkStubsPtr->tk_SizeOfBitmap) /* 172 */
-#endif
-#ifndef Tk_SizeOfImage
 #define Tk_SizeOfImage \
 	(tkStubsPtr->tk_SizeOfImage) /* 173 */
-#endif
-#ifndef Tk_StrictMotif
 #define Tk_StrictMotif \
 	(tkStubsPtr->tk_StrictMotif) /* 174 */
-#endif
-#ifndef Tk_TextLayoutToPostscript
 #define Tk_TextLayoutToPostscript \
 	(tkStubsPtr->tk_TextLayoutToPostscript) /* 175 */
-#endif
-#ifndef Tk_TextWidth
 #define Tk_TextWidth \
 	(tkStubsPtr->tk_TextWidth) /* 176 */
-#endif
-#ifndef Tk_UndefineCursor
 #define Tk_UndefineCursor \
 	(tkStubsPtr->tk_UndefineCursor) /* 177 */
-#endif
-#ifndef Tk_UnderlineChars
 #define Tk_UnderlineChars \
 	(tkStubsPtr->tk_UnderlineChars) /* 178 */
-#endif
-#ifndef Tk_UnderlineTextLayout
 #define Tk_UnderlineTextLayout \
 	(tkStubsPtr->tk_UnderlineTextLayout) /* 179 */
-#endif
-#ifndef Tk_Ungrab
 #define Tk_Ungrab \
 	(tkStubsPtr->tk_Ungrab) /* 180 */
-#endif
-#ifndef Tk_UnmaintainGeometry
 #define Tk_UnmaintainGeometry \
 	(tkStubsPtr->tk_UnmaintainGeometry) /* 181 */
-#endif
-#ifndef Tk_UnmapWindow
 #define Tk_UnmapWindow \
 	(tkStubsPtr->tk_UnmapWindow) /* 182 */
-#endif
-#ifndef Tk_UnsetGrid
 #define Tk_UnsetGrid \
 	(tkStubsPtr->tk_UnsetGrid) /* 183 */
-#endif
-#ifndef Tk_UpdatePointer
 #define Tk_UpdatePointer \
 	(tkStubsPtr->tk_UpdatePointer) /* 184 */
-#endif
-#ifndef Tk_AllocBitmapFromObj
 #define Tk_AllocBitmapFromObj \
 	(tkStubsPtr->tk_AllocBitmapFromObj) /* 185 */
-#endif
-#ifndef Tk_Alloc3DBorderFromObj
 #define Tk_Alloc3DBorderFromObj \
 	(tkStubsPtr->tk_Alloc3DBorderFromObj) /* 186 */
-#endif
-#ifndef Tk_AllocColorFromObj
 #define Tk_AllocColorFromObj \
 	(tkStubsPtr->tk_AllocColorFromObj) /* 187 */
-#endif
-#ifndef Tk_AllocCursorFromObj
 #define Tk_AllocCursorFromObj \
 	(tkStubsPtr->tk_AllocCursorFromObj) /* 188 */
-#endif
-#ifndef Tk_AllocFontFromObj
 #define Tk_AllocFontFromObj \
 	(tkStubsPtr->tk_AllocFontFromObj) /* 189 */
-#endif
-#ifndef Tk_CreateOptionTable
 #define Tk_CreateOptionTable \
 	(tkStubsPtr->tk_CreateOptionTable) /* 190 */
-#endif
-#ifndef Tk_DeleteOptionTable
 #define Tk_DeleteOptionTable \
 	(tkStubsPtr->tk_DeleteOptionTable) /* 191 */
-#endif
-#ifndef Tk_Free3DBorderFromObj
 #define Tk_Free3DBorderFromObj \
 	(tkStubsPtr->tk_Free3DBorderFromObj) /* 192 */
-#endif
-#ifndef Tk_FreeBitmapFromObj
 #define Tk_FreeBitmapFromObj \
 	(tkStubsPtr->tk_FreeBitmapFromObj) /* 193 */
-#endif
-#ifndef Tk_FreeColorFromObj
 #define Tk_FreeColorFromObj \
 	(tkStubsPtr->tk_FreeColorFromObj) /* 194 */
-#endif
-#ifndef Tk_FreeConfigOptions
 #define Tk_FreeConfigOptions \
 	(tkStubsPtr->tk_FreeConfigOptions) /* 195 */
-#endif
-#ifndef Tk_FreeSavedOptions
 #define Tk_FreeSavedOptions \
 	(tkStubsPtr->tk_FreeSavedOptions) /* 196 */
-#endif
-#ifndef Tk_FreeCursorFromObj
 #define Tk_FreeCursorFromObj \
 	(tkStubsPtr->tk_FreeCursorFromObj) /* 197 */
-#endif
-#ifndef Tk_FreeFontFromObj
 #define Tk_FreeFontFromObj \
 	(tkStubsPtr->tk_FreeFontFromObj) /* 198 */
-#endif
-#ifndef Tk_Get3DBorderFromObj
 #define Tk_Get3DBorderFromObj \
 	(tkStubsPtr->tk_Get3DBorderFromObj) /* 199 */
-#endif
-#ifndef Tk_GetAnchorFromObj
 #define Tk_GetAnchorFromObj \
 	(tkStubsPtr->tk_GetAnchorFromObj) /* 200 */
-#endif
-#ifndef Tk_GetBitmapFromObj
 #define Tk_GetBitmapFromObj \
 	(tkStubsPtr->tk_GetBitmapFromObj) /* 201 */
-#endif
-#ifndef Tk_GetColorFromObj
 #define Tk_GetColorFromObj \
 	(tkStubsPtr->tk_GetColorFromObj) /* 202 */
-#endif
-#ifndef Tk_GetCursorFromObj
 #define Tk_GetCursorFromObj \
 	(tkStubsPtr->tk_GetCursorFromObj) /* 203 */
-#endif
-#ifndef Tk_GetOptionInfo
 #define Tk_GetOptionInfo \
 	(tkStubsPtr->tk_GetOptionInfo) /* 204 */
-#endif
-#ifndef Tk_GetOptionValue
 #define Tk_GetOptionValue \
 	(tkStubsPtr->tk_GetOptionValue) /* 205 */
-#endif
-#ifndef Tk_GetJustifyFromObj
 #define Tk_GetJustifyFromObj \
 	(tkStubsPtr->tk_GetJustifyFromObj) /* 206 */
-#endif
-#ifndef Tk_GetMMFromObj
 #define Tk_GetMMFromObj \
 	(tkStubsPtr->tk_GetMMFromObj) /* 207 */
-#endif
-#ifndef Tk_GetPixelsFromObj
 #define Tk_GetPixelsFromObj \
 	(tkStubsPtr->tk_GetPixelsFromObj) /* 208 */
-#endif
-#ifndef Tk_GetReliefFromObj
 #define Tk_GetReliefFromObj \
 	(tkStubsPtr->tk_GetReliefFromObj) /* 209 */
-#endif
-#ifndef Tk_GetScrollInfoObj
 #define Tk_GetScrollInfoObj \
 	(tkStubsPtr->tk_GetScrollInfoObj) /* 210 */
-#endif
-#ifndef Tk_InitOptions
 #define Tk_InitOptions \
 	(tkStubsPtr->tk_InitOptions) /* 211 */
-#endif
-#ifndef Tk_MainEx
 #define Tk_MainEx \
 	(tkStubsPtr->tk_MainEx) /* 212 */
-#endif
-#ifndef Tk_RestoreSavedOptions
 #define Tk_RestoreSavedOptions \
 	(tkStubsPtr->tk_RestoreSavedOptions) /* 213 */
-#endif
-#ifndef Tk_SetOptions
 #define Tk_SetOptions \
 	(tkStubsPtr->tk_SetOptions) /* 214 */
-#endif
-#ifndef Tk_InitConsoleChannels
 #define Tk_InitConsoleChannels \
 	(tkStubsPtr->tk_InitConsoleChannels) /* 215 */
-#endif
-#ifndef Tk_CreateConsoleWindow
 #define Tk_CreateConsoleWindow \
 	(tkStubsPtr->tk_CreateConsoleWindow) /* 216 */
-#endif
-#ifndef Tk_CreateSmoothMethod
 #define Tk_CreateSmoothMethod \
 	(tkStubsPtr->tk_CreateSmoothMethod) /* 217 */
-#endif
 /* Slot 218 is reserved */
 /* Slot 219 is reserved */
-#ifndef Tk_GetDash
 #define Tk_GetDash \
 	(tkStubsPtr->tk_GetDash) /* 220 */
-#endif
-#ifndef Tk_CreateOutline
 #define Tk_CreateOutline \
 	(tkStubsPtr->tk_CreateOutline) /* 221 */
-#endif
-#ifndef Tk_DeleteOutline
 #define Tk_DeleteOutline \
 	(tkStubsPtr->tk_DeleteOutline) /* 222 */
-#endif
-#ifndef Tk_ConfigOutlineGC
 #define Tk_ConfigOutlineGC \
 	(tkStubsPtr->tk_ConfigOutlineGC) /* 223 */
-#endif
-#ifndef Tk_ChangeOutlineGC
 #define Tk_ChangeOutlineGC \
 	(tkStubsPtr->tk_ChangeOutlineGC) /* 224 */
-#endif
-#ifndef Tk_ResetOutlineGC
 #define Tk_ResetOutlineGC \
 	(tkStubsPtr->tk_ResetOutlineGC) /* 225 */
-#endif
-#ifndef Tk_CanvasPsOutline
 #define Tk_CanvasPsOutline \
 	(tkStubsPtr->tk_CanvasPsOutline) /* 226 */
-#endif
-#ifndef Tk_SetTSOrigin
 #define Tk_SetTSOrigin \
 	(tkStubsPtr->tk_SetTSOrigin) /* 227 */
-#endif
-#ifndef Tk_CanvasGetCoordFromObj
 #define Tk_CanvasGetCoordFromObj \
 	(tkStubsPtr->tk_CanvasGetCoordFromObj) /* 228 */
-#endif
-#ifndef Tk_CanvasSetOffset
 #define Tk_CanvasSetOffset \
 	(tkStubsPtr->tk_CanvasSetOffset) /* 229 */
-#endif
-#ifndef Tk_DitherPhoto
 #define Tk_DitherPhoto \
 	(tkStubsPtr->tk_DitherPhoto) /* 230 */
-#endif
-#ifndef Tk_PostscriptBitmap
 #define Tk_PostscriptBitmap \
 	(tkStubsPtr->tk_PostscriptBitmap) /* 231 */
-#endif
-#ifndef Tk_PostscriptColor
 #define Tk_PostscriptColor \
 	(tkStubsPtr->tk_PostscriptColor) /* 232 */
-#endif
-#ifndef Tk_PostscriptFont
 #define Tk_PostscriptFont \
 	(tkStubsPtr->tk_PostscriptFont) /* 233 */
-#endif
-#ifndef Tk_PostscriptImage
 #define Tk_PostscriptImage \
 	(tkStubsPtr->tk_PostscriptImage) /* 234 */
-#endif
-#ifndef Tk_PostscriptPath
 #define Tk_PostscriptPath \
 	(tkStubsPtr->tk_PostscriptPath) /* 235 */
-#endif
-#ifndef Tk_PostscriptStipple
 #define Tk_PostscriptStipple \
 	(tkStubsPtr->tk_PostscriptStipple) /* 236 */
-#endif
-#ifndef Tk_PostscriptY
 #define Tk_PostscriptY \
 	(tkStubsPtr->tk_PostscriptY) /* 237 */
-#endif
-#ifndef Tk_PostscriptPhoto
 #define Tk_PostscriptPhoto \
 	(tkStubsPtr->tk_PostscriptPhoto) /* 238 */
-#endif
-#ifndef Tk_CreateClientMessageHandler
 #define Tk_CreateClientMessageHandler \
 	(tkStubsPtr->tk_CreateClientMessageHandler) /* 239 */
-#endif
-#ifndef Tk_DeleteClientMessageHandler
 #define Tk_DeleteClientMessageHandler \
 	(tkStubsPtr->tk_DeleteClientMessageHandler) /* 240 */
-#endif
-#ifndef Tk_CreateAnonymousWindow
 #define Tk_CreateAnonymousWindow \
 	(tkStubsPtr->tk_CreateAnonymousWindow) /* 241 */
-#endif
-#ifndef Tk_SetClassProcs
 #define Tk_SetClassProcs \
 	(tkStubsPtr->tk_SetClassProcs) /* 242 */
-#endif
-#ifndef Tk_SetInternalBorderEx
 #define Tk_SetInternalBorderEx \
 	(tkStubsPtr->tk_SetInternalBorderEx) /* 243 */
-#endif
-#ifndef Tk_SetMinimumRequestSize
 #define Tk_SetMinimumRequestSize \
 	(tkStubsPtr->tk_SetMinimumRequestSize) /* 244 */
-#endif
-#ifndef Tk_SetCaretPos
 #define Tk_SetCaretPos \
 	(tkStubsPtr->tk_SetCaretPos) /* 245 */
-#endif
-#ifndef Tk_PhotoPutBlock_Panic
 #define Tk_PhotoPutBlock_Panic \
 	(tkStubsPtr->tk_PhotoPutBlock_Panic) /* 246 */
-#endif
-#ifndef Tk_PhotoPutZoomedBlock_Panic
 #define Tk_PhotoPutZoomedBlock_Panic \
 	(tkStubsPtr->tk_PhotoPutZoomedBlock_Panic) /* 247 */
-#endif
-#ifndef Tk_CollapseMotionEvents
 #define Tk_CollapseMotionEvents \
 	(tkStubsPtr->tk_CollapseMotionEvents) /* 248 */
-#endif
-#ifndef Tk_RegisterStyleEngine
 #define Tk_RegisterStyleEngine \
 	(tkStubsPtr->tk_RegisterStyleEngine) /* 249 */
-#endif
-#ifndef Tk_GetStyleEngine
 #define Tk_GetStyleEngine \
 	(tkStubsPtr->tk_GetStyleEngine) /* 250 */
-#endif
-#ifndef Tk_RegisterStyledElement
 #define Tk_RegisterStyledElement \
 	(tkStubsPtr->tk_RegisterStyledElement) /* 251 */
-#endif
-#ifndef Tk_GetElementId
 #define Tk_GetElementId \
 	(tkStubsPtr->tk_GetElementId) /* 252 */
-#endif
-#ifndef Tk_CreateStyle
 #define Tk_CreateStyle \
 	(tkStubsPtr->tk_CreateStyle) /* 253 */
-#endif
-#ifndef Tk_GetStyle
 #define Tk_GetStyle \
 	(tkStubsPtr->tk_GetStyle) /* 254 */
-#endif
-#ifndef Tk_FreeStyle
 #define Tk_FreeStyle \
 	(tkStubsPtr->tk_FreeStyle) /* 255 */
-#endif
-#ifndef Tk_NameOfStyle
 #define Tk_NameOfStyle \
 	(tkStubsPtr->tk_NameOfStyle) /* 256 */
-#endif
-#ifndef Tk_AllocStyleFromObj
 #define Tk_AllocStyleFromObj \
 	(tkStubsPtr->tk_AllocStyleFromObj) /* 257 */
-#endif
-#ifndef Tk_GetStyleFromObj
 #define Tk_GetStyleFromObj \
 	(tkStubsPtr->tk_GetStyleFromObj) /* 258 */
-#endif
-#ifndef Tk_FreeStyleFromObj
 #define Tk_FreeStyleFromObj \
 	(tkStubsPtr->tk_FreeStyleFromObj) /* 259 */
-#endif
-#ifndef Tk_GetStyledElement
 #define Tk_GetStyledElement \
 	(tkStubsPtr->tk_GetStyledElement) /* 260 */
-#endif
-#ifndef Tk_GetElementSize
 #define Tk_GetElementSize \
 	(tkStubsPtr->tk_GetElementSize) /* 261 */
-#endif
-#ifndef Tk_GetElementBox
 #define Tk_GetElementBox \
 	(tkStubsPtr->tk_GetElementBox) /* 262 */
-#endif
-#ifndef Tk_GetElementBorderWidth
 #define Tk_GetElementBorderWidth \
 	(tkStubsPtr->tk_GetElementBorderWidth) /* 263 */
-#endif
-#ifndef Tk_DrawElement
 #define Tk_DrawElement \
 	(tkStubsPtr->tk_DrawElement) /* 264 */
-#endif
-#ifndef Tk_PhotoExpand
 #define Tk_PhotoExpand \
 	(tkStubsPtr->tk_PhotoExpand) /* 265 */
-#endif
-#ifndef Tk_PhotoPutBlock
 #define Tk_PhotoPutBlock \
 	(tkStubsPtr->tk_PhotoPutBlock) /* 266 */
-#endif
-#ifndef Tk_PhotoPutZoomedBlock
 #define Tk_PhotoPutZoomedBlock \
 	(tkStubsPtr->tk_PhotoPutZoomedBlock) /* 267 */
-#endif
-#ifndef Tk_PhotoSetSize
 #define Tk_PhotoSetSize \
 	(tkStubsPtr->tk_PhotoSetSize) /* 268 */
-#endif
-#ifndef Tk_GetUserInactiveTime
 #define Tk_GetUserInactiveTime \
 	(tkStubsPtr->tk_GetUserInactiveTime) /* 269 */
-#endif
-#ifndef Tk_ResetUserInactiveTime
 #define Tk_ResetUserInactiveTime \
 	(tkStubsPtr->tk_ResetUserInactiveTime) /* 270 */
-#endif
-#ifndef Tk_Interp
 #define Tk_Interp \
 	(tkStubsPtr->tk_Interp) /* 271 */
-#endif
-#ifndef Tk_CreateOldImageType
 #define Tk_CreateOldImageType \
 	(tkStubsPtr->tk_CreateOldImageType) /* 272 */
-#endif
-#ifndef Tk_CreateOldPhotoImageFormat
 #define Tk_CreateOldPhotoImageFormat \
 	(tkStubsPtr->tk_CreateOldPhotoImageFormat) /* 273 */
-#endif
 /* Slot 274 is reserved */
-#ifndef TkUnusedStubEntry
+/* Slot 275 is reserved */
+/* Slot 276 is reserved */
+/* Slot 277 is reserved */
+/* Slot 278 is reserved */
+/* Slot 279 is reserved */
 #define TkUnusedStubEntry \
-	(tkStubsPtr->tkUnusedStubEntry) /* 275 */
-#endif
+	(tkStubsPtr->tkUnusedStubEntry) /* 280 */
 
-#endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
+#endif /* defined(USE_TK_STUBS) */
 
 /* !END!: Do not edit above this line. */
 
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h
index d0a091d..fd9ff07 100644
--- a/generic/tkIntDecls.h
+++ b/generic/tkIntDecls.h
@@ -36,702 +36,336 @@ extern "C" {
  * Exported function declarations:
  */
 
-#ifndef TkAllocWindow_TCL_DECLARED
-#define TkAllocWindow_TCL_DECLARED
 /* 0 */
 EXTERN TkWindow *	TkAllocWindow(TkDisplay *dispPtr, int screenNum,
 				TkWindow *parentPtr);
-#endif
-#ifndef TkBezierPoints_TCL_DECLARED
-#define TkBezierPoints_TCL_DECLARED
 /* 1 */
 EXTERN void		TkBezierPoints(double control[], int numSteps,
 				double *coordPtr);
-#endif
-#ifndef TkBezierScreenPoints_TCL_DECLARED
-#define TkBezierScreenPoints_TCL_DECLARED
 /* 2 */
 EXTERN void		TkBezierScreenPoints(Tk_Canvas canvas,
 				double control[], int numSteps,
 				XPoint *xPointPtr);
-#endif
-#ifndef TkBindDeadWindow_TCL_DECLARED
-#define TkBindDeadWindow_TCL_DECLARED
 /* 3 */
 EXTERN void		TkBindDeadWindow(TkWindow *winPtr);
-#endif
-#ifndef TkBindEventProc_TCL_DECLARED
-#define TkBindEventProc_TCL_DECLARED
 /* 4 */
 EXTERN void		TkBindEventProc(TkWindow *winPtr, XEvent *eventPtr);
-#endif
-#ifndef TkBindFree_TCL_DECLARED
-#define TkBindFree_TCL_DECLARED
 /* 5 */
 EXTERN void		TkBindFree(TkMainInfo *mainPtr);
-#endif
-#ifndef TkBindInit_TCL_DECLARED
-#define TkBindInit_TCL_DECLARED
 /* 6 */
 EXTERN void		TkBindInit(TkMainInfo *mainPtr);
-#endif
-#ifndef TkChangeEventWindow_TCL_DECLARED
-#define TkChangeEventWindow_TCL_DECLARED
 /* 7 */
 EXTERN void		TkChangeEventWindow(XEvent *eventPtr,
 				TkWindow *winPtr);
-#endif
-#ifndef TkClipInit_TCL_DECLARED
-#define TkClipInit_TCL_DECLARED
 /* 8 */
 EXTERN int		TkClipInit(Tcl_Interp *interp, TkDisplay *dispPtr);
-#endif
-#ifndef TkComputeAnchor_TCL_DECLARED
-#define TkComputeAnchor_TCL_DECLARED
 /* 9 */
 EXTERN void		TkComputeAnchor(Tk_Anchor anchor, Tk_Window tkwin,
 				int padX, int padY, int innerWidth,
 				int innerHeight, int *xPtr, int *yPtr);
-#endif
-#ifndef TkCopyAndGlobalEval_TCL_DECLARED
-#define TkCopyAndGlobalEval_TCL_DECLARED
 /* 10 */
 EXTERN int		TkCopyAndGlobalEval(Tcl_Interp *interp, char *script);
-#endif
-#ifndef TkCreateBindingProcedure_TCL_DECLARED
-#define TkCreateBindingProcedure_TCL_DECLARED
 /* 11 */
 EXTERN unsigned long	TkCreateBindingProcedure(Tcl_Interp *interp,
 				Tk_BindingTable bindingTable,
-				ClientData object, CONST char *eventString,
+				ClientData object, const char *eventString,
 				TkBindEvalProc *evalProc,
 				TkBindFreeProc *freeProc,
 				ClientData clientData);
-#endif
-#ifndef TkCreateCursorFromData_TCL_DECLARED
-#define TkCreateCursorFromData_TCL_DECLARED
 /* 12 */
 EXTERN TkCursor *	TkCreateCursorFromData(Tk_Window tkwin,
-				CONST char *source, CONST char *mask,
+				const char *source, const char *mask,
 				int width, int height, int xHot, int yHot,
 				XColor fg, XColor bg);
-#endif
-#ifndef TkCreateFrame_TCL_DECLARED
-#define TkCreateFrame_TCL_DECLARED
 /* 13 */
 EXTERN int		TkCreateFrame(ClientData clientData,
 				Tcl_Interp *interp, int argc, char **argv,
 				int toplevel, char *appName);
-#endif
-#ifndef TkCreateMainWindow_TCL_DECLARED
-#define TkCreateMainWindow_TCL_DECLARED
 /* 14 */
 EXTERN Tk_Window	TkCreateMainWindow(Tcl_Interp *interp,
-				CONST char *screenName, char *baseName);
-#endif
-#ifndef TkCurrentTime_TCL_DECLARED
-#define TkCurrentTime_TCL_DECLARED
+				const char *screenName, char *baseName);
 /* 15 */
 EXTERN Time		TkCurrentTime(TkDisplay *dispPtr);
-#endif
-#ifndef TkDeleteAllImages_TCL_DECLARED
-#define TkDeleteAllImages_TCL_DECLARED
 /* 16 */
 EXTERN void		TkDeleteAllImages(TkMainInfo *mainPtr);
-#endif
-#ifndef TkDoConfigureNotify_TCL_DECLARED
-#define TkDoConfigureNotify_TCL_DECLARED
 /* 17 */
 EXTERN void		TkDoConfigureNotify(TkWindow *winPtr);
-#endif
-#ifndef TkDrawInsetFocusHighlight_TCL_DECLARED
-#define TkDrawInsetFocusHighlight_TCL_DECLARED
 /* 18 */
 EXTERN void		TkDrawInsetFocusHighlight(Tk_Window tkwin, GC gc,
 				int width, Drawable drawable, int padding);
-#endif
-#ifndef TkEventDeadWindow_TCL_DECLARED
-#define TkEventDeadWindow_TCL_DECLARED
 /* 19 */
 EXTERN void		TkEventDeadWindow(TkWindow *winPtr);
-#endif
-#ifndef TkFillPolygon_TCL_DECLARED
-#define TkFillPolygon_TCL_DECLARED
 /* 20 */
 EXTERN void		TkFillPolygon(Tk_Canvas canvas, double *coordPtr,
 				int numPoints, Display *display,
 				Drawable drawable, GC gc, GC outlineGC);
-#endif
-#ifndef TkFindStateNum_TCL_DECLARED
-#define TkFindStateNum_TCL_DECLARED
 /* 21 */
 EXTERN int		TkFindStateNum(Tcl_Interp *interp,
-				CONST char *option, CONST TkStateMap *mapPtr,
-				CONST char *strKey);
-#endif
-#ifndef TkFindStateString_TCL_DECLARED
-#define TkFindStateString_TCL_DECLARED
+				const char *option, const TkStateMap *mapPtr,
+				const char *strKey);
 /* 22 */
-EXTERN char *		TkFindStateString(CONST TkStateMap *mapPtr,
+EXTERN char *		TkFindStateString(const TkStateMap *mapPtr,
 				int numKey);
-#endif
-#ifndef TkFocusDeadWindow_TCL_DECLARED
-#define TkFocusDeadWindow_TCL_DECLARED
 /* 23 */
 EXTERN void		TkFocusDeadWindow(TkWindow *winPtr);
-#endif
-#ifndef TkFocusFilterEvent_TCL_DECLARED
-#define TkFocusFilterEvent_TCL_DECLARED
 /* 24 */
 EXTERN int		TkFocusFilterEvent(TkWindow *winPtr,
 				XEvent *eventPtr);
-#endif
-#ifndef TkFocusKeyEvent_TCL_DECLARED
-#define TkFocusKeyEvent_TCL_DECLARED
 /* 25 */
 EXTERN TkWindow *	TkFocusKeyEvent(TkWindow *winPtr, XEvent *eventPtr);
-#endif
-#ifndef TkFontPkgInit_TCL_DECLARED
-#define TkFontPkgInit_TCL_DECLARED
 /* 26 */
 EXTERN void		TkFontPkgInit(TkMainInfo *mainPtr);
-#endif
-#ifndef TkFontPkgFree_TCL_DECLARED
-#define TkFontPkgFree_TCL_DECLARED
 /* 27 */
 EXTERN void		TkFontPkgFree(TkMainInfo *mainPtr);
-#endif
-#ifndef TkFreeBindingTags_TCL_DECLARED
-#define TkFreeBindingTags_TCL_DECLARED
 /* 28 */
 EXTERN void		TkFreeBindingTags(TkWindow *winPtr);
-#endif
-#ifndef TkpFreeCursor_TCL_DECLARED
-#define TkpFreeCursor_TCL_DECLARED
 /* 29 */
 EXTERN void		TkpFreeCursor(TkCursor *cursorPtr);
-#endif
-#ifndef TkGetBitmapData_TCL_DECLARED
-#define TkGetBitmapData_TCL_DECLARED
 /* 30 */
 EXTERN char *		TkGetBitmapData(Tcl_Interp *interp, char *string,
 				char *fileName, int *widthPtr,
 				int *heightPtr, int *hotXPtr, int *hotYPtr);
-#endif
-#ifndef TkGetButtPoints_TCL_DECLARED
-#define TkGetButtPoints_TCL_DECLARED
 /* 31 */
 EXTERN void		TkGetButtPoints(double p1[], double p2[],
 				double width, int project, double m1[],
 				double m2[]);
-#endif
-#ifndef TkGetCursorByName_TCL_DECLARED
-#define TkGetCursorByName_TCL_DECLARED
 /* 32 */
 EXTERN TkCursor *	TkGetCursorByName(Tcl_Interp *interp,
 				Tk_Window tkwin, Tk_Uid string);
-#endif
-#ifndef TkGetDefaultScreenName_TCL_DECLARED
-#define TkGetDefaultScreenName_TCL_DECLARED
 /* 33 */
 EXTERN CONST84_RETURN char * TkGetDefaultScreenName(Tcl_Interp *interp,
-				CONST char *screenName);
-#endif
-#ifndef TkGetDisplay_TCL_DECLARED
-#define TkGetDisplay_TCL_DECLARED
+				const char *screenName);
 /* 34 */
 EXTERN TkDisplay *	TkGetDisplay(Display *display);
-#endif
-#ifndef TkGetDisplayOf_TCL_DECLARED
-#define TkGetDisplayOf_TCL_DECLARED
 /* 35 */
 EXTERN int		TkGetDisplayOf(Tcl_Interp *interp, int objc,
-				Tcl_Obj *CONST objv[], Tk_Window *tkwinPtr);
-#endif
-#ifndef TkGetFocusWin_TCL_DECLARED
-#define TkGetFocusWin_TCL_DECLARED
+				Tcl_Obj *const objv[], Tk_Window *tkwinPtr);
 /* 36 */
 EXTERN TkWindow *	TkGetFocusWin(TkWindow *winPtr);
-#endif
-#ifndef TkGetInterpNames_TCL_DECLARED
-#define TkGetInterpNames_TCL_DECLARED
 /* 37 */
 EXTERN int		TkGetInterpNames(Tcl_Interp *interp, Tk_Window tkwin);
-#endif
-#ifndef TkGetMiterPoints_TCL_DECLARED
-#define TkGetMiterPoints_TCL_DECLARED
 /* 38 */
 EXTERN int		TkGetMiterPoints(double p1[], double p2[],
 				double p3[], double width, double m1[],
 				double m2[]);
-#endif
-#ifndef TkGetPointerCoords_TCL_DECLARED
-#define TkGetPointerCoords_TCL_DECLARED
 /* 39 */
 EXTERN void		TkGetPointerCoords(Tk_Window tkwin, int *xPtr,
 				int *yPtr);
-#endif
-#ifndef TkGetServerInfo_TCL_DECLARED
-#define TkGetServerInfo_TCL_DECLARED
 /* 40 */
 EXTERN void		TkGetServerInfo(Tcl_Interp *interp, Tk_Window tkwin);
-#endif
-#ifndef TkGrabDeadWindow_TCL_DECLARED
-#define TkGrabDeadWindow_TCL_DECLARED
 /* 41 */
 EXTERN void		TkGrabDeadWindow(TkWindow *winPtr);
-#endif
-#ifndef TkGrabState_TCL_DECLARED
-#define TkGrabState_TCL_DECLARED
 /* 42 */
 EXTERN int		TkGrabState(TkWindow *winPtr);
-#endif
-#ifndef TkIncludePoint_TCL_DECLARED
-#define TkIncludePoint_TCL_DECLARED
 /* 43 */
 EXTERN void		TkIncludePoint(Tk_Item *itemPtr, double *pointPtr);
-#endif
-#ifndef TkInOutEvents_TCL_DECLARED
-#define TkInOutEvents_TCL_DECLARED
 /* 44 */
 EXTERN void		TkInOutEvents(XEvent *eventPtr, TkWindow *sourcePtr,
 				TkWindow *destPtr, int leaveType,
 				int enterType, Tcl_QueuePosition position);
-#endif
-#ifndef TkInstallFrameMenu_TCL_DECLARED
-#define TkInstallFrameMenu_TCL_DECLARED
 /* 45 */
 EXTERN void		TkInstallFrameMenu(Tk_Window tkwin);
-#endif
-#ifndef TkKeysymToString_TCL_DECLARED
-#define TkKeysymToString_TCL_DECLARED
 /* 46 */
 EXTERN char *		TkKeysymToString(KeySym keysym);
-#endif
-#ifndef TkLineToArea_TCL_DECLARED
-#define TkLineToArea_TCL_DECLARED
 /* 47 */
 EXTERN int		TkLineToArea(double end1Ptr[], double end2Ptr[],
 				double rectPtr[]);
-#endif
-#ifndef TkLineToPoint_TCL_DECLARED
-#define TkLineToPoint_TCL_DECLARED
 /* 48 */
 EXTERN double		TkLineToPoint(double end1Ptr[], double end2Ptr[],
 				double pointPtr[]);
-#endif
-#ifndef TkMakeBezierCurve_TCL_DECLARED
-#define TkMakeBezierCurve_TCL_DECLARED
 /* 49 */
 EXTERN int		TkMakeBezierCurve(Tk_Canvas canvas, double *pointPtr,
 				int numPoints, int numSteps,
 				XPoint xPoints[], double dblPoints[]);
-#endif
-#ifndef TkMakeBezierPostscript_TCL_DECLARED
-#define TkMakeBezierPostscript_TCL_DECLARED
 /* 50 */
 EXTERN void		TkMakeBezierPostscript(Tcl_Interp *interp,
 				Tk_Canvas canvas, double *pointPtr,
 				int numPoints);
-#endif
-#ifndef TkOptionClassChanged_TCL_DECLARED
-#define TkOptionClassChanged_TCL_DECLARED
 /* 51 */
 EXTERN void		TkOptionClassChanged(TkWindow *winPtr);
-#endif
-#ifndef TkOptionDeadWindow_TCL_DECLARED
-#define TkOptionDeadWindow_TCL_DECLARED
 /* 52 */
 EXTERN void		TkOptionDeadWindow(TkWindow *winPtr);
-#endif
-#ifndef TkOvalToArea_TCL_DECLARED
-#define TkOvalToArea_TCL_DECLARED
 /* 53 */
 EXTERN int		TkOvalToArea(double *ovalPtr, double *rectPtr);
-#endif
-#ifndef TkOvalToPoint_TCL_DECLARED
-#define TkOvalToPoint_TCL_DECLARED
 /* 54 */
 EXTERN double		TkOvalToPoint(double ovalPtr[], double width,
 				int filled, double pointPtr[]);
-#endif
-#ifndef TkpChangeFocus_TCL_DECLARED
-#define TkpChangeFocus_TCL_DECLARED
 /* 55 */
 EXTERN int		TkpChangeFocus(TkWindow *winPtr, int force);
-#endif
-#ifndef TkpCloseDisplay_TCL_DECLARED
-#define TkpCloseDisplay_TCL_DECLARED
 /* 56 */
 EXTERN void		TkpCloseDisplay(TkDisplay *dispPtr);
-#endif
-#ifndef TkpClaimFocus_TCL_DECLARED
-#define TkpClaimFocus_TCL_DECLARED
 /* 57 */
 EXTERN void		TkpClaimFocus(TkWindow *topLevelPtr, int force);
-#endif
-#ifndef TkpDisplayWarning_TCL_DECLARED
-#define TkpDisplayWarning_TCL_DECLARED
 /* 58 */
-EXTERN void		TkpDisplayWarning(CONST char *msg, CONST char *title);
-#endif
-#ifndef TkpGetAppName_TCL_DECLARED
-#define TkpGetAppName_TCL_DECLARED
+EXTERN void		TkpDisplayWarning(const char *msg, const char *title);
 /* 59 */
 EXTERN void		TkpGetAppName(Tcl_Interp *interp, Tcl_DString *name);
-#endif
-#ifndef TkpGetOtherWindow_TCL_DECLARED
-#define TkpGetOtherWindow_TCL_DECLARED
 /* 60 */
 EXTERN TkWindow *	TkpGetOtherWindow(TkWindow *winPtr);
-#endif
-#ifndef TkpGetWrapperWindow_TCL_DECLARED
-#define TkpGetWrapperWindow_TCL_DECLARED
 /* 61 */
 EXTERN TkWindow *	TkpGetWrapperWindow(TkWindow *winPtr);
-#endif
-#ifndef TkpInit_TCL_DECLARED
-#define TkpInit_TCL_DECLARED
 /* 62 */
 EXTERN int		TkpInit(Tcl_Interp *interp);
-#endif
-#ifndef TkpInitializeMenuBindings_TCL_DECLARED
-#define TkpInitializeMenuBindings_TCL_DECLARED
 /* 63 */
 EXTERN void		TkpInitializeMenuBindings(Tcl_Interp *interp,
 				Tk_BindingTable bindingTable);
-#endif
-#ifndef TkpMakeContainer_TCL_DECLARED
-#define TkpMakeContainer_TCL_DECLARED
 /* 64 */
 EXTERN void		TkpMakeContainer(Tk_Window tkwin);
-#endif
-#ifndef TkpMakeMenuWindow_TCL_DECLARED
-#define TkpMakeMenuWindow_TCL_DECLARED
 /* 65 */
 EXTERN void		TkpMakeMenuWindow(Tk_Window tkwin, int transient);
-#endif
-#ifndef TkpMakeWindow_TCL_DECLARED
-#define TkpMakeWindow_TCL_DECLARED
 /* 66 */
 EXTERN Window		TkpMakeWindow(TkWindow *winPtr, Window parent);
-#endif
-#ifndef TkpMenuNotifyToplevelCreate_TCL_DECLARED
-#define TkpMenuNotifyToplevelCreate_TCL_DECLARED
 /* 67 */
 EXTERN void		TkpMenuNotifyToplevelCreate(Tcl_Interp *interp,
 				char *menuName);
-#endif
-#ifndef TkpOpenDisplay_TCL_DECLARED
-#define TkpOpenDisplay_TCL_DECLARED
 /* 68 */
-EXTERN TkDisplay *	TkpOpenDisplay(CONST char *display_name);
-#endif
-#ifndef TkPointerEvent_TCL_DECLARED
-#define TkPointerEvent_TCL_DECLARED
+EXTERN TkDisplay *	TkpOpenDisplay(const char *display_name);
 /* 69 */
 EXTERN int		TkPointerEvent(XEvent *eventPtr, TkWindow *winPtr);
-#endif
-#ifndef TkPolygonToArea_TCL_DECLARED
-#define TkPolygonToArea_TCL_DECLARED
 /* 70 */
 EXTERN int		TkPolygonToArea(double *polyPtr, int numPoints,
 				double *rectPtr);
-#endif
-#ifndef TkPolygonToPoint_TCL_DECLARED
-#define TkPolygonToPoint_TCL_DECLARED
 /* 71 */
 EXTERN double		TkPolygonToPoint(double *polyPtr, int numPoints,
 				double *pointPtr);
-#endif
-#ifndef TkPositionInTree_TCL_DECLARED
-#define TkPositionInTree_TCL_DECLARED
 /* 72 */
 EXTERN int		TkPositionInTree(TkWindow *winPtr, TkWindow *treePtr);
-#endif
-#ifndef TkpRedirectKeyEvent_TCL_DECLARED
-#define TkpRedirectKeyEvent_TCL_DECLARED
 /* 73 */
 EXTERN void		TkpRedirectKeyEvent(TkWindow *winPtr,
 				XEvent *eventPtr);
-#endif
-#ifndef TkpSetMainMenubar_TCL_DECLARED
-#define TkpSetMainMenubar_TCL_DECLARED
 /* 74 */
 EXTERN void		TkpSetMainMenubar(Tcl_Interp *interp,
 				Tk_Window tkwin, char *menuName);
-#endif
-#ifndef TkpUseWindow_TCL_DECLARED
-#define TkpUseWindow_TCL_DECLARED
 /* 75 */
 EXTERN int		TkpUseWindow(Tcl_Interp *interp, Tk_Window tkwin,
-				CONST char *string);
-#endif
-#ifndef TkpWindowWasRecentlyDeleted_TCL_DECLARED
-#define TkpWindowWasRecentlyDeleted_TCL_DECLARED
+				const char *string);
 /* 76 */
 EXTERN int		TkpWindowWasRecentlyDeleted(Window win,
 				TkDisplay *dispPtr);
-#endif
-#ifndef TkQueueEventForAllChildren_TCL_DECLARED
-#define TkQueueEventForAllChildren_TCL_DECLARED
 /* 77 */
 EXTERN void		TkQueueEventForAllChildren(TkWindow *winPtr,
 				XEvent *eventPtr);
-#endif
-#ifndef TkReadBitmapFile_TCL_DECLARED
-#define TkReadBitmapFile_TCL_DECLARED
 /* 78 */
 EXTERN int		TkReadBitmapFile(Display *display, Drawable d,
-				CONST char *filename,
+				const char *filename,
 				unsigned int *width_return,
 				unsigned int *height_return,
 				Pixmap *bitmap_return, int *x_hot_return,
 				int *y_hot_return);
-#endif
-#ifndef TkScrollWindow_TCL_DECLARED
-#define TkScrollWindow_TCL_DECLARED
 /* 79 */
 EXTERN int		TkScrollWindow(Tk_Window tkwin, GC gc, int x, int y,
 				int width, int height, int dx, int dy,
 				TkRegion damageRgn);
-#endif
-#ifndef TkSelDeadWindow_TCL_DECLARED
-#define TkSelDeadWindow_TCL_DECLARED
 /* 80 */
 EXTERN void		TkSelDeadWindow(TkWindow *winPtr);
-#endif
-#ifndef TkSelEventProc_TCL_DECLARED
-#define TkSelEventProc_TCL_DECLARED
 /* 81 */
 EXTERN void		TkSelEventProc(Tk_Window tkwin, XEvent *eventPtr);
-#endif
-#ifndef TkSelInit_TCL_DECLARED
-#define TkSelInit_TCL_DECLARED
 /* 82 */
 EXTERN void		TkSelInit(Tk_Window tkwin);
-#endif
-#ifndef TkSelPropProc_TCL_DECLARED
-#define TkSelPropProc_TCL_DECLARED
 /* 83 */
 EXTERN void		TkSelPropProc(XEvent *eventPtr);
-#endif
 /* Slot 84 is reserved */
-#ifndef TkSetWindowMenuBar_TCL_DECLARED
-#define TkSetWindowMenuBar_TCL_DECLARED
 /* 85 */
 EXTERN void		TkSetWindowMenuBar(Tcl_Interp *interp,
 				Tk_Window tkwin, char *oldMenuName,
 				char *menuName);
-#endif
-#ifndef TkStringToKeysym_TCL_DECLARED
-#define TkStringToKeysym_TCL_DECLARED
 /* 86 */
 EXTERN KeySym		TkStringToKeysym(char *name);
-#endif
-#ifndef TkThickPolyLineToArea_TCL_DECLARED
-#define TkThickPolyLineToArea_TCL_DECLARED
 /* 87 */
 EXTERN int		TkThickPolyLineToArea(double *coordPtr,
 				int numPoints, double width, int capStyle,
 				int joinStyle, double *rectPtr);
-#endif
-#ifndef TkWmAddToColormapWindows_TCL_DECLARED
-#define TkWmAddToColormapWindows_TCL_DECLARED
 /* 88 */
 EXTERN void		TkWmAddToColormapWindows(TkWindow *winPtr);
-#endif
-#ifndef TkWmDeadWindow_TCL_DECLARED
-#define TkWmDeadWindow_TCL_DECLARED
 /* 89 */
 EXTERN void		TkWmDeadWindow(TkWindow *winPtr);
-#endif
-#ifndef TkWmFocusToplevel_TCL_DECLARED
-#define TkWmFocusToplevel_TCL_DECLARED
 /* 90 */
 EXTERN TkWindow *	TkWmFocusToplevel(TkWindow *winPtr);
-#endif
-#ifndef TkWmMapWindow_TCL_DECLARED
-#define TkWmMapWindow_TCL_DECLARED
 /* 91 */
 EXTERN void		TkWmMapWindow(TkWindow *winPtr);
-#endif
-#ifndef TkWmNewWindow_TCL_DECLARED
-#define TkWmNewWindow_TCL_DECLARED
 /* 92 */
 EXTERN void		TkWmNewWindow(TkWindow *winPtr);
-#endif
-#ifndef TkWmProtocolEventProc_TCL_DECLARED
-#define TkWmProtocolEventProc_TCL_DECLARED
 /* 93 */
 EXTERN void		TkWmProtocolEventProc(TkWindow *winPtr,
 				XEvent *evenvPtr);
-#endif
-#ifndef TkWmRemoveFromColormapWindows_TCL_DECLARED
-#define TkWmRemoveFromColormapWindows_TCL_DECLARED
 /* 94 */
 EXTERN void		TkWmRemoveFromColormapWindows(TkWindow *winPtr);
-#endif
-#ifndef TkWmRestackToplevel_TCL_DECLARED
-#define TkWmRestackToplevel_TCL_DECLARED
 /* 95 */
 EXTERN void		TkWmRestackToplevel(TkWindow *winPtr, int aboveBelow,
 				TkWindow *otherPtr);
-#endif
-#ifndef TkWmSetClass_TCL_DECLARED
-#define TkWmSetClass_TCL_DECLARED
 /* 96 */
 EXTERN void		TkWmSetClass(TkWindow *winPtr);
-#endif
-#ifndef TkWmUnmapWindow_TCL_DECLARED
-#define TkWmUnmapWindow_TCL_DECLARED
 /* 97 */
 EXTERN void		TkWmUnmapWindow(TkWindow *winPtr);
-#endif
-#ifndef TkDebugBitmap_TCL_DECLARED
-#define TkDebugBitmap_TCL_DECLARED
 /* 98 */
 EXTERN Tcl_Obj *	TkDebugBitmap(Tk_Window tkwin, char *name);
-#endif
-#ifndef TkDebugBorder_TCL_DECLARED
-#define TkDebugBorder_TCL_DECLARED
 /* 99 */
 EXTERN Tcl_Obj *	TkDebugBorder(Tk_Window tkwin, char *name);
-#endif
-#ifndef TkDebugCursor_TCL_DECLARED
-#define TkDebugCursor_TCL_DECLARED
 /* 100 */
 EXTERN Tcl_Obj *	TkDebugCursor(Tk_Window tkwin, char *name);
-#endif
-#ifndef TkDebugColor_TCL_DECLARED
-#define TkDebugColor_TCL_DECLARED
 /* 101 */
 EXTERN Tcl_Obj *	TkDebugColor(Tk_Window tkwin, char *name);
-#endif
-#ifndef TkDebugConfig_TCL_DECLARED
-#define TkDebugConfig_TCL_DECLARED
 /* 102 */
 EXTERN Tcl_Obj *	TkDebugConfig(Tcl_Interp *interp,
 				Tk_OptionTable table);
-#endif
-#ifndef TkDebugFont_TCL_DECLARED
-#define TkDebugFont_TCL_DECLARED
 /* 103 */
 EXTERN Tcl_Obj *	TkDebugFont(Tk_Window tkwin, char *name);
-#endif
-#ifndef TkFindStateNumObj_TCL_DECLARED
-#define TkFindStateNumObj_TCL_DECLARED
 /* 104 */
 EXTERN int		TkFindStateNumObj(Tcl_Interp *interp,
-				Tcl_Obj *optionPtr, CONST TkStateMap *mapPtr,
+				Tcl_Obj *optionPtr, const TkStateMap *mapPtr,
 				Tcl_Obj *keyPtr);
-#endif
-#ifndef TkGetBitmapPredefTable_TCL_DECLARED
-#define TkGetBitmapPredefTable_TCL_DECLARED
 /* 105 */
 EXTERN Tcl_HashTable *	TkGetBitmapPredefTable(void);
-#endif
-#ifndef TkGetDisplayList_TCL_DECLARED
-#define TkGetDisplayList_TCL_DECLARED
 /* 106 */
 EXTERN TkDisplay *	TkGetDisplayList(void);
-#endif
-#ifndef TkGetMainInfoList_TCL_DECLARED
-#define TkGetMainInfoList_TCL_DECLARED
 /* 107 */
 EXTERN TkMainInfo *	TkGetMainInfoList(void);
-#endif
-#ifndef TkGetWindowFromObj_TCL_DECLARED
-#define TkGetWindowFromObj_TCL_DECLARED
 /* 108 */
 EXTERN int		TkGetWindowFromObj(Tcl_Interp *interp,
 				Tk_Window tkwin, Tcl_Obj *objPtr,
 				Tk_Window *windowPtr);
-#endif
-#ifndef TkpGetString_TCL_DECLARED
-#define TkpGetString_TCL_DECLARED
 /* 109 */
 EXTERN char *		TkpGetString(TkWindow *winPtr, XEvent *eventPtr,
 				Tcl_DString *dsPtr);
-#endif
-#ifndef TkpGetSubFonts_TCL_DECLARED
-#define TkpGetSubFonts_TCL_DECLARED
 /* 110 */
 EXTERN void		TkpGetSubFonts(Tcl_Interp *interp, Tk_Font tkfont);
-#endif
-#ifndef TkpGetSystemDefault_TCL_DECLARED
-#define TkpGetSystemDefault_TCL_DECLARED
 /* 111 */
 EXTERN Tcl_Obj *	TkpGetSystemDefault(Tk_Window tkwin,
-				CONST char *dbName, CONST char *className);
-#endif
-#ifndef TkpMenuThreadInit_TCL_DECLARED
-#define TkpMenuThreadInit_TCL_DECLARED
+				const char *dbName, const char *className);
 /* 112 */
 EXTERN void		TkpMenuThreadInit(void);
-#endif
-#ifndef TkClipBox_TCL_DECLARED
-#define TkClipBox_TCL_DECLARED
 /* 113 */
 EXTERN void		TkClipBox(TkRegion rgn, XRectangle *rect_return);
-#endif
-#ifndef TkCreateRegion_TCL_DECLARED
-#define TkCreateRegion_TCL_DECLARED
 /* 114 */
 EXTERN TkRegion		TkCreateRegion(void);
-#endif
-#ifndef TkDestroyRegion_TCL_DECLARED
-#define TkDestroyRegion_TCL_DECLARED
 /* 115 */
 EXTERN void		TkDestroyRegion(TkRegion rgn);
-#endif
-#ifndef TkIntersectRegion_TCL_DECLARED
-#define TkIntersectRegion_TCL_DECLARED
 /* 116 */
 EXTERN void		TkIntersectRegion(TkRegion sra, TkRegion srcb,
 				TkRegion dr_return);
-#endif
-#ifndef TkRectInRegion_TCL_DECLARED
-#define TkRectInRegion_TCL_DECLARED
 /* 117 */
 EXTERN int		TkRectInRegion(TkRegion rgn, int x, int y,
 				unsigned int width, unsigned int height);
-#endif
-#ifndef TkSetRegion_TCL_DECLARED
-#define TkSetRegion_TCL_DECLARED
 /* 118 */
 EXTERN void		TkSetRegion(Display *display, GC gc, TkRegion rgn);
-#endif
-#ifndef TkUnionRectWithRegion_TCL_DECLARED
-#define TkUnionRectWithRegion_TCL_DECLARED
 /* 119 */
 EXTERN void		TkUnionRectWithRegion(XRectangle *rect, TkRegion src,
 				TkRegion dr_return);
-#endif
 /* Slot 120 is reserved */
 #ifdef MAC_OSX_TK /* AQUA */
-#ifndef TkpCreateNativeBitmap_TCL_DECLARED
-#define TkpCreateNativeBitmap_TCL_DECLARED
 /* 121 */
 EXTERN Pixmap		TkpCreateNativeBitmap(Display *display,
-				CONST char *source);
-#endif
+				const char *source);
 #endif /* AQUA */
 #ifdef MAC_OSX_TK /* AQUA */
-#ifndef TkpDefineNativeBitmaps_TCL_DECLARED
-#define TkpDefineNativeBitmaps_TCL_DECLARED
 /* 122 */
 EXTERN void		TkpDefineNativeBitmaps(void);
-#endif
 #endif /* AQUA */
 /* Slot 123 is reserved */
 #ifdef MAC_OSX_TK /* AQUA */
-#ifndef TkpGetNativeAppBitmap_TCL_DECLARED
-#define TkpGetNativeAppBitmap_TCL_DECLARED
 /* 124 */
 EXTERN Pixmap		TkpGetNativeAppBitmap(Display *display,
-				CONST char *name, int *width, int *height);
-#endif
+				const char *name, int *width, int *height);
 #endif /* AQUA */
 /* Slot 125 is reserved */
 /* Slot 126 is reserved */
@@ -743,134 +377,68 @@ EXTERN Pixmap		TkpGetNativeAppBitmap(Display *display,
 /* Slot 132 is reserved */
 /* Slot 133 is reserved */
 /* Slot 134 is reserved */
-#ifndef TkpDrawHighlightBorder_TCL_DECLARED
-#define TkpDrawHighlightBorder_TCL_DECLARED
 /* 135 */
 EXTERN void		TkpDrawHighlightBorder(Tk_Window tkwin, GC fgGC,
 				GC bgGC, int highlightWidth,
 				Drawable drawable);
-#endif
-#ifndef TkSetFocusWin_TCL_DECLARED
-#define TkSetFocusWin_TCL_DECLARED
 /* 136 */
 EXTERN void		TkSetFocusWin(TkWindow *winPtr, int force);
-#endif
-#ifndef TkpSetKeycodeAndState_TCL_DECLARED
-#define TkpSetKeycodeAndState_TCL_DECLARED
 /* 137 */
 EXTERN void		TkpSetKeycodeAndState(Tk_Window tkwin, KeySym keySym,
 				XEvent *eventPtr);
-#endif
-#ifndef TkpGetKeySym_TCL_DECLARED
-#define TkpGetKeySym_TCL_DECLARED
 /* 138 */
 EXTERN KeySym		TkpGetKeySym(TkDisplay *dispPtr, XEvent *eventPtr);
-#endif
-#ifndef TkpInitKeymapInfo_TCL_DECLARED
-#define TkpInitKeymapInfo_TCL_DECLARED
 /* 139 */
 EXTERN void		TkpInitKeymapInfo(TkDisplay *dispPtr);
-#endif
-#ifndef TkPhotoGetValidRegion_TCL_DECLARED
-#define TkPhotoGetValidRegion_TCL_DECLARED
 /* 140 */
 EXTERN TkRegion		TkPhotoGetValidRegion(Tk_PhotoHandle handle);
-#endif
-#ifndef TkWmStackorderToplevel_TCL_DECLARED
-#define TkWmStackorderToplevel_TCL_DECLARED
 /* 141 */
 EXTERN TkWindow **	TkWmStackorderToplevel(TkWindow *parentPtr);
-#endif
-#ifndef TkFocusFree_TCL_DECLARED
-#define TkFocusFree_TCL_DECLARED
 /* 142 */
 EXTERN void		TkFocusFree(TkMainInfo *mainPtr);
-#endif
-#ifndef TkClipCleanup_TCL_DECLARED
-#define TkClipCleanup_TCL_DECLARED
 /* 143 */
 EXTERN void		TkClipCleanup(TkDisplay *dispPtr);
-#endif
-#ifndef TkGCCleanup_TCL_DECLARED
-#define TkGCCleanup_TCL_DECLARED
 /* 144 */
 EXTERN void		TkGCCleanup(TkDisplay *dispPtr);
-#endif
-#ifndef TkSubtractRegion_TCL_DECLARED
-#define TkSubtractRegion_TCL_DECLARED
 /* 145 */
 EXTERN void		TkSubtractRegion(TkRegion sra, TkRegion srcb,
 				TkRegion dr_return);
-#endif
-#ifndef TkStylePkgInit_TCL_DECLARED
-#define TkStylePkgInit_TCL_DECLARED
 /* 146 */
 EXTERN void		TkStylePkgInit(TkMainInfo *mainPtr);
-#endif
-#ifndef TkStylePkgFree_TCL_DECLARED
-#define TkStylePkgFree_TCL_DECLARED
 /* 147 */
 EXTERN void		TkStylePkgFree(TkMainInfo *mainPtr);
-#endif
-#ifndef TkToplevelWindowForCommand_TCL_DECLARED
-#define TkToplevelWindowForCommand_TCL_DECLARED
 /* 148 */
 EXTERN Tk_Window	TkToplevelWindowForCommand(Tcl_Interp *interp,
-				CONST char *cmdName);
-#endif
-#ifndef TkGetOptionSpec_TCL_DECLARED
-#define TkGetOptionSpec_TCL_DECLARED
+				const char *cmdName);
 /* 149 */
-EXTERN CONST Tk_OptionSpec * TkGetOptionSpec(CONST char *name,
+EXTERN const Tk_OptionSpec * TkGetOptionSpec(const char *name,
 				Tk_OptionTable optionTable);
-#endif
-#ifndef TkMakeRawCurve_TCL_DECLARED
-#define TkMakeRawCurve_TCL_DECLARED
 /* 150 */
 EXTERN int		TkMakeRawCurve(Tk_Canvas canvas, double *pointPtr,
 				int numPoints, int numSteps,
 				XPoint xPoints[], double dblPoints[]);
-#endif
-#ifndef TkMakeRawCurvePostscript_TCL_DECLARED
-#define TkMakeRawCurvePostscript_TCL_DECLARED
 /* 151 */
 EXTERN void		TkMakeRawCurvePostscript(Tcl_Interp *interp,
 				Tk_Canvas canvas, double *pointPtr,
 				int numPoints);
-#endif
-#ifndef TkpDrawFrame_TCL_DECLARED
-#define TkpDrawFrame_TCL_DECLARED
 /* 152 */
 EXTERN void		TkpDrawFrame(Tk_Window tkwin, Tk_3DBorder border,
 				int highlightWidth, int borderWidth,
 				int relief);
-#endif
-#ifndef TkCreateThreadExitHandler_TCL_DECLARED
-#define TkCreateThreadExitHandler_TCL_DECLARED
 /* 153 */
 EXTERN void		TkCreateThreadExitHandler(Tcl_ExitProc *proc,
 				ClientData clientData);
-#endif
-#ifndef TkDeleteThreadExitHandler_TCL_DECLARED
-#define TkDeleteThreadExitHandler_TCL_DECLARED
 /* 154 */
 EXTERN void		TkDeleteThreadExitHandler(Tcl_ExitProc *proc,
 				ClientData clientData);
-#endif
 /* Slot 155 is reserved */
-#ifndef TkpTestembedCmd_TCL_DECLARED
-#define TkpTestembedCmd_TCL_DECLARED
 /* 156 */
 EXTERN int		TkpTestembedCmd(ClientData clientData,
 				Tcl_Interp *interp, int argc,
-				CONST char **argv);
-#endif
-#ifndef TkpTesttextCmd_TCL_DECLARED
-#define TkpTesttextCmd_TCL_DECLARED
+				const char **argv);
 /* 157 */
 EXTERN int		TkpTesttextCmd(ClientData dummy, Tcl_Interp *interp,
-				int argc, CONST char **argv);
-#endif
+				int argc, const char **argv);
 /* Slot 158 is reserved */
 /* Slot 159 is reserved */
 /* Slot 160 is reserved */
@@ -882,104 +450,65 @@ EXTERN int		TkpTesttextCmd(ClientData dummy, Tcl_Interp *interp,
 /* Slot 166 is reserved */
 /* Slot 167 is reserved */
 /* Slot 168 is reserved */
-#ifndef TkStateParseProc_TCL_DECLARED
-#define TkStateParseProc_TCL_DECLARED
 /* 169 */
 EXTERN int		TkStateParseProc(ClientData clientData,
 				Tcl_Interp *interp, Tk_Window tkwin,
-				CONST char *value, char *widgRec, int offset);
-#endif
-#ifndef TkStatePrintProc_TCL_DECLARED
-#define TkStatePrintProc_TCL_DECLARED
+				const char *value, char *widgRec, int offset);
 /* 170 */
 EXTERN char *		TkStatePrintProc(ClientData clientData,
 				Tk_Window tkwin, char *widgRec, int offset,
 				Tcl_FreeProc **freeProcPtr);
-#endif
-#ifndef TkCanvasDashParseProc_TCL_DECLARED
-#define TkCanvasDashParseProc_TCL_DECLARED
 /* 171 */
 EXTERN int		TkCanvasDashParseProc(ClientData clientData,
 				Tcl_Interp *interp, Tk_Window tkwin,
-				CONST char *value, char *widgRec, int offset);
-#endif
-#ifndef TkCanvasDashPrintProc_TCL_DECLARED
-#define TkCanvasDashPrintProc_TCL_DECLARED
+				const char *value, char *widgRec, int offset);
 /* 172 */
 EXTERN char *		TkCanvasDashPrintProc(ClientData clientData,
 				Tk_Window tkwin, char *widgRec, int offset,
 				Tcl_FreeProc **freeProcPtr);
-#endif
-#ifndef TkOffsetParseProc_TCL_DECLARED
-#define TkOffsetParseProc_TCL_DECLARED
 /* 173 */
 EXTERN int		TkOffsetParseProc(ClientData clientData,
 				Tcl_Interp *interp, Tk_Window tkwin,
-				CONST char *value, char *widgRec, int offset);
-#endif
-#ifndef TkOffsetPrintProc_TCL_DECLARED
-#define TkOffsetPrintProc_TCL_DECLARED
+				const char *value, char *widgRec, int offset);
 /* 174 */
 EXTERN char *		TkOffsetPrintProc(ClientData clientData,
 				Tk_Window tkwin, char *widgRec, int offset,
 				Tcl_FreeProc **freeProcPtr);
-#endif
-#ifndef TkPixelParseProc_TCL_DECLARED
-#define TkPixelParseProc_TCL_DECLARED
 /* 175 */
 EXTERN int		TkPixelParseProc(ClientData clientData,
 				Tcl_Interp *interp, Tk_Window tkwin,
-				CONST char *value, char *widgRec, int offset);
-#endif
-#ifndef TkPixelPrintProc_TCL_DECLARED
-#define TkPixelPrintProc_TCL_DECLARED
+				const char *value, char *widgRec, int offset);
 /* 176 */
 EXTERN char *		TkPixelPrintProc(ClientData clientData,
 				Tk_Window tkwin, char *widgRec, int offset,
 				Tcl_FreeProc **freeProcPtr);
-#endif
-#ifndef TkOrientParseProc_TCL_DECLARED
-#define TkOrientParseProc_TCL_DECLARED
 /* 177 */
 EXTERN int		TkOrientParseProc(ClientData clientData,
 				Tcl_Interp *interp, Tk_Window tkwin,
-				CONST char *value, char *widgRec, int offset);
-#endif
-#ifndef TkOrientPrintProc_TCL_DECLARED
-#define TkOrientPrintProc_TCL_DECLARED
+				const char *value, char *widgRec, int offset);
 /* 178 */
 EXTERN char *		TkOrientPrintProc(ClientData clientData,
 				Tk_Window tkwin, char *widgRec, int offset,
 				Tcl_FreeProc **freeProcPtr);
-#endif
-#ifndef TkSmoothParseProc_TCL_DECLARED
-#define TkSmoothParseProc_TCL_DECLARED
 /* 179 */
 EXTERN int		TkSmoothParseProc(ClientData clientData,
 				Tcl_Interp *interp, Tk_Window tkwin,
-				CONST char *value, char *widgRec, int offset);
-#endif
-#ifndef TkSmoothPrintProc_TCL_DECLARED
-#define TkSmoothPrintProc_TCL_DECLARED
+				const char *value, char *widgRec, int offset);
 /* 180 */
 EXTERN char *		TkSmoothPrintProc(ClientData clientData,
 				Tk_Window tkwin, char *widgRec, int offset,
 				Tcl_FreeProc **freeProcPtr);
-#endif
 /* Slot 181 is reserved */
 /* Slot 182 is reserved */
 /* Slot 183 is reserved */
 /* Slot 184 is reserved */
 /* Slot 185 is reserved */
-#ifndef TkUnusedStubEntry_TCL_DECLARED
-#define TkUnusedStubEntry_TCL_DECLARED
 /* 186 */
 EXTERN void		TkUnusedStubEntry(void);
-#endif
 
 typedef struct TkIntStubs {
     int magic;
-    struct TkIntStubHooks *hooks;
+    void *hooks;
 
     TkWindow * (*tkAllocWindow) (TkDisplay *dispPtr, int screenNum, TkWindow *parentPtr); /* 0 */
     void (*tkBezierPoints) (double control[], int numSteps, double *coordPtr); /* 1 */
@@ -992,18 +521,18 @@ typedef struct TkIntStubs {
     int (*tkClipInit) (Tcl_Interp *interp, TkDisplay *dispPtr); /* 8 */
     void (*tkComputeAnchor) (Tk_Anchor anchor, Tk_Window tkwin, int padX, int padY, int innerWidth, int innerHeight, int *xPtr, int *yPtr); /* 9 */
     int (*tkCopyAndGlobalEval) (Tcl_Interp *interp, char *script); /* 10 */
-    unsigned long (*tkCreateBindingProcedure) (Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, CONST char *eventString, TkBindEvalProc *evalProc, TkBindFreeProc *freeProc, ClientData clientData); /* 11 */
-    TkCursor * (*tkCreateCursorFromData) (Tk_Window tkwin, CONST char *source, CONST char *mask, int width, int height, int xHot, int yHot, XColor fg, XColor bg); /* 12 */
+    unsigned long (*tkCreateBindingProcedure) (Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, const char *eventString, TkBindEvalProc *evalProc, TkBindFreeProc *freeProc, ClientData clientData); /* 11 */
+    TkCursor * (*tkCreateCursorFromData) (Tk_Window tkwin, const char *source, const char *mask, int width, int height, int xHot, int yHot, XColor fg, XColor bg); /* 12 */
     int (*tkCreateFrame) (ClientData clientData, Tcl_Interp *interp, int argc, char **argv, int toplevel, char *appName); /* 13 */
-    Tk_Window (*tkCreateMainWindow) (Tcl_Interp *interp, CONST char *screenName, char *baseName); /* 14 */
+    Tk_Window (*tkCreateMainWindow) (Tcl_Interp *interp, const char *screenName, char *baseName); /* 14 */
     Time (*tkCurrentTime) (TkDisplay *dispPtr); /* 15 */
     void (*tkDeleteAllImages) (TkMainInfo *mainPtr); /* 16 */
     void (*tkDoConfigureNotify) (TkWindow *winPtr); /* 17 */
     void (*tkDrawInsetFocusHighlight) (Tk_Window tkwin, GC gc, int width, Drawable drawable, int padding); /* 18 */
     void (*tkEventDeadWindow) (TkWindow *winPtr); /* 19 */
     void (*tkFillPolygon) (Tk_Canvas canvas, double *coordPtr, int numPoints, Display *display, Drawable drawable, GC gc, GC outlineGC); /* 20 */
-    int (*tkFindStateNum) (Tcl_Interp *interp, CONST char *option, CONST TkStateMap *mapPtr, CONST char *strKey); /* 21 */
-    char * (*tkFindStateString) (CONST TkStateMap *mapPtr, int numKey); /* 22 */
+    int (*tkFindStateNum) (Tcl_Interp *interp, const char *option, const TkStateMap *mapPtr, const char *strKey); /* 21 */
+    char * (*tkFindStateString) (const TkStateMap *mapPtr, int numKey); /* 22 */
     void (*tkFocusDeadWindow) (TkWindow *winPtr); /* 23 */
     int (*tkFocusFilterEvent) (TkWindow *winPtr, XEvent *eventPtr); /* 24 */
     TkWindow * (*tkFocusKeyEvent) (TkWindow *winPtr, XEvent *eventPtr); /* 25 */
@@ -1014,9 +543,9 @@ typedef struct TkIntStubs {
     char * (*tkGetBitmapData) (Tcl_Interp *interp, char *string, char *fileName, int *widthPtr, int *heightPtr, int *hotXPtr, int *hotYPtr); /* 30 */
     void (*tkGetButtPoints) (double p1[], double p2[], double width, int project, double m1[], double m2[]); /* 31 */
     TkCursor * (*tkGetCursorByName) (Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid string); /* 32 */
-    CONST84_RETURN char * (*tkGetDefaultScreenName) (Tcl_Interp *interp, CONST char *screenName); /* 33 */
+    CONST84_RETURN char * (*tkGetDefaultScreenName) (Tcl_Interp *interp, const char *screenName); /* 33 */
     TkDisplay * (*tkGetDisplay) (Display *display); /* 34 */
-    int (*tkGetDisplayOf) (Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], Tk_Window *tkwinPtr); /* 35 */
+    int (*tkGetDisplayOf) (Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], Tk_Window *tkwinPtr); /* 35 */
     TkWindow * (*tkGetFocusWin) (TkWindow *winPtr); /* 36 */
     int (*tkGetInterpNames) (Tcl_Interp *interp, Tk_Window tkwin); /* 37 */
     int (*tkGetMiterPoints) (double p1[], double p2[], double p3[], double width, double m1[], double m2[]); /* 38 */
@@ -1039,7 +568,7 @@ typedef struct TkIntStubs {
     int (*tkpChangeFocus) (TkWindow *winPtr, int force); /* 55 */
     void (*tkpCloseDisplay) (TkDisplay *dispPtr); /* 56 */
     void (*tkpClaimFocus) (TkWindow *topLevelPtr, int force); /* 57 */
-    void (*tkpDisplayWarning) (CONST char *msg, CONST char *title); /* 58 */
+    void (*tkpDisplayWarning) (const char *msg, const char *title); /* 58 */
     void (*tkpGetAppName) (Tcl_Interp *interp, Tcl_DString *name); /* 59 */
     TkWindow * (*tkpGetOtherWindow) (TkWindow *winPtr); /* 60 */
     TkWindow * (*tkpGetWrapperWindow) (TkWindow *winPtr); /* 61 */
@@ -1049,23 +578,23 @@ typedef struct TkIntStubs {
     void (*tkpMakeMenuWindow) (Tk_Window tkwin, int transient); /* 65 */
     Window (*tkpMakeWindow) (TkWindow *winPtr, Window parent); /* 66 */
     void (*tkpMenuNotifyToplevelCreate) (Tcl_Interp *interp, char *menuName); /* 67 */
-    TkDisplay * (*tkpOpenDisplay) (CONST char *display_name); /* 68 */
+    TkDisplay * (*tkpOpenDisplay) (const char *display_name); /* 68 */
     int (*tkPointerEvent) (XEvent *eventPtr, TkWindow *winPtr); /* 69 */
     int (*tkPolygonToArea) (double *polyPtr, int numPoints, double *rectPtr); /* 70 */
     double (*tkPolygonToPoint) (double *polyPtr, int numPoints, double *pointPtr); /* 71 */
     int (*tkPositionInTree) (TkWindow *winPtr, TkWindow *treePtr); /* 72 */
     void (*tkpRedirectKeyEvent) (TkWindow *winPtr, XEvent *eventPtr); /* 73 */
     void (*tkpSetMainMenubar) (Tcl_Interp *interp, Tk_Window tkwin, char *menuName); /* 74 */
-    int (*tkpUseWindow) (Tcl_Interp *interp, Tk_Window tkwin, CONST char *string); /* 75 */
+    int (*tkpUseWindow) (Tcl_Interp *interp, Tk_Window tkwin, const char *string); /* 75 */
     int (*tkpWindowWasRecentlyDeleted) (Window win, TkDisplay *dispPtr); /* 76 */
     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 */
+    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 */
     int (*tkScrollWindow) (Tk_Window tkwin, GC gc, int x, int y, int width, int height, int dx, int dy, TkRegion damageRgn); /* 79 */
     void (*tkSelDeadWindow) (TkWindow *winPtr); /* 80 */
     void (*tkSelEventProc) (Tk_Window tkwin, XEvent *eventPtr); /* 81 */
     void (*tkSelInit) (Tk_Window tkwin); /* 82 */
     void (*tkSelPropProc) (XEvent *eventPtr); /* 83 */
-    VOID *reserved84;
+    void (*reserved84)(void);
     void (*tkSetWindowMenuBar) (Tcl_Interp *interp, Tk_Window tkwin, char *oldMenuName, char *menuName); /* 85 */
     KeySym (*tkStringToKeysym) (char *name); /* 86 */
     int (*tkThickPolyLineToArea) (double *coordPtr, int numPoints, double width, int capStyle, int joinStyle, double *rectPtr); /* 87 */
@@ -1085,14 +614,14 @@ typedef struct TkIntStubs {
     Tcl_Obj * (*tkDebugColor) (Tk_Window tkwin, char *name); /* 101 */
     Tcl_Obj * (*tkDebugConfig) (Tcl_Interp *interp, Tk_OptionTable table); /* 102 */
     Tcl_Obj * (*tkDebugFont) (Tk_Window tkwin, char *name); /* 103 */
-    int (*tkFindStateNumObj) (Tcl_Interp *interp, Tcl_Obj *optionPtr, CONST TkStateMap *mapPtr, Tcl_Obj *keyPtr); /* 104 */
+    int (*tkFindStateNumObj) (Tcl_Interp *interp, Tcl_Obj *optionPtr, const TkStateMap *mapPtr, Tcl_Obj *keyPtr); /* 104 */
     Tcl_HashTable * (*tkGetBitmapPredefTable) (void); /* 105 */
     TkDisplay * (*tkGetDisplayList) (void); /* 106 */
     TkMainInfo * (*tkGetMainInfoList) (void); /* 107 */
     int (*tkGetWindowFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr, Tk_Window *windowPtr); /* 108 */
     char * (*tkpGetString) (TkWindow *winPtr, XEvent *eventPtr, Tcl_DString *dsPtr); /* 109 */
     void (*tkpGetSubFonts) (Tcl_Interp *interp, Tk_Font tkfont); /* 110 */
-    Tcl_Obj * (*tkpGetSystemDefault) (Tk_Window tkwin, CONST char *dbName, CONST char *className); /* 111 */
+    Tcl_Obj * (*tkpGetSystemDefault) (Tk_Window tkwin, const char *dbName, const char *className); /* 111 */
     void (*tkpMenuThreadInit) (void); /* 112 */
     void (*tkClipBox) (TkRegion rgn, XRectangle *rect_return); /* 113 */
     TkRegion (*tkCreateRegion) (void); /* 114 */
@@ -1101,48 +630,48 @@ typedef struct TkIntStubs {
     int (*tkRectInRegion) (TkRegion rgn, int x, int y, unsigned int width, unsigned int height); /* 117 */
     void (*tkSetRegion) (Display *display, GC gc, TkRegion rgn); /* 118 */
     void (*tkUnionRectWithRegion) (XRectangle *rect, TkRegion src, TkRegion dr_return); /* 119 */
-    VOID *reserved120;
-#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
-    VOID *reserved121;
+    void (*reserved120)(void);
+#if !(defined(_WIN32) || defined(MAC_OSX_TK)) /* X11 */
+    void (*reserved121)(void);
 #endif /* X11 */
-#if defined(__WIN32__) /* WIN */
-    VOID *reserved121;
+#if defined(_WIN32) /* WIN */
+    void (*reserved121)(void);
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    VOID *reserved121; /* Dummy entry for stubs table backwards compatibility */
-    Pixmap (*tkpCreateNativeBitmap) (Display *display, CONST char *source); /* 121 */
+    void (*reserved121)(void); /* Dummy entry for stubs table backwards compatibility */
+    Pixmap (*tkpCreateNativeBitmap) (Display *display, const char *source); /* 121 */
 #endif /* AQUA */
-#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
-    VOID *reserved122;
+#if !(defined(_WIN32) || defined(MAC_OSX_TK)) /* X11 */
+    void (*reserved122)(void);
 #endif /* X11 */
-#if defined(__WIN32__) /* WIN */
-    VOID *reserved122;
+#if defined(_WIN32) /* WIN */
+    void (*reserved122)(void);
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    VOID *reserved122; /* Dummy entry for stubs table backwards compatibility */
+    void (*reserved122)(void); /* Dummy entry for stubs table backwards compatibility */
     void (*tkpDefineNativeBitmaps) (void); /* 122 */
 #endif /* AQUA */
-    VOID *reserved123;
-#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
-    VOID *reserved124;
+    void (*reserved123)(void);
+#if !(defined(_WIN32) || defined(MAC_OSX_TK)) /* X11 */
+    void (*reserved124)(void);
 #endif /* X11 */
-#if defined(__WIN32__) /* WIN */
-    VOID *reserved124;
+#if defined(_WIN32) /* WIN */
+    void (*reserved124)(void);
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    VOID *reserved124; /* Dummy entry for stubs table backwards compatibility */
-    Pixmap (*tkpGetNativeAppBitmap) (Display *display, CONST char *name, int *width, int *height); /* 124 */
+    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 *reserved126;
-    VOID *reserved127;
-    VOID *reserved128;
-    VOID *reserved129;
-    VOID *reserved130;
-    VOID *reserved131;
-    VOID *reserved132;
-    VOID *reserved133;
-    VOID *reserved134;
+    void (*reserved125)(void);
+    void (*reserved126)(void);
+    void (*reserved127)(void);
+    void (*reserved128)(void);
+    void (*reserved129)(void);
+    void (*reserved130)(void);
+    void (*reserved131)(void);
+    void (*reserved132)(void);
+    void (*reserved133)(void);
+    void (*reserved134)(void);
     void (*tkpDrawHighlightBorder) (Tk_Window tkwin, GC fgGC, GC bgGC, int highlightWidth, Drawable drawable); /* 135 */
     void (*tkSetFocusWin) (TkWindow *winPtr, int force); /* 136 */
     void (*tkpSetKeycodeAndState) (Tk_Window tkwin, KeySym keySym, XEvent *eventPtr); /* 137 */
@@ -1156,555 +685,311 @@ typedef struct TkIntStubs {
     void (*tkSubtractRegion) (TkRegion sra, TkRegion srcb, TkRegion dr_return); /* 145 */
     void (*tkStylePkgInit) (TkMainInfo *mainPtr); /* 146 */
     void (*tkStylePkgFree) (TkMainInfo *mainPtr); /* 147 */
-    Tk_Window (*tkToplevelWindowForCommand) (Tcl_Interp *interp, CONST char *cmdName); /* 148 */
-    CONST Tk_OptionSpec * (*tkGetOptionSpec) (CONST char *name, Tk_OptionTable optionTable); /* 149 */
+    Tk_Window (*tkToplevelWindowForCommand) (Tcl_Interp *interp, const char *cmdName); /* 148 */
+    const Tk_OptionSpec * (*tkGetOptionSpec) (const char *name, Tk_OptionTable optionTable); /* 149 */
     int (*tkMakeRawCurve) (Tk_Canvas canvas, double *pointPtr, int numPoints, int numSteps, XPoint xPoints[], double dblPoints[]); /* 150 */
     void (*tkMakeRawCurvePostscript) (Tcl_Interp *interp, Tk_Canvas canvas, double *pointPtr, int numPoints); /* 151 */
     void (*tkpDrawFrame) (Tk_Window tkwin, Tk_3DBorder border, int highlightWidth, int borderWidth, int relief); /* 152 */
     void (*tkCreateThreadExitHandler) (Tcl_ExitProc *proc, ClientData clientData); /* 153 */
     void (*tkDeleteThreadExitHandler) (Tcl_ExitProc *proc, ClientData clientData); /* 154 */
-    VOID *reserved155;
-    int (*tkpTestembedCmd) (ClientData clientData, Tcl_Interp *interp, int argc, CONST char **argv); /* 156 */
-    int (*tkpTesttextCmd) (ClientData dummy, Tcl_Interp *interp, int argc, CONST char **argv); /* 157 */
-    VOID *reserved158;
-    VOID *reserved159;
-    VOID *reserved160;
-    VOID *reserved161;
-    VOID *reserved162;
-    VOID *reserved163;
-    VOID *reserved164;
-    VOID *reserved165;
-    VOID *reserved166;
-    VOID *reserved167;
-    VOID *reserved168;
-    int (*tkStateParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, CONST char *value, char *widgRec, int offset); /* 169 */
+    void (*reserved155)(void);
+    int (*tkpTestembedCmd) (ClientData clientData, Tcl_Interp *interp, int argc, const char **argv); /* 156 */
+    int (*tkpTesttextCmd) (ClientData dummy, Tcl_Interp *interp, int argc, const char **argv); /* 157 */
+    void (*reserved158)(void);
+    void (*reserved159)(void);
+    void (*reserved160)(void);
+    void (*reserved161)(void);
+    void (*reserved162)(void);
+    void (*reserved163)(void);
+    void (*reserved164)(void);
+    void (*reserved165)(void);
+    void (*reserved166)(void);
+    void (*reserved167)(void);
+    void (*reserved168)(void);
+    int (*tkStateParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset); /* 169 */
     char * (*tkStatePrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 170 */
-    int (*tkCanvasDashParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, CONST char *value, char *widgRec, int offset); /* 171 */
+    int (*tkCanvasDashParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset); /* 171 */
     char * (*tkCanvasDashPrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 172 */
-    int (*tkOffsetParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, CONST char *value, char *widgRec, int offset); /* 173 */
+    int (*tkOffsetParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset); /* 173 */
     char * (*tkOffsetPrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 174 */
-    int (*tkPixelParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, CONST char *value, char *widgRec, int offset); /* 175 */
+    int (*tkPixelParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset); /* 175 */
     char * (*tkPixelPrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 176 */
-    int (*tkOrientParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, CONST char *value, char *widgRec, int offset); /* 177 */
+    int (*tkOrientParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset); /* 177 */
     char * (*tkOrientPrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 178 */
-    int (*tkSmoothParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, CONST char *value, char *widgRec, int offset); /* 179 */
+    int (*tkSmoothParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset); /* 179 */
     char * (*tkSmoothPrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 180 */
-    VOID *reserved181;
-    VOID *reserved182;
-    VOID *reserved183;
-    VOID *reserved184;
-    VOID *reserved185;
+    void (*reserved181)(void);
+    void (*reserved182)(void);
+    void (*reserved183)(void);
+    void (*reserved184)(void);
+    void (*reserved185)(void);
     void (*tkUnusedStubEntry) (void); /* 186 */
 } TkIntStubs;
 
-extern TkIntStubs *tkIntStubsPtr;
+extern const TkIntStubs *tkIntStubsPtr;
 
 #ifdef __cplusplus
 }
 #endif
 
-#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
+#if defined(USE_TK_STUBS)
 
 /*
  * Inline function declarations:
  */
 
-#ifndef TkAllocWindow
 #define TkAllocWindow \
 	(tkIntStubsPtr->tkAllocWindow) /* 0 */
-#endif
-#ifndef TkBezierPoints
 #define TkBezierPoints \
 	(tkIntStubsPtr->tkBezierPoints) /* 1 */
-#endif
-#ifndef TkBezierScreenPoints
 #define TkBezierScreenPoints \
 	(tkIntStubsPtr->tkBezierScreenPoints) /* 2 */
-#endif
-#ifndef TkBindDeadWindow
 #define TkBindDeadWindow \
 	(tkIntStubsPtr->tkBindDeadWindow) /* 3 */
-#endif
-#ifndef TkBindEventProc
 #define TkBindEventProc \
 	(tkIntStubsPtr->tkBindEventProc) /* 4 */
-#endif
-#ifndef TkBindFree
 #define TkBindFree \
 	(tkIntStubsPtr->tkBindFree) /* 5 */
-#endif
-#ifndef TkBindInit
 #define TkBindInit \
 	(tkIntStubsPtr->tkBindInit) /* 6 */
-#endif
-#ifndef TkChangeEventWindow
 #define TkChangeEventWindow \
 	(tkIntStubsPtr->tkChangeEventWindow) /* 7 */
-#endif
-#ifndef TkClipInit
 #define TkClipInit \
 	(tkIntStubsPtr->tkClipInit) /* 8 */
-#endif
-#ifndef TkComputeAnchor
 #define TkComputeAnchor \
 	(tkIntStubsPtr->tkComputeAnchor) /* 9 */
-#endif
-#ifndef TkCopyAndGlobalEval
 #define TkCopyAndGlobalEval \
 	(tkIntStubsPtr->tkCopyAndGlobalEval) /* 10 */
-#endif
-#ifndef TkCreateBindingProcedure
 #define TkCreateBindingProcedure \
 	(tkIntStubsPtr->tkCreateBindingProcedure) /* 11 */
-#endif
-#ifndef TkCreateCursorFromData
 #define TkCreateCursorFromData \
 	(tkIntStubsPtr->tkCreateCursorFromData) /* 12 */
-#endif
-#ifndef TkCreateFrame
 #define TkCreateFrame \
 	(tkIntStubsPtr->tkCreateFrame) /* 13 */
-#endif
-#ifndef TkCreateMainWindow
 #define TkCreateMainWindow \
 	(tkIntStubsPtr->tkCreateMainWindow) /* 14 */
-#endif
-#ifndef TkCurrentTime
 #define TkCurrentTime \
 	(tkIntStubsPtr->tkCurrentTime) /* 15 */
-#endif
-#ifndef TkDeleteAllImages
 #define TkDeleteAllImages \
 	(tkIntStubsPtr->tkDeleteAllImages) /* 16 */
-#endif
-#ifndef TkDoConfigureNotify
 #define TkDoConfigureNotify \
 	(tkIntStubsPtr->tkDoConfigureNotify) /* 17 */
-#endif
-#ifndef TkDrawInsetFocusHighlight
 #define TkDrawInsetFocusHighlight \
 	(tkIntStubsPtr->tkDrawInsetFocusHighlight) /* 18 */
-#endif
-#ifndef TkEventDeadWindow
 #define TkEventDeadWindow \
 	(tkIntStubsPtr->tkEventDeadWindow) /* 19 */
-#endif
-#ifndef TkFillPolygon
 #define TkFillPolygon \
 	(tkIntStubsPtr->tkFillPolygon) /* 20 */
-#endif
-#ifndef TkFindStateNum
 #define TkFindStateNum \
 	(tkIntStubsPtr->tkFindStateNum) /* 21 */
-#endif
-#ifndef TkFindStateString
 #define TkFindStateString \
 	(tkIntStubsPtr->tkFindStateString) /* 22 */
-#endif
-#ifndef TkFocusDeadWindow
 #define TkFocusDeadWindow \
 	(tkIntStubsPtr->tkFocusDeadWindow) /* 23 */
-#endif
-#ifndef TkFocusFilterEvent
 #define TkFocusFilterEvent \
 	(tkIntStubsPtr->tkFocusFilterEvent) /* 24 */
-#endif
-#ifndef TkFocusKeyEvent
 #define TkFocusKeyEvent \
 	(tkIntStubsPtr->tkFocusKeyEvent) /* 25 */
-#endif
-#ifndef TkFontPkgInit
 #define TkFontPkgInit \
 	(tkIntStubsPtr->tkFontPkgInit) /* 26 */
-#endif
-#ifndef TkFontPkgFree
 #define TkFontPkgFree \
 	(tkIntStubsPtr->tkFontPkgFree) /* 27 */
-#endif
-#ifndef TkFreeBindingTags
 #define TkFreeBindingTags \
 	(tkIntStubsPtr->tkFreeBindingTags) /* 28 */
-#endif
-#ifndef TkpFreeCursor
 #define TkpFreeCursor \
 	(tkIntStubsPtr->tkpFreeCursor) /* 29 */
-#endif
-#ifndef TkGetBitmapData
 #define TkGetBitmapData \
 	(tkIntStubsPtr->tkGetBitmapData) /* 30 */
-#endif
-#ifndef TkGetButtPoints
 #define TkGetButtPoints \
 	(tkIntStubsPtr->tkGetButtPoints) /* 31 */
-#endif
-#ifndef TkGetCursorByName
 #define TkGetCursorByName \
 	(tkIntStubsPtr->tkGetCursorByName) /* 32 */
-#endif
-#ifndef TkGetDefaultScreenName
 #define TkGetDefaultScreenName \
 	(tkIntStubsPtr->tkGetDefaultScreenName) /* 33 */
-#endif
-#ifndef TkGetDisplay
 #define TkGetDisplay \
 	(tkIntStubsPtr->tkGetDisplay) /* 34 */
-#endif
-#ifndef TkGetDisplayOf
 #define TkGetDisplayOf \
 	(tkIntStubsPtr->tkGetDisplayOf) /* 35 */
-#endif
-#ifndef TkGetFocusWin
 #define TkGetFocusWin \
 	(tkIntStubsPtr->tkGetFocusWin) /* 36 */
-#endif
-#ifndef TkGetInterpNames
 #define TkGetInterpNames \
 	(tkIntStubsPtr->tkGetInterpNames) /* 37 */
-#endif
-#ifndef TkGetMiterPoints
 #define TkGetMiterPoints \
 	(tkIntStubsPtr->tkGetMiterPoints) /* 38 */
-#endif
-#ifndef TkGetPointerCoords
 #define TkGetPointerCoords \
 	(tkIntStubsPtr->tkGetPointerCoords) /* 39 */
-#endif
-#ifndef TkGetServerInfo
 #define TkGetServerInfo \
 	(tkIntStubsPtr->tkGetServerInfo) /* 40 */
-#endif
-#ifndef TkGrabDeadWindow
 #define TkGrabDeadWindow \
 	(tkIntStubsPtr->tkGrabDeadWindow) /* 41 */
-#endif
-#ifndef TkGrabState
 #define TkGrabState \
 	(tkIntStubsPtr->tkGrabState) /* 42 */
-#endif
-#ifndef TkIncludePoint
 #define TkIncludePoint \
 	(tkIntStubsPtr->tkIncludePoint) /* 43 */
-#endif
-#ifndef TkInOutEvents
 #define TkInOutEvents \
 	(tkIntStubsPtr->tkInOutEvents) /* 44 */
-#endif
-#ifndef TkInstallFrameMenu
 #define TkInstallFrameMenu \
 	(tkIntStubsPtr->tkInstallFrameMenu) /* 45 */
-#endif
-#ifndef TkKeysymToString
 #define TkKeysymToString \
 	(tkIntStubsPtr->tkKeysymToString) /* 46 */
-#endif
-#ifndef TkLineToArea
 #define TkLineToArea \
 	(tkIntStubsPtr->tkLineToArea) /* 47 */
-#endif
-#ifndef TkLineToPoint
 #define TkLineToPoint \
 	(tkIntStubsPtr->tkLineToPoint) /* 48 */
-#endif
-#ifndef TkMakeBezierCurve
 #define TkMakeBezierCurve \
 	(tkIntStubsPtr->tkMakeBezierCurve) /* 49 */
-#endif
-#ifndef TkMakeBezierPostscript
 #define TkMakeBezierPostscript \
 	(tkIntStubsPtr->tkMakeBezierPostscript) /* 50 */
-#endif
-#ifndef TkOptionClassChanged
 #define TkOptionClassChanged \
 	(tkIntStubsPtr->tkOptionClassChanged) /* 51 */
-#endif
-#ifndef TkOptionDeadWindow
 #define TkOptionDeadWindow \
 	(tkIntStubsPtr->tkOptionDeadWindow) /* 52 */
-#endif
-#ifndef TkOvalToArea
 #define TkOvalToArea \
 	(tkIntStubsPtr->tkOvalToArea) /* 53 */
-#endif
-#ifndef TkOvalToPoint
 #define TkOvalToPoint \
 	(tkIntStubsPtr->tkOvalToPoint) /* 54 */
-#endif
-#ifndef TkpChangeFocus
 #define TkpChangeFocus \
 	(tkIntStubsPtr->tkpChangeFocus) /* 55 */
-#endif
-#ifndef TkpCloseDisplay
 #define TkpCloseDisplay \
 	(tkIntStubsPtr->tkpCloseDisplay) /* 56 */
-#endif
-#ifndef TkpClaimFocus
 #define TkpClaimFocus \
 	(tkIntStubsPtr->tkpClaimFocus) /* 57 */
-#endif
-#ifndef TkpDisplayWarning
 #define TkpDisplayWarning \
 	(tkIntStubsPtr->tkpDisplayWarning) /* 58 */
-#endif
-#ifndef TkpGetAppName
 #define TkpGetAppName \
 	(tkIntStubsPtr->tkpGetAppName) /* 59 */
-#endif
-#ifndef TkpGetOtherWindow
 #define TkpGetOtherWindow \
 	(tkIntStubsPtr->tkpGetOtherWindow) /* 60 */
-#endif
-#ifndef TkpGetWrapperWindow
 #define TkpGetWrapperWindow \
 	(tkIntStubsPtr->tkpGetWrapperWindow) /* 61 */
-#endif
-#ifndef TkpInit
 #define TkpInit \
 	(tkIntStubsPtr->tkpInit) /* 62 */
-#endif
-#ifndef TkpInitializeMenuBindings
 #define TkpInitializeMenuBindings \
 	(tkIntStubsPtr->tkpInitializeMenuBindings) /* 63 */
-#endif
-#ifndef TkpMakeContainer
 #define TkpMakeContainer \
 	(tkIntStubsPtr->tkpMakeContainer) /* 64 */
-#endif
-#ifndef TkpMakeMenuWindow
 #define TkpMakeMenuWindow \
 	(tkIntStubsPtr->tkpMakeMenuWindow) /* 65 */
-#endif
-#ifndef TkpMakeWindow
 #define TkpMakeWindow \
 	(tkIntStubsPtr->tkpMakeWindow) /* 66 */
-#endif
-#ifndef TkpMenuNotifyToplevelCreate
 #define TkpMenuNotifyToplevelCreate \
 	(tkIntStubsPtr->tkpMenuNotifyToplevelCreate) /* 67 */
-#endif
-#ifndef TkpOpenDisplay
 #define TkpOpenDisplay \
 	(tkIntStubsPtr->tkpOpenDisplay) /* 68 */
-#endif
-#ifndef TkPointerEvent
 #define TkPointerEvent \
 	(tkIntStubsPtr->tkPointerEvent) /* 69 */
-#endif
-#ifndef TkPolygonToArea
 #define TkPolygonToArea \
 	(tkIntStubsPtr->tkPolygonToArea) /* 70 */
-#endif
-#ifndef TkPolygonToPoint
 #define TkPolygonToPoint \
 	(tkIntStubsPtr->tkPolygonToPoint) /* 71 */
-#endif
-#ifndef TkPositionInTree
 #define TkPositionInTree \
 	(tkIntStubsPtr->tkPositionInTree) /* 72 */
-#endif
-#ifndef TkpRedirectKeyEvent
 #define TkpRedirectKeyEvent \
 	(tkIntStubsPtr->tkpRedirectKeyEvent) /* 73 */
-#endif
-#ifndef TkpSetMainMenubar
 #define TkpSetMainMenubar \
 	(tkIntStubsPtr->tkpSetMainMenubar) /* 74 */
-#endif
-#ifndef TkpUseWindow
 #define TkpUseWindow \
 	(tkIntStubsPtr->tkpUseWindow) /* 75 */
-#endif
-#ifndef TkpWindowWasRecentlyDeleted
 #define TkpWindowWasRecentlyDeleted \
 	(tkIntStubsPtr->tkpWindowWasRecentlyDeleted) /* 76 */
-#endif
-#ifndef TkQueueEventForAllChildren
 #define TkQueueEventForAllChildren \
 	(tkIntStubsPtr->tkQueueEventForAllChildren) /* 77 */
-#endif
-#ifndef TkReadBitmapFile
 #define TkReadBitmapFile \
 	(tkIntStubsPtr->tkReadBitmapFile) /* 78 */
-#endif
-#ifndef TkScrollWindow
 #define TkScrollWindow \
 	(tkIntStubsPtr->tkScrollWindow) /* 79 */
-#endif
-#ifndef TkSelDeadWindow
 #define TkSelDeadWindow \
 	(tkIntStubsPtr->tkSelDeadWindow) /* 80 */
-#endif
-#ifndef TkSelEventProc
 #define TkSelEventProc \
 	(tkIntStubsPtr->tkSelEventProc) /* 81 */
-#endif
-#ifndef TkSelInit
 #define TkSelInit \
 	(tkIntStubsPtr->tkSelInit) /* 82 */
-#endif
-#ifndef TkSelPropProc
 #define TkSelPropProc \
 	(tkIntStubsPtr->tkSelPropProc) /* 83 */
-#endif
 /* Slot 84 is reserved */
-#ifndef TkSetWindowMenuBar
 #define TkSetWindowMenuBar \
 	(tkIntStubsPtr->tkSetWindowMenuBar) /* 85 */
-#endif
-#ifndef TkStringToKeysym
 #define TkStringToKeysym \
 	(tkIntStubsPtr->tkStringToKeysym) /* 86 */
-#endif
-#ifndef TkThickPolyLineToArea
 #define TkThickPolyLineToArea \
 	(tkIntStubsPtr->tkThickPolyLineToArea) /* 87 */
-#endif
-#ifndef TkWmAddToColormapWindows
 #define TkWmAddToColormapWindows \
 	(tkIntStubsPtr->tkWmAddToColormapWindows) /* 88 */
-#endif
-#ifndef TkWmDeadWindow
 #define TkWmDeadWindow \
 	(tkIntStubsPtr->tkWmDeadWindow) /* 89 */
-#endif
-#ifndef TkWmFocusToplevel
 #define TkWmFocusToplevel \
 	(tkIntStubsPtr->tkWmFocusToplevel) /* 90 */
-#endif
-#ifndef TkWmMapWindow
 #define TkWmMapWindow \
 	(tkIntStubsPtr->tkWmMapWindow) /* 91 */
-#endif
-#ifndef TkWmNewWindow
 #define TkWmNewWindow \
 	(tkIntStubsPtr->tkWmNewWindow) /* 92 */
-#endif
-#ifndef TkWmProtocolEventProc
 #define TkWmProtocolEventProc \
 	(tkIntStubsPtr->tkWmProtocolEventProc) /* 93 */
-#endif
-#ifndef TkWmRemoveFromColormapWindows
 #define TkWmRemoveFromColormapWindows \
 	(tkIntStubsPtr->tkWmRemoveFromColormapWindows) /* 94 */
-#endif
-#ifndef TkWmRestackToplevel
 #define TkWmRestackToplevel \
 	(tkIntStubsPtr->tkWmRestackToplevel) /* 95 */
-#endif
-#ifndef TkWmSetClass
 #define TkWmSetClass \
 	(tkIntStubsPtr->tkWmSetClass) /* 96 */
-#endif
-#ifndef TkWmUnmapWindow
 #define TkWmUnmapWindow \
 	(tkIntStubsPtr->tkWmUnmapWindow) /* 97 */
-#endif
-#ifndef TkDebugBitmap
 #define TkDebugBitmap \
 	(tkIntStubsPtr->tkDebugBitmap) /* 98 */
-#endif
-#ifndef TkDebugBorder
 #define TkDebugBorder \
 	(tkIntStubsPtr->tkDebugBorder) /* 99 */
-#endif
-#ifndef TkDebugCursor
 #define TkDebugCursor \
 	(tkIntStubsPtr->tkDebugCursor) /* 100 */
-#endif
-#ifndef TkDebugColor
 #define TkDebugColor \
 	(tkIntStubsPtr->tkDebugColor) /* 101 */
-#endif
-#ifndef TkDebugConfig
 #define TkDebugConfig \
 	(tkIntStubsPtr->tkDebugConfig) /* 102 */
-#endif
-#ifndef TkDebugFont
 #define TkDebugFont \
 	(tkIntStubsPtr->tkDebugFont) /* 103 */
-#endif
-#ifndef TkFindStateNumObj
 #define TkFindStateNumObj \
 	(tkIntStubsPtr->tkFindStateNumObj) /* 104 */
-#endif
-#ifndef TkGetBitmapPredefTable
 #define TkGetBitmapPredefTable \
 	(tkIntStubsPtr->tkGetBitmapPredefTable) /* 105 */
-#endif
-#ifndef TkGetDisplayList
 #define TkGetDisplayList \
 	(tkIntStubsPtr->tkGetDisplayList) /* 106 */
-#endif
-#ifndef TkGetMainInfoList
 #define TkGetMainInfoList \
 	(tkIntStubsPtr->tkGetMainInfoList) /* 107 */
-#endif
-#ifndef TkGetWindowFromObj
 #define TkGetWindowFromObj \
 	(tkIntStubsPtr->tkGetWindowFromObj) /* 108 */
-#endif
-#ifndef TkpGetString
 #define TkpGetString \
 	(tkIntStubsPtr->tkpGetString) /* 109 */
-#endif
-#ifndef TkpGetSubFonts
 #define TkpGetSubFonts \
 	(tkIntStubsPtr->tkpGetSubFonts) /* 110 */
-#endif
-#ifndef TkpGetSystemDefault
 #define TkpGetSystemDefault \
 	(tkIntStubsPtr->tkpGetSystemDefault) /* 111 */
-#endif
-#ifndef TkpMenuThreadInit
 #define TkpMenuThreadInit \
 	(tkIntStubsPtr->tkpMenuThreadInit) /* 112 */
-#endif
-#ifndef TkClipBox
 #define TkClipBox \
 	(tkIntStubsPtr->tkClipBox) /* 113 */
-#endif
-#ifndef TkCreateRegion
 #define TkCreateRegion \
 	(tkIntStubsPtr->tkCreateRegion) /* 114 */
-#endif
-#ifndef TkDestroyRegion
 #define TkDestroyRegion \
 	(tkIntStubsPtr->tkDestroyRegion) /* 115 */
-#endif
-#ifndef TkIntersectRegion
 #define TkIntersectRegion \
 	(tkIntStubsPtr->tkIntersectRegion) /* 116 */
-#endif
-#ifndef TkRectInRegion
 #define TkRectInRegion \
 	(tkIntStubsPtr->tkRectInRegion) /* 117 */
-#endif
-#ifndef TkSetRegion
 #define TkSetRegion \
 	(tkIntStubsPtr->tkSetRegion) /* 118 */
-#endif
-#ifndef TkUnionRectWithRegion
 #define TkUnionRectWithRegion \
 	(tkIntStubsPtr->tkUnionRectWithRegion) /* 119 */
-#endif
 /* Slot 120 is reserved */
 #ifdef MAC_OSX_TK /* AQUA */
-#ifndef TkpCreateNativeBitmap
 #define TkpCreateNativeBitmap \
 	(tkIntStubsPtr->tkpCreateNativeBitmap) /* 121 */
-#endif
 #endif /* AQUA */
 #ifdef MAC_OSX_TK /* AQUA */
-#ifndef TkpDefineNativeBitmaps
 #define TkpDefineNativeBitmaps \
 	(tkIntStubsPtr->tkpDefineNativeBitmaps) /* 122 */
-#endif
 #endif /* AQUA */
 /* Slot 123 is reserved */
 #ifdef MAC_OSX_TK /* AQUA */
-#ifndef TkpGetNativeAppBitmap
 #define TkpGetNativeAppBitmap \
 	(tkIntStubsPtr->tkpGetNativeAppBitmap) /* 124 */
-#endif
 #endif /* AQUA */
 /* Slot 125 is reserved */
 /* Slot 126 is reserved */
@@ -1716,95 +1001,51 @@ extern TkIntStubs *tkIntStubsPtr;
 /* Slot 132 is reserved */
 /* Slot 133 is reserved */
 /* Slot 134 is reserved */
-#ifndef TkpDrawHighlightBorder
 #define TkpDrawHighlightBorder \
 	(tkIntStubsPtr->tkpDrawHighlightBorder) /* 135 */
-#endif
-#ifndef TkSetFocusWin
 #define TkSetFocusWin \
 	(tkIntStubsPtr->tkSetFocusWin) /* 136 */
-#endif
-#ifndef TkpSetKeycodeAndState
 #define TkpSetKeycodeAndState \
 	(tkIntStubsPtr->tkpSetKeycodeAndState) /* 137 */
-#endif
-#ifndef TkpGetKeySym
 #define TkpGetKeySym \
 	(tkIntStubsPtr->tkpGetKeySym) /* 138 */
-#endif
-#ifndef TkpInitKeymapInfo
 #define TkpInitKeymapInfo \
 	(tkIntStubsPtr->tkpInitKeymapInfo) /* 139 */
-#endif
-#ifndef TkPhotoGetValidRegion
 #define TkPhotoGetValidRegion \
 	(tkIntStubsPtr->tkPhotoGetValidRegion) /* 140 */
-#endif
-#ifndef TkWmStackorderToplevel
 #define TkWmStackorderToplevel \
 	(tkIntStubsPtr->tkWmStackorderToplevel) /* 141 */
-#endif
-#ifndef TkFocusFree
 #define TkFocusFree \
 	(tkIntStubsPtr->tkFocusFree) /* 142 */
-#endif
-#ifndef TkClipCleanup
 #define TkClipCleanup \
 	(tkIntStubsPtr->tkClipCleanup) /* 143 */
-#endif
-#ifndef TkGCCleanup
 #define TkGCCleanup \
 	(tkIntStubsPtr->tkGCCleanup) /* 144 */
-#endif
-#ifndef TkSubtractRegion
 #define TkSubtractRegion \
 	(tkIntStubsPtr->tkSubtractRegion) /* 145 */
-#endif
-#ifndef TkStylePkgInit
 #define TkStylePkgInit \
 	(tkIntStubsPtr->tkStylePkgInit) /* 146 */
-#endif
-#ifndef TkStylePkgFree
 #define TkStylePkgFree \
 	(tkIntStubsPtr->tkStylePkgFree) /* 147 */
-#endif
-#ifndef TkToplevelWindowForCommand
 #define TkToplevelWindowForCommand \
 	(tkIntStubsPtr->tkToplevelWindowForCommand) /* 148 */
-#endif
-#ifndef TkGetOptionSpec
 #define TkGetOptionSpec \
 	(tkIntStubsPtr->tkGetOptionSpec) /* 149 */
-#endif
-#ifndef TkMakeRawCurve
 #define TkMakeRawCurve \
 	(tkIntStubsPtr->tkMakeRawCurve) /* 150 */
-#endif
-#ifndef TkMakeRawCurvePostscript
 #define TkMakeRawCurvePostscript \
 	(tkIntStubsPtr->tkMakeRawCurvePostscript) /* 151 */
-#endif
-#ifndef TkpDrawFrame
 #define TkpDrawFrame \
 	(tkIntStubsPtr->tkpDrawFrame) /* 152 */
-#endif
-#ifndef TkCreateThreadExitHandler
 #define TkCreateThreadExitHandler \
 	(tkIntStubsPtr->tkCreateThreadExitHandler) /* 153 */
-#endif
-#ifndef TkDeleteThreadExitHandler
 #define TkDeleteThreadExitHandler \
 	(tkIntStubsPtr->tkDeleteThreadExitHandler) /* 154 */
-#endif
 /* Slot 155 is reserved */
-#ifndef TkpTestembedCmd
 #define TkpTestembedCmd \
 	(tkIntStubsPtr->tkpTestembedCmd) /* 156 */
-#endif
-#ifndef TkpTesttextCmd
 #define TkpTesttextCmd \
 	(tkIntStubsPtr->tkpTesttextCmd) /* 157 */
-#endif
 /* Slot 158 is reserved */
 /* Slot 159 is reserved */
 /* Slot 160 is reserved */
@@ -1816,65 +1057,39 @@ extern TkIntStubs *tkIntStubsPtr;
 /* Slot 166 is reserved */
 /* Slot 167 is reserved */
 /* Slot 168 is reserved */
-#ifndef TkStateParseProc
 #define TkStateParseProc \
 	(tkIntStubsPtr->tkStateParseProc) /* 169 */
-#endif
-#ifndef TkStatePrintProc
 #define TkStatePrintProc \
 	(tkIntStubsPtr->tkStatePrintProc) /* 170 */
-#endif
-#ifndef TkCanvasDashParseProc
 #define TkCanvasDashParseProc \
 	(tkIntStubsPtr->tkCanvasDashParseProc) /* 171 */
-#endif
-#ifndef TkCanvasDashPrintProc
 #define TkCanvasDashPrintProc \
 	(tkIntStubsPtr->tkCanvasDashPrintProc) /* 172 */
-#endif
-#ifndef TkOffsetParseProc
 #define TkOffsetParseProc \
 	(tkIntStubsPtr->tkOffsetParseProc) /* 173 */
-#endif
-#ifndef TkOffsetPrintProc
 #define TkOffsetPrintProc \
 	(tkIntStubsPtr->tkOffsetPrintProc) /* 174 */
-#endif
-#ifndef TkPixelParseProc
 #define TkPixelParseProc \
 	(tkIntStubsPtr->tkPixelParseProc) /* 175 */
-#endif
-#ifndef TkPixelPrintProc
 #define TkPixelPrintProc \
 	(tkIntStubsPtr->tkPixelPrintProc) /* 176 */
-#endif
-#ifndef TkOrientParseProc
 #define TkOrientParseProc \
 	(tkIntStubsPtr->tkOrientParseProc) /* 177 */
-#endif
-#ifndef TkOrientPrintProc
 #define TkOrientPrintProc \
 	(tkIntStubsPtr->tkOrientPrintProc) /* 178 */
-#endif
-#ifndef TkSmoothParseProc
 #define TkSmoothParseProc \
 	(tkIntStubsPtr->tkSmoothParseProc) /* 179 */
-#endif
-#ifndef TkSmoothPrintProc
 #define TkSmoothPrintProc \
 	(tkIntStubsPtr->tkSmoothPrintProc) /* 180 */
-#endif
 /* Slot 181 is reserved */
 /* Slot 182 is reserved */
 /* Slot 183 is reserved */
 /* Slot 184 is reserved */
 /* Slot 185 is reserved */
-#ifndef TkUnusedStubEntry
 #define TkUnusedStubEntry \
 	(tkIntStubsPtr->tkUnusedStubEntry) /* 186 */
-#endif
 
-#endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
+#endif /* defined(USE_TK_STUBS) */
 
 /* !END!: Do not edit above this line. */
 
diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h
index 86127fe..0d88f73 100644
--- a/generic/tkIntPlatDecls.h
+++ b/generic/tkIntPlatDecls.h
@@ -34,602 +34,278 @@ extern "C" {
  * Exported function declarations:
  */
 
-#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
-#ifndef TkAlignImageData_TCL_DECLARED
-#define TkAlignImageData_TCL_DECLARED
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
 /* 0 */
 EXTERN char *		TkAlignImageData(XImage *image, int alignment,
 				int bitOrder);
-#endif
 /* Slot 1 is reserved */
-#ifndef TkGenerateActivateEvents_TCL_DECLARED
-#define TkGenerateActivateEvents_TCL_DECLARED
 /* 2 */
 EXTERN void		TkGenerateActivateEvents(TkWindow *winPtr,
 				int active);
-#endif
-#ifndef TkpGetMS_TCL_DECLARED
-#define TkpGetMS_TCL_DECLARED
 /* 3 */
 EXTERN unsigned long	TkpGetMS(void);
-#endif
-#ifndef TkPointerDeadWindow_TCL_DECLARED
-#define TkPointerDeadWindow_TCL_DECLARED
 /* 4 */
 EXTERN void		TkPointerDeadWindow(TkWindow *winPtr);
-#endif
-#ifndef TkpPrintWindowId_TCL_DECLARED
-#define TkpPrintWindowId_TCL_DECLARED
 /* 5 */
 EXTERN void		TkpPrintWindowId(char *buf, Window window);
-#endif
-#ifndef TkpScanWindowId_TCL_DECLARED
-#define TkpScanWindowId_TCL_DECLARED
 /* 6 */
 EXTERN int		TkpScanWindowId(Tcl_Interp *interp,
-				CONST char *string, Window *idPtr);
-#endif
-#ifndef TkpSetCapture_TCL_DECLARED
-#define TkpSetCapture_TCL_DECLARED
+				const char *string, Window *idPtr);
 /* 7 */
 EXTERN void		TkpSetCapture(TkWindow *winPtr);
-#endif
-#ifndef TkpSetCursor_TCL_DECLARED
-#define TkpSetCursor_TCL_DECLARED
 /* 8 */
 EXTERN void		TkpSetCursor(TkpCursor cursor);
-#endif
-#ifndef TkpWmSetState_TCL_DECLARED
-#define TkpWmSetState_TCL_DECLARED
 /* 9 */
 EXTERN int		TkpWmSetState(TkWindow *winPtr, int state);
-#endif
-#ifndef TkSetPixmapColormap_TCL_DECLARED
-#define TkSetPixmapColormap_TCL_DECLARED
 /* 10 */
 EXTERN void		TkSetPixmapColormap(Pixmap pixmap, Colormap colormap);
-#endif
-#ifndef TkWinCancelMouseTimer_TCL_DECLARED
-#define TkWinCancelMouseTimer_TCL_DECLARED
 /* 11 */
 EXTERN void		TkWinCancelMouseTimer(void);
-#endif
-#ifndef TkWinClipboardRender_TCL_DECLARED
-#define TkWinClipboardRender_TCL_DECLARED
 /* 12 */
 EXTERN void		TkWinClipboardRender(TkDisplay *dispPtr, UINT format);
-#endif
-#ifndef TkWinEmbeddedEventProc_TCL_DECLARED
-#define TkWinEmbeddedEventProc_TCL_DECLARED
 /* 13 */
 EXTERN LRESULT		TkWinEmbeddedEventProc(HWND hwnd, UINT message,
 				WPARAM wParam, LPARAM lParam);
-#endif
-#ifndef TkWinFillRect_TCL_DECLARED
-#define TkWinFillRect_TCL_DECLARED
 /* 14 */
 EXTERN void		TkWinFillRect(HDC dc, int x, int y, int width,
 				int height, int pixel);
-#endif
-#ifndef TkWinGetBorderPixels_TCL_DECLARED
-#define TkWinGetBorderPixels_TCL_DECLARED
 /* 15 */
 EXTERN COLORREF		TkWinGetBorderPixels(Tk_Window tkwin,
 				Tk_3DBorder border, int which);
-#endif
-#ifndef TkWinGetDrawableDC_TCL_DECLARED
-#define TkWinGetDrawableDC_TCL_DECLARED
 /* 16 */
 EXTERN HDC		TkWinGetDrawableDC(Display *display, Drawable d,
 				TkWinDCState *state);
-#endif
-#ifndef TkWinGetModifierState_TCL_DECLARED
-#define TkWinGetModifierState_TCL_DECLARED
 /* 17 */
 EXTERN int		TkWinGetModifierState(void);
-#endif
-#ifndef TkWinGetSystemPalette_TCL_DECLARED
-#define TkWinGetSystemPalette_TCL_DECLARED
 /* 18 */
 EXTERN HPALETTE		TkWinGetSystemPalette(void);
-#endif
-#ifndef TkWinGetWrapperWindow_TCL_DECLARED
-#define TkWinGetWrapperWindow_TCL_DECLARED
 /* 19 */
 EXTERN HWND		TkWinGetWrapperWindow(Tk_Window tkwin);
-#endif
-#ifndef TkWinHandleMenuEvent_TCL_DECLARED
-#define TkWinHandleMenuEvent_TCL_DECLARED
 /* 20 */
 EXTERN int		TkWinHandleMenuEvent(HWND *phwnd, UINT *pMessage,
 				WPARAM *pwParam, LPARAM *plParam,
 				LRESULT *plResult);
-#endif
-#ifndef TkWinIndexOfColor_TCL_DECLARED
-#define TkWinIndexOfColor_TCL_DECLARED
 /* 21 */
 EXTERN int		TkWinIndexOfColor(XColor *colorPtr);
-#endif
-#ifndef TkWinReleaseDrawableDC_TCL_DECLARED
-#define TkWinReleaseDrawableDC_TCL_DECLARED
 /* 22 */
 EXTERN void		TkWinReleaseDrawableDC(Drawable d, HDC hdc,
 				TkWinDCState *state);
-#endif
-#ifndef TkWinResendEvent_TCL_DECLARED
-#define TkWinResendEvent_TCL_DECLARED
 /* 23 */
 EXTERN LRESULT		TkWinResendEvent(WNDPROC wndproc, HWND hwnd,
 				XEvent *eventPtr);
-#endif
-#ifndef TkWinSelectPalette_TCL_DECLARED
-#define TkWinSelectPalette_TCL_DECLARED
 /* 24 */
 EXTERN HPALETTE		TkWinSelectPalette(HDC dc, Colormap colormap);
-#endif
-#ifndef TkWinSetMenu_TCL_DECLARED
-#define TkWinSetMenu_TCL_DECLARED
 /* 25 */
 EXTERN void		TkWinSetMenu(Tk_Window tkwin, HMENU hMenu);
-#endif
-#ifndef TkWinSetWindowPos_TCL_DECLARED
-#define TkWinSetWindowPos_TCL_DECLARED
 /* 26 */
 EXTERN void		TkWinSetWindowPos(HWND hwnd, HWND siblingHwnd,
 				int pos);
-#endif
-#ifndef TkWinWmCleanup_TCL_DECLARED
-#define TkWinWmCleanup_TCL_DECLARED
 /* 27 */
 EXTERN void		TkWinWmCleanup(HINSTANCE hInstance);
-#endif
-#ifndef TkWinXCleanup_TCL_DECLARED
-#define TkWinXCleanup_TCL_DECLARED
 /* 28 */
 EXTERN void		TkWinXCleanup(ClientData clientData);
-#endif
-#ifndef TkWinXInit_TCL_DECLARED
-#define TkWinXInit_TCL_DECLARED
 /* 29 */
 EXTERN void		TkWinXInit(HINSTANCE hInstance);
-#endif
-#ifndef TkWinSetForegroundWindow_TCL_DECLARED
-#define TkWinSetForegroundWindow_TCL_DECLARED
 /* 30 */
 EXTERN void		TkWinSetForegroundWindow(TkWindow *winPtr);
-#endif
-#ifndef TkWinDialogDebug_TCL_DECLARED
-#define TkWinDialogDebug_TCL_DECLARED
 /* 31 */
 EXTERN void		TkWinDialogDebug(int debug);
-#endif
-#ifndef TkWinGetMenuSystemDefault_TCL_DECLARED
-#define TkWinGetMenuSystemDefault_TCL_DECLARED
 /* 32 */
 EXTERN Tcl_Obj *	TkWinGetMenuSystemDefault(Tk_Window tkwin,
-				CONST char *dbName, CONST char *className);
-#endif
-#ifndef TkWinGetPlatformId_TCL_DECLARED
-#define TkWinGetPlatformId_TCL_DECLARED
+				const char *dbName, const char *className);
 /* 33 */
 EXTERN int		TkWinGetPlatformId(void);
-#endif
-#ifndef TkWinSetHINSTANCE_TCL_DECLARED
-#define TkWinSetHINSTANCE_TCL_DECLARED
 /* 34 */
 EXTERN void		TkWinSetHINSTANCE(HINSTANCE hInstance);
-#endif
-#ifndef TkWinGetPlatformTheme_TCL_DECLARED
-#define TkWinGetPlatformTheme_TCL_DECLARED
 /* 35 */
 EXTERN int		TkWinGetPlatformTheme(void);
-#endif
-#ifndef TkWinChildProc_TCL_DECLARED
-#define TkWinChildProc_TCL_DECLARED
 /* 36 */
 EXTERN LRESULT __stdcall TkWinChildProc(HWND hwnd, UINT message,
 				WPARAM wParam, LPARAM lParam);
-#endif
-#ifndef TkCreateXEventSource_TCL_DECLARED
-#define TkCreateXEventSource_TCL_DECLARED
 /* 37 */
 EXTERN void		TkCreateXEventSource(void);
-#endif
-#ifndef TkpCmapStressed_TCL_DECLARED
-#define TkpCmapStressed_TCL_DECLARED
 /* 38 */
 EXTERN int		TkpCmapStressed(Tk_Window tkwin, Colormap colormap);
-#endif
-#ifndef TkpSync_TCL_DECLARED
-#define TkpSync_TCL_DECLARED
 /* 39 */
 EXTERN void		TkpSync(Display *display);
-#endif
-#ifndef TkUnixContainerId_TCL_DECLARED
-#define TkUnixContainerId_TCL_DECLARED
 /* 40 */
 EXTERN Window		TkUnixContainerId(TkWindow *winPtr);
-#endif
-#ifndef TkUnixDoOneXEvent_TCL_DECLARED
-#define TkUnixDoOneXEvent_TCL_DECLARED
 /* 41 */
 EXTERN int		TkUnixDoOneXEvent(Tcl_Time *timePtr);
-#endif
-#ifndef TkUnixSetMenubar_TCL_DECLARED
-#define TkUnixSetMenubar_TCL_DECLARED
 /* 42 */
 EXTERN void		TkUnixSetMenubar(Tk_Window tkwin, Tk_Window menubar);
-#endif
-#ifndef TkWmCleanup_TCL_DECLARED
-#define TkWmCleanup_TCL_DECLARED
 /* 43 */
 EXTERN void		TkWmCleanup(TkDisplay *dispPtr);
-#endif
-#ifndef TkSendCleanup_TCL_DECLARED
-#define TkSendCleanup_TCL_DECLARED
 /* 44 */
 EXTERN void		TkSendCleanup(TkDisplay *dispPtr);
-#endif
-#ifndef TkpTestsendCmd_TCL_DECLARED
-#define TkpTestsendCmd_TCL_DECLARED
 /* 45 */
 EXTERN int		TkpTestsendCmd(ClientData clientData,
 				Tcl_Interp *interp, int argc,
-				CONST char **argv);
-#endif
+				const char **argv);
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-#ifndef TkGenerateActivateEvents_TCL_DECLARED
-#define TkGenerateActivateEvents_TCL_DECLARED
 /* 0 */
 EXTERN void		TkGenerateActivateEvents(TkWindow *winPtr,
 				int active);
-#endif
 /* Slot 1 is reserved */
 /* Slot 2 is reserved */
-#ifndef TkPointerDeadWindow_TCL_DECLARED
-#define TkPointerDeadWindow_TCL_DECLARED
 /* 3 */
 EXTERN void		TkPointerDeadWindow(TkWindow *winPtr);
-#endif
-#ifndef TkpSetCapture_TCL_DECLARED
-#define TkpSetCapture_TCL_DECLARED
 /* 4 */
 EXTERN void		TkpSetCapture(TkWindow *winPtr);
-#endif
-#ifndef TkpSetCursor_TCL_DECLARED
-#define TkpSetCursor_TCL_DECLARED
 /* 5 */
 EXTERN void		TkpSetCursor(TkpCursor cursor);
-#endif
-#ifndef TkpWmSetState_TCL_DECLARED
-#define TkpWmSetState_TCL_DECLARED
 /* 6 */
 EXTERN void		TkpWmSetState(TkWindow *winPtr, int state);
-#endif
-#ifndef TkAboutDlg_TCL_DECLARED
-#define TkAboutDlg_TCL_DECLARED
 /* 7 */
 EXTERN void		TkAboutDlg(void);
-#endif
-#ifndef TkMacOSXButtonKeyState_TCL_DECLARED
-#define TkMacOSXButtonKeyState_TCL_DECLARED
 /* 8 */
 EXTERN unsigned int	TkMacOSXButtonKeyState(void);
-#endif
-#ifndef TkMacOSXClearMenubarActive_TCL_DECLARED
-#define TkMacOSXClearMenubarActive_TCL_DECLARED
 /* 9 */
 EXTERN void		TkMacOSXClearMenubarActive(void);
-#endif
-#ifndef TkMacOSXDispatchMenuEvent_TCL_DECLARED
-#define TkMacOSXDispatchMenuEvent_TCL_DECLARED
 /* 10 */
 EXTERN int		TkMacOSXDispatchMenuEvent(int menuID, int index);
-#endif
-#ifndef TkMacOSXInstallCursor_TCL_DECLARED
-#define TkMacOSXInstallCursor_TCL_DECLARED
 /* 11 */
 EXTERN void		TkMacOSXInstallCursor(int resizeOverride);
-#endif
-#ifndef TkMacOSXHandleTearoffMenu_TCL_DECLARED
-#define TkMacOSXHandleTearoffMenu_TCL_DECLARED
 /* 12 */
 EXTERN void		TkMacOSXHandleTearoffMenu(void);
-#endif
 /* Slot 13 is reserved */
-#ifndef TkMacOSXDoHLEvent_TCL_DECLARED
-#define TkMacOSXDoHLEvent_TCL_DECLARED
 /* 14 */
-EXTERN int		TkMacOSXDoHLEvent(VOID *theEvent);
-#endif
+EXTERN int		TkMacOSXDoHLEvent(void *theEvent);
 /* Slot 15 is reserved */
-#ifndef TkMacOSXGetXWindow_TCL_DECLARED
-#define TkMacOSXGetXWindow_TCL_DECLARED
 /* 16 */
-EXTERN Window		TkMacOSXGetXWindow(VOID *macWinPtr);
-#endif
-#ifndef TkMacOSXGrowToplevel_TCL_DECLARED
-#define TkMacOSXGrowToplevel_TCL_DECLARED
+EXTERN Window		TkMacOSXGetXWindow(void *macWinPtr);
 /* 17 */
-EXTERN int		TkMacOSXGrowToplevel(VOID *whichWindow, XPoint start);
-#endif
-#ifndef TkMacOSXHandleMenuSelect_TCL_DECLARED
-#define TkMacOSXHandleMenuSelect_TCL_DECLARED
+EXTERN int		TkMacOSXGrowToplevel(void *whichWindow, XPoint start);
 /* 18 */
 EXTERN void		TkMacOSXHandleMenuSelect(short theMenu,
 				unsigned short theItem, int optionKeyPressed);
-#endif
 /* Slot 19 is reserved */
 /* Slot 20 is reserved */
-#ifndef TkMacOSXInvalidateWindow_TCL_DECLARED
-#define TkMacOSXInvalidateWindow_TCL_DECLARED
 /* 21 */
 EXTERN void		TkMacOSXInvalidateWindow(MacDrawable *macWin,
 				int flag);
-#endif
-#ifndef TkMacOSXIsCharacterMissing_TCL_DECLARED
-#define TkMacOSXIsCharacterMissing_TCL_DECLARED
 /* 22 */
 EXTERN int		TkMacOSXIsCharacterMissing(Tk_Font tkfont,
 				unsigned int searchChar);
-#endif
-#ifndef TkMacOSXMakeRealWindowExist_TCL_DECLARED
-#define TkMacOSXMakeRealWindowExist_TCL_DECLARED
 /* 23 */
 EXTERN void		TkMacOSXMakeRealWindowExist(TkWindow *winPtr);
-#endif
-#ifndef TkMacOSXMakeStippleMap_TCL_DECLARED
-#define TkMacOSXMakeStippleMap_TCL_DECLARED
 /* 24 */
-EXTERN VOID *		TkMacOSXMakeStippleMap(Drawable d1, Drawable d2);
-#endif
-#ifndef TkMacOSXMenuClick_TCL_DECLARED
-#define TkMacOSXMenuClick_TCL_DECLARED
+EXTERN void *		TkMacOSXMakeStippleMap(Drawable d1, Drawable d2);
 /* 25 */
 EXTERN void		TkMacOSXMenuClick(void);
-#endif
-#ifndef TkMacOSXRegisterOffScreenWindow_TCL_DECLARED
-#define TkMacOSXRegisterOffScreenWindow_TCL_DECLARED
 /* 26 */
 EXTERN void		TkMacOSXRegisterOffScreenWindow(Window window,
-				VOID *portPtr);
-#endif
-#ifndef TkMacOSXResizable_TCL_DECLARED
-#define TkMacOSXResizable_TCL_DECLARED
+				void *portPtr);
 /* 27 */
 EXTERN int		TkMacOSXResizable(TkWindow *winPtr);
-#endif
-#ifndef TkMacOSXSetHelpMenuItemCount_TCL_DECLARED
-#define TkMacOSXSetHelpMenuItemCount_TCL_DECLARED
 /* 28 */
 EXTERN void		TkMacOSXSetHelpMenuItemCount(void);
-#endif
-#ifndef TkMacOSXSetScrollbarGrow_TCL_DECLARED
-#define TkMacOSXSetScrollbarGrow_TCL_DECLARED
 /* 29 */
 EXTERN void		TkMacOSXSetScrollbarGrow(TkWindow *winPtr, int flag);
-#endif
-#ifndef TkMacOSXSetUpClippingRgn_TCL_DECLARED
-#define TkMacOSXSetUpClippingRgn_TCL_DECLARED
 /* 30 */
 EXTERN void		TkMacOSXSetUpClippingRgn(Drawable drawable);
-#endif
-#ifndef TkMacOSXSetUpGraphicsPort_TCL_DECLARED
-#define TkMacOSXSetUpGraphicsPort_TCL_DECLARED
 /* 31 */
-EXTERN void		TkMacOSXSetUpGraphicsPort(GC gc, VOID *destPort);
-#endif
-#ifndef TkMacOSXUpdateClipRgn_TCL_DECLARED
-#define TkMacOSXUpdateClipRgn_TCL_DECLARED
+EXTERN void		TkMacOSXSetUpGraphicsPort(GC gc, void *destPort);
 /* 32 */
 EXTERN void		TkMacOSXUpdateClipRgn(TkWindow *winPtr);
-#endif
-#ifndef TkMacOSXUnregisterMacWindow_TCL_DECLARED
-#define TkMacOSXUnregisterMacWindow_TCL_DECLARED
 /* 33 */
-EXTERN void		TkMacOSXUnregisterMacWindow(VOID *portPtr);
-#endif
-#ifndef TkMacOSXUseMenuID_TCL_DECLARED
-#define TkMacOSXUseMenuID_TCL_DECLARED
+EXTERN void		TkMacOSXUnregisterMacWindow(void *portPtr);
 /* 34 */
 EXTERN int		TkMacOSXUseMenuID(short macID);
-#endif
-#ifndef TkMacOSXVisableClipRgn_TCL_DECLARED
-#define TkMacOSXVisableClipRgn_TCL_DECLARED
 /* 35 */
 EXTERN TkRegion		TkMacOSXVisableClipRgn(TkWindow *winPtr);
-#endif
-#ifndef TkMacOSXWinBounds_TCL_DECLARED
-#define TkMacOSXWinBounds_TCL_DECLARED
 /* 36 */
-EXTERN void		TkMacOSXWinBounds(TkWindow *winPtr, VOID *geometry);
-#endif
-#ifndef TkMacOSXWindowOffset_TCL_DECLARED
-#define TkMacOSXWindowOffset_TCL_DECLARED
+EXTERN void		TkMacOSXWinBounds(TkWindow *winPtr, void *geometry);
 /* 37 */
-EXTERN void		TkMacOSXWindowOffset(VOID *wRef, int *xOffset,
+EXTERN void		TkMacOSXWindowOffset(void *wRef, int *xOffset,
 				int *yOffset);
-#endif
-#ifndef TkSetMacColor_TCL_DECLARED
-#define TkSetMacColor_TCL_DECLARED
 /* 38 */
-EXTERN int		TkSetMacColor(unsigned long pixel, VOID *macColor);
-#endif
-#ifndef TkSetWMName_TCL_DECLARED
-#define TkSetWMName_TCL_DECLARED
+EXTERN int		TkSetMacColor(unsigned long pixel, void *macColor);
 /* 39 */
 EXTERN void		TkSetWMName(TkWindow *winPtr, Tk_Uid titleUid);
-#endif
-#ifndef TkSuspendClipboard_TCL_DECLARED
-#define TkSuspendClipboard_TCL_DECLARED
 /* 40 */
 EXTERN void		TkSuspendClipboard(void);
-#endif
-#ifndef TkMacOSXZoomToplevel_TCL_DECLARED
-#define TkMacOSXZoomToplevel_TCL_DECLARED
 /* 41 */
-EXTERN int		TkMacOSXZoomToplevel(VOID *whichWindow,
+EXTERN int		TkMacOSXZoomToplevel(void *whichWindow,
 				short zoomPart);
-#endif
-#ifndef Tk_TopCoordsToWindow_TCL_DECLARED
-#define Tk_TopCoordsToWindow_TCL_DECLARED
 /* 42 */
 EXTERN Tk_Window	Tk_TopCoordsToWindow(Tk_Window tkwin, int rootX,
 				int rootY, int *newX, int *newY);
-#endif
-#ifndef TkMacOSXContainerId_TCL_DECLARED
-#define TkMacOSXContainerId_TCL_DECLARED
 /* 43 */
 EXTERN MacDrawable *	TkMacOSXContainerId(TkWindow *winPtr);
-#endif
-#ifndef TkMacOSXGetHostToplevel_TCL_DECLARED
-#define TkMacOSXGetHostToplevel_TCL_DECLARED
 /* 44 */
 EXTERN MacDrawable *	TkMacOSXGetHostToplevel(TkWindow *winPtr);
-#endif
-#ifndef TkMacOSXPreprocessMenu_TCL_DECLARED
-#define TkMacOSXPreprocessMenu_TCL_DECLARED
 /* 45 */
 EXTERN void		TkMacOSXPreprocessMenu(void);
-#endif
-#ifndef TkpIsWindowFloating_TCL_DECLARED
-#define TkpIsWindowFloating_TCL_DECLARED
 /* 46 */
-EXTERN int		TkpIsWindowFloating(VOID *window);
-#endif
-#ifndef TkMacOSXGetCapture_TCL_DECLARED
-#define TkMacOSXGetCapture_TCL_DECLARED
+EXTERN int		TkpIsWindowFloating(void *window);
 /* 47 */
 EXTERN Tk_Window	TkMacOSXGetCapture(void);
-#endif
 /* Slot 48 is reserved */
-#ifndef TkGetTransientMaster_TCL_DECLARED
-#define TkGetTransientMaster_TCL_DECLARED
 /* 49 */
 EXTERN Window		TkGetTransientMaster(TkWindow *winPtr);
-#endif
-#ifndef TkGenerateButtonEvent_TCL_DECLARED
-#define TkGenerateButtonEvent_TCL_DECLARED
 /* 50 */
 EXTERN int		TkGenerateButtonEvent(int x, int y, Window window,
 				unsigned int state);
-#endif
-#ifndef TkGenWMDestroyEvent_TCL_DECLARED
-#define TkGenWMDestroyEvent_TCL_DECLARED
 /* 51 */
 EXTERN void		TkGenWMDestroyEvent(Tk_Window tkwin);
-#endif
-#ifndef TkMacOSXSetDrawingEnabled_TCL_DECLARED
-#define TkMacOSXSetDrawingEnabled_TCL_DECLARED
 /* 52 */
 EXTERN void		TkMacOSXSetDrawingEnabled(TkWindow *winPtr, int flag);
-#endif
-#ifndef TkpGetMS_TCL_DECLARED
-#define TkpGetMS_TCL_DECLARED
 /* 53 */
 EXTERN unsigned long	TkpGetMS(void);
-#endif
-#ifndef TkMacOSXDrawable_TCL_DECLARED
-#define TkMacOSXDrawable_TCL_DECLARED
 /* 54 */
-EXTERN VOID *		TkMacOSXDrawable(Drawable drawable);
-#endif
-#ifndef TkpScanWindowId_TCL_DECLARED
-#define TkpScanWindowId_TCL_DECLARED
+EXTERN void *		TkMacOSXDrawable(Drawable drawable);
 /* 55 */
 EXTERN int		TkpScanWindowId(Tcl_Interp *interp,
-				CONST char *string, Window *idPtr);
-#endif
+				const char *string, Window *idPtr);
 #endif /* AQUA */
-#if !(defined(__WIN32__) || defined(__CYGWIN__) || defined(MAC_OSX_TK)) /* X11 */
-#ifndef TkCreateXEventSource_TCL_DECLARED
-#define TkCreateXEventSource_TCL_DECLARED
+#if !(defined(_WIN32) || defined(__CYGWIN__) || defined(MAC_OSX_TK)) /* X11 */
 /* 0 */
 EXTERN void		TkCreateXEventSource(void);
-#endif
-#ifndef TkFreeWindowId_TCL_DECLARED
-#define TkFreeWindowId_TCL_DECLARED
 /* 1 */
 EXTERN void		TkFreeWindowId(TkDisplay *dispPtr, Window w);
-#endif
-#ifndef TkInitXId_TCL_DECLARED
-#define TkInitXId_TCL_DECLARED
 /* 2 */
 EXTERN void		TkInitXId(TkDisplay *dispPtr);
-#endif
-#ifndef TkpCmapStressed_TCL_DECLARED
-#define TkpCmapStressed_TCL_DECLARED
 /* 3 */
 EXTERN int		TkpCmapStressed(Tk_Window tkwin, Colormap colormap);
-#endif
-#ifndef TkpSync_TCL_DECLARED
-#define TkpSync_TCL_DECLARED
 /* 4 */
 EXTERN void		TkpSync(Display *display);
-#endif
-#ifndef TkUnixContainerId_TCL_DECLARED
-#define TkUnixContainerId_TCL_DECLARED
 /* 5 */
 EXTERN Window		TkUnixContainerId(TkWindow *winPtr);
-#endif
-#ifndef TkUnixDoOneXEvent_TCL_DECLARED
-#define TkUnixDoOneXEvent_TCL_DECLARED
 /* 6 */
 EXTERN int		TkUnixDoOneXEvent(Tcl_Time *timePtr);
-#endif
-#ifndef TkUnixSetMenubar_TCL_DECLARED
-#define TkUnixSetMenubar_TCL_DECLARED
 /* 7 */
 EXTERN void		TkUnixSetMenubar(Tk_Window tkwin, Tk_Window menubar);
-#endif
-#ifndef TkpScanWindowId_TCL_DECLARED
-#define TkpScanWindowId_TCL_DECLARED
 /* 8 */
 EXTERN int		TkpScanWindowId(Tcl_Interp *interp,
-				CONST char *string, Window *idPtr);
-#endif
-#ifndef TkWmCleanup_TCL_DECLARED
-#define TkWmCleanup_TCL_DECLARED
+				const char *string, Window *idPtr);
 /* 9 */
 EXTERN void		TkWmCleanup(TkDisplay *dispPtr);
-#endif
-#ifndef TkSendCleanup_TCL_DECLARED
-#define TkSendCleanup_TCL_DECLARED
 /* 10 */
 EXTERN void		TkSendCleanup(TkDisplay *dispPtr);
-#endif
-#ifndef TkFreeXId_TCL_DECLARED
-#define TkFreeXId_TCL_DECLARED
 /* 11 */
 EXTERN void		TkFreeXId(TkDisplay *dispPtr);
-#endif
-#ifndef TkpWmSetState_TCL_DECLARED
-#define TkpWmSetState_TCL_DECLARED
 /* 12 */
 EXTERN int		TkpWmSetState(TkWindow *winPtr, int state);
-#endif
-#ifndef TkpTestsendCmd_TCL_DECLARED
-#define TkpTestsendCmd_TCL_DECLARED
 /* 13 */
 EXTERN int		TkpTestsendCmd(ClientData clientData,
 				Tcl_Interp *interp, int argc,
-				CONST char **argv);
-#endif
+				const char **argv);
 #endif /* X11 */
 
 typedef struct TkIntPlatStubs {
     int magic;
-    struct TkIntPlatStubHooks *hooks;
+    void *hooks;
 
-#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
     char * (*tkAlignImageData) (XImage *image, int alignment, int bitOrder); /* 0 */
-    VOID *reserved1;
+    void (*reserved1)(void);
     void (*tkGenerateActivateEvents) (TkWindow *winPtr, int active); /* 2 */
     unsigned long (*tkpGetMS) (void); /* 3 */
     void (*tkPointerDeadWindow) (TkWindow *winPtr); /* 4 */
     void (*tkpPrintWindowId) (char *buf, Window window); /* 5 */
-    int (*tkpScanWindowId) (Tcl_Interp *interp, CONST char *string, Window *idPtr); /* 6 */
+    int (*tkpScanWindowId) (Tcl_Interp *interp, const char *string, Window *idPtr); /* 6 */
     void (*tkpSetCapture) (TkWindow *winPtr); /* 7 */
     void (*tkpSetCursor) (TkpCursor cursor); /* 8 */
     int (*tkpWmSetState) (TkWindow *winPtr, int state); /* 9 */
@@ -655,7 +331,7 @@ typedef struct TkIntPlatStubs {
     void (*tkWinXInit) (HINSTANCE hInstance); /* 29 */
     void (*tkWinSetForegroundWindow) (TkWindow *winPtr); /* 30 */
     void (*tkWinDialogDebug) (int debug); /* 31 */
-    Tcl_Obj * (*tkWinGetMenuSystemDefault) (Tk_Window tkwin, CONST char *dbName, CONST char *className); /* 32 */
+    Tcl_Obj * (*tkWinGetMenuSystemDefault) (Tk_Window tkwin, const char *dbName, const char *className); /* 32 */
     int (*tkWinGetPlatformId) (void); /* 33 */
     void (*tkWinSetHINSTANCE) (HINSTANCE hInstance); /* 34 */
     int (*tkWinGetPlatformTheme) (void); /* 35 */
@@ -668,12 +344,12 @@ typedef struct TkIntPlatStubs {
     void (*tkUnixSetMenubar) (Tk_Window tkwin, Tk_Window menubar); /* 42 */
     void (*tkWmCleanup) (TkDisplay *dispPtr); /* 43 */
     void (*tkSendCleanup) (TkDisplay *dispPtr); /* 44 */
-    int (*tkpTestsendCmd) (ClientData clientData, Tcl_Interp *interp, int argc, CONST char **argv); /* 45 */
+    int (*tkpTestsendCmd) (ClientData clientData, Tcl_Interp *interp, int argc, const char **argv); /* 45 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
     void (*tkGenerateActivateEvents) (TkWindow *winPtr, int active); /* 0 */
-    VOID *reserved1;
-    VOID *reserved2;
+    void (*reserved1)(void);
+    void (*reserved2)(void);
     void (*tkPointerDeadWindow) (TkWindow *winPtr); /* 3 */
     void (*tkpSetCapture) (TkWindow *winPtr); /* 4 */
     void (*tkpSetCursor) (TkpCursor cursor); /* 5 */
@@ -684,51 +360,51 @@ typedef struct TkIntPlatStubs {
     int (*tkMacOSXDispatchMenuEvent) (int menuID, int index); /* 10 */
     void (*tkMacOSXInstallCursor) (int resizeOverride); /* 11 */
     void (*tkMacOSXHandleTearoffMenu) (void); /* 12 */
-    VOID *reserved13;
-    int (*tkMacOSXDoHLEvent) (VOID *theEvent); /* 14 */
-    VOID *reserved15;
-    Window (*tkMacOSXGetXWindow) (VOID *macWinPtr); /* 16 */
-    int (*tkMacOSXGrowToplevel) (VOID *whichWindow, XPoint start); /* 17 */
+    void (*reserved13)(void);
+    int (*tkMacOSXDoHLEvent) (void *theEvent); /* 14 */
+    void (*reserved15)(void);
+    Window (*tkMacOSXGetXWindow) (void *macWinPtr); /* 16 */
+    int (*tkMacOSXGrowToplevel) (void *whichWindow, XPoint start); /* 17 */
     void (*tkMacOSXHandleMenuSelect) (short theMenu, unsigned short theItem, int optionKeyPressed); /* 18 */
-    VOID *reserved19;
-    VOID *reserved20;
+    void (*reserved19)(void);
+    void (*reserved20)(void);
     void (*tkMacOSXInvalidateWindow) (MacDrawable *macWin, int flag); /* 21 */
     int (*tkMacOSXIsCharacterMissing) (Tk_Font tkfont, unsigned int searchChar); /* 22 */
     void (*tkMacOSXMakeRealWindowExist) (TkWindow *winPtr); /* 23 */
-    VOID * (*tkMacOSXMakeStippleMap) (Drawable d1, Drawable d2); /* 24 */
+    void * (*tkMacOSXMakeStippleMap) (Drawable d1, Drawable d2); /* 24 */
     void (*tkMacOSXMenuClick) (void); /* 25 */
-    void (*tkMacOSXRegisterOffScreenWindow) (Window window, VOID *portPtr); /* 26 */
+    void (*tkMacOSXRegisterOffScreenWindow) (Window window, void *portPtr); /* 26 */
     int (*tkMacOSXResizable) (TkWindow *winPtr); /* 27 */
     void (*tkMacOSXSetHelpMenuItemCount) (void); /* 28 */
     void (*tkMacOSXSetScrollbarGrow) (TkWindow *winPtr, int flag); /* 29 */
     void (*tkMacOSXSetUpClippingRgn) (Drawable drawable); /* 30 */
-    void (*tkMacOSXSetUpGraphicsPort) (GC gc, VOID *destPort); /* 31 */
+    void (*tkMacOSXSetUpGraphicsPort) (GC gc, void *destPort); /* 31 */
     void (*tkMacOSXUpdateClipRgn) (TkWindow *winPtr); /* 32 */
-    void (*tkMacOSXUnregisterMacWindow) (VOID *portPtr); /* 33 */
+    void (*tkMacOSXUnregisterMacWindow) (void *portPtr); /* 33 */
     int (*tkMacOSXUseMenuID) (short macID); /* 34 */
     TkRegion (*tkMacOSXVisableClipRgn) (TkWindow *winPtr); /* 35 */
-    void (*tkMacOSXWinBounds) (TkWindow *winPtr, VOID *geometry); /* 36 */
-    void (*tkMacOSXWindowOffset) (VOID *wRef, int *xOffset, int *yOffset); /* 37 */
-    int (*tkSetMacColor) (unsigned long pixel, VOID *macColor); /* 38 */
+    void (*tkMacOSXWinBounds) (TkWindow *winPtr, void *geometry); /* 36 */
+    void (*tkMacOSXWindowOffset) (void *wRef, int *xOffset, int *yOffset); /* 37 */
+    int (*tkSetMacColor) (unsigned long pixel, void *macColor); /* 38 */
     void (*tkSetWMName) (TkWindow *winPtr, Tk_Uid titleUid); /* 39 */
     void (*tkSuspendClipboard) (void); /* 40 */
-    int (*tkMacOSXZoomToplevel) (VOID *whichWindow, short zoomPart); /* 41 */
+    int (*tkMacOSXZoomToplevel) (void *whichWindow, short zoomPart); /* 41 */
     Tk_Window (*tk_TopCoordsToWindow) (Tk_Window tkwin, int rootX, int rootY, int *newX, int *newY); /* 42 */
     MacDrawable * (*tkMacOSXContainerId) (TkWindow *winPtr); /* 43 */
     MacDrawable * (*tkMacOSXGetHostToplevel) (TkWindow *winPtr); /* 44 */
     void (*tkMacOSXPreprocessMenu) (void); /* 45 */
-    int (*tkpIsWindowFloating) (VOID *window); /* 46 */
+    int (*tkpIsWindowFloating) (void *window); /* 46 */
     Tk_Window (*tkMacOSXGetCapture) (void); /* 47 */
-    VOID *reserved48;
+    void (*reserved48)(void);
     Window (*tkGetTransientMaster) (TkWindow *winPtr); /* 49 */
     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 * (*tkMacOSXDrawable) (Drawable drawable); /* 54 */
-    int (*tkpScanWindowId) (Tcl_Interp *interp, CONST char *string, Window *idPtr); /* 55 */
+    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 */
+#if !(defined(_WIN32) || defined(__CYGWIN__) || defined(MAC_OSX_TK)) /* X11 */
     void (*tkCreateXEventSource) (void); /* 0 */
     void (*tkFreeWindowId) (TkDisplay *dispPtr, Window w); /* 1 */
     void (*tkInitXId) (TkDisplay *dispPtr); /* 2 */
@@ -737,475 +413,259 @@ typedef struct TkIntPlatStubs {
     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 */
+    int (*tkpScanWindowId) (Tcl_Interp *interp, const char *string, Window *idPtr); /* 8 */
     void (*tkWmCleanup) (TkDisplay *dispPtr); /* 9 */
     void (*tkSendCleanup) (TkDisplay *dispPtr); /* 10 */
     void (*tkFreeXId) (TkDisplay *dispPtr); /* 11 */
     int (*tkpWmSetState) (TkWindow *winPtr, int state); /* 12 */
-    int (*tkpTestsendCmd) (ClientData clientData, Tcl_Interp *interp, int argc, CONST char **argv); /* 13 */
+    int (*tkpTestsendCmd) (ClientData clientData, Tcl_Interp *interp, int argc, const char **argv); /* 13 */
 #endif /* X11 */
 } TkIntPlatStubs;
 
-extern TkIntPlatStubs *tkIntPlatStubsPtr;
+extern const TkIntPlatStubs *tkIntPlatStubsPtr;
 
 #ifdef __cplusplus
 }
 #endif
 
-#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
+#if defined(USE_TK_STUBS)
 
 /*
  * Inline function declarations:
  */
 
-#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
-#ifndef TkAlignImageData
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
 #define TkAlignImageData \
 	(tkIntPlatStubsPtr->tkAlignImageData) /* 0 */
-#endif
 /* Slot 1 is reserved */
-#ifndef TkGenerateActivateEvents
 #define TkGenerateActivateEvents \
 	(tkIntPlatStubsPtr->tkGenerateActivateEvents) /* 2 */
-#endif
-#ifndef TkpGetMS
 #define TkpGetMS \
 	(tkIntPlatStubsPtr->tkpGetMS) /* 3 */
-#endif
-#ifndef TkPointerDeadWindow
 #define TkPointerDeadWindow \
 	(tkIntPlatStubsPtr->tkPointerDeadWindow) /* 4 */
-#endif
-#ifndef TkpPrintWindowId
 #define TkpPrintWindowId \
 	(tkIntPlatStubsPtr->tkpPrintWindowId) /* 5 */
-#endif
-#ifndef TkpScanWindowId
 #define TkpScanWindowId \
 	(tkIntPlatStubsPtr->tkpScanWindowId) /* 6 */
-#endif
-#ifndef TkpSetCapture
 #define TkpSetCapture \
 	(tkIntPlatStubsPtr->tkpSetCapture) /* 7 */
-#endif
-#ifndef TkpSetCursor
 #define TkpSetCursor \
 	(tkIntPlatStubsPtr->tkpSetCursor) /* 8 */
-#endif
-#ifndef TkpWmSetState
 #define TkpWmSetState \
 	(tkIntPlatStubsPtr->tkpWmSetState) /* 9 */
-#endif
-#ifndef TkSetPixmapColormap
 #define TkSetPixmapColormap \
 	(tkIntPlatStubsPtr->tkSetPixmapColormap) /* 10 */
-#endif
-#ifndef TkWinCancelMouseTimer
 #define TkWinCancelMouseTimer \
 	(tkIntPlatStubsPtr->tkWinCancelMouseTimer) /* 11 */
-#endif
-#ifndef TkWinClipboardRender
 #define TkWinClipboardRender \
 	(tkIntPlatStubsPtr->tkWinClipboardRender) /* 12 */
-#endif
-#ifndef TkWinEmbeddedEventProc
 #define TkWinEmbeddedEventProc \
 	(tkIntPlatStubsPtr->tkWinEmbeddedEventProc) /* 13 */
-#endif
-#ifndef TkWinFillRect
 #define TkWinFillRect \
 	(tkIntPlatStubsPtr->tkWinFillRect) /* 14 */
-#endif
-#ifndef TkWinGetBorderPixels
 #define TkWinGetBorderPixels \
 	(tkIntPlatStubsPtr->tkWinGetBorderPixels) /* 15 */
-#endif
-#ifndef TkWinGetDrawableDC
 #define TkWinGetDrawableDC \
 	(tkIntPlatStubsPtr->tkWinGetDrawableDC) /* 16 */
-#endif
-#ifndef TkWinGetModifierState
 #define TkWinGetModifierState \
 	(tkIntPlatStubsPtr->tkWinGetModifierState) /* 17 */
-#endif
-#ifndef TkWinGetSystemPalette
 #define TkWinGetSystemPalette \
 	(tkIntPlatStubsPtr->tkWinGetSystemPalette) /* 18 */
-#endif
-#ifndef TkWinGetWrapperWindow
 #define TkWinGetWrapperWindow \
 	(tkIntPlatStubsPtr->tkWinGetWrapperWindow) /* 19 */
-#endif
-#ifndef TkWinHandleMenuEvent
 #define TkWinHandleMenuEvent \
 	(tkIntPlatStubsPtr->tkWinHandleMenuEvent) /* 20 */
-#endif
-#ifndef TkWinIndexOfColor
 #define TkWinIndexOfColor \
 	(tkIntPlatStubsPtr->tkWinIndexOfColor) /* 21 */
-#endif
-#ifndef TkWinReleaseDrawableDC
 #define TkWinReleaseDrawableDC \
 	(tkIntPlatStubsPtr->tkWinReleaseDrawableDC) /* 22 */
-#endif
-#ifndef TkWinResendEvent
 #define TkWinResendEvent \
 	(tkIntPlatStubsPtr->tkWinResendEvent) /* 23 */
-#endif
-#ifndef TkWinSelectPalette
 #define TkWinSelectPalette \
 	(tkIntPlatStubsPtr->tkWinSelectPalette) /* 24 */
-#endif
-#ifndef TkWinSetMenu
 #define TkWinSetMenu \
 	(tkIntPlatStubsPtr->tkWinSetMenu) /* 25 */
-#endif
-#ifndef TkWinSetWindowPos
 #define TkWinSetWindowPos \
 	(tkIntPlatStubsPtr->tkWinSetWindowPos) /* 26 */
-#endif
-#ifndef TkWinWmCleanup
 #define TkWinWmCleanup \
 	(tkIntPlatStubsPtr->tkWinWmCleanup) /* 27 */
-#endif
-#ifndef TkWinXCleanup
 #define TkWinXCleanup \
 	(tkIntPlatStubsPtr->tkWinXCleanup) /* 28 */
-#endif
-#ifndef TkWinXInit
 #define TkWinXInit \
 	(tkIntPlatStubsPtr->tkWinXInit) /* 29 */
-#endif
-#ifndef TkWinSetForegroundWindow
 #define TkWinSetForegroundWindow \
 	(tkIntPlatStubsPtr->tkWinSetForegroundWindow) /* 30 */
-#endif
-#ifndef TkWinDialogDebug
 #define TkWinDialogDebug \
 	(tkIntPlatStubsPtr->tkWinDialogDebug) /* 31 */
-#endif
-#ifndef TkWinGetMenuSystemDefault
 #define TkWinGetMenuSystemDefault \
 	(tkIntPlatStubsPtr->tkWinGetMenuSystemDefault) /* 32 */
-#endif
-#ifndef TkWinGetPlatformId
 #define TkWinGetPlatformId \
 	(tkIntPlatStubsPtr->tkWinGetPlatformId) /* 33 */
-#endif
-#ifndef TkWinSetHINSTANCE
 #define TkWinSetHINSTANCE \
 	(tkIntPlatStubsPtr->tkWinSetHINSTANCE) /* 34 */
-#endif
-#ifndef TkWinGetPlatformTheme
 #define TkWinGetPlatformTheme \
 	(tkIntPlatStubsPtr->tkWinGetPlatformTheme) /* 35 */
-#endif
-#ifndef TkWinChildProc
 #define TkWinChildProc \
 	(tkIntPlatStubsPtr->tkWinChildProc) /* 36 */
-#endif
-#ifndef TkCreateXEventSource
 #define TkCreateXEventSource \
 	(tkIntPlatStubsPtr->tkCreateXEventSource) /* 37 */
-#endif
-#ifndef TkpCmapStressed
 #define TkpCmapStressed \
 	(tkIntPlatStubsPtr->tkpCmapStressed) /* 38 */
-#endif
-#ifndef TkpSync
 #define TkpSync \
 	(tkIntPlatStubsPtr->tkpSync) /* 39 */
-#endif
-#ifndef TkUnixContainerId
 #define TkUnixContainerId \
 	(tkIntPlatStubsPtr->tkUnixContainerId) /* 40 */
-#endif
-#ifndef TkUnixDoOneXEvent
 #define TkUnixDoOneXEvent \
 	(tkIntPlatStubsPtr->tkUnixDoOneXEvent) /* 41 */
-#endif
-#ifndef TkUnixSetMenubar
 #define TkUnixSetMenubar \
 	(tkIntPlatStubsPtr->tkUnixSetMenubar) /* 42 */
-#endif
-#ifndef TkWmCleanup
 #define TkWmCleanup \
 	(tkIntPlatStubsPtr->tkWmCleanup) /* 43 */
-#endif
-#ifndef TkSendCleanup
 #define TkSendCleanup \
 	(tkIntPlatStubsPtr->tkSendCleanup) /* 44 */
-#endif
-#ifndef TkpTestsendCmd
 #define TkpTestsendCmd \
 	(tkIntPlatStubsPtr->tkpTestsendCmd) /* 45 */
-#endif
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-#ifndef TkGenerateActivateEvents
 #define TkGenerateActivateEvents \
 	(tkIntPlatStubsPtr->tkGenerateActivateEvents) /* 0 */
-#endif
 /* Slot 1 is reserved */
 /* Slot 2 is reserved */
-#ifndef TkPointerDeadWindow
 #define TkPointerDeadWindow \
 	(tkIntPlatStubsPtr->tkPointerDeadWindow) /* 3 */
-#endif
-#ifndef TkpSetCapture
 #define TkpSetCapture \
 	(tkIntPlatStubsPtr->tkpSetCapture) /* 4 */
-#endif
-#ifndef TkpSetCursor
 #define TkpSetCursor \
 	(tkIntPlatStubsPtr->tkpSetCursor) /* 5 */
-#endif
-#ifndef TkpWmSetState
 #define TkpWmSetState \
 	(tkIntPlatStubsPtr->tkpWmSetState) /* 6 */
-#endif
-#ifndef TkAboutDlg
 #define TkAboutDlg \
 	(tkIntPlatStubsPtr->tkAboutDlg) /* 7 */
-#endif
-#ifndef TkMacOSXButtonKeyState
 #define TkMacOSXButtonKeyState \
 	(tkIntPlatStubsPtr->tkMacOSXButtonKeyState) /* 8 */
-#endif
-#ifndef TkMacOSXClearMenubarActive
 #define TkMacOSXClearMenubarActive \
 	(tkIntPlatStubsPtr->tkMacOSXClearMenubarActive) /* 9 */
-#endif
-#ifndef TkMacOSXDispatchMenuEvent
 #define TkMacOSXDispatchMenuEvent \
 	(tkIntPlatStubsPtr->tkMacOSXDispatchMenuEvent) /* 10 */
-#endif
-#ifndef TkMacOSXInstallCursor
 #define TkMacOSXInstallCursor \
 	(tkIntPlatStubsPtr->tkMacOSXInstallCursor) /* 11 */
-#endif
-#ifndef TkMacOSXHandleTearoffMenu
 #define TkMacOSXHandleTearoffMenu \
 	(tkIntPlatStubsPtr->tkMacOSXHandleTearoffMenu) /* 12 */
-#endif
 /* Slot 13 is reserved */
-#ifndef TkMacOSXDoHLEvent
 #define TkMacOSXDoHLEvent \
 	(tkIntPlatStubsPtr->tkMacOSXDoHLEvent) /* 14 */
-#endif
 /* Slot 15 is reserved */
-#ifndef TkMacOSXGetXWindow
 #define TkMacOSXGetXWindow \
 	(tkIntPlatStubsPtr->tkMacOSXGetXWindow) /* 16 */
-#endif
-#ifndef TkMacOSXGrowToplevel
 #define TkMacOSXGrowToplevel \
 	(tkIntPlatStubsPtr->tkMacOSXGrowToplevel) /* 17 */
-#endif
-#ifndef TkMacOSXHandleMenuSelect
 #define TkMacOSXHandleMenuSelect \
 	(tkIntPlatStubsPtr->tkMacOSXHandleMenuSelect) /* 18 */
-#endif
 /* Slot 19 is reserved */
 /* Slot 20 is reserved */
-#ifndef TkMacOSXInvalidateWindow
 #define TkMacOSXInvalidateWindow \
 	(tkIntPlatStubsPtr->tkMacOSXInvalidateWindow) /* 21 */
-#endif
-#ifndef TkMacOSXIsCharacterMissing
 #define TkMacOSXIsCharacterMissing \
 	(tkIntPlatStubsPtr->tkMacOSXIsCharacterMissing) /* 22 */
-#endif
-#ifndef TkMacOSXMakeRealWindowExist
 #define TkMacOSXMakeRealWindowExist \
 	(tkIntPlatStubsPtr->tkMacOSXMakeRealWindowExist) /* 23 */
-#endif
-#ifndef TkMacOSXMakeStippleMap
 #define TkMacOSXMakeStippleMap \
 	(tkIntPlatStubsPtr->tkMacOSXMakeStippleMap) /* 24 */
-#endif
-#ifndef TkMacOSXMenuClick
 #define TkMacOSXMenuClick \
 	(tkIntPlatStubsPtr->tkMacOSXMenuClick) /* 25 */
-#endif
-#ifndef TkMacOSXRegisterOffScreenWindow
 #define TkMacOSXRegisterOffScreenWindow \
 	(tkIntPlatStubsPtr->tkMacOSXRegisterOffScreenWindow) /* 26 */
-#endif
-#ifndef TkMacOSXResizable
 #define TkMacOSXResizable \
 	(tkIntPlatStubsPtr->tkMacOSXResizable) /* 27 */
-#endif
-#ifndef TkMacOSXSetHelpMenuItemCount
 #define TkMacOSXSetHelpMenuItemCount \
 	(tkIntPlatStubsPtr->tkMacOSXSetHelpMenuItemCount) /* 28 */
-#endif
-#ifndef TkMacOSXSetScrollbarGrow
 #define TkMacOSXSetScrollbarGrow \
 	(tkIntPlatStubsPtr->tkMacOSXSetScrollbarGrow) /* 29 */
-#endif
-#ifndef TkMacOSXSetUpClippingRgn
 #define TkMacOSXSetUpClippingRgn \
 	(tkIntPlatStubsPtr->tkMacOSXSetUpClippingRgn) /* 30 */
-#endif
-#ifndef TkMacOSXSetUpGraphicsPort
 #define TkMacOSXSetUpGraphicsPort \
 	(tkIntPlatStubsPtr->tkMacOSXSetUpGraphicsPort) /* 31 */
-#endif
-#ifndef TkMacOSXUpdateClipRgn
 #define TkMacOSXUpdateClipRgn \
 	(tkIntPlatStubsPtr->tkMacOSXUpdateClipRgn) /* 32 */
-#endif
-#ifndef TkMacOSXUnregisterMacWindow
 #define TkMacOSXUnregisterMacWindow \
 	(tkIntPlatStubsPtr->tkMacOSXUnregisterMacWindow) /* 33 */
-#endif
-#ifndef TkMacOSXUseMenuID
 #define TkMacOSXUseMenuID \
 	(tkIntPlatStubsPtr->tkMacOSXUseMenuID) /* 34 */
-#endif
-#ifndef TkMacOSXVisableClipRgn
 #define TkMacOSXVisableClipRgn \
 	(tkIntPlatStubsPtr->tkMacOSXVisableClipRgn) /* 35 */
-#endif
-#ifndef TkMacOSXWinBounds
 #define TkMacOSXWinBounds \
 	(tkIntPlatStubsPtr->tkMacOSXWinBounds) /* 36 */
-#endif
-#ifndef TkMacOSXWindowOffset
 #define TkMacOSXWindowOffset \
 	(tkIntPlatStubsPtr->tkMacOSXWindowOffset) /* 37 */
-#endif
-#ifndef TkSetMacColor
 #define TkSetMacColor \
 	(tkIntPlatStubsPtr->tkSetMacColor) /* 38 */
-#endif
-#ifndef TkSetWMName
 #define TkSetWMName \
 	(tkIntPlatStubsPtr->tkSetWMName) /* 39 */
-#endif
-#ifndef TkSuspendClipboard
 #define TkSuspendClipboard \
 	(tkIntPlatStubsPtr->tkSuspendClipboard) /* 40 */
-#endif
-#ifndef TkMacOSXZoomToplevel
 #define TkMacOSXZoomToplevel \
 	(tkIntPlatStubsPtr->tkMacOSXZoomToplevel) /* 41 */
-#endif
-#ifndef Tk_TopCoordsToWindow
 #define Tk_TopCoordsToWindow \
 	(tkIntPlatStubsPtr->tk_TopCoordsToWindow) /* 42 */
-#endif
-#ifndef TkMacOSXContainerId
 #define TkMacOSXContainerId \
 	(tkIntPlatStubsPtr->tkMacOSXContainerId) /* 43 */
-#endif
-#ifndef TkMacOSXGetHostToplevel
 #define TkMacOSXGetHostToplevel \
 	(tkIntPlatStubsPtr->tkMacOSXGetHostToplevel) /* 44 */
-#endif
-#ifndef TkMacOSXPreprocessMenu
 #define TkMacOSXPreprocessMenu \
 	(tkIntPlatStubsPtr->tkMacOSXPreprocessMenu) /* 45 */
-#endif
-#ifndef TkpIsWindowFloating
 #define TkpIsWindowFloating \
 	(tkIntPlatStubsPtr->tkpIsWindowFloating) /* 46 */
-#endif
-#ifndef TkMacOSXGetCapture
 #define TkMacOSXGetCapture \
 	(tkIntPlatStubsPtr->tkMacOSXGetCapture) /* 47 */
-#endif
 /* Slot 48 is reserved */
-#ifndef TkGetTransientMaster
 #define TkGetTransientMaster \
 	(tkIntPlatStubsPtr->tkGetTransientMaster) /* 49 */
-#endif
-#ifndef TkGenerateButtonEvent
 #define TkGenerateButtonEvent \
 	(tkIntPlatStubsPtr->tkGenerateButtonEvent) /* 50 */
-#endif
-#ifndef TkGenWMDestroyEvent
 #define TkGenWMDestroyEvent \
 	(tkIntPlatStubsPtr->tkGenWMDestroyEvent) /* 51 */
-#endif
-#ifndef TkMacOSXSetDrawingEnabled
 #define TkMacOSXSetDrawingEnabled \
 	(tkIntPlatStubsPtr->tkMacOSXSetDrawingEnabled) /* 52 */
-#endif
-#ifndef TkpGetMS
 #define TkpGetMS \
 	(tkIntPlatStubsPtr->tkpGetMS) /* 53 */
-#endif
-#ifndef TkMacOSXDrawable
 #define TkMacOSXDrawable \
 	(tkIntPlatStubsPtr->tkMacOSXDrawable) /* 54 */
-#endif
-#ifndef TkpScanWindowId
 #define TkpScanWindowId \
 	(tkIntPlatStubsPtr->tkpScanWindowId) /* 55 */
-#endif
 #endif /* AQUA */
-#if !(defined(__WIN32__) || defined(__CYGWIN__) || defined(MAC_OSX_TK)) /* X11 */
-#ifndef TkCreateXEventSource
+#if !(defined(_WIN32) || defined(__CYGWIN__) || defined(MAC_OSX_TK)) /* X11 */
 #define TkCreateXEventSource \
 	(tkIntPlatStubsPtr->tkCreateXEventSource) /* 0 */
-#endif
-#ifndef TkFreeWindowId
 #define TkFreeWindowId \
 	(tkIntPlatStubsPtr->tkFreeWindowId) /* 1 */
-#endif
-#ifndef TkInitXId
 #define TkInitXId \
 	(tkIntPlatStubsPtr->tkInitXId) /* 2 */
-#endif
-#ifndef TkpCmapStressed
 #define TkpCmapStressed \
 	(tkIntPlatStubsPtr->tkpCmapStressed) /* 3 */
-#endif
-#ifndef TkpSync
 #define TkpSync \
 	(tkIntPlatStubsPtr->tkpSync) /* 4 */
-#endif
-#ifndef TkUnixContainerId
 #define TkUnixContainerId \
 	(tkIntPlatStubsPtr->tkUnixContainerId) /* 5 */
-#endif
-#ifndef TkUnixDoOneXEvent
 #define TkUnixDoOneXEvent \
 	(tkIntPlatStubsPtr->tkUnixDoOneXEvent) /* 6 */
-#endif
-#ifndef TkUnixSetMenubar
 #define TkUnixSetMenubar \
 	(tkIntPlatStubsPtr->tkUnixSetMenubar) /* 7 */
-#endif
-#ifndef TkpScanWindowId
 #define TkpScanWindowId \
 	(tkIntPlatStubsPtr->tkpScanWindowId) /* 8 */
-#endif
-#ifndef TkWmCleanup
 #define TkWmCleanup \
 	(tkIntPlatStubsPtr->tkWmCleanup) /* 9 */
-#endif
-#ifndef TkSendCleanup
 #define TkSendCleanup \
 	(tkIntPlatStubsPtr->tkSendCleanup) /* 10 */
-#endif
-#ifndef TkFreeXId
 #define TkFreeXId \
 	(tkIntPlatStubsPtr->tkFreeXId) /* 11 */
-#endif
-#ifndef TkpWmSetState
 #define TkpWmSetState \
 	(tkIntPlatStubsPtr->tkpWmSetState) /* 12 */
-#endif
-#ifndef TkpTestsendCmd
 #define TkpTestsendCmd \
 	(tkIntPlatStubsPtr->tkpTestsendCmd) /* 13 */
-#endif
 #endif /* X11 */
 
-#endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
+#endif /* defined(USE_TK_STUBS) */
 
 /* !END!: Do not edit above this line. */
 
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index 700aa3d..f16bb8f 100644
--- a/generic/tkIntXlibDecls.h
+++ b/generic/tkIntXlibDecls.h
@@ -44,660 +44,318 @@ extern "C" {
  * Exported function declarations:
  */
 
-#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
-#ifndef XSetDashes_TCL_DECLARED
-#define XSetDashes_TCL_DECLARED
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
 /* 0 */
 EXTERN int		XSetDashes(Display *display, GC gc, int dash_offset,
 				_Xconst char *dash_list, int n);
-#endif
-#ifndef XGetModifierMapping_TCL_DECLARED
-#define XGetModifierMapping_TCL_DECLARED
 /* 1 */
 EXTERN XModifierKeymap * XGetModifierMapping(Display *d);
-#endif
-#ifndef XCreateImage_TCL_DECLARED
-#define XCreateImage_TCL_DECLARED
 /* 2 */
 EXTERN XImage *		XCreateImage(Display *d, Visual *v, unsigned int ui1,
 				int i1, int i2, char *cp, unsigned int ui2,
 				unsigned int ui3, int i3, int i4);
-#endif
-#ifndef XGetImage_TCL_DECLARED
-#define XGetImage_TCL_DECLARED
 /* 3 */
 EXTERN XImage *		XGetImage(Display *d, Drawable dr, int i1, int i2,
 				unsigned int ui1, unsigned int ui2,
 				unsigned long ul, int i3);
-#endif
-#ifndef XGetAtomName_TCL_DECLARED
-#define XGetAtomName_TCL_DECLARED
 /* 4 */
 EXTERN char *		XGetAtomName(Display *d, Atom a);
-#endif
-#ifndef XKeysymToString_TCL_DECLARED
-#define XKeysymToString_TCL_DECLARED
 /* 5 */
 EXTERN char *		XKeysymToString(KeySym k);
-#endif
-#ifndef XCreateColormap_TCL_DECLARED
-#define XCreateColormap_TCL_DECLARED
 /* 6 */
 EXTERN Colormap		XCreateColormap(Display *d, Window w, Visual *v,
 				int i);
-#endif
-#ifndef XCreatePixmapCursor_TCL_DECLARED
-#define XCreatePixmapCursor_TCL_DECLARED
 /* 7 */
 EXTERN Cursor		XCreatePixmapCursor(Display *d, Pixmap p1, Pixmap p2,
 				XColor *x1, XColor *x2, unsigned int ui1,
 				unsigned int ui2);
-#endif
-#ifndef XCreateGlyphCursor_TCL_DECLARED
-#define XCreateGlyphCursor_TCL_DECLARED
 /* 8 */
 EXTERN Cursor		XCreateGlyphCursor(Display *d, Font f1, Font f2,
 				unsigned int ui1, unsigned int ui2,
 				XColor _Xconst *x1, XColor _Xconst *x2);
-#endif
-#ifndef XGContextFromGC_TCL_DECLARED
-#define XGContextFromGC_TCL_DECLARED
 /* 9 */
 EXTERN GContext		XGContextFromGC(GC g);
-#endif
-#ifndef XListHosts_TCL_DECLARED
-#define XListHosts_TCL_DECLARED
 /* 10 */
 EXTERN XHostAddress *	XListHosts(Display *d, int *i, Bool *b);
-#endif
-#ifndef XKeycodeToKeysym_TCL_DECLARED
-#define XKeycodeToKeysym_TCL_DECLARED
 /* 11 */
 EXTERN KeySym		XKeycodeToKeysym(Display *d, unsigned int k, int i);
-#endif
-#ifndef XStringToKeysym_TCL_DECLARED
-#define XStringToKeysym_TCL_DECLARED
 /* 12 */
 EXTERN KeySym		XStringToKeysym(_Xconst char *c);
-#endif
-#ifndef XRootWindow_TCL_DECLARED
-#define XRootWindow_TCL_DECLARED
 /* 13 */
 EXTERN Window		XRootWindow(Display *d, int i);
-#endif
-#ifndef XSetErrorHandler_TCL_DECLARED
-#define XSetErrorHandler_TCL_DECLARED
 /* 14 */
 EXTERN XErrorHandler	XSetErrorHandler(XErrorHandler x);
-#endif
-#ifndef XIconifyWindow_TCL_DECLARED
-#define XIconifyWindow_TCL_DECLARED
 /* 15 */
 EXTERN Status		XIconifyWindow(Display *d, Window w, int i);
-#endif
-#ifndef XWithdrawWindow_TCL_DECLARED
-#define XWithdrawWindow_TCL_DECLARED
 /* 16 */
 EXTERN Status		XWithdrawWindow(Display *d, Window w, int i);
-#endif
-#ifndef XGetWMColormapWindows_TCL_DECLARED
-#define XGetWMColormapWindows_TCL_DECLARED
 /* 17 */
 EXTERN Status		XGetWMColormapWindows(Display *d, Window w,
 				Window **wpp, int *ip);
-#endif
-#ifndef XAllocColor_TCL_DECLARED
-#define XAllocColor_TCL_DECLARED
 /* 18 */
 EXTERN Status		XAllocColor(Display *d, Colormap c, XColor *xp);
-#endif
-#ifndef XBell_TCL_DECLARED
-#define XBell_TCL_DECLARED
 /* 19 */
 EXTERN int		XBell(Display *d, int i);
-#endif
-#ifndef XChangeProperty_TCL_DECLARED
-#define XChangeProperty_TCL_DECLARED
 /* 20 */
 EXTERN int		XChangeProperty(Display *d, Window w, Atom a1,
 				Atom a2, int i1, int i2,
 				_Xconst unsigned char *c, int i3);
-#endif
-#ifndef XChangeWindowAttributes_TCL_DECLARED
-#define XChangeWindowAttributes_TCL_DECLARED
 /* 21 */
 EXTERN int		XChangeWindowAttributes(Display *d, Window w,
 				unsigned long ul, XSetWindowAttributes *x);
-#endif
-#ifndef XClearWindow_TCL_DECLARED
-#define XClearWindow_TCL_DECLARED
 /* 22 */
 EXTERN int		XClearWindow(Display *d, Window w);
-#endif
-#ifndef XConfigureWindow_TCL_DECLARED
-#define XConfigureWindow_TCL_DECLARED
 /* 23 */
 EXTERN int		XConfigureWindow(Display *d, Window w,
 				unsigned int i, XWindowChanges *x);
-#endif
-#ifndef XCopyArea_TCL_DECLARED
-#define XCopyArea_TCL_DECLARED
 /* 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);
-#endif
-#ifndef XCopyPlane_TCL_DECLARED
-#define XCopyPlane_TCL_DECLARED
 /* 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);
-#endif
-#ifndef XCreateBitmapFromData_TCL_DECLARED
-#define XCreateBitmapFromData_TCL_DECLARED
 /* 26 */
 EXTERN Pixmap		XCreateBitmapFromData(Display *display, Drawable d,
 				_Xconst char *data, unsigned int width,
 				unsigned int height);
-#endif
-#ifndef XDefineCursor_TCL_DECLARED
-#define XDefineCursor_TCL_DECLARED
 /* 27 */
 EXTERN int		XDefineCursor(Display *d, Window w, Cursor c);
-#endif
-#ifndef XDeleteProperty_TCL_DECLARED
-#define XDeleteProperty_TCL_DECLARED
 /* 28 */
 EXTERN int		XDeleteProperty(Display *d, Window w, Atom a);
-#endif
-#ifndef XDestroyWindow_TCL_DECLARED
-#define XDestroyWindow_TCL_DECLARED
 /* 29 */
 EXTERN int		XDestroyWindow(Display *d, Window w);
-#endif
-#ifndef XDrawArc_TCL_DECLARED
-#define XDrawArc_TCL_DECLARED
 /* 30 */
 EXTERN int		XDrawArc(Display *d, Drawable dr, GC g, int i1,
 				int i2, unsigned int ui1, unsigned int ui2,
 				int i3, int i4);
-#endif
-#ifndef XDrawLines_TCL_DECLARED
-#define XDrawLines_TCL_DECLARED
 /* 31 */
 EXTERN int		XDrawLines(Display *d, Drawable dr, GC g, XPoint *x,
 				int i1, int i2);
-#endif
-#ifndef XDrawRectangle_TCL_DECLARED
-#define XDrawRectangle_TCL_DECLARED
 /* 32 */
 EXTERN int		XDrawRectangle(Display *d, Drawable dr, GC g, int i1,
 				int i2, unsigned int ui1, unsigned int ui2);
-#endif
-#ifndef XFillArc_TCL_DECLARED
-#define XFillArc_TCL_DECLARED
 /* 33 */
 EXTERN int		XFillArc(Display *d, Drawable dr, GC g, int i1,
 				int i2, unsigned int ui1, unsigned int ui2,
 				int i3, int i4);
-#endif
-#ifndef XFillPolygon_TCL_DECLARED
-#define XFillPolygon_TCL_DECLARED
 /* 34 */
 EXTERN int		XFillPolygon(Display *d, Drawable dr, GC g,
 				XPoint *x, int i1, int i2, int i3);
-#endif
-#ifndef XFillRectangles_TCL_DECLARED
-#define XFillRectangles_TCL_DECLARED
 /* 35 */
 EXTERN int		XFillRectangles(Display *d, Drawable dr, GC g,
 				XRectangle *x, int i);
-#endif
-#ifndef XForceScreenSaver_TCL_DECLARED
-#define XForceScreenSaver_TCL_DECLARED
 /* 36 */
 EXTERN int		XForceScreenSaver(Display *d, int i);
-#endif
-#ifndef XFreeColormap_TCL_DECLARED
-#define XFreeColormap_TCL_DECLARED
 /* 37 */
 EXTERN int		XFreeColormap(Display *d, Colormap c);
-#endif
-#ifndef XFreeColors_TCL_DECLARED
-#define XFreeColors_TCL_DECLARED
 /* 38 */
 EXTERN int		XFreeColors(Display *d, Colormap c,
 				unsigned long *ulp, int i, unsigned long ul);
-#endif
-#ifndef XFreeCursor_TCL_DECLARED
-#define XFreeCursor_TCL_DECLARED
 /* 39 */
 EXTERN int		XFreeCursor(Display *d, Cursor c);
-#endif
-#ifndef XFreeModifiermap_TCL_DECLARED
-#define XFreeModifiermap_TCL_DECLARED
 /* 40 */
 EXTERN int		XFreeModifiermap(XModifierKeymap *x);
-#endif
-#ifndef XGetGeometry_TCL_DECLARED
-#define XGetGeometry_TCL_DECLARED
 /* 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);
-#endif
-#ifndef XGetInputFocus_TCL_DECLARED
-#define XGetInputFocus_TCL_DECLARED
 /* 42 */
 EXTERN int		XGetInputFocus(Display *d, Window *w, int *i);
-#endif
-#ifndef XGetWindowProperty_TCL_DECLARED
-#define XGetWindowProperty_TCL_DECLARED
 /* 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);
-#endif
-#ifndef XGetWindowAttributes_TCL_DECLARED
-#define XGetWindowAttributes_TCL_DECLARED
 /* 44 */
 EXTERN Status		XGetWindowAttributes(Display *d, Window w,
 				XWindowAttributes *x);
-#endif
-#ifndef XGrabKeyboard_TCL_DECLARED
-#define XGrabKeyboard_TCL_DECLARED
 /* 45 */
 EXTERN int		XGrabKeyboard(Display *d, Window w, Bool b, int i1,
 				int i2, Time t);
-#endif
-#ifndef XGrabPointer_TCL_DECLARED
-#define XGrabPointer_TCL_DECLARED
 /* 46 */
 EXTERN int		XGrabPointer(Display *d, Window w1, Bool b,
 				unsigned int ui, int i1, int i2, Window w2,
 				Cursor c, Time t);
-#endif
-#ifndef XKeysymToKeycode_TCL_DECLARED
-#define XKeysymToKeycode_TCL_DECLARED
 /* 47 */
 EXTERN KeyCode		XKeysymToKeycode(Display *d, KeySym k);
-#endif
-#ifndef XLookupColor_TCL_DECLARED
-#define XLookupColor_TCL_DECLARED
 /* 48 */
 EXTERN Status		XLookupColor(Display *d, Colormap c1,
 				_Xconst char *c2, XColor *x1, XColor *x2);
-#endif
-#ifndef XMapWindow_TCL_DECLARED
-#define XMapWindow_TCL_DECLARED
 /* 49 */
 EXTERN int		XMapWindow(Display *d, Window w);
-#endif
-#ifndef XMoveResizeWindow_TCL_DECLARED
-#define XMoveResizeWindow_TCL_DECLARED
 /* 50 */
 EXTERN int		XMoveResizeWindow(Display *d, Window w, int i1,
 				int i2, unsigned int ui1, unsigned int ui2);
-#endif
-#ifndef XMoveWindow_TCL_DECLARED
-#define XMoveWindow_TCL_DECLARED
 /* 51 */
 EXTERN int		XMoveWindow(Display *d, Window w, int i1, int i2);
-#endif
-#ifndef XNextEvent_TCL_DECLARED
-#define XNextEvent_TCL_DECLARED
 /* 52 */
 EXTERN int		XNextEvent(Display *d, XEvent *x);
-#endif
-#ifndef XPutBackEvent_TCL_DECLARED
-#define XPutBackEvent_TCL_DECLARED
 /* 53 */
 EXTERN int		XPutBackEvent(Display *d, XEvent *x);
-#endif
-#ifndef XQueryColors_TCL_DECLARED
-#define XQueryColors_TCL_DECLARED
 /* 54 */
 EXTERN int		XQueryColors(Display *d, Colormap c, XColor *x,
 				int i);
-#endif
-#ifndef XQueryPointer_TCL_DECLARED
-#define XQueryPointer_TCL_DECLARED
 /* 55 */
 EXTERN Bool		XQueryPointer(Display *d, Window w1, Window *w2,
 				Window *w3, int *i1, int *i2, int *i3,
 				int *i4, unsigned int *ui);
-#endif
-#ifndef XQueryTree_TCL_DECLARED
-#define XQueryTree_TCL_DECLARED
 /* 56 */
 EXTERN Status		XQueryTree(Display *d, Window w1, Window *w2,
 				Window *w3, Window **w4, unsigned int *ui);
-#endif
-#ifndef XRaiseWindow_TCL_DECLARED
-#define XRaiseWindow_TCL_DECLARED
 /* 57 */
 EXTERN int		XRaiseWindow(Display *d, Window w);
-#endif
-#ifndef XRefreshKeyboardMapping_TCL_DECLARED
-#define XRefreshKeyboardMapping_TCL_DECLARED
 /* 58 */
 EXTERN int		XRefreshKeyboardMapping(XMappingEvent *x);
-#endif
-#ifndef XResizeWindow_TCL_DECLARED
-#define XResizeWindow_TCL_DECLARED
 /* 59 */
 EXTERN int		XResizeWindow(Display *d, Window w, unsigned int ui1,
 				unsigned int ui2);
-#endif
-#ifndef XSelectInput_TCL_DECLARED
-#define XSelectInput_TCL_DECLARED
 /* 60 */
 EXTERN int		XSelectInput(Display *d, Window w, long l);
-#endif
-#ifndef XSendEvent_TCL_DECLARED
-#define XSendEvent_TCL_DECLARED
 /* 61 */
 EXTERN Status		XSendEvent(Display *d, Window w, Bool b, long l,
 				XEvent *x);
-#endif
-#ifndef XSetCommand_TCL_DECLARED
-#define XSetCommand_TCL_DECLARED
 /* 62 */
 EXTERN int		XSetCommand(Display *d, Window w, char **c, int i);
-#endif
-#ifndef XSetIconName_TCL_DECLARED
-#define XSetIconName_TCL_DECLARED
 /* 63 */
 EXTERN int		XSetIconName(Display *d, Window w, _Xconst char *c);
-#endif
-#ifndef XSetInputFocus_TCL_DECLARED
-#define XSetInputFocus_TCL_DECLARED
 /* 64 */
 EXTERN int		XSetInputFocus(Display *d, Window w, int i, Time t);
-#endif
-#ifndef XSetSelectionOwner_TCL_DECLARED
-#define XSetSelectionOwner_TCL_DECLARED
 /* 65 */
 EXTERN int		XSetSelectionOwner(Display *d, Atom a, Window w,
 				Time t);
-#endif
-#ifndef XSetWindowBackground_TCL_DECLARED
-#define XSetWindowBackground_TCL_DECLARED
 /* 66 */
 EXTERN int		XSetWindowBackground(Display *d, Window w,
 				unsigned long ul);
-#endif
-#ifndef XSetWindowBackgroundPixmap_TCL_DECLARED
-#define XSetWindowBackgroundPixmap_TCL_DECLARED
 /* 67 */
 EXTERN int		XSetWindowBackgroundPixmap(Display *d, Window w,
 				Pixmap p);
-#endif
-#ifndef XSetWindowBorder_TCL_DECLARED
-#define XSetWindowBorder_TCL_DECLARED
 /* 68 */
 EXTERN int		XSetWindowBorder(Display *d, Window w,
 				unsigned long ul);
-#endif
-#ifndef XSetWindowBorderPixmap_TCL_DECLARED
-#define XSetWindowBorderPixmap_TCL_DECLARED
 /* 69 */
 EXTERN int		XSetWindowBorderPixmap(Display *d, Window w,
 				Pixmap p);
-#endif
-#ifndef XSetWindowBorderWidth_TCL_DECLARED
-#define XSetWindowBorderWidth_TCL_DECLARED
 /* 70 */
 EXTERN int		XSetWindowBorderWidth(Display *d, Window w,
 				unsigned int ui);
-#endif
-#ifndef XSetWindowColormap_TCL_DECLARED
-#define XSetWindowColormap_TCL_DECLARED
 /* 71 */
 EXTERN int		XSetWindowColormap(Display *d, Window w, Colormap c);
-#endif
-#ifndef XTranslateCoordinates_TCL_DECLARED
-#define XTranslateCoordinates_TCL_DECLARED
 /* 72 */
 EXTERN Bool		XTranslateCoordinates(Display *d, Window w1,
 				Window w2, int i1, int i2, int *i3, int *i4,
 				Window *w3);
-#endif
-#ifndef XUngrabKeyboard_TCL_DECLARED
-#define XUngrabKeyboard_TCL_DECLARED
 /* 73 */
 EXTERN int		XUngrabKeyboard(Display *d, Time t);
-#endif
-#ifndef XUngrabPointer_TCL_DECLARED
-#define XUngrabPointer_TCL_DECLARED
 /* 74 */
 EXTERN int		XUngrabPointer(Display *d, Time t);
-#endif
-#ifndef XUnmapWindow_TCL_DECLARED
-#define XUnmapWindow_TCL_DECLARED
 /* 75 */
 EXTERN int		XUnmapWindow(Display *d, Window w);
-#endif
-#ifndef XWindowEvent_TCL_DECLARED
-#define XWindowEvent_TCL_DECLARED
 /* 76 */
 EXTERN int		XWindowEvent(Display *d, Window w, long l, XEvent *x);
-#endif
-#ifndef XDestroyIC_TCL_DECLARED
-#define XDestroyIC_TCL_DECLARED
 /* 77 */
 EXTERN void		XDestroyIC(XIC x);
-#endif
-#ifndef XFilterEvent_TCL_DECLARED
-#define XFilterEvent_TCL_DECLARED
 /* 78 */
 EXTERN Bool		XFilterEvent(XEvent *x, Window w);
-#endif
-#ifndef XmbLookupString_TCL_DECLARED
-#define XmbLookupString_TCL_DECLARED
 /* 79 */
 EXTERN int		XmbLookupString(XIC xi, XKeyPressedEvent *xk,
 				char *c, int i, KeySym *k, Status *s);
-#endif
-#ifndef TkPutImage_TCL_DECLARED
-#define TkPutImage_TCL_DECLARED
 /* 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);
-#endif
 /* Slot 81 is reserved */
-#ifndef XParseColor_TCL_DECLARED
-#define XParseColor_TCL_DECLARED
 /* 82 */
 EXTERN Status		XParseColor(Display *display, Colormap map,
 				_Xconst char *spec, XColor *colorPtr);
-#endif
-#ifndef XCreateGC_TCL_DECLARED
-#define XCreateGC_TCL_DECLARED
 /* 83 */
 EXTERN GC		XCreateGC(Display *display, Drawable d,
 				unsigned long valuemask, XGCValues *values);
-#endif
-#ifndef XFreeGC_TCL_DECLARED
-#define XFreeGC_TCL_DECLARED
 /* 84 */
 EXTERN int		XFreeGC(Display *display, GC gc);
-#endif
-#ifndef XInternAtom_TCL_DECLARED
-#define XInternAtom_TCL_DECLARED
 /* 85 */
 EXTERN Atom		XInternAtom(Display *display,
 				_Xconst char *atom_name, Bool only_if_exists);
-#endif
-#ifndef XSetBackground_TCL_DECLARED
-#define XSetBackground_TCL_DECLARED
 /* 86 */
 EXTERN int		XSetBackground(Display *display, GC gc,
 				unsigned long foreground);
-#endif
-#ifndef XSetForeground_TCL_DECLARED
-#define XSetForeground_TCL_DECLARED
 /* 87 */
 EXTERN int		XSetForeground(Display *display, GC gc,
 				unsigned long foreground);
-#endif
-#ifndef XSetClipMask_TCL_DECLARED
-#define XSetClipMask_TCL_DECLARED
 /* 88 */
 EXTERN int		XSetClipMask(Display *display, GC gc, Pixmap pixmap);
-#endif
-#ifndef XSetClipOrigin_TCL_DECLARED
-#define XSetClipOrigin_TCL_DECLARED
 /* 89 */
 EXTERN int		XSetClipOrigin(Display *display, GC gc,
 				int clip_x_origin, int clip_y_origin);
-#endif
-#ifndef XSetTSOrigin_TCL_DECLARED
-#define XSetTSOrigin_TCL_DECLARED
 /* 90 */
 EXTERN int		XSetTSOrigin(Display *display, GC gc,
 				int ts_x_origin, int ts_y_origin);
-#endif
-#ifndef XChangeGC_TCL_DECLARED
-#define XChangeGC_TCL_DECLARED
 /* 91 */
 EXTERN int		XChangeGC(Display *d, GC gc, unsigned long mask,
 				XGCValues *values);
-#endif
-#ifndef XSetFont_TCL_DECLARED
-#define XSetFont_TCL_DECLARED
 /* 92 */
 EXTERN int		XSetFont(Display *display, GC gc, Font font);
-#endif
-#ifndef XSetArcMode_TCL_DECLARED
-#define XSetArcMode_TCL_DECLARED
 /* 93 */
 EXTERN int		XSetArcMode(Display *display, GC gc, int arc_mode);
-#endif
-#ifndef XSetStipple_TCL_DECLARED
-#define XSetStipple_TCL_DECLARED
 /* 94 */
 EXTERN int		XSetStipple(Display *display, GC gc, Pixmap stipple);
-#endif
-#ifndef XSetFillRule_TCL_DECLARED
-#define XSetFillRule_TCL_DECLARED
 /* 95 */
 EXTERN int		XSetFillRule(Display *display, GC gc, int fill_rule);
-#endif
-#ifndef XSetFillStyle_TCL_DECLARED
-#define XSetFillStyle_TCL_DECLARED
 /* 96 */
 EXTERN int		XSetFillStyle(Display *display, GC gc,
 				int fill_style);
-#endif
-#ifndef XSetFunction_TCL_DECLARED
-#define XSetFunction_TCL_DECLARED
 /* 97 */
 EXTERN int		XSetFunction(Display *display, GC gc, int function);
-#endif
-#ifndef XSetLineAttributes_TCL_DECLARED
-#define XSetLineAttributes_TCL_DECLARED
 /* 98 */
 EXTERN int		XSetLineAttributes(Display *display, GC gc,
 				unsigned int line_width, int line_style,
 				int cap_style, int join_style);
-#endif
-#ifndef _XInitImageFuncPtrs_TCL_DECLARED
-#define _XInitImageFuncPtrs_TCL_DECLARED
 /* 99 */
 EXTERN int		_XInitImageFuncPtrs(XImage *image);
-#endif
-#ifndef XCreateIC_TCL_DECLARED
-#define XCreateIC_TCL_DECLARED
 /* 100 */
 EXTERN XIC		XCreateIC(XIM xim, ...);
-#endif
-#ifndef XGetVisualInfo_TCL_DECLARED
-#define XGetVisualInfo_TCL_DECLARED
 /* 101 */
 EXTERN XVisualInfo *	XGetVisualInfo(Display *display, long vinfo_mask,
 				XVisualInfo *vinfo_template,
 				int *nitems_return);
-#endif
-#ifndef XSetWMClientMachine_TCL_DECLARED
-#define XSetWMClientMachine_TCL_DECLARED
 /* 102 */
 EXTERN void		XSetWMClientMachine(Display *display, Window w,
 				XTextProperty *text_prop);
-#endif
-#ifndef XStringListToTextProperty_TCL_DECLARED
-#define XStringListToTextProperty_TCL_DECLARED
 /* 103 */
 EXTERN Status		XStringListToTextProperty(char **list, int count,
 				XTextProperty *text_prop_return);
-#endif
-#ifndef XDrawLine_TCL_DECLARED
-#define XDrawLine_TCL_DECLARED
 /* 104 */
 EXTERN int		XDrawLine(Display *d, Drawable dr, GC g, int x1,
 				int y1, int x2, int y2);
-#endif
-#ifndef XWarpPointer_TCL_DECLARED
-#define XWarpPointer_TCL_DECLARED
 /* 105 */
 EXTERN int		XWarpPointer(Display *d, Window s, Window dw, int sx,
 				int sy, unsigned int sw, unsigned int sh,
 				int dx, int dy);
-#endif
-#ifndef XFillRectangle_TCL_DECLARED
-#define XFillRectangle_TCL_DECLARED
 /* 106 */
 EXTERN int		XFillRectangle(Display *display, Drawable d, GC gc,
 				int x, int y, unsigned int width,
 				unsigned int height);
-#endif
-#ifndef XFlush_TCL_DECLARED
-#define XFlush_TCL_DECLARED
 /* 107 */
 EXTERN int		XFlush(Display *display);
-#endif
-#ifndef XGrabServer_TCL_DECLARED
-#define XGrabServer_TCL_DECLARED
 /* 108 */
 EXTERN int		XGrabServer(Display *display);
-#endif
-#ifndef XUngrabServer_TCL_DECLARED
-#define XUngrabServer_TCL_DECLARED
 /* 109 */
 EXTERN int		XUngrabServer(Display *display);
-#endif
-#ifndef XFree_TCL_DECLARED
-#define XFree_TCL_DECLARED
 /* 110 */
-EXTERN int		XFree(VOID *data);
-#endif
-#ifndef XNoOp_TCL_DECLARED
-#define XNoOp_TCL_DECLARED
+EXTERN int		XFree(void *data);
 /* 111 */
 EXTERN int		XNoOp(Display *display);
-#endif
-#ifndef XSynchronize_TCL_DECLARED
-#define XSynchronize_TCL_DECLARED
 /* 112 */
 EXTERN XAfterFunction	XSynchronize(Display *display, Bool onoff);
-#endif
-#ifndef XSync_TCL_DECLARED
-#define XSync_TCL_DECLARED
 /* 113 */
 EXTERN int		XSync(Display *display, Bool discard);
-#endif
-#ifndef XVisualIDFromVisual_TCL_DECLARED
-#define XVisualIDFromVisual_TCL_DECLARED
 /* 114 */
 EXTERN VisualID		XVisualIDFromVisual(Visual *visual);
-#endif
 /* Slot 115 is reserved */
 /* Slot 116 is reserved */
 /* Slot 117 is reserved */
@@ -716,24 +374,15 @@ EXTERN VisualID		XVisualIDFromVisual(Visual *visual);
 /* Slot 130 is reserved */
 /* Slot 131 is reserved */
 /* Slot 132 is reserved */
-#ifndef XDrawSegments_TCL_DECLARED
-#define XDrawSegments_TCL_DECLARED
 /* 133 */
 EXTERN int		XDrawSegments(Display *d, Drawable dr, GC gc,
 				XSegment *s, int n);
-#endif
-#ifndef XDrawPoint_TCL_DECLARED
-#define XDrawPoint_TCL_DECLARED
 /* 134 */
 EXTERN int		XDrawPoint(Display *d, Drawable dr, GC gc, int x,
 				int y);
-#endif
-#ifndef XDrawPoints_TCL_DECLARED
-#define XDrawPoints_TCL_DECLARED
 /* 135 */
 EXTERN int		XDrawPoints(Display *d, Drawable dr, GC gc,
 				XPoint *p, int n, int m);
-#endif
 /* Slot 136 is reserved */
 /* Slot 137 is reserved */
 /* Slot 138 is reserved */
@@ -756,551 +405,272 @@ EXTERN int		XDrawPoints(Display *d, Drawable dr, GC gc,
 /* Slot 155 is reserved */
 /* Slot 156 is reserved */
 /* Slot 157 is reserved */
-#ifndef TkUnusedStubEntry_TCL_DECLARED
-#define TkUnusedStubEntry_TCL_DECLARED
 /* 158 */
 EXTERN void		TkUnusedStubEntry(void);
-#endif
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-#ifndef XSetDashes_TCL_DECLARED
-#define XSetDashes_TCL_DECLARED
 /* 0 */
 EXTERN int		XSetDashes(Display *display, GC gc, int dash_offset,
 				_Xconst char *dash_list, int n);
-#endif
-#ifndef XGetModifierMapping_TCL_DECLARED
-#define XGetModifierMapping_TCL_DECLARED
 /* 1 */
 EXTERN XModifierKeymap * XGetModifierMapping(Display *d);
-#endif
-#ifndef XCreateImage_TCL_DECLARED
-#define XCreateImage_TCL_DECLARED
 /* 2 */
 EXTERN XImage *		XCreateImage(Display *d, Visual *v, unsigned int ui1,
 				int i1, int i2, char *cp, unsigned int ui2,
 				unsigned int ui3, int i3, int i4);
-#endif
-#ifndef XGetImage_TCL_DECLARED
-#define XGetImage_TCL_DECLARED
 /* 3 */
 EXTERN XImage *		XGetImage(Display *d, Drawable dr, int i1, int i2,
 				unsigned int ui1, unsigned int ui2,
 				unsigned long ul, int i3);
-#endif
-#ifndef XGetAtomName_TCL_DECLARED
-#define XGetAtomName_TCL_DECLARED
 /* 4 */
 EXTERN char *		XGetAtomName(Display *d, Atom a);
-#endif
-#ifndef XKeysymToString_TCL_DECLARED
-#define XKeysymToString_TCL_DECLARED
 /* 5 */
 EXTERN char *		XKeysymToString(KeySym k);
-#endif
-#ifndef XCreateColormap_TCL_DECLARED
-#define XCreateColormap_TCL_DECLARED
 /* 6 */
 EXTERN Colormap		XCreateColormap(Display *d, Window w, Visual *v,
 				int i);
-#endif
-#ifndef XGContextFromGC_TCL_DECLARED
-#define XGContextFromGC_TCL_DECLARED
 /* 7 */
 EXTERN GContext		XGContextFromGC(GC g);
-#endif
-#ifndef XKeycodeToKeysym_TCL_DECLARED
-#define XKeycodeToKeysym_TCL_DECLARED
 /* 8 */
 EXTERN KeySym		XKeycodeToKeysym(Display *d, KeyCode k, int i);
-#endif
-#ifndef XStringToKeysym_TCL_DECLARED
-#define XStringToKeysym_TCL_DECLARED
 /* 9 */
 EXTERN KeySym		XStringToKeysym(_Xconst char *c);
-#endif
-#ifndef XRootWindow_TCL_DECLARED
-#define XRootWindow_TCL_DECLARED
 /* 10 */
 EXTERN Window		XRootWindow(Display *d, int i);
-#endif
-#ifndef XSetErrorHandler_TCL_DECLARED
-#define XSetErrorHandler_TCL_DECLARED
 /* 11 */
 EXTERN XErrorHandler	XSetErrorHandler(XErrorHandler x);
-#endif
-#ifndef XAllocColor_TCL_DECLARED
-#define XAllocColor_TCL_DECLARED
 /* 12 */
 EXTERN Status		XAllocColor(Display *d, Colormap c, XColor *xp);
-#endif
-#ifndef XBell_TCL_DECLARED
-#define XBell_TCL_DECLARED
 /* 13 */
 EXTERN int		XBell(Display *d, int i);
-#endif
-#ifndef XChangeProperty_TCL_DECLARED
-#define XChangeProperty_TCL_DECLARED
 /* 14 */
 EXTERN void		XChangeProperty(Display *d, Window w, Atom a1,
 				Atom a2, int i1, int i2,
 				_Xconst unsigned char *c, int i3);
-#endif
-#ifndef XChangeWindowAttributes_TCL_DECLARED
-#define XChangeWindowAttributes_TCL_DECLARED
 /* 15 */
 EXTERN void		XChangeWindowAttributes(Display *d, Window w,
 				unsigned long ul, XSetWindowAttributes *x);
-#endif
-#ifndef XConfigureWindow_TCL_DECLARED
-#define XConfigureWindow_TCL_DECLARED
 /* 16 */
 EXTERN void		XConfigureWindow(Display *d, Window w,
 				unsigned int i, XWindowChanges *x);
-#endif
-#ifndef XCopyArea_TCL_DECLARED
-#define XCopyArea_TCL_DECLARED
 /* 17 */
 EXTERN void		XCopyArea(Display *d, Drawable dr1, Drawable dr2,
 				GC g, int i1, int i2, unsigned int ui1,
 				unsigned int ui2, int i3, int i4);
-#endif
-#ifndef XCopyPlane_TCL_DECLARED
-#define XCopyPlane_TCL_DECLARED
 /* 18 */
 EXTERN void		XCopyPlane(Display *d, Drawable dr1, Drawable dr2,
 				GC g, int i1, int i2, unsigned int ui1,
 				unsigned int ui2, int i3, int i4,
 				unsigned long ul);
-#endif
-#ifndef XCreateBitmapFromData_TCL_DECLARED
-#define XCreateBitmapFromData_TCL_DECLARED
 /* 19 */
 EXTERN Pixmap		XCreateBitmapFromData(Display *display, Drawable d,
 				_Xconst char *data, unsigned int width,
 				unsigned int height);
-#endif
-#ifndef XDefineCursor_TCL_DECLARED
-#define XDefineCursor_TCL_DECLARED
 /* 20 */
 EXTERN int		XDefineCursor(Display *d, Window w, Cursor c);
-#endif
-#ifndef XDestroyWindow_TCL_DECLARED
-#define XDestroyWindow_TCL_DECLARED
 /* 21 */
 EXTERN void		XDestroyWindow(Display *d, Window w);
-#endif
-#ifndef XDrawArc_TCL_DECLARED
-#define XDrawArc_TCL_DECLARED
 /* 22 */
 EXTERN void		XDrawArc(Display *d, Drawable dr, GC g, int i1,
 				int i2, unsigned int ui1, unsigned int ui2,
 				int i3, int i4);
-#endif
-#ifndef XDrawLines_TCL_DECLARED
-#define XDrawLines_TCL_DECLARED
 /* 23 */
 EXTERN int		XDrawLines(Display *d, Drawable dr, GC g, XPoint *x,
 				int i1, int i2);
-#endif
-#ifndef XDrawRectangle_TCL_DECLARED
-#define XDrawRectangle_TCL_DECLARED
 /* 24 */
 EXTERN void		XDrawRectangle(Display *d, Drawable dr, GC g, int i1,
 				int i2, unsigned int ui1, unsigned int ui2);
-#endif
-#ifndef XFillArc_TCL_DECLARED
-#define XFillArc_TCL_DECLARED
 /* 25 */
 EXTERN void		XFillArc(Display *d, Drawable dr, GC g, int i1,
 				int i2, unsigned int ui1, unsigned int ui2,
 				int i3, int i4);
-#endif
-#ifndef XFillPolygon_TCL_DECLARED
-#define XFillPolygon_TCL_DECLARED
 /* 26 */
 EXTERN void		XFillPolygon(Display *d, Drawable dr, GC g,
 				XPoint *x, int i1, int i2, int i3);
-#endif
-#ifndef XFillRectangles_TCL_DECLARED
-#define XFillRectangles_TCL_DECLARED
 /* 27 */
 EXTERN int		XFillRectangles(Display *d, Drawable dr, GC g,
 				XRectangle *x, int i);
-#endif
-#ifndef XFreeColormap_TCL_DECLARED
-#define XFreeColormap_TCL_DECLARED
 /* 28 */
 EXTERN int		XFreeColormap(Display *d, Colormap c);
-#endif
-#ifndef XFreeColors_TCL_DECLARED
-#define XFreeColors_TCL_DECLARED
 /* 29 */
 EXTERN int		XFreeColors(Display *d, Colormap c,
 				unsigned long *ulp, int i, unsigned long ul);
-#endif
-#ifndef XFreeModifiermap_TCL_DECLARED
-#define XFreeModifiermap_TCL_DECLARED
 /* 30 */
 EXTERN int		XFreeModifiermap(XModifierKeymap *x);
-#endif
-#ifndef XGetGeometry_TCL_DECLARED
-#define XGetGeometry_TCL_DECLARED
 /* 31 */
 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);
-#endif
-#ifndef XGetWindowProperty_TCL_DECLARED
-#define XGetWindowProperty_TCL_DECLARED
 /* 32 */
 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);
-#endif
-#ifndef XGrabKeyboard_TCL_DECLARED
-#define XGrabKeyboard_TCL_DECLARED
 /* 33 */
 EXTERN int		XGrabKeyboard(Display *d, Window w, Bool b, int i1,
 				int i2, Time t);
-#endif
-#ifndef XGrabPointer_TCL_DECLARED
-#define XGrabPointer_TCL_DECLARED
 /* 34 */
 EXTERN int		XGrabPointer(Display *d, Window w1, Bool b,
 				unsigned int ui, int i1, int i2, Window w2,
 				Cursor c, Time t);
-#endif
-#ifndef XKeysymToKeycode_TCL_DECLARED
-#define XKeysymToKeycode_TCL_DECLARED
 /* 35 */
 EXTERN KeyCode		XKeysymToKeycode(Display *d, KeySym k);
-#endif
-#ifndef XMapWindow_TCL_DECLARED
-#define XMapWindow_TCL_DECLARED
 /* 36 */
 EXTERN void		XMapWindow(Display *d, Window w);
-#endif
-#ifndef XMoveResizeWindow_TCL_DECLARED
-#define XMoveResizeWindow_TCL_DECLARED
 /* 37 */
 EXTERN void		XMoveResizeWindow(Display *d, Window w, int i1,
 				int i2, unsigned int ui1, unsigned int ui2);
-#endif
-#ifndef XMoveWindow_TCL_DECLARED
-#define XMoveWindow_TCL_DECLARED
 /* 38 */
 EXTERN void		XMoveWindow(Display *d, Window w, int i1, int i2);
-#endif
-#ifndef XQueryPointer_TCL_DECLARED
-#define XQueryPointer_TCL_DECLARED
 /* 39 */
 EXTERN Bool		XQueryPointer(Display *d, Window w1, Window *w2,
 				Window *w3, int *i1, int *i2, int *i3,
 				int *i4, unsigned int *ui);
-#endif
-#ifndef XRaiseWindow_TCL_DECLARED
-#define XRaiseWindow_TCL_DECLARED
 /* 40 */
 EXTERN void		XRaiseWindow(Display *d, Window w);
-#endif
-#ifndef XRefreshKeyboardMapping_TCL_DECLARED
-#define XRefreshKeyboardMapping_TCL_DECLARED
 /* 41 */
 EXTERN void		XRefreshKeyboardMapping(XMappingEvent *x);
-#endif
-#ifndef XResizeWindow_TCL_DECLARED
-#define XResizeWindow_TCL_DECLARED
 /* 42 */
 EXTERN void		XResizeWindow(Display *d, Window w, unsigned int ui1,
 				unsigned int ui2);
-#endif
-#ifndef XSelectInput_TCL_DECLARED
-#define XSelectInput_TCL_DECLARED
 /* 43 */
 EXTERN void		XSelectInput(Display *d, Window w, long l);
-#endif
-#ifndef XSendEvent_TCL_DECLARED
-#define XSendEvent_TCL_DECLARED
 /* 44 */
 EXTERN Status		XSendEvent(Display *d, Window w, Bool b, long l,
 				XEvent *x);
-#endif
-#ifndef XSetIconName_TCL_DECLARED
-#define XSetIconName_TCL_DECLARED
 /* 45 */
 EXTERN void		XSetIconName(Display *d, Window w, _Xconst char *c);
-#endif
-#ifndef XSetInputFocus_TCL_DECLARED
-#define XSetInputFocus_TCL_DECLARED
 /* 46 */
 EXTERN void		XSetInputFocus(Display *d, Window w, int i, Time t);
-#endif
-#ifndef XSetSelectionOwner_TCL_DECLARED
-#define XSetSelectionOwner_TCL_DECLARED
 /* 47 */
 EXTERN int		XSetSelectionOwner(Display *d, Atom a, Window w,
 				Time t);
-#endif
-#ifndef XSetWindowBackground_TCL_DECLARED
-#define XSetWindowBackground_TCL_DECLARED
 /* 48 */
 EXTERN void		XSetWindowBackground(Display *d, Window w,
 				unsigned long ul);
-#endif
-#ifndef XSetWindowBackgroundPixmap_TCL_DECLARED
-#define XSetWindowBackgroundPixmap_TCL_DECLARED
 /* 49 */
 EXTERN void		XSetWindowBackgroundPixmap(Display *d, Window w,
 				Pixmap p);
-#endif
-#ifndef XSetWindowBorder_TCL_DECLARED
-#define XSetWindowBorder_TCL_DECLARED
 /* 50 */
 EXTERN void		XSetWindowBorder(Display *d, Window w,
 				unsigned long ul);
-#endif
-#ifndef XSetWindowBorderPixmap_TCL_DECLARED
-#define XSetWindowBorderPixmap_TCL_DECLARED
 /* 51 */
 EXTERN void		XSetWindowBorderPixmap(Display *d, Window w,
 				Pixmap p);
-#endif
-#ifndef XSetWindowBorderWidth_TCL_DECLARED
-#define XSetWindowBorderWidth_TCL_DECLARED
 /* 52 */
 EXTERN void		XSetWindowBorderWidth(Display *d, Window w,
 				unsigned int ui);
-#endif
-#ifndef XSetWindowColormap_TCL_DECLARED
-#define XSetWindowColormap_TCL_DECLARED
 /* 53 */
 EXTERN void		XSetWindowColormap(Display *d, Window w, Colormap c);
-#endif
-#ifndef XUngrabKeyboard_TCL_DECLARED
-#define XUngrabKeyboard_TCL_DECLARED
 /* 54 */
 EXTERN void		XUngrabKeyboard(Display *d, Time t);
-#endif
-#ifndef XUngrabPointer_TCL_DECLARED
-#define XUngrabPointer_TCL_DECLARED
 /* 55 */
 EXTERN int		XUngrabPointer(Display *d, Time t);
-#endif
-#ifndef XUnmapWindow_TCL_DECLARED
-#define XUnmapWindow_TCL_DECLARED
 /* 56 */
 EXTERN void		XUnmapWindow(Display *d, Window w);
-#endif
-#ifndef TkPutImage_TCL_DECLARED
-#define TkPutImage_TCL_DECLARED
 /* 57 */
 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);
-#endif
-#ifndef XParseColor_TCL_DECLARED
-#define XParseColor_TCL_DECLARED
 /* 58 */
 EXTERN Status		XParseColor(Display *display, Colormap map,
 				_Xconst char *spec, XColor *colorPtr);
-#endif
-#ifndef XCreateGC_TCL_DECLARED
-#define XCreateGC_TCL_DECLARED
 /* 59 */
 EXTERN GC		XCreateGC(Display *display, Drawable d,
 				unsigned long valuemask, XGCValues *values);
-#endif
-#ifndef XFreeGC_TCL_DECLARED
-#define XFreeGC_TCL_DECLARED
 /* 60 */
 EXTERN int		XFreeGC(Display *display, GC gc);
-#endif
-#ifndef XInternAtom_TCL_DECLARED
-#define XInternAtom_TCL_DECLARED
 /* 61 */
 EXTERN Atom		XInternAtom(Display *display,
 				_Xconst char *atom_name, Bool only_if_exists);
-#endif
-#ifndef XSetBackground_TCL_DECLARED
-#define XSetBackground_TCL_DECLARED
 /* 62 */
 EXTERN int		XSetBackground(Display *display, GC gc,
 				unsigned long foreground);
-#endif
-#ifndef XSetForeground_TCL_DECLARED
-#define XSetForeground_TCL_DECLARED
 /* 63 */
 EXTERN int		XSetForeground(Display *display, GC gc,
 				unsigned long foreground);
-#endif
-#ifndef XSetClipMask_TCL_DECLARED
-#define XSetClipMask_TCL_DECLARED
 /* 64 */
 EXTERN int		XSetClipMask(Display *display, GC gc, Pixmap pixmap);
-#endif
-#ifndef XSetClipOrigin_TCL_DECLARED
-#define XSetClipOrigin_TCL_DECLARED
 /* 65 */
 EXTERN int		XSetClipOrigin(Display *display, GC gc,
 				int clip_x_origin, int clip_y_origin);
-#endif
-#ifndef XSetTSOrigin_TCL_DECLARED
-#define XSetTSOrigin_TCL_DECLARED
 /* 66 */
 EXTERN int		XSetTSOrigin(Display *display, GC gc,
 				int ts_x_origin, int ts_y_origin);
-#endif
-#ifndef XChangeGC_TCL_DECLARED
-#define XChangeGC_TCL_DECLARED
 /* 67 */
 EXTERN int		XChangeGC(Display *d, GC gc, unsigned long mask,
 				XGCValues *values);
-#endif
-#ifndef XSetFont_TCL_DECLARED
-#define XSetFont_TCL_DECLARED
 /* 68 */
 EXTERN int		XSetFont(Display *display, GC gc, Font font);
-#endif
-#ifndef XSetArcMode_TCL_DECLARED
-#define XSetArcMode_TCL_DECLARED
 /* 69 */
 EXTERN int		XSetArcMode(Display *display, GC gc, int arc_mode);
-#endif
-#ifndef XSetStipple_TCL_DECLARED
-#define XSetStipple_TCL_DECLARED
 /* 70 */
 EXTERN int		XSetStipple(Display *display, GC gc, Pixmap stipple);
-#endif
-#ifndef XSetFillRule_TCL_DECLARED
-#define XSetFillRule_TCL_DECLARED
 /* 71 */
 EXTERN int		XSetFillRule(Display *display, GC gc, int fill_rule);
-#endif
-#ifndef XSetFillStyle_TCL_DECLARED
-#define XSetFillStyle_TCL_DECLARED
 /* 72 */
 EXTERN int		XSetFillStyle(Display *display, GC gc,
 				int fill_style);
-#endif
-#ifndef XSetFunction_TCL_DECLARED
-#define XSetFunction_TCL_DECLARED
 /* 73 */
 EXTERN int		XSetFunction(Display *display, GC gc, int function);
-#endif
-#ifndef XSetLineAttributes_TCL_DECLARED
-#define XSetLineAttributes_TCL_DECLARED
 /* 74 */
 EXTERN int		XSetLineAttributes(Display *display, GC gc,
 				unsigned int line_width, int line_style,
 				int cap_style, int join_style);
-#endif
-#ifndef _XInitImageFuncPtrs_TCL_DECLARED
-#define _XInitImageFuncPtrs_TCL_DECLARED
 /* 75 */
 EXTERN int		_XInitImageFuncPtrs(XImage *image);
-#endif
-#ifndef XCreateIC_TCL_DECLARED
-#define XCreateIC_TCL_DECLARED
 /* 76 */
 EXTERN XIC		XCreateIC(void);
-#endif
-#ifndef XGetVisualInfo_TCL_DECLARED
-#define XGetVisualInfo_TCL_DECLARED
 /* 77 */
 EXTERN XVisualInfo *	XGetVisualInfo(Display *display, long vinfo_mask,
 				XVisualInfo *vinfo_template,
 				int *nitems_return);
-#endif
-#ifndef XSetWMClientMachine_TCL_DECLARED
-#define XSetWMClientMachine_TCL_DECLARED
 /* 78 */
 EXTERN void		XSetWMClientMachine(Display *display, Window w,
 				XTextProperty *text_prop);
-#endif
-#ifndef XStringListToTextProperty_TCL_DECLARED
-#define XStringListToTextProperty_TCL_DECLARED
 /* 79 */
 EXTERN Status		XStringListToTextProperty(char **list, int count,
 				XTextProperty *text_prop_return);
-#endif
-#ifndef XDrawSegments_TCL_DECLARED
-#define XDrawSegments_TCL_DECLARED
 /* 80 */
 EXTERN int		XDrawSegments(Display *display, Drawable d, GC gc,
 				XSegment *segments, int nsegments);
-#endif
-#ifndef XForceScreenSaver_TCL_DECLARED
-#define XForceScreenSaver_TCL_DECLARED
 /* 81 */
 EXTERN void		XForceScreenSaver(Display *display, int mode);
-#endif
-#ifndef XDrawLine_TCL_DECLARED
-#define XDrawLine_TCL_DECLARED
 /* 82 */
 EXTERN int		XDrawLine(Display *d, Drawable dr, GC g, int x1,
 				int y1, int x2, int y2);
-#endif
-#ifndef XFillRectangle_TCL_DECLARED
-#define XFillRectangle_TCL_DECLARED
 /* 83 */
 EXTERN int		XFillRectangle(Display *display, Drawable d, GC gc,
 				int x, int y, unsigned int width,
 				unsigned int height);
-#endif
-#ifndef XClearWindow_TCL_DECLARED
-#define XClearWindow_TCL_DECLARED
 /* 84 */
 EXTERN void		XClearWindow(Display *d, Window w);
-#endif
-#ifndef XDrawPoint_TCL_DECLARED
-#define XDrawPoint_TCL_DECLARED
 /* 85 */
 EXTERN int		XDrawPoint(Display *display, Drawable d, GC gc,
 				int x, int y);
-#endif
-#ifndef XDrawPoints_TCL_DECLARED
-#define XDrawPoints_TCL_DECLARED
 /* 86 */
 EXTERN int		XDrawPoints(Display *display, Drawable d, GC gc,
 				XPoint *points, int npoints, int mode);
-#endif
-#ifndef XWarpPointer_TCL_DECLARED
-#define XWarpPointer_TCL_DECLARED
 /* 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);
-#endif
-#ifndef XQueryColor_TCL_DECLARED
-#define XQueryColor_TCL_DECLARED
 /* 88 */
 EXTERN void		XQueryColor(Display *display, Colormap colormap,
 				XColor *def_in_out);
-#endif
-#ifndef XQueryColors_TCL_DECLARED
-#define XQueryColors_TCL_DECLARED
 /* 89 */
 EXTERN void		XQueryColors(Display *display, Colormap colormap,
 				XColor *defs_in_out, int ncolors);
-#endif
-#ifndef XQueryTree_TCL_DECLARED
-#define XQueryTree_TCL_DECLARED
 /* 90 */
 EXTERN Status		XQueryTree(Display *d, Window w1, Window *w2,
 				Window *w3, Window **w4, unsigned int *ui);
-#endif
-#ifndef XSync_TCL_DECLARED
-#define XSync_TCL_DECLARED
 /* 91 */
 EXTERN int		XSync(Display *display, Bool discard);
-#endif
 /* Slot 92 is reserved */
 /* Slot 93 is reserved */
 /* Slot 94 is reserved */
@@ -1367,18 +737,15 @@ EXTERN int		XSync(Display *display, Bool discard);
 /* Slot 155 is reserved */
 /* Slot 156 is reserved */
 /* Slot 157 is reserved */
-#ifndef TkUnusedStubEntry_TCL_DECLARED
-#define TkUnusedStubEntry_TCL_DECLARED
 /* 158 */
 EXTERN void		TkUnusedStubEntry(void);
-#endif
 #endif /* AQUA */
 
 typedef struct TkIntXlibStubs {
     int magic;
-    struct TkIntXlibStubHooks *hooks;
+    void *hooks;
 
-#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
     int (*xSetDashes) (Display *display, GC gc, int dash_offset, _Xconst char *dash_list, int n); /* 0 */
     XModifierKeymap * (*xGetModifierMapping) (Display *d); /* 1 */
     XImage * (*xCreateImage) (Display *d, Visual *v, unsigned int ui1, int i1, int i2, char *cp, unsigned int ui2, unsigned int ui3, int i3, int i4); /* 2 */
@@ -1460,7 +827,7 @@ typedef struct TkIntXlibStubs {
     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 */
-    VOID *reserved81;
+    void (*reserved81)(void);
     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 */
@@ -1489,54 +856,54 @@ typedef struct TkIntXlibStubs {
     int (*xFlush) (Display *display); /* 107 */
     int (*xGrabServer) (Display *display); /* 108 */
     int (*xUngrabServer) (Display *display); /* 109 */
-    int (*xFree) (VOID *data); /* 110 */
+    int (*xFree) (void *data); /* 110 */
     int (*xNoOp) (Display *display); /* 111 */
     XAfterFunction (*xSynchronize) (Display *display, Bool onoff); /* 112 */
     int (*xSync) (Display *display, Bool discard); /* 113 */
     VisualID (*xVisualIDFromVisual) (Visual *visual); /* 114 */
-    VOID *reserved115;
-    VOID *reserved116;
-    VOID *reserved117;
-    VOID *reserved118;
-    VOID *reserved119;
-    VOID *reserved120;
-    VOID *reserved121;
-    VOID *reserved122;
-    VOID *reserved123;
-    VOID *reserved124;
-    VOID *reserved125;
-    VOID *reserved126;
-    VOID *reserved127;
-    VOID *reserved128;
-    VOID *reserved129;
-    VOID *reserved130;
-    VOID *reserved131;
-    VOID *reserved132;
+    void (*reserved115)(void);
+    void (*reserved116)(void);
+    void (*reserved117)(void);
+    void (*reserved118)(void);
+    void (*reserved119)(void);
+    void (*reserved120)(void);
+    void (*reserved121)(void);
+    void (*reserved122)(void);
+    void (*reserved123)(void);
+    void (*reserved124)(void);
+    void (*reserved125)(void);
+    void (*reserved126)(void);
+    void (*reserved127)(void);
+    void (*reserved128)(void);
+    void (*reserved129)(void);
+    void (*reserved130)(void);
+    void (*reserved131)(void);
+    void (*reserved132)(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 */
-    VOID *reserved136;
-    VOID *reserved137;
-    VOID *reserved138;
-    VOID *reserved139;
-    VOID *reserved140;
-    VOID *reserved141;
-    VOID *reserved142;
-    VOID *reserved143;
-    VOID *reserved144;
-    VOID *reserved145;
-    VOID *reserved146;
-    VOID *reserved147;
-    VOID *reserved148;
-    VOID *reserved149;
-    VOID *reserved150;
-    VOID *reserved151;
-    VOID *reserved152;
-    VOID *reserved153;
-    VOID *reserved154;
-    VOID *reserved155;
-    VOID *reserved156;
-    VOID *reserved157;
+    void (*reserved136)(void);
+    void (*reserved137)(void);
+    void (*reserved138)(void);
+    void (*reserved139)(void);
+    void (*reserved140)(void);
+    void (*reserved141)(void);
+    void (*reserved142)(void);
+    void (*reserved143)(void);
+    void (*reserved144)(void);
+    void (*reserved145)(void);
+    void (*reserved146)(void);
+    void (*reserved147)(void);
+    void (*reserved148)(void);
+    void (*reserved149)(void);
+    void (*reserved150)(void);
+    void (*reserved151)(void);
+    void (*reserved152)(void);
+    void (*reserved153)(void);
+    void (*reserved154)(void);
+    void (*reserved155)(void);
+    void (*reserved156)(void);
+    void (*reserved157)(void);
     void (*tkUnusedStubEntry) (void); /* 158 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
@@ -1632,546 +999,318 @@ typedef struct TkIntXlibStubs {
     void (*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 */
-    VOID *reserved92;
-    VOID *reserved93;
-    VOID *reserved94;
-    VOID *reserved95;
-    VOID *reserved96;
-    VOID *reserved97;
-    VOID *reserved98;
-    VOID *reserved99;
-    VOID *reserved100;
-    VOID *reserved101;
-    VOID *reserved102;
-    VOID *reserved103;
-    VOID *reserved104;
-    VOID *reserved105;
-    VOID *reserved106;
-    VOID *reserved107;
-    VOID *reserved108;
-    VOID *reserved109;
-    VOID *reserved110;
-    VOID *reserved111;
-    VOID *reserved112;
-    VOID *reserved113;
-    VOID *reserved114;
-    VOID *reserved115;
-    VOID *reserved116;
-    VOID *reserved117;
-    VOID *reserved118;
-    VOID *reserved119;
-    VOID *reserved120;
-    VOID *reserved121;
-    VOID *reserved122;
-    VOID *reserved123;
-    VOID *reserved124;
-    VOID *reserved125;
-    VOID *reserved126;
-    VOID *reserved127;
-    VOID *reserved128;
-    VOID *reserved129;
-    VOID *reserved130;
-    VOID *reserved131;
-    VOID *reserved132;
-    VOID *reserved133;
-    VOID *reserved134;
-    VOID *reserved135;
-    VOID *reserved136;
-    VOID *reserved137;
-    VOID *reserved138;
-    VOID *reserved139;
-    VOID *reserved140;
-    VOID *reserved141;
-    VOID *reserved142;
-    VOID *reserved143;
-    VOID *reserved144;
-    VOID *reserved145;
-    VOID *reserved146;
-    VOID *reserved147;
-    VOID *reserved148;
-    VOID *reserved149;
-    VOID *reserved150;
-    VOID *reserved151;
-    VOID *reserved152;
-    VOID *reserved153;
-    VOID *reserved154;
-    VOID *reserved155;
-    VOID *reserved156;
-    VOID *reserved157;
+    void (*reserved92)(void);
+    void (*reserved93)(void);
+    void (*reserved94)(void);
+    void (*reserved95)(void);
+    void (*reserved96)(void);
+    void (*reserved97)(void);
+    void (*reserved98)(void);
+    void (*reserved99)(void);
+    void (*reserved100)(void);
+    void (*reserved101)(void);
+    void (*reserved102)(void);
+    void (*reserved103)(void);
+    void (*reserved104)(void);
+    void (*reserved105)(void);
+    void (*reserved106)(void);
+    void (*reserved107)(void);
+    void (*reserved108)(void);
+    void (*reserved109)(void);
+    void (*reserved110)(void);
+    void (*reserved111)(void);
+    void (*reserved112)(void);
+    void (*reserved113)(void);
+    void (*reserved114)(void);
+    void (*reserved115)(void);
+    void (*reserved116)(void);
+    void (*reserved117)(void);
+    void (*reserved118)(void);
+    void (*reserved119)(void);
+    void (*reserved120)(void);
+    void (*reserved121)(void);
+    void (*reserved122)(void);
+    void (*reserved123)(void);
+    void (*reserved124)(void);
+    void (*reserved125)(void);
+    void (*reserved126)(void);
+    void (*reserved127)(void);
+    void (*reserved128)(void);
+    void (*reserved129)(void);
+    void (*reserved130)(void);
+    void (*reserved131)(void);
+    void (*reserved132)(void);
+    void (*reserved133)(void);
+    void (*reserved134)(void);
+    void (*reserved135)(void);
+    void (*reserved136)(void);
+    void (*reserved137)(void);
+    void (*reserved138)(void);
+    void (*reserved139)(void);
+    void (*reserved140)(void);
+    void (*reserved141)(void);
+    void (*reserved142)(void);
+    void (*reserved143)(void);
+    void (*reserved144)(void);
+    void (*reserved145)(void);
+    void (*reserved146)(void);
+    void (*reserved147)(void);
+    void (*reserved148)(void);
+    void (*reserved149)(void);
+    void (*reserved150)(void);
+    void (*reserved151)(void);
+    void (*reserved152)(void);
+    void (*reserved153)(void);
+    void (*reserved154)(void);
+    void (*reserved155)(void);
+    void (*reserved156)(void);
+    void (*reserved157)(void);
     void (*tkUnusedStubEntry) (void); /* 158 */
 #endif /* AQUA */
 } TkIntXlibStubs;
 
-extern TkIntXlibStubs *tkIntXlibStubsPtr;
+extern const TkIntXlibStubs *tkIntXlibStubsPtr;
 
 #ifdef __cplusplus
 }
 #endif
 
-#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
+#if defined(USE_TK_STUBS)
 
 /*
  * Inline function declarations:
  */
 
-#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
-#ifndef XSetDashes
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
 #define XSetDashes \
 	(tkIntXlibStubsPtr->xSetDashes) /* 0 */
-#endif
-#ifndef XGetModifierMapping
 #define XGetModifierMapping \
 	(tkIntXlibStubsPtr->xGetModifierMapping) /* 1 */
-#endif
-#ifndef XCreateImage
 #define XCreateImage \
 	(tkIntXlibStubsPtr->xCreateImage) /* 2 */
-#endif
-#ifndef XGetImage
 #define XGetImage \
 	(tkIntXlibStubsPtr->xGetImage) /* 3 */
-#endif
-#ifndef XGetAtomName
 #define XGetAtomName \
 	(tkIntXlibStubsPtr->xGetAtomName) /* 4 */
-#endif
-#ifndef XKeysymToString
 #define XKeysymToString \
 	(tkIntXlibStubsPtr->xKeysymToString) /* 5 */
-#endif
-#ifndef XCreateColormap
 #define XCreateColormap \
 	(tkIntXlibStubsPtr->xCreateColormap) /* 6 */
-#endif
-#ifndef XCreatePixmapCursor
 #define XCreatePixmapCursor \
 	(tkIntXlibStubsPtr->xCreatePixmapCursor) /* 7 */
-#endif
-#ifndef XCreateGlyphCursor
 #define XCreateGlyphCursor \
 	(tkIntXlibStubsPtr->xCreateGlyphCursor) /* 8 */
-#endif
-#ifndef XGContextFromGC
 #define XGContextFromGC \
 	(tkIntXlibStubsPtr->xGContextFromGC) /* 9 */
-#endif
-#ifndef XListHosts
 #define XListHosts \
 	(tkIntXlibStubsPtr->xListHosts) /* 10 */
-#endif
-#ifndef XKeycodeToKeysym
 #define XKeycodeToKeysym \
 	(tkIntXlibStubsPtr->xKeycodeToKeysym) /* 11 */
-#endif
-#ifndef XStringToKeysym
 #define XStringToKeysym \
 	(tkIntXlibStubsPtr->xStringToKeysym) /* 12 */
-#endif
-#ifndef XRootWindow
 #define XRootWindow \
 	(tkIntXlibStubsPtr->xRootWindow) /* 13 */
-#endif
-#ifndef XSetErrorHandler
 #define XSetErrorHandler \
 	(tkIntXlibStubsPtr->xSetErrorHandler) /* 14 */
-#endif
-#ifndef XIconifyWindow
 #define XIconifyWindow \
 	(tkIntXlibStubsPtr->xIconifyWindow) /* 15 */
-#endif
-#ifndef XWithdrawWindow
 #define XWithdrawWindow \
 	(tkIntXlibStubsPtr->xWithdrawWindow) /* 16 */
-#endif
-#ifndef XGetWMColormapWindows
 #define XGetWMColormapWindows \
 	(tkIntXlibStubsPtr->xGetWMColormapWindows) /* 17 */
-#endif
-#ifndef XAllocColor
 #define XAllocColor \
 	(tkIntXlibStubsPtr->xAllocColor) /* 18 */
-#endif
-#ifndef XBell
 #define XBell \
 	(tkIntXlibStubsPtr->xBell) /* 19 */
-#endif
-#ifndef XChangeProperty
 #define XChangeProperty \
 	(tkIntXlibStubsPtr->xChangeProperty) /* 20 */
-#endif
-#ifndef XChangeWindowAttributes
 #define XChangeWindowAttributes \
 	(tkIntXlibStubsPtr->xChangeWindowAttributes) /* 21 */
-#endif
-#ifndef XClearWindow
 #define XClearWindow \
 	(tkIntXlibStubsPtr->xClearWindow) /* 22 */
-#endif
-#ifndef XConfigureWindow
 #define XConfigureWindow \
 	(tkIntXlibStubsPtr->xConfigureWindow) /* 23 */
-#endif
-#ifndef XCopyArea
 #define XCopyArea \
 	(tkIntXlibStubsPtr->xCopyArea) /* 24 */
-#endif
-#ifndef XCopyPlane
 #define XCopyPlane \
 	(tkIntXlibStubsPtr->xCopyPlane) /* 25 */
-#endif
-#ifndef XCreateBitmapFromData
 #define XCreateBitmapFromData \
 	(tkIntXlibStubsPtr->xCreateBitmapFromData) /* 26 */
-#endif
-#ifndef XDefineCursor
 #define XDefineCursor \
 	(tkIntXlibStubsPtr->xDefineCursor) /* 27 */
-#endif
-#ifndef XDeleteProperty
 #define XDeleteProperty \
 	(tkIntXlibStubsPtr->xDeleteProperty) /* 28 */
-#endif
-#ifndef XDestroyWindow
 #define XDestroyWindow \
 	(tkIntXlibStubsPtr->xDestroyWindow) /* 29 */
-#endif
-#ifndef XDrawArc
 #define XDrawArc \
 	(tkIntXlibStubsPtr->xDrawArc) /* 30 */
-#endif
-#ifndef XDrawLines
 #define XDrawLines \
 	(tkIntXlibStubsPtr->xDrawLines) /* 31 */
-#endif
-#ifndef XDrawRectangle
 #define XDrawRectangle \
 	(tkIntXlibStubsPtr->xDrawRectangle) /* 32 */
-#endif
-#ifndef XFillArc
 #define XFillArc \
 	(tkIntXlibStubsPtr->xFillArc) /* 33 */
-#endif
-#ifndef XFillPolygon
 #define XFillPolygon \
 	(tkIntXlibStubsPtr->xFillPolygon) /* 34 */
-#endif
-#ifndef XFillRectangles
 #define XFillRectangles \
 	(tkIntXlibStubsPtr->xFillRectangles) /* 35 */
-#endif
-#ifndef XForceScreenSaver
 #define XForceScreenSaver \
 	(tkIntXlibStubsPtr->xForceScreenSaver) /* 36 */
-#endif
-#ifndef XFreeColormap
 #define XFreeColormap \
 	(tkIntXlibStubsPtr->xFreeColormap) /* 37 */
-#endif
-#ifndef XFreeColors
 #define XFreeColors \
 	(tkIntXlibStubsPtr->xFreeColors) /* 38 */
-#endif
-#ifndef XFreeCursor
 #define XFreeCursor \
 	(tkIntXlibStubsPtr->xFreeCursor) /* 39 */
-#endif
-#ifndef XFreeModifiermap
 #define XFreeModifiermap \
 	(tkIntXlibStubsPtr->xFreeModifiermap) /* 40 */
-#endif
-#ifndef XGetGeometry
 #define XGetGeometry \
 	(tkIntXlibStubsPtr->xGetGeometry) /* 41 */
-#endif
-#ifndef XGetInputFocus
 #define XGetInputFocus \
 	(tkIntXlibStubsPtr->xGetInputFocus) /* 42 */
-#endif
-#ifndef XGetWindowProperty
 #define XGetWindowProperty \
 	(tkIntXlibStubsPtr->xGetWindowProperty) /* 43 */
-#endif
-#ifndef XGetWindowAttributes
 #define XGetWindowAttributes \
 	(tkIntXlibStubsPtr->xGetWindowAttributes) /* 44 */
-#endif
-#ifndef XGrabKeyboard
 #define XGrabKeyboard \
 	(tkIntXlibStubsPtr->xGrabKeyboard) /* 45 */
-#endif
-#ifndef XGrabPointer
 #define XGrabPointer \
 	(tkIntXlibStubsPtr->xGrabPointer) /* 46 */
-#endif
-#ifndef XKeysymToKeycode
 #define XKeysymToKeycode \
 	(tkIntXlibStubsPtr->xKeysymToKeycode) /* 47 */
-#endif
-#ifndef XLookupColor
 #define XLookupColor \
 	(tkIntXlibStubsPtr->xLookupColor) /* 48 */
-#endif
-#ifndef XMapWindow
 #define XMapWindow \
 	(tkIntXlibStubsPtr->xMapWindow) /* 49 */
-#endif
-#ifndef XMoveResizeWindow
 #define XMoveResizeWindow \
 	(tkIntXlibStubsPtr->xMoveResizeWindow) /* 50 */
-#endif
-#ifndef XMoveWindow
 #define XMoveWindow \
 	(tkIntXlibStubsPtr->xMoveWindow) /* 51 */
-#endif
-#ifndef XNextEvent
 #define XNextEvent \
 	(tkIntXlibStubsPtr->xNextEvent) /* 52 */
-#endif
-#ifndef XPutBackEvent
 #define XPutBackEvent \
 	(tkIntXlibStubsPtr->xPutBackEvent) /* 53 */
-#endif
-#ifndef XQueryColors
 #define XQueryColors \
 	(tkIntXlibStubsPtr->xQueryColors) /* 54 */
-#endif
-#ifndef XQueryPointer
 #define XQueryPointer \
 	(tkIntXlibStubsPtr->xQueryPointer) /* 55 */
-#endif
-#ifndef XQueryTree
 #define XQueryTree \
 	(tkIntXlibStubsPtr->xQueryTree) /* 56 */
-#endif
-#ifndef XRaiseWindow
 #define XRaiseWindow \
 	(tkIntXlibStubsPtr->xRaiseWindow) /* 57 */
-#endif
-#ifndef XRefreshKeyboardMapping
 #define XRefreshKeyboardMapping \
 	(tkIntXlibStubsPtr->xRefreshKeyboardMapping) /* 58 */
-#endif
-#ifndef XResizeWindow
 #define XResizeWindow \
 	(tkIntXlibStubsPtr->xResizeWindow) /* 59 */
-#endif
-#ifndef XSelectInput
 #define XSelectInput \
 	(tkIntXlibStubsPtr->xSelectInput) /* 60 */
-#endif
-#ifndef XSendEvent
 #define XSendEvent \
 	(tkIntXlibStubsPtr->xSendEvent) /* 61 */
-#endif
-#ifndef XSetCommand
 #define XSetCommand \
 	(tkIntXlibStubsPtr->xSetCommand) /* 62 */
-#endif
-#ifndef XSetIconName
 #define XSetIconName \
 	(tkIntXlibStubsPtr->xSetIconName) /* 63 */
-#endif
-#ifndef XSetInputFocus
 #define XSetInputFocus \
 	(tkIntXlibStubsPtr->xSetInputFocus) /* 64 */
-#endif
-#ifndef XSetSelectionOwner
 #define XSetSelectionOwner \
 	(tkIntXlibStubsPtr->xSetSelectionOwner) /* 65 */
-#endif
-#ifndef XSetWindowBackground
 #define XSetWindowBackground \
 	(tkIntXlibStubsPtr->xSetWindowBackground) /* 66 */
-#endif
-#ifndef XSetWindowBackgroundPixmap
 #define XSetWindowBackgroundPixmap \
 	(tkIntXlibStubsPtr->xSetWindowBackgroundPixmap) /* 67 */
-#endif
-#ifndef XSetWindowBorder
 #define XSetWindowBorder \
 	(tkIntXlibStubsPtr->xSetWindowBorder) /* 68 */
-#endif
-#ifndef XSetWindowBorderPixmap
 #define XSetWindowBorderPixmap \
 	(tkIntXlibStubsPtr->xSetWindowBorderPixmap) /* 69 */
-#endif
-#ifndef XSetWindowBorderWidth
 #define XSetWindowBorderWidth \
 	(tkIntXlibStubsPtr->xSetWindowBorderWidth) /* 70 */
-#endif
-#ifndef XSetWindowColormap
 #define XSetWindowColormap \
 	(tkIntXlibStubsPtr->xSetWindowColormap) /* 71 */
-#endif
-#ifndef XTranslateCoordinates
 #define XTranslateCoordinates \
 	(tkIntXlibStubsPtr->xTranslateCoordinates) /* 72 */
-#endif
-#ifndef XUngrabKeyboard
 #define XUngrabKeyboard \
 	(tkIntXlibStubsPtr->xUngrabKeyboard) /* 73 */
-#endif
-#ifndef XUngrabPointer
 #define XUngrabPointer \
 	(tkIntXlibStubsPtr->xUngrabPointer) /* 74 */
-#endif
-#ifndef XUnmapWindow
 #define XUnmapWindow \
 	(tkIntXlibStubsPtr->xUnmapWindow) /* 75 */
-#endif
-#ifndef XWindowEvent
 #define XWindowEvent \
 	(tkIntXlibStubsPtr->xWindowEvent) /* 76 */
-#endif
-#ifndef XDestroyIC
 #define XDestroyIC \
 	(tkIntXlibStubsPtr->xDestroyIC) /* 77 */
-#endif
-#ifndef XFilterEvent
 #define XFilterEvent \
 	(tkIntXlibStubsPtr->xFilterEvent) /* 78 */
-#endif
-#ifndef XmbLookupString
 #define XmbLookupString \
 	(tkIntXlibStubsPtr->xmbLookupString) /* 79 */
-#endif
-#ifndef TkPutImage
 #define TkPutImage \
 	(tkIntXlibStubsPtr->tkPutImage) /* 80 */
-#endif
 /* Slot 81 is reserved */
-#ifndef XParseColor
 #define XParseColor \
 	(tkIntXlibStubsPtr->xParseColor) /* 82 */
-#endif
-#ifndef XCreateGC
 #define XCreateGC \
 	(tkIntXlibStubsPtr->xCreateGC) /* 83 */
-#endif
-#ifndef XFreeGC
 #define XFreeGC \
 	(tkIntXlibStubsPtr->xFreeGC) /* 84 */
-#endif
-#ifndef XInternAtom
 #define XInternAtom \
 	(tkIntXlibStubsPtr->xInternAtom) /* 85 */
-#endif
-#ifndef XSetBackground
 #define XSetBackground \
 	(tkIntXlibStubsPtr->xSetBackground) /* 86 */
-#endif
-#ifndef XSetForeground
 #define XSetForeground \
 	(tkIntXlibStubsPtr->xSetForeground) /* 87 */
-#endif
-#ifndef XSetClipMask
 #define XSetClipMask \
 	(tkIntXlibStubsPtr->xSetClipMask) /* 88 */
-#endif
-#ifndef XSetClipOrigin
 #define XSetClipOrigin \
 	(tkIntXlibStubsPtr->xSetClipOrigin) /* 89 */
-#endif
-#ifndef XSetTSOrigin
 #define XSetTSOrigin \
 	(tkIntXlibStubsPtr->xSetTSOrigin) /* 90 */
-#endif
-#ifndef XChangeGC
 #define XChangeGC \
 	(tkIntXlibStubsPtr->xChangeGC) /* 91 */
-#endif
-#ifndef XSetFont
 #define XSetFont \
 	(tkIntXlibStubsPtr->xSetFont) /* 92 */
-#endif
-#ifndef XSetArcMode
 #define XSetArcMode \
 	(tkIntXlibStubsPtr->xSetArcMode) /* 93 */
-#endif
-#ifndef XSetStipple
 #define XSetStipple \
 	(tkIntXlibStubsPtr->xSetStipple) /* 94 */
-#endif
-#ifndef XSetFillRule
 #define XSetFillRule \
 	(tkIntXlibStubsPtr->xSetFillRule) /* 95 */
-#endif
-#ifndef XSetFillStyle
 #define XSetFillStyle \
 	(tkIntXlibStubsPtr->xSetFillStyle) /* 96 */
-#endif
-#ifndef XSetFunction
 #define XSetFunction \
 	(tkIntXlibStubsPtr->xSetFunction) /* 97 */
-#endif
-#ifndef XSetLineAttributes
 #define XSetLineAttributes \
 	(tkIntXlibStubsPtr->xSetLineAttributes) /* 98 */
-#endif
-#ifndef _XInitImageFuncPtrs
 #define _XInitImageFuncPtrs \
 	(tkIntXlibStubsPtr->_XInitImageFuncPtrs) /* 99 */
-#endif
-#ifndef XCreateIC
 #define XCreateIC \
 	(tkIntXlibStubsPtr->xCreateIC) /* 100 */
-#endif
-#ifndef XGetVisualInfo
 #define XGetVisualInfo \
 	(tkIntXlibStubsPtr->xGetVisualInfo) /* 101 */
-#endif
-#ifndef XSetWMClientMachine
 #define XSetWMClientMachine \
 	(tkIntXlibStubsPtr->xSetWMClientMachine) /* 102 */
-#endif
-#ifndef XStringListToTextProperty
 #define XStringListToTextProperty \
 	(tkIntXlibStubsPtr->xStringListToTextProperty) /* 103 */
-#endif
-#ifndef XDrawLine
 #define XDrawLine \
 	(tkIntXlibStubsPtr->xDrawLine) /* 104 */
-#endif
-#ifndef XWarpPointer
 #define XWarpPointer \
 	(tkIntXlibStubsPtr->xWarpPointer) /* 105 */
-#endif
-#ifndef XFillRectangle
 #define XFillRectangle \
 	(tkIntXlibStubsPtr->xFillRectangle) /* 106 */
-#endif
-#ifndef XFlush
 #define XFlush \
 	(tkIntXlibStubsPtr->xFlush) /* 107 */
-#endif
-#ifndef XGrabServer
 #define XGrabServer \
 	(tkIntXlibStubsPtr->xGrabServer) /* 108 */
-#endif
-#ifndef XUngrabServer
 #define XUngrabServer \
 	(tkIntXlibStubsPtr->xUngrabServer) /* 109 */
-#endif
-#ifndef XFree
 #define XFree \
 	(tkIntXlibStubsPtr->xFree) /* 110 */
-#endif
-#ifndef XNoOp
 #define XNoOp \
 	(tkIntXlibStubsPtr->xNoOp) /* 111 */
-#endif
-#ifndef XSynchronize
 #define XSynchronize \
 	(tkIntXlibStubsPtr->xSynchronize) /* 112 */
-#endif
-#ifndef XSync
 #define XSync \
 	(tkIntXlibStubsPtr->xSync) /* 113 */
-#endif
-#ifndef XVisualIDFromVisual
 #define XVisualIDFromVisual \
 	(tkIntXlibStubsPtr->xVisualIDFromVisual) /* 114 */
-#endif
 /* Slot 115 is reserved */
 /* Slot 116 is reserved */
 /* Slot 117 is reserved */
@@ -2190,18 +1329,12 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr;
 /* Slot 130 is reserved */
 /* Slot 131 is reserved */
 /* Slot 132 is reserved */
-#ifndef XDrawSegments
 #define XDrawSegments \
 	(tkIntXlibStubsPtr->xDrawSegments) /* 133 */
-#endif
-#ifndef XDrawPoint
 #define XDrawPoint \
 	(tkIntXlibStubsPtr->xDrawPoint) /* 134 */
-#endif
-#ifndef XDrawPoints
 #define XDrawPoints \
 	(tkIntXlibStubsPtr->xDrawPoints) /* 135 */
-#endif
 /* Slot 136 is reserved */
 /* Slot 137 is reserved */
 /* Slot 138 is reserved */
@@ -2224,380 +1357,194 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr;
 /* Slot 155 is reserved */
 /* Slot 156 is reserved */
 /* Slot 157 is reserved */
-#ifndef TkUnusedStubEntry
 #define TkUnusedStubEntry \
 	(tkIntXlibStubsPtr->tkUnusedStubEntry) /* 158 */
-#endif
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-#ifndef XSetDashes
 #define XSetDashes \
 	(tkIntXlibStubsPtr->xSetDashes) /* 0 */
-#endif
-#ifndef XGetModifierMapping
 #define XGetModifierMapping \
 	(tkIntXlibStubsPtr->xGetModifierMapping) /* 1 */
-#endif
-#ifndef XCreateImage
 #define XCreateImage \
 	(tkIntXlibStubsPtr->xCreateImage) /* 2 */
-#endif
-#ifndef XGetImage
 #define XGetImage \
 	(tkIntXlibStubsPtr->xGetImage) /* 3 */
-#endif
-#ifndef XGetAtomName
 #define XGetAtomName \
 	(tkIntXlibStubsPtr->xGetAtomName) /* 4 */
-#endif
-#ifndef XKeysymToString
 #define XKeysymToString \
 	(tkIntXlibStubsPtr->xKeysymToString) /* 5 */
-#endif
-#ifndef XCreateColormap
 #define XCreateColormap \
 	(tkIntXlibStubsPtr->xCreateColormap) /* 6 */
-#endif
-#ifndef XGContextFromGC
 #define XGContextFromGC \
 	(tkIntXlibStubsPtr->xGContextFromGC) /* 7 */
-#endif
-#ifndef XKeycodeToKeysym
 #define XKeycodeToKeysym \
 	(tkIntXlibStubsPtr->xKeycodeToKeysym) /* 8 */
-#endif
-#ifndef XStringToKeysym
 #define XStringToKeysym \
 	(tkIntXlibStubsPtr->xStringToKeysym) /* 9 */
-#endif
-#ifndef XRootWindow
 #define XRootWindow \
 	(tkIntXlibStubsPtr->xRootWindow) /* 10 */
-#endif
-#ifndef XSetErrorHandler
 #define XSetErrorHandler \
 	(tkIntXlibStubsPtr->xSetErrorHandler) /* 11 */
-#endif
-#ifndef XAllocColor
 #define XAllocColor \
 	(tkIntXlibStubsPtr->xAllocColor) /* 12 */
-#endif
-#ifndef XBell
 #define XBell \
 	(tkIntXlibStubsPtr->xBell) /* 13 */
-#endif
-#ifndef XChangeProperty
 #define XChangeProperty \
 	(tkIntXlibStubsPtr->xChangeProperty) /* 14 */
-#endif
-#ifndef XChangeWindowAttributes
 #define XChangeWindowAttributes \
 	(tkIntXlibStubsPtr->xChangeWindowAttributes) /* 15 */
-#endif
-#ifndef XConfigureWindow
 #define XConfigureWindow \
 	(tkIntXlibStubsPtr->xConfigureWindow) /* 16 */
-#endif
-#ifndef XCopyArea
 #define XCopyArea \
 	(tkIntXlibStubsPtr->xCopyArea) /* 17 */
-#endif
-#ifndef XCopyPlane
 #define XCopyPlane \
 	(tkIntXlibStubsPtr->xCopyPlane) /* 18 */
-#endif
-#ifndef XCreateBitmapFromData
 #define XCreateBitmapFromData \
 	(tkIntXlibStubsPtr->xCreateBitmapFromData) /* 19 */
-#endif
-#ifndef XDefineCursor
 #define XDefineCursor \
 	(tkIntXlibStubsPtr->xDefineCursor) /* 20 */
-#endif
-#ifndef XDestroyWindow
 #define XDestroyWindow \
 	(tkIntXlibStubsPtr->xDestroyWindow) /* 21 */
-#endif
-#ifndef XDrawArc
 #define XDrawArc \
 	(tkIntXlibStubsPtr->xDrawArc) /* 22 */
-#endif
-#ifndef XDrawLines
 #define XDrawLines \
 	(tkIntXlibStubsPtr->xDrawLines) /* 23 */
-#endif
-#ifndef XDrawRectangle
 #define XDrawRectangle \
 	(tkIntXlibStubsPtr->xDrawRectangle) /* 24 */
-#endif
-#ifndef XFillArc
 #define XFillArc \
 	(tkIntXlibStubsPtr->xFillArc) /* 25 */
-#endif
-#ifndef XFillPolygon
 #define XFillPolygon \
 	(tkIntXlibStubsPtr->xFillPolygon) /* 26 */
-#endif
-#ifndef XFillRectangles
 #define XFillRectangles \
 	(tkIntXlibStubsPtr->xFillRectangles) /* 27 */
-#endif
-#ifndef XFreeColormap
 #define XFreeColormap \
 	(tkIntXlibStubsPtr->xFreeColormap) /* 28 */
-#endif
-#ifndef XFreeColors
 #define XFreeColors \
 	(tkIntXlibStubsPtr->xFreeColors) /* 29 */
-#endif
-#ifndef XFreeModifiermap
 #define XFreeModifiermap \
 	(tkIntXlibStubsPtr->xFreeModifiermap) /* 30 */
-#endif
-#ifndef XGetGeometry
 #define XGetGeometry \
 	(tkIntXlibStubsPtr->xGetGeometry) /* 31 */
-#endif
-#ifndef XGetWindowProperty
 #define XGetWindowProperty \
 	(tkIntXlibStubsPtr->xGetWindowProperty) /* 32 */
-#endif
-#ifndef XGrabKeyboard
 #define XGrabKeyboard \
 	(tkIntXlibStubsPtr->xGrabKeyboard) /* 33 */
-#endif
-#ifndef XGrabPointer
 #define XGrabPointer \
 	(tkIntXlibStubsPtr->xGrabPointer) /* 34 */
-#endif
-#ifndef XKeysymToKeycode
 #define XKeysymToKeycode \
 	(tkIntXlibStubsPtr->xKeysymToKeycode) /* 35 */
-#endif
-#ifndef XMapWindow
 #define XMapWindow \
 	(tkIntXlibStubsPtr->xMapWindow) /* 36 */
-#endif
-#ifndef XMoveResizeWindow
 #define XMoveResizeWindow \
 	(tkIntXlibStubsPtr->xMoveResizeWindow) /* 37 */
-#endif
-#ifndef XMoveWindow
 #define XMoveWindow \
 	(tkIntXlibStubsPtr->xMoveWindow) /* 38 */
-#endif
-#ifndef XQueryPointer
 #define XQueryPointer \
 	(tkIntXlibStubsPtr->xQueryPointer) /* 39 */
-#endif
-#ifndef XRaiseWindow
 #define XRaiseWindow \
 	(tkIntXlibStubsPtr->xRaiseWindow) /* 40 */
-#endif
-#ifndef XRefreshKeyboardMapping
 #define XRefreshKeyboardMapping \
 	(tkIntXlibStubsPtr->xRefreshKeyboardMapping) /* 41 */
-#endif
-#ifndef XResizeWindow
 #define XResizeWindow \
 	(tkIntXlibStubsPtr->xResizeWindow) /* 42 */
-#endif
-#ifndef XSelectInput
 #define XSelectInput \
 	(tkIntXlibStubsPtr->xSelectInput) /* 43 */
-#endif
-#ifndef XSendEvent
 #define XSendEvent \
 	(tkIntXlibStubsPtr->xSendEvent) /* 44 */
-#endif
-#ifndef XSetIconName
 #define XSetIconName \
 	(tkIntXlibStubsPtr->xSetIconName) /* 45 */
-#endif
-#ifndef XSetInputFocus
 #define XSetInputFocus \
 	(tkIntXlibStubsPtr->xSetInputFocus) /* 46 */
-#endif
-#ifndef XSetSelectionOwner
 #define XSetSelectionOwner \
 	(tkIntXlibStubsPtr->xSetSelectionOwner) /* 47 */
-#endif
-#ifndef XSetWindowBackground
 #define XSetWindowBackground \
 	(tkIntXlibStubsPtr->xSetWindowBackground) /* 48 */
-#endif
-#ifndef XSetWindowBackgroundPixmap
 #define XSetWindowBackgroundPixmap \
 	(tkIntXlibStubsPtr->xSetWindowBackgroundPixmap) /* 49 */
-#endif
-#ifndef XSetWindowBorder
 #define XSetWindowBorder \
 	(tkIntXlibStubsPtr->xSetWindowBorder) /* 50 */
-#endif
-#ifndef XSetWindowBorderPixmap
 #define XSetWindowBorderPixmap \
 	(tkIntXlibStubsPtr->xSetWindowBorderPixmap) /* 51 */
-#endif
-#ifndef XSetWindowBorderWidth
 #define XSetWindowBorderWidth \
 	(tkIntXlibStubsPtr->xSetWindowBorderWidth) /* 52 */
-#endif
-#ifndef XSetWindowColormap
 #define XSetWindowColormap \
 	(tkIntXlibStubsPtr->xSetWindowColormap) /* 53 */
-#endif
-#ifndef XUngrabKeyboard
 #define XUngrabKeyboard \
 	(tkIntXlibStubsPtr->xUngrabKeyboard) /* 54 */
-#endif
-#ifndef XUngrabPointer
 #define XUngrabPointer \
 	(tkIntXlibStubsPtr->xUngrabPointer) /* 55 */
-#endif
-#ifndef XUnmapWindow
 #define XUnmapWindow \
 	(tkIntXlibStubsPtr->xUnmapWindow) /* 56 */
-#endif
-#ifndef TkPutImage
 #define TkPutImage \
 	(tkIntXlibStubsPtr->tkPutImage) /* 57 */
-#endif
-#ifndef XParseColor
 #define XParseColor \
 	(tkIntXlibStubsPtr->xParseColor) /* 58 */
-#endif
-#ifndef XCreateGC
 #define XCreateGC \
 	(tkIntXlibStubsPtr->xCreateGC) /* 59 */
-#endif
-#ifndef XFreeGC
 #define XFreeGC \
 	(tkIntXlibStubsPtr->xFreeGC) /* 60 */
-#endif
-#ifndef XInternAtom
 #define XInternAtom \
 	(tkIntXlibStubsPtr->xInternAtom) /* 61 */
-#endif
-#ifndef XSetBackground
 #define XSetBackground \
 	(tkIntXlibStubsPtr->xSetBackground) /* 62 */
-#endif
-#ifndef XSetForeground
 #define XSetForeground \
 	(tkIntXlibStubsPtr->xSetForeground) /* 63 */
-#endif
-#ifndef XSetClipMask
 #define XSetClipMask \
 	(tkIntXlibStubsPtr->xSetClipMask) /* 64 */
-#endif
-#ifndef XSetClipOrigin
 #define XSetClipOrigin \
 	(tkIntXlibStubsPtr->xSetClipOrigin) /* 65 */
-#endif
-#ifndef XSetTSOrigin
 #define XSetTSOrigin \
 	(tkIntXlibStubsPtr->xSetTSOrigin) /* 66 */
-#endif
-#ifndef XChangeGC
 #define XChangeGC \
 	(tkIntXlibStubsPtr->xChangeGC) /* 67 */
-#endif
-#ifndef XSetFont
 #define XSetFont \
 	(tkIntXlibStubsPtr->xSetFont) /* 68 */
-#endif
-#ifndef XSetArcMode
 #define XSetArcMode \
 	(tkIntXlibStubsPtr->xSetArcMode) /* 69 */
-#endif
-#ifndef XSetStipple
 #define XSetStipple \
 	(tkIntXlibStubsPtr->xSetStipple) /* 70 */
-#endif
-#ifndef XSetFillRule
 #define XSetFillRule \
 	(tkIntXlibStubsPtr->xSetFillRule) /* 71 */
-#endif
-#ifndef XSetFillStyle
 #define XSetFillStyle \
 	(tkIntXlibStubsPtr->xSetFillStyle) /* 72 */
-#endif
-#ifndef XSetFunction
 #define XSetFunction \
 	(tkIntXlibStubsPtr->xSetFunction) /* 73 */
-#endif
-#ifndef XSetLineAttributes
 #define XSetLineAttributes \
 	(tkIntXlibStubsPtr->xSetLineAttributes) /* 74 */
-#endif
-#ifndef _XInitImageFuncPtrs
 #define _XInitImageFuncPtrs \
 	(tkIntXlibStubsPtr->_XInitImageFuncPtrs) /* 75 */
-#endif
-#ifndef XCreateIC
 #define XCreateIC \
 	(tkIntXlibStubsPtr->xCreateIC) /* 76 */
-#endif
-#ifndef XGetVisualInfo
 #define XGetVisualInfo \
 	(tkIntXlibStubsPtr->xGetVisualInfo) /* 77 */
-#endif
-#ifndef XSetWMClientMachine
 #define XSetWMClientMachine \
 	(tkIntXlibStubsPtr->xSetWMClientMachine) /* 78 */
-#endif
-#ifndef XStringListToTextProperty
 #define XStringListToTextProperty \
 	(tkIntXlibStubsPtr->xStringListToTextProperty) /* 79 */
-#endif
-#ifndef XDrawSegments
 #define XDrawSegments \
 	(tkIntXlibStubsPtr->xDrawSegments) /* 80 */
-#endif
-#ifndef XForceScreenSaver
 #define XForceScreenSaver \
 	(tkIntXlibStubsPtr->xForceScreenSaver) /* 81 */
-#endif
-#ifndef XDrawLine
 #define XDrawLine \
 	(tkIntXlibStubsPtr->xDrawLine) /* 82 */
-#endif
-#ifndef XFillRectangle
 #define XFillRectangle \
 	(tkIntXlibStubsPtr->xFillRectangle) /* 83 */
-#endif
-#ifndef XClearWindow
 #define XClearWindow \
 	(tkIntXlibStubsPtr->xClearWindow) /* 84 */
-#endif
-#ifndef XDrawPoint
 #define XDrawPoint \
 	(tkIntXlibStubsPtr->xDrawPoint) /* 85 */
-#endif
-#ifndef XDrawPoints
 #define XDrawPoints \
 	(tkIntXlibStubsPtr->xDrawPoints) /* 86 */
-#endif
-#ifndef XWarpPointer
 #define XWarpPointer \
 	(tkIntXlibStubsPtr->xWarpPointer) /* 87 */
-#endif
-#ifndef XQueryColor
 #define XQueryColor \
 	(tkIntXlibStubsPtr->xQueryColor) /* 88 */
-#endif
-#ifndef XQueryColors
 #define XQueryColors \
 	(tkIntXlibStubsPtr->xQueryColors) /* 89 */
-#endif
-#ifndef XQueryTree
 #define XQueryTree \
 	(tkIntXlibStubsPtr->xQueryTree) /* 90 */
-#endif
-#ifndef XSync
 #define XSync \
 	(tkIntXlibStubsPtr->xSync) /* 91 */
-#endif
 /* Slot 92 is reserved */
 /* Slot 93 is reserved */
 /* Slot 94 is reserved */
@@ -2664,13 +1611,11 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr;
 /* Slot 155 is reserved */
 /* Slot 156 is reserved */
 /* Slot 157 is reserved */
-#ifndef TkUnusedStubEntry
 #define TkUnusedStubEntry \
 	(tkIntXlibStubsPtr->tkUnusedStubEntry) /* 158 */
-#endif
 #endif /* AQUA */
 
-#endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
+#endif /* defined(USE_TK_STUBS) */
 
 /* !END!: Do not edit above this line. */
 
diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h
index 9112f58..b6c7920 100644
--- a/generic/tkPlatDecls.h
+++ b/generic/tkPlatDecls.h
@@ -33,43 +33,23 @@ extern "C" {
  * Exported function declarations:
  */
 
-#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
-#ifndef Tk_AttachHWND_TCL_DECLARED
-#define Tk_AttachHWND_TCL_DECLARED
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
 /* 0 */
 EXTERN Window		Tk_AttachHWND(Tk_Window tkwin, HWND hwnd);
-#endif
-#ifndef Tk_GetHINSTANCE_TCL_DECLARED
-#define Tk_GetHINSTANCE_TCL_DECLARED
 /* 1 */
 EXTERN HINSTANCE	Tk_GetHINSTANCE(void);
-#endif
-#ifndef Tk_GetHWND_TCL_DECLARED
-#define Tk_GetHWND_TCL_DECLARED
 /* 2 */
 EXTERN HWND		Tk_GetHWND(Window window);
-#endif
-#ifndef Tk_HWNDToWindow_TCL_DECLARED
-#define Tk_HWNDToWindow_TCL_DECLARED
 /* 3 */
 EXTERN Tk_Window	Tk_HWNDToWindow(HWND hwnd);
-#endif
-#ifndef Tk_PointerEvent_TCL_DECLARED
-#define Tk_PointerEvent_TCL_DECLARED
 /* 4 */
 EXTERN void		Tk_PointerEvent(HWND hwnd, int x, int y);
-#endif
-#ifndef Tk_TranslateWinEvent_TCL_DECLARED
-#define Tk_TranslateWinEvent_TCL_DECLARED
 /* 5 */
 EXTERN int		Tk_TranslateWinEvent(HWND hwnd, UINT message,
 				WPARAM wParam, LPARAM lParam,
 				LRESULT *result);
-#endif
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-#ifndef Tk_MacOSXSetEmbedHandler_TCL_DECLARED
-#define Tk_MacOSXSetEmbedHandler_TCL_DECLARED
 /* 0 */
 EXTERN void		Tk_MacOSXSetEmbedHandler(
 				Tk_MacOSXEmbedRegisterWinProc *registerWinProcPtr,
@@ -77,75 +57,41 @@ EXTERN void		Tk_MacOSXSetEmbedHandler(
 				Tk_MacOSXEmbedMakeContainerExistProc *containerExistProcPtr,
 				Tk_MacOSXEmbedGetClipProc *getClipProc,
 				Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc);
-#endif
-#ifndef Tk_MacOSXTurnOffMenus_TCL_DECLARED
-#define Tk_MacOSXTurnOffMenus_TCL_DECLARED
 /* 1 */
 EXTERN void		Tk_MacOSXTurnOffMenus(void);
-#endif
-#ifndef Tk_MacOSXTkOwnsCursor_TCL_DECLARED
-#define Tk_MacOSXTkOwnsCursor_TCL_DECLARED
 /* 2 */
 EXTERN void		Tk_MacOSXTkOwnsCursor(int tkOwnsIt);
-#endif
-#ifndef TkMacOSXInitMenus_TCL_DECLARED
-#define TkMacOSXInitMenus_TCL_DECLARED
 /* 3 */
 EXTERN void		TkMacOSXInitMenus(Tcl_Interp *interp);
-#endif
-#ifndef TkMacOSXInitAppleEvents_TCL_DECLARED
-#define TkMacOSXInitAppleEvents_TCL_DECLARED
 /* 4 */
 EXTERN void		TkMacOSXInitAppleEvents(Tcl_Interp *interp);
-#endif
-#ifndef TkGenWMConfigureEvent_TCL_DECLARED
-#define TkGenWMConfigureEvent_TCL_DECLARED
 /* 5 */
 EXTERN void		TkGenWMConfigureEvent(Tk_Window tkwin, int x, int y,
 				int width, int height, int flags);
-#endif
-#ifndef TkMacOSXInvalClipRgns_TCL_DECLARED
-#define TkMacOSXInvalClipRgns_TCL_DECLARED
 /* 6 */
 EXTERN void		TkMacOSXInvalClipRgns(Tk_Window tkwin);
-#endif
-#ifndef TkMacOSXGetDrawablePort_TCL_DECLARED
-#define TkMacOSXGetDrawablePort_TCL_DECLARED
 /* 7 */
-EXTERN VOID *		TkMacOSXGetDrawablePort(Drawable drawable);
-#endif
-#ifndef TkMacOSXGetRootControl_TCL_DECLARED
-#define TkMacOSXGetRootControl_TCL_DECLARED
+EXTERN void *		TkMacOSXGetDrawablePort(Drawable drawable);
 /* 8 */
-EXTERN VOID *		TkMacOSXGetRootControl(Drawable drawable);
-#endif
-#ifndef Tk_MacOSXSetupTkNotifier_TCL_DECLARED
-#define Tk_MacOSXSetupTkNotifier_TCL_DECLARED
+EXTERN void *		TkMacOSXGetRootControl(Drawable drawable);
 /* 9 */
 EXTERN void		Tk_MacOSXSetupTkNotifier(void);
-#endif
-#ifndef Tk_MacOSXIsAppInFront_TCL_DECLARED
-#define Tk_MacOSXIsAppInFront_TCL_DECLARED
 /* 10 */
 EXTERN int		Tk_MacOSXIsAppInFront(void);
-#endif
 /* Slot 11 is reserved */
 /* Slot 12 is reserved */
 /* Slot 13 is reserved */
 /* Slot 14 is reserved */
 /* Slot 15 is reserved */
-#ifndef TkUnusedStubEntry_TCL_DECLARED
-#define TkUnusedStubEntry_TCL_DECLARED
 /* 16 */
 EXTERN void		TkUnusedStubEntry(void);
-#endif
 #endif /* AQUA */
 
 typedef struct TkPlatStubs {
     int magic;
-    struct TkPlatStubHooks *hooks;
+    void *hooks;
 
-#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
     Window (*tk_AttachHWND) (Tk_Window tkwin, HWND hwnd); /* 0 */
     HINSTANCE (*tk_GetHINSTANCE) (void); /* 1 */
     HWND (*tk_GetHWND) (Window window); /* 2 */
@@ -161,114 +107,78 @@ typedef struct TkPlatStubs {
     void (*tkMacOSXInitAppleEvents) (Tcl_Interp *interp); /* 4 */
     void (*tkGenWMConfigureEvent) (Tk_Window tkwin, int x, int y, int width, int height, int flags); /* 5 */
     void (*tkMacOSXInvalClipRgns) (Tk_Window tkwin); /* 6 */
-    VOID * (*tkMacOSXGetDrawablePort) (Drawable drawable); /* 7 */
-    VOID * (*tkMacOSXGetRootControl) (Drawable drawable); /* 8 */
+    void * (*tkMacOSXGetDrawablePort) (Drawable drawable); /* 7 */
+    void * (*tkMacOSXGetRootControl) (Drawable drawable); /* 8 */
     void (*tk_MacOSXSetupTkNotifier) (void); /* 9 */
     int (*tk_MacOSXIsAppInFront) (void); /* 10 */
-    VOID *reserved11;
-    VOID *reserved12;
-    VOID *reserved13;
-    VOID *reserved14;
-    VOID *reserved15;
+    void (*reserved11)(void);
+    void (*reserved12)(void);
+    void (*reserved13)(void);
+    void (*reserved14)(void);
+    void (*reserved15)(void);
     void (*tkUnusedStubEntry) (void); /* 16 */
 #endif /* AQUA */
 } TkPlatStubs;
 
-extern TkPlatStubs *tkPlatStubsPtr;
+extern const TkPlatStubs *tkPlatStubsPtr;
 
 #ifdef __cplusplus
 }
 #endif
 
-#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
+#if defined(USE_TK_STUBS)
 
 /*
  * Inline function declarations:
  */
 
-#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
-#ifndef Tk_AttachHWND
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
 #define Tk_AttachHWND \
 	(tkPlatStubsPtr->tk_AttachHWND) /* 0 */
-#endif
-#ifndef Tk_GetHINSTANCE
 #define Tk_GetHINSTANCE \
 	(tkPlatStubsPtr->tk_GetHINSTANCE) /* 1 */
-#endif
-#ifndef Tk_GetHWND
 #define Tk_GetHWND \
 	(tkPlatStubsPtr->tk_GetHWND) /* 2 */
-#endif
-#ifndef Tk_HWNDToWindow
 #define Tk_HWNDToWindow \
 	(tkPlatStubsPtr->tk_HWNDToWindow) /* 3 */
-#endif
-#ifndef Tk_PointerEvent
 #define Tk_PointerEvent \
 	(tkPlatStubsPtr->tk_PointerEvent) /* 4 */
-#endif
-#ifndef Tk_TranslateWinEvent
 #define Tk_TranslateWinEvent \
 	(tkPlatStubsPtr->tk_TranslateWinEvent) /* 5 */
-#endif
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-#ifndef Tk_MacOSXSetEmbedHandler
 #define Tk_MacOSXSetEmbedHandler \
 	(tkPlatStubsPtr->tk_MacOSXSetEmbedHandler) /* 0 */
-#endif
-#ifndef Tk_MacOSXTurnOffMenus
 #define Tk_MacOSXTurnOffMenus \
 	(tkPlatStubsPtr->tk_MacOSXTurnOffMenus) /* 1 */
-#endif
-#ifndef Tk_MacOSXTkOwnsCursor
 #define Tk_MacOSXTkOwnsCursor \
 	(tkPlatStubsPtr->tk_MacOSXTkOwnsCursor) /* 2 */
-#endif
-#ifndef TkMacOSXInitMenus
 #define TkMacOSXInitMenus \
 	(tkPlatStubsPtr->tkMacOSXInitMenus) /* 3 */
-#endif
-#ifndef TkMacOSXInitAppleEvents
 #define TkMacOSXInitAppleEvents \
 	(tkPlatStubsPtr->tkMacOSXInitAppleEvents) /* 4 */
-#endif
-#ifndef TkGenWMConfigureEvent
 #define TkGenWMConfigureEvent \
 	(tkPlatStubsPtr->tkGenWMConfigureEvent) /* 5 */
-#endif
-#ifndef TkMacOSXInvalClipRgns
 #define TkMacOSXInvalClipRgns \
 	(tkPlatStubsPtr->tkMacOSXInvalClipRgns) /* 6 */
-#endif
-#ifndef TkMacOSXGetDrawablePort
 #define TkMacOSXGetDrawablePort \
 	(tkPlatStubsPtr->tkMacOSXGetDrawablePort) /* 7 */
-#endif
-#ifndef TkMacOSXGetRootControl
 #define TkMacOSXGetRootControl \
 	(tkPlatStubsPtr->tkMacOSXGetRootControl) /* 8 */
-#endif
-#ifndef Tk_MacOSXSetupTkNotifier
 #define Tk_MacOSXSetupTkNotifier \
 	(tkPlatStubsPtr->tk_MacOSXSetupTkNotifier) /* 9 */
-#endif
-#ifndef Tk_MacOSXIsAppInFront
 #define Tk_MacOSXIsAppInFront \
 	(tkPlatStubsPtr->tk_MacOSXIsAppInFront) /* 10 */
-#endif
 /* Slot 11 is reserved */
 /* Slot 12 is reserved */
 /* Slot 13 is reserved */
 /* Slot 14 is reserved */
 /* Slot 15 is reserved */
-#ifndef TkUnusedStubEntry
 #define TkUnusedStubEntry \
 	(tkPlatStubsPtr->tkUnusedStubEntry) /* 16 */
-#endif
 #endif /* AQUA */
 
-#endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
+#endif /* defined(USE_TK_STUBS) */
 
 /* !END!: Do not edit above this line. */
 
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 6054d50..9102ec5 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -267,9 +267,9 @@ void TkSubtractRegion (TkRegion a, TkRegion b, TkRegion c)
 
 /* !BEGIN!: Do not edit below this line. */
 
-TkIntStubs tkIntStubs = {
+static const TkIntStubs tkIntStubs = {
     TCL_STUB_MAGIC,
-    NULL,
+    0,
     TkAllocWindow, /* 0 */
     TkBezierPoints, /* 1 */
     TkBezierScreenPoints, /* 2 */
@@ -354,7 +354,7 @@ TkIntStubs tkIntStubs = {
     TkSelEventProc, /* 81 */
     TkSelInit, /* 82 */
     TkSelPropProc, /* 83 */
-    NULL, /* 84 */
+    0, /* 84 */
     TkSetWindowMenuBar, /* 85 */
     TkStringToKeysym, /* 86 */
     TkThickPolyLineToArea, /* 87 */
@@ -390,48 +390,48 @@ TkIntStubs tkIntStubs = {
     TkRectInRegion, /* 117 */
     TkSetRegion, /* 118 */
     TkUnionRectWithRegion, /* 119 */
-    NULL, /* 120 */
-#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
-    NULL, /* 121 */
+    0, /* 120 */
+#if !(defined(_WIN32) || defined(MAC_OSX_TK)) /* X11 */
+    0, /* 121 */
 #endif /* X11 */
-#if defined(__WIN32__) /* WIN */
-    NULL, /* 121 */
+#if defined(_WIN32) /* WIN */
+    0, /* 121 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    NULL, /* 121 */ /* Dummy entry for stubs table backwards compatibility */
+    0, /* 121 */ /* Dummy entry for stubs table backwards compatibility */
     TkpCreateNativeBitmap, /* 121 */
 #endif /* AQUA */
-#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
-    NULL, /* 122 */
+#if !(defined(_WIN32) || defined(MAC_OSX_TK)) /* X11 */
+    0, /* 122 */
 #endif /* X11 */
-#if defined(__WIN32__) /* WIN */
-    NULL, /* 122 */
+#if defined(_WIN32) /* WIN */
+    0, /* 122 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    NULL, /* 122 */ /* Dummy entry for stubs table backwards compatibility */
+    0, /* 122 */ /* Dummy entry for stubs table backwards compatibility */
     TkpDefineNativeBitmaps, /* 122 */
 #endif /* AQUA */
-    NULL, /* 123 */
-#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
-    NULL, /* 124 */
+    0, /* 123 */
+#if !(defined(_WIN32) || defined(MAC_OSX_TK)) /* X11 */
+    0, /* 124 */
 #endif /* X11 */
-#if defined(__WIN32__) /* WIN */
-    NULL, /* 124 */
+#if defined(_WIN32) /* WIN */
+    0, /* 124 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    NULL, /* 124 */ /* Dummy entry for stubs table backwards compatibility */
+    0, /* 124 */ /* Dummy entry for stubs table backwards compatibility */
     TkpGetNativeAppBitmap, /* 124 */
 #endif /* AQUA */
-    NULL, /* 125 */
-    NULL, /* 126 */
-    NULL, /* 127 */
-    NULL, /* 128 */
-    NULL, /* 129 */
-    NULL, /* 130 */
-    NULL, /* 131 */
-    NULL, /* 132 */
-    NULL, /* 133 */
-    NULL, /* 134 */
+    0, /* 125 */
+    0, /* 126 */
+    0, /* 127 */
+    0, /* 128 */
+    0, /* 129 */
+    0, /* 130 */
+    0, /* 131 */
+    0, /* 132 */
+    0, /* 133 */
+    0, /* 134 */
     TkpDrawHighlightBorder, /* 135 */
     TkSetFocusWin, /* 136 */
     TkpSetKeycodeAndState, /* 137 */
@@ -452,20 +452,20 @@ TkIntStubs tkIntStubs = {
     TkpDrawFrame, /* 152 */
     TkCreateThreadExitHandler, /* 153 */
     TkDeleteThreadExitHandler, /* 154 */
-    NULL, /* 155 */
+    0, /* 155 */
     TkpTestembedCmd, /* 156 */
     TkpTesttextCmd, /* 157 */
-    NULL, /* 158 */
-    NULL, /* 159 */
-    NULL, /* 160 */
-    NULL, /* 161 */
-    NULL, /* 162 */
-    NULL, /* 163 */
-    NULL, /* 164 */
-    NULL, /* 165 */
-    NULL, /* 166 */
-    NULL, /* 167 */
-    NULL, /* 168 */
+    0, /* 158 */
+    0, /* 159 */
+    0, /* 160 */
+    0, /* 161 */
+    0, /* 162 */
+    0, /* 163 */
+    0, /* 164 */
+    0, /* 165 */
+    0, /* 166 */
+    0, /* 167 */
+    0, /* 168 */
     TkStateParseProc, /* 169 */
     TkStatePrintProc, /* 170 */
     TkCanvasDashParseProc, /* 171 */
@@ -478,20 +478,20 @@ TkIntStubs tkIntStubs = {
     TkOrientPrintProc, /* 178 */
     TkSmoothParseProc, /* 179 */
     TkSmoothPrintProc, /* 180 */
-    NULL, /* 181 */
-    NULL, /* 182 */
-    NULL, /* 183 */
-    NULL, /* 184 */
-    NULL, /* 185 */
+    0, /* 181 */
+    0, /* 182 */
+    0, /* 183 */
+    0, /* 184 */
+    0, /* 185 */
     TkUnusedStubEntry, /* 186 */
 };
 
-TkIntPlatStubs tkIntPlatStubs = {
+static const TkIntPlatStubs tkIntPlatStubs = {
     TCL_STUB_MAGIC,
-    NULL,
-#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
+    0,
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
     TkAlignImageData, /* 0 */
-    NULL, /* 1 */
+    0, /* 1 */
     TkGenerateActivateEvents, /* 2 */
     TkpGetMS, /* 3 */
     TkPointerDeadWindow, /* 4 */
@@ -539,8 +539,8 @@ TkIntPlatStubs tkIntPlatStubs = {
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
     TkGenerateActivateEvents, /* 0 */
-    NULL, /* 1 */
-    NULL, /* 2 */
+    0, /* 1 */
+    0, /* 2 */
     TkPointerDeadWindow, /* 3 */
     TkpSetCapture, /* 4 */
     TkpSetCursor, /* 5 */
@@ -551,14 +551,14 @@ TkIntPlatStubs tkIntPlatStubs = {
     TkMacOSXDispatchMenuEvent, /* 10 */
     TkMacOSXInstallCursor, /* 11 */
     TkMacOSXHandleTearoffMenu, /* 12 */
-    NULL, /* 13 */
+    0, /* 13 */
     TkMacOSXDoHLEvent, /* 14 */
-    NULL, /* 15 */
+    0, /* 15 */
     TkMacOSXGetXWindow, /* 16 */
     TkMacOSXGrowToplevel, /* 17 */
     TkMacOSXHandleMenuSelect, /* 18 */
-    NULL, /* 19 */
-    NULL, /* 20 */
+    0, /* 19 */
+    0, /* 20 */
     TkMacOSXInvalidateWindow, /* 21 */
     TkMacOSXIsCharacterMissing, /* 22 */
     TkMacOSXMakeRealWindowExist, /* 23 */
@@ -586,7 +586,7 @@ TkIntPlatStubs tkIntPlatStubs = {
     TkMacOSXPreprocessMenu, /* 45 */
     TkpIsWindowFloating, /* 46 */
     TkMacOSXGetCapture, /* 47 */
-    NULL, /* 48 */
+    0, /* 48 */
     TkGetTransientMaster, /* 49 */
     TkGenerateButtonEvent, /* 50 */
     TkGenWMDestroyEvent, /* 51 */
@@ -595,7 +595,7 @@ TkIntPlatStubs tkIntPlatStubs = {
     TkMacOSXDrawable, /* 54 */
     TkpScanWindowId, /* 55 */
 #endif /* AQUA */
-#if !(defined(__WIN32__) || defined(__CYGWIN__) || defined(MAC_OSX_TK)) /* X11 */
+#if !(defined(_WIN32) || defined(__CYGWIN__) || defined(MAC_OSX_TK)) /* X11 */
     TkCreateXEventSource, /* 0 */
     TkFreeWindowId, /* 1 */
     TkInitXId, /* 2 */
@@ -613,10 +613,10 @@ TkIntPlatStubs tkIntPlatStubs = {
 #endif /* X11 */
 };
 
-TkIntXlibStubs tkIntXlibStubs = {
+static const TkIntXlibStubs tkIntXlibStubs = {
     TCL_STUB_MAGIC,
-    NULL,
-#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
+    0,
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
     XSetDashes, /* 0 */
     XGetModifierMapping, /* 1 */
     XCreateImage, /* 2 */
@@ -698,7 +698,7 @@ TkIntXlibStubs tkIntXlibStubs = {
     XFilterEvent, /* 78 */
     XmbLookupString, /* 79 */
     TkPutImage, /* 80 */
-    NULL, /* 81 */
+    0, /* 81 */
     XParseColor, /* 82 */
     XCreateGC, /* 83 */
     XFreeGC, /* 84 */
@@ -732,49 +732,49 @@ TkIntXlibStubs tkIntXlibStubs = {
     XSynchronize, /* 112 */
     XSync, /* 113 */
     XVisualIDFromVisual, /* 114 */
-    NULL, /* 115 */
-    NULL, /* 116 */
-    NULL, /* 117 */
-    NULL, /* 118 */
-    NULL, /* 119 */
-    NULL, /* 120 */
-    NULL, /* 121 */
-    NULL, /* 122 */
-    NULL, /* 123 */
-    NULL, /* 124 */
-    NULL, /* 125 */
-    NULL, /* 126 */
-    NULL, /* 127 */
-    NULL, /* 128 */
-    NULL, /* 129 */
-    NULL, /* 130 */
-    NULL, /* 131 */
-    NULL, /* 132 */
+    0, /* 115 */
+    0, /* 116 */
+    0, /* 117 */
+    0, /* 118 */
+    0, /* 119 */
+    0, /* 120 */
+    0, /* 121 */
+    0, /* 122 */
+    0, /* 123 */
+    0, /* 124 */
+    0, /* 125 */
+    0, /* 126 */
+    0, /* 127 */
+    0, /* 128 */
+    0, /* 129 */
+    0, /* 130 */
+    0, /* 131 */
+    0, /* 132 */
     XDrawSegments, /* 133 */
     XDrawPoint, /* 134 */
     XDrawPoints, /* 135 */
-    NULL, /* 136 */
-    NULL, /* 137 */
-    NULL, /* 138 */
-    NULL, /* 139 */
-    NULL, /* 140 */
-    NULL, /* 141 */
-    NULL, /* 142 */
-    NULL, /* 143 */
-    NULL, /* 144 */
-    NULL, /* 145 */
-    NULL, /* 146 */
-    NULL, /* 147 */
-    NULL, /* 148 */
-    NULL, /* 149 */
-    NULL, /* 150 */
-    NULL, /* 151 */
-    NULL, /* 152 */
-    NULL, /* 153 */
-    NULL, /* 154 */
-    NULL, /* 155 */
-    NULL, /* 156 */
-    NULL, /* 157 */
+    0, /* 136 */
+    0, /* 137 */
+    0, /* 138 */
+    0, /* 139 */
+    0, /* 140 */
+    0, /* 141 */
+    0, /* 142 */
+    0, /* 143 */
+    0, /* 144 */
+    0, /* 145 */
+    0, /* 146 */
+    0, /* 147 */
+    0, /* 148 */
+    0, /* 149 */
+    0, /* 150 */
+    0, /* 151 */
+    0, /* 152 */
+    0, /* 153 */
+    0, /* 154 */
+    0, /* 155 */
+    0, /* 156 */
+    0, /* 157 */
     TkUnusedStubEntry, /* 158 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
@@ -870,80 +870,80 @@ TkIntXlibStubs tkIntXlibStubs = {
     XQueryColors, /* 89 */
     XQueryTree, /* 90 */
     XSync, /* 91 */
-    NULL, /* 92 */
-    NULL, /* 93 */
-    NULL, /* 94 */
-    NULL, /* 95 */
-    NULL, /* 96 */
-    NULL, /* 97 */
-    NULL, /* 98 */
-    NULL, /* 99 */
-    NULL, /* 100 */
-    NULL, /* 101 */
-    NULL, /* 102 */
-    NULL, /* 103 */
-    NULL, /* 104 */
-    NULL, /* 105 */
-    NULL, /* 106 */
-    NULL, /* 107 */
-    NULL, /* 108 */
-    NULL, /* 109 */
-    NULL, /* 110 */
-    NULL, /* 111 */
-    NULL, /* 112 */
-    NULL, /* 113 */
-    NULL, /* 114 */
-    NULL, /* 115 */
-    NULL, /* 116 */
-    NULL, /* 117 */
-    NULL, /* 118 */
-    NULL, /* 119 */
-    NULL, /* 120 */
-    NULL, /* 121 */
-    NULL, /* 122 */
-    NULL, /* 123 */
-    NULL, /* 124 */
-    NULL, /* 125 */
-    NULL, /* 126 */
-    NULL, /* 127 */
-    NULL, /* 128 */
-    NULL, /* 129 */
-    NULL, /* 130 */
-    NULL, /* 131 */
-    NULL, /* 132 */
-    NULL, /* 133 */
-    NULL, /* 134 */
-    NULL, /* 135 */
-    NULL, /* 136 */
-    NULL, /* 137 */
-    NULL, /* 138 */
-    NULL, /* 139 */
-    NULL, /* 140 */
-    NULL, /* 141 */
-    NULL, /* 142 */
-    NULL, /* 143 */
-    NULL, /* 144 */
-    NULL, /* 145 */
-    NULL, /* 146 */
-    NULL, /* 147 */
-    NULL, /* 148 */
-    NULL, /* 149 */
-    NULL, /* 150 */
-    NULL, /* 151 */
-    NULL, /* 152 */
-    NULL, /* 153 */
-    NULL, /* 154 */
-    NULL, /* 155 */
-    NULL, /* 156 */
-    NULL, /* 157 */
+    0, /* 92 */
+    0, /* 93 */
+    0, /* 94 */
+    0, /* 95 */
+    0, /* 96 */
+    0, /* 97 */
+    0, /* 98 */
+    0, /* 99 */
+    0, /* 100 */
+    0, /* 101 */
+    0, /* 102 */
+    0, /* 103 */
+    0, /* 104 */
+    0, /* 105 */
+    0, /* 106 */
+    0, /* 107 */
+    0, /* 108 */
+    0, /* 109 */
+    0, /* 110 */
+    0, /* 111 */
+    0, /* 112 */
+    0, /* 113 */
+    0, /* 114 */
+    0, /* 115 */
+    0, /* 116 */
+    0, /* 117 */
+    0, /* 118 */
+    0, /* 119 */
+    0, /* 120 */
+    0, /* 121 */
+    0, /* 122 */
+    0, /* 123 */
+    0, /* 124 */
+    0, /* 125 */
+    0, /* 126 */
+    0, /* 127 */
+    0, /* 128 */
+    0, /* 129 */
+    0, /* 130 */
+    0, /* 131 */
+    0, /* 132 */
+    0, /* 133 */
+    0, /* 134 */
+    0, /* 135 */
+    0, /* 136 */
+    0, /* 137 */
+    0, /* 138 */
+    0, /* 139 */
+    0, /* 140 */
+    0, /* 141 */
+    0, /* 142 */
+    0, /* 143 */
+    0, /* 144 */
+    0, /* 145 */
+    0, /* 146 */
+    0, /* 147 */
+    0, /* 148 */
+    0, /* 149 */
+    0, /* 150 */
+    0, /* 151 */
+    0, /* 152 */
+    0, /* 153 */
+    0, /* 154 */
+    0, /* 155 */
+    0, /* 156 */
+    0, /* 157 */
     TkUnusedStubEntry, /* 158 */
 #endif /* AQUA */
 };
 
-TkPlatStubs tkPlatStubs = {
+static const TkPlatStubs tkPlatStubs = {
     TCL_STUB_MAGIC,
-    NULL,
-#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
+    0,
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
     Tk_AttachHWND, /* 0 */
     Tk_GetHINSTANCE, /* 1 */
     Tk_GetHWND, /* 2 */
@@ -963,23 +963,23 @@ TkPlatStubs tkPlatStubs = {
     TkMacOSXGetRootControl, /* 8 */
     Tk_MacOSXSetupTkNotifier, /* 9 */
     Tk_MacOSXIsAppInFront, /* 10 */
-    NULL, /* 11 */
-    NULL, /* 12 */
-    NULL, /* 13 */
-    NULL, /* 14 */
-    NULL, /* 15 */
+    0, /* 11 */
+    0, /* 12 */
+    0, /* 13 */
+    0, /* 14 */
+    0, /* 15 */
     TkUnusedStubEntry, /* 16 */
 #endif /* AQUA */
 };
 
-static TkStubHooks tkStubHooks = {
+static const TkStubHooks tkStubHooks = {
     &tkPlatStubs,
     &tkIntStubs,
     &tkIntPlatStubs,
     &tkIntXlibStubs
 };
 
-TkStubs tkStubs = {
+const TkStubs tkStubs = {
     TCL_STUB_MAGIC,
     &tkStubHooks,
     Tk_MainLoop, /* 0 */
@@ -1200,8 +1200,8 @@ TkStubs tkStubs = {
     Tk_InitConsoleChannels, /* 215 */
     Tk_CreateConsoleWindow, /* 216 */
     Tk_CreateSmoothMethod, /* 217 */
-    NULL, /* 218 */
-    NULL, /* 219 */
+    0, /* 218 */
+    0, /* 219 */
     Tk_GetDash, /* 220 */
     Tk_CreateOutline, /* 221 */
     Tk_DeleteOutline, /* 222 */
@@ -1256,8 +1256,13 @@ TkStubs tkStubs = {
     Tk_Interp, /* 271 */
     Tk_CreateOldImageType, /* 272 */
     Tk_CreateOldPhotoImageFormat, /* 273 */
-    NULL, /* 274 */
-    TkUnusedStubEntry, /* 275 */
+    0, /* 274 */
+    0, /* 275 */
+    0, /* 276 */
+    0, /* 277 */
+    0, /* 278 */
+    0, /* 279 */
+    TkUnusedStubEntry, /* 280 */
 };
 
 /* !END!: Do not edit above this line. */
-- 
cgit v0.12


From 7ab30c7f2e1462813cea109e17ee831c659e01ca Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 8 Sep 2020 15:38:56 +0000
Subject: Some more xcode 11.6 -> 11.7

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3400bff..da8b681 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -153,15 +153,15 @@ jobs:
       env:
         - BUILD_DIR=unix
         - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include"
-    - name: "macOS/Clang++/Xcode 11.6/Shared"
+    - name: "macOS/Clang++/Xcode 11.7/Shared"
       os: osx
-      osx_image: xcode11.6
+      osx_image: xcode11.7
       env:
         - BUILD_DIR=unix
         - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib CC=clang++ --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-D__private_extern__=extern"
-    - name: "macOS/Clang/Xcode 11.6/Shared"
+    - name: "macOS/Clang/Xcode 11.7/Shared"
       os: osx
-      osx_image: xcode11.6
+      osx_image: xcode11.7
       env:
         - BUILD_DIR=unix
         - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include"
-- 
cgit v0.12


From a56a753b41381943366da4d0bfbe307b14ad3eb6 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Tue, 8 Sep 2020 16:24:30 +0000
Subject: Fix TkMacOSXGetXWindow so it returns a Window, not a Tk_Window cast
 as a Window.

---
 macosx/tkMacOSXWm.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index d66c594..3b843b9 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -5401,8 +5401,11 @@ Window
 TkMacOSXGetXWindow(
     void *macWinPtr)
 {
+    Window window = None;
     TKWindow *w = (TKWindow *)macWinPtr;
-    Window window = (Window) TkMacOSXGetTkWindow(w);
+    if ([w respondsToSelector: @selector (tkWindow)]) {
+	window = [w tkWindow];
+    }
     return window ? window : None;
 }
 
@@ -5436,7 +5439,6 @@ Tk_MacOSXGetTkWindow(
     }
     return (window != None ?
 	    Tk_IdToWindow(dispPtr->display, window) : NULL);
-
 }
 
 /*
-- 
cgit v0.12


From 1cebfa6aa3095dcdb4dbcf81186a0090a5ef2b8b Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Tue, 8 Sep 2020 19:47:11 +0000
Subject: Fix [6c2425f92e]: UBSan error in Tk_FreeSavedOptions(). Thanks to
 Christopher Chavez.

---
 generic/tkConfig.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/generic/tkConfig.c b/generic/tkConfig.c
index a752674..7e0943d 100644
--- a/generic/tkConfig.c
+++ b/generic/tkConfig.c
@@ -1500,9 +1500,8 @@ Tk_FreeSavedOptions(
 	Tk_FreeSavedOptions(savePtr->nextPtr);
 	ckfree(savePtr->nextPtr);
     }
-    for (count = savePtr->numItems,
-	    savedOptionPtr = &savePtr->items[savePtr->numItems-1];
-	    count > 0;  count--, savedOptionPtr--) {
+    for (count = savePtr->numItems; count > 0; count--) {
+	savedOptionPtr = &savePtr->items[count-1];
 	if (savedOptionPtr->optionPtr->flags & OPTION_NEEDS_FREEING) {
 	    FreeResources(savedOptionPtr->optionPtr, savedOptionPtr->valuePtr,
 		    (char *) &savedOptionPtr->internalForm, savePtr->tkwin);
-- 
cgit v0.12


From b3a1dc834a344eeb6eb6c42eee5747023e39385e Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Tue, 8 Sep 2020 20:28:57 +0000
Subject: Fix [2a6d63b9dc]: crash in macOS 10.6 when de-activating wish with
 Option-tab

---
 macosx/ttkMacOSXTheme.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c
index 26a25b4..df597f4 100644
--- a/macosx/ttkMacOSXTheme.c
+++ b/macosx/ttkMacOSXTheme.c
@@ -501,10 +501,13 @@ static void SolidFillRoundedRectangle(
     NSColor *color)
 {
     CGPathRef path;
-    CHECK_RADIUS(radius, bounds)
 
-    CGContextSetFillColorWithColor(context, CGCOLOR(color));
+    CHECK_RADIUS(radius, bounds)
     path = CGPathCreateWithRoundedRect(bounds, radius, radius, NULL);
+    if (!path) {
+	return;
+    }
+    CGContextSetFillColorWithColor(context, CGCOLOR(color));
     CGContextBeginPath(context);
     CGContextAddPath(context, path);
     CGContextFillPath(context);
-- 
cgit v0.12


From 19349f662acefdded4ad020f003c6945d9f9da23 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 8 Sep 2020 20:32:51 +0000
Subject: Don't depend on TIP #581 for Tcl in testcases

---
 tests/focus.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/focus.test b/tests/focus.test
index 7ce2df1..3d9d7c3 100644
--- a/tests/focus.test
+++ b/tests/focus.test
@@ -624,7 +624,7 @@ fixfocus
 test focus-6.1 {miscellaneous - embedded application in same process} -constraints {
     unix  testwrapper
 } -setup {
-    eval interp delete [interp slaves]
+    eval interp delete [interp children]
 } -body {
     toplevel .t
     wm geometry .t +0+0
-- 
cgit v0.12


From 19d012df44dac9aaf5faa9b3beca5a6396ea21a8 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 8 Sep 2020 20:43:52 +0000
Subject: Fix [420feb3850]: Aqua: UBSan warns for misaligned TkpGCCache access.
 Just define the memory layout we want (XGCValuesWithCache) and let the
 compiler do the calculations.

---
 xlib/xgc.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/xlib/xgc.c b/xlib/xgc.c
index b145395..c0dbe84 100644
--- a/xlib/xgc.c
+++ b/xlib/xgc.c
@@ -16,7 +16,6 @@
 
 #if !defined(MAC_OSX_TK)
 #   include <X11/Xlib.h>
-#   define gcCacheSize 0
 #   define TkpInitGCCache(gc)
 #   define TkpFreeGCCache(gc)
 #   define TkpGetGCCache(gc)
@@ -26,11 +25,19 @@
 #   include <X11/X.h>
 #   define Cursor XCursor
 #   define Region XRegion
-#   define gcCacheSize sizeof(TkpGCCache)
 #endif
 
 #undef TkSetRegion
 
+#define MAX_DASH_LIST_SIZE 10
+typedef struct {
+    XGCValues gc;
+    char dash[MAX_DASH_LIST_SIZE];
+#ifdef MAC_OSX_TK
+    TkpGCCache cache;
+#endif
+} XGCValuesWithCache;
+
 /*
  *----------------------------------------------------------------------
  *
@@ -113,9 +120,7 @@ XCreateGC(
      * initialization.
      */
 
-#define MAX_DASH_LIST_SIZE 10
-
-    gp = (GC)ckalloc(sizeof(XGCValues) + MAX_DASH_LIST_SIZE + gcCacheSize);
+    gp = (GC)ckalloc(sizeof(XGCValuesWithCache));
     if (!gp) {
 	return NULL;
     }
@@ -178,8 +183,7 @@ XCreateGC(
 
 TkpGCCache*
 TkpGetGCCache(GC gc) {
-    return (gc ? (TkpGCCache*)(((char*) gc) + sizeof(XGCValues) +
-	    MAX_DASH_LIST_SIZE) : NULL);
+    return (gc ? &((XGCValuesWithCache *)gc)->cache : NULL);
 }
 #endif
 
-- 
cgit v0.12


From abc19613ce37f3616bce34410b1b00b69c8a0de3 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 9 Sep 2020 06:19:53 +0000
Subject: Attempt to fix [3bc0f44ef3]: UBSan complains about body.chars[]
 usage. Don't know if all (older) compilers, like VC++ 6.0, accept this.

---
 generic/tkText.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tkText.h b/generic/tkText.h
index 75cab59..61a2a53 100644
--- a/generic/tkText.h
+++ b/generic/tkText.h
@@ -168,7 +168,7 @@ typedef struct TkTextSegment {
     TkSizeT size;			/* Size of this segment (# of bytes of index
 				 * space it occupies). */
     union {
-	char chars[2];		/* Characters that make up character info.
+	char chars[0];		/* Characters that make up character info.
 				 * Actual length varies to hold as many
 				 * characters as needed.*/
 	TkTextToggle toggle;	/* Information about tag toggle. */
-- 
cgit v0.12


From 9c82b94f7f8be2ebc6cf88f55d08d6e087cff5a5 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 9 Sep 2020 09:55:56 +0000
Subject: TIP #581: More progress

---
 generic/tkGeometry.c       | 302 ++++++++++++++++++++++-----------------------
 generic/tkImage.c          | 265 ++++++++++++++++++++-------------------
 generic/tkImgBmap.c        |  22 ++--
 generic/tkStubInit.c       |   2 +-
 generic/ttk/ttkManager.c   |  24 ++--
 macosx/tkMacOSXMenu.c      |   4 +-
 macosx/tkMacOSXWm.c        |  34 ++---
 macosx/tkMacOSXWm.h        |   2 +-
 tests/focus.test           |   2 +-
 tests/safe.test            |   2 +-
 tests/ttk/combobox.test    |   8 +-
 tests/ttk/image.test       |   2 +-
 tests/ttk/panedwindow.test |   6 +-
 tests/ttk/scrollbar.test   |   8 +-
 tests/ttk/treetags.test    |   6 +-
 tests/ttk/treeview.test    |   6 +-
 tests/ttk/ttk.test         |   2 +-
 tests/ttk/validate.test    |   2 +-
 unix/Makefile.in           |   2 +-
 unix/tkUnixWm.c            | 106 ++++++++--------
 win/Makefile.in            |   9 +-
 win/tkWinWm.c              | 108 ++++++++--------
 22 files changed, 461 insertions(+), 463 deletions(-)

diff --git a/generic/tkGeometry.c b/generic/tkGeometry.c
index b70e66a..5ecac0e 100644
--- a/generic/tkGeometry.c
+++ b/generic/tkGeometry.c
@@ -20,16 +20,16 @@
  */
 
 typedef struct MaintainContent {
-    Tk_Window slave;		/* The slave window being positioned. */
-    Tk_Window master;		/* The master that determines slave's
+    Tk_Window content;		/* The content window being positioned. */
+    Tk_Window container;		/* The container that determines content's
 				 * position; it must be a descendant of
-				 * slave's parent. */
-    int x, y;			/* Desired position of slave relative to
-				 * master. */
-    int width, height;		/* Desired dimensions of slave. */
+				 * content's parent. */
+    int x, y;			/* Desired position of content relative to
+				 * container. */
+    int width, height;		/* Desired dimensions of content. */
     struct MaintainContent *nextPtr;
 				/* Next in list of Maintains associated with
-				 * master. */
+				 * container. */
 } MaintainContent;
 
 /*
@@ -45,7 +45,7 @@ typedef struct MaintainContainer {
     int checkScheduled;		/* Non-zero means that there is already a call
 				 * to MaintainCheckProc scheduled as an idle
 				 * handler. */
-    MaintainContent *slavePtr;	/* First in list of all content associated with
+    MaintainContent *contentPtr;	/* First in list of all content associated with
 				 * this container. */
 } MaintainContainer;
 
@@ -65,7 +65,7 @@ static void		MaintainContentProc(ClientData clientData,
  * Tk_ManageGeometry --
  *
  *	Arrange for a particular procedure to manage the geometry of a given
- *	slave window.
+ *	content window.
  *
  * Results:
  *	None.
@@ -218,7 +218,7 @@ Tk_SetInternalBorderEx(
     }
 
     /*
-     * All the slaves for which this is the master window must now be
+     * All the content for which this is the container window must now be
      * repositioned to take account of the new internal border width. To
      * signal all the geometry managers to do this, trigger a ConfigureNotify
      * event. This will cause geometry managers to recompute everything.
@@ -341,7 +341,7 @@ TkSetGeometryContainer(
 	return TCL_ERROR;
     }
 
-    winPtr->geomMgrName = ckalloc(strlen(name) + 1);
+    winPtr->geomMgrName = (char *)ckalloc(strlen(name) + 1);
     strcpy(winPtr->geomMgrName, name);
     return TCL_OK;
 }
@@ -387,12 +387,12 @@ TkFreeGeometryContainer(
  *
  * Tk_MaintainGeometry --
  *
- *	This procedure is invoked by geometry managers to handle slaves whose
- *	master's are not their parents. It translates the desired geometry for
- *	the slave into the coordinate system of the parent and respositions
- *	the slave if it isn't already at the right place. Furthermore, it sets
- *	up event handlers so that if the master (or any of its ancestors up to
- *	the slave's parent) is mapped, unmapped, or moved, then the slave will
+ *	This procedure is invoked by geometry managers to handle content whose
+ *	container's are not their parents. It translates the desired geometry for
+ *	the content into the coordinate system of the parent and respositions
+ *	the content if it isn't already at the right place. Furthermore, it sets
+ *	up event handlers so that if the container (or any of its ancestors up to
+ *	the content's parent) is mapped, unmapped, or moved, then the content will
  *	be adjusted to match.
  *
  * Results:
@@ -400,7 +400,7 @@ TkFreeGeometryContainer(
  *
  * Side effects:
  *	Event handlers are created and state is allocated to keep track of
- *	slave. Note: if slave was already managed for master by
+ *	content. Note: if content was already managed for container by
  *	Tk_MaintainGeometry, then the previous information is replaced with
  *	the new information. The caller must eventually call
  *	Tk_UnmaintainGeometry to eliminate the correspondence (or, the state
@@ -411,40 +411,40 @@ TkFreeGeometryContainer(
 
 void
 Tk_MaintainGeometry(
-    Tk_Window slave,		/* Slave for geometry management. */
-    Tk_Window master,		/* Master for slave; must be a descendant of
-				 * slave's parent. */
-    int x, int y,		/* Desired position of slave within master. */
-    int width, int height)	/* Desired dimensions for slave. */
+    Tk_Window window,		/* Window for geometry management. */
+    Tk_Window container,		/* Container for window; must be a descendant of
+				 * window's parent. */
+    int x, int y,		/* Desired position of window within container. */
+    int width, int height)	/* Desired dimensions for window. */
 {
     Tcl_HashEntry *hPtr;
-    MaintainContainer *masterPtr;
-    MaintainContent *slavePtr;
+    MaintainContainer *containerPtr;
+    MaintainContent *contentPtr;
     int isNew, map;
     Tk_Window ancestor, parent;
-    TkDisplay *dispPtr = ((TkWindow *) master)->dispPtr;
+    TkDisplay *dispPtr = ((TkWindow *) container)->dispPtr;
 
-    ((TkWindow *)slave)->maintainerPtr = (TkWindow *)master;
+    ((TkWindow *)window)->maintainerPtr = (TkWindow *)container;
 
-    ((TkWindow *)slave)->maintainerPtr = (TkWindow *)master;
-    if (master == Tk_Parent(slave)) {
+    ((TkWindow *)window)->maintainerPtr = (TkWindow *)container;
+    if (container == Tk_Parent(window)) {
 	/*
-	 * If the slave is a direct descendant of the master, don't bother
+	 * If the window is a direct descendant of the container, don't bother
 	 * setting up the extra infrastructure for management, just make a
 	 * call to Tk_MoveResizeWindow; the parent/child relationship will
 	 * take care of the rest.
 	 */
 
-	Tk_MoveResizeWindow(slave, x, y, width, height);
+	Tk_MoveResizeWindow(window, x, y, width, height);
 
 	/*
-	 * Map the slave if the master is already mapped; otherwise, wait
-	 * until the master is mapped later (in which case mapping the slave
+	 * Map the window if the container is already mapped; otherwise, wait
+	 * until the container is mapped later (in which case mapping the window
 	 * is taken care of elsewhere).
 	 */
 
-	if (Tk_IsMapped(master)) {
-	    Tk_MapWindow(slave);
+	if (Tk_IsMapped(container)) {
+	    Tk_MapWindow(window);
 	}
 	return;
     }
@@ -455,55 +455,55 @@ Tk_MaintainGeometry(
     }
 
     /*
-     * See if there is already a MaintainContainer structure for the master; if
+     * See if there is already a MaintainContainer structure for the container; if
      * not, then create one.
      */
 
-    parent = Tk_Parent(slave);
+    parent = Tk_Parent(window);
     hPtr = Tcl_CreateHashEntry(&dispPtr->maintainHashTable,
-	    (char *) master, &isNew);
+	    (char *) container, &isNew);
     if (!isNew) {
-	masterPtr = Tcl_GetHashValue(hPtr);
+	containerPtr = (MaintainContainer *)Tcl_GetHashValue(hPtr);
     } else {
-	masterPtr = ckalloc(sizeof(MaintainContainer));
-	masterPtr->ancestor = master;
-	masterPtr->checkScheduled = 0;
-	masterPtr->slavePtr = NULL;
-	Tcl_SetHashValue(hPtr, masterPtr);
+	containerPtr = (MaintainContainer *)ckalloc(sizeof(MaintainContainer));
+	containerPtr->ancestor = container;
+	containerPtr->checkScheduled = 0;
+	containerPtr->contentPtr = NULL;
+	Tcl_SetHashValue(hPtr, containerPtr);
     }
 
     /*
-     * Create a MaintainContent structure for the slave if there isn't already
+     * Create a MaintainContent structure for the window if there isn't already
      * one.
      */
 
-    for (slavePtr = masterPtr->slavePtr; slavePtr != NULL;
-	    slavePtr = slavePtr->nextPtr) {
-	if (slavePtr->slave == slave) {
-	    goto gotSlave;
+    for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
+	    contentPtr = contentPtr->nextPtr) {
+	if (contentPtr->content == window) {
+	    goto gotContent;
 	}
     }
-    slavePtr = ckalloc(sizeof(MaintainContent));
-    slavePtr->slave = slave;
-    slavePtr->master = master;
-    slavePtr->nextPtr = masterPtr->slavePtr;
-    masterPtr->slavePtr = slavePtr;
-    Tk_CreateEventHandler(slave, StructureNotifyMask, MaintainContentProc,
-	    slavePtr);
+    contentPtr = (MaintainContent *)ckalloc(sizeof(MaintainContent));
+    contentPtr->content = window;
+    contentPtr->container = container;
+    contentPtr->nextPtr = containerPtr->contentPtr;
+    containerPtr->contentPtr = contentPtr;
+    Tk_CreateEventHandler(window, StructureNotifyMask, MaintainContentProc,
+	    contentPtr);
 
     /*
      * Make sure that there are event handlers registered for all the windows
-     * between master and slave's parent (including master but not slave's
-     * parent). There may already be handlers for master and some of its
-     * ancestors (masterPtr->ancestor tells how many).
+     * between container and windows's parent (including container but not window's
+     * parent). There may already be handlers for container and some of its
+     * ancestors (containerPtr->ancestor tells how many).
      */
 
-    for (ancestor = master; ancestor != parent;
+    for (ancestor = container; ancestor != parent;
 	    ancestor = Tk_Parent(ancestor)) {
-	if (ancestor == masterPtr->ancestor) {
+	if (ancestor == containerPtr->ancestor) {
 	    Tk_CreateEventHandler(ancestor, StructureNotifyMask,
-		    MaintainContainerProc, masterPtr);
-	    masterPtr->ancestor = Tk_Parent(ancestor);
+		    MaintainContainerProc, containerPtr);
+	    containerPtr->ancestor = Tk_Parent(ancestor);
 	}
     }
 
@@ -512,27 +512,27 @@ Tk_MaintainGeometry(
      * if it's not currently in the right place or state.
      */
 
-  gotSlave:
-    slavePtr->x = x;
-    slavePtr->y = y;
-    slavePtr->width = width;
-    slavePtr->height = height;
+  gotContent:
+    contentPtr->x = x;
+    contentPtr->y = y;
+    contentPtr->width = width;
+    contentPtr->height = height;
     map = 1;
-    for (ancestor = slavePtr->master; ; ancestor = Tk_Parent(ancestor)) {
+    for (ancestor = contentPtr->container; ; ancestor = Tk_Parent(ancestor)) {
 	if (!Tk_IsMapped(ancestor) && (ancestor != parent)) {
 	    map = 0;
 	}
 	if (ancestor == parent) {
-	    if ((x != Tk_X(slavePtr->slave))
-		    || (y != Tk_Y(slavePtr->slave))
-		    || (width != Tk_Width(slavePtr->slave))
-		    || (height != Tk_Height(slavePtr->slave))) {
-		Tk_MoveResizeWindow(slavePtr->slave, x, y, width, height);
+	    if ((x != Tk_X(contentPtr->content))
+		    || (y != Tk_Y(contentPtr->content))
+		    || (width != Tk_Width(contentPtr->content))
+		    || (height != Tk_Height(contentPtr->content))) {
+		Tk_MoveResizeWindow(contentPtr->content, x, y, width, height);
 	    }
 	    if (map) {
-		Tk_MapWindow(slavePtr->slave);
+		Tk_MapWindow(contentPtr->content);
 	    } else {
-		Tk_UnmapWindow(slavePtr->slave);
+		Tk_UnmapWindow(contentPtr->content);
 	    }
 	    break;
 	}
@@ -547,37 +547,37 @@ Tk_MaintainGeometry(
  * Tk_UnmaintainGeometry --
  *
  *	This procedure cancels a previous Tk_MaintainGeometry call, so that
- *	the relationship between slave and master is no longer maintained.
+ *	the relationship between window and container is no longer maintained.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	The slave is unmapped and state is released, so that slave won't track
- *	master any more. If we weren't previously managing slave relative to
- *	master, then this procedure has no effect.
+ *	The window is unmapped and state is released, so that window won't track
+ *	container any more. If we weren't previously managing window relative to
+ *	container, then this procedure has no effect.
  *
  *----------------------------------------------------------------------
  */
 
 void
 Tk_UnmaintainGeometry(
-    Tk_Window slave,		/* Slave for geometry management. */
-    Tk_Window master)		/* Master for slave; must be a descendant of
-				 * slave's parent. */
+    Tk_Window window,		/* WIndow for geometry management. */
+    Tk_Window container)		/* Container for window; must be a descendant of
+				 * window's parent. */
 {
     Tcl_HashEntry *hPtr;
-    MaintainContainer *masterPtr;
-    MaintainContent *slavePtr, *prevPtr;
+    MaintainContainer *containerPtr;
+    MaintainContent *contentPtr, *prevPtr;
     Tk_Window ancestor;
-    TkDisplay *dispPtr = ((TkWindow *) slave)->dispPtr;
+    TkDisplay *dispPtr = ((TkWindow *) window)->dispPtr;
 
-    ((TkWindow *)slave)->maintainerPtr = NULL;
+    ((TkWindow *)window)->maintainerPtr = NULL;
 
-    ((TkWindow *)slave)->maintainerPtr = NULL;
-    if (master == Tk_Parent(slave)) {
+    ((TkWindow *)window)->maintainerPtr = NULL;
+    if (container == Tk_Parent(window)) {
 	/*
-	 * If the slave is a direct descendant of the master,
+	 * If the window is a direct descendant of the container,
 	 * Tk_MaintainGeometry will not have set up any of the extra
 	 * infrastructure. Don't even bother to look for it, just return.
 	 */
@@ -589,47 +589,47 @@ Tk_UnmaintainGeometry(
 	Tcl_InitHashTable(&dispPtr->maintainHashTable, TCL_ONE_WORD_KEYS);
     }
 
-    if (!(((TkWindow *) slave)->flags & TK_ALREADY_DEAD)) {
-	Tk_UnmapWindow(slave);
+    if (!(((TkWindow *) window)->flags & TK_ALREADY_DEAD)) {
+	Tk_UnmapWindow(window);
     }
-    hPtr = Tcl_FindHashEntry(&dispPtr->maintainHashTable, (char *) master);
+    hPtr = Tcl_FindHashEntry(&dispPtr->maintainHashTable, container);
     if (hPtr == NULL) {
 	return;
     }
-    masterPtr = Tcl_GetHashValue(hPtr);
-    slavePtr = masterPtr->slavePtr;
-    if (slavePtr->slave == slave) {
-	masterPtr->slavePtr = slavePtr->nextPtr;
+    containerPtr = (MaintainContainer *)Tcl_GetHashValue(hPtr);
+    contentPtr = containerPtr->contentPtr;
+    if (contentPtr->content == window) {
+	containerPtr->contentPtr = contentPtr->nextPtr;
     } else {
-	for (prevPtr = slavePtr, slavePtr = slavePtr->nextPtr; ;
-		prevPtr = slavePtr, slavePtr = slavePtr->nextPtr) {
-	    if (slavePtr == NULL) {
+	for (prevPtr = contentPtr, contentPtr = contentPtr->nextPtr; ;
+		prevPtr = contentPtr, contentPtr = contentPtr->nextPtr) {
+	    if (contentPtr == NULL) {
 		return;
 	    }
-	    if (slavePtr->slave == slave) {
-		prevPtr->nextPtr = slavePtr->nextPtr;
+	    if (contentPtr->content == window) {
+		prevPtr->nextPtr = contentPtr->nextPtr;
 		break;
 	    }
 	}
     }
-    Tk_DeleteEventHandler(slavePtr->slave, StructureNotifyMask,
-	    MaintainContentProc, slavePtr);
-    ckfree(slavePtr);
-    if (masterPtr->slavePtr == NULL) {
-	if (masterPtr->ancestor != NULL) {
-	    for (ancestor = master; ; ancestor = Tk_Parent(ancestor)) {
+    Tk_DeleteEventHandler(contentPtr->content, StructureNotifyMask,
+	    MaintainContentProc, contentPtr);
+    ckfree(contentPtr);
+    if (containerPtr->contentPtr == NULL) {
+	if (containerPtr->ancestor != NULL) {
+	    for (ancestor = container; ; ancestor = Tk_Parent(ancestor)) {
 		Tk_DeleteEventHandler(ancestor, StructureNotifyMask,
-			MaintainContainerProc, masterPtr);
-		if (ancestor == masterPtr->ancestor) {
+			MaintainContainerProc, containerPtr);
+		if (ancestor == containerPtr->ancestor) {
 		    break;
 		}
 	    }
 	}
-	if (masterPtr->checkScheduled) {
-	    Tcl_CancelIdleCall(MaintainCheckProc, masterPtr);
+	if (containerPtr->checkScheduled) {
+	    Tcl_CancelIdleCall(MaintainCheckProc, containerPtr);
 	}
 	Tcl_DeleteHashEntry(hPtr);
-	ckfree(masterPtr);
+	ckfree(containerPtr);
     }
 }
 
@@ -639,7 +639,7 @@ Tk_UnmaintainGeometry(
  * MaintainContainerProc --
  *
  *	This procedure is invoked by the Tk event dispatcher in response to
- *	StructureNotify events on the master or one of its ancestors, on
+ *	StructureNotify events on the container or one of its ancestors, on
  *	behalf of Tk_MaintainGeometry.
  *
  * Results:
@@ -648,7 +648,7 @@ Tk_UnmaintainGeometry(
  * Side effects:
  *	It schedules a call to MaintainCheckProc, which will eventually caused
  *	the postions and mapped states to be recalculated for all the
- *	maintained slaves of the master. Or, if the master window is being
+ *	maintained windows of the container. Or, if the container window is being
  *	deleted then state is cleaned up.
  *
  *----------------------------------------------------------------------
@@ -657,34 +657,34 @@ Tk_UnmaintainGeometry(
 static void
 MaintainContainerProc(
     ClientData clientData,	/* Pointer to MaintainContainer structure for the
-				 * master window. */
+				 * container window. */
     XEvent *eventPtr)		/* Describes what just happened. */
 {
-    MaintainContainer *masterPtr = clientData;
-    MaintainContent *slavePtr;
+    MaintainContainer *containerPtr = (MaintainContainer *)clientData;
+    MaintainContent *contentPtr;
     int done;
 
     if ((eventPtr->type == ConfigureNotify)
 	    || (eventPtr->type == MapNotify)
 	    || (eventPtr->type == UnmapNotify)) {
-	if (!masterPtr->checkScheduled) {
-	    masterPtr->checkScheduled = 1;
-	    Tcl_DoWhenIdle(MaintainCheckProc, masterPtr);
+	if (!containerPtr->checkScheduled) {
+	    containerPtr->checkScheduled = 1;
+	    Tcl_DoWhenIdle(MaintainCheckProc, containerPtr);
 	}
     } else if (eventPtr->type == DestroyNotify) {
 	/*
-	 * Delete all of the state associated with this master, but be careful
-	 * not to use masterPtr after the last slave is deleted, since its
+	 * Delete all of the state associated with this container, but be careful
+	 * not to use containerPtr after the last window is deleted, since its
 	 * memory will have been freed.
 	 */
 
 	done = 0;
 	do {
-	    slavePtr = masterPtr->slavePtr;
-	    if (slavePtr->nextPtr == NULL) {
+	    contentPtr = containerPtr->contentPtr;
+	    if (contentPtr->nextPtr == NULL) {
 		done = 1;
 	    }
-	    Tk_UnmaintainGeometry(slavePtr->slave, slavePtr->master);
+	    Tk_UnmaintainGeometry(contentPtr->content, contentPtr->container);
 	} while (!done);
     }
 }
@@ -695,7 +695,7 @@ MaintainContainerProc(
  * MaintainContentProc --
  *
  *	This procedure is invoked by the Tk event dispatcher in response to
- *	StructureNotify events on a slave being managed by
+ *	StructureNotify events on a window being managed by
  *	Tk_MaintainGeometry.
  *
  * Results:
@@ -703,7 +703,7 @@ MaintainContainerProc(
  *
  * Side effects:
  *	If the event is a DestroyNotify event then the Maintain state and
- *	event handlers for this slave are deleted.
+ *	event handlers for this window are deleted.
  *
  *----------------------------------------------------------------------
  */
@@ -711,13 +711,13 @@ MaintainContainerProc(
 static void
 MaintainContentProc(
     ClientData clientData,	/* Pointer to MaintainContent structure for
-				 * master-slave pair. */
+				 * container-window pair. */
     XEvent *eventPtr)		/* Describes what just happened. */
 {
-    MaintainContent *slavePtr = clientData;
+    MaintainContent *contentPtr = (MaintainContent *)clientData;
 
     if (eventPtr->type == DestroyNotify) {
-	Tk_UnmaintainGeometry(slavePtr->slave, slavePtr->master);
+	Tk_UnmaintainGeometry(contentPtr->content, contentPtr->container);
     }
 }
 
@@ -727,16 +727,16 @@ MaintainContentProc(
  * MaintainCheckProc --
  *
  *	This procedure is invoked by the Tk event dispatcher as an idle
- *	handler, when a master or one of its ancestors has been reconfigured,
- *	mapped, or unmapped. Its job is to scan all of the slaves for the
- *	master and reposition them, map them, or unmap them as needed to
- *	maintain their geometry relative to the master.
+ *	handler, when a container or one of its ancestors has been reconfigured,
+ *	mapped, or unmapped. Its job is to scan all of the windows for the
+ *	container and reposition them, map them, or unmap them as needed to
+ *	maintain their geometry relative to the container.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	Slaves can get repositioned, mapped, or unmapped.
+ *	Windows can get repositioned, mapped, or unmapped.
  *
  *----------------------------------------------------------------------
  */
@@ -744,33 +744,33 @@ MaintainContentProc(
 static void
 MaintainCheckProc(
     ClientData clientData)	/* Pointer to MaintainContainer structure for the
-				 * master window. */
+				 * container window. */
 {
-    MaintainContainer *masterPtr = clientData;
-    MaintainContent *slavePtr;
+    MaintainContainer *containerPtr = (MaintainContainer *)clientData;
+    MaintainContent *contentPtr;
     Tk_Window ancestor, parent;
     int x, y, map;
 
-    masterPtr->checkScheduled = 0;
-    for (slavePtr = masterPtr->slavePtr; slavePtr != NULL;
-	    slavePtr = slavePtr->nextPtr) {
-	parent = Tk_Parent(slavePtr->slave);
-	x = slavePtr->x;
-	y = slavePtr->y;
+    containerPtr->checkScheduled = 0;
+    for (contentPtr = containerPtr->contentPtr; contentPtr != NULL;
+	    contentPtr = contentPtr->nextPtr) {
+	parent = Tk_Parent(contentPtr->content);
+	x = contentPtr->x;
+	y = contentPtr->y;
 	map = 1;
-	for (ancestor = slavePtr->master; ; ancestor = Tk_Parent(ancestor)) {
+	for (ancestor = contentPtr->container; ; ancestor = Tk_Parent(ancestor)) {
 	    if (!Tk_IsMapped(ancestor) && (ancestor != parent)) {
 		map = 0;
 	    }
 	    if (ancestor == parent) {
-		if ((x != Tk_X(slavePtr->slave))
-			|| (y != Tk_Y(slavePtr->slave))) {
-		    Tk_MoveWindow(slavePtr->slave, x, y);
+		if ((x != Tk_X(contentPtr->content))
+			|| (y != Tk_Y(contentPtr->content))) {
+		    Tk_MoveWindow(contentPtr->content, x, y);
 		}
 		if (map) {
-		    Tk_MapWindow(slavePtr->slave);
+		    Tk_MapWindow(contentPtr->content);
 		} else {
-		    Tk_UnmapWindow(slavePtr->slave);
+		    Tk_UnmapWindow(contentPtr->content);
 		}
 		break;
 	    }
diff --git a/generic/tkImage.c b/generic/tkImage.c
index 8192c23..763c65b 100644
--- a/generic/tkImage.c
+++ b/generic/tkImage.c
@@ -26,8 +26,8 @@ typedef struct Image {
     Display *display;		/* Display for tkwin. Needed because when the
 				 * image is eventually freed tkwin may not
 				 * exist anymore. */
-    struct ImageModel *masterPtr;
-				/* Master for this image (identifiers image
+    struct ImageModel *modelPtr;
+				/* Model for this image (identifiers image
 				 * manager, for example). */
     ClientData instanceData;	/* One word argument to pass to image manager
 				 * when dealing with this image instance. */
@@ -40,7 +40,7 @@ typedef struct Image {
 } Image;
 
 /*
- * For each image master there is one of the following structures, which
+ * For each image model there is one of the following structures, which
  * represents a name in the image table and all of the images instantiated
  * from it. Entries in mainPtr->imageTable point to these structures.
  */
@@ -49,8 +49,8 @@ typedef struct ImageModel {
     Tk_ImageType *typePtr;	/* Information about image type. NULL means
 				 * that no image manager owns this image: the
 				 * image was deleted. */
-    ClientData masterData;	/* One-word argument to pass to image mgr when
-				 * dealing with the master, as opposed to
+    ClientData modelData;	/* One-word argument to pass to image mgr when
+				 * dealing with the model, as opposed to
 				 * instances. */
     int width, height;		/* Last known dimensions for image. */
     Tcl_HashTable *tablePtr;	/* Pointer to hash table containing image (the
@@ -82,8 +82,8 @@ static Tcl_ThreadDataKey dataKey;
  */
 
 static void		ImageTypeThreadExitProc(ClientData clientData);
-static void		DeleteImage(ImageModel *masterPtr);
-static void		EventuallyDeleteImage(ImageModel *masterPtr,
+static void		DeleteImage(ImageModel *modelPtr);
+static void		EventuallyDeleteImage(ImageModel *modelPtr,
 			    int forgetImageHashNow);
 
 /*
@@ -104,10 +104,10 @@ static void		EventuallyDeleteImage(ImageModel *masterPtr,
 
 static void
 ImageTypeThreadExitProc(
-    ClientData clientData)	/* not used */
+    TCL_UNUSED(void *))
 {
     Tk_ImageType *freePtr;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     while (tsdPtr->oldImageTypeList != NULL) {
@@ -149,14 +149,14 @@ Tk_CreateOldImageType(
 				 * by caller. */
 {
     Tk_ImageType *copyPtr;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     if (!tsdPtr->initialized) {
 	tsdPtr->initialized = 1;
 	Tcl_CreateThreadExitHandler(ImageTypeThreadExitProc, NULL);
     }
-    copyPtr = ckalloc(sizeof(Tk_ImageType));
+    copyPtr = (Tk_ImageType *)ckalloc(sizeof(Tk_ImageType));
     *copyPtr = *typePtr;
     copyPtr->nextPtr = tsdPtr->oldImageTypeList;
     tsdPtr->oldImageTypeList = copyPtr;
@@ -170,14 +170,14 @@ Tk_CreateImageType(
 				 * by caller. */
 {
     Tk_ImageType *copyPtr;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     if (!tsdPtr->initialized) {
 	tsdPtr->initialized = 1;
 	Tcl_CreateThreadExitHandler(ImageTypeThreadExitProc, NULL);
     }
-    copyPtr = ckalloc(sizeof(Tk_ImageType));
+    copyPtr = (Tk_ImageType *)ckalloc(sizeof(Tk_ImageType));
     *copyPtr = *typePtr;
     copyPtr->nextPtr = tsdPtr->imageTypeList;
     tsdPtr->imageTypeList = copyPtr;
@@ -215,10 +215,10 @@ Tk_ImageObjCmd(
 	IMAGE_CREATE, IMAGE_DELETE, IMAGE_HEIGHT, IMAGE_INUSE, IMAGE_NAMES,
 	IMAGE_TYPE, IMAGE_TYPES, IMAGE_WIDTH
     };
-    TkWindow *winPtr = clientData;
+    TkWindow *winPtr = (TkWindow *)clientData;
     int i, isNew, firstOption, index;
     Tk_ImageType *typePtr;
-    ImageModel *masterPtr;
+    ImageModel *modelPtr;
     Image *imagePtr;
     Tcl_HashEntry *hPtr;
     Tcl_HashSearch search;
@@ -226,7 +226,7 @@ Tk_ImageObjCmd(
     TkDisplay *dispPtr = winPtr->dispPtr;
     const char *arg, *name;
     Tcl_Obj *resultObj;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
             Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     if (objc < 2) {
@@ -297,7 +297,7 @@ Tk_ImageObjCmd(
 
 	    /*
 	     * Need to check if the _command_ that we are about to create is
-	     * the name of the current master widget command (normally "." but
+	     * the name of the current model widget command (normally "." but
 	     * could have been renamed) and fail in that case before a really
 	     * nasty and hard to stop crash happens.
 	     */
@@ -318,37 +318,37 @@ Tk_ImageObjCmd(
 
 	hPtr = Tcl_CreateHashEntry(&winPtr->mainPtr->imageTable, name, &isNew);
 	if (isNew) {
-	    masterPtr = ckalloc(sizeof(ImageModel));
-	    masterPtr->typePtr = NULL;
-	    masterPtr->masterData = NULL;
-	    masterPtr->width = masterPtr->height = 1;
-	    masterPtr->tablePtr = &winPtr->mainPtr->imageTable;
-	    masterPtr->hPtr = hPtr;
-	    masterPtr->instancePtr = NULL;
-	    masterPtr->deleted = 0;
-	    masterPtr->winPtr = winPtr->mainPtr->winPtr;
-	    Tcl_Preserve(masterPtr->winPtr);
-	    Tcl_SetHashValue(hPtr, masterPtr);
+	    modelPtr = (ImageModel *)ckalloc(sizeof(ImageModel));
+	    modelPtr->typePtr = NULL;
+	    modelPtr->modelData = NULL;
+	    modelPtr->width = modelPtr->height = 1;
+	    modelPtr->tablePtr = &winPtr->mainPtr->imageTable;
+	    modelPtr->hPtr = hPtr;
+	    modelPtr->instancePtr = NULL;
+	    modelPtr->deleted = 0;
+	    modelPtr->winPtr = winPtr->mainPtr->winPtr;
+	    Tcl_Preserve(modelPtr->winPtr);
+	    Tcl_SetHashValue(hPtr, modelPtr);
 	} else {
 	    /*
 	     * An image already exists by this name. Disconnect the instances
-	     * from the master.
+	     * from the model.
 	     */
 
-	    masterPtr = Tcl_GetHashValue(hPtr);
-	    if (masterPtr->typePtr != NULL) {
-		for (imagePtr = masterPtr->instancePtr; imagePtr != NULL;
+	    modelPtr = (ImageModel *)Tcl_GetHashValue(hPtr);
+	    if (modelPtr->typePtr != NULL) {
+		for (imagePtr = modelPtr->instancePtr; imagePtr != NULL;
 			imagePtr = imagePtr->nextPtr) {
-		    masterPtr->typePtr->freeProc(imagePtr->instanceData,
+		    modelPtr->typePtr->freeProc(imagePtr->instanceData,
 			    imagePtr->display);
 		    imagePtr->changeProc(imagePtr->widgetClientData, 0, 0,
-			    masterPtr->width, masterPtr->height,
-			    masterPtr->width, masterPtr->height);
+			    modelPtr->width, modelPtr->height,
+			    modelPtr->width, modelPtr->height);
 		}
-		masterPtr->typePtr->deleteProc(masterPtr->masterData);
-		masterPtr->typePtr = NULL;
+		modelPtr->typePtr->deleteProc(modelPtr->modelData);
+		modelPtr->typePtr = NULL;
 	    }
-	    masterPtr->deleted = 0;
+	    modelPtr->deleted = 0;
 	}
 
 	/*
@@ -363,34 +363,34 @@ Tk_ImageObjCmd(
 	if (oldimage) {
 	    int i;
 
-	    args = ckalloc((objc+1) * sizeof(char *));
+	    args = (Tcl_Obj **)ckalloc((objc+1) * sizeof(Tcl_Obj *));
 	    for (i = 0; i < objc; i++) {
 		args[i] = (Tcl_Obj *) Tcl_GetString(objv[i]);
 	    }
 	    args[objc] = NULL;
 	}
-	Tcl_Preserve(masterPtr);
+	Tcl_Preserve(modelPtr);
 	if (typePtr->createProc(interp, name, objc, args, typePtr,
-		(Tk_ImageModel)masterPtr, &masterPtr->masterData) != TCL_OK){
-	    EventuallyDeleteImage(masterPtr, 0);
-	    Tcl_Release(masterPtr);
+		(Tk_ImageModel)modelPtr, &modelPtr->modelData) != TCL_OK){
+	    EventuallyDeleteImage(modelPtr, 0);
+	    Tcl_Release(modelPtr);
 	    if (oldimage) {
 		ckfree(args);
 	    }
 	    return TCL_ERROR;
 	}
-	Tcl_Release(masterPtr);
+	Tcl_Release(modelPtr);
 	if (oldimage) {
 	    ckfree(args);
 	}
-	masterPtr->typePtr = typePtr;
-	for (imagePtr = masterPtr->instancePtr; imagePtr != NULL;
+	modelPtr->typePtr = typePtr;
+	for (imagePtr = modelPtr->instancePtr; imagePtr != NULL;
 		imagePtr = imagePtr->nextPtr) {
 	    imagePtr->instanceData = typePtr->getProc(imagePtr->tkwin,
-		    masterPtr->masterData);
+		    modelPtr->modelData);
 	}
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		Tcl_GetHashKey(&winPtr->mainPtr->imageTable, hPtr), -1));
+		(const char *)Tcl_GetHashKey(&winPtr->mainPtr->imageTable, hPtr), -1));
 	break;
     }
     case IMAGE_DELETE:
@@ -400,11 +400,11 @@ Tk_ImageObjCmd(
 	    if (hPtr == NULL) {
 		goto alreadyDeleted;
 	    }
-	    masterPtr = Tcl_GetHashValue(hPtr);
-	    if (masterPtr->deleted) {
+	    modelPtr = (ImageModel *)Tcl_GetHashValue(hPtr);
+	    if (modelPtr->deleted) {
 		goto alreadyDeleted;
 	    }
-	    DeleteImage(masterPtr);
+	    DeleteImage(modelPtr);
 	}
 	break;
     case IMAGE_NAMES:
@@ -415,12 +415,12 @@ Tk_ImageObjCmd(
 	hPtr = Tcl_FirstHashEntry(&winPtr->mainPtr->imageTable, &search);
 	resultObj = Tcl_NewObj();
 	for ( ; hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
-	    masterPtr = Tcl_GetHashValue(hPtr);
-	    if (masterPtr->deleted) {
+	    modelPtr = (ImageModel *)Tcl_GetHashValue(hPtr);
+	    if (modelPtr->deleted) {
 		continue;
 	    }
 	    Tcl_ListObjAppendElement(NULL, resultObj, Tcl_NewStringObj(
-		    Tcl_GetHashKey(&winPtr->mainPtr->imageTable, hPtr), -1));
+		    (const char *)Tcl_GetHashKey(&winPtr->mainPtr->imageTable, hPtr), -1));
 	}
 	Tcl_SetObjResult(interp, resultObj);
 	break;
@@ -449,7 +449,7 @@ Tk_ImageObjCmd(
     case IMAGE_WIDTH:
 	/*
 	 * These operations all parse virtually identically. First check to
-	 * see if three args are given. Then get a non-deleted master from the
+	 * see if three args are given. Then get a non-deleted model from the
 	 * third arg.
 	 */
 
@@ -463,8 +463,8 @@ Tk_ImageObjCmd(
 	if (hPtr == NULL) {
 	    goto alreadyDeleted;
 	}
-	masterPtr = Tcl_GetHashValue(hPtr);
-	if (masterPtr->deleted) {
+	modelPtr = (ImageModel *)Tcl_GetHashValue(hPtr);
+	if (modelPtr->deleted) {
 	    goto alreadyDeleted;
 	}
 
@@ -474,20 +474,20 @@ Tk_ImageObjCmd(
 
 	switch ((enum options) index) {
 	case IMAGE_HEIGHT:
-	    Tcl_SetObjResult(interp, Tcl_NewIntObj(masterPtr->height));
+	    Tcl_SetObjResult(interp, Tcl_NewIntObj(modelPtr->height));
 	    break;
 	case IMAGE_INUSE:
 	    Tcl_SetObjResult(interp, Tcl_NewBooleanObj(
-		    masterPtr->typePtr && masterPtr->instancePtr));
+		    modelPtr->typePtr && modelPtr->instancePtr));
 	    break;
 	case IMAGE_TYPE:
-	    if (masterPtr->typePtr != NULL) {
+	    if (modelPtr->typePtr != NULL) {
 		Tcl_SetObjResult(interp,
-			Tcl_NewStringObj(masterPtr->typePtr->name, -1));
+			Tcl_NewStringObj(modelPtr->typePtr->name, -1));
 	    }
 	    break;
 	case IMAGE_WIDTH:
-	    Tcl_SetObjResult(interp, Tcl_NewIntObj(masterPtr->width));
+	    Tcl_SetObjResult(interp, Tcl_NewIntObj(modelPtr->width));
 	    break;
 	default:
 	    Tcl_Panic("can't happen");
@@ -534,12 +534,12 @@ Tk_ImageChanged(
     int imageWidth, int imageHeight)
 				/* New dimensions of image. */
 {
-    ImageModel *masterPtr = (ImageModel *) imageModel;
+    ImageModel *modelPtr = (ImageModel *) imageModel;
     Image *imagePtr;
 
-    masterPtr->width = imageWidth;
-    masterPtr->height = imageHeight;
-    for (imagePtr = masterPtr->instancePtr; imagePtr != NULL;
+    modelPtr->width = imageWidth;
+    modelPtr->height = imageHeight;
+    for (imagePtr = modelPtr->instancePtr; imagePtr != NULL;
 	    imagePtr = imagePtr->nextPtr) {
 	imagePtr->changeProc(imagePtr->widgetClientData, x, y, width, height,
 		imageWidth, imageHeight);
@@ -551,7 +551,7 @@ Tk_ImageChanged(
  *
  * Tk_NameOfImage --
  *
- *	Given a token for an image master, this function returns the name of
+ *	Given a token for an image model, this function returns the name of
  *	the image.
  *
  * Results:
@@ -567,12 +567,12 @@ const char *
 Tk_NameOfImage(
     Tk_ImageModel imageModel)	/* Token for image. */
 {
-    ImageModel *masterPtr = (ImageModel *) imageModel;
+    ImageModel *modelPtr = (ImageModel *) imageModel;
 
-    if (masterPtr->hPtr == NULL) {
+    if (modelPtr->hPtr == NULL) {
 	return NULL;
     }
-    return Tcl_GetHashKey(masterPtr->tablePtr, masterPtr->hPtr);
+    return (const char *)Tcl_GetHashKey(modelPtr->tablePtr, modelPtr->hPtr);
 }
 
 /*
@@ -610,30 +610,30 @@ Tk_GetImage(
     ClientData clientData)	/* One-word argument to pass to damageProc. */
 {
     Tcl_HashEntry *hPtr;
-    ImageModel *masterPtr;
+    ImageModel *modelPtr;
     Image *imagePtr;
 
     hPtr = Tcl_FindHashEntry(&((TkWindow *) tkwin)->mainPtr->imageTable, name);
     if (hPtr == NULL) {
 	goto noSuchImage;
     }
-    masterPtr = Tcl_GetHashValue(hPtr);
-    if (masterPtr->typePtr == NULL) {
+    modelPtr = (ImageModel *)Tcl_GetHashValue(hPtr);
+    if (modelPtr->typePtr == NULL) {
 	goto noSuchImage;
     }
-    if (masterPtr->deleted) {
+    if (modelPtr->deleted) {
 	goto noSuchImage;
     }
-    imagePtr = ckalloc(sizeof(Image));
+    imagePtr = (Image *)ckalloc(sizeof(Image));
     imagePtr->tkwin = tkwin;
     imagePtr->display = Tk_Display(tkwin);
-    imagePtr->masterPtr = masterPtr;
+    imagePtr->modelPtr = modelPtr;
     imagePtr->instanceData =
-	    masterPtr->typePtr->getProc(tkwin, masterPtr->masterData);
+	    modelPtr->typePtr->getProc(tkwin, modelPtr->modelData);
     imagePtr->changeProc = changeProc;
     imagePtr->widgetClientData = clientData;
-    imagePtr->nextPtr = masterPtr->instancePtr;
-    masterPtr->instancePtr = imagePtr;
+    imagePtr->nextPtr = modelPtr->instancePtr;
+    modelPtr->instancePtr = imagePtr;
     return (Tk_Image) imagePtr;
 
   noSuchImage:
@@ -669,20 +669,20 @@ Tk_FreeImage(
 				 * a widget. */
 {
     Image *imagePtr = (Image *) image;
-    ImageModel *masterPtr = imagePtr->masterPtr;
+    ImageModel *modelPtr = imagePtr->modelPtr;
     Image *prevPtr;
 
     /*
      * Clean up the particular instance.
      */
 
-    if (masterPtr->typePtr != NULL) {
-	masterPtr->typePtr->freeProc(imagePtr->instanceData,
+    if (modelPtr->typePtr != NULL) {
+	modelPtr->typePtr->freeProc(imagePtr->instanceData,
 		imagePtr->display);
     }
-    prevPtr = masterPtr->instancePtr;
+    prevPtr = modelPtr->instancePtr;
     if (prevPtr == imagePtr) {
-	masterPtr->instancePtr = imagePtr->nextPtr;
+	modelPtr->instancePtr = imagePtr->nextPtr;
     } else {
 	while (prevPtr->nextPtr != imagePtr) {
 	    prevPtr = prevPtr->nextPtr;
@@ -692,16 +692,16 @@ Tk_FreeImage(
     ckfree(imagePtr);
 
     /*
-     * If there are no more instances left for the master, and if the master
-     * image has been deleted, then delete the master too.
+     * If there are no more instances left for the model, and if the model
+     * image has been deleted, then delete the model too.
      */
 
-    if ((masterPtr->typePtr == NULL) && (masterPtr->instancePtr == NULL)) {
-	if (masterPtr->hPtr != NULL) {
-	    Tcl_DeleteHashEntry(masterPtr->hPtr);
+    if ((modelPtr->typePtr == NULL) && (modelPtr->instancePtr == NULL)) {
+	if (modelPtr->hPtr != NULL) {
+	    Tcl_DeleteHashEntry(modelPtr->hPtr);
 	}
-	Tcl_Release(masterPtr->winPtr);
-	ckfree(masterPtr);
+	Tcl_Release(modelPtr->winPtr);
+	ckfree(modelPtr);
     }
 }
 
@@ -741,9 +741,9 @@ Tk_PostscriptImage(
     GC newGC;
     XGCValues gcValues;
 
-    if (imagePtr->masterPtr->typePtr == NULL) {
+    if (imagePtr->modelPtr->typePtr == NULL) {
 	/*
-	 * No master for image, so nothing to display on postscript.
+	 * No model for image, so nothing to display on postscript.
 	 */
 
 	return TCL_OK;
@@ -754,9 +754,9 @@ Tk_PostscriptImage(
      * otherwise go on with generic code.
      */
 
-    if (imagePtr->masterPtr->typePtr->postscriptProc != NULL) {
-	return imagePtr->masterPtr->typePtr->postscriptProc(
-		imagePtr->masterPtr->masterData, interp, tkwin, psinfo,
+    if (imagePtr->modelPtr->typePtr->postscriptProc != NULL) {
+	return imagePtr->modelPtr->typePtr->postscriptProc(
+		imagePtr->modelPtr->modelData, interp, tkwin, psinfo,
 		x, y, width, height, prepass);
     }
 
@@ -837,9 +837,9 @@ Tk_RedrawImage(
 {
     Image *imagePtr = (Image *) image;
 
-    if (imagePtr->masterPtr->typePtr == NULL) {
+    if (imagePtr->modelPtr->typePtr == NULL) {
 	/*
-	 * No master for image, so nothing to display.
+	 * No model for image, so nothing to display.
 	 */
 
 	return;
@@ -859,13 +859,13 @@ Tk_RedrawImage(
 	drawableY -= imageY;
 	imageY = 0;
     }
-    if ((imageX + width) > imagePtr->masterPtr->width) {
-	width = imagePtr->masterPtr->width - imageX;
+    if ((imageX + width) > imagePtr->modelPtr->width) {
+	width = imagePtr->modelPtr->width - imageX;
     }
-    if ((imageY + height) > imagePtr->masterPtr->height) {
-	height = imagePtr->masterPtr->height - imageY;
+    if ((imageY + height) > imagePtr->modelPtr->height) {
+	height = imagePtr->modelPtr->height - imageY;
     }
-    imagePtr->masterPtr->typePtr->displayProc(imagePtr->instanceData,
+    imagePtr->modelPtr->typePtr->displayProc(imagePtr->instanceData,
 	    imagePtr->display, drawable, imageX, imageY, width, height,
 	    drawableX, drawableY);
 }
@@ -895,8 +895,8 @@ Tk_SizeOfImage(
 {
     Image *imagePtr = (Image *) image;
 
-    *widthPtr = imagePtr->masterPtr->width;
-    *heightPtr = imagePtr->masterPtr->height;
+    *widthPtr = imagePtr->modelPtr->width;
+    *heightPtr = imagePtr->modelPtr->height;
 }
 
 /*
@@ -933,7 +933,7 @@ Tk_DeleteImage(
     if (hPtr == NULL) {
 	return;
     }
-    DeleteImage(Tcl_GetHashValue(hPtr));
+    DeleteImage((ImageModel *)Tcl_GetHashValue(hPtr));
 }
 
 /*
@@ -948,7 +948,7 @@ Tk_DeleteImage(
  *
  * Side effects:
  *	The connection is dropped between instances of this image and an image
- *	master. Image instances will redisplay themselves as empty areas, but
+ *	model. Image instances will redisplay themselves as empty areas, but
  *	existing instances will not be deleted.
  *
  *----------------------------------------------------------------------
@@ -956,31 +956,31 @@ Tk_DeleteImage(
 
 static void
 DeleteImage(
-    ImageModel *masterPtr)	/* Pointer to main data structure for image. */
+    ImageModel *modelPtr)	/* Pointer to main data structure for image. */
 {
     Image *imagePtr;
     Tk_ImageType *typePtr;
 
-    typePtr = masterPtr->typePtr;
-    masterPtr->typePtr = NULL;
+    typePtr = modelPtr->typePtr;
+    modelPtr->typePtr = NULL;
     if (typePtr != NULL) {
-	for (imagePtr = masterPtr->instancePtr; imagePtr != NULL;
+	for (imagePtr = modelPtr->instancePtr; imagePtr != NULL;
 		imagePtr = imagePtr->nextPtr) {
 	    typePtr->freeProc(imagePtr->instanceData, imagePtr->display);
 	    imagePtr->changeProc(imagePtr->widgetClientData, 0, 0,
-		    masterPtr->width, masterPtr->height, masterPtr->width,
-		    masterPtr->height);
+		    modelPtr->width, modelPtr->height, modelPtr->width,
+		    modelPtr->height);
 	}
-	typePtr->deleteProc(masterPtr->masterData);
+	typePtr->deleteProc(modelPtr->modelData);
     }
-    if (masterPtr->instancePtr == NULL) {
-	if (masterPtr->hPtr != NULL) {
-	    Tcl_DeleteHashEntry(masterPtr->hPtr);
+    if (modelPtr->instancePtr == NULL) {
+	if (modelPtr->hPtr != NULL) {
+	    Tcl_DeleteHashEntry(modelPtr->hPtr);
 	}
-	Tcl_Release(masterPtr->winPtr);
-	ckfree(masterPtr);
+	Tcl_Release(modelPtr->winPtr);
+	ckfree(modelPtr);
     } else {
-	masterPtr->deleted = 1;
+	modelPtr->deleted = 1;
     }
 }
 
@@ -1004,16 +1004,16 @@ DeleteImage(
 
 static void
 EventuallyDeleteImage(
-    ImageModel *masterPtr,	/* Pointer to main data structure for image. */
+    ImageModel *modelPtr,	/* Pointer to main data structure for image. */
     int forgetImageHashNow)	/* Flag to say whether the hash table is about
 				 * to vanish. */
 {
     if (forgetImageHashNow) {
-	masterPtr->hPtr = NULL;
+	modelPtr->hPtr = NULL;
     }
-    if (!masterPtr->deleted) {
-	masterPtr->deleted = 1;
-	Tcl_EventuallyFree(masterPtr, (Tcl_FreeProc *) DeleteImage);
+    if (!modelPtr->deleted) {
+	modelPtr->deleted = 1;
+	Tcl_EventuallyFree(modelPtr, (Tcl_FreeProc *) DeleteImage);
     }
 }
 
@@ -1045,7 +1045,7 @@ TkDeleteAllImages(
 
     for (hPtr = Tcl_FirstHashEntry(&mainPtr->imageTable, &search);
 	    hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
-	EventuallyDeleteImage(Tcl_GetHashValue(hPtr), 1);
+	EventuallyDeleteImage((ImageModel *)Tcl_GetHashValue(hPtr), 1);
     }
     Tcl_DeleteHashTable(&mainPtr->imageTable);
 }
@@ -1056,7 +1056,7 @@ TkDeleteAllImages(
  * Tk_GetImageModelData --
  *
  *	Given the name of an image, this function returns the type of the
- *	image and the clientData associated with its master.
+ *	image and the clientData associated with its model.
  *
  * Results:
  *	If there is no image by the given name, then NULL is returned and a
@@ -1081,20 +1081,20 @@ Tk_GetImageModelData(
 {
     TkWindow *winPtr = (TkWindow *) Tk_MainWindow(interp);
     Tcl_HashEntry *hPtr;
-    ImageModel *masterPtr;
+    ImageModel *modelPtr;
 
     hPtr = Tcl_FindHashEntry(&winPtr->mainPtr->imageTable, name);
     if (hPtr == NULL) {
 	*typePtrPtr = NULL;
 	return NULL;
     }
-    masterPtr = Tcl_GetHashValue(hPtr);
-    if (masterPtr->deleted) {
+    modelPtr = (ImageModel *)Tcl_GetHashValue(hPtr);
+    if (modelPtr->deleted) {
 	*typePtrPtr = NULL;
 	return NULL;
     }
-    *typePtrPtr = masterPtr->typePtr;
-    return masterPtr->masterData;
+    *typePtrPtr = modelPtr->typePtr;
+    return modelPtr->modelData;
 }
 
 /*
@@ -1118,7 +1118,6 @@ Tk_GetImageModelData(
  *----------------------------------------------------------------------
  */
 
-/*ARGSUSED*/
 void
 Tk_SetTSOrigin(
     Tk_Window tkwin,
diff --git a/generic/tkImgBmap.c b/generic/tkImgBmap.c
index 8d51671..c6ab05d 100644
--- a/generic/tkImgBmap.c
+++ b/generic/tkImgBmap.c
@@ -14,7 +14,7 @@
 #include "tkInt.h"
 
 /*
- * The following data structure represents the master for a bitmap
+ * The following data structure represents the model for a bitmap
  * image:
  */
 
@@ -40,7 +40,7 @@ typedef struct BitmapModel {
     char *maskDataString;	/* Value of -maskdata option (malloc'ed). */
     struct BitmapInstance *instancePtr;
 				/* First in list of all instances associated
-				 * with this master. */
+				 * with this model. */
 } BitmapModel;
 
 /*
@@ -51,7 +51,7 @@ typedef struct BitmapModel {
 typedef struct BitmapInstance {
     int refCount;		/* Number of instances that share this data
 				 * structure. */
-    BitmapModel *modelPtr;	/* Pointer to master for image. */
+    BitmapModel *modelPtr;	/* Pointer to model for image. */
     Tk_Window tkwin;		/* Window in which the instances will be
 				 * displayed. */
     XColor *fg;			/* Foreground color for displaying image. */
@@ -322,8 +322,8 @@ ImgBmapConfigureModel(
  * ImgBmapConfigureInstance --
  *
  *	This procedure is called to create displaying information for a bitmap
- *	image instance based on the configuration information in the master.
- *	It is invoked both when new instances are created and when the master
+ *	image instance based on the configuration information in the model.
+ *	It is invoked both when new instances are created and when the model
  *	is reconfigured.
  *
  * Results:
@@ -751,7 +751,7 @@ NextBitmapWord(
 
 static int
 ImgBmapCmd(
-    ClientData clientData,	/* Information about the image master. */
+    ClientData clientData,	/* Information about the image model. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -816,10 +816,10 @@ static ClientData
 ImgBmapGet(
     Tk_Window tkwin,		/* Window in which the instance will be
 				 * used. */
-    ClientData masterData)	/* Pointer to our master structure for the
+    ClientData modelData)	/* Pointer to our model structure for the
 				 * image. */
 {
-    BitmapModel *modelPtr = masterData;
+    BitmapModel *modelPtr = modelData;
     BitmapInstance *instancePtr;
 
     /*
@@ -993,7 +993,7 @@ ImgBmapFree(
  *
  * ImgBmapDelete --
  *
- *	This procedure is called by the image code to delete the master
+ *	This procedure is called by the image code to delete the model
  *	structure for an image.
  *
  * Results:
@@ -1007,10 +1007,10 @@ ImgBmapFree(
 
 static void
 ImgBmapDelete(
-    ClientData masterData)	/* Pointer to BitmapModel structure for
+    ClientData modelData)	/* Pointer to BitmapModel structure for
 				 * image. Must not have any more instances. */
 {
-    BitmapModel *modelPtr = masterData;
+    BitmapModel *modelPtr = modelData;
 
     if (modelPtr->instancePtr != NULL) {
 	Tcl_Panic("tried to delete bitmap image when instances still exist");
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index cfca9ca..e637f8e 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -59,7 +59,7 @@ MODULE_SCOPE const TkStubs tkStubs;
 #define TkGenWMConfigureEvent_ TkGenWMConfigureEvent
 #define TkGenerateActivateEvents_ TkGenerateActivateEvents
 
-#if !defined(MAC_OSX_TK)
+#if !defined(MAC_OSX_TK) && defined(MAC_OSX_TCL)
 #   undef TkpWillDrawWidget
 #   undef TkpRedrawWidget
 static int
diff --git a/generic/ttk/ttkManager.c b/generic/ttk/ttkManager.c
index 42f1812..8cad58c 100644
--- a/generic/ttk/ttkManager.c
+++ b/generic/ttk/ttkManager.c
@@ -463,7 +463,7 @@ int Ttk_GetContentIndexFromObj(
 	return TCL_OK;
     }
 
-    /* Try interpreting as a slave window name;
+    /* Try interpreting as a window name;
      */
     if ((*string == '.') &&
 	    (tkwin = Tk_NameToWindow(interp, string, mgr->window))) {
@@ -505,28 +505,28 @@ void Ttk_ReorderContent(Ttk_Manager *mgr, int fromIndex, int toIndex)
     /* ASSERT: fromIndex == toIndex */
     mgr->content[fromIndex] = moved;
 
-    /* Schedule a relayout.  In general, rearranging slaves
+    /* Schedule a relayout.  In general, rearranging content
      * may also change the size:
      */
     ScheduleUpdate(mgr, MGR_RESIZE_REQUIRED);
 }
 
-/* ++ Ttk_Maintainable(interp, slave, container) --
+/* ++ Ttk_Maintainable(interp, window, container) --
  * 	Utility routine.  Verifies that 'container' may be used to maintain
- *	the geometry of 'slave' via Tk_MaintainGeometry:
+ *	the geometry of 'window' via Tk_MaintainGeometry:
  *
- * 	+ 'container' is either 'slave's parent -OR-
- * 	+ 'container is a descendant of 'slave's parent.
- * 	+ 'slave' is not a toplevel window
- * 	+ 'slave' belongs to the same toplevel as 'container'
+ * 	+ 'container' is either 'window's parent -OR-
+ * 	+ 'container is a descendant of 'window's parent.
+ * 	+ 'window' is not a toplevel window
+ * 	+ 'window' belongs to the same toplevel as 'container'
  *
  * Returns: 1 if OK; otherwise 0, leaving an error message in 'interp'.
  */
-int Ttk_Maintainable(Tcl_Interp *interp, Tk_Window slave, Tk_Window container)
+int Ttk_Maintainable(Tcl_Interp *interp, Tk_Window window, Tk_Window container)
 {
-    Tk_Window ancestor = container, parent = Tk_Parent(slave);
+    Tk_Window ancestor = container, parent = Tk_Parent(window);
 
-    if (Tk_IsTopLevel(slave) || slave == container) {
+    if (Tk_IsTopLevel(window) || window == container) {
 	goto badWindow;
     }
 
@@ -541,7 +541,7 @@ int Ttk_Maintainable(Tcl_Interp *interp, Tk_Window slave, Tk_Window container)
 
 badWindow:
     Tcl_SetObjResult(interp, Tcl_ObjPrintf("can't add %s as slave of %s",
-	    Tk_PathName(slave), Tk_PathName(container)));
+	    Tk_PathName(window), Tk_PathName(container)));
     Tcl_SetErrorCode(interp, "TTK", "GEOMETRY", "MAINTAINABLE", NULL);
     return 0;
 }
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c
index 9ba7ce8..8005517 100644
--- a/macosx/tkMacOSXMenu.c
+++ b/macosx/tkMacOSXMenu.c
@@ -1165,12 +1165,12 @@ CheckForSpecialMenu(
 	    cascadeEntryPtr = cascadeEntryPtr->nextCascadePtr) {
 	if (cascadeEntryPtr->menuPtr->menuType == MENUBAR
 		&& cascadeEntryPtr->menuPtr->masterMenuPtr->tkwin) {
-	    TkMenu *masterMenuPtr = cascadeEntryPtr->menuPtr->masterMenuPtr;
+	    TkMenu *mainMenuPtr = cascadeEntryPtr->menuPtr->masterMenuPtr;
 	    int i = 0;
 	    Tcl_DString ds;
 
 	    Tcl_DStringInit(&ds);
-	    Tcl_DStringAppend(&ds, Tk_PathName(masterMenuPtr->tkwin), -1);
+	    Tcl_DStringAppend(&ds, Tk_PathName(mainMenuPtr->tkwin), -1);
 	    while (specialMenus[i].name) {
 		Tcl_DStringAppend(&ds, specialMenus[i].name,
 			specialMenus[i].len);
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 3b843b9..6b7871f 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -674,7 +674,7 @@ TkWmNewWindow(
     wmPtr->reparent = None;
     wmPtr->titleUid = NULL;
     wmPtr->iconName = NULL;
-    wmPtr->master = NULL;
+    wmPtr->container = NULL;
     wmPtr->hints.flags = InputHint | StateHint;
     wmPtr->hints.input = True;
     wmPtr->hints.initial_state = NormalState;
@@ -950,7 +950,7 @@ TkWmDeadWindow(
 
     	if (containerPtr == winPtr) {
     	    wmPtr2 = winPtr2->wmInfoPtr;
-    	    wmPtr2->master = NULL;
+    	    wmPtr2->container = NULL;
     	}
     }
 
@@ -2353,7 +2353,7 @@ WmIconifyCmd(
 	Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "OVERRIDE_REDIRECT",
 		NULL);
 	return TCL_ERROR;
-    } else if (wmPtr->master != NULL) {
+    } else if (wmPtr->container != NULL) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"can't iconify \"%s\": it is a transient", winPtr->pathName));
 	Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "TRANSIENT", NULL);
@@ -3493,7 +3493,7 @@ WmStateCmd(
 			"OVERRIDE_REDIRECT", NULL);
 		return TCL_ERROR;
 	    }
-	    if (wmPtr->master != NULL) {
+	    if (wmPtr->container != NULL) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 			"can't iconify \"%s\": it is a transient",
 			winPtr->pathName));
@@ -3620,9 +3620,9 @@ WmTransientCmd(
 	return TCL_ERROR;
     }
     if (objc == 3) {
-	if (wmPtr->master != NULL) {
+	if (wmPtr->container != NULL) {
 	    Tcl_SetObjResult(interp,
-		Tcl_NewStringObj(Tk_PathName(wmPtr->master), -1));
+		Tcl_NewStringObj(Tk_PathName(wmPtr->container), -1));
 	}
 	return TCL_OK;
     }
@@ -3665,7 +3665,7 @@ WmTransientCmd(
 	}
 
 	for (w = containerPtr; w != NULL && w->wmInfoPtr != NULL;
-		w = (TkWindow *)w->wmInfoPtr->master) {
+		w = (TkWindow *)w->wmInfoPtr->container) {
 	    if (w == winPtr) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "setting \"%s\" as master creates a transient/master cycle",
@@ -3701,7 +3701,7 @@ WmTransientCmd(
 	    transient->flags |= WITHDRAWN_BY_CONTAINER;
 	}
 
-	wmPtr->master = (Tk_Window)containerPtr;
+	wmPtr->container = (Tk_Window)containerPtr;
     }
     ApplyContainerOverrideChanges(winPtr, NULL);
     return TCL_OK;
@@ -3734,15 +3734,15 @@ RemoveTransient(
     TkWindow *containerPtr;
     Transient *transPtr, *temp;
 
-    if (wmPtr == NULL || wmPtr->master == NULL) {
+    if (wmPtr == NULL || wmPtr->container == NULL) {
 	return;
     }
-    containerPtr = (TkWindow *)wmPtr->master;
+    containerPtr = (TkWindow *)wmPtr->container;
     wmPtr2 = containerPtr->wmInfoPtr;
     if (wmPtr2 == NULL) {
 	return;
     }
-    wmPtr->master= NULL;
+    wmPtr->container= NULL;
     transPtr = wmPtr2->transientPtr;
     while (transPtr != NULL) {
 	if (transPtr->winPtr != winPtr) {
@@ -5375,7 +5375,7 @@ TkGetTransientMaster(
     TkWindow *winPtr)
 {
     if (winPtr->wmInfoPtr != NULL) {
-	return (Tk_Window)winPtr->wmInfoPtr->master;
+	return (Tk_Window)winPtr->wmInfoPtr->container;
     }
     return NULL;
 }
@@ -6647,7 +6647,7 @@ TkMacOSXApplyWindowAttributes(
     WmInfo *wmPtr = winPtr->wmInfoPtr;
 
     ApplyWindowAttributeFlagChanges(winPtr, macWindow, 0, 0, 0, 1);
-    if (wmPtr->master != NULL || winPtr->atts.override_redirect) {
+    if (wmPtr->container != NULL || winPtr->atts.override_redirect) {
 	ApplyContainerOverrideChanges(winPtr, macWindow);
     }
 }
@@ -6781,7 +6781,7 @@ ApplyWindowAttributeFlagChanges(
 		 */
 
 		if ((winPtr->atts.override_redirect) ||
-			(wmPtr->master != NULL) ||
+			(wmPtr->container != NULL) ||
 			(winPtr->wmInfoPtr->macClass == kHelpWindowClass)) {
 		    b |= (NSWindowCollectionBehaviorCanJoinAllSpaces |
 			    NSWindowCollectionBehaviorFullScreenAuxiliary);
@@ -6923,7 +6923,7 @@ ApplyContainerOverrideChanges(
 	    if (wmPtr->hints.initial_state == NormalState) {
 		[macWindow orderFront:nil];
 	    }
-	    if (wmPtr->master != NULL) {
+	    if (wmPtr->container != NULL) {
 		wmPtr->flags |= WM_TOPMOST;
 	    } else {
 		wmPtr->flags &= ~WM_TOPMOST;
@@ -6939,8 +6939,8 @@ ApplyContainerOverrideChanges(
 	    [macWindow setExcludedFromWindowsMenu:NO];
 	    wmPtr->flags &= ~WM_TOPMOST;
 	}
-	if (wmPtr->master != None) {
-	    TkWindow *containerWinPtr = (TkWindow *)wmPtr->master;
+	if (wmPtr->container != None) {
+	    TkWindow *containerWinPtr = (TkWindow *)wmPtr->container;
 
 	    if (containerWinPtr && (containerWinPtr->window != None)
 		    && TkMacOSXHostToplevelExists(containerWinPtr)) {
diff --git a/macosx/tkMacOSXWm.h b/macosx/tkMacOSXWm.h
index 6696b05..19bf379 100644
--- a/macosx/tkMacOSXWm.h
+++ b/macosx/tkMacOSXWm.h
@@ -66,7 +66,7 @@ typedef struct TkWmInfo {
     Tk_Uid titleUid;		/* Title to display in window caption. If NULL,
 				 * use name of widget. */
     char *iconName;		/* Name to display in icon. */
-    Tk_Window master;		/* Container window for TRANSIENT_FOR property,
+    Tk_Window container;		/* Container window for TRANSIENT_FOR property,
 				 * or None. */
     XWMHints hints;		/* Various pieces of information for window
 				 * manager. */
diff --git a/tests/focus.test b/tests/focus.test
index 3d9d7c3..7ce2df1 100644
--- a/tests/focus.test
+++ b/tests/focus.test
@@ -624,7 +624,7 @@ fixfocus
 test focus-6.1 {miscellaneous - embedded application in same process} -constraints {
     unix  testwrapper
 } -setup {
-    eval interp delete [interp children]
+    eval interp delete [interp slaves]
 } -body {
     toplevel .t
     wm geometry .t +0+0
diff --git a/tests/safe.test b/tests/safe.test
index a31e029..5a2cd26 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -199,7 +199,7 @@ test safe-5.1 {loading Tk in safe interps without parent's clearance} -body {
     interp eval $i {load {} Tk}
 } -cleanup {
     safe::interpDelete $i
-} -returnCodes error -result {load of binary library for package Tk failed: not allowed}
+} -returnCodes error -match glob -result {*not allowed}
 test safe-5.2 {multi-level Tk loading with clearance} -setup {
     set safeParent [safe::interpCreate]
 } -body {
diff --git a/tests/ttk/combobox.test b/tests/ttk/combobox.test
index 45fe0fc..c14db9b 100644
--- a/tests/ttk/combobox.test
+++ b/tests/ttk/combobox.test
@@ -38,18 +38,18 @@ test combobox-2.3 "current -- change value" -body {
     .cb current
 } -result 1
 
-test combobox-2.4 "current -- value not in list" -body { 
+test combobox-2.4 "current -- value not in list" -body {
     .cb set "z"
     .cb current
 } -result -1
 
-test combobox-2.5 "current -- set to end index" -body { 
+test combobox-2.5 "current -- set to end index" -body {
     .cb configure -values [list a b c d e thelastone]
     .cb current end
     .cb get
 } -result thelastone
 
-test combobox-2.6 "current -- set to unknown index" -body { 
+test combobox-2.6 "current -- set to unknown index" -body {
     .cb configure -values [list a b c d e]
     .cb current notanindex
 } -returnCodes error -result {Incorrect index notanindex}
@@ -58,7 +58,7 @@ test combobox-2.end "Cleanup" -body { destroy .cb }
 
 test combobox-3 "Read postoffset value dynamically from current style" -body {
     ttk::combobox .cb -values [list a b c] -style "DerivedStyle.TCombobox"
-    pack .cb -expand true -fill both 
+    pack .cb -expand true -fill both
     ttk::style configure DerivedStyle.TCombobox -postoffset [list 25 0 0 0]
     ttk::combobox::Post .cb
     expr {[winfo rootx .cb.popdown] - [winfo rootx .cb]}
diff --git a/tests/ttk/image.test b/tests/ttk/image.test
index a55f7f8..5e48d5c 100644
--- a/tests/ttk/image.test
+++ b/tests/ttk/image.test
@@ -23,7 +23,7 @@ test image-2.0 "Deletion of displayed image (label)" -setup {
 } -cleanup {
     destroy .ttk_image20
 } -result {}
-    
+
 test image-2.1 "Deletion of displayed image (checkbutton)" -setup {
      image create photo test.image -width 10 -height 10
 } -body {
diff --git a/tests/ttk/panedwindow.test b/tests/ttk/panedwindow.test
index f72ffb8..ad2865c 100644
--- a/tests/ttk/panedwindow.test
+++ b/tests/ttk/panedwindow.test
@@ -110,8 +110,8 @@ test panedwindow-2.end "Cleanup" -body { destroy .pw }
 #
 test panedwindow-3.0 "configure pane" -body {
     ttk::panedwindow .pw
-    .pw add [listbox .pw.lb1] 
-    .pw add [listbox .pw.lb2] 
+    .pw add [listbox .pw.lb1]
+    .pw add [listbox .pw.lb2]
     .pw pane 1 -weight 2
     .pw pane 1 -weight
 } -result 2
@@ -253,7 +253,7 @@ test paned-propagation-setup "Setup." -body {
     frame .pw.f2 -width 100 -height 50
 
     list [winfo reqwidth .pw.f1] [winfo reqheight .pw.f1]
-} -result [list 100 50] 
+} -result [list 100 50]
 
 test paned-propagation-1 "Initial request size" -body {
     .pw add .pw.f1
diff --git a/tests/ttk/scrollbar.test b/tests/ttk/scrollbar.test
index 903328e..0743def 100644
--- a/tests/ttk/scrollbar.test
+++ b/tests/ttk/scrollbar.test
@@ -18,8 +18,8 @@ test scrollbar-swapout-1 "Don't use core scrollbars on OSX..." \
 } -body {
     ttk::scrollbar .sb -command "yadda"
     list [winfo class .sb] [.sb cget -command]
-} -result [list TScrollbar yadda] -cleanup { 
-    destroy .sb 
+} -result [list TScrollbar yadda] -cleanup {
+    destroy .sb
 }
 
 test scrollbar-swapout-2 "... regardless of whether -style ..." \
@@ -28,7 +28,7 @@ test scrollbar-swapout-2 "... regardless of whether -style ..." \
 } -body {
     ttk::style layout Vertical.Custom.TScrollbar \
     	[ttk::style layout Vertical.TScrollbar] ; # See #1833339
-    ttk::scrollbar .sb -command "yadda" -style Custom.TScrollbar 
+    ttk::scrollbar .sb -command "yadda" -style Custom.TScrollbar
     list [winfo class .sb] [.sb cget -command] [.sb cget -style]
 } -result [list TScrollbar yadda Custom.TScrollbar] -cleanup {
     destroy .sb
@@ -37,7 +37,7 @@ test scrollbar-swapout-2 "... regardless of whether -style ..." \
 test scrollbar-swapout-3 "... or -class is specified." -constraints {
     coreScrollbar
 } -body {
-    ttk::scrollbar .sb -command "yadda" -class Custom.TScrollbar 
+    ttk::scrollbar .sb -command "yadda" -class Custom.TScrollbar
     list [winfo class .sb] [.sb cget -command]
 } -result [list Custom.TScrollbar yadda] -cleanup {
     destroy .sb
diff --git a/tests/ttk/treetags.test b/tests/ttk/treetags.test
index 7f26e2f..f91673f 100644
--- a/tests/ttk/treetags.test
+++ b/tests/ttk/treetags.test
@@ -105,7 +105,7 @@ test treetags-1.8 "tag names" -body {
 } -result [list tag1 tag2 tag3]
 
 test treetags-1.9 "tag names - tag added to item" -body {
-    $tv item item1 -tags tag4 
+    $tv item item1 -tags tag4
     lsort [$tv tag names]
 } -result [list tag1 tag2 tag3 tag4]
 
@@ -201,12 +201,12 @@ test treetags-3.4 "stomp tags in tag binding procedure" -body {
     set result [list]
     $tv tag bind rm1 <<Remove>> { lappend ::result rm1 [%W focus] <<Remove>> }
     $tv tag bind rm2 <<Remove>> {
-    	lappend ::result rm2 [%W focus] <<Remove>> 
+    	lappend ::result rm2 [%W focus] <<Remove>>
 	%W item [%W focus] -tags {tag1}
     }
     $tv tag bind rm3 <<Remove>> { lappend ::result rm3 [%W focus] <<Remove>> }
 
-    $tv item item1 -tags {rm1 rm2 rm3} 
+    $tv item item1 -tags {rm1 rm2 rm3}
     $tv focus item1
     event generate $tv <<Remove>>
     set result
diff --git a/tests/ttk/treeview.test b/tests/ttk/treeview.test
index 0ad0443..f068243 100644
--- a/tests/ttk/treeview.test
+++ b/tests/ttk/treeview.test
@@ -729,7 +729,7 @@ test treeview-3085489-2 "tag remove, no -tags" -setup {
 
 test treeview-368fa4561e "indicators cannot be clicked on leafs" -setup {
     pack [ttk::treeview .tv]
-    .tv insert {} end -id foo -text "<-- (1) Click the blank space to my left" 
+    .tv insert {} end -id foo -text "<-- (1) Click the blank space to my left"
     update
 } -body {
     foreach {x y w h} [.tv bbox foo #0] {}
@@ -748,7 +748,7 @@ test treeview-368fa4561e "indicators cannot be clicked on leafs" -setup {
 
 test treeview-ce470f20fd-1 "dragging further than the right edge of the treeview is allowed" -setup {
     pack [ttk::treeview .tv]
-    .tv heading #0 -text "Drag my right edge -->" 
+    .tv heading #0 -text "Drag my right edge -->"
     update
 } -body {
     set res [.tv column #0 -width]
@@ -818,7 +818,7 @@ test treeview-ce470f20fd-4 "changing -stretch resizes columns" -setup {
     update idletasks ; # redisplay treeview
 } -body {
     # only some columns are displayed (and in a different order than declared
-    # in -columns), a non-displayed column becomes stretchable  --> nothing 
+    # in -columns), a non-displayed column becomes stretchable  --> nothing
     # happens
     set origTreeWidth [winfo width .tv]
     set res [list [.tv column bar -width] [.tv column colA -width]]
diff --git a/tests/ttk/ttk.test b/tests/ttk/ttk.test
index aba3eba..eb320e9 100644
--- a/tests/ttk/ttk.test
+++ b/tests/ttk/ttk.test
@@ -207,7 +207,7 @@ test ttk-2.8 "bug 3223850: button state disabled during click" -setup {
     set ttk28 {}
     pack [ttk::button .b -command {set ::ttk28 failed}]
     update
-} -body { 
+} -body {
     bind .b <ButtonPress-1> {after 0 {.b configure -state disabled}}
     after 1 {event generate .b <ButtonPress-1>}
     after 20 {event generate .b <ButtonRelease-1>}
diff --git a/tests/ttk/validate.test b/tests/ttk/validate.test
index 417deac..5755943 100644
--- a/tests/ttk/validate.test
+++ b/tests/ttk/validate.test
@@ -161,7 +161,7 @@ test validate-1.18 {entry widget validation} -constraints coreEntry -body {
     list [.e cget -validate] $::vVals
 } -result {none {.e -1 -1 nextdata newdata {} all forced}}
 # DIFFERENCE: ttk::entry doesn't validate when setting linked -variable
-# DIFFERENCE: ttk::entry doesn't disable validation 
+# DIFFERENCE: ttk::entry doesn't disable validation
 
 proc doval {W d i P s S v V} {
     set ::vVals [list $W $d $i $P $s $S $v $V]
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 0fbfb5d..86ea005 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -1531,7 +1531,7 @@ rpm: all
 
 #
 # Target to create a proper Tk distribution from information in the
-# master source directory.  DISTDIR must be defined to indicate where
+# source directory.  DISTDIR must be defined to indicate where
 # to put the distribution.  DISTDIR must be an absolute path name.
 #
 
diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c
index 2c9e9dd..00893f2 100644
--- a/unix/tkUnixWm.c
+++ b/unix/tkUnixWm.c
@@ -82,7 +82,7 @@ typedef struct TkWmInfo {
 				 * (corresponds to hints.window_group).
 				 * Malloc-ed. Note: this field doesn't get
 				 * updated if leader is destroyed. */
-    TkWindow *masterPtr;	/* Master window for TRANSIENT_FOR property,
+    TkWindow *containerPtr;	/* Container window for TRANSIENT_FOR property,
 				 * or NULL. */
     Tk_Window icon;		/* Window to use as icon for this window, or
 				 * NULL. */
@@ -259,7 +259,7 @@ typedef struct TkWmInfo {
  *				window (controlled by "wm resizable" command).
  * WM_WITHDRAWN -		non-zero means that this window has explicitly
  *				been withdrawn. If it's a transient, it should
- *				not mirror state changes in the master.
+ *				not mirror state changes in the container.
  */
 
 #define WM_NEVER_MAPPED			1
@@ -571,7 +571,7 @@ TkWmNewWindow(
     memset(wmPtr, 0, sizeof(WmInfo));
     wmPtr->winPtr = winPtr;
     wmPtr->reparent = None;
-    wmPtr->masterPtr = NULL;
+    wmPtr->containerPtr = NULL;
     wmPtr->numTransients = 0;
     wmPtr->hints.flags = InputHint | StateHint;
     wmPtr->hints.input = True;
@@ -684,12 +684,12 @@ TkWmMapWindow(
 	UpdateTitle(winPtr);
 	UpdatePhotoIcon(winPtr);
 
-	if (wmPtr->masterPtr != NULL) {
+	if (wmPtr->containerPtr != NULL) {
 	    /*
-	     * Don't map a transient if the master is not mapped.
+	     * Don't map a transient if the container is not mapped.
 	     */
 
-	    if (!Tk_IsMapped(wmPtr->masterPtr)) {
+	    if (!Tk_IsMapped(wmPtr->containerPtr)) {
 		wmPtr->withdrawn = 1;
 		wmPtr->hints.initial_state = WithdrawnState;
 	    }
@@ -700,7 +700,7 @@ TkWmMapWindow(
 	     */
 
 	    XSetTransientForHint(winPtr->display, wmPtr->wrapperPtr->window,
-		    wmPtr->masterPtr->wmInfoPtr->wrapperPtr->window);
+		    wmPtr->containerPtr->wmInfoPtr->wrapperPtr->window);
 	}
 
 	wmPtr->flags |= WM_UPDATE_SIZE_HINTS;
@@ -909,16 +909,16 @@ TkWmDeadWindow(
     }
 
     /*
-     * Reset all transient windows whose master is the dead window.
+     * Reset all transient windows whose container is the dead window.
      */
 
     for (wmPtr2 = winPtr->dispPtr->firstWmPtr; wmPtr2 != NULL;
 	    wmPtr2 = wmPtr2->nextPtr) {
-	if (wmPtr2->masterPtr == winPtr) {
+	if (wmPtr2->containerPtr == winPtr) {
 	    wmPtr->numTransients--;
-	    Tk_DeleteEventHandler((Tk_Window) wmPtr2->masterPtr,
+	    Tk_DeleteEventHandler((Tk_Window) wmPtr2->containerPtr,
 		    StructureNotifyMask, WmWaitMapProc, wmPtr2->winPtr);
-	    wmPtr2->masterPtr = NULL;
+	    wmPtr2->containerPtr = NULL;
 	    if (!(wmPtr2->flags & WM_NEVER_MAPPED)) {
 		XDeleteProperty(winPtr->display, wmPtr2->wrapperPtr->window,
 			Tk_InternAtom((Tk_Window) winPtr, "WM_TRANSIENT_FOR"));
@@ -933,19 +933,19 @@ TkWmDeadWindow(
     }
     /* ASSERT: numTransients == 0 [Bug 1789819] */
 
-    if (wmPtr->masterPtr != NULL) {
-	wmPtr2 = wmPtr->masterPtr->wmInfoPtr;
+    if (wmPtr->containerPtr != NULL) {
+	wmPtr2 = wmPtr->containerPtr->wmInfoPtr;
 
 	/*
-	 * If we had a master, tell them that we aren't tied to them anymore
+	 * If we had a container, tell them that we aren't tied to them anymore
 	 */
 
 	if (wmPtr2 != NULL) {
 	    wmPtr2->numTransients--;
 	}
-	Tk_DeleteEventHandler((Tk_Window) wmPtr->masterPtr,
+	Tk_DeleteEventHandler((Tk_Window) wmPtr->containerPtr,
 		StructureNotifyMask, WmWaitMapProc, winPtr);
-	wmPtr->masterPtr = NULL;
+	wmPtr->containerPtr = NULL;
     }
     ckfree(wmPtr);
     winPtr->wmInfoPtr = NULL;
@@ -2220,7 +2220,7 @@ WmIconifyCmd(
 		NULL);
 	return TCL_ERROR;
     }
-    if (wmPtr->masterPtr != NULL) {
+    if (wmPtr->containerPtr != NULL) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"can't iconify \"%s\": it is a transient",
 		winPtr->pathName));
@@ -3408,7 +3408,7 @@ WmStateCmd(
 			"OVERRIDE_REDIRECT", NULL);
 		return TCL_ERROR;
 	    }
-	    if (wmPtr->masterPtr != NULL) {
+	    if (wmPtr->containerPtr != NULL) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 			"can't iconify \"%s\": it is a transient",
 			winPtr->pathName));
@@ -3532,7 +3532,7 @@ WmTransientCmd(
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     register WmInfo *wmPtr = winPtr->wmInfoPtr;
-    TkWindow *masterPtr = wmPtr->masterPtr, *w;
+    TkWindow *containerPtr = wmPtr->containerPtr, *w;
     WmInfo *wmPtr2;
 
     if ((objc != 3) && (objc != 4)) {
@@ -3540,20 +3540,20 @@ WmTransientCmd(
 	return TCL_ERROR;
     }
     if (objc == 3) {
-	if (masterPtr != NULL) {
-	    Tcl_SetObjResult(interp, TkNewWindowObj((Tk_Window) masterPtr));
+	if (containerPtr != NULL) {
+	    Tcl_SetObjResult(interp, TkNewWindowObj((Tk_Window) containerPtr));
 	}
 	return TCL_OK;
     }
     if (Tcl_GetString(objv[3])[0] == '\0') {
-	if (masterPtr != NULL) {
+	if (containerPtr != NULL) {
 	    /*
-	     * If we had a master, tell them that we aren't tied to them
+	     * If we had a container, tell them that we aren't tied to them
 	     * anymore
 	     */
 
-	    masterPtr->wmInfoPtr->numTransients--;
-	    Tk_DeleteEventHandler((Tk_Window) masterPtr, StructureNotifyMask,
+	    containerPtr->wmInfoPtr->numTransients--;
+	    Tk_DeleteEventHandler((Tk_Window) containerPtr, StructureNotifyMask,
 		    WmWaitMapProc, winPtr);
 
 	    /*
@@ -3563,22 +3563,22 @@ WmTransientCmd(
 	     */
 	}
 
-	wmPtr->masterPtr = NULL;
+	wmPtr->containerPtr = NULL;
     } else {
-	Tk_Window masterWin;
+	Tk_Window container;
 
-	if (TkGetWindowFromObj(interp, tkwin, objv[3], &masterWin)!=TCL_OK) {
+	if (TkGetWindowFromObj(interp, tkwin, objv[3], &container)!=TCL_OK) {
 	    return TCL_ERROR;
 	}
-	masterPtr = (TkWindow *) masterWin;
-	while (!Tk_TopWinHierarchy(masterPtr)) {
+	containerPtr = (TkWindow *) container;
+	while (!Tk_TopWinHierarchy(containerPtr)) {
 	    /*
-	     * Ensure that the master window is actually a Tk toplevel.
+	     * Ensure that the container window is actually a Tk toplevel.
 	     */
 
-	    masterPtr = masterPtr->parentPtr;
+	    containerPtr = containerPtr->parentPtr;
 	}
-	Tk_MakeWindowExist((Tk_Window) masterPtr);
+	Tk_MakeWindowExist((Tk_Window) containerPtr);
 
 	if (wmPtr->iconFor != NULL) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
@@ -3588,7 +3588,7 @@ WmTransientCmd(
 	    return TCL_ERROR;
 	}
 
-	wmPtr2 = masterPtr->wmInfoPtr;
+	wmPtr2 = containerPtr->wmInfoPtr;
 	if (wmPtr2->wrapperPtr == NULL) {
 	    CreateWrapper(wmPtr2);
 	}
@@ -3601,39 +3601,39 @@ WmTransientCmd(
 	    return TCL_ERROR;
 	}
 
-	for (w = masterPtr; w != NULL && w->wmInfoPtr != NULL;
-	     w = (TkWindow *)w->wmInfoPtr->masterPtr) {
+	for (w = containerPtr; w != NULL && w->wmInfoPtr != NULL;
+	     w = (TkWindow *)w->wmInfoPtr->containerPtr) {
 	    if (w == winPtr) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "setting \"%s\" as master creates a transient/master cycle",
-		    Tk_PathName(masterPtr)));
+		    Tk_PathName(containerPtr)));
 		Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "SELF", NULL);
 		return TCL_ERROR;
 	    }
 	}
 
-	if (masterPtr != wmPtr->masterPtr) {
+	if (containerPtr != wmPtr->containerPtr) {
 	    /*
-	     * Remove old master map/unmap binding before setting the new
-	     * master. The event handler will ensure that transient states
-	     * reflect the state of the master.
+	     * Remove old container map/unmap binding before setting the new
+	     * container. The event handler will ensure that transient states
+	     * reflect the state of the container.
 	     */
 
-	    if (wmPtr->masterPtr != NULL) {
-		wmPtr->masterPtr->wmInfoPtr->numTransients--;
-		Tk_DeleteEventHandler((Tk_Window) wmPtr->masterPtr,
+	    if (wmPtr->containerPtr != NULL) {
+		wmPtr->containerPtr->wmInfoPtr->numTransients--;
+		Tk_DeleteEventHandler((Tk_Window) wmPtr->containerPtr,
 			StructureNotifyMask, WmWaitMapProc, winPtr);
 	    }
 
-	    masterPtr->wmInfoPtr->numTransients++;
-	    Tk_CreateEventHandler((Tk_Window) masterPtr,
+	    containerPtr->wmInfoPtr->numTransients++;
+	    Tk_CreateEventHandler((Tk_Window) containerPtr,
 		    StructureNotifyMask, WmWaitMapProc, winPtr);
 
-	    wmPtr->masterPtr = masterPtr;
+	    wmPtr->containerPtr = containerPtr;
 	}
     }
     if (!(wmPtr->flags & WM_NEVER_MAPPED)) {
-	if (wmPtr->masterPtr != NULL && !Tk_IsMapped(wmPtr->masterPtr)) {
+	if (wmPtr->containerPtr != NULL && !Tk_IsMapped(wmPtr->containerPtr)) {
 	    if (TkpWmSetState(winPtr, WithdrawnState) == 0) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			"couldn't send withdraw message to window manager",
@@ -3642,10 +3642,10 @@ WmTransientCmd(
 		return TCL_ERROR;
 	    }
 	} else {
-	    if (wmPtr->masterPtr != NULL) {
+	    if (wmPtr->containerPtr != NULL) {
 		XSetTransientForHint(winPtr->display,
 			wmPtr->wrapperPtr->window,
-			wmPtr->masterPtr->wmInfoPtr->wrapperPtr->window);
+			wmPtr->containerPtr->wmInfoPtr->wrapperPtr->window);
 	    } else {
 		XDeleteProperty(winPtr->display, wmPtr->wrapperPtr->window,
 			Tk_InternAtom((Tk_Window) winPtr,"WM_TRANSIENT_FOR"));
@@ -3721,7 +3721,7 @@ WmUpdateGeom(
 
 /*
  * Invoked when a MapNotify or UnmapNotify event is delivered for a toplevel
- * that is the master of a transient toplevel.
+ * that is the container of a transient toplevel.
  */
 
 static void
@@ -3730,9 +3730,9 @@ WmWaitMapProc(
     XEvent *eventPtr)		/* Information about event. */
 {
     TkWindow *winPtr = clientData;
-    TkWindow *masterPtr = winPtr->wmInfoPtr->masterPtr;
+    TkWindow *containerPtr = winPtr->wmInfoPtr->containerPtr;
 
-    if (masterPtr == NULL) {
+    if (containerPtr == NULL) {
 	return;
     }
 
diff --git a/win/Makefile.in b/win/Makefile.in
index 43f9c81..c561f61 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -140,9 +140,9 @@ SHARED_LIBRARIES 	= $(TK_DLL_FILE) $(TK_STUB_LIB_FILE)
 STATIC_LIBRARIES	= $(TK_LIB_FILE)
 
 WISH			= wish$(VER)${EXESUFFIX}
-TKTEST			= tktest${EXEEXT}
-CAT32			= cat32$(EXEEXT)
-MAN2TCL			= man2tcl$(EXEEXT)
+TKTEST			= tktest.exe
+CAT32			= cat32.exe
+MAN2TCL			= man2tcl.exe
 
 @SET_MAKE@
 
@@ -184,7 +184,6 @@ CPPFLAGS	= @CPPFLAGS@
 LDFLAGS		= @LDFLAGS@ @LDFLAGS_DEFAULT@
 LDFLAGS_CONSOLE	= @LDFLAGS_CONSOLE@
 LDFLAGS_WINDOW	= @LDFLAGS_WINDOW@
-EXEEXT		= @EXEEXT@
 OBJEXT		= @OBJEXT@
 STLIB_LD	= @STLIB_LD@
 SHLIB_LD	= @SHLIB_LD@
@@ -706,7 +705,7 @@ tkWindow.$(OBJEXT): configure Makefile
 depend:
 
 cleanhelp:
-	$(RM) *.hlp *.cnt *.hpj *.GID *.rtf man2tcl${EXEEXT}
+	$(RM) *.hlp *.cnt *.hpj *.GID *.rtf man2tcl.exe
 
 clean: cleanhelp
 	$(RM) *.lib *.a *.exp *.dll *.res *.${OBJEXT} *~ \#* TAGS a.out
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index f7ba611..923a58f 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.c
@@ -177,7 +177,7 @@ typedef struct TkWmInfo {
 				 * (corresponds to hints.window_group).
 				 * Malloc-ed. Note: this field doesn't get
 				 * updated if leader is destroyed. */
-    TkWindow *masterPtr;	/* Master window for TRANSIENT_FOR property,
+    TkWindow *containerPtr;	/* Container window for TRANSIENT_FOR property,
 				 * or NULL. */
     Tk_Window icon;		/* Window to use as icon for this window, or
 				 * NULL. */
@@ -315,7 +315,7 @@ typedef struct TkWmInfo {
  *				window (controlled by "wm resizable" command).
  * WM_WITHDRAWN -		Non-zero means that this window has explicitly
  *				been withdrawn. If it's a transient, it should
- *				not mirror state changes in the master.
+ *				not mirror state changes in the container.
  * WM_FULLSCREEN -		Non-zero means that this window has been placed
  *				in the full screen mode. It should be mapped at
  *				0,0 and be the width and height of the screen.
@@ -2054,7 +2054,7 @@ UpdateWrapper(
 	     */
 
 	    parentHWND = GetDesktopWindow();
-	    if (wmPtr->masterPtr) {
+	    if (wmPtr->containerPtr) {
 		wmPtr->style |= WS_CHILD;
 	    } else {
 		wmPtr->style |= WS_POPUP;
@@ -2062,10 +2062,10 @@ UpdateWrapper(
 	} else if (wmPtr->flags & WM_FULLSCREEN) {
 	    wmPtr->style = WM_FULLSCREEN_STYLE;
 	    wmPtr->exStyle = EX_FULLSCREEN_STYLE;
-	} else if (wmPtr->masterPtr) {
+	} else if (wmPtr->containerPtr) {
 	    wmPtr->style = WM_TRANSIENT_STYLE;
 	    wmPtr->exStyle = EX_TRANSIENT_STYLE;
-	    parentHWND = Tk_GetHWND(Tk_WindowId(wmPtr->masterPtr));
+	    parentHWND = Tk_GetHWND(Tk_WindowId(wmPtr->containerPtr));
 	    if (! ((wmPtr->flags & WM_WIDTH_NOT_RESIZABLE)
 		    && (wmPtr->flags & WM_HEIGHT_NOT_RESIZABLE))) {
 		wmPtr->style |= WS_THICKFRAME;
@@ -2204,7 +2204,7 @@ UpdateWrapper(
 	if (wmPtr->numTransients > 0) {
 	    /*
 	     * Unset the current wrapper as the parent for all transient
-	     * children for whom this is the master
+	     * children for whom this is the container
 	     */
 
 	    WmInfo *wmPtr2;
@@ -2213,7 +2213,7 @@ UpdateWrapper(
 	    state = 0;
 	    for (wmPtr2 = winPtr->dispPtr->firstWmPtr; wmPtr2 != NULL;
 		    wmPtr2 = wmPtr2->nextPtr) {
-		if (wmPtr2->masterPtr == winPtr
+		if (wmPtr2->containerPtr == winPtr
 			&& !(wmPtr2->flags & WM_NEVER_MAPPED)) {
 		    childStateInfo[state++] = wmPtr2->hints.initial_state;
 		    SetParent(TkWinGetHWND(wmPtr2->winPtr->window), NULL);
@@ -2292,7 +2292,7 @@ UpdateWrapper(
     if (childStateInfo) {
 	if (wmPtr->numTransients > 0) {
 	    /*
-	     * Reset all transient children for whom this is the master.
+	     * Reset all transient children for whom this is the container.
 	     */
 
 	    WmInfo *wmPtr2;
@@ -2300,7 +2300,7 @@ UpdateWrapper(
 	    state = 0;
 	    for (wmPtr2 = winPtr->dispPtr->firstWmPtr; wmPtr2 != NULL;
 		    wmPtr2 = wmPtr2->nextPtr) {
-		if (wmPtr2->masterPtr == winPtr
+		if (wmPtr2->containerPtr == winPtr
 			&& !(wmPtr2->flags & WM_NEVER_MAPPED)) {
 		    UpdateWrapper(wmPtr2->winPtr);
 		    TkpWmSetState(wmPtr2->winPtr, childStateInfo[state++]);
@@ -2365,10 +2365,10 @@ TkWmMapWindow(
 
     if (wmPtr->flags & WM_NEVER_MAPPED) {
 	/*
-	 * Don't map a transient if the master is not mapped.
+	 * Don't map a transient if the container is not mapped.
 	 */
 
-	if (wmPtr->masterPtr != NULL && !Tk_IsMapped(wmPtr->masterPtr)) {
+	if (wmPtr->containerPtr != NULL && !Tk_IsMapped(wmPtr->containerPtr)) {
 	    wmPtr->hints.initial_state = WithdrawnState;
 	    return;
 	}
@@ -2610,17 +2610,17 @@ TkWmDeadWindow(
     }
 
     /*
-     * Reset all transient windows whose master is the dead window.
+     * Reset all transient windows whose container is the dead window.
      */
 
     for (wmPtr2 = winPtr->dispPtr->firstWmPtr; wmPtr2 != NULL;
 	 wmPtr2 = wmPtr2->nextPtr) {
-	if (wmPtr2->masterPtr == winPtr) {
+	if (wmPtr2->containerPtr == winPtr) {
 	    wmPtr->numTransients--;
-	    Tk_DeleteEventHandler((Tk_Window) wmPtr2->masterPtr,
+	    Tk_DeleteEventHandler((Tk_Window) wmPtr2->containerPtr,
 		    VisibilityChangeMask|StructureNotifyMask,
 		    WmWaitVisibilityOrMapProc, wmPtr2->winPtr);
-	    wmPtr2->masterPtr = NULL;
+	    wmPtr2->containerPtr = NULL;
 	    if ((wmPtr2->wrapper != NULL)
 		    && !(wmPtr2->flags & (WM_NEVER_MAPPED))) {
 		UpdateWrapper(wmPtr2->winPtr);
@@ -2670,20 +2670,20 @@ TkWmDeadWindow(
     if (wmPtr->flags & WM_UPDATE_PENDING) {
 	Tcl_CancelIdleCall(UpdateGeometryInfo, winPtr);
     }
-    if (wmPtr->masterPtr != NULL) {
-	wmPtr2 = wmPtr->masterPtr->wmInfoPtr;
+    if (wmPtr->containerPtr != NULL) {
+	wmPtr2 = wmPtr->containerPtr->wmInfoPtr;
 
 	/*
-	 * If we had a master, tell them that we aren't tied to them anymore.
+	 * If we had a container, tell them that we aren't tied to them anymore.
 	 */
 
 	if (wmPtr2 != NULL) {
 	    wmPtr2->numTransients--;
 	}
-	Tk_DeleteEventHandler((Tk_Window) wmPtr->masterPtr,
+	Tk_DeleteEventHandler((Tk_Window) wmPtr->containerPtr,
 		VisibilityChangeMask|StructureNotifyMask,
 		WmWaitVisibilityOrMapProc, winPtr);
-	wmPtr->masterPtr = NULL;
+	wmPtr->containerPtr = NULL;
     }
     if (wmPtr->crefObj != NULL) {
 	Tcl_DecrRefCount(wmPtr->crefObj);
@@ -4154,7 +4154,7 @@ WmIconifyCmd(
 		NULL);
 	return TCL_ERROR;
     }
-    if (wmPtr->masterPtr != NULL) {
+    if (wmPtr->containerPtr != NULL) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"can't iconify \"%s\": it is a transient",
 		winPtr->pathName));
@@ -5403,7 +5403,7 @@ WmStateCmd(
 			"OVERRIDE_REDIRECT", NULL);
 		return TCL_ERROR;
 	    }
-	    if (wmPtr->masterPtr != NULL) {
+	    if (wmPtr->containerPtr != NULL) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 			"can't iconify \"%s\": it is a transient",
 			winPtr->pathName));
@@ -5549,7 +5549,7 @@ WmTransientCmd(
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     WmInfo *wmPtr = winPtr->wmInfoPtr;
-    TkWindow *masterPtr = wmPtr->masterPtr, **masterPtrPtr = &masterPtr, *w;
+    TkWindow *containerPtr = wmPtr->containerPtr, **containerPtrPtr = &containerPtr, *w;
     WmInfo *wmPtr2;
 
     if ((objc != 3) && (objc != 4)) {
@@ -5557,38 +5557,38 @@ WmTransientCmd(
 	return TCL_ERROR;
     }
     if (objc == 3) {
-	if (masterPtr != NULL) {
-	    Tcl_SetObjResult(interp, TkNewWindowObj((Tk_Window) masterPtr));
+	if (containerPtr != NULL) {
+	    Tcl_SetObjResult(interp, TkNewWindowObj((Tk_Window) containerPtr));
 	}
 	return TCL_OK;
     }
     if (Tcl_GetString(objv[3])[0] == '\0') {
-	if (masterPtr != NULL) {
+	if (containerPtr != NULL) {
 	    /*
-	     * If we had a master, tell them that we aren't tied to them
+	     * If we had a container, tell them that we aren't tied to them
 	     * anymore.
 	     */
 
-	    masterPtr->wmInfoPtr->numTransients--;
-	    Tk_DeleteEventHandler((Tk_Window) masterPtr,
+	    containerPtr->wmInfoPtr->numTransients--;
+	    Tk_DeleteEventHandler((Tk_Window) containerPtr,
 		    VisibilityChangeMask|StructureNotifyMask,
 		    WmWaitVisibilityOrMapProc, winPtr);
 	}
 
-	wmPtr->masterPtr = NULL;
+	wmPtr->containerPtr = NULL;
     } else {
 	if (TkGetWindowFromObj(interp, tkwin, objv[3],
-		(Tk_Window *) masterPtrPtr) != TCL_OK) {
+		(Tk_Window *) containerPtrPtr) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	while (!Tk_TopWinHierarchy(masterPtr)) {
+	while (!Tk_TopWinHierarchy(containerPtr)) {
 	    /*
-	     * Ensure that the master window is actually a Tk toplevel.
+	     * Ensure that the container window is actually a Tk toplevel.
 	     */
 
-	    masterPtr = masterPtr->parentPtr;
+	    containerPtr = containerPtr->parentPtr;
 	}
-	Tk_MakeWindowExist((Tk_Window) masterPtr);
+	Tk_MakeWindowExist((Tk_Window) containerPtr);
 
 	if (wmPtr->iconFor != NULL) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
@@ -5598,7 +5598,7 @@ WmTransientCmd(
 	    return TCL_ERROR;
 	}
 
-	wmPtr2 = masterPtr->wmInfoPtr;
+	wmPtr2 = containerPtr->wmInfoPtr;
 
 	if (wmPtr2->iconFor != NULL) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
@@ -5607,42 +5607,42 @@ WmTransientCmd(
 	    Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "ICON", NULL);
 	    return TCL_ERROR;
 	}
-	for (w = masterPtr; w != NULL && w->wmInfoPtr != NULL;
-	     w = (TkWindow *)w->wmInfoPtr->masterPtr) {
+	for (w = containerPtr; w != NULL && w->wmInfoPtr != NULL;
+	     w = (TkWindow *)w->wmInfoPtr->containerPtr) {
 	    if (w == winPtr) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "setting \"%s\" as master creates a transient/master cycle",
-		    Tk_PathName(masterPtr)));
+		    Tk_PathName(containerPtr)));
 		Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "SELF", NULL);
 		return TCL_ERROR;
 	    }
 	}
-	if (masterPtr != wmPtr->masterPtr) {
+	if (containerPtr != wmPtr->containerPtr) {
 	    /*
-	     * Remove old master map/unmap binding before setting the new
-	     * master. The event handler will ensure that transient states
-	     * reflect the state of the master.
+	     * Remove old container map/unmap binding before setting the new
+	     * container. The event handler will ensure that transient states
+	     * reflect the state of the container.
 	     */
 
-	    if (wmPtr->masterPtr != NULL) {
-		wmPtr->masterPtr->wmInfoPtr->numTransients--;
-		Tk_DeleteEventHandler((Tk_Window) wmPtr->masterPtr,
+	    if (wmPtr->containerPtr != NULL) {
+		wmPtr->containerPtr->wmInfoPtr->numTransients--;
+		Tk_DeleteEventHandler((Tk_Window) wmPtr->containerPtr,
 			VisibilityChangeMask|StructureNotifyMask,
 			WmWaitVisibilityOrMapProc, winPtr);
 	    }
 
-	    masterPtr->wmInfoPtr->numTransients++;
-	    Tk_CreateEventHandler((Tk_Window) masterPtr,
+	    containerPtr->wmInfoPtr->numTransients++;
+	    Tk_CreateEventHandler((Tk_Window) containerPtr,
 		    VisibilityChangeMask|StructureNotifyMask,
 		    WmWaitVisibilityOrMapProc, winPtr);
 
-	    wmPtr->masterPtr = masterPtr;
+	    wmPtr->containerPtr = containerPtr;
 	}
     }
     if (!((wmPtr->flags & WM_NEVER_MAPPED)
 	    && !(winPtr->flags & TK_EMBEDDED))) {
-	if (wmPtr->masterPtr != NULL
-		&& !Tk_IsMapped(wmPtr->masterPtr)) {
+	if (wmPtr->containerPtr != NULL
+		&& !Tk_IsMapped(wmPtr->containerPtr)) {
 	    TkpWmSetState(winPtr, WithdrawnState);
 	} else {
 	    UpdateWrapper(winPtr);
@@ -5728,9 +5728,9 @@ WmWaitVisibilityOrMapProc(
     XEvent *eventPtr)		/* Information about event. */
 {
     TkWindow *winPtr = (TkWindow *)clientData;
-    TkWindow *masterPtr = winPtr->wmInfoPtr->masterPtr;
+    TkWindow *containerPtr = winPtr->wmInfoPtr->containerPtr;
 
-    if (masterPtr == NULL)
+    if (containerPtr == NULL)
 	return;
 
     if (eventPtr->type == MapNotify) {
@@ -5742,7 +5742,7 @@ WmWaitVisibilityOrMapProc(
     }
 
     if (eventPtr->type == VisibilityNotify) {
-	int state = masterPtr->wmInfoPtr->hints.initial_state;
+	int state = containerPtr->wmInfoPtr->hints.initial_state;
 
 	if ((state == NormalState) || (state == ZoomState)) {
 	    state = winPtr->wmInfoPtr->hints.initial_state;
-- 
cgit v0.12


From 5385927e72f73a73d5f8a5e4eb0f033c18d2ad6c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 9 Sep 2020 14:47:05 +0000
Subject: Re-generate "make genstubs" (was done with the wrong version)

---
 generic/tkDecls.h        | 1615 ++++++++++++++++++++++++++++++++++++++++++----
 generic/tkIntDecls.h     |  985 +++++++++++++++++++++++++---
 generic/tkIntPlatDecls.h |  652 +++++++++++++++++--
 generic/tkIntXlibDecls.h | 1287 ++++++++++++++++++++++++++++++++----
 generic/tkPlatDecls.h    |  122 +++-
 generic/tkStubInit.c     |  374 +++++------
 6 files changed, 4435 insertions(+), 600 deletions(-)

diff --git a/generic/tkDecls.h b/generic/tkDecls.h
index a7d184a..0cd84c7 100644
--- a/generic/tkDecls.h
+++ b/generic/tkDecls.h
@@ -33,865 +33,1684 @@ extern "C" {
  * Exported function declarations:
  */
 
+#ifndef Tk_MainLoop_TCL_DECLARED
+#define Tk_MainLoop_TCL_DECLARED
 /* 0 */
 EXTERN void		Tk_MainLoop(void);
+#endif
+#ifndef Tk_3DBorderColor_TCL_DECLARED
+#define Tk_3DBorderColor_TCL_DECLARED
 /* 1 */
 EXTERN XColor *		Tk_3DBorderColor(Tk_3DBorder border);
+#endif
+#ifndef Tk_3DBorderGC_TCL_DECLARED
+#define Tk_3DBorderGC_TCL_DECLARED
 /* 2 */
 EXTERN GC		Tk_3DBorderGC(Tk_Window tkwin, Tk_3DBorder border,
 				int which);
+#endif
+#ifndef Tk_3DHorizontalBevel_TCL_DECLARED
+#define Tk_3DHorizontalBevel_TCL_DECLARED
 /* 3 */
 EXTERN void		Tk_3DHorizontalBevel(Tk_Window tkwin,
 				Drawable drawable, Tk_3DBorder border, int x,
 				int y, int width, int height, int leftIn,
 				int rightIn, int topBevel, int relief);
+#endif
+#ifndef Tk_3DVerticalBevel_TCL_DECLARED
+#define Tk_3DVerticalBevel_TCL_DECLARED
 /* 4 */
 EXTERN void		Tk_3DVerticalBevel(Tk_Window tkwin,
 				Drawable drawable, Tk_3DBorder border, int x,
 				int y, int width, int height, int leftBevel,
 				int relief);
+#endif
+#ifndef Tk_AddOption_TCL_DECLARED
+#define Tk_AddOption_TCL_DECLARED
 /* 5 */
-EXTERN void		Tk_AddOption(Tk_Window tkwin, const char *name,
-				const char *value, int priority);
+EXTERN void		Tk_AddOption(Tk_Window tkwin, CONST char *name,
+				CONST char *value, int priority);
+#endif
+#ifndef Tk_BindEvent_TCL_DECLARED
+#define Tk_BindEvent_TCL_DECLARED
 /* 6 */
 EXTERN void		Tk_BindEvent(Tk_BindingTable bindingTable,
 				XEvent *eventPtr, Tk_Window tkwin,
 				int numObjects, ClientData *objectPtr);
+#endif
+#ifndef Tk_CanvasDrawableCoords_TCL_DECLARED
+#define Tk_CanvasDrawableCoords_TCL_DECLARED
 /* 7 */
 EXTERN void		Tk_CanvasDrawableCoords(Tk_Canvas canvas, double x,
 				double y, short *drawableXPtr,
 				short *drawableYPtr);
+#endif
+#ifndef Tk_CanvasEventuallyRedraw_TCL_DECLARED
+#define Tk_CanvasEventuallyRedraw_TCL_DECLARED
 /* 8 */
 EXTERN void		Tk_CanvasEventuallyRedraw(Tk_Canvas canvas, int x1,
 				int y1, int x2, int y2);
+#endif
+#ifndef Tk_CanvasGetCoord_TCL_DECLARED
+#define Tk_CanvasGetCoord_TCL_DECLARED
 /* 9 */
 EXTERN int		Tk_CanvasGetCoord(Tcl_Interp *interp,
-				Tk_Canvas canvas, const char *str,
+				Tk_Canvas canvas, CONST char *str,
 				double *doublePtr);
+#endif
+#ifndef Tk_CanvasGetTextInfo_TCL_DECLARED
+#define Tk_CanvasGetTextInfo_TCL_DECLARED
 /* 10 */
 EXTERN Tk_CanvasTextInfo * Tk_CanvasGetTextInfo(Tk_Canvas canvas);
+#endif
+#ifndef Tk_CanvasPsBitmap_TCL_DECLARED
+#define Tk_CanvasPsBitmap_TCL_DECLARED
 /* 11 */
 EXTERN int		Tk_CanvasPsBitmap(Tcl_Interp *interp,
 				Tk_Canvas canvas, Pixmap bitmap, int x,
 				int y, int width, int height);
+#endif
+#ifndef Tk_CanvasPsColor_TCL_DECLARED
+#define Tk_CanvasPsColor_TCL_DECLARED
 /* 12 */
 EXTERN int		Tk_CanvasPsColor(Tcl_Interp *interp,
 				Tk_Canvas canvas, XColor *colorPtr);
+#endif
+#ifndef Tk_CanvasPsFont_TCL_DECLARED
+#define Tk_CanvasPsFont_TCL_DECLARED
 /* 13 */
 EXTERN int		Tk_CanvasPsFont(Tcl_Interp *interp, Tk_Canvas canvas,
 				Tk_Font font);
+#endif
+#ifndef Tk_CanvasPsPath_TCL_DECLARED
+#define Tk_CanvasPsPath_TCL_DECLARED
 /* 14 */
 EXTERN void		Tk_CanvasPsPath(Tcl_Interp *interp, Tk_Canvas canvas,
 				double *coordPtr, int numPoints);
+#endif
+#ifndef Tk_CanvasPsStipple_TCL_DECLARED
+#define Tk_CanvasPsStipple_TCL_DECLARED
 /* 15 */
 EXTERN int		Tk_CanvasPsStipple(Tcl_Interp *interp,
 				Tk_Canvas canvas, Pixmap bitmap);
+#endif
+#ifndef Tk_CanvasPsY_TCL_DECLARED
+#define Tk_CanvasPsY_TCL_DECLARED
 /* 16 */
 EXTERN double		Tk_CanvasPsY(Tk_Canvas canvas, double y);
+#endif
+#ifndef Tk_CanvasSetStippleOrigin_TCL_DECLARED
+#define Tk_CanvasSetStippleOrigin_TCL_DECLARED
 /* 17 */
 EXTERN void		Tk_CanvasSetStippleOrigin(Tk_Canvas canvas, GC gc);
+#endif
+#ifndef Tk_CanvasTagsParseProc_TCL_DECLARED
+#define Tk_CanvasTagsParseProc_TCL_DECLARED
 /* 18 */
 EXTERN int		Tk_CanvasTagsParseProc(ClientData clientData,
 				Tcl_Interp *interp, Tk_Window tkwin,
-				const char *value, char *widgRec, int offset);
+				CONST char *value, char *widgRec, int offset);
+#endif
+#ifndef Tk_CanvasTagsPrintProc_TCL_DECLARED
+#define Tk_CanvasTagsPrintProc_TCL_DECLARED
 /* 19 */
 EXTERN char *		Tk_CanvasTagsPrintProc(ClientData clientData,
 				Tk_Window tkwin, char *widgRec, int offset,
 				Tcl_FreeProc **freeProcPtr);
+#endif
+#ifndef Tk_CanvasTkwin_TCL_DECLARED
+#define Tk_CanvasTkwin_TCL_DECLARED
 /* 20 */
 EXTERN Tk_Window	Tk_CanvasTkwin(Tk_Canvas canvas);
+#endif
+#ifndef Tk_CanvasWindowCoords_TCL_DECLARED
+#define Tk_CanvasWindowCoords_TCL_DECLARED
 /* 21 */
 EXTERN void		Tk_CanvasWindowCoords(Tk_Canvas canvas, double x,
 				double y, short *screenXPtr,
 				short *screenYPtr);
+#endif
+#ifndef Tk_ChangeWindowAttributes_TCL_DECLARED
+#define Tk_ChangeWindowAttributes_TCL_DECLARED
 /* 22 */
 EXTERN void		Tk_ChangeWindowAttributes(Tk_Window tkwin,
 				unsigned long valueMask,
 				XSetWindowAttributes *attsPtr);
+#endif
+#ifndef Tk_CharBbox_TCL_DECLARED
+#define Tk_CharBbox_TCL_DECLARED
 /* 23 */
 EXTERN int		Tk_CharBbox(Tk_TextLayout layout, int index,
 				int *xPtr, int *yPtr, int *widthPtr,
 				int *heightPtr);
+#endif
+#ifndef Tk_ClearSelection_TCL_DECLARED
+#define Tk_ClearSelection_TCL_DECLARED
 /* 24 */
 EXTERN void		Tk_ClearSelection(Tk_Window tkwin, Atom selection);
+#endif
+#ifndef Tk_ClipboardAppend_TCL_DECLARED
+#define Tk_ClipboardAppend_TCL_DECLARED
 /* 25 */
 EXTERN int		Tk_ClipboardAppend(Tcl_Interp *interp,
 				Tk_Window tkwin, Atom target, Atom format,
 				char *buffer);
+#endif
+#ifndef Tk_ClipboardClear_TCL_DECLARED
+#define Tk_ClipboardClear_TCL_DECLARED
 /* 26 */
 EXTERN int		Tk_ClipboardClear(Tcl_Interp *interp,
 				Tk_Window tkwin);
+#endif
+#ifndef Tk_ConfigureInfo_TCL_DECLARED
+#define Tk_ConfigureInfo_TCL_DECLARED
 /* 27 */
 EXTERN int		Tk_ConfigureInfo(Tcl_Interp *interp, Tk_Window tkwin,
 				Tk_ConfigSpec *specs, char *widgRec,
-				const char *argvName, int flags);
+				CONST char *argvName, int flags);
+#endif
+#ifndef Tk_ConfigureValue_TCL_DECLARED
+#define Tk_ConfigureValue_TCL_DECLARED
 /* 28 */
 EXTERN int		Tk_ConfigureValue(Tcl_Interp *interp,
 				Tk_Window tkwin, Tk_ConfigSpec *specs,
-				char *widgRec, const char *argvName,
+				char *widgRec, CONST char *argvName,
 				int flags);
+#endif
+#ifndef Tk_ConfigureWidget_TCL_DECLARED
+#define Tk_ConfigureWidget_TCL_DECLARED
 /* 29 */
 EXTERN int		Tk_ConfigureWidget(Tcl_Interp *interp,
 				Tk_Window tkwin, Tk_ConfigSpec *specs,
 				int argc, CONST84 char **argv, char *widgRec,
 				int flags);
+#endif
+#ifndef Tk_ConfigureWindow_TCL_DECLARED
+#define Tk_ConfigureWindow_TCL_DECLARED
 /* 30 */
 EXTERN void		Tk_ConfigureWindow(Tk_Window tkwin,
 				unsigned int valueMask,
 				XWindowChanges *valuePtr);
+#endif
+#ifndef Tk_ComputeTextLayout_TCL_DECLARED
+#define Tk_ComputeTextLayout_TCL_DECLARED
 /* 31 */
-EXTERN Tk_TextLayout	Tk_ComputeTextLayout(Tk_Font font, const char *str,
+EXTERN Tk_TextLayout	Tk_ComputeTextLayout(Tk_Font font, CONST char *str,
 				int numChars, int wrapLength,
 				Tk_Justify justify, int flags, int *widthPtr,
 				int *heightPtr);
+#endif
+#ifndef Tk_CoordsToWindow_TCL_DECLARED
+#define Tk_CoordsToWindow_TCL_DECLARED
 /* 32 */
 EXTERN Tk_Window	Tk_CoordsToWindow(int rootX, int rootY,
 				Tk_Window tkwin);
+#endif
+#ifndef Tk_CreateBinding_TCL_DECLARED
+#define Tk_CreateBinding_TCL_DECLARED
 /* 33 */
 EXTERN unsigned long	Tk_CreateBinding(Tcl_Interp *interp,
 				Tk_BindingTable bindingTable,
-				ClientData object, const char *eventStr,
-				const char *command, int append);
+				ClientData object, CONST char *eventStr,
+				CONST char *command, int append);
+#endif
+#ifndef Tk_CreateBindingTable_TCL_DECLARED
+#define Tk_CreateBindingTable_TCL_DECLARED
 /* 34 */
 EXTERN Tk_BindingTable	Tk_CreateBindingTable(Tcl_Interp *interp);
+#endif
+#ifndef Tk_CreateErrorHandler_TCL_DECLARED
+#define Tk_CreateErrorHandler_TCL_DECLARED
 /* 35 */
 EXTERN Tk_ErrorHandler	Tk_CreateErrorHandler(Display *display, int errNum,
 				int request, int minorCode,
 				Tk_ErrorProc *errorProc,
 				ClientData clientData);
+#endif
+#ifndef Tk_CreateEventHandler_TCL_DECLARED
+#define Tk_CreateEventHandler_TCL_DECLARED
 /* 36 */
 EXTERN void		Tk_CreateEventHandler(Tk_Window token,
 				unsigned long mask, Tk_EventProc *proc,
 				ClientData clientData);
+#endif
+#ifndef Tk_CreateGenericHandler_TCL_DECLARED
+#define Tk_CreateGenericHandler_TCL_DECLARED
 /* 37 */
 EXTERN void		Tk_CreateGenericHandler(Tk_GenericProc *proc,
 				ClientData clientData);
+#endif
+#ifndef Tk_CreateImageType_TCL_DECLARED
+#define Tk_CreateImageType_TCL_DECLARED
 /* 38 */
 EXTERN void		Tk_CreateImageType(Tk_ImageType *typePtr);
+#endif
+#ifndef Tk_CreateItemType_TCL_DECLARED
+#define Tk_CreateItemType_TCL_DECLARED
 /* 39 */
 EXTERN void		Tk_CreateItemType(Tk_ItemType *typePtr);
+#endif
+#ifndef Tk_CreatePhotoImageFormat_TCL_DECLARED
+#define Tk_CreatePhotoImageFormat_TCL_DECLARED
 /* 40 */
 EXTERN void		Tk_CreatePhotoImageFormat(
 				Tk_PhotoImageFormat *formatPtr);
+#endif
+#ifndef Tk_CreateSelHandler_TCL_DECLARED
+#define Tk_CreateSelHandler_TCL_DECLARED
 /* 41 */
 EXTERN void		Tk_CreateSelHandler(Tk_Window tkwin, Atom selection,
 				Atom target, Tk_SelectionProc *proc,
 				ClientData clientData, Atom format);
+#endif
+#ifndef Tk_CreateWindow_TCL_DECLARED
+#define Tk_CreateWindow_TCL_DECLARED
 /* 42 */
 EXTERN Tk_Window	Tk_CreateWindow(Tcl_Interp *interp, Tk_Window parent,
-				const char *name, const char *screenName);
+				CONST char *name, CONST char *screenName);
+#endif
+#ifndef Tk_CreateWindowFromPath_TCL_DECLARED
+#define Tk_CreateWindowFromPath_TCL_DECLARED
 /* 43 */
 EXTERN Tk_Window	Tk_CreateWindowFromPath(Tcl_Interp *interp,
-				Tk_Window tkwin, const char *pathName,
-				const char *screenName);
+				Tk_Window tkwin, CONST char *pathName,
+				CONST char *screenName);
+#endif
+#ifndef Tk_DefineBitmap_TCL_DECLARED
+#define Tk_DefineBitmap_TCL_DECLARED
 /* 44 */
-EXTERN int		Tk_DefineBitmap(Tcl_Interp *interp, const char *name,
-				const char *source, int width, int height);
+EXTERN int		Tk_DefineBitmap(Tcl_Interp *interp, CONST char *name,
+				CONST char *source, int width, int height);
+#endif
+#ifndef Tk_DefineCursor_TCL_DECLARED
+#define Tk_DefineCursor_TCL_DECLARED
 /* 45 */
 EXTERN void		Tk_DefineCursor(Tk_Window window, Tk_Cursor cursor);
+#endif
+#ifndef Tk_DeleteAllBindings_TCL_DECLARED
+#define Tk_DeleteAllBindings_TCL_DECLARED
 /* 46 */
 EXTERN void		Tk_DeleteAllBindings(Tk_BindingTable bindingTable,
 				ClientData object);
+#endif
+#ifndef Tk_DeleteBinding_TCL_DECLARED
+#define Tk_DeleteBinding_TCL_DECLARED
 /* 47 */
 EXTERN int		Tk_DeleteBinding(Tcl_Interp *interp,
 				Tk_BindingTable bindingTable,
-				ClientData object, const char *eventStr);
+				ClientData object, CONST char *eventStr);
+#endif
+#ifndef Tk_DeleteBindingTable_TCL_DECLARED
+#define Tk_DeleteBindingTable_TCL_DECLARED
 /* 48 */
 EXTERN void		Tk_DeleteBindingTable(Tk_BindingTable bindingTable);
+#endif
+#ifndef Tk_DeleteErrorHandler_TCL_DECLARED
+#define Tk_DeleteErrorHandler_TCL_DECLARED
 /* 49 */
 EXTERN void		Tk_DeleteErrorHandler(Tk_ErrorHandler handler);
+#endif
+#ifndef Tk_DeleteEventHandler_TCL_DECLARED
+#define Tk_DeleteEventHandler_TCL_DECLARED
 /* 50 */
 EXTERN void		Tk_DeleteEventHandler(Tk_Window token,
 				unsigned long mask, Tk_EventProc *proc,
 				ClientData clientData);
+#endif
+#ifndef Tk_DeleteGenericHandler_TCL_DECLARED
+#define Tk_DeleteGenericHandler_TCL_DECLARED
 /* 51 */
 EXTERN void		Tk_DeleteGenericHandler(Tk_GenericProc *proc,
 				ClientData clientData);
+#endif
+#ifndef Tk_DeleteImage_TCL_DECLARED
+#define Tk_DeleteImage_TCL_DECLARED
 /* 52 */
-EXTERN void		Tk_DeleteImage(Tcl_Interp *interp, const char *name);
+EXTERN void		Tk_DeleteImage(Tcl_Interp *interp, CONST char *name);
+#endif
+#ifndef Tk_DeleteSelHandler_TCL_DECLARED
+#define Tk_DeleteSelHandler_TCL_DECLARED
 /* 53 */
 EXTERN void		Tk_DeleteSelHandler(Tk_Window tkwin, Atom selection,
 				Atom target);
+#endif
+#ifndef Tk_DestroyWindow_TCL_DECLARED
+#define Tk_DestroyWindow_TCL_DECLARED
 /* 54 */
 EXTERN void		Tk_DestroyWindow(Tk_Window tkwin);
+#endif
+#ifndef Tk_DisplayName_TCL_DECLARED
+#define Tk_DisplayName_TCL_DECLARED
 /* 55 */
 EXTERN CONST84_RETURN char * Tk_DisplayName(Tk_Window tkwin);
+#endif
+#ifndef Tk_DistanceToTextLayout_TCL_DECLARED
+#define Tk_DistanceToTextLayout_TCL_DECLARED
 /* 56 */
 EXTERN int		Tk_DistanceToTextLayout(Tk_TextLayout layout, int x,
 				int y);
+#endif
+#ifndef Tk_Draw3DPolygon_TCL_DECLARED
+#define Tk_Draw3DPolygon_TCL_DECLARED
 /* 57 */
 EXTERN void		Tk_Draw3DPolygon(Tk_Window tkwin, Drawable drawable,
 				Tk_3DBorder border, XPoint *pointPtr,
 				int numPoints, int borderWidth,
 				int leftRelief);
+#endif
+#ifndef Tk_Draw3DRectangle_TCL_DECLARED
+#define Tk_Draw3DRectangle_TCL_DECLARED
 /* 58 */
 EXTERN void		Tk_Draw3DRectangle(Tk_Window tkwin,
 				Drawable drawable, Tk_3DBorder border, int x,
 				int y, int width, int height,
 				int borderWidth, int relief);
+#endif
+#ifndef Tk_DrawChars_TCL_DECLARED
+#define Tk_DrawChars_TCL_DECLARED
 /* 59 */
 EXTERN void		Tk_DrawChars(Display *display, Drawable drawable,
-				GC gc, Tk_Font tkfont, const char *source,
+				GC gc, Tk_Font tkfont, CONST char *source,
 				int numBytes, int x, int y);
+#endif
+#ifndef Tk_DrawFocusHighlight_TCL_DECLARED
+#define Tk_DrawFocusHighlight_TCL_DECLARED
 /* 60 */
 EXTERN void		Tk_DrawFocusHighlight(Tk_Window tkwin, GC gc,
 				int width, Drawable drawable);
+#endif
+#ifndef Tk_DrawTextLayout_TCL_DECLARED
+#define Tk_DrawTextLayout_TCL_DECLARED
 /* 61 */
 EXTERN void		Tk_DrawTextLayout(Display *display,
 				Drawable drawable, GC gc,
 				Tk_TextLayout layout, int x, int y,
 				int firstChar, int lastChar);
+#endif
+#ifndef Tk_Fill3DPolygon_TCL_DECLARED
+#define Tk_Fill3DPolygon_TCL_DECLARED
 /* 62 */
 EXTERN void		Tk_Fill3DPolygon(Tk_Window tkwin, Drawable drawable,
 				Tk_3DBorder border, XPoint *pointPtr,
 				int numPoints, int borderWidth,
 				int leftRelief);
+#endif
+#ifndef Tk_Fill3DRectangle_TCL_DECLARED
+#define Tk_Fill3DRectangle_TCL_DECLARED
 /* 63 */
 EXTERN void		Tk_Fill3DRectangle(Tk_Window tkwin,
 				Drawable drawable, Tk_3DBorder border, int x,
 				int y, int width, int height,
 				int borderWidth, int relief);
+#endif
+#ifndef Tk_FindPhoto_TCL_DECLARED
+#define Tk_FindPhoto_TCL_DECLARED
 /* 64 */
 EXTERN Tk_PhotoHandle	Tk_FindPhoto(Tcl_Interp *interp,
-				const char *imageName);
+				CONST char *imageName);
+#endif
+#ifndef Tk_FontId_TCL_DECLARED
+#define Tk_FontId_TCL_DECLARED
 /* 65 */
 EXTERN Font		Tk_FontId(Tk_Font font);
+#endif
+#ifndef Tk_Free3DBorder_TCL_DECLARED
+#define Tk_Free3DBorder_TCL_DECLARED
 /* 66 */
 EXTERN void		Tk_Free3DBorder(Tk_3DBorder border);
+#endif
+#ifndef Tk_FreeBitmap_TCL_DECLARED
+#define Tk_FreeBitmap_TCL_DECLARED
 /* 67 */
 EXTERN void		Tk_FreeBitmap(Display *display, Pixmap bitmap);
+#endif
+#ifndef Tk_FreeColor_TCL_DECLARED
+#define Tk_FreeColor_TCL_DECLARED
 /* 68 */
 EXTERN void		Tk_FreeColor(XColor *colorPtr);
+#endif
+#ifndef Tk_FreeColormap_TCL_DECLARED
+#define Tk_FreeColormap_TCL_DECLARED
 /* 69 */
 EXTERN void		Tk_FreeColormap(Display *display, Colormap colormap);
+#endif
+#ifndef Tk_FreeCursor_TCL_DECLARED
+#define Tk_FreeCursor_TCL_DECLARED
 /* 70 */
 EXTERN void		Tk_FreeCursor(Display *display, Tk_Cursor cursor);
+#endif
+#ifndef Tk_FreeFont_TCL_DECLARED
+#define Tk_FreeFont_TCL_DECLARED
 /* 71 */
 EXTERN void		Tk_FreeFont(Tk_Font f);
+#endif
+#ifndef Tk_FreeGC_TCL_DECLARED
+#define Tk_FreeGC_TCL_DECLARED
 /* 72 */
 EXTERN void		Tk_FreeGC(Display *display, GC gc);
+#endif
+#ifndef Tk_FreeImage_TCL_DECLARED
+#define Tk_FreeImage_TCL_DECLARED
 /* 73 */
 EXTERN void		Tk_FreeImage(Tk_Image image);
+#endif
+#ifndef Tk_FreeOptions_TCL_DECLARED
+#define Tk_FreeOptions_TCL_DECLARED
 /* 74 */
 EXTERN void		Tk_FreeOptions(Tk_ConfigSpec *specs, char *widgRec,
 				Display *display, int needFlags);
+#endif
+#ifndef Tk_FreePixmap_TCL_DECLARED
+#define Tk_FreePixmap_TCL_DECLARED
 /* 75 */
 EXTERN void		Tk_FreePixmap(Display *display, Pixmap pixmap);
+#endif
+#ifndef Tk_FreeTextLayout_TCL_DECLARED
+#define Tk_FreeTextLayout_TCL_DECLARED
 /* 76 */
 EXTERN void		Tk_FreeTextLayout(Tk_TextLayout textLayout);
+#endif
+#ifndef Tk_FreeXId_TCL_DECLARED
+#define Tk_FreeXId_TCL_DECLARED
 /* 77 */
 EXTERN void		Tk_FreeXId(Display *display, XID xid);
+#endif
+#ifndef Tk_GCForColor_TCL_DECLARED
+#define Tk_GCForColor_TCL_DECLARED
 /* 78 */
 EXTERN GC		Tk_GCForColor(XColor *colorPtr, Drawable drawable);
+#endif
+#ifndef Tk_GeometryRequest_TCL_DECLARED
+#define Tk_GeometryRequest_TCL_DECLARED
 /* 79 */
 EXTERN void		Tk_GeometryRequest(Tk_Window tkwin, int reqWidth,
 				int reqHeight);
+#endif
+#ifndef Tk_Get3DBorder_TCL_DECLARED
+#define Tk_Get3DBorder_TCL_DECLARED
 /* 80 */
 EXTERN Tk_3DBorder	Tk_Get3DBorder(Tcl_Interp *interp, Tk_Window tkwin,
 				Tk_Uid colorName);
+#endif
+#ifndef Tk_GetAllBindings_TCL_DECLARED
+#define Tk_GetAllBindings_TCL_DECLARED
 /* 81 */
 EXTERN void		Tk_GetAllBindings(Tcl_Interp *interp,
 				Tk_BindingTable bindingTable,
 				ClientData object);
+#endif
+#ifndef Tk_GetAnchor_TCL_DECLARED
+#define Tk_GetAnchor_TCL_DECLARED
 /* 82 */
-EXTERN int		Tk_GetAnchor(Tcl_Interp *interp, const char *str,
+EXTERN int		Tk_GetAnchor(Tcl_Interp *interp, CONST char *str,
 				Tk_Anchor *anchorPtr);
+#endif
+#ifndef Tk_GetAtomName_TCL_DECLARED
+#define Tk_GetAtomName_TCL_DECLARED
 /* 83 */
 EXTERN CONST84_RETURN char * Tk_GetAtomName(Tk_Window tkwin, Atom atom);
+#endif
+#ifndef Tk_GetBinding_TCL_DECLARED
+#define Tk_GetBinding_TCL_DECLARED
 /* 84 */
 EXTERN CONST84_RETURN char * Tk_GetBinding(Tcl_Interp *interp,
 				Tk_BindingTable bindingTable,
-				ClientData object, const char *eventStr);
+				ClientData object, CONST char *eventStr);
+#endif
+#ifndef Tk_GetBitmap_TCL_DECLARED
+#define Tk_GetBitmap_TCL_DECLARED
 /* 85 */
 EXTERN Pixmap		Tk_GetBitmap(Tcl_Interp *interp, Tk_Window tkwin,
-				const char *str);
+				CONST char *str);
+#endif
+#ifndef Tk_GetBitmapFromData_TCL_DECLARED
+#define Tk_GetBitmapFromData_TCL_DECLARED
 /* 86 */
 EXTERN Pixmap		Tk_GetBitmapFromData(Tcl_Interp *interp,
-				Tk_Window tkwin, const char *source,
+				Tk_Window tkwin, CONST char *source,
 				int width, int height);
+#endif
+#ifndef Tk_GetCapStyle_TCL_DECLARED
+#define Tk_GetCapStyle_TCL_DECLARED
 /* 87 */
-EXTERN int		Tk_GetCapStyle(Tcl_Interp *interp, const char *str,
+EXTERN int		Tk_GetCapStyle(Tcl_Interp *interp, CONST char *str,
 				int *capPtr);
+#endif
+#ifndef Tk_GetColor_TCL_DECLARED
+#define Tk_GetColor_TCL_DECLARED
 /* 88 */
 EXTERN XColor *		Tk_GetColor(Tcl_Interp *interp, Tk_Window tkwin,
 				Tk_Uid name);
+#endif
+#ifndef Tk_GetColorByValue_TCL_DECLARED
+#define Tk_GetColorByValue_TCL_DECLARED
 /* 89 */
 EXTERN XColor *		Tk_GetColorByValue(Tk_Window tkwin, XColor *colorPtr);
+#endif
+#ifndef Tk_GetColormap_TCL_DECLARED
+#define Tk_GetColormap_TCL_DECLARED
 /* 90 */
 EXTERN Colormap		Tk_GetColormap(Tcl_Interp *interp, Tk_Window tkwin,
-				const char *str);
+				CONST char *str);
+#endif
+#ifndef Tk_GetCursor_TCL_DECLARED
+#define Tk_GetCursor_TCL_DECLARED
 /* 91 */
 EXTERN Tk_Cursor	Tk_GetCursor(Tcl_Interp *interp, Tk_Window tkwin,
 				Tk_Uid str);
+#endif
+#ifndef Tk_GetCursorFromData_TCL_DECLARED
+#define Tk_GetCursorFromData_TCL_DECLARED
 /* 92 */
 EXTERN Tk_Cursor	Tk_GetCursorFromData(Tcl_Interp *interp,
-				Tk_Window tkwin, const char *source,
-				const char *mask, int width, int height,
+				Tk_Window tkwin, CONST char *source,
+				CONST char *mask, int width, int height,
 				int xHot, int yHot, Tk_Uid fg, Tk_Uid bg);
+#endif
+#ifndef Tk_GetFont_TCL_DECLARED
+#define Tk_GetFont_TCL_DECLARED
 /* 93 */
 EXTERN Tk_Font		Tk_GetFont(Tcl_Interp *interp, Tk_Window tkwin,
-				const char *str);
+				CONST char *str);
+#endif
+#ifndef Tk_GetFontFromObj_TCL_DECLARED
+#define Tk_GetFontFromObj_TCL_DECLARED
 /* 94 */
 EXTERN Tk_Font		Tk_GetFontFromObj(Tk_Window tkwin, Tcl_Obj *objPtr);
+#endif
+#ifndef Tk_GetFontMetrics_TCL_DECLARED
+#define Tk_GetFontMetrics_TCL_DECLARED
 /* 95 */
 EXTERN void		Tk_GetFontMetrics(Tk_Font font,
 				Tk_FontMetrics *fmPtr);
+#endif
+#ifndef Tk_GetGC_TCL_DECLARED
+#define Tk_GetGC_TCL_DECLARED
 /* 96 */
 EXTERN GC		Tk_GetGC(Tk_Window tkwin, unsigned long valueMask,
 				XGCValues *valuePtr);
+#endif
+#ifndef Tk_GetImage_TCL_DECLARED
+#define Tk_GetImage_TCL_DECLARED
 /* 97 */
 EXTERN Tk_Image		Tk_GetImage(Tcl_Interp *interp, Tk_Window tkwin,
-				const char *name,
+				CONST char *name,
 				Tk_ImageChangedProc *changeProc,
 				ClientData clientData);
+#endif
+#ifndef Tk_GetImageMasterData_TCL_DECLARED
+#define Tk_GetImageMasterData_TCL_DECLARED
 /* 98 */
 EXTERN ClientData	Tk_GetImageMasterData(Tcl_Interp *interp,
-				const char *name, Tk_ImageType **typePtrPtr);
+				CONST char *name, Tk_ImageType **typePtrPtr);
+#endif
+#ifndef Tk_GetItemTypes_TCL_DECLARED
+#define Tk_GetItemTypes_TCL_DECLARED
 /* 99 */
 EXTERN Tk_ItemType *	Tk_GetItemTypes(void);
+#endif
+#ifndef Tk_GetJoinStyle_TCL_DECLARED
+#define Tk_GetJoinStyle_TCL_DECLARED
 /* 100 */
-EXTERN int		Tk_GetJoinStyle(Tcl_Interp *interp, const char *str,
+EXTERN int		Tk_GetJoinStyle(Tcl_Interp *interp, CONST char *str,
 				int *joinPtr);
+#endif
+#ifndef Tk_GetJustify_TCL_DECLARED
+#define Tk_GetJustify_TCL_DECLARED
 /* 101 */
-EXTERN int		Tk_GetJustify(Tcl_Interp *interp, const char *str,
+EXTERN int		Tk_GetJustify(Tcl_Interp *interp, CONST char *str,
 				Tk_Justify *justifyPtr);
+#endif
+#ifndef Tk_GetNumMainWindows_TCL_DECLARED
+#define Tk_GetNumMainWindows_TCL_DECLARED
 /* 102 */
 EXTERN int		Tk_GetNumMainWindows(void);
+#endif
+#ifndef Tk_GetOption_TCL_DECLARED
+#define Tk_GetOption_TCL_DECLARED
 /* 103 */
-EXTERN Tk_Uid		Tk_GetOption(Tk_Window tkwin, const char *name,
-				const char *className);
+EXTERN Tk_Uid		Tk_GetOption(Tk_Window tkwin, CONST char *name,
+				CONST char *className);
+#endif
+#ifndef Tk_GetPixels_TCL_DECLARED
+#define Tk_GetPixels_TCL_DECLARED
 /* 104 */
 EXTERN int		Tk_GetPixels(Tcl_Interp *interp, Tk_Window tkwin,
-				const char *str, int *intPtr);
+				CONST char *str, int *intPtr);
+#endif
+#ifndef Tk_GetPixmap_TCL_DECLARED
+#define Tk_GetPixmap_TCL_DECLARED
 /* 105 */
 EXTERN Pixmap		Tk_GetPixmap(Display *display, Drawable d, int width,
 				int height, int depth);
+#endif
+#ifndef Tk_GetRelief_TCL_DECLARED
+#define Tk_GetRelief_TCL_DECLARED
 /* 106 */
-EXTERN int		Tk_GetRelief(Tcl_Interp *interp, const char *name,
+EXTERN int		Tk_GetRelief(Tcl_Interp *interp, CONST char *name,
 				int *reliefPtr);
+#endif
+#ifndef Tk_GetRootCoords_TCL_DECLARED
+#define Tk_GetRootCoords_TCL_DECLARED
 /* 107 */
 EXTERN void		Tk_GetRootCoords(Tk_Window tkwin, int *xPtr,
 				int *yPtr);
+#endif
+#ifndef Tk_GetScrollInfo_TCL_DECLARED
+#define Tk_GetScrollInfo_TCL_DECLARED
 /* 108 */
 EXTERN int		Tk_GetScrollInfo(Tcl_Interp *interp, int argc,
 				CONST84 char **argv, double *dblPtr,
 				int *intPtr);
+#endif
+#ifndef Tk_GetScreenMM_TCL_DECLARED
+#define Tk_GetScreenMM_TCL_DECLARED
 /* 109 */
 EXTERN int		Tk_GetScreenMM(Tcl_Interp *interp, Tk_Window tkwin,
-				const char *str, double *doublePtr);
+				CONST char *str, double *doublePtr);
+#endif
+#ifndef Tk_GetSelection_TCL_DECLARED
+#define Tk_GetSelection_TCL_DECLARED
 /* 110 */
 EXTERN int		Tk_GetSelection(Tcl_Interp *interp, Tk_Window tkwin,
 				Atom selection, Atom target,
 				Tk_GetSelProc *proc, ClientData clientData);
+#endif
+#ifndef Tk_GetUid_TCL_DECLARED
+#define Tk_GetUid_TCL_DECLARED
 /* 111 */
-EXTERN Tk_Uid		Tk_GetUid(const char *str);
+EXTERN Tk_Uid		Tk_GetUid(CONST char *str);
+#endif
+#ifndef Tk_GetVisual_TCL_DECLARED
+#define Tk_GetVisual_TCL_DECLARED
 /* 112 */
 EXTERN Visual *		Tk_GetVisual(Tcl_Interp *interp, Tk_Window tkwin,
-				const char *str, int *depthPtr,
+				CONST char *str, int *depthPtr,
 				Colormap *colormapPtr);
+#endif
+#ifndef Tk_GetVRootGeometry_TCL_DECLARED
+#define Tk_GetVRootGeometry_TCL_DECLARED
 /* 113 */
 EXTERN void		Tk_GetVRootGeometry(Tk_Window tkwin, int *xPtr,
 				int *yPtr, int *widthPtr, int *heightPtr);
+#endif
+#ifndef Tk_Grab_TCL_DECLARED
+#define Tk_Grab_TCL_DECLARED
 /* 114 */
 EXTERN int		Tk_Grab(Tcl_Interp *interp, Tk_Window tkwin,
 				int grabGlobal);
+#endif
+#ifndef Tk_HandleEvent_TCL_DECLARED
+#define Tk_HandleEvent_TCL_DECLARED
 /* 115 */
 EXTERN void		Tk_HandleEvent(XEvent *eventPtr);
+#endif
+#ifndef Tk_IdToWindow_TCL_DECLARED
+#define Tk_IdToWindow_TCL_DECLARED
 /* 116 */
 EXTERN Tk_Window	Tk_IdToWindow(Display *display, Window window);
+#endif
+#ifndef Tk_ImageChanged_TCL_DECLARED
+#define Tk_ImageChanged_TCL_DECLARED
 /* 117 */
 EXTERN void		Tk_ImageChanged(Tk_ImageMaster master, int x, int y,
 				int width, int height, int imageWidth,
 				int imageHeight);
+#endif
+#ifndef Tk_Init_TCL_DECLARED
+#define Tk_Init_TCL_DECLARED
 /* 118 */
 EXTERN int		Tk_Init(Tcl_Interp *interp);
+#endif
+#ifndef Tk_InternAtom_TCL_DECLARED
+#define Tk_InternAtom_TCL_DECLARED
 /* 119 */
-EXTERN Atom		Tk_InternAtom(Tk_Window tkwin, const char *name);
+EXTERN Atom		Tk_InternAtom(Tk_Window tkwin, CONST char *name);
+#endif
+#ifndef Tk_IntersectTextLayout_TCL_DECLARED
+#define Tk_IntersectTextLayout_TCL_DECLARED
 /* 120 */
 EXTERN int		Tk_IntersectTextLayout(Tk_TextLayout layout, int x,
 				int y, int width, int height);
+#endif
+#ifndef Tk_MaintainGeometry_TCL_DECLARED
+#define Tk_MaintainGeometry_TCL_DECLARED
 /* 121 */
 EXTERN void		Tk_MaintainGeometry(Tk_Window slave,
 				Tk_Window master, int x, int y, int width,
 				int height);
+#endif
+#ifndef Tk_MainWindow_TCL_DECLARED
+#define Tk_MainWindow_TCL_DECLARED
 /* 122 */
 EXTERN Tk_Window	Tk_MainWindow(Tcl_Interp *interp);
+#endif
+#ifndef Tk_MakeWindowExist_TCL_DECLARED
+#define Tk_MakeWindowExist_TCL_DECLARED
 /* 123 */
 EXTERN void		Tk_MakeWindowExist(Tk_Window tkwin);
+#endif
+#ifndef Tk_ManageGeometry_TCL_DECLARED
+#define Tk_ManageGeometry_TCL_DECLARED
 /* 124 */
 EXTERN void		Tk_ManageGeometry(Tk_Window tkwin,
-				const Tk_GeomMgr *mgrPtr,
+				CONST Tk_GeomMgr *mgrPtr,
 				ClientData clientData);
+#endif
+#ifndef Tk_MapWindow_TCL_DECLARED
+#define Tk_MapWindow_TCL_DECLARED
 /* 125 */
 EXTERN void		Tk_MapWindow(Tk_Window tkwin);
+#endif
+#ifndef Tk_MeasureChars_TCL_DECLARED
+#define Tk_MeasureChars_TCL_DECLARED
 /* 126 */
-EXTERN int		Tk_MeasureChars(Tk_Font tkfont, const char *source,
+EXTERN int		Tk_MeasureChars(Tk_Font tkfont, CONST char *source,
 				int numBytes, int maxPixels, int flags,
 				int *lengthPtr);
+#endif
+#ifndef Tk_MoveResizeWindow_TCL_DECLARED
+#define Tk_MoveResizeWindow_TCL_DECLARED
 /* 127 */
 EXTERN void		Tk_MoveResizeWindow(Tk_Window tkwin, int x, int y,
 				int width, int height);
+#endif
+#ifndef Tk_MoveWindow_TCL_DECLARED
+#define Tk_MoveWindow_TCL_DECLARED
 /* 128 */
 EXTERN void		Tk_MoveWindow(Tk_Window tkwin, int x, int y);
+#endif
+#ifndef Tk_MoveToplevelWindow_TCL_DECLARED
+#define Tk_MoveToplevelWindow_TCL_DECLARED
 /* 129 */
 EXTERN void		Tk_MoveToplevelWindow(Tk_Window tkwin, int x, int y);
+#endif
+#ifndef Tk_NameOf3DBorder_TCL_DECLARED
+#define Tk_NameOf3DBorder_TCL_DECLARED
 /* 130 */
 EXTERN CONST84_RETURN char * Tk_NameOf3DBorder(Tk_3DBorder border);
+#endif
+#ifndef Tk_NameOfAnchor_TCL_DECLARED
+#define Tk_NameOfAnchor_TCL_DECLARED
 /* 131 */
 EXTERN CONST84_RETURN char * Tk_NameOfAnchor(Tk_Anchor anchor);
+#endif
+#ifndef Tk_NameOfBitmap_TCL_DECLARED
+#define Tk_NameOfBitmap_TCL_DECLARED
 /* 132 */
 EXTERN CONST84_RETURN char * Tk_NameOfBitmap(Display *display, Pixmap bitmap);
+#endif
+#ifndef Tk_NameOfCapStyle_TCL_DECLARED
+#define Tk_NameOfCapStyle_TCL_DECLARED
 /* 133 */
 EXTERN CONST84_RETURN char * Tk_NameOfCapStyle(int cap);
+#endif
+#ifndef Tk_NameOfColor_TCL_DECLARED
+#define Tk_NameOfColor_TCL_DECLARED
 /* 134 */
 EXTERN CONST84_RETURN char * Tk_NameOfColor(XColor *colorPtr);
+#endif
+#ifndef Tk_NameOfCursor_TCL_DECLARED
+#define Tk_NameOfCursor_TCL_DECLARED
 /* 135 */
 EXTERN CONST84_RETURN char * Tk_NameOfCursor(Display *display,
 				Tk_Cursor cursor);
+#endif
+#ifndef Tk_NameOfFont_TCL_DECLARED
+#define Tk_NameOfFont_TCL_DECLARED
 /* 136 */
 EXTERN CONST84_RETURN char * Tk_NameOfFont(Tk_Font font);
+#endif
+#ifndef Tk_NameOfImage_TCL_DECLARED
+#define Tk_NameOfImage_TCL_DECLARED
 /* 137 */
 EXTERN CONST84_RETURN char * Tk_NameOfImage(Tk_ImageMaster imageMaster);
+#endif
+#ifndef Tk_NameOfJoinStyle_TCL_DECLARED
+#define Tk_NameOfJoinStyle_TCL_DECLARED
 /* 138 */
 EXTERN CONST84_RETURN char * Tk_NameOfJoinStyle(int join);
+#endif
+#ifndef Tk_NameOfJustify_TCL_DECLARED
+#define Tk_NameOfJustify_TCL_DECLARED
 /* 139 */
 EXTERN CONST84_RETURN char * Tk_NameOfJustify(Tk_Justify justify);
+#endif
+#ifndef Tk_NameOfRelief_TCL_DECLARED
+#define Tk_NameOfRelief_TCL_DECLARED
 /* 140 */
 EXTERN CONST84_RETURN char * Tk_NameOfRelief(int relief);
+#endif
+#ifndef Tk_NameToWindow_TCL_DECLARED
+#define Tk_NameToWindow_TCL_DECLARED
 /* 141 */
 EXTERN Tk_Window	Tk_NameToWindow(Tcl_Interp *interp,
-				const char *pathName, Tk_Window tkwin);
+				CONST char *pathName, Tk_Window tkwin);
+#endif
+#ifndef Tk_OwnSelection_TCL_DECLARED
+#define Tk_OwnSelection_TCL_DECLARED
 /* 142 */
 EXTERN void		Tk_OwnSelection(Tk_Window tkwin, Atom selection,
 				Tk_LostSelProc *proc, ClientData clientData);
+#endif
+#ifndef Tk_ParseArgv_TCL_DECLARED
+#define Tk_ParseArgv_TCL_DECLARED
 /* 143 */
 EXTERN int		Tk_ParseArgv(Tcl_Interp *interp, Tk_Window tkwin,
 				int *argcPtr, CONST84 char **argv,
 				Tk_ArgvInfo *argTable, int flags);
+#endif
+#ifndef Tk_PhotoPutBlock_NoComposite_TCL_DECLARED
+#define Tk_PhotoPutBlock_NoComposite_TCL_DECLARED
 /* 144 */
 EXTERN void		Tk_PhotoPutBlock_NoComposite(Tk_PhotoHandle handle,
 				Tk_PhotoImageBlock *blockPtr, int x, int y,
 				int width, int height);
+#endif
+#ifndef Tk_PhotoPutZoomedBlock_NoComposite_TCL_DECLARED
+#define Tk_PhotoPutZoomedBlock_NoComposite_TCL_DECLARED
 /* 145 */
 EXTERN 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);
+#endif
+#ifndef Tk_PhotoGetImage_TCL_DECLARED
+#define Tk_PhotoGetImage_TCL_DECLARED
 /* 146 */
 EXTERN int		Tk_PhotoGetImage(Tk_PhotoHandle handle,
 				Tk_PhotoImageBlock *blockPtr);
+#endif
+#ifndef Tk_PhotoBlank_TCL_DECLARED
+#define Tk_PhotoBlank_TCL_DECLARED
 /* 147 */
 EXTERN void		Tk_PhotoBlank(Tk_PhotoHandle handle);
+#endif
+#ifndef Tk_PhotoExpand_Panic_TCL_DECLARED
+#define Tk_PhotoExpand_Panic_TCL_DECLARED
 /* 148 */
 EXTERN void		Tk_PhotoExpand_Panic(Tk_PhotoHandle handle,
 				int width, int height);
+#endif
+#ifndef Tk_PhotoGetSize_TCL_DECLARED
+#define Tk_PhotoGetSize_TCL_DECLARED
 /* 149 */
 EXTERN void		Tk_PhotoGetSize(Tk_PhotoHandle handle, int *widthPtr,
 				int *heightPtr);
+#endif
+#ifndef Tk_PhotoSetSize_Panic_TCL_DECLARED
+#define Tk_PhotoSetSize_Panic_TCL_DECLARED
 /* 150 */
 EXTERN void		Tk_PhotoSetSize_Panic(Tk_PhotoHandle handle,
 				int width, int height);
+#endif
+#ifndef Tk_PointToChar_TCL_DECLARED
+#define Tk_PointToChar_TCL_DECLARED
 /* 151 */
 EXTERN int		Tk_PointToChar(Tk_TextLayout layout, int x, int y);
+#endif
+#ifndef Tk_PostscriptFontName_TCL_DECLARED
+#define Tk_PostscriptFontName_TCL_DECLARED
 /* 152 */
 EXTERN int		Tk_PostscriptFontName(Tk_Font tkfont,
 				Tcl_DString *dsPtr);
+#endif
+#ifndef Tk_PreserveColormap_TCL_DECLARED
+#define Tk_PreserveColormap_TCL_DECLARED
 /* 153 */
 EXTERN void		Tk_PreserveColormap(Display *display,
 				Colormap colormap);
+#endif
+#ifndef Tk_QueueWindowEvent_TCL_DECLARED
+#define Tk_QueueWindowEvent_TCL_DECLARED
 /* 154 */
 EXTERN void		Tk_QueueWindowEvent(XEvent *eventPtr,
 				Tcl_QueuePosition position);
+#endif
+#ifndef Tk_RedrawImage_TCL_DECLARED
+#define Tk_RedrawImage_TCL_DECLARED
 /* 155 */
 EXTERN void		Tk_RedrawImage(Tk_Image image, int imageX,
 				int imageY, int width, int height,
 				Drawable drawable, int drawableX,
 				int drawableY);
+#endif
+#ifndef Tk_ResizeWindow_TCL_DECLARED
+#define Tk_ResizeWindow_TCL_DECLARED
 /* 156 */
 EXTERN void		Tk_ResizeWindow(Tk_Window tkwin, int width,
 				int height);
+#endif
+#ifndef Tk_RestackWindow_TCL_DECLARED
+#define Tk_RestackWindow_TCL_DECLARED
 /* 157 */
 EXTERN int		Tk_RestackWindow(Tk_Window tkwin, int aboveBelow,
 				Tk_Window other);
+#endif
+#ifndef Tk_RestrictEvents_TCL_DECLARED
+#define Tk_RestrictEvents_TCL_DECLARED
 /* 158 */
 EXTERN Tk_RestrictProc * Tk_RestrictEvents(Tk_RestrictProc *proc,
 				ClientData arg, ClientData *prevArgPtr);
+#endif
+#ifndef Tk_SafeInit_TCL_DECLARED
+#define Tk_SafeInit_TCL_DECLARED
 /* 159 */
 EXTERN int		Tk_SafeInit(Tcl_Interp *interp);
+#endif
+#ifndef Tk_SetAppName_TCL_DECLARED
+#define Tk_SetAppName_TCL_DECLARED
 /* 160 */
-EXTERN const char *	Tk_SetAppName(Tk_Window tkwin, const char *name);
+EXTERN CONST char *	Tk_SetAppName(Tk_Window tkwin, CONST char *name);
+#endif
+#ifndef Tk_SetBackgroundFromBorder_TCL_DECLARED
+#define Tk_SetBackgroundFromBorder_TCL_DECLARED
 /* 161 */
 EXTERN void		Tk_SetBackgroundFromBorder(Tk_Window tkwin,
 				Tk_3DBorder border);
+#endif
+#ifndef Tk_SetClass_TCL_DECLARED
+#define Tk_SetClass_TCL_DECLARED
 /* 162 */
-EXTERN void		Tk_SetClass(Tk_Window tkwin, const char *className);
+EXTERN void		Tk_SetClass(Tk_Window tkwin, CONST char *className);
+#endif
+#ifndef Tk_SetGrid_TCL_DECLARED
+#define Tk_SetGrid_TCL_DECLARED
 /* 163 */
 EXTERN void		Tk_SetGrid(Tk_Window tkwin, int reqWidth,
 				int reqHeight, int gridWidth, int gridHeight);
+#endif
+#ifndef Tk_SetInternalBorder_TCL_DECLARED
+#define Tk_SetInternalBorder_TCL_DECLARED
 /* 164 */
 EXTERN void		Tk_SetInternalBorder(Tk_Window tkwin, int width);
+#endif
+#ifndef Tk_SetWindowBackground_TCL_DECLARED
+#define Tk_SetWindowBackground_TCL_DECLARED
 /* 165 */
 EXTERN void		Tk_SetWindowBackground(Tk_Window tkwin,
 				unsigned long pixel);
+#endif
+#ifndef Tk_SetWindowBackgroundPixmap_TCL_DECLARED
+#define Tk_SetWindowBackgroundPixmap_TCL_DECLARED
 /* 166 */
 EXTERN void		Tk_SetWindowBackgroundPixmap(Tk_Window tkwin,
 				Pixmap pixmap);
+#endif
+#ifndef Tk_SetWindowBorder_TCL_DECLARED
+#define Tk_SetWindowBorder_TCL_DECLARED
 /* 167 */
 EXTERN void		Tk_SetWindowBorder(Tk_Window tkwin,
 				unsigned long pixel);
+#endif
+#ifndef Tk_SetWindowBorderWidth_TCL_DECLARED
+#define Tk_SetWindowBorderWidth_TCL_DECLARED
 /* 168 */
 EXTERN void		Tk_SetWindowBorderWidth(Tk_Window tkwin, int width);
+#endif
+#ifndef Tk_SetWindowBorderPixmap_TCL_DECLARED
+#define Tk_SetWindowBorderPixmap_TCL_DECLARED
 /* 169 */
 EXTERN void		Tk_SetWindowBorderPixmap(Tk_Window tkwin,
 				Pixmap pixmap);
+#endif
+#ifndef Tk_SetWindowColormap_TCL_DECLARED
+#define Tk_SetWindowColormap_TCL_DECLARED
 /* 170 */
 EXTERN void		Tk_SetWindowColormap(Tk_Window tkwin,
 				Colormap colormap);
+#endif
+#ifndef Tk_SetWindowVisual_TCL_DECLARED
+#define Tk_SetWindowVisual_TCL_DECLARED
 /* 171 */
 EXTERN int		Tk_SetWindowVisual(Tk_Window tkwin, Visual *visual,
 				int depth, Colormap colormap);
+#endif
+#ifndef Tk_SizeOfBitmap_TCL_DECLARED
+#define Tk_SizeOfBitmap_TCL_DECLARED
 /* 172 */
 EXTERN void		Tk_SizeOfBitmap(Display *display, Pixmap bitmap,
 				int *widthPtr, int *heightPtr);
+#endif
+#ifndef Tk_SizeOfImage_TCL_DECLARED
+#define Tk_SizeOfImage_TCL_DECLARED
 /* 173 */
 EXTERN void		Tk_SizeOfImage(Tk_Image image, int *widthPtr,
 				int *heightPtr);
+#endif
+#ifndef Tk_StrictMotif_TCL_DECLARED
+#define Tk_StrictMotif_TCL_DECLARED
 /* 174 */
 EXTERN int		Tk_StrictMotif(Tk_Window tkwin);
+#endif
+#ifndef Tk_TextLayoutToPostscript_TCL_DECLARED
+#define Tk_TextLayoutToPostscript_TCL_DECLARED
 /* 175 */
 EXTERN void		Tk_TextLayoutToPostscript(Tcl_Interp *interp,
 				Tk_TextLayout layout);
+#endif
+#ifndef Tk_TextWidth_TCL_DECLARED
+#define Tk_TextWidth_TCL_DECLARED
 /* 176 */
-EXTERN int		Tk_TextWidth(Tk_Font font, const char *str,
+EXTERN int		Tk_TextWidth(Tk_Font font, CONST char *str,
 				int numBytes);
+#endif
+#ifndef Tk_UndefineCursor_TCL_DECLARED
+#define Tk_UndefineCursor_TCL_DECLARED
 /* 177 */
 EXTERN void		Tk_UndefineCursor(Tk_Window window);
+#endif
+#ifndef Tk_UnderlineChars_TCL_DECLARED
+#define Tk_UnderlineChars_TCL_DECLARED
 /* 178 */
 EXTERN void		Tk_UnderlineChars(Display *display,
 				Drawable drawable, GC gc, Tk_Font tkfont,
-				const char *source, int x, int y,
+				CONST char *source, int x, int y,
 				int firstByte, int lastByte);
+#endif
+#ifndef Tk_UnderlineTextLayout_TCL_DECLARED
+#define Tk_UnderlineTextLayout_TCL_DECLARED
 /* 179 */
 EXTERN void		Tk_UnderlineTextLayout(Display *display,
 				Drawable drawable, GC gc,
 				Tk_TextLayout layout, int x, int y,
 				int underline);
+#endif
+#ifndef Tk_Ungrab_TCL_DECLARED
+#define Tk_Ungrab_TCL_DECLARED
 /* 180 */
 EXTERN void		Tk_Ungrab(Tk_Window tkwin);
+#endif
+#ifndef Tk_UnmaintainGeometry_TCL_DECLARED
+#define Tk_UnmaintainGeometry_TCL_DECLARED
 /* 181 */
 EXTERN void		Tk_UnmaintainGeometry(Tk_Window slave,
 				Tk_Window master);
+#endif
+#ifndef Tk_UnmapWindow_TCL_DECLARED
+#define Tk_UnmapWindow_TCL_DECLARED
 /* 182 */
 EXTERN void		Tk_UnmapWindow(Tk_Window tkwin);
+#endif
+#ifndef Tk_UnsetGrid_TCL_DECLARED
+#define Tk_UnsetGrid_TCL_DECLARED
 /* 183 */
 EXTERN void		Tk_UnsetGrid(Tk_Window tkwin);
+#endif
+#ifndef Tk_UpdatePointer_TCL_DECLARED
+#define Tk_UpdatePointer_TCL_DECLARED
 /* 184 */
 EXTERN void		Tk_UpdatePointer(Tk_Window tkwin, int x, int y,
 				int state);
+#endif
+#ifndef Tk_AllocBitmapFromObj_TCL_DECLARED
+#define Tk_AllocBitmapFromObj_TCL_DECLARED
 /* 185 */
 EXTERN Pixmap		Tk_AllocBitmapFromObj(Tcl_Interp *interp,
 				Tk_Window tkwin, Tcl_Obj *objPtr);
+#endif
+#ifndef Tk_Alloc3DBorderFromObj_TCL_DECLARED
+#define Tk_Alloc3DBorderFromObj_TCL_DECLARED
 /* 186 */
 EXTERN Tk_3DBorder	Tk_Alloc3DBorderFromObj(Tcl_Interp *interp,
 				Tk_Window tkwin, Tcl_Obj *objPtr);
+#endif
+#ifndef Tk_AllocColorFromObj_TCL_DECLARED
+#define Tk_AllocColorFromObj_TCL_DECLARED
 /* 187 */
 EXTERN XColor *		Tk_AllocColorFromObj(Tcl_Interp *interp,
 				Tk_Window tkwin, Tcl_Obj *objPtr);
+#endif
+#ifndef Tk_AllocCursorFromObj_TCL_DECLARED
+#define Tk_AllocCursorFromObj_TCL_DECLARED
 /* 188 */
 EXTERN Tk_Cursor	Tk_AllocCursorFromObj(Tcl_Interp *interp,
 				Tk_Window tkwin, Tcl_Obj *objPtr);
+#endif
+#ifndef Tk_AllocFontFromObj_TCL_DECLARED
+#define Tk_AllocFontFromObj_TCL_DECLARED
 /* 189 */
 EXTERN Tk_Font		Tk_AllocFontFromObj(Tcl_Interp *interp,
 				Tk_Window tkwin, Tcl_Obj *objPtr);
+#endif
+#ifndef Tk_CreateOptionTable_TCL_DECLARED
+#define Tk_CreateOptionTable_TCL_DECLARED
 /* 190 */
 EXTERN Tk_OptionTable	Tk_CreateOptionTable(Tcl_Interp *interp,
-				const Tk_OptionSpec *templatePtr);
+				CONST Tk_OptionSpec *templatePtr);
+#endif
+#ifndef Tk_DeleteOptionTable_TCL_DECLARED
+#define Tk_DeleteOptionTable_TCL_DECLARED
 /* 191 */
 EXTERN void		Tk_DeleteOptionTable(Tk_OptionTable optionTable);
+#endif
+#ifndef Tk_Free3DBorderFromObj_TCL_DECLARED
+#define Tk_Free3DBorderFromObj_TCL_DECLARED
 /* 192 */
 EXTERN void		Tk_Free3DBorderFromObj(Tk_Window tkwin,
 				Tcl_Obj *objPtr);
+#endif
+#ifndef Tk_FreeBitmapFromObj_TCL_DECLARED
+#define Tk_FreeBitmapFromObj_TCL_DECLARED
 /* 193 */
 EXTERN void		Tk_FreeBitmapFromObj(Tk_Window tkwin,
 				Tcl_Obj *objPtr);
+#endif
+#ifndef Tk_FreeColorFromObj_TCL_DECLARED
+#define Tk_FreeColorFromObj_TCL_DECLARED
 /* 194 */
 EXTERN void		Tk_FreeColorFromObj(Tk_Window tkwin, Tcl_Obj *objPtr);
+#endif
+#ifndef Tk_FreeConfigOptions_TCL_DECLARED
+#define Tk_FreeConfigOptions_TCL_DECLARED
 /* 195 */
 EXTERN void		Tk_FreeConfigOptions(char *recordPtr,
 				Tk_OptionTable optionToken, Tk_Window tkwin);
+#endif
+#ifndef Tk_FreeSavedOptions_TCL_DECLARED
+#define Tk_FreeSavedOptions_TCL_DECLARED
 /* 196 */
 EXTERN void		Tk_FreeSavedOptions(Tk_SavedOptions *savePtr);
+#endif
+#ifndef Tk_FreeCursorFromObj_TCL_DECLARED
+#define Tk_FreeCursorFromObj_TCL_DECLARED
 /* 197 */
 EXTERN void		Tk_FreeCursorFromObj(Tk_Window tkwin,
 				Tcl_Obj *objPtr);
+#endif
+#ifndef Tk_FreeFontFromObj_TCL_DECLARED
+#define Tk_FreeFontFromObj_TCL_DECLARED
 /* 198 */
 EXTERN void		Tk_FreeFontFromObj(Tk_Window tkwin, Tcl_Obj *objPtr);
+#endif
+#ifndef Tk_Get3DBorderFromObj_TCL_DECLARED
+#define Tk_Get3DBorderFromObj_TCL_DECLARED
 /* 199 */
 EXTERN Tk_3DBorder	Tk_Get3DBorderFromObj(Tk_Window tkwin,
 				Tcl_Obj *objPtr);
+#endif
+#ifndef Tk_GetAnchorFromObj_TCL_DECLARED
+#define Tk_GetAnchorFromObj_TCL_DECLARED
 /* 200 */
 EXTERN int		Tk_GetAnchorFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, Tk_Anchor *anchorPtr);
+#endif
+#ifndef Tk_GetBitmapFromObj_TCL_DECLARED
+#define Tk_GetBitmapFromObj_TCL_DECLARED
 /* 201 */
 EXTERN Pixmap		Tk_GetBitmapFromObj(Tk_Window tkwin, Tcl_Obj *objPtr);
+#endif
+#ifndef Tk_GetColorFromObj_TCL_DECLARED
+#define Tk_GetColorFromObj_TCL_DECLARED
 /* 202 */
 EXTERN XColor *		Tk_GetColorFromObj(Tk_Window tkwin, Tcl_Obj *objPtr);
+#endif
+#ifndef Tk_GetCursorFromObj_TCL_DECLARED
+#define Tk_GetCursorFromObj_TCL_DECLARED
 /* 203 */
 EXTERN Tk_Cursor	Tk_GetCursorFromObj(Tk_Window tkwin, Tcl_Obj *objPtr);
+#endif
+#ifndef Tk_GetOptionInfo_TCL_DECLARED
+#define Tk_GetOptionInfo_TCL_DECLARED
 /* 204 */
 EXTERN Tcl_Obj *	Tk_GetOptionInfo(Tcl_Interp *interp, char *recordPtr,
 				Tk_OptionTable optionTable, Tcl_Obj *namePtr,
 				Tk_Window tkwin);
+#endif
+#ifndef Tk_GetOptionValue_TCL_DECLARED
+#define Tk_GetOptionValue_TCL_DECLARED
 /* 205 */
 EXTERN Tcl_Obj *	Tk_GetOptionValue(Tcl_Interp *interp,
 				char *recordPtr, Tk_OptionTable optionTable,
 				Tcl_Obj *namePtr, Tk_Window tkwin);
+#endif
+#ifndef Tk_GetJustifyFromObj_TCL_DECLARED
+#define Tk_GetJustifyFromObj_TCL_DECLARED
 /* 206 */
 EXTERN int		Tk_GetJustifyFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, Tk_Justify *justifyPtr);
+#endif
+#ifndef Tk_GetMMFromObj_TCL_DECLARED
+#define Tk_GetMMFromObj_TCL_DECLARED
 /* 207 */
 EXTERN int		Tk_GetMMFromObj(Tcl_Interp *interp, Tk_Window tkwin,
 				Tcl_Obj *objPtr, double *doublePtr);
+#endif
+#ifndef Tk_GetPixelsFromObj_TCL_DECLARED
+#define Tk_GetPixelsFromObj_TCL_DECLARED
 /* 208 */
 EXTERN int		Tk_GetPixelsFromObj(Tcl_Interp *interp,
 				Tk_Window tkwin, Tcl_Obj *objPtr,
 				int *intPtr);
+#endif
+#ifndef Tk_GetReliefFromObj_TCL_DECLARED
+#define Tk_GetReliefFromObj_TCL_DECLARED
 /* 209 */
 EXTERN int		Tk_GetReliefFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, int *resultPtr);
+#endif
+#ifndef Tk_GetScrollInfoObj_TCL_DECLARED
+#define Tk_GetScrollInfoObj_TCL_DECLARED
 /* 210 */
 EXTERN int		Tk_GetScrollInfoObj(Tcl_Interp *interp, int objc,
-				Tcl_Obj *const objv[], double *dblPtr,
+				Tcl_Obj *CONST objv[], double *dblPtr,
 				int *intPtr);
+#endif
+#ifndef Tk_InitOptions_TCL_DECLARED
+#define Tk_InitOptions_TCL_DECLARED
 /* 211 */
 EXTERN int		Tk_InitOptions(Tcl_Interp *interp, char *recordPtr,
 				Tk_OptionTable optionToken, Tk_Window tkwin);
+#endif
+#ifndef Tk_MainEx_TCL_DECLARED
+#define Tk_MainEx_TCL_DECLARED
 /* 212 */
 EXTERN void		Tk_MainEx(int argc, char **argv,
 				Tcl_AppInitProc *appInitProc,
 				Tcl_Interp *interp);
+#endif
+#ifndef Tk_RestoreSavedOptions_TCL_DECLARED
+#define Tk_RestoreSavedOptions_TCL_DECLARED
 /* 213 */
 EXTERN void		Tk_RestoreSavedOptions(Tk_SavedOptions *savePtr);
+#endif
+#ifndef Tk_SetOptions_TCL_DECLARED
+#define Tk_SetOptions_TCL_DECLARED
 /* 214 */
 EXTERN int		Tk_SetOptions(Tcl_Interp *interp, char *recordPtr,
 				Tk_OptionTable optionTable, int objc,
-				Tcl_Obj *const objv[], Tk_Window tkwin,
+				Tcl_Obj *CONST objv[], Tk_Window tkwin,
 				Tk_SavedOptions *savePtr, int *maskPtr);
+#endif
+#ifndef Tk_InitConsoleChannels_TCL_DECLARED
+#define Tk_InitConsoleChannels_TCL_DECLARED
 /* 215 */
 EXTERN void		Tk_InitConsoleChannels(Tcl_Interp *interp);
+#endif
+#ifndef Tk_CreateConsoleWindow_TCL_DECLARED
+#define Tk_CreateConsoleWindow_TCL_DECLARED
 /* 216 */
 EXTERN int		Tk_CreateConsoleWindow(Tcl_Interp *interp);
+#endif
+#ifndef Tk_CreateSmoothMethod_TCL_DECLARED
+#define Tk_CreateSmoothMethod_TCL_DECLARED
 /* 217 */
 EXTERN void		Tk_CreateSmoothMethod(Tcl_Interp *interp,
 				Tk_SmoothMethod *method);
+#endif
 /* Slot 218 is reserved */
 /* Slot 219 is reserved */
+#ifndef Tk_GetDash_TCL_DECLARED
+#define Tk_GetDash_TCL_DECLARED
 /* 220 */
-EXTERN int		Tk_GetDash(Tcl_Interp *interp, const char *value,
+EXTERN int		Tk_GetDash(Tcl_Interp *interp, CONST char *value,
 				Tk_Dash *dash);
+#endif
+#ifndef Tk_CreateOutline_TCL_DECLARED
+#define Tk_CreateOutline_TCL_DECLARED
 /* 221 */
 EXTERN void		Tk_CreateOutline(Tk_Outline *outline);
+#endif
+#ifndef Tk_DeleteOutline_TCL_DECLARED
+#define Tk_DeleteOutline_TCL_DECLARED
 /* 222 */
 EXTERN void		Tk_DeleteOutline(Display *display,
 				Tk_Outline *outline);
+#endif
+#ifndef Tk_ConfigOutlineGC_TCL_DECLARED
+#define Tk_ConfigOutlineGC_TCL_DECLARED
 /* 223 */
 EXTERN int		Tk_ConfigOutlineGC(XGCValues *gcValues,
 				Tk_Canvas canvas, Tk_Item *item,
 				Tk_Outline *outline);
+#endif
+#ifndef Tk_ChangeOutlineGC_TCL_DECLARED
+#define Tk_ChangeOutlineGC_TCL_DECLARED
 /* 224 */
 EXTERN int		Tk_ChangeOutlineGC(Tk_Canvas canvas, Tk_Item *item,
 				Tk_Outline *outline);
+#endif
+#ifndef Tk_ResetOutlineGC_TCL_DECLARED
+#define Tk_ResetOutlineGC_TCL_DECLARED
 /* 225 */
 EXTERN int		Tk_ResetOutlineGC(Tk_Canvas canvas, Tk_Item *item,
 				Tk_Outline *outline);
+#endif
+#ifndef Tk_CanvasPsOutline_TCL_DECLARED
+#define Tk_CanvasPsOutline_TCL_DECLARED
 /* 226 */
 EXTERN int		Tk_CanvasPsOutline(Tk_Canvas canvas, Tk_Item *item,
 				Tk_Outline *outline);
+#endif
+#ifndef Tk_SetTSOrigin_TCL_DECLARED
+#define Tk_SetTSOrigin_TCL_DECLARED
 /* 227 */
 EXTERN void		Tk_SetTSOrigin(Tk_Window tkwin, GC gc, int x, int y);
+#endif
+#ifndef Tk_CanvasGetCoordFromObj_TCL_DECLARED
+#define Tk_CanvasGetCoordFromObj_TCL_DECLARED
 /* 228 */
 EXTERN int		Tk_CanvasGetCoordFromObj(Tcl_Interp *interp,
 				Tk_Canvas canvas, Tcl_Obj *obj,
 				double *doublePtr);
+#endif
+#ifndef Tk_CanvasSetOffset_TCL_DECLARED
+#define Tk_CanvasSetOffset_TCL_DECLARED
 /* 229 */
 EXTERN void		Tk_CanvasSetOffset(Tk_Canvas canvas, GC gc,
 				Tk_TSOffset *offset);
+#endif
+#ifndef Tk_DitherPhoto_TCL_DECLARED
+#define Tk_DitherPhoto_TCL_DECLARED
 /* 230 */
 EXTERN void		Tk_DitherPhoto(Tk_PhotoHandle handle, int x, int y,
 				int width, int height);
+#endif
+#ifndef Tk_PostscriptBitmap_TCL_DECLARED
+#define Tk_PostscriptBitmap_TCL_DECLARED
 /* 231 */
 EXTERN int		Tk_PostscriptBitmap(Tcl_Interp *interp,
 				Tk_Window tkwin, Tk_PostscriptInfo psInfo,
 				Pixmap bitmap, int startX, int startY,
 				int width, int height);
+#endif
+#ifndef Tk_PostscriptColor_TCL_DECLARED
+#define Tk_PostscriptColor_TCL_DECLARED
 /* 232 */
 EXTERN int		Tk_PostscriptColor(Tcl_Interp *interp,
 				Tk_PostscriptInfo psInfo, XColor *colorPtr);
+#endif
+#ifndef Tk_PostscriptFont_TCL_DECLARED
+#define Tk_PostscriptFont_TCL_DECLARED
 /* 233 */
 EXTERN int		Tk_PostscriptFont(Tcl_Interp *interp,
 				Tk_PostscriptInfo psInfo, Tk_Font font);
+#endif
+#ifndef Tk_PostscriptImage_TCL_DECLARED
+#define Tk_PostscriptImage_TCL_DECLARED
 /* 234 */
 EXTERN int		Tk_PostscriptImage(Tk_Image image,
 				Tcl_Interp *interp, Tk_Window tkwin,
 				Tk_PostscriptInfo psinfo, int x, int y,
 				int width, int height, int prepass);
+#endif
+#ifndef Tk_PostscriptPath_TCL_DECLARED
+#define Tk_PostscriptPath_TCL_DECLARED
 /* 235 */
 EXTERN void		Tk_PostscriptPath(Tcl_Interp *interp,
 				Tk_PostscriptInfo psInfo, double *coordPtr,
 				int numPoints);
+#endif
+#ifndef Tk_PostscriptStipple_TCL_DECLARED
+#define Tk_PostscriptStipple_TCL_DECLARED
 /* 236 */
 EXTERN int		Tk_PostscriptStipple(Tcl_Interp *interp,
 				Tk_Window tkwin, Tk_PostscriptInfo psInfo,
 				Pixmap bitmap);
+#endif
+#ifndef Tk_PostscriptY_TCL_DECLARED
+#define Tk_PostscriptY_TCL_DECLARED
 /* 237 */
 EXTERN double		Tk_PostscriptY(double y, Tk_PostscriptInfo psInfo);
+#endif
+#ifndef Tk_PostscriptPhoto_TCL_DECLARED
+#define Tk_PostscriptPhoto_TCL_DECLARED
 /* 238 */
 EXTERN int		Tk_PostscriptPhoto(Tcl_Interp *interp,
 				Tk_PhotoImageBlock *blockPtr,
 				Tk_PostscriptInfo psInfo, int width,
 				int height);
+#endif
+#ifndef Tk_CreateClientMessageHandler_TCL_DECLARED
+#define Tk_CreateClientMessageHandler_TCL_DECLARED
 /* 239 */
 EXTERN void		Tk_CreateClientMessageHandler(
 				Tk_ClientMessageProc *proc);
+#endif
+#ifndef Tk_DeleteClientMessageHandler_TCL_DECLARED
+#define Tk_DeleteClientMessageHandler_TCL_DECLARED
 /* 240 */
 EXTERN void		Tk_DeleteClientMessageHandler(
 				Tk_ClientMessageProc *proc);
+#endif
+#ifndef Tk_CreateAnonymousWindow_TCL_DECLARED
+#define Tk_CreateAnonymousWindow_TCL_DECLARED
 /* 241 */
 EXTERN Tk_Window	Tk_CreateAnonymousWindow(Tcl_Interp *interp,
-				Tk_Window parent, const char *screenName);
+				Tk_Window parent, CONST char *screenName);
+#endif
+#ifndef Tk_SetClassProcs_TCL_DECLARED
+#define Tk_SetClassProcs_TCL_DECLARED
 /* 242 */
 EXTERN void		Tk_SetClassProcs(Tk_Window tkwin,
 				Tk_ClassProcs *procs,
 				ClientData instanceData);
+#endif
+#ifndef Tk_SetInternalBorderEx_TCL_DECLARED
+#define Tk_SetInternalBorderEx_TCL_DECLARED
 /* 243 */
 EXTERN void		Tk_SetInternalBorderEx(Tk_Window tkwin, int left,
 				int right, int top, int bottom);
+#endif
+#ifndef Tk_SetMinimumRequestSize_TCL_DECLARED
+#define Tk_SetMinimumRequestSize_TCL_DECLARED
 /* 244 */
 EXTERN void		Tk_SetMinimumRequestSize(Tk_Window tkwin,
 				int minWidth, int minHeight);
+#endif
+#ifndef Tk_SetCaretPos_TCL_DECLARED
+#define Tk_SetCaretPos_TCL_DECLARED
 /* 245 */
 EXTERN void		Tk_SetCaretPos(Tk_Window tkwin, int x, int y,
 				int height);
+#endif
+#ifndef Tk_PhotoPutBlock_Panic_TCL_DECLARED
+#define Tk_PhotoPutBlock_Panic_TCL_DECLARED
 /* 246 */
 EXTERN void		Tk_PhotoPutBlock_Panic(Tk_PhotoHandle handle,
 				Tk_PhotoImageBlock *blockPtr, int x, int y,
 				int width, int height, int compRule);
+#endif
+#ifndef Tk_PhotoPutZoomedBlock_Panic_TCL_DECLARED
+#define Tk_PhotoPutZoomedBlock_Panic_TCL_DECLARED
 /* 247 */
 EXTERN 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);
+#endif
+#ifndef Tk_CollapseMotionEvents_TCL_DECLARED
+#define Tk_CollapseMotionEvents_TCL_DECLARED
 /* 248 */
 EXTERN int		Tk_CollapseMotionEvents(Display *display,
 				int collapse);
+#endif
+#ifndef Tk_RegisterStyleEngine_TCL_DECLARED
+#define Tk_RegisterStyleEngine_TCL_DECLARED
 /* 249 */
-EXTERN Tk_StyleEngine	Tk_RegisterStyleEngine(const char *name,
+EXTERN Tk_StyleEngine	Tk_RegisterStyleEngine(CONST char *name,
 				Tk_StyleEngine parent);
+#endif
+#ifndef Tk_GetStyleEngine_TCL_DECLARED
+#define Tk_GetStyleEngine_TCL_DECLARED
 /* 250 */
-EXTERN Tk_StyleEngine	Tk_GetStyleEngine(const char *name);
+EXTERN Tk_StyleEngine	Tk_GetStyleEngine(CONST char *name);
+#endif
+#ifndef Tk_RegisterStyledElement_TCL_DECLARED
+#define Tk_RegisterStyledElement_TCL_DECLARED
 /* 251 */
 EXTERN int		Tk_RegisterStyledElement(Tk_StyleEngine engine,
 				Tk_ElementSpec *templatePtr);
+#endif
+#ifndef Tk_GetElementId_TCL_DECLARED
+#define Tk_GetElementId_TCL_DECLARED
 /* 252 */
-EXTERN int		Tk_GetElementId(const char *name);
+EXTERN int		Tk_GetElementId(CONST char *name);
+#endif
+#ifndef Tk_CreateStyle_TCL_DECLARED
+#define Tk_CreateStyle_TCL_DECLARED
 /* 253 */
-EXTERN Tk_Style		Tk_CreateStyle(const char *name,
+EXTERN Tk_Style		Tk_CreateStyle(CONST char *name,
 				Tk_StyleEngine engine, ClientData clientData);
+#endif
+#ifndef Tk_GetStyle_TCL_DECLARED
+#define Tk_GetStyle_TCL_DECLARED
 /* 254 */
-EXTERN Tk_Style		Tk_GetStyle(Tcl_Interp *interp, const char *name);
+EXTERN Tk_Style		Tk_GetStyle(Tcl_Interp *interp, CONST char *name);
+#endif
+#ifndef Tk_FreeStyle_TCL_DECLARED
+#define Tk_FreeStyle_TCL_DECLARED
 /* 255 */
 EXTERN void		Tk_FreeStyle(Tk_Style style);
+#endif
+#ifndef Tk_NameOfStyle_TCL_DECLARED
+#define Tk_NameOfStyle_TCL_DECLARED
 /* 256 */
-EXTERN const char *	Tk_NameOfStyle(Tk_Style style);
+EXTERN CONST char *	Tk_NameOfStyle(Tk_Style style);
+#endif
+#ifndef Tk_AllocStyleFromObj_TCL_DECLARED
+#define Tk_AllocStyleFromObj_TCL_DECLARED
 /* 257 */
 EXTERN Tk_Style		Tk_AllocStyleFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr);
+#endif
+#ifndef Tk_GetStyleFromObj_TCL_DECLARED
+#define Tk_GetStyleFromObj_TCL_DECLARED
 /* 258 */
 EXTERN Tk_Style		Tk_GetStyleFromObj(Tcl_Obj *objPtr);
+#endif
+#ifndef Tk_FreeStyleFromObj_TCL_DECLARED
+#define Tk_FreeStyleFromObj_TCL_DECLARED
 /* 259 */
 EXTERN void		Tk_FreeStyleFromObj(Tcl_Obj *objPtr);
+#endif
+#ifndef Tk_GetStyledElement_TCL_DECLARED
+#define Tk_GetStyledElement_TCL_DECLARED
 /* 260 */
 EXTERN Tk_StyledElement	 Tk_GetStyledElement(Tk_Style style, int elementId,
 				Tk_OptionTable optionTable);
+#endif
+#ifndef Tk_GetElementSize_TCL_DECLARED
+#define Tk_GetElementSize_TCL_DECLARED
 /* 261 */
 EXTERN void		Tk_GetElementSize(Tk_Style style,
 				Tk_StyledElement element, char *recordPtr,
 				Tk_Window tkwin, int width, int height,
 				int inner, int *widthPtr, int *heightPtr);
+#endif
+#ifndef Tk_GetElementBox_TCL_DECLARED
+#define Tk_GetElementBox_TCL_DECLARED
 /* 262 */
 EXTERN void		Tk_GetElementBox(Tk_Style style,
 				Tk_StyledElement element, char *recordPtr,
 				Tk_Window tkwin, int x, int y, int width,
 				int height, int inner, int *xPtr, int *yPtr,
 				int *widthPtr, int *heightPtr);
+#endif
+#ifndef Tk_GetElementBorderWidth_TCL_DECLARED
+#define Tk_GetElementBorderWidth_TCL_DECLARED
 /* 263 */
 EXTERN int		Tk_GetElementBorderWidth(Tk_Style style,
 				Tk_StyledElement element, char *recordPtr,
 				Tk_Window tkwin);
+#endif
+#ifndef Tk_DrawElement_TCL_DECLARED
+#define Tk_DrawElement_TCL_DECLARED
 /* 264 */
 EXTERN void		Tk_DrawElement(Tk_Style style,
 				Tk_StyledElement element, char *recordPtr,
 				Tk_Window tkwin, Drawable d, int x, int y,
 				int width, int height, int state);
+#endif
+#ifndef Tk_PhotoExpand_TCL_DECLARED
+#define Tk_PhotoExpand_TCL_DECLARED
 /* 265 */
 EXTERN int		Tk_PhotoExpand(Tcl_Interp *interp,
 				Tk_PhotoHandle handle, int width, int height);
+#endif
+#ifndef Tk_PhotoPutBlock_TCL_DECLARED
+#define Tk_PhotoPutBlock_TCL_DECLARED
 /* 266 */
 EXTERN int		Tk_PhotoPutBlock(Tcl_Interp *interp,
 				Tk_PhotoHandle handle,
 				Tk_PhotoImageBlock *blockPtr, int x, int y,
 				int width, int height, int compRule);
+#endif
+#ifndef Tk_PhotoPutZoomedBlock_TCL_DECLARED
+#define Tk_PhotoPutZoomedBlock_TCL_DECLARED
 /* 267 */
 EXTERN int		Tk_PhotoPutZoomedBlock(Tcl_Interp *interp,
 				Tk_PhotoHandle handle,
 				Tk_PhotoImageBlock *blockPtr, int x, int y,
 				int width, int height, int zoomX, int zoomY,
 				int subsampleX, int subsampleY, int compRule);
+#endif
+#ifndef Tk_PhotoSetSize_TCL_DECLARED
+#define Tk_PhotoSetSize_TCL_DECLARED
 /* 268 */
 EXTERN int		Tk_PhotoSetSize(Tcl_Interp *interp,
 				Tk_PhotoHandle handle, int width, int height);
+#endif
+#ifndef Tk_GetUserInactiveTime_TCL_DECLARED
+#define Tk_GetUserInactiveTime_TCL_DECLARED
 /* 269 */
 EXTERN long		Tk_GetUserInactiveTime(Display *dpy);
+#endif
+#ifndef Tk_ResetUserInactiveTime_TCL_DECLARED
+#define Tk_ResetUserInactiveTime_TCL_DECLARED
 /* 270 */
 EXTERN void		Tk_ResetUserInactiveTime(Display *dpy);
+#endif
+#ifndef Tk_Interp_TCL_DECLARED
+#define Tk_Interp_TCL_DECLARED
 /* 271 */
 EXTERN Tcl_Interp *	Tk_Interp(Tk_Window tkwin);
+#endif
+#ifndef Tk_CreateOldImageType_TCL_DECLARED
+#define Tk_CreateOldImageType_TCL_DECLARED
 /* 272 */
 EXTERN void		Tk_CreateOldImageType(Tk_ImageType *typePtr);
+#endif
+#ifndef Tk_CreateOldPhotoImageFormat_TCL_DECLARED
+#define Tk_CreateOldPhotoImageFormat_TCL_DECLARED
 /* 273 */
 EXTERN void		Tk_CreateOldPhotoImageFormat(
 				Tk_PhotoImageFormat *formatPtr);
+#endif
 /* Slot 274 is reserved */
 /* Slot 275 is reserved */
 /* Slot 276 is reserved */
 /* Slot 277 is reserved */
 /* Slot 278 is reserved */
 /* Slot 279 is reserved */
+#ifndef TkUnusedStubEntry_TCL_DECLARED
+#define TkUnusedStubEntry_TCL_DECLARED
 /* 280 */
 EXTERN void		TkUnusedStubEntry(void);
+#endif
 
-typedef struct {
-    const struct TkPlatStubs *tkPlatStubs;
-    const struct TkIntStubs *tkIntStubs;
-    const struct TkIntPlatStubs *tkIntPlatStubs;
-    const struct TkIntXlibStubs *tkIntXlibStubs;
+typedef struct TkStubHooks {
+    struct TkPlatStubs *tkPlatStubs;
+    struct TkIntStubs *tkIntStubs;
+    struct TkIntPlatStubs *tkIntPlatStubs;
+    struct TkIntXlibStubs *tkIntXlibStubs;
 } TkStubHooks;
 
 typedef struct TkStubs {
     int magic;
-    const TkStubHooks *hooks;
+    struct TkStubHooks *hooks;
 
     void (*tk_MainLoop) (void); /* 0 */
     XColor * (*tk_3DBorderColor) (Tk_3DBorder border); /* 1 */
     GC (*tk_3DBorderGC) (Tk_Window tkwin, Tk_3DBorder border, int which); /* 2 */
     void (*tk_3DHorizontalBevel) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int leftIn, int rightIn, int topBevel, int relief); /* 3 */
     void (*tk_3DVerticalBevel) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int leftBevel, int relief); /* 4 */
-    void (*tk_AddOption) (Tk_Window tkwin, const char *name, const char *value, int priority); /* 5 */
+    void (*tk_AddOption) (Tk_Window tkwin, CONST char *name, CONST char *value, int priority); /* 5 */
     void (*tk_BindEvent) (Tk_BindingTable bindingTable, XEvent *eventPtr, Tk_Window tkwin, int numObjects, ClientData *objectPtr); /* 6 */
     void (*tk_CanvasDrawableCoords) (Tk_Canvas canvas, double x, double y, short *drawableXPtr, short *drawableYPtr); /* 7 */
     void (*tk_CanvasEventuallyRedraw) (Tk_Canvas canvas, int x1, int y1, int x2, int y2); /* 8 */
-    int (*tk_CanvasGetCoord) (Tcl_Interp *interp, Tk_Canvas canvas, const char *str, double *doublePtr); /* 9 */
+    int (*tk_CanvasGetCoord) (Tcl_Interp *interp, Tk_Canvas canvas, CONST char *str, double *doublePtr); /* 9 */
     Tk_CanvasTextInfo * (*tk_CanvasGetTextInfo) (Tk_Canvas canvas); /* 10 */
     int (*tk_CanvasPsBitmap) (Tcl_Interp *interp, Tk_Canvas canvas, Pixmap bitmap, int x, int y, int width, int height); /* 11 */
     int (*tk_CanvasPsColor) (Tcl_Interp *interp, Tk_Canvas canvas, XColor *colorPtr); /* 12 */
@@ -900,7 +1719,7 @@ typedef struct TkStubs {
     int (*tk_CanvasPsStipple) (Tcl_Interp *interp, Tk_Canvas canvas, Pixmap bitmap); /* 15 */
     double (*tk_CanvasPsY) (Tk_Canvas canvas, double y); /* 16 */
     void (*tk_CanvasSetStippleOrigin) (Tk_Canvas canvas, GC gc); /* 17 */
-    int (*tk_CanvasTagsParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset); /* 18 */
+    int (*tk_CanvasTagsParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, CONST char *value, char *widgRec, int offset); /* 18 */
     char * (*tk_CanvasTagsPrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 19 */
     Tk_Window (*tk_CanvasTkwin) (Tk_Canvas canvas); /* 20 */
     void (*tk_CanvasWindowCoords) (Tk_Canvas canvas, double x, double y, short *screenXPtr, short *screenYPtr); /* 21 */
@@ -909,13 +1728,13 @@ typedef struct TkStubs {
     void (*tk_ClearSelection) (Tk_Window tkwin, Atom selection); /* 24 */
     int (*tk_ClipboardAppend) (Tcl_Interp *interp, Tk_Window tkwin, Atom target, Atom format, char *buffer); /* 25 */
     int (*tk_ClipboardClear) (Tcl_Interp *interp, Tk_Window tkwin); /* 26 */
-    int (*tk_ConfigureInfo) (Tcl_Interp *interp, Tk_Window tkwin, Tk_ConfigSpec *specs, char *widgRec, const char *argvName, int flags); /* 27 */
-    int (*tk_ConfigureValue) (Tcl_Interp *interp, Tk_Window tkwin, Tk_ConfigSpec *specs, char *widgRec, const char *argvName, int flags); /* 28 */
+    int (*tk_ConfigureInfo) (Tcl_Interp *interp, Tk_Window tkwin, Tk_ConfigSpec *specs, char *widgRec, CONST char *argvName, int flags); /* 27 */
+    int (*tk_ConfigureValue) (Tcl_Interp *interp, Tk_Window tkwin, Tk_ConfigSpec *specs, char *widgRec, CONST char *argvName, int flags); /* 28 */
     int (*tk_ConfigureWidget) (Tcl_Interp *interp, Tk_Window tkwin, Tk_ConfigSpec *specs, int argc, CONST84 char **argv, char *widgRec, int flags); /* 29 */
     void (*tk_ConfigureWindow) (Tk_Window tkwin, unsigned int valueMask, XWindowChanges *valuePtr); /* 30 */
-    Tk_TextLayout (*tk_ComputeTextLayout) (Tk_Font font, const char *str, int numChars, int wrapLength, Tk_Justify justify, int flags, int *widthPtr, int *heightPtr); /* 31 */
+    Tk_TextLayout (*tk_ComputeTextLayout) (Tk_Font font, CONST char *str, int numChars, int wrapLength, Tk_Justify justify, int flags, int *widthPtr, int *heightPtr); /* 31 */
     Tk_Window (*tk_CoordsToWindow) (int rootX, int rootY, Tk_Window tkwin); /* 32 */
-    unsigned long (*tk_CreateBinding) (Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, const char *eventStr, const char *command, int append); /* 33 */
+    unsigned long (*tk_CreateBinding) (Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, CONST char *eventStr, CONST char *command, int append); /* 33 */
     Tk_BindingTable (*tk_CreateBindingTable) (Tcl_Interp *interp); /* 34 */
     Tk_ErrorHandler (*tk_CreateErrorHandler) (Display *display, int errNum, int request, int minorCode, Tk_ErrorProc *errorProc, ClientData clientData); /* 35 */
     void (*tk_CreateEventHandler) (Tk_Window token, unsigned long mask, Tk_EventProc *proc, ClientData clientData); /* 36 */
@@ -924,29 +1743,29 @@ typedef struct TkStubs {
     void (*tk_CreateItemType) (Tk_ItemType *typePtr); /* 39 */
     void (*tk_CreatePhotoImageFormat) (Tk_PhotoImageFormat *formatPtr); /* 40 */
     void (*tk_CreateSelHandler) (Tk_Window tkwin, Atom selection, Atom target, Tk_SelectionProc *proc, ClientData clientData, Atom format); /* 41 */
-    Tk_Window (*tk_CreateWindow) (Tcl_Interp *interp, Tk_Window parent, const char *name, const char *screenName); /* 42 */
-    Tk_Window (*tk_CreateWindowFromPath) (Tcl_Interp *interp, Tk_Window tkwin, const char *pathName, const char *screenName); /* 43 */
-    int (*tk_DefineBitmap) (Tcl_Interp *interp, const char *name, const char *source, int width, int height); /* 44 */
+    Tk_Window (*tk_CreateWindow) (Tcl_Interp *interp, Tk_Window parent, CONST char *name, CONST char *screenName); /* 42 */
+    Tk_Window (*tk_CreateWindowFromPath) (Tcl_Interp *interp, Tk_Window tkwin, CONST char *pathName, CONST char *screenName); /* 43 */
+    int (*tk_DefineBitmap) (Tcl_Interp *interp, CONST char *name, CONST char *source, int width, int height); /* 44 */
     void (*tk_DefineCursor) (Tk_Window window, Tk_Cursor cursor); /* 45 */
     void (*tk_DeleteAllBindings) (Tk_BindingTable bindingTable, ClientData object); /* 46 */
-    int (*tk_DeleteBinding) (Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, const char *eventStr); /* 47 */
+    int (*tk_DeleteBinding) (Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, CONST char *eventStr); /* 47 */
     void (*tk_DeleteBindingTable) (Tk_BindingTable bindingTable); /* 48 */
     void (*tk_DeleteErrorHandler) (Tk_ErrorHandler handler); /* 49 */
     void (*tk_DeleteEventHandler) (Tk_Window token, unsigned long mask, Tk_EventProc *proc, ClientData clientData); /* 50 */
     void (*tk_DeleteGenericHandler) (Tk_GenericProc *proc, ClientData clientData); /* 51 */
-    void (*tk_DeleteImage) (Tcl_Interp *interp, const char *name); /* 52 */
+    void (*tk_DeleteImage) (Tcl_Interp *interp, CONST char *name); /* 52 */
     void (*tk_DeleteSelHandler) (Tk_Window tkwin, Atom selection, Atom target); /* 53 */
     void (*tk_DestroyWindow) (Tk_Window tkwin); /* 54 */
     CONST84_RETURN char * (*tk_DisplayName) (Tk_Window tkwin); /* 55 */
     int (*tk_DistanceToTextLayout) (Tk_TextLayout layout, int x, int y); /* 56 */
     void (*tk_Draw3DPolygon) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, XPoint *pointPtr, int numPoints, int borderWidth, int leftRelief); /* 57 */
     void (*tk_Draw3DRectangle) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int borderWidth, int relief); /* 58 */
-    void (*tk_DrawChars) (Display *display, Drawable drawable, GC gc, Tk_Font tkfont, const char *source, int numBytes, int x, int y); /* 59 */
+    void (*tk_DrawChars) (Display *display, Drawable drawable, GC gc, Tk_Font tkfont, CONST char *source, int numBytes, int x, int y); /* 59 */
     void (*tk_DrawFocusHighlight) (Tk_Window tkwin, GC gc, int width, Drawable drawable); /* 60 */
     void (*tk_DrawTextLayout) (Display *display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, int firstChar, int lastChar); /* 61 */
     void (*tk_Fill3DPolygon) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, XPoint *pointPtr, int numPoints, int borderWidth, int leftRelief); /* 62 */
     void (*tk_Fill3DRectangle) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int borderWidth, int relief); /* 63 */
-    Tk_PhotoHandle (*tk_FindPhoto) (Tcl_Interp *interp, const char *imageName); /* 64 */
+    Tk_PhotoHandle (*tk_FindPhoto) (Tcl_Interp *interp, CONST char *imageName); /* 64 */
     Font (*tk_FontId) (Tk_Font font); /* 65 */
     void (*tk_Free3DBorder) (Tk_3DBorder border); /* 66 */
     void (*tk_FreeBitmap) (Display *display, Pixmap bitmap); /* 67 */
@@ -964,51 +1783,51 @@ typedef struct TkStubs {
     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 */
     void (*tk_GetAllBindings) (Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object); /* 81 */
-    int (*tk_GetAnchor) (Tcl_Interp *interp, const char *str, Tk_Anchor *anchorPtr); /* 82 */
+    int (*tk_GetAnchor) (Tcl_Interp *interp, CONST char *str, Tk_Anchor *anchorPtr); /* 82 */
     CONST84_RETURN char * (*tk_GetAtomName) (Tk_Window tkwin, Atom atom); /* 83 */
-    CONST84_RETURN char * (*tk_GetBinding) (Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, const char *eventStr); /* 84 */
-    Pixmap (*tk_GetBitmap) (Tcl_Interp *interp, Tk_Window tkwin, const char *str); /* 85 */
-    Pixmap (*tk_GetBitmapFromData) (Tcl_Interp *interp, Tk_Window tkwin, const char *source, int width, int height); /* 86 */
-    int (*tk_GetCapStyle) (Tcl_Interp *interp, const char *str, int *capPtr); /* 87 */
+    CONST84_RETURN char * (*tk_GetBinding) (Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, CONST char *eventStr); /* 84 */
+    Pixmap (*tk_GetBitmap) (Tcl_Interp *interp, Tk_Window tkwin, CONST char *str); /* 85 */
+    Pixmap (*tk_GetBitmapFromData) (Tcl_Interp *interp, Tk_Window tkwin, CONST char *source, int width, int height); /* 86 */
+    int (*tk_GetCapStyle) (Tcl_Interp *interp, CONST char *str, int *capPtr); /* 87 */
     XColor * (*tk_GetColor) (Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid name); /* 88 */
     XColor * (*tk_GetColorByValue) (Tk_Window tkwin, XColor *colorPtr); /* 89 */
-    Colormap (*tk_GetColormap) (Tcl_Interp *interp, Tk_Window tkwin, const char *str); /* 90 */
+    Colormap (*tk_GetColormap) (Tcl_Interp *interp, Tk_Window tkwin, CONST char *str); /* 90 */
     Tk_Cursor (*tk_GetCursor) (Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid str); /* 91 */
-    Tk_Cursor (*tk_GetCursorFromData) (Tcl_Interp *interp, Tk_Window tkwin, const char *source, const char *mask, int width, int height, int xHot, int yHot, Tk_Uid fg, Tk_Uid bg); /* 92 */
-    Tk_Font (*tk_GetFont) (Tcl_Interp *interp, Tk_Window tkwin, const char *str); /* 93 */
+    Tk_Cursor (*tk_GetCursorFromData) (Tcl_Interp *interp, Tk_Window tkwin, CONST char *source, CONST char *mask, int width, int height, int xHot, int yHot, Tk_Uid fg, Tk_Uid bg); /* 92 */
+    Tk_Font (*tk_GetFont) (Tcl_Interp *interp, Tk_Window tkwin, CONST char *str); /* 93 */
     Tk_Font (*tk_GetFontFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 94 */
     void (*tk_GetFontMetrics) (Tk_Font font, Tk_FontMetrics *fmPtr); /* 95 */
     GC (*tk_GetGC) (Tk_Window tkwin, unsigned long valueMask, XGCValues *valuePtr); /* 96 */
-    Tk_Image (*tk_GetImage) (Tcl_Interp *interp, Tk_Window tkwin, const char *name, Tk_ImageChangedProc *changeProc, ClientData clientData); /* 97 */
-    ClientData (*tk_GetImageMasterData) (Tcl_Interp *interp, const char *name, Tk_ImageType **typePtrPtr); /* 98 */
+    Tk_Image (*tk_GetImage) (Tcl_Interp *interp, Tk_Window tkwin, CONST char *name, Tk_ImageChangedProc *changeProc, ClientData clientData); /* 97 */
+    ClientData (*tk_GetImageMasterData) (Tcl_Interp *interp, CONST char *name, Tk_ImageType **typePtrPtr); /* 98 */
     Tk_ItemType * (*tk_GetItemTypes) (void); /* 99 */
-    int (*tk_GetJoinStyle) (Tcl_Interp *interp, const char *str, int *joinPtr); /* 100 */
-    int (*tk_GetJustify) (Tcl_Interp *interp, const char *str, Tk_Justify *justifyPtr); /* 101 */
+    int (*tk_GetJoinStyle) (Tcl_Interp *interp, CONST char *str, int *joinPtr); /* 100 */
+    int (*tk_GetJustify) (Tcl_Interp *interp, CONST char *str, Tk_Justify *justifyPtr); /* 101 */
     int (*tk_GetNumMainWindows) (void); /* 102 */
-    Tk_Uid (*tk_GetOption) (Tk_Window tkwin, const char *name, const char *className); /* 103 */
-    int (*tk_GetPixels) (Tcl_Interp *interp, Tk_Window tkwin, const char *str, int *intPtr); /* 104 */
+    Tk_Uid (*tk_GetOption) (Tk_Window tkwin, CONST char *name, CONST char *className); /* 103 */
+    int (*tk_GetPixels) (Tcl_Interp *interp, Tk_Window tkwin, CONST char *str, int *intPtr); /* 104 */
     Pixmap (*tk_GetPixmap) (Display *display, Drawable d, int width, int height, int depth); /* 105 */
-    int (*tk_GetRelief) (Tcl_Interp *interp, const char *name, int *reliefPtr); /* 106 */
+    int (*tk_GetRelief) (Tcl_Interp *interp, CONST char *name, int *reliefPtr); /* 106 */
     void (*tk_GetRootCoords) (Tk_Window tkwin, int *xPtr, int *yPtr); /* 107 */
     int (*tk_GetScrollInfo) (Tcl_Interp *interp, int argc, CONST84 char **argv, double *dblPtr, int *intPtr); /* 108 */
-    int (*tk_GetScreenMM) (Tcl_Interp *interp, Tk_Window tkwin, const char *str, double *doublePtr); /* 109 */
+    int (*tk_GetScreenMM) (Tcl_Interp *interp, Tk_Window tkwin, CONST char *str, double *doublePtr); /* 109 */
     int (*tk_GetSelection) (Tcl_Interp *interp, Tk_Window tkwin, Atom selection, Atom target, Tk_GetSelProc *proc, ClientData clientData); /* 110 */
-    Tk_Uid (*tk_GetUid) (const char *str); /* 111 */
-    Visual * (*tk_GetVisual) (Tcl_Interp *interp, Tk_Window tkwin, const char *str, int *depthPtr, Colormap *colormapPtr); /* 112 */
+    Tk_Uid (*tk_GetUid) (CONST char *str); /* 111 */
+    Visual * (*tk_GetVisual) (Tcl_Interp *interp, Tk_Window tkwin, CONST char *str, int *depthPtr, Colormap *colormapPtr); /* 112 */
     void (*tk_GetVRootGeometry) (Tk_Window tkwin, int *xPtr, int *yPtr, int *widthPtr, int *heightPtr); /* 113 */
     int (*tk_Grab) (Tcl_Interp *interp, Tk_Window tkwin, int grabGlobal); /* 114 */
     void (*tk_HandleEvent) (XEvent *eventPtr); /* 115 */
     Tk_Window (*tk_IdToWindow) (Display *display, Window window); /* 116 */
     void (*tk_ImageChanged) (Tk_ImageMaster master, int x, int y, int width, int height, int imageWidth, int imageHeight); /* 117 */
     int (*tk_Init) (Tcl_Interp *interp); /* 118 */
-    Atom (*tk_InternAtom) (Tk_Window tkwin, const char *name); /* 119 */
+    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 slave, Tk_Window master, int x, int y, int width, int height); /* 121 */
     Tk_Window (*tk_MainWindow) (Tcl_Interp *interp); /* 122 */
     void (*tk_MakeWindowExist) (Tk_Window tkwin); /* 123 */
-    void (*tk_ManageGeometry) (Tk_Window tkwin, const Tk_GeomMgr *mgrPtr, ClientData clientData); /* 124 */
+    void (*tk_ManageGeometry) (Tk_Window tkwin, CONST Tk_GeomMgr *mgrPtr, ClientData clientData); /* 124 */
     void (*tk_MapWindow) (Tk_Window tkwin); /* 125 */
-    int (*tk_MeasureChars) (Tk_Font tkfont, const char *source, int numBytes, int maxPixels, int flags, int *lengthPtr); /* 126 */
+    int (*tk_MeasureChars) (Tk_Font tkfont, CONST char *source, int numBytes, int maxPixels, int flags, int *lengthPtr); /* 126 */
     void (*tk_MoveResizeWindow) (Tk_Window tkwin, int x, int y, int width, int height); /* 127 */
     void (*tk_MoveWindow) (Tk_Window tkwin, int x, int y); /* 128 */
     void (*tk_MoveToplevelWindow) (Tk_Window tkwin, int x, int y); /* 129 */
@@ -1023,7 +1842,7 @@ typedef struct TkStubs {
     CONST84_RETURN char * (*tk_NameOfJoinStyle) (int join); /* 138 */
     CONST84_RETURN char * (*tk_NameOfJustify) (Tk_Justify justify); /* 139 */
     CONST84_RETURN char * (*tk_NameOfRelief) (int relief); /* 140 */
-    Tk_Window (*tk_NameToWindow) (Tcl_Interp *interp, const char *pathName, Tk_Window tkwin); /* 141 */
+    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, ClientData clientData); /* 142 */
     int (*tk_ParseArgv) (Tcl_Interp *interp, Tk_Window tkwin, int *argcPtr, CONST84 char **argv, Tk_ArgvInfo *argTable, int flags); /* 143 */
     void (*tk_PhotoPutBlock_NoComposite) (Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height); /* 144 */
@@ -1042,9 +1861,9 @@ typedef struct TkStubs {
     int (*tk_RestackWindow) (Tk_Window tkwin, int aboveBelow, Tk_Window other); /* 157 */
     Tk_RestrictProc * (*tk_RestrictEvents) (Tk_RestrictProc *proc, ClientData arg, ClientData *prevArgPtr); /* 158 */
     int (*tk_SafeInit) (Tcl_Interp *interp); /* 159 */
-    const char * (*tk_SetAppName) (Tk_Window tkwin, const char *name); /* 160 */
+    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 */
+    void (*tk_SetClass) (Tk_Window tkwin, CONST char *className); /* 162 */
     void (*tk_SetGrid) (Tk_Window tkwin, int reqWidth, int reqHeight, int gridWidth, int gridHeight); /* 163 */
     void (*tk_SetInternalBorder) (Tk_Window tkwin, int width); /* 164 */
     void (*tk_SetWindowBackground) (Tk_Window tkwin, unsigned long pixel); /* 165 */
@@ -1058,9 +1877,9 @@ typedef struct TkStubs {
     void (*tk_SizeOfImage) (Tk_Image image, int *widthPtr, int *heightPtr); /* 173 */
     int (*tk_StrictMotif) (Tk_Window tkwin); /* 174 */
     void (*tk_TextLayoutToPostscript) (Tcl_Interp *interp, Tk_TextLayout layout); /* 175 */
-    int (*tk_TextWidth) (Tk_Font font, const char *str, int numBytes); /* 176 */
+    int (*tk_TextWidth) (Tk_Font font, CONST char *str, int numBytes); /* 176 */
     void (*tk_UndefineCursor) (Tk_Window window); /* 177 */
-    void (*tk_UnderlineChars) (Display *display, Drawable drawable, GC gc, Tk_Font tkfont, const char *source, int x, int y, int firstByte, int lastByte); /* 178 */
+    void (*tk_UnderlineChars) (Display *display, Drawable drawable, GC gc, Tk_Font tkfont, CONST char *source, int x, int y, int firstByte, int lastByte); /* 178 */
     void (*tk_UnderlineTextLayout) (Display *display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, int underline); /* 179 */
     void (*tk_Ungrab) (Tk_Window tkwin); /* 180 */
     void (*tk_UnmaintainGeometry) (Tk_Window slave, Tk_Window master); /* 181 */
@@ -1072,7 +1891,7 @@ typedef struct TkStubs {
     XColor * (*tk_AllocColorFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr); /* 187 */
     Tk_Cursor (*tk_AllocCursorFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr); /* 188 */
     Tk_Font (*tk_AllocFontFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr); /* 189 */
-    Tk_OptionTable (*tk_CreateOptionTable) (Tcl_Interp *interp, const Tk_OptionSpec *templatePtr); /* 190 */
+    Tk_OptionTable (*tk_CreateOptionTable) (Tcl_Interp *interp, CONST Tk_OptionSpec *templatePtr); /* 190 */
     void (*tk_DeleteOptionTable) (Tk_OptionTable optionTable); /* 191 */
     void (*tk_Free3DBorderFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 192 */
     void (*tk_FreeBitmapFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 193 */
@@ -1092,17 +1911,17 @@ typedef struct TkStubs {
     int (*tk_GetMMFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr, double *doublePtr); /* 207 */
     int (*tk_GetPixelsFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr, int *intPtr); /* 208 */
     int (*tk_GetReliefFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *resultPtr); /* 209 */
-    int (*tk_GetScrollInfoObj) (Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], double *dblPtr, int *intPtr); /* 210 */
+    int (*tk_GetScrollInfoObj) (Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], double *dblPtr, int *intPtr); /* 210 */
     int (*tk_InitOptions) (Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionToken, Tk_Window tkwin); /* 211 */
     void (*tk_MainEx) (int argc, char **argv, Tcl_AppInitProc *appInitProc, Tcl_Interp *interp); /* 212 */
     void (*tk_RestoreSavedOptions) (Tk_SavedOptions *savePtr); /* 213 */
-    int (*tk_SetOptions) (Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionTable, int objc, Tcl_Obj *const objv[], Tk_Window tkwin, Tk_SavedOptions *savePtr, int *maskPtr); /* 214 */
+    int (*tk_SetOptions) (Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionTable, int 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 (*tk_CreateSmoothMethod) (Tcl_Interp *interp, Tk_SmoothMethod *method); /* 217 */
-    void (*reserved218)(void);
-    void (*reserved219)(void);
-    int (*tk_GetDash) (Tcl_Interp *interp, const char *value, Tk_Dash *dash); /* 220 */
+    VOID *reserved218;
+    VOID *reserved219;
+    int (*tk_GetDash) (Tcl_Interp *interp, CONST char *value, Tk_Dash *dash); /* 220 */
     void (*tk_CreateOutline) (Tk_Outline *outline); /* 221 */
     void (*tk_DeleteOutline) (Display *display, Tk_Outline *outline); /* 222 */
     int (*tk_ConfigOutlineGC) (XGCValues *gcValues, Tk_Canvas canvas, Tk_Item *item, Tk_Outline *outline); /* 223 */
@@ -1123,7 +1942,7 @@ typedef struct TkStubs {
     int (*tk_PostscriptPhoto) (Tcl_Interp *interp, Tk_PhotoImageBlock *blockPtr, Tk_PostscriptInfo psInfo, int width, int height); /* 238 */
     void (*tk_CreateClientMessageHandler) (Tk_ClientMessageProc *proc); /* 239 */
     void (*tk_DeleteClientMessageHandler) (Tk_ClientMessageProc *proc); /* 240 */
-    Tk_Window (*tk_CreateAnonymousWindow) (Tcl_Interp *interp, Tk_Window parent, const char *screenName); /* 241 */
+    Tk_Window (*tk_CreateAnonymousWindow) (Tcl_Interp *interp, Tk_Window parent, CONST char *screenName); /* 241 */
     void (*tk_SetClassProcs) (Tk_Window tkwin, Tk_ClassProcs *procs, ClientData instanceData); /* 242 */
     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 */
@@ -1131,14 +1950,14 @@ typedef struct TkStubs {
     void (*tk_PhotoPutBlock_Panic) (Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int compRule); /* 246 */
     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 */
     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 */
+    Tk_StyleEngine (*tk_RegisterStyleEngine) (CONST char *name, Tk_StyleEngine parent); /* 249 */
+    Tk_StyleEngine (*tk_GetStyleEngine) (CONST char *name); /* 250 */
     int (*tk_RegisterStyledElement) (Tk_StyleEngine engine, Tk_ElementSpec *templatePtr); /* 251 */
-    int (*tk_GetElementId) (const char *name); /* 252 */
-    Tk_Style (*tk_CreateStyle) (const char *name, Tk_StyleEngine engine, ClientData clientData); /* 253 */
-    Tk_Style (*tk_GetStyle) (Tcl_Interp *interp, const char *name); /* 254 */
+    int (*tk_GetElementId) (CONST char *name); /* 252 */
+    Tk_Style (*tk_CreateStyle) (CONST char *name, Tk_StyleEngine engine, ClientData clientData); /* 253 */
+    Tk_Style (*tk_GetStyle) (Tcl_Interp *interp, CONST char *name); /* 254 */
     void (*tk_FreeStyle) (Tk_Style style); /* 255 */
-    const char * (*tk_NameOfStyle) (Tk_Style style); /* 256 */
+    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 */
@@ -1156,583 +1975,1129 @@ typedef struct TkStubs {
     Tcl_Interp * (*tk_Interp) (Tk_Window tkwin); /* 271 */
     void (*tk_CreateOldImageType) (Tk_ImageType *typePtr); /* 272 */
     void (*tk_CreateOldPhotoImageFormat) (Tk_PhotoImageFormat *formatPtr); /* 273 */
-    void (*reserved274)(void);
-    void (*reserved275)(void);
-    void (*reserved276)(void);
-    void (*reserved277)(void);
-    void (*reserved278)(void);
-    void (*reserved279)(void);
+    VOID *reserved274;
+    VOID *reserved275;
+    VOID *reserved276;
+    VOID *reserved277;
+    VOID *reserved278;
+    VOID *reserved279;
     void (*tkUnusedStubEntry) (void); /* 280 */
 } TkStubs;
 
-extern const TkStubs *tkStubsPtr;
+extern TkStubs *tkStubsPtr;
 
 #ifdef __cplusplus
 }
 #endif
 
-#if defined(USE_TK_STUBS)
+#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
 
 /*
  * Inline function declarations:
  */
 
+#ifndef Tk_MainLoop
 #define Tk_MainLoop \
 	(tkStubsPtr->tk_MainLoop) /* 0 */
+#endif
+#ifndef Tk_3DBorderColor
 #define Tk_3DBorderColor \
 	(tkStubsPtr->tk_3DBorderColor) /* 1 */
+#endif
+#ifndef Tk_3DBorderGC
 #define Tk_3DBorderGC \
 	(tkStubsPtr->tk_3DBorderGC) /* 2 */
+#endif
+#ifndef Tk_3DHorizontalBevel
 #define Tk_3DHorizontalBevel \
 	(tkStubsPtr->tk_3DHorizontalBevel) /* 3 */
+#endif
+#ifndef Tk_3DVerticalBevel
 #define Tk_3DVerticalBevel \
 	(tkStubsPtr->tk_3DVerticalBevel) /* 4 */
+#endif
+#ifndef Tk_AddOption
 #define Tk_AddOption \
 	(tkStubsPtr->tk_AddOption) /* 5 */
+#endif
+#ifndef Tk_BindEvent
 #define Tk_BindEvent \
 	(tkStubsPtr->tk_BindEvent) /* 6 */
+#endif
+#ifndef Tk_CanvasDrawableCoords
 #define Tk_CanvasDrawableCoords \
 	(tkStubsPtr->tk_CanvasDrawableCoords) /* 7 */
+#endif
+#ifndef Tk_CanvasEventuallyRedraw
 #define Tk_CanvasEventuallyRedraw \
 	(tkStubsPtr->tk_CanvasEventuallyRedraw) /* 8 */
+#endif
+#ifndef Tk_CanvasGetCoord
 #define Tk_CanvasGetCoord \
 	(tkStubsPtr->tk_CanvasGetCoord) /* 9 */
+#endif
+#ifndef Tk_CanvasGetTextInfo
 #define Tk_CanvasGetTextInfo \
 	(tkStubsPtr->tk_CanvasGetTextInfo) /* 10 */
+#endif
+#ifndef Tk_CanvasPsBitmap
 #define Tk_CanvasPsBitmap \
 	(tkStubsPtr->tk_CanvasPsBitmap) /* 11 */
+#endif
+#ifndef Tk_CanvasPsColor
 #define Tk_CanvasPsColor \
 	(tkStubsPtr->tk_CanvasPsColor) /* 12 */
+#endif
+#ifndef Tk_CanvasPsFont
 #define Tk_CanvasPsFont \
 	(tkStubsPtr->tk_CanvasPsFont) /* 13 */
+#endif
+#ifndef Tk_CanvasPsPath
 #define Tk_CanvasPsPath \
 	(tkStubsPtr->tk_CanvasPsPath) /* 14 */
+#endif
+#ifndef Tk_CanvasPsStipple
 #define Tk_CanvasPsStipple \
 	(tkStubsPtr->tk_CanvasPsStipple) /* 15 */
+#endif
+#ifndef Tk_CanvasPsY
 #define Tk_CanvasPsY \
 	(tkStubsPtr->tk_CanvasPsY) /* 16 */
+#endif
+#ifndef Tk_CanvasSetStippleOrigin
 #define Tk_CanvasSetStippleOrigin \
 	(tkStubsPtr->tk_CanvasSetStippleOrigin) /* 17 */
+#endif
+#ifndef Tk_CanvasTagsParseProc
 #define Tk_CanvasTagsParseProc \
 	(tkStubsPtr->tk_CanvasTagsParseProc) /* 18 */
+#endif
+#ifndef Tk_CanvasTagsPrintProc
 #define Tk_CanvasTagsPrintProc \
 	(tkStubsPtr->tk_CanvasTagsPrintProc) /* 19 */
+#endif
+#ifndef Tk_CanvasTkwin
 #define Tk_CanvasTkwin \
 	(tkStubsPtr->tk_CanvasTkwin) /* 20 */
+#endif
+#ifndef Tk_CanvasWindowCoords
 #define Tk_CanvasWindowCoords \
 	(tkStubsPtr->tk_CanvasWindowCoords) /* 21 */
+#endif
+#ifndef Tk_ChangeWindowAttributes
 #define Tk_ChangeWindowAttributes \
 	(tkStubsPtr->tk_ChangeWindowAttributes) /* 22 */
+#endif
+#ifndef Tk_CharBbox
 #define Tk_CharBbox \
 	(tkStubsPtr->tk_CharBbox) /* 23 */
+#endif
+#ifndef Tk_ClearSelection
 #define Tk_ClearSelection \
 	(tkStubsPtr->tk_ClearSelection) /* 24 */
+#endif
+#ifndef Tk_ClipboardAppend
 #define Tk_ClipboardAppend \
 	(tkStubsPtr->tk_ClipboardAppend) /* 25 */
+#endif
+#ifndef Tk_ClipboardClear
 #define Tk_ClipboardClear \
 	(tkStubsPtr->tk_ClipboardClear) /* 26 */
+#endif
+#ifndef Tk_ConfigureInfo
 #define Tk_ConfigureInfo \
 	(tkStubsPtr->tk_ConfigureInfo) /* 27 */
+#endif
+#ifndef Tk_ConfigureValue
 #define Tk_ConfigureValue \
 	(tkStubsPtr->tk_ConfigureValue) /* 28 */
+#endif
+#ifndef Tk_ConfigureWidget
 #define Tk_ConfigureWidget \
 	(tkStubsPtr->tk_ConfigureWidget) /* 29 */
+#endif
+#ifndef Tk_ConfigureWindow
 #define Tk_ConfigureWindow \
 	(tkStubsPtr->tk_ConfigureWindow) /* 30 */
+#endif
+#ifndef Tk_ComputeTextLayout
 #define Tk_ComputeTextLayout \
 	(tkStubsPtr->tk_ComputeTextLayout) /* 31 */
+#endif
+#ifndef Tk_CoordsToWindow
 #define Tk_CoordsToWindow \
 	(tkStubsPtr->tk_CoordsToWindow) /* 32 */
+#endif
+#ifndef Tk_CreateBinding
 #define Tk_CreateBinding \
 	(tkStubsPtr->tk_CreateBinding) /* 33 */
+#endif
+#ifndef Tk_CreateBindingTable
 #define Tk_CreateBindingTable \
 	(tkStubsPtr->tk_CreateBindingTable) /* 34 */
+#endif
+#ifndef Tk_CreateErrorHandler
 #define Tk_CreateErrorHandler \
 	(tkStubsPtr->tk_CreateErrorHandler) /* 35 */
+#endif
+#ifndef Tk_CreateEventHandler
 #define Tk_CreateEventHandler \
 	(tkStubsPtr->tk_CreateEventHandler) /* 36 */
+#endif
+#ifndef Tk_CreateGenericHandler
 #define Tk_CreateGenericHandler \
 	(tkStubsPtr->tk_CreateGenericHandler) /* 37 */
+#endif
+#ifndef Tk_CreateImageType
 #define Tk_CreateImageType \
 	(tkStubsPtr->tk_CreateImageType) /* 38 */
+#endif
+#ifndef Tk_CreateItemType
 #define Tk_CreateItemType \
 	(tkStubsPtr->tk_CreateItemType) /* 39 */
+#endif
+#ifndef Tk_CreatePhotoImageFormat
 #define Tk_CreatePhotoImageFormat \
 	(tkStubsPtr->tk_CreatePhotoImageFormat) /* 40 */
+#endif
+#ifndef Tk_CreateSelHandler
 #define Tk_CreateSelHandler \
 	(tkStubsPtr->tk_CreateSelHandler) /* 41 */
+#endif
+#ifndef Tk_CreateWindow
 #define Tk_CreateWindow \
 	(tkStubsPtr->tk_CreateWindow) /* 42 */
+#endif
+#ifndef Tk_CreateWindowFromPath
 #define Tk_CreateWindowFromPath \
 	(tkStubsPtr->tk_CreateWindowFromPath) /* 43 */
+#endif
+#ifndef Tk_DefineBitmap
 #define Tk_DefineBitmap \
 	(tkStubsPtr->tk_DefineBitmap) /* 44 */
+#endif
+#ifndef Tk_DefineCursor
 #define Tk_DefineCursor \
 	(tkStubsPtr->tk_DefineCursor) /* 45 */
+#endif
+#ifndef Tk_DeleteAllBindings
 #define Tk_DeleteAllBindings \
 	(tkStubsPtr->tk_DeleteAllBindings) /* 46 */
+#endif
+#ifndef Tk_DeleteBinding
 #define Tk_DeleteBinding \
 	(tkStubsPtr->tk_DeleteBinding) /* 47 */
+#endif
+#ifndef Tk_DeleteBindingTable
 #define Tk_DeleteBindingTable \
 	(tkStubsPtr->tk_DeleteBindingTable) /* 48 */
+#endif
+#ifndef Tk_DeleteErrorHandler
 #define Tk_DeleteErrorHandler \
 	(tkStubsPtr->tk_DeleteErrorHandler) /* 49 */
+#endif
+#ifndef Tk_DeleteEventHandler
 #define Tk_DeleteEventHandler \
 	(tkStubsPtr->tk_DeleteEventHandler) /* 50 */
+#endif
+#ifndef Tk_DeleteGenericHandler
 #define Tk_DeleteGenericHandler \
 	(tkStubsPtr->tk_DeleteGenericHandler) /* 51 */
+#endif
+#ifndef Tk_DeleteImage
 #define Tk_DeleteImage \
 	(tkStubsPtr->tk_DeleteImage) /* 52 */
+#endif
+#ifndef Tk_DeleteSelHandler
 #define Tk_DeleteSelHandler \
 	(tkStubsPtr->tk_DeleteSelHandler) /* 53 */
+#endif
+#ifndef Tk_DestroyWindow
 #define Tk_DestroyWindow \
 	(tkStubsPtr->tk_DestroyWindow) /* 54 */
+#endif
+#ifndef Tk_DisplayName
 #define Tk_DisplayName \
 	(tkStubsPtr->tk_DisplayName) /* 55 */
+#endif
+#ifndef Tk_DistanceToTextLayout
 #define Tk_DistanceToTextLayout \
 	(tkStubsPtr->tk_DistanceToTextLayout) /* 56 */
+#endif
+#ifndef Tk_Draw3DPolygon
 #define Tk_Draw3DPolygon \
 	(tkStubsPtr->tk_Draw3DPolygon) /* 57 */
+#endif
+#ifndef Tk_Draw3DRectangle
 #define Tk_Draw3DRectangle \
 	(tkStubsPtr->tk_Draw3DRectangle) /* 58 */
+#endif
+#ifndef Tk_DrawChars
 #define Tk_DrawChars \
 	(tkStubsPtr->tk_DrawChars) /* 59 */
+#endif
+#ifndef Tk_DrawFocusHighlight
 #define Tk_DrawFocusHighlight \
 	(tkStubsPtr->tk_DrawFocusHighlight) /* 60 */
+#endif
+#ifndef Tk_DrawTextLayout
 #define Tk_DrawTextLayout \
 	(tkStubsPtr->tk_DrawTextLayout) /* 61 */
+#endif
+#ifndef Tk_Fill3DPolygon
 #define Tk_Fill3DPolygon \
 	(tkStubsPtr->tk_Fill3DPolygon) /* 62 */
+#endif
+#ifndef Tk_Fill3DRectangle
 #define Tk_Fill3DRectangle \
 	(tkStubsPtr->tk_Fill3DRectangle) /* 63 */
+#endif
+#ifndef Tk_FindPhoto
 #define Tk_FindPhoto \
 	(tkStubsPtr->tk_FindPhoto) /* 64 */
+#endif
+#ifndef Tk_FontId
 #define Tk_FontId \
 	(tkStubsPtr->tk_FontId) /* 65 */
+#endif
+#ifndef Tk_Free3DBorder
 #define Tk_Free3DBorder \
 	(tkStubsPtr->tk_Free3DBorder) /* 66 */
+#endif
+#ifndef Tk_FreeBitmap
 #define Tk_FreeBitmap \
 	(tkStubsPtr->tk_FreeBitmap) /* 67 */
+#endif
+#ifndef Tk_FreeColor
 #define Tk_FreeColor \
 	(tkStubsPtr->tk_FreeColor) /* 68 */
+#endif
+#ifndef Tk_FreeColormap
 #define Tk_FreeColormap \
 	(tkStubsPtr->tk_FreeColormap) /* 69 */
+#endif
+#ifndef Tk_FreeCursor
 #define Tk_FreeCursor \
 	(tkStubsPtr->tk_FreeCursor) /* 70 */
+#endif
+#ifndef Tk_FreeFont
 #define Tk_FreeFont \
 	(tkStubsPtr->tk_FreeFont) /* 71 */
+#endif
+#ifndef Tk_FreeGC
 #define Tk_FreeGC \
 	(tkStubsPtr->tk_FreeGC) /* 72 */
+#endif
+#ifndef Tk_FreeImage
 #define Tk_FreeImage \
 	(tkStubsPtr->tk_FreeImage) /* 73 */
+#endif
+#ifndef Tk_FreeOptions
 #define Tk_FreeOptions \
 	(tkStubsPtr->tk_FreeOptions) /* 74 */
+#endif
+#ifndef Tk_FreePixmap
 #define Tk_FreePixmap \
 	(tkStubsPtr->tk_FreePixmap) /* 75 */
+#endif
+#ifndef Tk_FreeTextLayout
 #define Tk_FreeTextLayout \
 	(tkStubsPtr->tk_FreeTextLayout) /* 76 */
+#endif
+#ifndef Tk_FreeXId
 #define Tk_FreeXId \
 	(tkStubsPtr->tk_FreeXId) /* 77 */
+#endif
+#ifndef Tk_GCForColor
 #define Tk_GCForColor \
 	(tkStubsPtr->tk_GCForColor) /* 78 */
+#endif
+#ifndef Tk_GeometryRequest
 #define Tk_GeometryRequest \
 	(tkStubsPtr->tk_GeometryRequest) /* 79 */
+#endif
+#ifndef Tk_Get3DBorder
 #define Tk_Get3DBorder \
 	(tkStubsPtr->tk_Get3DBorder) /* 80 */
+#endif
+#ifndef Tk_GetAllBindings
 #define Tk_GetAllBindings \
 	(tkStubsPtr->tk_GetAllBindings) /* 81 */
+#endif
+#ifndef Tk_GetAnchor
 #define Tk_GetAnchor \
 	(tkStubsPtr->tk_GetAnchor) /* 82 */
+#endif
+#ifndef Tk_GetAtomName
 #define Tk_GetAtomName \
 	(tkStubsPtr->tk_GetAtomName) /* 83 */
+#endif
+#ifndef Tk_GetBinding
 #define Tk_GetBinding \
 	(tkStubsPtr->tk_GetBinding) /* 84 */
+#endif
+#ifndef Tk_GetBitmap
 #define Tk_GetBitmap \
 	(tkStubsPtr->tk_GetBitmap) /* 85 */
+#endif
+#ifndef Tk_GetBitmapFromData
 #define Tk_GetBitmapFromData \
 	(tkStubsPtr->tk_GetBitmapFromData) /* 86 */
+#endif
+#ifndef Tk_GetCapStyle
 #define Tk_GetCapStyle \
 	(tkStubsPtr->tk_GetCapStyle) /* 87 */
+#endif
+#ifndef Tk_GetColor
 #define Tk_GetColor \
 	(tkStubsPtr->tk_GetColor) /* 88 */
+#endif
+#ifndef Tk_GetColorByValue
 #define Tk_GetColorByValue \
 	(tkStubsPtr->tk_GetColorByValue) /* 89 */
+#endif
+#ifndef Tk_GetColormap
 #define Tk_GetColormap \
 	(tkStubsPtr->tk_GetColormap) /* 90 */
+#endif
+#ifndef Tk_GetCursor
 #define Tk_GetCursor \
 	(tkStubsPtr->tk_GetCursor) /* 91 */
+#endif
+#ifndef Tk_GetCursorFromData
 #define Tk_GetCursorFromData \
 	(tkStubsPtr->tk_GetCursorFromData) /* 92 */
+#endif
+#ifndef Tk_GetFont
 #define Tk_GetFont \
 	(tkStubsPtr->tk_GetFont) /* 93 */
+#endif
+#ifndef Tk_GetFontFromObj
 #define Tk_GetFontFromObj \
 	(tkStubsPtr->tk_GetFontFromObj) /* 94 */
+#endif
+#ifndef Tk_GetFontMetrics
 #define Tk_GetFontMetrics \
 	(tkStubsPtr->tk_GetFontMetrics) /* 95 */
+#endif
+#ifndef Tk_GetGC
 #define Tk_GetGC \
 	(tkStubsPtr->tk_GetGC) /* 96 */
+#endif
+#ifndef Tk_GetImage
 #define Tk_GetImage \
 	(tkStubsPtr->tk_GetImage) /* 97 */
+#endif
+#ifndef Tk_GetImageMasterData
 #define Tk_GetImageMasterData \
 	(tkStubsPtr->tk_GetImageMasterData) /* 98 */
+#endif
+#ifndef Tk_GetItemTypes
 #define Tk_GetItemTypes \
 	(tkStubsPtr->tk_GetItemTypes) /* 99 */
+#endif
+#ifndef Tk_GetJoinStyle
 #define Tk_GetJoinStyle \
 	(tkStubsPtr->tk_GetJoinStyle) /* 100 */
+#endif
+#ifndef Tk_GetJustify
 #define Tk_GetJustify \
 	(tkStubsPtr->tk_GetJustify) /* 101 */
+#endif
+#ifndef Tk_GetNumMainWindows
 #define Tk_GetNumMainWindows \
 	(tkStubsPtr->tk_GetNumMainWindows) /* 102 */
+#endif
+#ifndef Tk_GetOption
 #define Tk_GetOption \
 	(tkStubsPtr->tk_GetOption) /* 103 */
+#endif
+#ifndef Tk_GetPixels
 #define Tk_GetPixels \
 	(tkStubsPtr->tk_GetPixels) /* 104 */
+#endif
+#ifndef Tk_GetPixmap
 #define Tk_GetPixmap \
 	(tkStubsPtr->tk_GetPixmap) /* 105 */
+#endif
+#ifndef Tk_GetRelief
 #define Tk_GetRelief \
 	(tkStubsPtr->tk_GetRelief) /* 106 */
+#endif
+#ifndef Tk_GetRootCoords
 #define Tk_GetRootCoords \
 	(tkStubsPtr->tk_GetRootCoords) /* 107 */
+#endif
+#ifndef Tk_GetScrollInfo
 #define Tk_GetScrollInfo \
 	(tkStubsPtr->tk_GetScrollInfo) /* 108 */
+#endif
+#ifndef Tk_GetScreenMM
 #define Tk_GetScreenMM \
 	(tkStubsPtr->tk_GetScreenMM) /* 109 */
+#endif
+#ifndef Tk_GetSelection
 #define Tk_GetSelection \
 	(tkStubsPtr->tk_GetSelection) /* 110 */
+#endif
+#ifndef Tk_GetUid
 #define Tk_GetUid \
 	(tkStubsPtr->tk_GetUid) /* 111 */
+#endif
+#ifndef Tk_GetVisual
 #define Tk_GetVisual \
 	(tkStubsPtr->tk_GetVisual) /* 112 */
+#endif
+#ifndef Tk_GetVRootGeometry
 #define Tk_GetVRootGeometry \
 	(tkStubsPtr->tk_GetVRootGeometry) /* 113 */
+#endif
+#ifndef Tk_Grab
 #define Tk_Grab \
 	(tkStubsPtr->tk_Grab) /* 114 */
+#endif
+#ifndef Tk_HandleEvent
 #define Tk_HandleEvent \
 	(tkStubsPtr->tk_HandleEvent) /* 115 */
+#endif
+#ifndef Tk_IdToWindow
 #define Tk_IdToWindow \
 	(tkStubsPtr->tk_IdToWindow) /* 116 */
+#endif
+#ifndef Tk_ImageChanged
 #define Tk_ImageChanged \
 	(tkStubsPtr->tk_ImageChanged) /* 117 */
+#endif
+#ifndef Tk_Init
 #define Tk_Init \
 	(tkStubsPtr->tk_Init) /* 118 */
+#endif
+#ifndef Tk_InternAtom
 #define Tk_InternAtom \
 	(tkStubsPtr->tk_InternAtom) /* 119 */
+#endif
+#ifndef Tk_IntersectTextLayout
 #define Tk_IntersectTextLayout \
 	(tkStubsPtr->tk_IntersectTextLayout) /* 120 */
+#endif
+#ifndef Tk_MaintainGeometry
 #define Tk_MaintainGeometry \
 	(tkStubsPtr->tk_MaintainGeometry) /* 121 */
+#endif
+#ifndef Tk_MainWindow
 #define Tk_MainWindow \
 	(tkStubsPtr->tk_MainWindow) /* 122 */
+#endif
+#ifndef Tk_MakeWindowExist
 #define Tk_MakeWindowExist \
 	(tkStubsPtr->tk_MakeWindowExist) /* 123 */
+#endif
+#ifndef Tk_ManageGeometry
 #define Tk_ManageGeometry \
 	(tkStubsPtr->tk_ManageGeometry) /* 124 */
+#endif
+#ifndef Tk_MapWindow
 #define Tk_MapWindow \
 	(tkStubsPtr->tk_MapWindow) /* 125 */
+#endif
+#ifndef Tk_MeasureChars
 #define Tk_MeasureChars \
 	(tkStubsPtr->tk_MeasureChars) /* 126 */
+#endif
+#ifndef Tk_MoveResizeWindow
 #define Tk_MoveResizeWindow \
 	(tkStubsPtr->tk_MoveResizeWindow) /* 127 */
+#endif
+#ifndef Tk_MoveWindow
 #define Tk_MoveWindow \
 	(tkStubsPtr->tk_MoveWindow) /* 128 */
+#endif
+#ifndef Tk_MoveToplevelWindow
 #define Tk_MoveToplevelWindow \
 	(tkStubsPtr->tk_MoveToplevelWindow) /* 129 */
+#endif
+#ifndef Tk_NameOf3DBorder
 #define Tk_NameOf3DBorder \
 	(tkStubsPtr->tk_NameOf3DBorder) /* 130 */
+#endif
+#ifndef Tk_NameOfAnchor
 #define Tk_NameOfAnchor \
 	(tkStubsPtr->tk_NameOfAnchor) /* 131 */
+#endif
+#ifndef Tk_NameOfBitmap
 #define Tk_NameOfBitmap \
 	(tkStubsPtr->tk_NameOfBitmap) /* 132 */
+#endif
+#ifndef Tk_NameOfCapStyle
 #define Tk_NameOfCapStyle \
 	(tkStubsPtr->tk_NameOfCapStyle) /* 133 */
+#endif
+#ifndef Tk_NameOfColor
 #define Tk_NameOfColor \
 	(tkStubsPtr->tk_NameOfColor) /* 134 */
+#endif
+#ifndef Tk_NameOfCursor
 #define Tk_NameOfCursor \
 	(tkStubsPtr->tk_NameOfCursor) /* 135 */
+#endif
+#ifndef Tk_NameOfFont
 #define Tk_NameOfFont \
 	(tkStubsPtr->tk_NameOfFont) /* 136 */
+#endif
+#ifndef Tk_NameOfImage
 #define Tk_NameOfImage \
 	(tkStubsPtr->tk_NameOfImage) /* 137 */
+#endif
+#ifndef Tk_NameOfJoinStyle
 #define Tk_NameOfJoinStyle \
 	(tkStubsPtr->tk_NameOfJoinStyle) /* 138 */
+#endif
+#ifndef Tk_NameOfJustify
 #define Tk_NameOfJustify \
 	(tkStubsPtr->tk_NameOfJustify) /* 139 */
+#endif
+#ifndef Tk_NameOfRelief
 #define Tk_NameOfRelief \
 	(tkStubsPtr->tk_NameOfRelief) /* 140 */
+#endif
+#ifndef Tk_NameToWindow
 #define Tk_NameToWindow \
 	(tkStubsPtr->tk_NameToWindow) /* 141 */
+#endif
+#ifndef Tk_OwnSelection
 #define Tk_OwnSelection \
 	(tkStubsPtr->tk_OwnSelection) /* 142 */
+#endif
+#ifndef Tk_ParseArgv
 #define Tk_ParseArgv \
 	(tkStubsPtr->tk_ParseArgv) /* 143 */
+#endif
+#ifndef Tk_PhotoPutBlock_NoComposite
 #define Tk_PhotoPutBlock_NoComposite \
 	(tkStubsPtr->tk_PhotoPutBlock_NoComposite) /* 144 */
+#endif
+#ifndef Tk_PhotoPutZoomedBlock_NoComposite
 #define Tk_PhotoPutZoomedBlock_NoComposite \
 	(tkStubsPtr->tk_PhotoPutZoomedBlock_NoComposite) /* 145 */
+#endif
+#ifndef Tk_PhotoGetImage
 #define Tk_PhotoGetImage \
 	(tkStubsPtr->tk_PhotoGetImage) /* 146 */
+#endif
+#ifndef Tk_PhotoBlank
 #define Tk_PhotoBlank \
 	(tkStubsPtr->tk_PhotoBlank) /* 147 */
+#endif
+#ifndef Tk_PhotoExpand_Panic
 #define Tk_PhotoExpand_Panic \
 	(tkStubsPtr->tk_PhotoExpand_Panic) /* 148 */
+#endif
+#ifndef Tk_PhotoGetSize
 #define Tk_PhotoGetSize \
 	(tkStubsPtr->tk_PhotoGetSize) /* 149 */
+#endif
+#ifndef Tk_PhotoSetSize_Panic
 #define Tk_PhotoSetSize_Panic \
 	(tkStubsPtr->tk_PhotoSetSize_Panic) /* 150 */
+#endif
+#ifndef Tk_PointToChar
 #define Tk_PointToChar \
 	(tkStubsPtr->tk_PointToChar) /* 151 */
+#endif
+#ifndef Tk_PostscriptFontName
 #define Tk_PostscriptFontName \
 	(tkStubsPtr->tk_PostscriptFontName) /* 152 */
+#endif
+#ifndef Tk_PreserveColormap
 #define Tk_PreserveColormap \
 	(tkStubsPtr->tk_PreserveColormap) /* 153 */
+#endif
+#ifndef Tk_QueueWindowEvent
 #define Tk_QueueWindowEvent \
 	(tkStubsPtr->tk_QueueWindowEvent) /* 154 */
+#endif
+#ifndef Tk_RedrawImage
 #define Tk_RedrawImage \
 	(tkStubsPtr->tk_RedrawImage) /* 155 */
+#endif
+#ifndef Tk_ResizeWindow
 #define Tk_ResizeWindow \
 	(tkStubsPtr->tk_ResizeWindow) /* 156 */
+#endif
+#ifndef Tk_RestackWindow
 #define Tk_RestackWindow \
 	(tkStubsPtr->tk_RestackWindow) /* 157 */
+#endif
+#ifndef Tk_RestrictEvents
 #define Tk_RestrictEvents \
 	(tkStubsPtr->tk_RestrictEvents) /* 158 */
+#endif
+#ifndef Tk_SafeInit
 #define Tk_SafeInit \
 	(tkStubsPtr->tk_SafeInit) /* 159 */
+#endif
+#ifndef Tk_SetAppName
 #define Tk_SetAppName \
 	(tkStubsPtr->tk_SetAppName) /* 160 */
+#endif
+#ifndef Tk_SetBackgroundFromBorder
 #define Tk_SetBackgroundFromBorder \
 	(tkStubsPtr->tk_SetBackgroundFromBorder) /* 161 */
+#endif
+#ifndef Tk_SetClass
 #define Tk_SetClass \
 	(tkStubsPtr->tk_SetClass) /* 162 */
+#endif
+#ifndef Tk_SetGrid
 #define Tk_SetGrid \
 	(tkStubsPtr->tk_SetGrid) /* 163 */
+#endif
+#ifndef Tk_SetInternalBorder
 #define Tk_SetInternalBorder \
 	(tkStubsPtr->tk_SetInternalBorder) /* 164 */
+#endif
+#ifndef Tk_SetWindowBackground
 #define Tk_SetWindowBackground \
 	(tkStubsPtr->tk_SetWindowBackground) /* 165 */
+#endif
+#ifndef Tk_SetWindowBackgroundPixmap
 #define Tk_SetWindowBackgroundPixmap \
 	(tkStubsPtr->tk_SetWindowBackgroundPixmap) /* 166 */
+#endif
+#ifndef Tk_SetWindowBorder
 #define Tk_SetWindowBorder \
 	(tkStubsPtr->tk_SetWindowBorder) /* 167 */
+#endif
+#ifndef Tk_SetWindowBorderWidth
 #define Tk_SetWindowBorderWidth \
 	(tkStubsPtr->tk_SetWindowBorderWidth) /* 168 */
+#endif
+#ifndef Tk_SetWindowBorderPixmap
 #define Tk_SetWindowBorderPixmap \
 	(tkStubsPtr->tk_SetWindowBorderPixmap) /* 169 */
+#endif
+#ifndef Tk_SetWindowColormap
 #define Tk_SetWindowColormap \
 	(tkStubsPtr->tk_SetWindowColormap) /* 170 */
+#endif
+#ifndef Tk_SetWindowVisual
 #define Tk_SetWindowVisual \
 	(tkStubsPtr->tk_SetWindowVisual) /* 171 */
+#endif
+#ifndef Tk_SizeOfBitmap
 #define Tk_SizeOfBitmap \
 	(tkStubsPtr->tk_SizeOfBitmap) /* 172 */
+#endif
+#ifndef Tk_SizeOfImage
 #define Tk_SizeOfImage \
 	(tkStubsPtr->tk_SizeOfImage) /* 173 */
+#endif
+#ifndef Tk_StrictMotif
 #define Tk_StrictMotif \
 	(tkStubsPtr->tk_StrictMotif) /* 174 */
+#endif
+#ifndef Tk_TextLayoutToPostscript
 #define Tk_TextLayoutToPostscript \
 	(tkStubsPtr->tk_TextLayoutToPostscript) /* 175 */
+#endif
+#ifndef Tk_TextWidth
 #define Tk_TextWidth \
 	(tkStubsPtr->tk_TextWidth) /* 176 */
+#endif
+#ifndef Tk_UndefineCursor
 #define Tk_UndefineCursor \
 	(tkStubsPtr->tk_UndefineCursor) /* 177 */
+#endif
+#ifndef Tk_UnderlineChars
 #define Tk_UnderlineChars \
 	(tkStubsPtr->tk_UnderlineChars) /* 178 */
+#endif
+#ifndef Tk_UnderlineTextLayout
 #define Tk_UnderlineTextLayout \
 	(tkStubsPtr->tk_UnderlineTextLayout) /* 179 */
+#endif
+#ifndef Tk_Ungrab
 #define Tk_Ungrab \
 	(tkStubsPtr->tk_Ungrab) /* 180 */
+#endif
+#ifndef Tk_UnmaintainGeometry
 #define Tk_UnmaintainGeometry \
 	(tkStubsPtr->tk_UnmaintainGeometry) /* 181 */
+#endif
+#ifndef Tk_UnmapWindow
 #define Tk_UnmapWindow \
 	(tkStubsPtr->tk_UnmapWindow) /* 182 */
+#endif
+#ifndef Tk_UnsetGrid
 #define Tk_UnsetGrid \
 	(tkStubsPtr->tk_UnsetGrid) /* 183 */
+#endif
+#ifndef Tk_UpdatePointer
 #define Tk_UpdatePointer \
 	(tkStubsPtr->tk_UpdatePointer) /* 184 */
+#endif
+#ifndef Tk_AllocBitmapFromObj
 #define Tk_AllocBitmapFromObj \
 	(tkStubsPtr->tk_AllocBitmapFromObj) /* 185 */
+#endif
+#ifndef Tk_Alloc3DBorderFromObj
 #define Tk_Alloc3DBorderFromObj \
 	(tkStubsPtr->tk_Alloc3DBorderFromObj) /* 186 */
+#endif
+#ifndef Tk_AllocColorFromObj
 #define Tk_AllocColorFromObj \
 	(tkStubsPtr->tk_AllocColorFromObj) /* 187 */
+#endif
+#ifndef Tk_AllocCursorFromObj
 #define Tk_AllocCursorFromObj \
 	(tkStubsPtr->tk_AllocCursorFromObj) /* 188 */
+#endif
+#ifndef Tk_AllocFontFromObj
 #define Tk_AllocFontFromObj \
 	(tkStubsPtr->tk_AllocFontFromObj) /* 189 */
+#endif
+#ifndef Tk_CreateOptionTable
 #define Tk_CreateOptionTable \
 	(tkStubsPtr->tk_CreateOptionTable) /* 190 */
+#endif
+#ifndef Tk_DeleteOptionTable
 #define Tk_DeleteOptionTable \
 	(tkStubsPtr->tk_DeleteOptionTable) /* 191 */
+#endif
+#ifndef Tk_Free3DBorderFromObj
 #define Tk_Free3DBorderFromObj \
 	(tkStubsPtr->tk_Free3DBorderFromObj) /* 192 */
+#endif
+#ifndef Tk_FreeBitmapFromObj
 #define Tk_FreeBitmapFromObj \
 	(tkStubsPtr->tk_FreeBitmapFromObj) /* 193 */
+#endif
+#ifndef Tk_FreeColorFromObj
 #define Tk_FreeColorFromObj \
 	(tkStubsPtr->tk_FreeColorFromObj) /* 194 */
+#endif
+#ifndef Tk_FreeConfigOptions
 #define Tk_FreeConfigOptions \
 	(tkStubsPtr->tk_FreeConfigOptions) /* 195 */
+#endif
+#ifndef Tk_FreeSavedOptions
 #define Tk_FreeSavedOptions \
 	(tkStubsPtr->tk_FreeSavedOptions) /* 196 */
+#endif
+#ifndef Tk_FreeCursorFromObj
 #define Tk_FreeCursorFromObj \
 	(tkStubsPtr->tk_FreeCursorFromObj) /* 197 */
+#endif
+#ifndef Tk_FreeFontFromObj
 #define Tk_FreeFontFromObj \
 	(tkStubsPtr->tk_FreeFontFromObj) /* 198 */
+#endif
+#ifndef Tk_Get3DBorderFromObj
 #define Tk_Get3DBorderFromObj \
 	(tkStubsPtr->tk_Get3DBorderFromObj) /* 199 */
+#endif
+#ifndef Tk_GetAnchorFromObj
 #define Tk_GetAnchorFromObj \
 	(tkStubsPtr->tk_GetAnchorFromObj) /* 200 */
+#endif
+#ifndef Tk_GetBitmapFromObj
 #define Tk_GetBitmapFromObj \
 	(tkStubsPtr->tk_GetBitmapFromObj) /* 201 */
+#endif
+#ifndef Tk_GetColorFromObj
 #define Tk_GetColorFromObj \
 	(tkStubsPtr->tk_GetColorFromObj) /* 202 */
+#endif
+#ifndef Tk_GetCursorFromObj
 #define Tk_GetCursorFromObj \
 	(tkStubsPtr->tk_GetCursorFromObj) /* 203 */
+#endif
+#ifndef Tk_GetOptionInfo
 #define Tk_GetOptionInfo \
 	(tkStubsPtr->tk_GetOptionInfo) /* 204 */
+#endif
+#ifndef Tk_GetOptionValue
 #define Tk_GetOptionValue \
 	(tkStubsPtr->tk_GetOptionValue) /* 205 */
+#endif
+#ifndef Tk_GetJustifyFromObj
 #define Tk_GetJustifyFromObj \
 	(tkStubsPtr->tk_GetJustifyFromObj) /* 206 */
+#endif
+#ifndef Tk_GetMMFromObj
 #define Tk_GetMMFromObj \
 	(tkStubsPtr->tk_GetMMFromObj) /* 207 */
+#endif
+#ifndef Tk_GetPixelsFromObj
 #define Tk_GetPixelsFromObj \
 	(tkStubsPtr->tk_GetPixelsFromObj) /* 208 */
+#endif
+#ifndef Tk_GetReliefFromObj
 #define Tk_GetReliefFromObj \
 	(tkStubsPtr->tk_GetReliefFromObj) /* 209 */
+#endif
+#ifndef Tk_GetScrollInfoObj
 #define Tk_GetScrollInfoObj \
 	(tkStubsPtr->tk_GetScrollInfoObj) /* 210 */
+#endif
+#ifndef Tk_InitOptions
 #define Tk_InitOptions \
 	(tkStubsPtr->tk_InitOptions) /* 211 */
+#endif
+#ifndef Tk_MainEx
 #define Tk_MainEx \
 	(tkStubsPtr->tk_MainEx) /* 212 */
+#endif
+#ifndef Tk_RestoreSavedOptions
 #define Tk_RestoreSavedOptions \
 	(tkStubsPtr->tk_RestoreSavedOptions) /* 213 */
+#endif
+#ifndef Tk_SetOptions
 #define Tk_SetOptions \
 	(tkStubsPtr->tk_SetOptions) /* 214 */
+#endif
+#ifndef Tk_InitConsoleChannels
 #define Tk_InitConsoleChannels \
 	(tkStubsPtr->tk_InitConsoleChannels) /* 215 */
+#endif
+#ifndef Tk_CreateConsoleWindow
 #define Tk_CreateConsoleWindow \
 	(tkStubsPtr->tk_CreateConsoleWindow) /* 216 */
+#endif
+#ifndef Tk_CreateSmoothMethod
 #define Tk_CreateSmoothMethod \
 	(tkStubsPtr->tk_CreateSmoothMethod) /* 217 */
+#endif
 /* Slot 218 is reserved */
 /* Slot 219 is reserved */
+#ifndef Tk_GetDash
 #define Tk_GetDash \
 	(tkStubsPtr->tk_GetDash) /* 220 */
+#endif
+#ifndef Tk_CreateOutline
 #define Tk_CreateOutline \
 	(tkStubsPtr->tk_CreateOutline) /* 221 */
+#endif
+#ifndef Tk_DeleteOutline
 #define Tk_DeleteOutline \
 	(tkStubsPtr->tk_DeleteOutline) /* 222 */
+#endif
+#ifndef Tk_ConfigOutlineGC
 #define Tk_ConfigOutlineGC \
 	(tkStubsPtr->tk_ConfigOutlineGC) /* 223 */
+#endif
+#ifndef Tk_ChangeOutlineGC
 #define Tk_ChangeOutlineGC \
 	(tkStubsPtr->tk_ChangeOutlineGC) /* 224 */
+#endif
+#ifndef Tk_ResetOutlineGC
 #define Tk_ResetOutlineGC \
 	(tkStubsPtr->tk_ResetOutlineGC) /* 225 */
+#endif
+#ifndef Tk_CanvasPsOutline
 #define Tk_CanvasPsOutline \
 	(tkStubsPtr->tk_CanvasPsOutline) /* 226 */
+#endif
+#ifndef Tk_SetTSOrigin
 #define Tk_SetTSOrigin \
 	(tkStubsPtr->tk_SetTSOrigin) /* 227 */
+#endif
+#ifndef Tk_CanvasGetCoordFromObj
 #define Tk_CanvasGetCoordFromObj \
 	(tkStubsPtr->tk_CanvasGetCoordFromObj) /* 228 */
+#endif
+#ifndef Tk_CanvasSetOffset
 #define Tk_CanvasSetOffset \
 	(tkStubsPtr->tk_CanvasSetOffset) /* 229 */
+#endif
+#ifndef Tk_DitherPhoto
 #define Tk_DitherPhoto \
 	(tkStubsPtr->tk_DitherPhoto) /* 230 */
+#endif
+#ifndef Tk_PostscriptBitmap
 #define Tk_PostscriptBitmap \
 	(tkStubsPtr->tk_PostscriptBitmap) /* 231 */
+#endif
+#ifndef Tk_PostscriptColor
 #define Tk_PostscriptColor \
 	(tkStubsPtr->tk_PostscriptColor) /* 232 */
+#endif
+#ifndef Tk_PostscriptFont
 #define Tk_PostscriptFont \
 	(tkStubsPtr->tk_PostscriptFont) /* 233 */
+#endif
+#ifndef Tk_PostscriptImage
 #define Tk_PostscriptImage \
 	(tkStubsPtr->tk_PostscriptImage) /* 234 */
+#endif
+#ifndef Tk_PostscriptPath
 #define Tk_PostscriptPath \
 	(tkStubsPtr->tk_PostscriptPath) /* 235 */
+#endif
+#ifndef Tk_PostscriptStipple
 #define Tk_PostscriptStipple \
 	(tkStubsPtr->tk_PostscriptStipple) /* 236 */
+#endif
+#ifndef Tk_PostscriptY
 #define Tk_PostscriptY \
 	(tkStubsPtr->tk_PostscriptY) /* 237 */
+#endif
+#ifndef Tk_PostscriptPhoto
 #define Tk_PostscriptPhoto \
 	(tkStubsPtr->tk_PostscriptPhoto) /* 238 */
+#endif
+#ifndef Tk_CreateClientMessageHandler
 #define Tk_CreateClientMessageHandler \
 	(tkStubsPtr->tk_CreateClientMessageHandler) /* 239 */
+#endif
+#ifndef Tk_DeleteClientMessageHandler
 #define Tk_DeleteClientMessageHandler \
 	(tkStubsPtr->tk_DeleteClientMessageHandler) /* 240 */
+#endif
+#ifndef Tk_CreateAnonymousWindow
 #define Tk_CreateAnonymousWindow \
 	(tkStubsPtr->tk_CreateAnonymousWindow) /* 241 */
+#endif
+#ifndef Tk_SetClassProcs
 #define Tk_SetClassProcs \
 	(tkStubsPtr->tk_SetClassProcs) /* 242 */
+#endif
+#ifndef Tk_SetInternalBorderEx
 #define Tk_SetInternalBorderEx \
 	(tkStubsPtr->tk_SetInternalBorderEx) /* 243 */
+#endif
+#ifndef Tk_SetMinimumRequestSize
 #define Tk_SetMinimumRequestSize \
 	(tkStubsPtr->tk_SetMinimumRequestSize) /* 244 */
+#endif
+#ifndef Tk_SetCaretPos
 #define Tk_SetCaretPos \
 	(tkStubsPtr->tk_SetCaretPos) /* 245 */
+#endif
+#ifndef Tk_PhotoPutBlock_Panic
 #define Tk_PhotoPutBlock_Panic \
 	(tkStubsPtr->tk_PhotoPutBlock_Panic) /* 246 */
+#endif
+#ifndef Tk_PhotoPutZoomedBlock_Panic
 #define Tk_PhotoPutZoomedBlock_Panic \
 	(tkStubsPtr->tk_PhotoPutZoomedBlock_Panic) /* 247 */
+#endif
+#ifndef Tk_CollapseMotionEvents
 #define Tk_CollapseMotionEvents \
 	(tkStubsPtr->tk_CollapseMotionEvents) /* 248 */
+#endif
+#ifndef Tk_RegisterStyleEngine
 #define Tk_RegisterStyleEngine \
 	(tkStubsPtr->tk_RegisterStyleEngine) /* 249 */
+#endif
+#ifndef Tk_GetStyleEngine
 #define Tk_GetStyleEngine \
 	(tkStubsPtr->tk_GetStyleEngine) /* 250 */
+#endif
+#ifndef Tk_RegisterStyledElement
 #define Tk_RegisterStyledElement \
 	(tkStubsPtr->tk_RegisterStyledElement) /* 251 */
+#endif
+#ifndef Tk_GetElementId
 #define Tk_GetElementId \
 	(tkStubsPtr->tk_GetElementId) /* 252 */
+#endif
+#ifndef Tk_CreateStyle
 #define Tk_CreateStyle \
 	(tkStubsPtr->tk_CreateStyle) /* 253 */
+#endif
+#ifndef Tk_GetStyle
 #define Tk_GetStyle \
 	(tkStubsPtr->tk_GetStyle) /* 254 */
+#endif
+#ifndef Tk_FreeStyle
 #define Tk_FreeStyle \
 	(tkStubsPtr->tk_FreeStyle) /* 255 */
+#endif
+#ifndef Tk_NameOfStyle
 #define Tk_NameOfStyle \
 	(tkStubsPtr->tk_NameOfStyle) /* 256 */
+#endif
+#ifndef Tk_AllocStyleFromObj
 #define Tk_AllocStyleFromObj \
 	(tkStubsPtr->tk_AllocStyleFromObj) /* 257 */
+#endif
+#ifndef Tk_GetStyleFromObj
 #define Tk_GetStyleFromObj \
 	(tkStubsPtr->tk_GetStyleFromObj) /* 258 */
+#endif
+#ifndef Tk_FreeStyleFromObj
 #define Tk_FreeStyleFromObj \
 	(tkStubsPtr->tk_FreeStyleFromObj) /* 259 */
+#endif
+#ifndef Tk_GetStyledElement
 #define Tk_GetStyledElement \
 	(tkStubsPtr->tk_GetStyledElement) /* 260 */
+#endif
+#ifndef Tk_GetElementSize
 #define Tk_GetElementSize \
 	(tkStubsPtr->tk_GetElementSize) /* 261 */
+#endif
+#ifndef Tk_GetElementBox
 #define Tk_GetElementBox \
 	(tkStubsPtr->tk_GetElementBox) /* 262 */
+#endif
+#ifndef Tk_GetElementBorderWidth
 #define Tk_GetElementBorderWidth \
 	(tkStubsPtr->tk_GetElementBorderWidth) /* 263 */
+#endif
+#ifndef Tk_DrawElement
 #define Tk_DrawElement \
 	(tkStubsPtr->tk_DrawElement) /* 264 */
+#endif
+#ifndef Tk_PhotoExpand
 #define Tk_PhotoExpand \
 	(tkStubsPtr->tk_PhotoExpand) /* 265 */
+#endif
+#ifndef Tk_PhotoPutBlock
 #define Tk_PhotoPutBlock \
 	(tkStubsPtr->tk_PhotoPutBlock) /* 266 */
+#endif
+#ifndef Tk_PhotoPutZoomedBlock
 #define Tk_PhotoPutZoomedBlock \
 	(tkStubsPtr->tk_PhotoPutZoomedBlock) /* 267 */
+#endif
+#ifndef Tk_PhotoSetSize
 #define Tk_PhotoSetSize \
 	(tkStubsPtr->tk_PhotoSetSize) /* 268 */
+#endif
+#ifndef Tk_GetUserInactiveTime
 #define Tk_GetUserInactiveTime \
 	(tkStubsPtr->tk_GetUserInactiveTime) /* 269 */
+#endif
+#ifndef Tk_ResetUserInactiveTime
 #define Tk_ResetUserInactiveTime \
 	(tkStubsPtr->tk_ResetUserInactiveTime) /* 270 */
+#endif
+#ifndef Tk_Interp
 #define Tk_Interp \
 	(tkStubsPtr->tk_Interp) /* 271 */
+#endif
+#ifndef Tk_CreateOldImageType
 #define Tk_CreateOldImageType \
 	(tkStubsPtr->tk_CreateOldImageType) /* 272 */
+#endif
+#ifndef Tk_CreateOldPhotoImageFormat
 #define Tk_CreateOldPhotoImageFormat \
 	(tkStubsPtr->tk_CreateOldPhotoImageFormat) /* 273 */
+#endif
 /* Slot 274 is reserved */
 /* Slot 275 is reserved */
 /* Slot 276 is reserved */
 /* Slot 277 is reserved */
 /* Slot 278 is reserved */
 /* Slot 279 is reserved */
+#ifndef TkUnusedStubEntry
 #define TkUnusedStubEntry \
 	(tkStubsPtr->tkUnusedStubEntry) /* 280 */
+#endif
 
-#endif /* defined(USE_TK_STUBS) */
+#endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
 
 /* !END!: Do not edit above this line. */
 
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h
index fd9ff07..d0a091d 100644
--- a/generic/tkIntDecls.h
+++ b/generic/tkIntDecls.h
@@ -36,336 +36,702 @@ extern "C" {
  * Exported function declarations:
  */
 
+#ifndef TkAllocWindow_TCL_DECLARED
+#define TkAllocWindow_TCL_DECLARED
 /* 0 */
 EXTERN TkWindow *	TkAllocWindow(TkDisplay *dispPtr, int screenNum,
 				TkWindow *parentPtr);
+#endif
+#ifndef TkBezierPoints_TCL_DECLARED
+#define TkBezierPoints_TCL_DECLARED
 /* 1 */
 EXTERN void		TkBezierPoints(double control[], int numSteps,
 				double *coordPtr);
+#endif
+#ifndef TkBezierScreenPoints_TCL_DECLARED
+#define TkBezierScreenPoints_TCL_DECLARED
 /* 2 */
 EXTERN void		TkBezierScreenPoints(Tk_Canvas canvas,
 				double control[], int numSteps,
 				XPoint *xPointPtr);
+#endif
+#ifndef TkBindDeadWindow_TCL_DECLARED
+#define TkBindDeadWindow_TCL_DECLARED
 /* 3 */
 EXTERN void		TkBindDeadWindow(TkWindow *winPtr);
+#endif
+#ifndef TkBindEventProc_TCL_DECLARED
+#define TkBindEventProc_TCL_DECLARED
 /* 4 */
 EXTERN void		TkBindEventProc(TkWindow *winPtr, XEvent *eventPtr);
+#endif
+#ifndef TkBindFree_TCL_DECLARED
+#define TkBindFree_TCL_DECLARED
 /* 5 */
 EXTERN void		TkBindFree(TkMainInfo *mainPtr);
+#endif
+#ifndef TkBindInit_TCL_DECLARED
+#define TkBindInit_TCL_DECLARED
 /* 6 */
 EXTERN void		TkBindInit(TkMainInfo *mainPtr);
+#endif
+#ifndef TkChangeEventWindow_TCL_DECLARED
+#define TkChangeEventWindow_TCL_DECLARED
 /* 7 */
 EXTERN void		TkChangeEventWindow(XEvent *eventPtr,
 				TkWindow *winPtr);
+#endif
+#ifndef TkClipInit_TCL_DECLARED
+#define TkClipInit_TCL_DECLARED
 /* 8 */
 EXTERN int		TkClipInit(Tcl_Interp *interp, TkDisplay *dispPtr);
+#endif
+#ifndef TkComputeAnchor_TCL_DECLARED
+#define TkComputeAnchor_TCL_DECLARED
 /* 9 */
 EXTERN void		TkComputeAnchor(Tk_Anchor anchor, Tk_Window tkwin,
 				int padX, int padY, int innerWidth,
 				int innerHeight, int *xPtr, int *yPtr);
+#endif
+#ifndef TkCopyAndGlobalEval_TCL_DECLARED
+#define TkCopyAndGlobalEval_TCL_DECLARED
 /* 10 */
 EXTERN int		TkCopyAndGlobalEval(Tcl_Interp *interp, char *script);
+#endif
+#ifndef TkCreateBindingProcedure_TCL_DECLARED
+#define TkCreateBindingProcedure_TCL_DECLARED
 /* 11 */
 EXTERN unsigned long	TkCreateBindingProcedure(Tcl_Interp *interp,
 				Tk_BindingTable bindingTable,
-				ClientData object, const char *eventString,
+				ClientData object, CONST char *eventString,
 				TkBindEvalProc *evalProc,
 				TkBindFreeProc *freeProc,
 				ClientData clientData);
+#endif
+#ifndef TkCreateCursorFromData_TCL_DECLARED
+#define TkCreateCursorFromData_TCL_DECLARED
 /* 12 */
 EXTERN TkCursor *	TkCreateCursorFromData(Tk_Window tkwin,
-				const char *source, const char *mask,
+				CONST char *source, CONST char *mask,
 				int width, int height, int xHot, int yHot,
 				XColor fg, XColor bg);
+#endif
+#ifndef TkCreateFrame_TCL_DECLARED
+#define TkCreateFrame_TCL_DECLARED
 /* 13 */
 EXTERN int		TkCreateFrame(ClientData clientData,
 				Tcl_Interp *interp, int argc, char **argv,
 				int toplevel, char *appName);
+#endif
+#ifndef TkCreateMainWindow_TCL_DECLARED
+#define TkCreateMainWindow_TCL_DECLARED
 /* 14 */
 EXTERN Tk_Window	TkCreateMainWindow(Tcl_Interp *interp,
-				const char *screenName, char *baseName);
+				CONST char *screenName, char *baseName);
+#endif
+#ifndef TkCurrentTime_TCL_DECLARED
+#define TkCurrentTime_TCL_DECLARED
 /* 15 */
 EXTERN Time		TkCurrentTime(TkDisplay *dispPtr);
+#endif
+#ifndef TkDeleteAllImages_TCL_DECLARED
+#define TkDeleteAllImages_TCL_DECLARED
 /* 16 */
 EXTERN void		TkDeleteAllImages(TkMainInfo *mainPtr);
+#endif
+#ifndef TkDoConfigureNotify_TCL_DECLARED
+#define TkDoConfigureNotify_TCL_DECLARED
 /* 17 */
 EXTERN void		TkDoConfigureNotify(TkWindow *winPtr);
+#endif
+#ifndef TkDrawInsetFocusHighlight_TCL_DECLARED
+#define TkDrawInsetFocusHighlight_TCL_DECLARED
 /* 18 */
 EXTERN void		TkDrawInsetFocusHighlight(Tk_Window tkwin, GC gc,
 				int width, Drawable drawable, int padding);
+#endif
+#ifndef TkEventDeadWindow_TCL_DECLARED
+#define TkEventDeadWindow_TCL_DECLARED
 /* 19 */
 EXTERN void		TkEventDeadWindow(TkWindow *winPtr);
+#endif
+#ifndef TkFillPolygon_TCL_DECLARED
+#define TkFillPolygon_TCL_DECLARED
 /* 20 */
 EXTERN void		TkFillPolygon(Tk_Canvas canvas, double *coordPtr,
 				int numPoints, Display *display,
 				Drawable drawable, GC gc, GC outlineGC);
+#endif
+#ifndef TkFindStateNum_TCL_DECLARED
+#define TkFindStateNum_TCL_DECLARED
 /* 21 */
 EXTERN int		TkFindStateNum(Tcl_Interp *interp,
-				const char *option, const TkStateMap *mapPtr,
-				const char *strKey);
+				CONST char *option, CONST TkStateMap *mapPtr,
+				CONST char *strKey);
+#endif
+#ifndef TkFindStateString_TCL_DECLARED
+#define TkFindStateString_TCL_DECLARED
 /* 22 */
-EXTERN char *		TkFindStateString(const TkStateMap *mapPtr,
+EXTERN char *		TkFindStateString(CONST TkStateMap *mapPtr,
 				int numKey);
+#endif
+#ifndef TkFocusDeadWindow_TCL_DECLARED
+#define TkFocusDeadWindow_TCL_DECLARED
 /* 23 */
 EXTERN void		TkFocusDeadWindow(TkWindow *winPtr);
+#endif
+#ifndef TkFocusFilterEvent_TCL_DECLARED
+#define TkFocusFilterEvent_TCL_DECLARED
 /* 24 */
 EXTERN int		TkFocusFilterEvent(TkWindow *winPtr,
 				XEvent *eventPtr);
+#endif
+#ifndef TkFocusKeyEvent_TCL_DECLARED
+#define TkFocusKeyEvent_TCL_DECLARED
 /* 25 */
 EXTERN TkWindow *	TkFocusKeyEvent(TkWindow *winPtr, XEvent *eventPtr);
+#endif
+#ifndef TkFontPkgInit_TCL_DECLARED
+#define TkFontPkgInit_TCL_DECLARED
 /* 26 */
 EXTERN void		TkFontPkgInit(TkMainInfo *mainPtr);
+#endif
+#ifndef TkFontPkgFree_TCL_DECLARED
+#define TkFontPkgFree_TCL_DECLARED
 /* 27 */
 EXTERN void		TkFontPkgFree(TkMainInfo *mainPtr);
+#endif
+#ifndef TkFreeBindingTags_TCL_DECLARED
+#define TkFreeBindingTags_TCL_DECLARED
 /* 28 */
 EXTERN void		TkFreeBindingTags(TkWindow *winPtr);
+#endif
+#ifndef TkpFreeCursor_TCL_DECLARED
+#define TkpFreeCursor_TCL_DECLARED
 /* 29 */
 EXTERN void		TkpFreeCursor(TkCursor *cursorPtr);
+#endif
+#ifndef TkGetBitmapData_TCL_DECLARED
+#define TkGetBitmapData_TCL_DECLARED
 /* 30 */
 EXTERN char *		TkGetBitmapData(Tcl_Interp *interp, char *string,
 				char *fileName, int *widthPtr,
 				int *heightPtr, int *hotXPtr, int *hotYPtr);
+#endif
+#ifndef TkGetButtPoints_TCL_DECLARED
+#define TkGetButtPoints_TCL_DECLARED
 /* 31 */
 EXTERN void		TkGetButtPoints(double p1[], double p2[],
 				double width, int project, double m1[],
 				double m2[]);
+#endif
+#ifndef TkGetCursorByName_TCL_DECLARED
+#define TkGetCursorByName_TCL_DECLARED
 /* 32 */
 EXTERN TkCursor *	TkGetCursorByName(Tcl_Interp *interp,
 				Tk_Window tkwin, Tk_Uid string);
+#endif
+#ifndef TkGetDefaultScreenName_TCL_DECLARED
+#define TkGetDefaultScreenName_TCL_DECLARED
 /* 33 */
 EXTERN CONST84_RETURN char * TkGetDefaultScreenName(Tcl_Interp *interp,
-				const char *screenName);
+				CONST char *screenName);
+#endif
+#ifndef TkGetDisplay_TCL_DECLARED
+#define TkGetDisplay_TCL_DECLARED
 /* 34 */
 EXTERN TkDisplay *	TkGetDisplay(Display *display);
+#endif
+#ifndef TkGetDisplayOf_TCL_DECLARED
+#define TkGetDisplayOf_TCL_DECLARED
 /* 35 */
 EXTERN int		TkGetDisplayOf(Tcl_Interp *interp, int objc,
-				Tcl_Obj *const objv[], Tk_Window *tkwinPtr);
+				Tcl_Obj *CONST objv[], Tk_Window *tkwinPtr);
+#endif
+#ifndef TkGetFocusWin_TCL_DECLARED
+#define TkGetFocusWin_TCL_DECLARED
 /* 36 */
 EXTERN TkWindow *	TkGetFocusWin(TkWindow *winPtr);
+#endif
+#ifndef TkGetInterpNames_TCL_DECLARED
+#define TkGetInterpNames_TCL_DECLARED
 /* 37 */
 EXTERN int		TkGetInterpNames(Tcl_Interp *interp, Tk_Window tkwin);
+#endif
+#ifndef TkGetMiterPoints_TCL_DECLARED
+#define TkGetMiterPoints_TCL_DECLARED
 /* 38 */
 EXTERN int		TkGetMiterPoints(double p1[], double p2[],
 				double p3[], double width, double m1[],
 				double m2[]);
+#endif
+#ifndef TkGetPointerCoords_TCL_DECLARED
+#define TkGetPointerCoords_TCL_DECLARED
 /* 39 */
 EXTERN void		TkGetPointerCoords(Tk_Window tkwin, int *xPtr,
 				int *yPtr);
+#endif
+#ifndef TkGetServerInfo_TCL_DECLARED
+#define TkGetServerInfo_TCL_DECLARED
 /* 40 */
 EXTERN void		TkGetServerInfo(Tcl_Interp *interp, Tk_Window tkwin);
+#endif
+#ifndef TkGrabDeadWindow_TCL_DECLARED
+#define TkGrabDeadWindow_TCL_DECLARED
 /* 41 */
 EXTERN void		TkGrabDeadWindow(TkWindow *winPtr);
+#endif
+#ifndef TkGrabState_TCL_DECLARED
+#define TkGrabState_TCL_DECLARED
 /* 42 */
 EXTERN int		TkGrabState(TkWindow *winPtr);
+#endif
+#ifndef TkIncludePoint_TCL_DECLARED
+#define TkIncludePoint_TCL_DECLARED
 /* 43 */
 EXTERN void		TkIncludePoint(Tk_Item *itemPtr, double *pointPtr);
+#endif
+#ifndef TkInOutEvents_TCL_DECLARED
+#define TkInOutEvents_TCL_DECLARED
 /* 44 */
 EXTERN void		TkInOutEvents(XEvent *eventPtr, TkWindow *sourcePtr,
 				TkWindow *destPtr, int leaveType,
 				int enterType, Tcl_QueuePosition position);
+#endif
+#ifndef TkInstallFrameMenu_TCL_DECLARED
+#define TkInstallFrameMenu_TCL_DECLARED
 /* 45 */
 EXTERN void		TkInstallFrameMenu(Tk_Window tkwin);
+#endif
+#ifndef TkKeysymToString_TCL_DECLARED
+#define TkKeysymToString_TCL_DECLARED
 /* 46 */
 EXTERN char *		TkKeysymToString(KeySym keysym);
+#endif
+#ifndef TkLineToArea_TCL_DECLARED
+#define TkLineToArea_TCL_DECLARED
 /* 47 */
 EXTERN int		TkLineToArea(double end1Ptr[], double end2Ptr[],
 				double rectPtr[]);
+#endif
+#ifndef TkLineToPoint_TCL_DECLARED
+#define TkLineToPoint_TCL_DECLARED
 /* 48 */
 EXTERN double		TkLineToPoint(double end1Ptr[], double end2Ptr[],
 				double pointPtr[]);
+#endif
+#ifndef TkMakeBezierCurve_TCL_DECLARED
+#define TkMakeBezierCurve_TCL_DECLARED
 /* 49 */
 EXTERN int		TkMakeBezierCurve(Tk_Canvas canvas, double *pointPtr,
 				int numPoints, int numSteps,
 				XPoint xPoints[], double dblPoints[]);
+#endif
+#ifndef TkMakeBezierPostscript_TCL_DECLARED
+#define TkMakeBezierPostscript_TCL_DECLARED
 /* 50 */
 EXTERN void		TkMakeBezierPostscript(Tcl_Interp *interp,
 				Tk_Canvas canvas, double *pointPtr,
 				int numPoints);
+#endif
+#ifndef TkOptionClassChanged_TCL_DECLARED
+#define TkOptionClassChanged_TCL_DECLARED
 /* 51 */
 EXTERN void		TkOptionClassChanged(TkWindow *winPtr);
+#endif
+#ifndef TkOptionDeadWindow_TCL_DECLARED
+#define TkOptionDeadWindow_TCL_DECLARED
 /* 52 */
 EXTERN void		TkOptionDeadWindow(TkWindow *winPtr);
+#endif
+#ifndef TkOvalToArea_TCL_DECLARED
+#define TkOvalToArea_TCL_DECLARED
 /* 53 */
 EXTERN int		TkOvalToArea(double *ovalPtr, double *rectPtr);
+#endif
+#ifndef TkOvalToPoint_TCL_DECLARED
+#define TkOvalToPoint_TCL_DECLARED
 /* 54 */
 EXTERN double		TkOvalToPoint(double ovalPtr[], double width,
 				int filled, double pointPtr[]);
+#endif
+#ifndef TkpChangeFocus_TCL_DECLARED
+#define TkpChangeFocus_TCL_DECLARED
 /* 55 */
 EXTERN int		TkpChangeFocus(TkWindow *winPtr, int force);
+#endif
+#ifndef TkpCloseDisplay_TCL_DECLARED
+#define TkpCloseDisplay_TCL_DECLARED
 /* 56 */
 EXTERN void		TkpCloseDisplay(TkDisplay *dispPtr);
+#endif
+#ifndef TkpClaimFocus_TCL_DECLARED
+#define TkpClaimFocus_TCL_DECLARED
 /* 57 */
 EXTERN void		TkpClaimFocus(TkWindow *topLevelPtr, int force);
+#endif
+#ifndef TkpDisplayWarning_TCL_DECLARED
+#define TkpDisplayWarning_TCL_DECLARED
 /* 58 */
-EXTERN void		TkpDisplayWarning(const char *msg, const char *title);
+EXTERN void		TkpDisplayWarning(CONST char *msg, CONST char *title);
+#endif
+#ifndef TkpGetAppName_TCL_DECLARED
+#define TkpGetAppName_TCL_DECLARED
 /* 59 */
 EXTERN void		TkpGetAppName(Tcl_Interp *interp, Tcl_DString *name);
+#endif
+#ifndef TkpGetOtherWindow_TCL_DECLARED
+#define TkpGetOtherWindow_TCL_DECLARED
 /* 60 */
 EXTERN TkWindow *	TkpGetOtherWindow(TkWindow *winPtr);
+#endif
+#ifndef TkpGetWrapperWindow_TCL_DECLARED
+#define TkpGetWrapperWindow_TCL_DECLARED
 /* 61 */
 EXTERN TkWindow *	TkpGetWrapperWindow(TkWindow *winPtr);
+#endif
+#ifndef TkpInit_TCL_DECLARED
+#define TkpInit_TCL_DECLARED
 /* 62 */
 EXTERN int		TkpInit(Tcl_Interp *interp);
+#endif
+#ifndef TkpInitializeMenuBindings_TCL_DECLARED
+#define TkpInitializeMenuBindings_TCL_DECLARED
 /* 63 */
 EXTERN void		TkpInitializeMenuBindings(Tcl_Interp *interp,
 				Tk_BindingTable bindingTable);
+#endif
+#ifndef TkpMakeContainer_TCL_DECLARED
+#define TkpMakeContainer_TCL_DECLARED
 /* 64 */
 EXTERN void		TkpMakeContainer(Tk_Window tkwin);
+#endif
+#ifndef TkpMakeMenuWindow_TCL_DECLARED
+#define TkpMakeMenuWindow_TCL_DECLARED
 /* 65 */
 EXTERN void		TkpMakeMenuWindow(Tk_Window tkwin, int transient);
+#endif
+#ifndef TkpMakeWindow_TCL_DECLARED
+#define TkpMakeWindow_TCL_DECLARED
 /* 66 */
 EXTERN Window		TkpMakeWindow(TkWindow *winPtr, Window parent);
+#endif
+#ifndef TkpMenuNotifyToplevelCreate_TCL_DECLARED
+#define TkpMenuNotifyToplevelCreate_TCL_DECLARED
 /* 67 */
 EXTERN void		TkpMenuNotifyToplevelCreate(Tcl_Interp *interp,
 				char *menuName);
+#endif
+#ifndef TkpOpenDisplay_TCL_DECLARED
+#define TkpOpenDisplay_TCL_DECLARED
 /* 68 */
-EXTERN TkDisplay *	TkpOpenDisplay(const char *display_name);
+EXTERN TkDisplay *	TkpOpenDisplay(CONST char *display_name);
+#endif
+#ifndef TkPointerEvent_TCL_DECLARED
+#define TkPointerEvent_TCL_DECLARED
 /* 69 */
 EXTERN int		TkPointerEvent(XEvent *eventPtr, TkWindow *winPtr);
+#endif
+#ifndef TkPolygonToArea_TCL_DECLARED
+#define TkPolygonToArea_TCL_DECLARED
 /* 70 */
 EXTERN int		TkPolygonToArea(double *polyPtr, int numPoints,
 				double *rectPtr);
+#endif
+#ifndef TkPolygonToPoint_TCL_DECLARED
+#define TkPolygonToPoint_TCL_DECLARED
 /* 71 */
 EXTERN double		TkPolygonToPoint(double *polyPtr, int numPoints,
 				double *pointPtr);
+#endif
+#ifndef TkPositionInTree_TCL_DECLARED
+#define TkPositionInTree_TCL_DECLARED
 /* 72 */
 EXTERN int		TkPositionInTree(TkWindow *winPtr, TkWindow *treePtr);
+#endif
+#ifndef TkpRedirectKeyEvent_TCL_DECLARED
+#define TkpRedirectKeyEvent_TCL_DECLARED
 /* 73 */
 EXTERN void		TkpRedirectKeyEvent(TkWindow *winPtr,
 				XEvent *eventPtr);
+#endif
+#ifndef TkpSetMainMenubar_TCL_DECLARED
+#define TkpSetMainMenubar_TCL_DECLARED
 /* 74 */
 EXTERN void		TkpSetMainMenubar(Tcl_Interp *interp,
 				Tk_Window tkwin, char *menuName);
+#endif
+#ifndef TkpUseWindow_TCL_DECLARED
+#define TkpUseWindow_TCL_DECLARED
 /* 75 */
 EXTERN int		TkpUseWindow(Tcl_Interp *interp, Tk_Window tkwin,
-				const char *string);
+				CONST char *string);
+#endif
+#ifndef TkpWindowWasRecentlyDeleted_TCL_DECLARED
+#define TkpWindowWasRecentlyDeleted_TCL_DECLARED
 /* 76 */
 EXTERN int		TkpWindowWasRecentlyDeleted(Window win,
 				TkDisplay *dispPtr);
+#endif
+#ifndef TkQueueEventForAllChildren_TCL_DECLARED
+#define TkQueueEventForAllChildren_TCL_DECLARED
 /* 77 */
 EXTERN void		TkQueueEventForAllChildren(TkWindow *winPtr,
 				XEvent *eventPtr);
+#endif
+#ifndef TkReadBitmapFile_TCL_DECLARED
+#define TkReadBitmapFile_TCL_DECLARED
 /* 78 */
 EXTERN int		TkReadBitmapFile(Display *display, Drawable d,
-				const char *filename,
+				CONST char *filename,
 				unsigned int *width_return,
 				unsigned int *height_return,
 				Pixmap *bitmap_return, int *x_hot_return,
 				int *y_hot_return);
+#endif
+#ifndef TkScrollWindow_TCL_DECLARED
+#define TkScrollWindow_TCL_DECLARED
 /* 79 */
 EXTERN int		TkScrollWindow(Tk_Window tkwin, GC gc, int x, int y,
 				int width, int height, int dx, int dy,
 				TkRegion damageRgn);
+#endif
+#ifndef TkSelDeadWindow_TCL_DECLARED
+#define TkSelDeadWindow_TCL_DECLARED
 /* 80 */
 EXTERN void		TkSelDeadWindow(TkWindow *winPtr);
+#endif
+#ifndef TkSelEventProc_TCL_DECLARED
+#define TkSelEventProc_TCL_DECLARED
 /* 81 */
 EXTERN void		TkSelEventProc(Tk_Window tkwin, XEvent *eventPtr);
+#endif
+#ifndef TkSelInit_TCL_DECLARED
+#define TkSelInit_TCL_DECLARED
 /* 82 */
 EXTERN void		TkSelInit(Tk_Window tkwin);
+#endif
+#ifndef TkSelPropProc_TCL_DECLARED
+#define TkSelPropProc_TCL_DECLARED
 /* 83 */
 EXTERN void		TkSelPropProc(XEvent *eventPtr);
+#endif
 /* Slot 84 is reserved */
+#ifndef TkSetWindowMenuBar_TCL_DECLARED
+#define TkSetWindowMenuBar_TCL_DECLARED
 /* 85 */
 EXTERN void		TkSetWindowMenuBar(Tcl_Interp *interp,
 				Tk_Window tkwin, char *oldMenuName,
 				char *menuName);
+#endif
+#ifndef TkStringToKeysym_TCL_DECLARED
+#define TkStringToKeysym_TCL_DECLARED
 /* 86 */
 EXTERN KeySym		TkStringToKeysym(char *name);
+#endif
+#ifndef TkThickPolyLineToArea_TCL_DECLARED
+#define TkThickPolyLineToArea_TCL_DECLARED
 /* 87 */
 EXTERN int		TkThickPolyLineToArea(double *coordPtr,
 				int numPoints, double width, int capStyle,
 				int joinStyle, double *rectPtr);
+#endif
+#ifndef TkWmAddToColormapWindows_TCL_DECLARED
+#define TkWmAddToColormapWindows_TCL_DECLARED
 /* 88 */
 EXTERN void		TkWmAddToColormapWindows(TkWindow *winPtr);
+#endif
+#ifndef TkWmDeadWindow_TCL_DECLARED
+#define TkWmDeadWindow_TCL_DECLARED
 /* 89 */
 EXTERN void		TkWmDeadWindow(TkWindow *winPtr);
+#endif
+#ifndef TkWmFocusToplevel_TCL_DECLARED
+#define TkWmFocusToplevel_TCL_DECLARED
 /* 90 */
 EXTERN TkWindow *	TkWmFocusToplevel(TkWindow *winPtr);
+#endif
+#ifndef TkWmMapWindow_TCL_DECLARED
+#define TkWmMapWindow_TCL_DECLARED
 /* 91 */
 EXTERN void		TkWmMapWindow(TkWindow *winPtr);
+#endif
+#ifndef TkWmNewWindow_TCL_DECLARED
+#define TkWmNewWindow_TCL_DECLARED
 /* 92 */
 EXTERN void		TkWmNewWindow(TkWindow *winPtr);
+#endif
+#ifndef TkWmProtocolEventProc_TCL_DECLARED
+#define TkWmProtocolEventProc_TCL_DECLARED
 /* 93 */
 EXTERN void		TkWmProtocolEventProc(TkWindow *winPtr,
 				XEvent *evenvPtr);
+#endif
+#ifndef TkWmRemoveFromColormapWindows_TCL_DECLARED
+#define TkWmRemoveFromColormapWindows_TCL_DECLARED
 /* 94 */
 EXTERN void		TkWmRemoveFromColormapWindows(TkWindow *winPtr);
+#endif
+#ifndef TkWmRestackToplevel_TCL_DECLARED
+#define TkWmRestackToplevel_TCL_DECLARED
 /* 95 */
 EXTERN void		TkWmRestackToplevel(TkWindow *winPtr, int aboveBelow,
 				TkWindow *otherPtr);
+#endif
+#ifndef TkWmSetClass_TCL_DECLARED
+#define TkWmSetClass_TCL_DECLARED
 /* 96 */
 EXTERN void		TkWmSetClass(TkWindow *winPtr);
+#endif
+#ifndef TkWmUnmapWindow_TCL_DECLARED
+#define TkWmUnmapWindow_TCL_DECLARED
 /* 97 */
 EXTERN void		TkWmUnmapWindow(TkWindow *winPtr);
+#endif
+#ifndef TkDebugBitmap_TCL_DECLARED
+#define TkDebugBitmap_TCL_DECLARED
 /* 98 */
 EXTERN Tcl_Obj *	TkDebugBitmap(Tk_Window tkwin, char *name);
+#endif
+#ifndef TkDebugBorder_TCL_DECLARED
+#define TkDebugBorder_TCL_DECLARED
 /* 99 */
 EXTERN Tcl_Obj *	TkDebugBorder(Tk_Window tkwin, char *name);
+#endif
+#ifndef TkDebugCursor_TCL_DECLARED
+#define TkDebugCursor_TCL_DECLARED
 /* 100 */
 EXTERN Tcl_Obj *	TkDebugCursor(Tk_Window tkwin, char *name);
+#endif
+#ifndef TkDebugColor_TCL_DECLARED
+#define TkDebugColor_TCL_DECLARED
 /* 101 */
 EXTERN Tcl_Obj *	TkDebugColor(Tk_Window tkwin, char *name);
+#endif
+#ifndef TkDebugConfig_TCL_DECLARED
+#define TkDebugConfig_TCL_DECLARED
 /* 102 */
 EXTERN Tcl_Obj *	TkDebugConfig(Tcl_Interp *interp,
 				Tk_OptionTable table);
+#endif
+#ifndef TkDebugFont_TCL_DECLARED
+#define TkDebugFont_TCL_DECLARED
 /* 103 */
 EXTERN Tcl_Obj *	TkDebugFont(Tk_Window tkwin, char *name);
+#endif
+#ifndef TkFindStateNumObj_TCL_DECLARED
+#define TkFindStateNumObj_TCL_DECLARED
 /* 104 */
 EXTERN int		TkFindStateNumObj(Tcl_Interp *interp,
-				Tcl_Obj *optionPtr, const TkStateMap *mapPtr,
+				Tcl_Obj *optionPtr, CONST TkStateMap *mapPtr,
 				Tcl_Obj *keyPtr);
+#endif
+#ifndef TkGetBitmapPredefTable_TCL_DECLARED
+#define TkGetBitmapPredefTable_TCL_DECLARED
 /* 105 */
 EXTERN Tcl_HashTable *	TkGetBitmapPredefTable(void);
+#endif
+#ifndef TkGetDisplayList_TCL_DECLARED
+#define TkGetDisplayList_TCL_DECLARED
 /* 106 */
 EXTERN TkDisplay *	TkGetDisplayList(void);
+#endif
+#ifndef TkGetMainInfoList_TCL_DECLARED
+#define TkGetMainInfoList_TCL_DECLARED
 /* 107 */
 EXTERN TkMainInfo *	TkGetMainInfoList(void);
+#endif
+#ifndef TkGetWindowFromObj_TCL_DECLARED
+#define TkGetWindowFromObj_TCL_DECLARED
 /* 108 */
 EXTERN int		TkGetWindowFromObj(Tcl_Interp *interp,
 				Tk_Window tkwin, Tcl_Obj *objPtr,
 				Tk_Window *windowPtr);
+#endif
+#ifndef TkpGetString_TCL_DECLARED
+#define TkpGetString_TCL_DECLARED
 /* 109 */
 EXTERN char *		TkpGetString(TkWindow *winPtr, XEvent *eventPtr,
 				Tcl_DString *dsPtr);
+#endif
+#ifndef TkpGetSubFonts_TCL_DECLARED
+#define TkpGetSubFonts_TCL_DECLARED
 /* 110 */
 EXTERN void		TkpGetSubFonts(Tcl_Interp *interp, Tk_Font tkfont);
+#endif
+#ifndef TkpGetSystemDefault_TCL_DECLARED
+#define TkpGetSystemDefault_TCL_DECLARED
 /* 111 */
 EXTERN Tcl_Obj *	TkpGetSystemDefault(Tk_Window tkwin,
-				const char *dbName, const char *className);
+				CONST char *dbName, CONST char *className);
+#endif
+#ifndef TkpMenuThreadInit_TCL_DECLARED
+#define TkpMenuThreadInit_TCL_DECLARED
 /* 112 */
 EXTERN void		TkpMenuThreadInit(void);
+#endif
+#ifndef TkClipBox_TCL_DECLARED
+#define TkClipBox_TCL_DECLARED
 /* 113 */
 EXTERN void		TkClipBox(TkRegion rgn, XRectangle *rect_return);
+#endif
+#ifndef TkCreateRegion_TCL_DECLARED
+#define TkCreateRegion_TCL_DECLARED
 /* 114 */
 EXTERN TkRegion		TkCreateRegion(void);
+#endif
+#ifndef TkDestroyRegion_TCL_DECLARED
+#define TkDestroyRegion_TCL_DECLARED
 /* 115 */
 EXTERN void		TkDestroyRegion(TkRegion rgn);
+#endif
+#ifndef TkIntersectRegion_TCL_DECLARED
+#define TkIntersectRegion_TCL_DECLARED
 /* 116 */
 EXTERN void		TkIntersectRegion(TkRegion sra, TkRegion srcb,
 				TkRegion dr_return);
+#endif
+#ifndef TkRectInRegion_TCL_DECLARED
+#define TkRectInRegion_TCL_DECLARED
 /* 117 */
 EXTERN int		TkRectInRegion(TkRegion rgn, int x, int y,
 				unsigned int width, unsigned int height);
+#endif
+#ifndef TkSetRegion_TCL_DECLARED
+#define TkSetRegion_TCL_DECLARED
 /* 118 */
 EXTERN void		TkSetRegion(Display *display, GC gc, TkRegion rgn);
+#endif
+#ifndef TkUnionRectWithRegion_TCL_DECLARED
+#define TkUnionRectWithRegion_TCL_DECLARED
 /* 119 */
 EXTERN void		TkUnionRectWithRegion(XRectangle *rect, TkRegion src,
 				TkRegion dr_return);
+#endif
 /* Slot 120 is reserved */
 #ifdef MAC_OSX_TK /* AQUA */
+#ifndef TkpCreateNativeBitmap_TCL_DECLARED
+#define TkpCreateNativeBitmap_TCL_DECLARED
 /* 121 */
 EXTERN Pixmap		TkpCreateNativeBitmap(Display *display,
-				const char *source);
+				CONST char *source);
+#endif
 #endif /* AQUA */
 #ifdef MAC_OSX_TK /* AQUA */
+#ifndef TkpDefineNativeBitmaps_TCL_DECLARED
+#define TkpDefineNativeBitmaps_TCL_DECLARED
 /* 122 */
 EXTERN void		TkpDefineNativeBitmaps(void);
+#endif
 #endif /* AQUA */
 /* Slot 123 is reserved */
 #ifdef MAC_OSX_TK /* AQUA */
+#ifndef TkpGetNativeAppBitmap_TCL_DECLARED
+#define TkpGetNativeAppBitmap_TCL_DECLARED
 /* 124 */
 EXTERN Pixmap		TkpGetNativeAppBitmap(Display *display,
-				const char *name, int *width, int *height);
+				CONST char *name, int *width, int *height);
+#endif
 #endif /* AQUA */
 /* Slot 125 is reserved */
 /* Slot 126 is reserved */
@@ -377,68 +743,134 @@ EXTERN Pixmap		TkpGetNativeAppBitmap(Display *display,
 /* Slot 132 is reserved */
 /* Slot 133 is reserved */
 /* Slot 134 is reserved */
+#ifndef TkpDrawHighlightBorder_TCL_DECLARED
+#define TkpDrawHighlightBorder_TCL_DECLARED
 /* 135 */
 EXTERN void		TkpDrawHighlightBorder(Tk_Window tkwin, GC fgGC,
 				GC bgGC, int highlightWidth,
 				Drawable drawable);
+#endif
+#ifndef TkSetFocusWin_TCL_DECLARED
+#define TkSetFocusWin_TCL_DECLARED
 /* 136 */
 EXTERN void		TkSetFocusWin(TkWindow *winPtr, int force);
+#endif
+#ifndef TkpSetKeycodeAndState_TCL_DECLARED
+#define TkpSetKeycodeAndState_TCL_DECLARED
 /* 137 */
 EXTERN void		TkpSetKeycodeAndState(Tk_Window tkwin, KeySym keySym,
 				XEvent *eventPtr);
+#endif
+#ifndef TkpGetKeySym_TCL_DECLARED
+#define TkpGetKeySym_TCL_DECLARED
 /* 138 */
 EXTERN KeySym		TkpGetKeySym(TkDisplay *dispPtr, XEvent *eventPtr);
+#endif
+#ifndef TkpInitKeymapInfo_TCL_DECLARED
+#define TkpInitKeymapInfo_TCL_DECLARED
 /* 139 */
 EXTERN void		TkpInitKeymapInfo(TkDisplay *dispPtr);
+#endif
+#ifndef TkPhotoGetValidRegion_TCL_DECLARED
+#define TkPhotoGetValidRegion_TCL_DECLARED
 /* 140 */
 EXTERN TkRegion		TkPhotoGetValidRegion(Tk_PhotoHandle handle);
+#endif
+#ifndef TkWmStackorderToplevel_TCL_DECLARED
+#define TkWmStackorderToplevel_TCL_DECLARED
 /* 141 */
 EXTERN TkWindow **	TkWmStackorderToplevel(TkWindow *parentPtr);
+#endif
+#ifndef TkFocusFree_TCL_DECLARED
+#define TkFocusFree_TCL_DECLARED
 /* 142 */
 EXTERN void		TkFocusFree(TkMainInfo *mainPtr);
+#endif
+#ifndef TkClipCleanup_TCL_DECLARED
+#define TkClipCleanup_TCL_DECLARED
 /* 143 */
 EXTERN void		TkClipCleanup(TkDisplay *dispPtr);
+#endif
+#ifndef TkGCCleanup_TCL_DECLARED
+#define TkGCCleanup_TCL_DECLARED
 /* 144 */
 EXTERN void		TkGCCleanup(TkDisplay *dispPtr);
+#endif
+#ifndef TkSubtractRegion_TCL_DECLARED
+#define TkSubtractRegion_TCL_DECLARED
 /* 145 */
 EXTERN void		TkSubtractRegion(TkRegion sra, TkRegion srcb,
 				TkRegion dr_return);
+#endif
+#ifndef TkStylePkgInit_TCL_DECLARED
+#define TkStylePkgInit_TCL_DECLARED
 /* 146 */
 EXTERN void		TkStylePkgInit(TkMainInfo *mainPtr);
+#endif
+#ifndef TkStylePkgFree_TCL_DECLARED
+#define TkStylePkgFree_TCL_DECLARED
 /* 147 */
 EXTERN void		TkStylePkgFree(TkMainInfo *mainPtr);
+#endif
+#ifndef TkToplevelWindowForCommand_TCL_DECLARED
+#define TkToplevelWindowForCommand_TCL_DECLARED
 /* 148 */
 EXTERN Tk_Window	TkToplevelWindowForCommand(Tcl_Interp *interp,
-				const char *cmdName);
+				CONST char *cmdName);
+#endif
+#ifndef TkGetOptionSpec_TCL_DECLARED
+#define TkGetOptionSpec_TCL_DECLARED
 /* 149 */
-EXTERN const Tk_OptionSpec * TkGetOptionSpec(const char *name,
+EXTERN CONST Tk_OptionSpec * TkGetOptionSpec(CONST char *name,
 				Tk_OptionTable optionTable);
+#endif
+#ifndef TkMakeRawCurve_TCL_DECLARED
+#define TkMakeRawCurve_TCL_DECLARED
 /* 150 */
 EXTERN int		TkMakeRawCurve(Tk_Canvas canvas, double *pointPtr,
 				int numPoints, int numSteps,
 				XPoint xPoints[], double dblPoints[]);
+#endif
+#ifndef TkMakeRawCurvePostscript_TCL_DECLARED
+#define TkMakeRawCurvePostscript_TCL_DECLARED
 /* 151 */
 EXTERN void		TkMakeRawCurvePostscript(Tcl_Interp *interp,
 				Tk_Canvas canvas, double *pointPtr,
 				int numPoints);
+#endif
+#ifndef TkpDrawFrame_TCL_DECLARED
+#define TkpDrawFrame_TCL_DECLARED
 /* 152 */
 EXTERN void		TkpDrawFrame(Tk_Window tkwin, Tk_3DBorder border,
 				int highlightWidth, int borderWidth,
 				int relief);
+#endif
+#ifndef TkCreateThreadExitHandler_TCL_DECLARED
+#define TkCreateThreadExitHandler_TCL_DECLARED
 /* 153 */
 EXTERN void		TkCreateThreadExitHandler(Tcl_ExitProc *proc,
 				ClientData clientData);
+#endif
+#ifndef TkDeleteThreadExitHandler_TCL_DECLARED
+#define TkDeleteThreadExitHandler_TCL_DECLARED
 /* 154 */
 EXTERN void		TkDeleteThreadExitHandler(Tcl_ExitProc *proc,
 				ClientData clientData);
+#endif
 /* Slot 155 is reserved */
+#ifndef TkpTestembedCmd_TCL_DECLARED
+#define TkpTestembedCmd_TCL_DECLARED
 /* 156 */
 EXTERN int		TkpTestembedCmd(ClientData clientData,
 				Tcl_Interp *interp, int argc,
-				const char **argv);
+				CONST char **argv);
+#endif
+#ifndef TkpTesttextCmd_TCL_DECLARED
+#define TkpTesttextCmd_TCL_DECLARED
 /* 157 */
 EXTERN int		TkpTesttextCmd(ClientData dummy, Tcl_Interp *interp,
-				int argc, const char **argv);
+				int argc, CONST char **argv);
+#endif
 /* Slot 158 is reserved */
 /* Slot 159 is reserved */
 /* Slot 160 is reserved */
@@ -450,65 +882,104 @@ EXTERN int		TkpTesttextCmd(ClientData dummy, Tcl_Interp *interp,
 /* Slot 166 is reserved */
 /* Slot 167 is reserved */
 /* Slot 168 is reserved */
+#ifndef TkStateParseProc_TCL_DECLARED
+#define TkStateParseProc_TCL_DECLARED
 /* 169 */
 EXTERN int		TkStateParseProc(ClientData clientData,
 				Tcl_Interp *interp, Tk_Window tkwin,
-				const char *value, char *widgRec, int offset);
+				CONST char *value, char *widgRec, int offset);
+#endif
+#ifndef TkStatePrintProc_TCL_DECLARED
+#define TkStatePrintProc_TCL_DECLARED
 /* 170 */
 EXTERN char *		TkStatePrintProc(ClientData clientData,
 				Tk_Window tkwin, char *widgRec, int offset,
 				Tcl_FreeProc **freeProcPtr);
+#endif
+#ifndef TkCanvasDashParseProc_TCL_DECLARED
+#define TkCanvasDashParseProc_TCL_DECLARED
 /* 171 */
 EXTERN int		TkCanvasDashParseProc(ClientData clientData,
 				Tcl_Interp *interp, Tk_Window tkwin,
-				const char *value, char *widgRec, int offset);
+				CONST char *value, char *widgRec, int offset);
+#endif
+#ifndef TkCanvasDashPrintProc_TCL_DECLARED
+#define TkCanvasDashPrintProc_TCL_DECLARED
 /* 172 */
 EXTERN char *		TkCanvasDashPrintProc(ClientData clientData,
 				Tk_Window tkwin, char *widgRec, int offset,
 				Tcl_FreeProc **freeProcPtr);
+#endif
+#ifndef TkOffsetParseProc_TCL_DECLARED
+#define TkOffsetParseProc_TCL_DECLARED
 /* 173 */
 EXTERN int		TkOffsetParseProc(ClientData clientData,
 				Tcl_Interp *interp, Tk_Window tkwin,
-				const char *value, char *widgRec, int offset);
+				CONST char *value, char *widgRec, int offset);
+#endif
+#ifndef TkOffsetPrintProc_TCL_DECLARED
+#define TkOffsetPrintProc_TCL_DECLARED
 /* 174 */
 EXTERN char *		TkOffsetPrintProc(ClientData clientData,
 				Tk_Window tkwin, char *widgRec, int offset,
 				Tcl_FreeProc **freeProcPtr);
+#endif
+#ifndef TkPixelParseProc_TCL_DECLARED
+#define TkPixelParseProc_TCL_DECLARED
 /* 175 */
 EXTERN int		TkPixelParseProc(ClientData clientData,
 				Tcl_Interp *interp, Tk_Window tkwin,
-				const char *value, char *widgRec, int offset);
+				CONST char *value, char *widgRec, int offset);
+#endif
+#ifndef TkPixelPrintProc_TCL_DECLARED
+#define TkPixelPrintProc_TCL_DECLARED
 /* 176 */
 EXTERN char *		TkPixelPrintProc(ClientData clientData,
 				Tk_Window tkwin, char *widgRec, int offset,
 				Tcl_FreeProc **freeProcPtr);
+#endif
+#ifndef TkOrientParseProc_TCL_DECLARED
+#define TkOrientParseProc_TCL_DECLARED
 /* 177 */
 EXTERN int		TkOrientParseProc(ClientData clientData,
 				Tcl_Interp *interp, Tk_Window tkwin,
-				const char *value, char *widgRec, int offset);
+				CONST char *value, char *widgRec, int offset);
+#endif
+#ifndef TkOrientPrintProc_TCL_DECLARED
+#define TkOrientPrintProc_TCL_DECLARED
 /* 178 */
 EXTERN char *		TkOrientPrintProc(ClientData clientData,
 				Tk_Window tkwin, char *widgRec, int offset,
 				Tcl_FreeProc **freeProcPtr);
+#endif
+#ifndef TkSmoothParseProc_TCL_DECLARED
+#define TkSmoothParseProc_TCL_DECLARED
 /* 179 */
 EXTERN int		TkSmoothParseProc(ClientData clientData,
 				Tcl_Interp *interp, Tk_Window tkwin,
-				const char *value, char *widgRec, int offset);
+				CONST char *value, char *widgRec, int offset);
+#endif
+#ifndef TkSmoothPrintProc_TCL_DECLARED
+#define TkSmoothPrintProc_TCL_DECLARED
 /* 180 */
 EXTERN char *		TkSmoothPrintProc(ClientData clientData,
 				Tk_Window tkwin, char *widgRec, int offset,
 				Tcl_FreeProc **freeProcPtr);
+#endif
 /* Slot 181 is reserved */
 /* Slot 182 is reserved */
 /* Slot 183 is reserved */
 /* Slot 184 is reserved */
 /* Slot 185 is reserved */
+#ifndef TkUnusedStubEntry_TCL_DECLARED
+#define TkUnusedStubEntry_TCL_DECLARED
 /* 186 */
 EXTERN void		TkUnusedStubEntry(void);
+#endif
 
 typedef struct TkIntStubs {
     int magic;
-    void *hooks;
+    struct TkIntStubHooks *hooks;
 
     TkWindow * (*tkAllocWindow) (TkDisplay *dispPtr, int screenNum, TkWindow *parentPtr); /* 0 */
     void (*tkBezierPoints) (double control[], int numSteps, double *coordPtr); /* 1 */
@@ -521,18 +992,18 @@ typedef struct TkIntStubs {
     int (*tkClipInit) (Tcl_Interp *interp, TkDisplay *dispPtr); /* 8 */
     void (*tkComputeAnchor) (Tk_Anchor anchor, Tk_Window tkwin, int padX, int padY, int innerWidth, int innerHeight, int *xPtr, int *yPtr); /* 9 */
     int (*tkCopyAndGlobalEval) (Tcl_Interp *interp, char *script); /* 10 */
-    unsigned long (*tkCreateBindingProcedure) (Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, const char *eventString, TkBindEvalProc *evalProc, TkBindFreeProc *freeProc, ClientData clientData); /* 11 */
-    TkCursor * (*tkCreateCursorFromData) (Tk_Window tkwin, const char *source, const char *mask, int width, int height, int xHot, int yHot, XColor fg, XColor bg); /* 12 */
+    unsigned long (*tkCreateBindingProcedure) (Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, CONST char *eventString, TkBindEvalProc *evalProc, TkBindFreeProc *freeProc, ClientData clientData); /* 11 */
+    TkCursor * (*tkCreateCursorFromData) (Tk_Window tkwin, CONST char *source, CONST char *mask, int width, int height, int xHot, int yHot, XColor fg, XColor bg); /* 12 */
     int (*tkCreateFrame) (ClientData clientData, Tcl_Interp *interp, int argc, char **argv, int toplevel, char *appName); /* 13 */
-    Tk_Window (*tkCreateMainWindow) (Tcl_Interp *interp, const char *screenName, char *baseName); /* 14 */
+    Tk_Window (*tkCreateMainWindow) (Tcl_Interp *interp, CONST char *screenName, char *baseName); /* 14 */
     Time (*tkCurrentTime) (TkDisplay *dispPtr); /* 15 */
     void (*tkDeleteAllImages) (TkMainInfo *mainPtr); /* 16 */
     void (*tkDoConfigureNotify) (TkWindow *winPtr); /* 17 */
     void (*tkDrawInsetFocusHighlight) (Tk_Window tkwin, GC gc, int width, Drawable drawable, int padding); /* 18 */
     void (*tkEventDeadWindow) (TkWindow *winPtr); /* 19 */
     void (*tkFillPolygon) (Tk_Canvas canvas, double *coordPtr, int numPoints, Display *display, Drawable drawable, GC gc, GC outlineGC); /* 20 */
-    int (*tkFindStateNum) (Tcl_Interp *interp, const char *option, const TkStateMap *mapPtr, const char *strKey); /* 21 */
-    char * (*tkFindStateString) (const TkStateMap *mapPtr, int numKey); /* 22 */
+    int (*tkFindStateNum) (Tcl_Interp *interp, CONST char *option, CONST TkStateMap *mapPtr, CONST char *strKey); /* 21 */
+    char * (*tkFindStateString) (CONST TkStateMap *mapPtr, int numKey); /* 22 */
     void (*tkFocusDeadWindow) (TkWindow *winPtr); /* 23 */
     int (*tkFocusFilterEvent) (TkWindow *winPtr, XEvent *eventPtr); /* 24 */
     TkWindow * (*tkFocusKeyEvent) (TkWindow *winPtr, XEvent *eventPtr); /* 25 */
@@ -543,9 +1014,9 @@ typedef struct TkIntStubs {
     char * (*tkGetBitmapData) (Tcl_Interp *interp, char *string, char *fileName, int *widthPtr, int *heightPtr, int *hotXPtr, int *hotYPtr); /* 30 */
     void (*tkGetButtPoints) (double p1[], double p2[], double width, int project, double m1[], double m2[]); /* 31 */
     TkCursor * (*tkGetCursorByName) (Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid string); /* 32 */
-    CONST84_RETURN char * (*tkGetDefaultScreenName) (Tcl_Interp *interp, const char *screenName); /* 33 */
+    CONST84_RETURN char * (*tkGetDefaultScreenName) (Tcl_Interp *interp, CONST char *screenName); /* 33 */
     TkDisplay * (*tkGetDisplay) (Display *display); /* 34 */
-    int (*tkGetDisplayOf) (Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], Tk_Window *tkwinPtr); /* 35 */
+    int (*tkGetDisplayOf) (Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], Tk_Window *tkwinPtr); /* 35 */
     TkWindow * (*tkGetFocusWin) (TkWindow *winPtr); /* 36 */
     int (*tkGetInterpNames) (Tcl_Interp *interp, Tk_Window tkwin); /* 37 */
     int (*tkGetMiterPoints) (double p1[], double p2[], double p3[], double width, double m1[], double m2[]); /* 38 */
@@ -568,7 +1039,7 @@ typedef struct TkIntStubs {
     int (*tkpChangeFocus) (TkWindow *winPtr, int force); /* 55 */
     void (*tkpCloseDisplay) (TkDisplay *dispPtr); /* 56 */
     void (*tkpClaimFocus) (TkWindow *topLevelPtr, int force); /* 57 */
-    void (*tkpDisplayWarning) (const char *msg, const char *title); /* 58 */
+    void (*tkpDisplayWarning) (CONST char *msg, CONST char *title); /* 58 */
     void (*tkpGetAppName) (Tcl_Interp *interp, Tcl_DString *name); /* 59 */
     TkWindow * (*tkpGetOtherWindow) (TkWindow *winPtr); /* 60 */
     TkWindow * (*tkpGetWrapperWindow) (TkWindow *winPtr); /* 61 */
@@ -578,23 +1049,23 @@ typedef struct TkIntStubs {
     void (*tkpMakeMenuWindow) (Tk_Window tkwin, int transient); /* 65 */
     Window (*tkpMakeWindow) (TkWindow *winPtr, Window parent); /* 66 */
     void (*tkpMenuNotifyToplevelCreate) (Tcl_Interp *interp, char *menuName); /* 67 */
-    TkDisplay * (*tkpOpenDisplay) (const char *display_name); /* 68 */
+    TkDisplay * (*tkpOpenDisplay) (CONST char *display_name); /* 68 */
     int (*tkPointerEvent) (XEvent *eventPtr, TkWindow *winPtr); /* 69 */
     int (*tkPolygonToArea) (double *polyPtr, int numPoints, double *rectPtr); /* 70 */
     double (*tkPolygonToPoint) (double *polyPtr, int numPoints, double *pointPtr); /* 71 */
     int (*tkPositionInTree) (TkWindow *winPtr, TkWindow *treePtr); /* 72 */
     void (*tkpRedirectKeyEvent) (TkWindow *winPtr, XEvent *eventPtr); /* 73 */
     void (*tkpSetMainMenubar) (Tcl_Interp *interp, Tk_Window tkwin, char *menuName); /* 74 */
-    int (*tkpUseWindow) (Tcl_Interp *interp, Tk_Window tkwin, const char *string); /* 75 */
+    int (*tkpUseWindow) (Tcl_Interp *interp, Tk_Window tkwin, CONST char *string); /* 75 */
     int (*tkpWindowWasRecentlyDeleted) (Window win, TkDisplay *dispPtr); /* 76 */
     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 */
+    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 */
     int (*tkScrollWindow) (Tk_Window tkwin, GC gc, int x, int y, int width, int height, int dx, int dy, TkRegion damageRgn); /* 79 */
     void (*tkSelDeadWindow) (TkWindow *winPtr); /* 80 */
     void (*tkSelEventProc) (Tk_Window tkwin, XEvent *eventPtr); /* 81 */
     void (*tkSelInit) (Tk_Window tkwin); /* 82 */
     void (*tkSelPropProc) (XEvent *eventPtr); /* 83 */
-    void (*reserved84)(void);
+    VOID *reserved84;
     void (*tkSetWindowMenuBar) (Tcl_Interp *interp, Tk_Window tkwin, char *oldMenuName, char *menuName); /* 85 */
     KeySym (*tkStringToKeysym) (char *name); /* 86 */
     int (*tkThickPolyLineToArea) (double *coordPtr, int numPoints, double width, int capStyle, int joinStyle, double *rectPtr); /* 87 */
@@ -614,14 +1085,14 @@ typedef struct TkIntStubs {
     Tcl_Obj * (*tkDebugColor) (Tk_Window tkwin, char *name); /* 101 */
     Tcl_Obj * (*tkDebugConfig) (Tcl_Interp *interp, Tk_OptionTable table); /* 102 */
     Tcl_Obj * (*tkDebugFont) (Tk_Window tkwin, char *name); /* 103 */
-    int (*tkFindStateNumObj) (Tcl_Interp *interp, Tcl_Obj *optionPtr, const TkStateMap *mapPtr, Tcl_Obj *keyPtr); /* 104 */
+    int (*tkFindStateNumObj) (Tcl_Interp *interp, Tcl_Obj *optionPtr, CONST TkStateMap *mapPtr, Tcl_Obj *keyPtr); /* 104 */
     Tcl_HashTable * (*tkGetBitmapPredefTable) (void); /* 105 */
     TkDisplay * (*tkGetDisplayList) (void); /* 106 */
     TkMainInfo * (*tkGetMainInfoList) (void); /* 107 */
     int (*tkGetWindowFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr, Tk_Window *windowPtr); /* 108 */
     char * (*tkpGetString) (TkWindow *winPtr, XEvent *eventPtr, Tcl_DString *dsPtr); /* 109 */
     void (*tkpGetSubFonts) (Tcl_Interp *interp, Tk_Font tkfont); /* 110 */
-    Tcl_Obj * (*tkpGetSystemDefault) (Tk_Window tkwin, const char *dbName, const char *className); /* 111 */
+    Tcl_Obj * (*tkpGetSystemDefault) (Tk_Window tkwin, CONST char *dbName, CONST char *className); /* 111 */
     void (*tkpMenuThreadInit) (void); /* 112 */
     void (*tkClipBox) (TkRegion rgn, XRectangle *rect_return); /* 113 */
     TkRegion (*tkCreateRegion) (void); /* 114 */
@@ -630,48 +1101,48 @@ typedef struct TkIntStubs {
     int (*tkRectInRegion) (TkRegion rgn, int x, int y, unsigned int width, unsigned int height); /* 117 */
     void (*tkSetRegion) (Display *display, GC gc, TkRegion rgn); /* 118 */
     void (*tkUnionRectWithRegion) (XRectangle *rect, TkRegion src, TkRegion dr_return); /* 119 */
-    void (*reserved120)(void);
-#if !(defined(_WIN32) || defined(MAC_OSX_TK)) /* X11 */
-    void (*reserved121)(void);
+    VOID *reserved120;
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
+    VOID *reserved121;
 #endif /* X11 */
-#if defined(_WIN32) /* WIN */
-    void (*reserved121)(void);
+#if defined(__WIN32__) /* WIN */
+    VOID *reserved121;
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    void (*reserved121)(void); /* Dummy entry for stubs table backwards compatibility */
-    Pixmap (*tkpCreateNativeBitmap) (Display *display, const char *source); /* 121 */
+    VOID *reserved121; /* Dummy entry for stubs table backwards compatibility */
+    Pixmap (*tkpCreateNativeBitmap) (Display *display, CONST char *source); /* 121 */
 #endif /* AQUA */
-#if !(defined(_WIN32) || defined(MAC_OSX_TK)) /* X11 */
-    void (*reserved122)(void);
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
+    VOID *reserved122;
 #endif /* X11 */
-#if defined(_WIN32) /* WIN */
-    void (*reserved122)(void);
+#if defined(__WIN32__) /* WIN */
+    VOID *reserved122;
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    void (*reserved122)(void); /* Dummy entry for stubs table backwards compatibility */
+    VOID *reserved122; /* 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);
+    VOID *reserved123;
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
+    VOID *reserved124;
 #endif /* X11 */
-#if defined(_WIN32) /* WIN */
-    void (*reserved124)(void);
+#if defined(__WIN32__) /* WIN */
+    VOID *reserved124;
 #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 */
+    VOID *reserved124; /* 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);
-    void (*reserved128)(void);
-    void (*reserved129)(void);
-    void (*reserved130)(void);
-    void (*reserved131)(void);
-    void (*reserved132)(void);
-    void (*reserved133)(void);
-    void (*reserved134)(void);
+    VOID *reserved125;
+    VOID *reserved126;
+    VOID *reserved127;
+    VOID *reserved128;
+    VOID *reserved129;
+    VOID *reserved130;
+    VOID *reserved131;
+    VOID *reserved132;
+    VOID *reserved133;
+    VOID *reserved134;
     void (*tkpDrawHighlightBorder) (Tk_Window tkwin, GC fgGC, GC bgGC, int highlightWidth, Drawable drawable); /* 135 */
     void (*tkSetFocusWin) (TkWindow *winPtr, int force); /* 136 */
     void (*tkpSetKeycodeAndState) (Tk_Window tkwin, KeySym keySym, XEvent *eventPtr); /* 137 */
@@ -685,311 +1156,555 @@ typedef struct TkIntStubs {
     void (*tkSubtractRegion) (TkRegion sra, TkRegion srcb, TkRegion dr_return); /* 145 */
     void (*tkStylePkgInit) (TkMainInfo *mainPtr); /* 146 */
     void (*tkStylePkgFree) (TkMainInfo *mainPtr); /* 147 */
-    Tk_Window (*tkToplevelWindowForCommand) (Tcl_Interp *interp, const char *cmdName); /* 148 */
-    const Tk_OptionSpec * (*tkGetOptionSpec) (const char *name, Tk_OptionTable optionTable); /* 149 */
+    Tk_Window (*tkToplevelWindowForCommand) (Tcl_Interp *interp, CONST char *cmdName); /* 148 */
+    CONST Tk_OptionSpec * (*tkGetOptionSpec) (CONST char *name, Tk_OptionTable optionTable); /* 149 */
     int (*tkMakeRawCurve) (Tk_Canvas canvas, double *pointPtr, int numPoints, int numSteps, XPoint xPoints[], double dblPoints[]); /* 150 */
     void (*tkMakeRawCurvePostscript) (Tcl_Interp *interp, Tk_Canvas canvas, double *pointPtr, int numPoints); /* 151 */
     void (*tkpDrawFrame) (Tk_Window tkwin, Tk_3DBorder border, int highlightWidth, int borderWidth, int relief); /* 152 */
     void (*tkCreateThreadExitHandler) (Tcl_ExitProc *proc, ClientData clientData); /* 153 */
     void (*tkDeleteThreadExitHandler) (Tcl_ExitProc *proc, ClientData clientData); /* 154 */
-    void (*reserved155)(void);
-    int (*tkpTestembedCmd) (ClientData clientData, Tcl_Interp *interp, int argc, const char **argv); /* 156 */
-    int (*tkpTesttextCmd) (ClientData dummy, Tcl_Interp *interp, int argc, const char **argv); /* 157 */
-    void (*reserved158)(void);
-    void (*reserved159)(void);
-    void (*reserved160)(void);
-    void (*reserved161)(void);
-    void (*reserved162)(void);
-    void (*reserved163)(void);
-    void (*reserved164)(void);
-    void (*reserved165)(void);
-    void (*reserved166)(void);
-    void (*reserved167)(void);
-    void (*reserved168)(void);
-    int (*tkStateParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset); /* 169 */
+    VOID *reserved155;
+    int (*tkpTestembedCmd) (ClientData clientData, Tcl_Interp *interp, int argc, CONST char **argv); /* 156 */
+    int (*tkpTesttextCmd) (ClientData dummy, Tcl_Interp *interp, int argc, CONST char **argv); /* 157 */
+    VOID *reserved158;
+    VOID *reserved159;
+    VOID *reserved160;
+    VOID *reserved161;
+    VOID *reserved162;
+    VOID *reserved163;
+    VOID *reserved164;
+    VOID *reserved165;
+    VOID *reserved166;
+    VOID *reserved167;
+    VOID *reserved168;
+    int (*tkStateParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, CONST char *value, char *widgRec, int offset); /* 169 */
     char * (*tkStatePrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 170 */
-    int (*tkCanvasDashParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset); /* 171 */
+    int (*tkCanvasDashParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, CONST char *value, char *widgRec, int offset); /* 171 */
     char * (*tkCanvasDashPrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 172 */
-    int (*tkOffsetParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset); /* 173 */
+    int (*tkOffsetParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, CONST char *value, char *widgRec, int offset); /* 173 */
     char * (*tkOffsetPrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 174 */
-    int (*tkPixelParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset); /* 175 */
+    int (*tkPixelParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, CONST char *value, char *widgRec, int offset); /* 175 */
     char * (*tkPixelPrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 176 */
-    int (*tkOrientParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset); /* 177 */
+    int (*tkOrientParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, CONST char *value, char *widgRec, int offset); /* 177 */
     char * (*tkOrientPrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 178 */
-    int (*tkSmoothParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset); /* 179 */
+    int (*tkSmoothParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, CONST char *value, char *widgRec, int offset); /* 179 */
     char * (*tkSmoothPrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 180 */
-    void (*reserved181)(void);
-    void (*reserved182)(void);
-    void (*reserved183)(void);
-    void (*reserved184)(void);
-    void (*reserved185)(void);
+    VOID *reserved181;
+    VOID *reserved182;
+    VOID *reserved183;
+    VOID *reserved184;
+    VOID *reserved185;
     void (*tkUnusedStubEntry) (void); /* 186 */
 } TkIntStubs;
 
-extern const TkIntStubs *tkIntStubsPtr;
+extern TkIntStubs *tkIntStubsPtr;
 
 #ifdef __cplusplus
 }
 #endif
 
-#if defined(USE_TK_STUBS)
+#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
 
 /*
  * Inline function declarations:
  */
 
+#ifndef TkAllocWindow
 #define TkAllocWindow \
 	(tkIntStubsPtr->tkAllocWindow) /* 0 */
+#endif
+#ifndef TkBezierPoints
 #define TkBezierPoints \
 	(tkIntStubsPtr->tkBezierPoints) /* 1 */
+#endif
+#ifndef TkBezierScreenPoints
 #define TkBezierScreenPoints \
 	(tkIntStubsPtr->tkBezierScreenPoints) /* 2 */
+#endif
+#ifndef TkBindDeadWindow
 #define TkBindDeadWindow \
 	(tkIntStubsPtr->tkBindDeadWindow) /* 3 */
+#endif
+#ifndef TkBindEventProc
 #define TkBindEventProc \
 	(tkIntStubsPtr->tkBindEventProc) /* 4 */
+#endif
+#ifndef TkBindFree
 #define TkBindFree \
 	(tkIntStubsPtr->tkBindFree) /* 5 */
+#endif
+#ifndef TkBindInit
 #define TkBindInit \
 	(tkIntStubsPtr->tkBindInit) /* 6 */
+#endif
+#ifndef TkChangeEventWindow
 #define TkChangeEventWindow \
 	(tkIntStubsPtr->tkChangeEventWindow) /* 7 */
+#endif
+#ifndef TkClipInit
 #define TkClipInit \
 	(tkIntStubsPtr->tkClipInit) /* 8 */
+#endif
+#ifndef TkComputeAnchor
 #define TkComputeAnchor \
 	(tkIntStubsPtr->tkComputeAnchor) /* 9 */
+#endif
+#ifndef TkCopyAndGlobalEval
 #define TkCopyAndGlobalEval \
 	(tkIntStubsPtr->tkCopyAndGlobalEval) /* 10 */
+#endif
+#ifndef TkCreateBindingProcedure
 #define TkCreateBindingProcedure \
 	(tkIntStubsPtr->tkCreateBindingProcedure) /* 11 */
+#endif
+#ifndef TkCreateCursorFromData
 #define TkCreateCursorFromData \
 	(tkIntStubsPtr->tkCreateCursorFromData) /* 12 */
+#endif
+#ifndef TkCreateFrame
 #define TkCreateFrame \
 	(tkIntStubsPtr->tkCreateFrame) /* 13 */
+#endif
+#ifndef TkCreateMainWindow
 #define TkCreateMainWindow \
 	(tkIntStubsPtr->tkCreateMainWindow) /* 14 */
+#endif
+#ifndef TkCurrentTime
 #define TkCurrentTime \
 	(tkIntStubsPtr->tkCurrentTime) /* 15 */
+#endif
+#ifndef TkDeleteAllImages
 #define TkDeleteAllImages \
 	(tkIntStubsPtr->tkDeleteAllImages) /* 16 */
+#endif
+#ifndef TkDoConfigureNotify
 #define TkDoConfigureNotify \
 	(tkIntStubsPtr->tkDoConfigureNotify) /* 17 */
+#endif
+#ifndef TkDrawInsetFocusHighlight
 #define TkDrawInsetFocusHighlight \
 	(tkIntStubsPtr->tkDrawInsetFocusHighlight) /* 18 */
+#endif
+#ifndef TkEventDeadWindow
 #define TkEventDeadWindow \
 	(tkIntStubsPtr->tkEventDeadWindow) /* 19 */
+#endif
+#ifndef TkFillPolygon
 #define TkFillPolygon \
 	(tkIntStubsPtr->tkFillPolygon) /* 20 */
+#endif
+#ifndef TkFindStateNum
 #define TkFindStateNum \
 	(tkIntStubsPtr->tkFindStateNum) /* 21 */
+#endif
+#ifndef TkFindStateString
 #define TkFindStateString \
 	(tkIntStubsPtr->tkFindStateString) /* 22 */
+#endif
+#ifndef TkFocusDeadWindow
 #define TkFocusDeadWindow \
 	(tkIntStubsPtr->tkFocusDeadWindow) /* 23 */
+#endif
+#ifndef TkFocusFilterEvent
 #define TkFocusFilterEvent \
 	(tkIntStubsPtr->tkFocusFilterEvent) /* 24 */
+#endif
+#ifndef TkFocusKeyEvent
 #define TkFocusKeyEvent \
 	(tkIntStubsPtr->tkFocusKeyEvent) /* 25 */
+#endif
+#ifndef TkFontPkgInit
 #define TkFontPkgInit \
 	(tkIntStubsPtr->tkFontPkgInit) /* 26 */
+#endif
+#ifndef TkFontPkgFree
 #define TkFontPkgFree \
 	(tkIntStubsPtr->tkFontPkgFree) /* 27 */
+#endif
+#ifndef TkFreeBindingTags
 #define TkFreeBindingTags \
 	(tkIntStubsPtr->tkFreeBindingTags) /* 28 */
+#endif
+#ifndef TkpFreeCursor
 #define TkpFreeCursor \
 	(tkIntStubsPtr->tkpFreeCursor) /* 29 */
+#endif
+#ifndef TkGetBitmapData
 #define TkGetBitmapData \
 	(tkIntStubsPtr->tkGetBitmapData) /* 30 */
+#endif
+#ifndef TkGetButtPoints
 #define TkGetButtPoints \
 	(tkIntStubsPtr->tkGetButtPoints) /* 31 */
+#endif
+#ifndef TkGetCursorByName
 #define TkGetCursorByName \
 	(tkIntStubsPtr->tkGetCursorByName) /* 32 */
+#endif
+#ifndef TkGetDefaultScreenName
 #define TkGetDefaultScreenName \
 	(tkIntStubsPtr->tkGetDefaultScreenName) /* 33 */
+#endif
+#ifndef TkGetDisplay
 #define TkGetDisplay \
 	(tkIntStubsPtr->tkGetDisplay) /* 34 */
+#endif
+#ifndef TkGetDisplayOf
 #define TkGetDisplayOf \
 	(tkIntStubsPtr->tkGetDisplayOf) /* 35 */
+#endif
+#ifndef TkGetFocusWin
 #define TkGetFocusWin \
 	(tkIntStubsPtr->tkGetFocusWin) /* 36 */
+#endif
+#ifndef TkGetInterpNames
 #define TkGetInterpNames \
 	(tkIntStubsPtr->tkGetInterpNames) /* 37 */
+#endif
+#ifndef TkGetMiterPoints
 #define TkGetMiterPoints \
 	(tkIntStubsPtr->tkGetMiterPoints) /* 38 */
+#endif
+#ifndef TkGetPointerCoords
 #define TkGetPointerCoords \
 	(tkIntStubsPtr->tkGetPointerCoords) /* 39 */
+#endif
+#ifndef TkGetServerInfo
 #define TkGetServerInfo \
 	(tkIntStubsPtr->tkGetServerInfo) /* 40 */
+#endif
+#ifndef TkGrabDeadWindow
 #define TkGrabDeadWindow \
 	(tkIntStubsPtr->tkGrabDeadWindow) /* 41 */
+#endif
+#ifndef TkGrabState
 #define TkGrabState \
 	(tkIntStubsPtr->tkGrabState) /* 42 */
+#endif
+#ifndef TkIncludePoint
 #define TkIncludePoint \
 	(tkIntStubsPtr->tkIncludePoint) /* 43 */
+#endif
+#ifndef TkInOutEvents
 #define TkInOutEvents \
 	(tkIntStubsPtr->tkInOutEvents) /* 44 */
+#endif
+#ifndef TkInstallFrameMenu
 #define TkInstallFrameMenu \
 	(tkIntStubsPtr->tkInstallFrameMenu) /* 45 */
+#endif
+#ifndef TkKeysymToString
 #define TkKeysymToString \
 	(tkIntStubsPtr->tkKeysymToString) /* 46 */
+#endif
+#ifndef TkLineToArea
 #define TkLineToArea \
 	(tkIntStubsPtr->tkLineToArea) /* 47 */
+#endif
+#ifndef TkLineToPoint
 #define TkLineToPoint \
 	(tkIntStubsPtr->tkLineToPoint) /* 48 */
+#endif
+#ifndef TkMakeBezierCurve
 #define TkMakeBezierCurve \
 	(tkIntStubsPtr->tkMakeBezierCurve) /* 49 */
+#endif
+#ifndef TkMakeBezierPostscript
 #define TkMakeBezierPostscript \
 	(tkIntStubsPtr->tkMakeBezierPostscript) /* 50 */
+#endif
+#ifndef TkOptionClassChanged
 #define TkOptionClassChanged \
 	(tkIntStubsPtr->tkOptionClassChanged) /* 51 */
+#endif
+#ifndef TkOptionDeadWindow
 #define TkOptionDeadWindow \
 	(tkIntStubsPtr->tkOptionDeadWindow) /* 52 */
+#endif
+#ifndef TkOvalToArea
 #define TkOvalToArea \
 	(tkIntStubsPtr->tkOvalToArea) /* 53 */
+#endif
+#ifndef TkOvalToPoint
 #define TkOvalToPoint \
 	(tkIntStubsPtr->tkOvalToPoint) /* 54 */
+#endif
+#ifndef TkpChangeFocus
 #define TkpChangeFocus \
 	(tkIntStubsPtr->tkpChangeFocus) /* 55 */
+#endif
+#ifndef TkpCloseDisplay
 #define TkpCloseDisplay \
 	(tkIntStubsPtr->tkpCloseDisplay) /* 56 */
+#endif
+#ifndef TkpClaimFocus
 #define TkpClaimFocus \
 	(tkIntStubsPtr->tkpClaimFocus) /* 57 */
+#endif
+#ifndef TkpDisplayWarning
 #define TkpDisplayWarning \
 	(tkIntStubsPtr->tkpDisplayWarning) /* 58 */
+#endif
+#ifndef TkpGetAppName
 #define TkpGetAppName \
 	(tkIntStubsPtr->tkpGetAppName) /* 59 */
+#endif
+#ifndef TkpGetOtherWindow
 #define TkpGetOtherWindow \
 	(tkIntStubsPtr->tkpGetOtherWindow) /* 60 */
+#endif
+#ifndef TkpGetWrapperWindow
 #define TkpGetWrapperWindow \
 	(tkIntStubsPtr->tkpGetWrapperWindow) /* 61 */
+#endif
+#ifndef TkpInit
 #define TkpInit \
 	(tkIntStubsPtr->tkpInit) /* 62 */
+#endif
+#ifndef TkpInitializeMenuBindings
 #define TkpInitializeMenuBindings \
 	(tkIntStubsPtr->tkpInitializeMenuBindings) /* 63 */
+#endif
+#ifndef TkpMakeContainer
 #define TkpMakeContainer \
 	(tkIntStubsPtr->tkpMakeContainer) /* 64 */
+#endif
+#ifndef TkpMakeMenuWindow
 #define TkpMakeMenuWindow \
 	(tkIntStubsPtr->tkpMakeMenuWindow) /* 65 */
+#endif
+#ifndef TkpMakeWindow
 #define TkpMakeWindow \
 	(tkIntStubsPtr->tkpMakeWindow) /* 66 */
+#endif
+#ifndef TkpMenuNotifyToplevelCreate
 #define TkpMenuNotifyToplevelCreate \
 	(tkIntStubsPtr->tkpMenuNotifyToplevelCreate) /* 67 */
+#endif
+#ifndef TkpOpenDisplay
 #define TkpOpenDisplay \
 	(tkIntStubsPtr->tkpOpenDisplay) /* 68 */
+#endif
+#ifndef TkPointerEvent
 #define TkPointerEvent \
 	(tkIntStubsPtr->tkPointerEvent) /* 69 */
+#endif
+#ifndef TkPolygonToArea
 #define TkPolygonToArea \
 	(tkIntStubsPtr->tkPolygonToArea) /* 70 */
+#endif
+#ifndef TkPolygonToPoint
 #define TkPolygonToPoint \
 	(tkIntStubsPtr->tkPolygonToPoint) /* 71 */
+#endif
+#ifndef TkPositionInTree
 #define TkPositionInTree \
 	(tkIntStubsPtr->tkPositionInTree) /* 72 */
+#endif
+#ifndef TkpRedirectKeyEvent
 #define TkpRedirectKeyEvent \
 	(tkIntStubsPtr->tkpRedirectKeyEvent) /* 73 */
+#endif
+#ifndef TkpSetMainMenubar
 #define TkpSetMainMenubar \
 	(tkIntStubsPtr->tkpSetMainMenubar) /* 74 */
+#endif
+#ifndef TkpUseWindow
 #define TkpUseWindow \
 	(tkIntStubsPtr->tkpUseWindow) /* 75 */
+#endif
+#ifndef TkpWindowWasRecentlyDeleted
 #define TkpWindowWasRecentlyDeleted \
 	(tkIntStubsPtr->tkpWindowWasRecentlyDeleted) /* 76 */
+#endif
+#ifndef TkQueueEventForAllChildren
 #define TkQueueEventForAllChildren \
 	(tkIntStubsPtr->tkQueueEventForAllChildren) /* 77 */
+#endif
+#ifndef TkReadBitmapFile
 #define TkReadBitmapFile \
 	(tkIntStubsPtr->tkReadBitmapFile) /* 78 */
+#endif
+#ifndef TkScrollWindow
 #define TkScrollWindow \
 	(tkIntStubsPtr->tkScrollWindow) /* 79 */
+#endif
+#ifndef TkSelDeadWindow
 #define TkSelDeadWindow \
 	(tkIntStubsPtr->tkSelDeadWindow) /* 80 */
+#endif
+#ifndef TkSelEventProc
 #define TkSelEventProc \
 	(tkIntStubsPtr->tkSelEventProc) /* 81 */
+#endif
+#ifndef TkSelInit
 #define TkSelInit \
 	(tkIntStubsPtr->tkSelInit) /* 82 */
+#endif
+#ifndef TkSelPropProc
 #define TkSelPropProc \
 	(tkIntStubsPtr->tkSelPropProc) /* 83 */
+#endif
 /* Slot 84 is reserved */
+#ifndef TkSetWindowMenuBar
 #define TkSetWindowMenuBar \
 	(tkIntStubsPtr->tkSetWindowMenuBar) /* 85 */
+#endif
+#ifndef TkStringToKeysym
 #define TkStringToKeysym \
 	(tkIntStubsPtr->tkStringToKeysym) /* 86 */
+#endif
+#ifndef TkThickPolyLineToArea
 #define TkThickPolyLineToArea \
 	(tkIntStubsPtr->tkThickPolyLineToArea) /* 87 */
+#endif
+#ifndef TkWmAddToColormapWindows
 #define TkWmAddToColormapWindows \
 	(tkIntStubsPtr->tkWmAddToColormapWindows) /* 88 */
+#endif
+#ifndef TkWmDeadWindow
 #define TkWmDeadWindow \
 	(tkIntStubsPtr->tkWmDeadWindow) /* 89 */
+#endif
+#ifndef TkWmFocusToplevel
 #define TkWmFocusToplevel \
 	(tkIntStubsPtr->tkWmFocusToplevel) /* 90 */
+#endif
+#ifndef TkWmMapWindow
 #define TkWmMapWindow \
 	(tkIntStubsPtr->tkWmMapWindow) /* 91 */
+#endif
+#ifndef TkWmNewWindow
 #define TkWmNewWindow \
 	(tkIntStubsPtr->tkWmNewWindow) /* 92 */
+#endif
+#ifndef TkWmProtocolEventProc
 #define TkWmProtocolEventProc \
 	(tkIntStubsPtr->tkWmProtocolEventProc) /* 93 */
+#endif
+#ifndef TkWmRemoveFromColormapWindows
 #define TkWmRemoveFromColormapWindows \
 	(tkIntStubsPtr->tkWmRemoveFromColormapWindows) /* 94 */
+#endif
+#ifndef TkWmRestackToplevel
 #define TkWmRestackToplevel \
 	(tkIntStubsPtr->tkWmRestackToplevel) /* 95 */
+#endif
+#ifndef TkWmSetClass
 #define TkWmSetClass \
 	(tkIntStubsPtr->tkWmSetClass) /* 96 */
+#endif
+#ifndef TkWmUnmapWindow
 #define TkWmUnmapWindow \
 	(tkIntStubsPtr->tkWmUnmapWindow) /* 97 */
+#endif
+#ifndef TkDebugBitmap
 #define TkDebugBitmap \
 	(tkIntStubsPtr->tkDebugBitmap) /* 98 */
+#endif
+#ifndef TkDebugBorder
 #define TkDebugBorder \
 	(tkIntStubsPtr->tkDebugBorder) /* 99 */
+#endif
+#ifndef TkDebugCursor
 #define TkDebugCursor \
 	(tkIntStubsPtr->tkDebugCursor) /* 100 */
+#endif
+#ifndef TkDebugColor
 #define TkDebugColor \
 	(tkIntStubsPtr->tkDebugColor) /* 101 */
+#endif
+#ifndef TkDebugConfig
 #define TkDebugConfig \
 	(tkIntStubsPtr->tkDebugConfig) /* 102 */
+#endif
+#ifndef TkDebugFont
 #define TkDebugFont \
 	(tkIntStubsPtr->tkDebugFont) /* 103 */
+#endif
+#ifndef TkFindStateNumObj
 #define TkFindStateNumObj \
 	(tkIntStubsPtr->tkFindStateNumObj) /* 104 */
+#endif
+#ifndef TkGetBitmapPredefTable
 #define TkGetBitmapPredefTable \
 	(tkIntStubsPtr->tkGetBitmapPredefTable) /* 105 */
+#endif
+#ifndef TkGetDisplayList
 #define TkGetDisplayList \
 	(tkIntStubsPtr->tkGetDisplayList) /* 106 */
+#endif
+#ifndef TkGetMainInfoList
 #define TkGetMainInfoList \
 	(tkIntStubsPtr->tkGetMainInfoList) /* 107 */
+#endif
+#ifndef TkGetWindowFromObj
 #define TkGetWindowFromObj \
 	(tkIntStubsPtr->tkGetWindowFromObj) /* 108 */
+#endif
+#ifndef TkpGetString
 #define TkpGetString \
 	(tkIntStubsPtr->tkpGetString) /* 109 */
+#endif
+#ifndef TkpGetSubFonts
 #define TkpGetSubFonts \
 	(tkIntStubsPtr->tkpGetSubFonts) /* 110 */
+#endif
+#ifndef TkpGetSystemDefault
 #define TkpGetSystemDefault \
 	(tkIntStubsPtr->tkpGetSystemDefault) /* 111 */
+#endif
+#ifndef TkpMenuThreadInit
 #define TkpMenuThreadInit \
 	(tkIntStubsPtr->tkpMenuThreadInit) /* 112 */
+#endif
+#ifndef TkClipBox
 #define TkClipBox \
 	(tkIntStubsPtr->tkClipBox) /* 113 */
+#endif
+#ifndef TkCreateRegion
 #define TkCreateRegion \
 	(tkIntStubsPtr->tkCreateRegion) /* 114 */
+#endif
+#ifndef TkDestroyRegion
 #define TkDestroyRegion \
 	(tkIntStubsPtr->tkDestroyRegion) /* 115 */
+#endif
+#ifndef TkIntersectRegion
 #define TkIntersectRegion \
 	(tkIntStubsPtr->tkIntersectRegion) /* 116 */
+#endif
+#ifndef TkRectInRegion
 #define TkRectInRegion \
 	(tkIntStubsPtr->tkRectInRegion) /* 117 */
+#endif
+#ifndef TkSetRegion
 #define TkSetRegion \
 	(tkIntStubsPtr->tkSetRegion) /* 118 */
+#endif
+#ifndef TkUnionRectWithRegion
 #define TkUnionRectWithRegion \
 	(tkIntStubsPtr->tkUnionRectWithRegion) /* 119 */
+#endif
 /* Slot 120 is reserved */
 #ifdef MAC_OSX_TK /* AQUA */
+#ifndef TkpCreateNativeBitmap
 #define TkpCreateNativeBitmap \
 	(tkIntStubsPtr->tkpCreateNativeBitmap) /* 121 */
+#endif
 #endif /* AQUA */
 #ifdef MAC_OSX_TK /* AQUA */
+#ifndef TkpDefineNativeBitmaps
 #define TkpDefineNativeBitmaps \
 	(tkIntStubsPtr->tkpDefineNativeBitmaps) /* 122 */
+#endif
 #endif /* AQUA */
 /* Slot 123 is reserved */
 #ifdef MAC_OSX_TK /* AQUA */
+#ifndef TkpGetNativeAppBitmap
 #define TkpGetNativeAppBitmap \
 	(tkIntStubsPtr->tkpGetNativeAppBitmap) /* 124 */
+#endif
 #endif /* AQUA */
 /* Slot 125 is reserved */
 /* Slot 126 is reserved */
@@ -1001,51 +1716,95 @@ extern const TkIntStubs *tkIntStubsPtr;
 /* Slot 132 is reserved */
 /* Slot 133 is reserved */
 /* Slot 134 is reserved */
+#ifndef TkpDrawHighlightBorder
 #define TkpDrawHighlightBorder \
 	(tkIntStubsPtr->tkpDrawHighlightBorder) /* 135 */
+#endif
+#ifndef TkSetFocusWin
 #define TkSetFocusWin \
 	(tkIntStubsPtr->tkSetFocusWin) /* 136 */
+#endif
+#ifndef TkpSetKeycodeAndState
 #define TkpSetKeycodeAndState \
 	(tkIntStubsPtr->tkpSetKeycodeAndState) /* 137 */
+#endif
+#ifndef TkpGetKeySym
 #define TkpGetKeySym \
 	(tkIntStubsPtr->tkpGetKeySym) /* 138 */
+#endif
+#ifndef TkpInitKeymapInfo
 #define TkpInitKeymapInfo \
 	(tkIntStubsPtr->tkpInitKeymapInfo) /* 139 */
+#endif
+#ifndef TkPhotoGetValidRegion
 #define TkPhotoGetValidRegion \
 	(tkIntStubsPtr->tkPhotoGetValidRegion) /* 140 */
+#endif
+#ifndef TkWmStackorderToplevel
 #define TkWmStackorderToplevel \
 	(tkIntStubsPtr->tkWmStackorderToplevel) /* 141 */
+#endif
+#ifndef TkFocusFree
 #define TkFocusFree \
 	(tkIntStubsPtr->tkFocusFree) /* 142 */
+#endif
+#ifndef TkClipCleanup
 #define TkClipCleanup \
 	(tkIntStubsPtr->tkClipCleanup) /* 143 */
+#endif
+#ifndef TkGCCleanup
 #define TkGCCleanup \
 	(tkIntStubsPtr->tkGCCleanup) /* 144 */
+#endif
+#ifndef TkSubtractRegion
 #define TkSubtractRegion \
 	(tkIntStubsPtr->tkSubtractRegion) /* 145 */
+#endif
+#ifndef TkStylePkgInit
 #define TkStylePkgInit \
 	(tkIntStubsPtr->tkStylePkgInit) /* 146 */
+#endif
+#ifndef TkStylePkgFree
 #define TkStylePkgFree \
 	(tkIntStubsPtr->tkStylePkgFree) /* 147 */
+#endif
+#ifndef TkToplevelWindowForCommand
 #define TkToplevelWindowForCommand \
 	(tkIntStubsPtr->tkToplevelWindowForCommand) /* 148 */
+#endif
+#ifndef TkGetOptionSpec
 #define TkGetOptionSpec \
 	(tkIntStubsPtr->tkGetOptionSpec) /* 149 */
+#endif
+#ifndef TkMakeRawCurve
 #define TkMakeRawCurve \
 	(tkIntStubsPtr->tkMakeRawCurve) /* 150 */
+#endif
+#ifndef TkMakeRawCurvePostscript
 #define TkMakeRawCurvePostscript \
 	(tkIntStubsPtr->tkMakeRawCurvePostscript) /* 151 */
+#endif
+#ifndef TkpDrawFrame
 #define TkpDrawFrame \
 	(tkIntStubsPtr->tkpDrawFrame) /* 152 */
+#endif
+#ifndef TkCreateThreadExitHandler
 #define TkCreateThreadExitHandler \
 	(tkIntStubsPtr->tkCreateThreadExitHandler) /* 153 */
+#endif
+#ifndef TkDeleteThreadExitHandler
 #define TkDeleteThreadExitHandler \
 	(tkIntStubsPtr->tkDeleteThreadExitHandler) /* 154 */
+#endif
 /* Slot 155 is reserved */
+#ifndef TkpTestembedCmd
 #define TkpTestembedCmd \
 	(tkIntStubsPtr->tkpTestembedCmd) /* 156 */
+#endif
+#ifndef TkpTesttextCmd
 #define TkpTesttextCmd \
 	(tkIntStubsPtr->tkpTesttextCmd) /* 157 */
+#endif
 /* Slot 158 is reserved */
 /* Slot 159 is reserved */
 /* Slot 160 is reserved */
@@ -1057,39 +1816,65 @@ extern const TkIntStubs *tkIntStubsPtr;
 /* Slot 166 is reserved */
 /* Slot 167 is reserved */
 /* Slot 168 is reserved */
+#ifndef TkStateParseProc
 #define TkStateParseProc \
 	(tkIntStubsPtr->tkStateParseProc) /* 169 */
+#endif
+#ifndef TkStatePrintProc
 #define TkStatePrintProc \
 	(tkIntStubsPtr->tkStatePrintProc) /* 170 */
+#endif
+#ifndef TkCanvasDashParseProc
 #define TkCanvasDashParseProc \
 	(tkIntStubsPtr->tkCanvasDashParseProc) /* 171 */
+#endif
+#ifndef TkCanvasDashPrintProc
 #define TkCanvasDashPrintProc \
 	(tkIntStubsPtr->tkCanvasDashPrintProc) /* 172 */
+#endif
+#ifndef TkOffsetParseProc
 #define TkOffsetParseProc \
 	(tkIntStubsPtr->tkOffsetParseProc) /* 173 */
+#endif
+#ifndef TkOffsetPrintProc
 #define TkOffsetPrintProc \
 	(tkIntStubsPtr->tkOffsetPrintProc) /* 174 */
+#endif
+#ifndef TkPixelParseProc
 #define TkPixelParseProc \
 	(tkIntStubsPtr->tkPixelParseProc) /* 175 */
+#endif
+#ifndef TkPixelPrintProc
 #define TkPixelPrintProc \
 	(tkIntStubsPtr->tkPixelPrintProc) /* 176 */
+#endif
+#ifndef TkOrientParseProc
 #define TkOrientParseProc \
 	(tkIntStubsPtr->tkOrientParseProc) /* 177 */
+#endif
+#ifndef TkOrientPrintProc
 #define TkOrientPrintProc \
 	(tkIntStubsPtr->tkOrientPrintProc) /* 178 */
+#endif
+#ifndef TkSmoothParseProc
 #define TkSmoothParseProc \
 	(tkIntStubsPtr->tkSmoothParseProc) /* 179 */
+#endif
+#ifndef TkSmoothPrintProc
 #define TkSmoothPrintProc \
 	(tkIntStubsPtr->tkSmoothPrintProc) /* 180 */
+#endif
 /* Slot 181 is reserved */
 /* Slot 182 is reserved */
 /* Slot 183 is reserved */
 /* Slot 184 is reserved */
 /* Slot 185 is reserved */
+#ifndef TkUnusedStubEntry
 #define TkUnusedStubEntry \
 	(tkIntStubsPtr->tkUnusedStubEntry) /* 186 */
+#endif
 
-#endif /* defined(USE_TK_STUBS) */
+#endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
 
 /* !END!: Do not edit above this line. */
 
diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h
index 0d88f73..86127fe 100644
--- a/generic/tkIntPlatDecls.h
+++ b/generic/tkIntPlatDecls.h
@@ -34,278 +34,602 @@ extern "C" {
  * Exported function declarations:
  */
 
-#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
+#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
+#ifndef TkAlignImageData_TCL_DECLARED
+#define TkAlignImageData_TCL_DECLARED
 /* 0 */
 EXTERN char *		TkAlignImageData(XImage *image, int alignment,
 				int bitOrder);
+#endif
 /* Slot 1 is reserved */
+#ifndef TkGenerateActivateEvents_TCL_DECLARED
+#define TkGenerateActivateEvents_TCL_DECLARED
 /* 2 */
 EXTERN void		TkGenerateActivateEvents(TkWindow *winPtr,
 				int active);
+#endif
+#ifndef TkpGetMS_TCL_DECLARED
+#define TkpGetMS_TCL_DECLARED
 /* 3 */
 EXTERN unsigned long	TkpGetMS(void);
+#endif
+#ifndef TkPointerDeadWindow_TCL_DECLARED
+#define TkPointerDeadWindow_TCL_DECLARED
 /* 4 */
 EXTERN void		TkPointerDeadWindow(TkWindow *winPtr);
+#endif
+#ifndef TkpPrintWindowId_TCL_DECLARED
+#define TkpPrintWindowId_TCL_DECLARED
 /* 5 */
 EXTERN void		TkpPrintWindowId(char *buf, Window window);
+#endif
+#ifndef TkpScanWindowId_TCL_DECLARED
+#define TkpScanWindowId_TCL_DECLARED
 /* 6 */
 EXTERN int		TkpScanWindowId(Tcl_Interp *interp,
-				const char *string, Window *idPtr);
+				CONST char *string, Window *idPtr);
+#endif
+#ifndef TkpSetCapture_TCL_DECLARED
+#define TkpSetCapture_TCL_DECLARED
 /* 7 */
 EXTERN void		TkpSetCapture(TkWindow *winPtr);
+#endif
+#ifndef TkpSetCursor_TCL_DECLARED
+#define TkpSetCursor_TCL_DECLARED
 /* 8 */
 EXTERN void		TkpSetCursor(TkpCursor cursor);
+#endif
+#ifndef TkpWmSetState_TCL_DECLARED
+#define TkpWmSetState_TCL_DECLARED
 /* 9 */
 EXTERN int		TkpWmSetState(TkWindow *winPtr, int state);
+#endif
+#ifndef TkSetPixmapColormap_TCL_DECLARED
+#define TkSetPixmapColormap_TCL_DECLARED
 /* 10 */
 EXTERN void		TkSetPixmapColormap(Pixmap pixmap, Colormap colormap);
+#endif
+#ifndef TkWinCancelMouseTimer_TCL_DECLARED
+#define TkWinCancelMouseTimer_TCL_DECLARED
 /* 11 */
 EXTERN void		TkWinCancelMouseTimer(void);
+#endif
+#ifndef TkWinClipboardRender_TCL_DECLARED
+#define TkWinClipboardRender_TCL_DECLARED
 /* 12 */
 EXTERN void		TkWinClipboardRender(TkDisplay *dispPtr, UINT format);
+#endif
+#ifndef TkWinEmbeddedEventProc_TCL_DECLARED
+#define TkWinEmbeddedEventProc_TCL_DECLARED
 /* 13 */
 EXTERN LRESULT		TkWinEmbeddedEventProc(HWND hwnd, UINT message,
 				WPARAM wParam, LPARAM lParam);
+#endif
+#ifndef TkWinFillRect_TCL_DECLARED
+#define TkWinFillRect_TCL_DECLARED
 /* 14 */
 EXTERN void		TkWinFillRect(HDC dc, int x, int y, int width,
 				int height, int pixel);
+#endif
+#ifndef TkWinGetBorderPixels_TCL_DECLARED
+#define TkWinGetBorderPixels_TCL_DECLARED
 /* 15 */
 EXTERN COLORREF		TkWinGetBorderPixels(Tk_Window tkwin,
 				Tk_3DBorder border, int which);
+#endif
+#ifndef TkWinGetDrawableDC_TCL_DECLARED
+#define TkWinGetDrawableDC_TCL_DECLARED
 /* 16 */
 EXTERN HDC		TkWinGetDrawableDC(Display *display, Drawable d,
 				TkWinDCState *state);
+#endif
+#ifndef TkWinGetModifierState_TCL_DECLARED
+#define TkWinGetModifierState_TCL_DECLARED
 /* 17 */
 EXTERN int		TkWinGetModifierState(void);
+#endif
+#ifndef TkWinGetSystemPalette_TCL_DECLARED
+#define TkWinGetSystemPalette_TCL_DECLARED
 /* 18 */
 EXTERN HPALETTE		TkWinGetSystemPalette(void);
+#endif
+#ifndef TkWinGetWrapperWindow_TCL_DECLARED
+#define TkWinGetWrapperWindow_TCL_DECLARED
 /* 19 */
 EXTERN HWND		TkWinGetWrapperWindow(Tk_Window tkwin);
+#endif
+#ifndef TkWinHandleMenuEvent_TCL_DECLARED
+#define TkWinHandleMenuEvent_TCL_DECLARED
 /* 20 */
 EXTERN int		TkWinHandleMenuEvent(HWND *phwnd, UINT *pMessage,
 				WPARAM *pwParam, LPARAM *plParam,
 				LRESULT *plResult);
+#endif
+#ifndef TkWinIndexOfColor_TCL_DECLARED
+#define TkWinIndexOfColor_TCL_DECLARED
 /* 21 */
 EXTERN int		TkWinIndexOfColor(XColor *colorPtr);
+#endif
+#ifndef TkWinReleaseDrawableDC_TCL_DECLARED
+#define TkWinReleaseDrawableDC_TCL_DECLARED
 /* 22 */
 EXTERN void		TkWinReleaseDrawableDC(Drawable d, HDC hdc,
 				TkWinDCState *state);
+#endif
+#ifndef TkWinResendEvent_TCL_DECLARED
+#define TkWinResendEvent_TCL_DECLARED
 /* 23 */
 EXTERN LRESULT		TkWinResendEvent(WNDPROC wndproc, HWND hwnd,
 				XEvent *eventPtr);
+#endif
+#ifndef TkWinSelectPalette_TCL_DECLARED
+#define TkWinSelectPalette_TCL_DECLARED
 /* 24 */
 EXTERN HPALETTE		TkWinSelectPalette(HDC dc, Colormap colormap);
+#endif
+#ifndef TkWinSetMenu_TCL_DECLARED
+#define TkWinSetMenu_TCL_DECLARED
 /* 25 */
 EXTERN void		TkWinSetMenu(Tk_Window tkwin, HMENU hMenu);
+#endif
+#ifndef TkWinSetWindowPos_TCL_DECLARED
+#define TkWinSetWindowPos_TCL_DECLARED
 /* 26 */
 EXTERN void		TkWinSetWindowPos(HWND hwnd, HWND siblingHwnd,
 				int pos);
+#endif
+#ifndef TkWinWmCleanup_TCL_DECLARED
+#define TkWinWmCleanup_TCL_DECLARED
 /* 27 */
 EXTERN void		TkWinWmCleanup(HINSTANCE hInstance);
+#endif
+#ifndef TkWinXCleanup_TCL_DECLARED
+#define TkWinXCleanup_TCL_DECLARED
 /* 28 */
 EXTERN void		TkWinXCleanup(ClientData clientData);
+#endif
+#ifndef TkWinXInit_TCL_DECLARED
+#define TkWinXInit_TCL_DECLARED
 /* 29 */
 EXTERN void		TkWinXInit(HINSTANCE hInstance);
+#endif
+#ifndef TkWinSetForegroundWindow_TCL_DECLARED
+#define TkWinSetForegroundWindow_TCL_DECLARED
 /* 30 */
 EXTERN void		TkWinSetForegroundWindow(TkWindow *winPtr);
+#endif
+#ifndef TkWinDialogDebug_TCL_DECLARED
+#define TkWinDialogDebug_TCL_DECLARED
 /* 31 */
 EXTERN void		TkWinDialogDebug(int debug);
+#endif
+#ifndef TkWinGetMenuSystemDefault_TCL_DECLARED
+#define TkWinGetMenuSystemDefault_TCL_DECLARED
 /* 32 */
 EXTERN Tcl_Obj *	TkWinGetMenuSystemDefault(Tk_Window tkwin,
-				const char *dbName, const char *className);
+				CONST char *dbName, CONST char *className);
+#endif
+#ifndef TkWinGetPlatformId_TCL_DECLARED
+#define TkWinGetPlatformId_TCL_DECLARED
 /* 33 */
 EXTERN int		TkWinGetPlatformId(void);
+#endif
+#ifndef TkWinSetHINSTANCE_TCL_DECLARED
+#define TkWinSetHINSTANCE_TCL_DECLARED
 /* 34 */
 EXTERN void		TkWinSetHINSTANCE(HINSTANCE hInstance);
+#endif
+#ifndef TkWinGetPlatformTheme_TCL_DECLARED
+#define TkWinGetPlatformTheme_TCL_DECLARED
 /* 35 */
 EXTERN int		TkWinGetPlatformTheme(void);
+#endif
+#ifndef TkWinChildProc_TCL_DECLARED
+#define TkWinChildProc_TCL_DECLARED
 /* 36 */
 EXTERN LRESULT __stdcall TkWinChildProc(HWND hwnd, UINT message,
 				WPARAM wParam, LPARAM lParam);
+#endif
+#ifndef TkCreateXEventSource_TCL_DECLARED
+#define TkCreateXEventSource_TCL_DECLARED
 /* 37 */
 EXTERN void		TkCreateXEventSource(void);
+#endif
+#ifndef TkpCmapStressed_TCL_DECLARED
+#define TkpCmapStressed_TCL_DECLARED
 /* 38 */
 EXTERN int		TkpCmapStressed(Tk_Window tkwin, Colormap colormap);
+#endif
+#ifndef TkpSync_TCL_DECLARED
+#define TkpSync_TCL_DECLARED
 /* 39 */
 EXTERN void		TkpSync(Display *display);
+#endif
+#ifndef TkUnixContainerId_TCL_DECLARED
+#define TkUnixContainerId_TCL_DECLARED
 /* 40 */
 EXTERN Window		TkUnixContainerId(TkWindow *winPtr);
+#endif
+#ifndef TkUnixDoOneXEvent_TCL_DECLARED
+#define TkUnixDoOneXEvent_TCL_DECLARED
 /* 41 */
 EXTERN int		TkUnixDoOneXEvent(Tcl_Time *timePtr);
+#endif
+#ifndef TkUnixSetMenubar_TCL_DECLARED
+#define TkUnixSetMenubar_TCL_DECLARED
 /* 42 */
 EXTERN void		TkUnixSetMenubar(Tk_Window tkwin, Tk_Window menubar);
+#endif
+#ifndef TkWmCleanup_TCL_DECLARED
+#define TkWmCleanup_TCL_DECLARED
 /* 43 */
 EXTERN void		TkWmCleanup(TkDisplay *dispPtr);
+#endif
+#ifndef TkSendCleanup_TCL_DECLARED
+#define TkSendCleanup_TCL_DECLARED
 /* 44 */
 EXTERN void		TkSendCleanup(TkDisplay *dispPtr);
+#endif
+#ifndef TkpTestsendCmd_TCL_DECLARED
+#define TkpTestsendCmd_TCL_DECLARED
 /* 45 */
 EXTERN int		TkpTestsendCmd(ClientData clientData,
 				Tcl_Interp *interp, int argc,
-				const char **argv);
+				CONST char **argv);
+#endif
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
+#ifndef TkGenerateActivateEvents_TCL_DECLARED
+#define TkGenerateActivateEvents_TCL_DECLARED
 /* 0 */
 EXTERN void		TkGenerateActivateEvents(TkWindow *winPtr,
 				int active);
+#endif
 /* Slot 1 is reserved */
 /* Slot 2 is reserved */
+#ifndef TkPointerDeadWindow_TCL_DECLARED
+#define TkPointerDeadWindow_TCL_DECLARED
 /* 3 */
 EXTERN void		TkPointerDeadWindow(TkWindow *winPtr);
+#endif
+#ifndef TkpSetCapture_TCL_DECLARED
+#define TkpSetCapture_TCL_DECLARED
 /* 4 */
 EXTERN void		TkpSetCapture(TkWindow *winPtr);
+#endif
+#ifndef TkpSetCursor_TCL_DECLARED
+#define TkpSetCursor_TCL_DECLARED
 /* 5 */
 EXTERN void		TkpSetCursor(TkpCursor cursor);
+#endif
+#ifndef TkpWmSetState_TCL_DECLARED
+#define TkpWmSetState_TCL_DECLARED
 /* 6 */
 EXTERN void		TkpWmSetState(TkWindow *winPtr, int state);
+#endif
+#ifndef TkAboutDlg_TCL_DECLARED
+#define TkAboutDlg_TCL_DECLARED
 /* 7 */
 EXTERN void		TkAboutDlg(void);
+#endif
+#ifndef TkMacOSXButtonKeyState_TCL_DECLARED
+#define TkMacOSXButtonKeyState_TCL_DECLARED
 /* 8 */
 EXTERN unsigned int	TkMacOSXButtonKeyState(void);
+#endif
+#ifndef TkMacOSXClearMenubarActive_TCL_DECLARED
+#define TkMacOSXClearMenubarActive_TCL_DECLARED
 /* 9 */
 EXTERN void		TkMacOSXClearMenubarActive(void);
+#endif
+#ifndef TkMacOSXDispatchMenuEvent_TCL_DECLARED
+#define TkMacOSXDispatchMenuEvent_TCL_DECLARED
 /* 10 */
 EXTERN int		TkMacOSXDispatchMenuEvent(int menuID, int index);
+#endif
+#ifndef TkMacOSXInstallCursor_TCL_DECLARED
+#define TkMacOSXInstallCursor_TCL_DECLARED
 /* 11 */
 EXTERN void		TkMacOSXInstallCursor(int resizeOverride);
+#endif
+#ifndef TkMacOSXHandleTearoffMenu_TCL_DECLARED
+#define TkMacOSXHandleTearoffMenu_TCL_DECLARED
 /* 12 */
 EXTERN void		TkMacOSXHandleTearoffMenu(void);
+#endif
 /* Slot 13 is reserved */
+#ifndef TkMacOSXDoHLEvent_TCL_DECLARED
+#define TkMacOSXDoHLEvent_TCL_DECLARED
 /* 14 */
-EXTERN int		TkMacOSXDoHLEvent(void *theEvent);
+EXTERN int		TkMacOSXDoHLEvent(VOID *theEvent);
+#endif
 /* Slot 15 is reserved */
+#ifndef TkMacOSXGetXWindow_TCL_DECLARED
+#define TkMacOSXGetXWindow_TCL_DECLARED
 /* 16 */
-EXTERN Window		TkMacOSXGetXWindow(void *macWinPtr);
+EXTERN Window		TkMacOSXGetXWindow(VOID *macWinPtr);
+#endif
+#ifndef TkMacOSXGrowToplevel_TCL_DECLARED
+#define TkMacOSXGrowToplevel_TCL_DECLARED
 /* 17 */
-EXTERN int		TkMacOSXGrowToplevel(void *whichWindow, XPoint start);
+EXTERN int		TkMacOSXGrowToplevel(VOID *whichWindow, XPoint start);
+#endif
+#ifndef TkMacOSXHandleMenuSelect_TCL_DECLARED
+#define TkMacOSXHandleMenuSelect_TCL_DECLARED
 /* 18 */
 EXTERN void		TkMacOSXHandleMenuSelect(short theMenu,
 				unsigned short theItem, int optionKeyPressed);
+#endif
 /* Slot 19 is reserved */
 /* Slot 20 is reserved */
+#ifndef TkMacOSXInvalidateWindow_TCL_DECLARED
+#define TkMacOSXInvalidateWindow_TCL_DECLARED
 /* 21 */
 EXTERN void		TkMacOSXInvalidateWindow(MacDrawable *macWin,
 				int flag);
+#endif
+#ifndef TkMacOSXIsCharacterMissing_TCL_DECLARED
+#define TkMacOSXIsCharacterMissing_TCL_DECLARED
 /* 22 */
 EXTERN int		TkMacOSXIsCharacterMissing(Tk_Font tkfont,
 				unsigned int searchChar);
+#endif
+#ifndef TkMacOSXMakeRealWindowExist_TCL_DECLARED
+#define TkMacOSXMakeRealWindowExist_TCL_DECLARED
 /* 23 */
 EXTERN void		TkMacOSXMakeRealWindowExist(TkWindow *winPtr);
+#endif
+#ifndef TkMacOSXMakeStippleMap_TCL_DECLARED
+#define TkMacOSXMakeStippleMap_TCL_DECLARED
 /* 24 */
-EXTERN void *		TkMacOSXMakeStippleMap(Drawable d1, Drawable d2);
+EXTERN VOID *		TkMacOSXMakeStippleMap(Drawable d1, Drawable d2);
+#endif
+#ifndef TkMacOSXMenuClick_TCL_DECLARED
+#define TkMacOSXMenuClick_TCL_DECLARED
 /* 25 */
 EXTERN void		TkMacOSXMenuClick(void);
+#endif
+#ifndef TkMacOSXRegisterOffScreenWindow_TCL_DECLARED
+#define TkMacOSXRegisterOffScreenWindow_TCL_DECLARED
 /* 26 */
 EXTERN void		TkMacOSXRegisterOffScreenWindow(Window window,
-				void *portPtr);
+				VOID *portPtr);
+#endif
+#ifndef TkMacOSXResizable_TCL_DECLARED
+#define TkMacOSXResizable_TCL_DECLARED
 /* 27 */
 EXTERN int		TkMacOSXResizable(TkWindow *winPtr);
+#endif
+#ifndef TkMacOSXSetHelpMenuItemCount_TCL_DECLARED
+#define TkMacOSXSetHelpMenuItemCount_TCL_DECLARED
 /* 28 */
 EXTERN void		TkMacOSXSetHelpMenuItemCount(void);
+#endif
+#ifndef TkMacOSXSetScrollbarGrow_TCL_DECLARED
+#define TkMacOSXSetScrollbarGrow_TCL_DECLARED
 /* 29 */
 EXTERN void		TkMacOSXSetScrollbarGrow(TkWindow *winPtr, int flag);
+#endif
+#ifndef TkMacOSXSetUpClippingRgn_TCL_DECLARED
+#define TkMacOSXSetUpClippingRgn_TCL_DECLARED
 /* 30 */
 EXTERN void		TkMacOSXSetUpClippingRgn(Drawable drawable);
+#endif
+#ifndef TkMacOSXSetUpGraphicsPort_TCL_DECLARED
+#define TkMacOSXSetUpGraphicsPort_TCL_DECLARED
 /* 31 */
-EXTERN void		TkMacOSXSetUpGraphicsPort(GC gc, void *destPort);
+EXTERN void		TkMacOSXSetUpGraphicsPort(GC gc, VOID *destPort);
+#endif
+#ifndef TkMacOSXUpdateClipRgn_TCL_DECLARED
+#define TkMacOSXUpdateClipRgn_TCL_DECLARED
 /* 32 */
 EXTERN void		TkMacOSXUpdateClipRgn(TkWindow *winPtr);
+#endif
+#ifndef TkMacOSXUnregisterMacWindow_TCL_DECLARED
+#define TkMacOSXUnregisterMacWindow_TCL_DECLARED
 /* 33 */
-EXTERN void		TkMacOSXUnregisterMacWindow(void *portPtr);
+EXTERN void		TkMacOSXUnregisterMacWindow(VOID *portPtr);
+#endif
+#ifndef TkMacOSXUseMenuID_TCL_DECLARED
+#define TkMacOSXUseMenuID_TCL_DECLARED
 /* 34 */
 EXTERN int		TkMacOSXUseMenuID(short macID);
+#endif
+#ifndef TkMacOSXVisableClipRgn_TCL_DECLARED
+#define TkMacOSXVisableClipRgn_TCL_DECLARED
 /* 35 */
 EXTERN TkRegion		TkMacOSXVisableClipRgn(TkWindow *winPtr);
+#endif
+#ifndef TkMacOSXWinBounds_TCL_DECLARED
+#define TkMacOSXWinBounds_TCL_DECLARED
 /* 36 */
-EXTERN void		TkMacOSXWinBounds(TkWindow *winPtr, void *geometry);
+EXTERN void		TkMacOSXWinBounds(TkWindow *winPtr, VOID *geometry);
+#endif
+#ifndef TkMacOSXWindowOffset_TCL_DECLARED
+#define TkMacOSXWindowOffset_TCL_DECLARED
 /* 37 */
-EXTERN void		TkMacOSXWindowOffset(void *wRef, int *xOffset,
+EXTERN void		TkMacOSXWindowOffset(VOID *wRef, int *xOffset,
 				int *yOffset);
+#endif
+#ifndef TkSetMacColor_TCL_DECLARED
+#define TkSetMacColor_TCL_DECLARED
 /* 38 */
-EXTERN int		TkSetMacColor(unsigned long pixel, void *macColor);
+EXTERN int		TkSetMacColor(unsigned long pixel, VOID *macColor);
+#endif
+#ifndef TkSetWMName_TCL_DECLARED
+#define TkSetWMName_TCL_DECLARED
 /* 39 */
 EXTERN void		TkSetWMName(TkWindow *winPtr, Tk_Uid titleUid);
+#endif
+#ifndef TkSuspendClipboard_TCL_DECLARED
+#define TkSuspendClipboard_TCL_DECLARED
 /* 40 */
 EXTERN void		TkSuspendClipboard(void);
+#endif
+#ifndef TkMacOSXZoomToplevel_TCL_DECLARED
+#define TkMacOSXZoomToplevel_TCL_DECLARED
 /* 41 */
-EXTERN int		TkMacOSXZoomToplevel(void *whichWindow,
+EXTERN int		TkMacOSXZoomToplevel(VOID *whichWindow,
 				short zoomPart);
+#endif
+#ifndef Tk_TopCoordsToWindow_TCL_DECLARED
+#define Tk_TopCoordsToWindow_TCL_DECLARED
 /* 42 */
 EXTERN Tk_Window	Tk_TopCoordsToWindow(Tk_Window tkwin, int rootX,
 				int rootY, int *newX, int *newY);
+#endif
+#ifndef TkMacOSXContainerId_TCL_DECLARED
+#define TkMacOSXContainerId_TCL_DECLARED
 /* 43 */
 EXTERN MacDrawable *	TkMacOSXContainerId(TkWindow *winPtr);
+#endif
+#ifndef TkMacOSXGetHostToplevel_TCL_DECLARED
+#define TkMacOSXGetHostToplevel_TCL_DECLARED
 /* 44 */
 EXTERN MacDrawable *	TkMacOSXGetHostToplevel(TkWindow *winPtr);
+#endif
+#ifndef TkMacOSXPreprocessMenu_TCL_DECLARED
+#define TkMacOSXPreprocessMenu_TCL_DECLARED
 /* 45 */
 EXTERN void		TkMacOSXPreprocessMenu(void);
+#endif
+#ifndef TkpIsWindowFloating_TCL_DECLARED
+#define TkpIsWindowFloating_TCL_DECLARED
 /* 46 */
-EXTERN int		TkpIsWindowFloating(void *window);
+EXTERN int		TkpIsWindowFloating(VOID *window);
+#endif
+#ifndef TkMacOSXGetCapture_TCL_DECLARED
+#define TkMacOSXGetCapture_TCL_DECLARED
 /* 47 */
 EXTERN Tk_Window	TkMacOSXGetCapture(void);
+#endif
 /* Slot 48 is reserved */
+#ifndef TkGetTransientMaster_TCL_DECLARED
+#define TkGetTransientMaster_TCL_DECLARED
 /* 49 */
 EXTERN Window		TkGetTransientMaster(TkWindow *winPtr);
+#endif
+#ifndef TkGenerateButtonEvent_TCL_DECLARED
+#define TkGenerateButtonEvent_TCL_DECLARED
 /* 50 */
 EXTERN int		TkGenerateButtonEvent(int x, int y, Window window,
 				unsigned int state);
+#endif
+#ifndef TkGenWMDestroyEvent_TCL_DECLARED
+#define TkGenWMDestroyEvent_TCL_DECLARED
 /* 51 */
 EXTERN void		TkGenWMDestroyEvent(Tk_Window tkwin);
+#endif
+#ifndef TkMacOSXSetDrawingEnabled_TCL_DECLARED
+#define TkMacOSXSetDrawingEnabled_TCL_DECLARED
 /* 52 */
 EXTERN void		TkMacOSXSetDrawingEnabled(TkWindow *winPtr, int flag);
+#endif
+#ifndef TkpGetMS_TCL_DECLARED
+#define TkpGetMS_TCL_DECLARED
 /* 53 */
 EXTERN unsigned long	TkpGetMS(void);
+#endif
+#ifndef TkMacOSXDrawable_TCL_DECLARED
+#define TkMacOSXDrawable_TCL_DECLARED
 /* 54 */
-EXTERN void *		TkMacOSXDrawable(Drawable drawable);
+EXTERN VOID *		TkMacOSXDrawable(Drawable drawable);
+#endif
+#ifndef TkpScanWindowId_TCL_DECLARED
+#define TkpScanWindowId_TCL_DECLARED
 /* 55 */
 EXTERN int		TkpScanWindowId(Tcl_Interp *interp,
-				const char *string, Window *idPtr);
+				CONST char *string, Window *idPtr);
+#endif
 #endif /* AQUA */
-#if !(defined(_WIN32) || defined(__CYGWIN__) || defined(MAC_OSX_TK)) /* X11 */
+#if !(defined(__WIN32__) || defined(__CYGWIN__) || defined(MAC_OSX_TK)) /* X11 */
+#ifndef TkCreateXEventSource_TCL_DECLARED
+#define TkCreateXEventSource_TCL_DECLARED
 /* 0 */
 EXTERN void		TkCreateXEventSource(void);
+#endif
+#ifndef TkFreeWindowId_TCL_DECLARED
+#define TkFreeWindowId_TCL_DECLARED
 /* 1 */
 EXTERN void		TkFreeWindowId(TkDisplay *dispPtr, Window w);
+#endif
+#ifndef TkInitXId_TCL_DECLARED
+#define TkInitXId_TCL_DECLARED
 /* 2 */
 EXTERN void		TkInitXId(TkDisplay *dispPtr);
+#endif
+#ifndef TkpCmapStressed_TCL_DECLARED
+#define TkpCmapStressed_TCL_DECLARED
 /* 3 */
 EXTERN int		TkpCmapStressed(Tk_Window tkwin, Colormap colormap);
+#endif
+#ifndef TkpSync_TCL_DECLARED
+#define TkpSync_TCL_DECLARED
 /* 4 */
 EXTERN void		TkpSync(Display *display);
+#endif
+#ifndef TkUnixContainerId_TCL_DECLARED
+#define TkUnixContainerId_TCL_DECLARED
 /* 5 */
 EXTERN Window		TkUnixContainerId(TkWindow *winPtr);
+#endif
+#ifndef TkUnixDoOneXEvent_TCL_DECLARED
+#define TkUnixDoOneXEvent_TCL_DECLARED
 /* 6 */
 EXTERN int		TkUnixDoOneXEvent(Tcl_Time *timePtr);
+#endif
+#ifndef TkUnixSetMenubar_TCL_DECLARED
+#define TkUnixSetMenubar_TCL_DECLARED
 /* 7 */
 EXTERN void		TkUnixSetMenubar(Tk_Window tkwin, Tk_Window menubar);
+#endif
+#ifndef TkpScanWindowId_TCL_DECLARED
+#define TkpScanWindowId_TCL_DECLARED
 /* 8 */
 EXTERN int		TkpScanWindowId(Tcl_Interp *interp,
-				const char *string, Window *idPtr);
+				CONST char *string, Window *idPtr);
+#endif
+#ifndef TkWmCleanup_TCL_DECLARED
+#define TkWmCleanup_TCL_DECLARED
 /* 9 */
 EXTERN void		TkWmCleanup(TkDisplay *dispPtr);
+#endif
+#ifndef TkSendCleanup_TCL_DECLARED
+#define TkSendCleanup_TCL_DECLARED
 /* 10 */
 EXTERN void		TkSendCleanup(TkDisplay *dispPtr);
+#endif
+#ifndef TkFreeXId_TCL_DECLARED
+#define TkFreeXId_TCL_DECLARED
 /* 11 */
 EXTERN void		TkFreeXId(TkDisplay *dispPtr);
+#endif
+#ifndef TkpWmSetState_TCL_DECLARED
+#define TkpWmSetState_TCL_DECLARED
 /* 12 */
 EXTERN int		TkpWmSetState(TkWindow *winPtr, int state);
+#endif
+#ifndef TkpTestsendCmd_TCL_DECLARED
+#define TkpTestsendCmd_TCL_DECLARED
 /* 13 */
 EXTERN int		TkpTestsendCmd(ClientData clientData,
 				Tcl_Interp *interp, int argc,
-				const char **argv);
+				CONST char **argv);
+#endif
 #endif /* X11 */
 
 typedef struct TkIntPlatStubs {
     int magic;
-    void *hooks;
+    struct TkIntPlatStubHooks *hooks;
 
-#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
+#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
     char * (*tkAlignImageData) (XImage *image, int alignment, int bitOrder); /* 0 */
-    void (*reserved1)(void);
+    VOID *reserved1;
     void (*tkGenerateActivateEvents) (TkWindow *winPtr, int active); /* 2 */
     unsigned long (*tkpGetMS) (void); /* 3 */
     void (*tkPointerDeadWindow) (TkWindow *winPtr); /* 4 */
     void (*tkpPrintWindowId) (char *buf, Window window); /* 5 */
-    int (*tkpScanWindowId) (Tcl_Interp *interp, const char *string, Window *idPtr); /* 6 */
+    int (*tkpScanWindowId) (Tcl_Interp *interp, CONST char *string, Window *idPtr); /* 6 */
     void (*tkpSetCapture) (TkWindow *winPtr); /* 7 */
     void (*tkpSetCursor) (TkpCursor cursor); /* 8 */
     int (*tkpWmSetState) (TkWindow *winPtr, int state); /* 9 */
@@ -331,7 +655,7 @@ typedef struct TkIntPlatStubs {
     void (*tkWinXInit) (HINSTANCE hInstance); /* 29 */
     void (*tkWinSetForegroundWindow) (TkWindow *winPtr); /* 30 */
     void (*tkWinDialogDebug) (int debug); /* 31 */
-    Tcl_Obj * (*tkWinGetMenuSystemDefault) (Tk_Window tkwin, const char *dbName, const char *className); /* 32 */
+    Tcl_Obj * (*tkWinGetMenuSystemDefault) (Tk_Window tkwin, CONST char *dbName, CONST char *className); /* 32 */
     int (*tkWinGetPlatformId) (void); /* 33 */
     void (*tkWinSetHINSTANCE) (HINSTANCE hInstance); /* 34 */
     int (*tkWinGetPlatformTheme) (void); /* 35 */
@@ -344,12 +668,12 @@ typedef struct TkIntPlatStubs {
     void (*tkUnixSetMenubar) (Tk_Window tkwin, Tk_Window menubar); /* 42 */
     void (*tkWmCleanup) (TkDisplay *dispPtr); /* 43 */
     void (*tkSendCleanup) (TkDisplay *dispPtr); /* 44 */
-    int (*tkpTestsendCmd) (ClientData clientData, Tcl_Interp *interp, int argc, const char **argv); /* 45 */
+    int (*tkpTestsendCmd) (ClientData clientData, Tcl_Interp *interp, int argc, CONST char **argv); /* 45 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
     void (*tkGenerateActivateEvents) (TkWindow *winPtr, int active); /* 0 */
-    void (*reserved1)(void);
-    void (*reserved2)(void);
+    VOID *reserved1;
+    VOID *reserved2;
     void (*tkPointerDeadWindow) (TkWindow *winPtr); /* 3 */
     void (*tkpSetCapture) (TkWindow *winPtr); /* 4 */
     void (*tkpSetCursor) (TkpCursor cursor); /* 5 */
@@ -360,51 +684,51 @@ typedef struct TkIntPlatStubs {
     int (*tkMacOSXDispatchMenuEvent) (int menuID, int index); /* 10 */
     void (*tkMacOSXInstallCursor) (int resizeOverride); /* 11 */
     void (*tkMacOSXHandleTearoffMenu) (void); /* 12 */
-    void (*reserved13)(void);
-    int (*tkMacOSXDoHLEvent) (void *theEvent); /* 14 */
-    void (*reserved15)(void);
-    Window (*tkMacOSXGetXWindow) (void *macWinPtr); /* 16 */
-    int (*tkMacOSXGrowToplevel) (void *whichWindow, XPoint start); /* 17 */
+    VOID *reserved13;
+    int (*tkMacOSXDoHLEvent) (VOID *theEvent); /* 14 */
+    VOID *reserved15;
+    Window (*tkMacOSXGetXWindow) (VOID *macWinPtr); /* 16 */
+    int (*tkMacOSXGrowToplevel) (VOID *whichWindow, XPoint start); /* 17 */
     void (*tkMacOSXHandleMenuSelect) (short theMenu, unsigned short theItem, int optionKeyPressed); /* 18 */
-    void (*reserved19)(void);
-    void (*reserved20)(void);
+    VOID *reserved19;
+    VOID *reserved20;
     void (*tkMacOSXInvalidateWindow) (MacDrawable *macWin, int flag); /* 21 */
     int (*tkMacOSXIsCharacterMissing) (Tk_Font tkfont, unsigned int searchChar); /* 22 */
     void (*tkMacOSXMakeRealWindowExist) (TkWindow *winPtr); /* 23 */
-    void * (*tkMacOSXMakeStippleMap) (Drawable d1, Drawable d2); /* 24 */
+    VOID * (*tkMacOSXMakeStippleMap) (Drawable d1, Drawable d2); /* 24 */
     void (*tkMacOSXMenuClick) (void); /* 25 */
-    void (*tkMacOSXRegisterOffScreenWindow) (Window window, void *portPtr); /* 26 */
+    void (*tkMacOSXRegisterOffScreenWindow) (Window window, VOID *portPtr); /* 26 */
     int (*tkMacOSXResizable) (TkWindow *winPtr); /* 27 */
     void (*tkMacOSXSetHelpMenuItemCount) (void); /* 28 */
     void (*tkMacOSXSetScrollbarGrow) (TkWindow *winPtr, int flag); /* 29 */
     void (*tkMacOSXSetUpClippingRgn) (Drawable drawable); /* 30 */
-    void (*tkMacOSXSetUpGraphicsPort) (GC gc, void *destPort); /* 31 */
+    void (*tkMacOSXSetUpGraphicsPort) (GC gc, VOID *destPort); /* 31 */
     void (*tkMacOSXUpdateClipRgn) (TkWindow *winPtr); /* 32 */
-    void (*tkMacOSXUnregisterMacWindow) (void *portPtr); /* 33 */
+    void (*tkMacOSXUnregisterMacWindow) (VOID *portPtr); /* 33 */
     int (*tkMacOSXUseMenuID) (short macID); /* 34 */
     TkRegion (*tkMacOSXVisableClipRgn) (TkWindow *winPtr); /* 35 */
-    void (*tkMacOSXWinBounds) (TkWindow *winPtr, void *geometry); /* 36 */
-    void (*tkMacOSXWindowOffset) (void *wRef, int *xOffset, int *yOffset); /* 37 */
-    int (*tkSetMacColor) (unsigned long pixel, void *macColor); /* 38 */
+    void (*tkMacOSXWinBounds) (TkWindow *winPtr, VOID *geometry); /* 36 */
+    void (*tkMacOSXWindowOffset) (VOID *wRef, int *xOffset, int *yOffset); /* 37 */
+    int (*tkSetMacColor) (unsigned long pixel, VOID *macColor); /* 38 */
     void (*tkSetWMName) (TkWindow *winPtr, Tk_Uid titleUid); /* 39 */
     void (*tkSuspendClipboard) (void); /* 40 */
-    int (*tkMacOSXZoomToplevel) (void *whichWindow, short zoomPart); /* 41 */
+    int (*tkMacOSXZoomToplevel) (VOID *whichWindow, short zoomPart); /* 41 */
     Tk_Window (*tk_TopCoordsToWindow) (Tk_Window tkwin, int rootX, int rootY, int *newX, int *newY); /* 42 */
     MacDrawable * (*tkMacOSXContainerId) (TkWindow *winPtr); /* 43 */
     MacDrawable * (*tkMacOSXGetHostToplevel) (TkWindow *winPtr); /* 44 */
     void (*tkMacOSXPreprocessMenu) (void); /* 45 */
-    int (*tkpIsWindowFloating) (void *window); /* 46 */
+    int (*tkpIsWindowFloating) (VOID *window); /* 46 */
     Tk_Window (*tkMacOSXGetCapture) (void); /* 47 */
-    void (*reserved48)(void);
+    VOID *reserved48;
     Window (*tkGetTransientMaster) (TkWindow *winPtr); /* 49 */
     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 * (*tkMacOSXDrawable) (Drawable drawable); /* 54 */
-    int (*tkpScanWindowId) (Tcl_Interp *interp, const char *string, Window *idPtr); /* 55 */
+    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 */
+#if !(defined(__WIN32__) || defined(__CYGWIN__) || defined(MAC_OSX_TK)) /* X11 */
     void (*tkCreateXEventSource) (void); /* 0 */
     void (*tkFreeWindowId) (TkDisplay *dispPtr, Window w); /* 1 */
     void (*tkInitXId) (TkDisplay *dispPtr); /* 2 */
@@ -413,259 +737,475 @@ typedef struct TkIntPlatStubs {
     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 */
+    int (*tkpScanWindowId) (Tcl_Interp *interp, CONST char *string, Window *idPtr); /* 8 */
     void (*tkWmCleanup) (TkDisplay *dispPtr); /* 9 */
     void (*tkSendCleanup) (TkDisplay *dispPtr); /* 10 */
     void (*tkFreeXId) (TkDisplay *dispPtr); /* 11 */
     int (*tkpWmSetState) (TkWindow *winPtr, int state); /* 12 */
-    int (*tkpTestsendCmd) (ClientData clientData, Tcl_Interp *interp, int argc, const char **argv); /* 13 */
+    int (*tkpTestsendCmd) (ClientData clientData, Tcl_Interp *interp, int argc, CONST char **argv); /* 13 */
 #endif /* X11 */
 } TkIntPlatStubs;
 
-extern const TkIntPlatStubs *tkIntPlatStubsPtr;
+extern TkIntPlatStubs *tkIntPlatStubsPtr;
 
 #ifdef __cplusplus
 }
 #endif
 
-#if defined(USE_TK_STUBS)
+#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
 
 /*
  * Inline function declarations:
  */
 
-#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
+#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
+#ifndef TkAlignImageData
 #define TkAlignImageData \
 	(tkIntPlatStubsPtr->tkAlignImageData) /* 0 */
+#endif
 /* Slot 1 is reserved */
+#ifndef TkGenerateActivateEvents
 #define TkGenerateActivateEvents \
 	(tkIntPlatStubsPtr->tkGenerateActivateEvents) /* 2 */
+#endif
+#ifndef TkpGetMS
 #define TkpGetMS \
 	(tkIntPlatStubsPtr->tkpGetMS) /* 3 */
+#endif
+#ifndef TkPointerDeadWindow
 #define TkPointerDeadWindow \
 	(tkIntPlatStubsPtr->tkPointerDeadWindow) /* 4 */
+#endif
+#ifndef TkpPrintWindowId
 #define TkpPrintWindowId \
 	(tkIntPlatStubsPtr->tkpPrintWindowId) /* 5 */
+#endif
+#ifndef TkpScanWindowId
 #define TkpScanWindowId \
 	(tkIntPlatStubsPtr->tkpScanWindowId) /* 6 */
+#endif
+#ifndef TkpSetCapture
 #define TkpSetCapture \
 	(tkIntPlatStubsPtr->tkpSetCapture) /* 7 */
+#endif
+#ifndef TkpSetCursor
 #define TkpSetCursor \
 	(tkIntPlatStubsPtr->tkpSetCursor) /* 8 */
+#endif
+#ifndef TkpWmSetState
 #define TkpWmSetState \
 	(tkIntPlatStubsPtr->tkpWmSetState) /* 9 */
+#endif
+#ifndef TkSetPixmapColormap
 #define TkSetPixmapColormap \
 	(tkIntPlatStubsPtr->tkSetPixmapColormap) /* 10 */
+#endif
+#ifndef TkWinCancelMouseTimer
 #define TkWinCancelMouseTimer \
 	(tkIntPlatStubsPtr->tkWinCancelMouseTimer) /* 11 */
+#endif
+#ifndef TkWinClipboardRender
 #define TkWinClipboardRender \
 	(tkIntPlatStubsPtr->tkWinClipboardRender) /* 12 */
+#endif
+#ifndef TkWinEmbeddedEventProc
 #define TkWinEmbeddedEventProc \
 	(tkIntPlatStubsPtr->tkWinEmbeddedEventProc) /* 13 */
+#endif
+#ifndef TkWinFillRect
 #define TkWinFillRect \
 	(tkIntPlatStubsPtr->tkWinFillRect) /* 14 */
+#endif
+#ifndef TkWinGetBorderPixels
 #define TkWinGetBorderPixels \
 	(tkIntPlatStubsPtr->tkWinGetBorderPixels) /* 15 */
+#endif
+#ifndef TkWinGetDrawableDC
 #define TkWinGetDrawableDC \
 	(tkIntPlatStubsPtr->tkWinGetDrawableDC) /* 16 */
+#endif
+#ifndef TkWinGetModifierState
 #define TkWinGetModifierState \
 	(tkIntPlatStubsPtr->tkWinGetModifierState) /* 17 */
+#endif
+#ifndef TkWinGetSystemPalette
 #define TkWinGetSystemPalette \
 	(tkIntPlatStubsPtr->tkWinGetSystemPalette) /* 18 */
+#endif
+#ifndef TkWinGetWrapperWindow
 #define TkWinGetWrapperWindow \
 	(tkIntPlatStubsPtr->tkWinGetWrapperWindow) /* 19 */
+#endif
+#ifndef TkWinHandleMenuEvent
 #define TkWinHandleMenuEvent \
 	(tkIntPlatStubsPtr->tkWinHandleMenuEvent) /* 20 */
+#endif
+#ifndef TkWinIndexOfColor
 #define TkWinIndexOfColor \
 	(tkIntPlatStubsPtr->tkWinIndexOfColor) /* 21 */
+#endif
+#ifndef TkWinReleaseDrawableDC
 #define TkWinReleaseDrawableDC \
 	(tkIntPlatStubsPtr->tkWinReleaseDrawableDC) /* 22 */
+#endif
+#ifndef TkWinResendEvent
 #define TkWinResendEvent \
 	(tkIntPlatStubsPtr->tkWinResendEvent) /* 23 */
+#endif
+#ifndef TkWinSelectPalette
 #define TkWinSelectPalette \
 	(tkIntPlatStubsPtr->tkWinSelectPalette) /* 24 */
+#endif
+#ifndef TkWinSetMenu
 #define TkWinSetMenu \
 	(tkIntPlatStubsPtr->tkWinSetMenu) /* 25 */
+#endif
+#ifndef TkWinSetWindowPos
 #define TkWinSetWindowPos \
 	(tkIntPlatStubsPtr->tkWinSetWindowPos) /* 26 */
+#endif
+#ifndef TkWinWmCleanup
 #define TkWinWmCleanup \
 	(tkIntPlatStubsPtr->tkWinWmCleanup) /* 27 */
+#endif
+#ifndef TkWinXCleanup
 #define TkWinXCleanup \
 	(tkIntPlatStubsPtr->tkWinXCleanup) /* 28 */
+#endif
+#ifndef TkWinXInit
 #define TkWinXInit \
 	(tkIntPlatStubsPtr->tkWinXInit) /* 29 */
+#endif
+#ifndef TkWinSetForegroundWindow
 #define TkWinSetForegroundWindow \
 	(tkIntPlatStubsPtr->tkWinSetForegroundWindow) /* 30 */
+#endif
+#ifndef TkWinDialogDebug
 #define TkWinDialogDebug \
 	(tkIntPlatStubsPtr->tkWinDialogDebug) /* 31 */
+#endif
+#ifndef TkWinGetMenuSystemDefault
 #define TkWinGetMenuSystemDefault \
 	(tkIntPlatStubsPtr->tkWinGetMenuSystemDefault) /* 32 */
+#endif
+#ifndef TkWinGetPlatformId
 #define TkWinGetPlatformId \
 	(tkIntPlatStubsPtr->tkWinGetPlatformId) /* 33 */
+#endif
+#ifndef TkWinSetHINSTANCE
 #define TkWinSetHINSTANCE \
 	(tkIntPlatStubsPtr->tkWinSetHINSTANCE) /* 34 */
+#endif
+#ifndef TkWinGetPlatformTheme
 #define TkWinGetPlatformTheme \
 	(tkIntPlatStubsPtr->tkWinGetPlatformTheme) /* 35 */
+#endif
+#ifndef TkWinChildProc
 #define TkWinChildProc \
 	(tkIntPlatStubsPtr->tkWinChildProc) /* 36 */
+#endif
+#ifndef TkCreateXEventSource
 #define TkCreateXEventSource \
 	(tkIntPlatStubsPtr->tkCreateXEventSource) /* 37 */
+#endif
+#ifndef TkpCmapStressed
 #define TkpCmapStressed \
 	(tkIntPlatStubsPtr->tkpCmapStressed) /* 38 */
+#endif
+#ifndef TkpSync
 #define TkpSync \
 	(tkIntPlatStubsPtr->tkpSync) /* 39 */
+#endif
+#ifndef TkUnixContainerId
 #define TkUnixContainerId \
 	(tkIntPlatStubsPtr->tkUnixContainerId) /* 40 */
+#endif
+#ifndef TkUnixDoOneXEvent
 #define TkUnixDoOneXEvent \
 	(tkIntPlatStubsPtr->tkUnixDoOneXEvent) /* 41 */
+#endif
+#ifndef TkUnixSetMenubar
 #define TkUnixSetMenubar \
 	(tkIntPlatStubsPtr->tkUnixSetMenubar) /* 42 */
+#endif
+#ifndef TkWmCleanup
 #define TkWmCleanup \
 	(tkIntPlatStubsPtr->tkWmCleanup) /* 43 */
+#endif
+#ifndef TkSendCleanup
 #define TkSendCleanup \
 	(tkIntPlatStubsPtr->tkSendCleanup) /* 44 */
+#endif
+#ifndef TkpTestsendCmd
 #define TkpTestsendCmd \
 	(tkIntPlatStubsPtr->tkpTestsendCmd) /* 45 */
+#endif
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
+#ifndef TkGenerateActivateEvents
 #define TkGenerateActivateEvents \
 	(tkIntPlatStubsPtr->tkGenerateActivateEvents) /* 0 */
+#endif
 /* Slot 1 is reserved */
 /* Slot 2 is reserved */
+#ifndef TkPointerDeadWindow
 #define TkPointerDeadWindow \
 	(tkIntPlatStubsPtr->tkPointerDeadWindow) /* 3 */
+#endif
+#ifndef TkpSetCapture
 #define TkpSetCapture \
 	(tkIntPlatStubsPtr->tkpSetCapture) /* 4 */
+#endif
+#ifndef TkpSetCursor
 #define TkpSetCursor \
 	(tkIntPlatStubsPtr->tkpSetCursor) /* 5 */
+#endif
+#ifndef TkpWmSetState
 #define TkpWmSetState \
 	(tkIntPlatStubsPtr->tkpWmSetState) /* 6 */
+#endif
+#ifndef TkAboutDlg
 #define TkAboutDlg \
 	(tkIntPlatStubsPtr->tkAboutDlg) /* 7 */
+#endif
+#ifndef TkMacOSXButtonKeyState
 #define TkMacOSXButtonKeyState \
 	(tkIntPlatStubsPtr->tkMacOSXButtonKeyState) /* 8 */
+#endif
+#ifndef TkMacOSXClearMenubarActive
 #define TkMacOSXClearMenubarActive \
 	(tkIntPlatStubsPtr->tkMacOSXClearMenubarActive) /* 9 */
+#endif
+#ifndef TkMacOSXDispatchMenuEvent
 #define TkMacOSXDispatchMenuEvent \
 	(tkIntPlatStubsPtr->tkMacOSXDispatchMenuEvent) /* 10 */
+#endif
+#ifndef TkMacOSXInstallCursor
 #define TkMacOSXInstallCursor \
 	(tkIntPlatStubsPtr->tkMacOSXInstallCursor) /* 11 */
+#endif
+#ifndef TkMacOSXHandleTearoffMenu
 #define TkMacOSXHandleTearoffMenu \
 	(tkIntPlatStubsPtr->tkMacOSXHandleTearoffMenu) /* 12 */
+#endif
 /* Slot 13 is reserved */
+#ifndef TkMacOSXDoHLEvent
 #define TkMacOSXDoHLEvent \
 	(tkIntPlatStubsPtr->tkMacOSXDoHLEvent) /* 14 */
+#endif
 /* Slot 15 is reserved */
+#ifndef TkMacOSXGetXWindow
 #define TkMacOSXGetXWindow \
 	(tkIntPlatStubsPtr->tkMacOSXGetXWindow) /* 16 */
+#endif
+#ifndef TkMacOSXGrowToplevel
 #define TkMacOSXGrowToplevel \
 	(tkIntPlatStubsPtr->tkMacOSXGrowToplevel) /* 17 */
+#endif
+#ifndef TkMacOSXHandleMenuSelect
 #define TkMacOSXHandleMenuSelect \
 	(tkIntPlatStubsPtr->tkMacOSXHandleMenuSelect) /* 18 */
+#endif
 /* Slot 19 is reserved */
 /* Slot 20 is reserved */
+#ifndef TkMacOSXInvalidateWindow
 #define TkMacOSXInvalidateWindow \
 	(tkIntPlatStubsPtr->tkMacOSXInvalidateWindow) /* 21 */
+#endif
+#ifndef TkMacOSXIsCharacterMissing
 #define TkMacOSXIsCharacterMissing \
 	(tkIntPlatStubsPtr->tkMacOSXIsCharacterMissing) /* 22 */
+#endif
+#ifndef TkMacOSXMakeRealWindowExist
 #define TkMacOSXMakeRealWindowExist \
 	(tkIntPlatStubsPtr->tkMacOSXMakeRealWindowExist) /* 23 */
+#endif
+#ifndef TkMacOSXMakeStippleMap
 #define TkMacOSXMakeStippleMap \
 	(tkIntPlatStubsPtr->tkMacOSXMakeStippleMap) /* 24 */
+#endif
+#ifndef TkMacOSXMenuClick
 #define TkMacOSXMenuClick \
 	(tkIntPlatStubsPtr->tkMacOSXMenuClick) /* 25 */
+#endif
+#ifndef TkMacOSXRegisterOffScreenWindow
 #define TkMacOSXRegisterOffScreenWindow \
 	(tkIntPlatStubsPtr->tkMacOSXRegisterOffScreenWindow) /* 26 */
+#endif
+#ifndef TkMacOSXResizable
 #define TkMacOSXResizable \
 	(tkIntPlatStubsPtr->tkMacOSXResizable) /* 27 */
+#endif
+#ifndef TkMacOSXSetHelpMenuItemCount
 #define TkMacOSXSetHelpMenuItemCount \
 	(tkIntPlatStubsPtr->tkMacOSXSetHelpMenuItemCount) /* 28 */
+#endif
+#ifndef TkMacOSXSetScrollbarGrow
 #define TkMacOSXSetScrollbarGrow \
 	(tkIntPlatStubsPtr->tkMacOSXSetScrollbarGrow) /* 29 */
+#endif
+#ifndef TkMacOSXSetUpClippingRgn
 #define TkMacOSXSetUpClippingRgn \
 	(tkIntPlatStubsPtr->tkMacOSXSetUpClippingRgn) /* 30 */
+#endif
+#ifndef TkMacOSXSetUpGraphicsPort
 #define TkMacOSXSetUpGraphicsPort \
 	(tkIntPlatStubsPtr->tkMacOSXSetUpGraphicsPort) /* 31 */
+#endif
+#ifndef TkMacOSXUpdateClipRgn
 #define TkMacOSXUpdateClipRgn \
 	(tkIntPlatStubsPtr->tkMacOSXUpdateClipRgn) /* 32 */
+#endif
+#ifndef TkMacOSXUnregisterMacWindow
 #define TkMacOSXUnregisterMacWindow \
 	(tkIntPlatStubsPtr->tkMacOSXUnregisterMacWindow) /* 33 */
+#endif
+#ifndef TkMacOSXUseMenuID
 #define TkMacOSXUseMenuID \
 	(tkIntPlatStubsPtr->tkMacOSXUseMenuID) /* 34 */
+#endif
+#ifndef TkMacOSXVisableClipRgn
 #define TkMacOSXVisableClipRgn \
 	(tkIntPlatStubsPtr->tkMacOSXVisableClipRgn) /* 35 */
+#endif
+#ifndef TkMacOSXWinBounds
 #define TkMacOSXWinBounds \
 	(tkIntPlatStubsPtr->tkMacOSXWinBounds) /* 36 */
+#endif
+#ifndef TkMacOSXWindowOffset
 #define TkMacOSXWindowOffset \
 	(tkIntPlatStubsPtr->tkMacOSXWindowOffset) /* 37 */
+#endif
+#ifndef TkSetMacColor
 #define TkSetMacColor \
 	(tkIntPlatStubsPtr->tkSetMacColor) /* 38 */
+#endif
+#ifndef TkSetWMName
 #define TkSetWMName \
 	(tkIntPlatStubsPtr->tkSetWMName) /* 39 */
+#endif
+#ifndef TkSuspendClipboard
 #define TkSuspendClipboard \
 	(tkIntPlatStubsPtr->tkSuspendClipboard) /* 40 */
+#endif
+#ifndef TkMacOSXZoomToplevel
 #define TkMacOSXZoomToplevel \
 	(tkIntPlatStubsPtr->tkMacOSXZoomToplevel) /* 41 */
+#endif
+#ifndef Tk_TopCoordsToWindow
 #define Tk_TopCoordsToWindow \
 	(tkIntPlatStubsPtr->tk_TopCoordsToWindow) /* 42 */
+#endif
+#ifndef TkMacOSXContainerId
 #define TkMacOSXContainerId \
 	(tkIntPlatStubsPtr->tkMacOSXContainerId) /* 43 */
+#endif
+#ifndef TkMacOSXGetHostToplevel
 #define TkMacOSXGetHostToplevel \
 	(tkIntPlatStubsPtr->tkMacOSXGetHostToplevel) /* 44 */
+#endif
+#ifndef TkMacOSXPreprocessMenu
 #define TkMacOSXPreprocessMenu \
 	(tkIntPlatStubsPtr->tkMacOSXPreprocessMenu) /* 45 */
+#endif
+#ifndef TkpIsWindowFloating
 #define TkpIsWindowFloating \
 	(tkIntPlatStubsPtr->tkpIsWindowFloating) /* 46 */
+#endif
+#ifndef TkMacOSXGetCapture
 #define TkMacOSXGetCapture \
 	(tkIntPlatStubsPtr->tkMacOSXGetCapture) /* 47 */
+#endif
 /* Slot 48 is reserved */
+#ifndef TkGetTransientMaster
 #define TkGetTransientMaster \
 	(tkIntPlatStubsPtr->tkGetTransientMaster) /* 49 */
+#endif
+#ifndef TkGenerateButtonEvent
 #define TkGenerateButtonEvent \
 	(tkIntPlatStubsPtr->tkGenerateButtonEvent) /* 50 */
+#endif
+#ifndef TkGenWMDestroyEvent
 #define TkGenWMDestroyEvent \
 	(tkIntPlatStubsPtr->tkGenWMDestroyEvent) /* 51 */
+#endif
+#ifndef TkMacOSXSetDrawingEnabled
 #define TkMacOSXSetDrawingEnabled \
 	(tkIntPlatStubsPtr->tkMacOSXSetDrawingEnabled) /* 52 */
+#endif
+#ifndef TkpGetMS
 #define TkpGetMS \
 	(tkIntPlatStubsPtr->tkpGetMS) /* 53 */
+#endif
+#ifndef TkMacOSXDrawable
 #define TkMacOSXDrawable \
 	(tkIntPlatStubsPtr->tkMacOSXDrawable) /* 54 */
+#endif
+#ifndef TkpScanWindowId
 #define TkpScanWindowId \
 	(tkIntPlatStubsPtr->tkpScanWindowId) /* 55 */
+#endif
 #endif /* AQUA */
-#if !(defined(_WIN32) || defined(__CYGWIN__) || defined(MAC_OSX_TK)) /* X11 */
+#if !(defined(__WIN32__) || defined(__CYGWIN__) || defined(MAC_OSX_TK)) /* X11 */
+#ifndef TkCreateXEventSource
 #define TkCreateXEventSource \
 	(tkIntPlatStubsPtr->tkCreateXEventSource) /* 0 */
+#endif
+#ifndef TkFreeWindowId
 #define TkFreeWindowId \
 	(tkIntPlatStubsPtr->tkFreeWindowId) /* 1 */
+#endif
+#ifndef TkInitXId
 #define TkInitXId \
 	(tkIntPlatStubsPtr->tkInitXId) /* 2 */
+#endif
+#ifndef TkpCmapStressed
 #define TkpCmapStressed \
 	(tkIntPlatStubsPtr->tkpCmapStressed) /* 3 */
+#endif
+#ifndef TkpSync
 #define TkpSync \
 	(tkIntPlatStubsPtr->tkpSync) /* 4 */
+#endif
+#ifndef TkUnixContainerId
 #define TkUnixContainerId \
 	(tkIntPlatStubsPtr->tkUnixContainerId) /* 5 */
+#endif
+#ifndef TkUnixDoOneXEvent
 #define TkUnixDoOneXEvent \
 	(tkIntPlatStubsPtr->tkUnixDoOneXEvent) /* 6 */
+#endif
+#ifndef TkUnixSetMenubar
 #define TkUnixSetMenubar \
 	(tkIntPlatStubsPtr->tkUnixSetMenubar) /* 7 */
+#endif
+#ifndef TkpScanWindowId
 #define TkpScanWindowId \
 	(tkIntPlatStubsPtr->tkpScanWindowId) /* 8 */
+#endif
+#ifndef TkWmCleanup
 #define TkWmCleanup \
 	(tkIntPlatStubsPtr->tkWmCleanup) /* 9 */
+#endif
+#ifndef TkSendCleanup
 #define TkSendCleanup \
 	(tkIntPlatStubsPtr->tkSendCleanup) /* 10 */
+#endif
+#ifndef TkFreeXId
 #define TkFreeXId \
 	(tkIntPlatStubsPtr->tkFreeXId) /* 11 */
+#endif
+#ifndef TkpWmSetState
 #define TkpWmSetState \
 	(tkIntPlatStubsPtr->tkpWmSetState) /* 12 */
+#endif
+#ifndef TkpTestsendCmd
 #define TkpTestsendCmd \
 	(tkIntPlatStubsPtr->tkpTestsendCmd) /* 13 */
+#endif
 #endif /* X11 */
 
-#endif /* defined(USE_TK_STUBS) */
+#endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
 
 /* !END!: Do not edit above this line. */
 
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index f16bb8f..700aa3d 100644
--- a/generic/tkIntXlibDecls.h
+++ b/generic/tkIntXlibDecls.h
@@ -44,318 +44,660 @@ extern "C" {
  * Exported function declarations:
  */
 
-#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
+#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
+#ifndef XSetDashes_TCL_DECLARED
+#define XSetDashes_TCL_DECLARED
 /* 0 */
 EXTERN int		XSetDashes(Display *display, GC gc, int dash_offset,
 				_Xconst char *dash_list, int n);
+#endif
+#ifndef XGetModifierMapping_TCL_DECLARED
+#define XGetModifierMapping_TCL_DECLARED
 /* 1 */
 EXTERN XModifierKeymap * XGetModifierMapping(Display *d);
+#endif
+#ifndef XCreateImage_TCL_DECLARED
+#define XCreateImage_TCL_DECLARED
 /* 2 */
 EXTERN XImage *		XCreateImage(Display *d, Visual *v, unsigned int ui1,
 				int i1, int i2, char *cp, unsigned int ui2,
 				unsigned int ui3, int i3, int i4);
+#endif
+#ifndef XGetImage_TCL_DECLARED
+#define XGetImage_TCL_DECLARED
 /* 3 */
 EXTERN XImage *		XGetImage(Display *d, Drawable dr, int i1, int i2,
 				unsigned int ui1, unsigned int ui2,
 				unsigned long ul, int i3);
+#endif
+#ifndef XGetAtomName_TCL_DECLARED
+#define XGetAtomName_TCL_DECLARED
 /* 4 */
 EXTERN char *		XGetAtomName(Display *d, Atom a);
+#endif
+#ifndef XKeysymToString_TCL_DECLARED
+#define XKeysymToString_TCL_DECLARED
 /* 5 */
 EXTERN char *		XKeysymToString(KeySym k);
+#endif
+#ifndef XCreateColormap_TCL_DECLARED
+#define XCreateColormap_TCL_DECLARED
 /* 6 */
 EXTERN Colormap		XCreateColormap(Display *d, Window w, Visual *v,
 				int i);
+#endif
+#ifndef XCreatePixmapCursor_TCL_DECLARED
+#define XCreatePixmapCursor_TCL_DECLARED
 /* 7 */
 EXTERN Cursor		XCreatePixmapCursor(Display *d, Pixmap p1, Pixmap p2,
 				XColor *x1, XColor *x2, unsigned int ui1,
 				unsigned int ui2);
+#endif
+#ifndef XCreateGlyphCursor_TCL_DECLARED
+#define XCreateGlyphCursor_TCL_DECLARED
 /* 8 */
 EXTERN Cursor		XCreateGlyphCursor(Display *d, Font f1, Font f2,
 				unsigned int ui1, unsigned int ui2,
 				XColor _Xconst *x1, XColor _Xconst *x2);
+#endif
+#ifndef XGContextFromGC_TCL_DECLARED
+#define XGContextFromGC_TCL_DECLARED
 /* 9 */
 EXTERN GContext		XGContextFromGC(GC g);
+#endif
+#ifndef XListHosts_TCL_DECLARED
+#define XListHosts_TCL_DECLARED
 /* 10 */
 EXTERN XHostAddress *	XListHosts(Display *d, int *i, Bool *b);
+#endif
+#ifndef XKeycodeToKeysym_TCL_DECLARED
+#define XKeycodeToKeysym_TCL_DECLARED
 /* 11 */
 EXTERN KeySym		XKeycodeToKeysym(Display *d, unsigned int k, int i);
+#endif
+#ifndef XStringToKeysym_TCL_DECLARED
+#define XStringToKeysym_TCL_DECLARED
 /* 12 */
 EXTERN KeySym		XStringToKeysym(_Xconst char *c);
+#endif
+#ifndef XRootWindow_TCL_DECLARED
+#define XRootWindow_TCL_DECLARED
 /* 13 */
 EXTERN Window		XRootWindow(Display *d, int i);
+#endif
+#ifndef XSetErrorHandler_TCL_DECLARED
+#define XSetErrorHandler_TCL_DECLARED
 /* 14 */
 EXTERN XErrorHandler	XSetErrorHandler(XErrorHandler x);
+#endif
+#ifndef XIconifyWindow_TCL_DECLARED
+#define XIconifyWindow_TCL_DECLARED
 /* 15 */
 EXTERN Status		XIconifyWindow(Display *d, Window w, int i);
+#endif
+#ifndef XWithdrawWindow_TCL_DECLARED
+#define XWithdrawWindow_TCL_DECLARED
 /* 16 */
 EXTERN Status		XWithdrawWindow(Display *d, Window w, int i);
+#endif
+#ifndef XGetWMColormapWindows_TCL_DECLARED
+#define XGetWMColormapWindows_TCL_DECLARED
 /* 17 */
 EXTERN Status		XGetWMColormapWindows(Display *d, Window w,
 				Window **wpp, int *ip);
+#endif
+#ifndef XAllocColor_TCL_DECLARED
+#define XAllocColor_TCL_DECLARED
 /* 18 */
 EXTERN Status		XAllocColor(Display *d, Colormap c, XColor *xp);
+#endif
+#ifndef XBell_TCL_DECLARED
+#define XBell_TCL_DECLARED
 /* 19 */
 EXTERN int		XBell(Display *d, int i);
+#endif
+#ifndef XChangeProperty_TCL_DECLARED
+#define XChangeProperty_TCL_DECLARED
 /* 20 */
 EXTERN int		XChangeProperty(Display *d, Window w, Atom a1,
 				Atom a2, int i1, int i2,
 				_Xconst unsigned char *c, int i3);
+#endif
+#ifndef XChangeWindowAttributes_TCL_DECLARED
+#define XChangeWindowAttributes_TCL_DECLARED
 /* 21 */
 EXTERN int		XChangeWindowAttributes(Display *d, Window w,
 				unsigned long ul, XSetWindowAttributes *x);
+#endif
+#ifndef XClearWindow_TCL_DECLARED
+#define XClearWindow_TCL_DECLARED
 /* 22 */
 EXTERN int		XClearWindow(Display *d, Window w);
+#endif
+#ifndef XConfigureWindow_TCL_DECLARED
+#define XConfigureWindow_TCL_DECLARED
 /* 23 */
 EXTERN int		XConfigureWindow(Display *d, Window w,
 				unsigned int i, XWindowChanges *x);
+#endif
+#ifndef XCopyArea_TCL_DECLARED
+#define XCopyArea_TCL_DECLARED
 /* 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);
+#endif
+#ifndef XCopyPlane_TCL_DECLARED
+#define XCopyPlane_TCL_DECLARED
 /* 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);
+#endif
+#ifndef XCreateBitmapFromData_TCL_DECLARED
+#define XCreateBitmapFromData_TCL_DECLARED
 /* 26 */
 EXTERN Pixmap		XCreateBitmapFromData(Display *display, Drawable d,
 				_Xconst char *data, unsigned int width,
 				unsigned int height);
+#endif
+#ifndef XDefineCursor_TCL_DECLARED
+#define XDefineCursor_TCL_DECLARED
 /* 27 */
 EXTERN int		XDefineCursor(Display *d, Window w, Cursor c);
+#endif
+#ifndef XDeleteProperty_TCL_DECLARED
+#define XDeleteProperty_TCL_DECLARED
 /* 28 */
 EXTERN int		XDeleteProperty(Display *d, Window w, Atom a);
+#endif
+#ifndef XDestroyWindow_TCL_DECLARED
+#define XDestroyWindow_TCL_DECLARED
 /* 29 */
 EXTERN int		XDestroyWindow(Display *d, Window w);
+#endif
+#ifndef XDrawArc_TCL_DECLARED
+#define XDrawArc_TCL_DECLARED
 /* 30 */
 EXTERN int		XDrawArc(Display *d, Drawable dr, GC g, int i1,
 				int i2, unsigned int ui1, unsigned int ui2,
 				int i3, int i4);
+#endif
+#ifndef XDrawLines_TCL_DECLARED
+#define XDrawLines_TCL_DECLARED
 /* 31 */
 EXTERN int		XDrawLines(Display *d, Drawable dr, GC g, XPoint *x,
 				int i1, int i2);
+#endif
+#ifndef XDrawRectangle_TCL_DECLARED
+#define XDrawRectangle_TCL_DECLARED
 /* 32 */
 EXTERN int		XDrawRectangle(Display *d, Drawable dr, GC g, int i1,
 				int i2, unsigned int ui1, unsigned int ui2);
+#endif
+#ifndef XFillArc_TCL_DECLARED
+#define XFillArc_TCL_DECLARED
 /* 33 */
 EXTERN int		XFillArc(Display *d, Drawable dr, GC g, int i1,
 				int i2, unsigned int ui1, unsigned int ui2,
 				int i3, int i4);
+#endif
+#ifndef XFillPolygon_TCL_DECLARED
+#define XFillPolygon_TCL_DECLARED
 /* 34 */
 EXTERN int		XFillPolygon(Display *d, Drawable dr, GC g,
 				XPoint *x, int i1, int i2, int i3);
+#endif
+#ifndef XFillRectangles_TCL_DECLARED
+#define XFillRectangles_TCL_DECLARED
 /* 35 */
 EXTERN int		XFillRectangles(Display *d, Drawable dr, GC g,
 				XRectangle *x, int i);
+#endif
+#ifndef XForceScreenSaver_TCL_DECLARED
+#define XForceScreenSaver_TCL_DECLARED
 /* 36 */
 EXTERN int		XForceScreenSaver(Display *d, int i);
+#endif
+#ifndef XFreeColormap_TCL_DECLARED
+#define XFreeColormap_TCL_DECLARED
 /* 37 */
 EXTERN int		XFreeColormap(Display *d, Colormap c);
+#endif
+#ifndef XFreeColors_TCL_DECLARED
+#define XFreeColors_TCL_DECLARED
 /* 38 */
 EXTERN int		XFreeColors(Display *d, Colormap c,
 				unsigned long *ulp, int i, unsigned long ul);
+#endif
+#ifndef XFreeCursor_TCL_DECLARED
+#define XFreeCursor_TCL_DECLARED
 /* 39 */
 EXTERN int		XFreeCursor(Display *d, Cursor c);
+#endif
+#ifndef XFreeModifiermap_TCL_DECLARED
+#define XFreeModifiermap_TCL_DECLARED
 /* 40 */
 EXTERN int		XFreeModifiermap(XModifierKeymap *x);
+#endif
+#ifndef XGetGeometry_TCL_DECLARED
+#define XGetGeometry_TCL_DECLARED
 /* 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);
+#endif
+#ifndef XGetInputFocus_TCL_DECLARED
+#define XGetInputFocus_TCL_DECLARED
 /* 42 */
 EXTERN int		XGetInputFocus(Display *d, Window *w, int *i);
+#endif
+#ifndef XGetWindowProperty_TCL_DECLARED
+#define XGetWindowProperty_TCL_DECLARED
 /* 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);
+#endif
+#ifndef XGetWindowAttributes_TCL_DECLARED
+#define XGetWindowAttributes_TCL_DECLARED
 /* 44 */
 EXTERN Status		XGetWindowAttributes(Display *d, Window w,
 				XWindowAttributes *x);
+#endif
+#ifndef XGrabKeyboard_TCL_DECLARED
+#define XGrabKeyboard_TCL_DECLARED
 /* 45 */
 EXTERN int		XGrabKeyboard(Display *d, Window w, Bool b, int i1,
 				int i2, Time t);
+#endif
+#ifndef XGrabPointer_TCL_DECLARED
+#define XGrabPointer_TCL_DECLARED
 /* 46 */
 EXTERN int		XGrabPointer(Display *d, Window w1, Bool b,
 				unsigned int ui, int i1, int i2, Window w2,
 				Cursor c, Time t);
+#endif
+#ifndef XKeysymToKeycode_TCL_DECLARED
+#define XKeysymToKeycode_TCL_DECLARED
 /* 47 */
 EXTERN KeyCode		XKeysymToKeycode(Display *d, KeySym k);
+#endif
+#ifndef XLookupColor_TCL_DECLARED
+#define XLookupColor_TCL_DECLARED
 /* 48 */
 EXTERN Status		XLookupColor(Display *d, Colormap c1,
 				_Xconst char *c2, XColor *x1, XColor *x2);
+#endif
+#ifndef XMapWindow_TCL_DECLARED
+#define XMapWindow_TCL_DECLARED
 /* 49 */
 EXTERN int		XMapWindow(Display *d, Window w);
+#endif
+#ifndef XMoveResizeWindow_TCL_DECLARED
+#define XMoveResizeWindow_TCL_DECLARED
 /* 50 */
 EXTERN int		XMoveResizeWindow(Display *d, Window w, int i1,
 				int i2, unsigned int ui1, unsigned int ui2);
+#endif
+#ifndef XMoveWindow_TCL_DECLARED
+#define XMoveWindow_TCL_DECLARED
 /* 51 */
 EXTERN int		XMoveWindow(Display *d, Window w, int i1, int i2);
+#endif
+#ifndef XNextEvent_TCL_DECLARED
+#define XNextEvent_TCL_DECLARED
 /* 52 */
 EXTERN int		XNextEvent(Display *d, XEvent *x);
+#endif
+#ifndef XPutBackEvent_TCL_DECLARED
+#define XPutBackEvent_TCL_DECLARED
 /* 53 */
 EXTERN int		XPutBackEvent(Display *d, XEvent *x);
+#endif
+#ifndef XQueryColors_TCL_DECLARED
+#define XQueryColors_TCL_DECLARED
 /* 54 */
 EXTERN int		XQueryColors(Display *d, Colormap c, XColor *x,
 				int i);
+#endif
+#ifndef XQueryPointer_TCL_DECLARED
+#define XQueryPointer_TCL_DECLARED
 /* 55 */
 EXTERN Bool		XQueryPointer(Display *d, Window w1, Window *w2,
 				Window *w3, int *i1, int *i2, int *i3,
 				int *i4, unsigned int *ui);
+#endif
+#ifndef XQueryTree_TCL_DECLARED
+#define XQueryTree_TCL_DECLARED
 /* 56 */
 EXTERN Status		XQueryTree(Display *d, Window w1, Window *w2,
 				Window *w3, Window **w4, unsigned int *ui);
+#endif
+#ifndef XRaiseWindow_TCL_DECLARED
+#define XRaiseWindow_TCL_DECLARED
 /* 57 */
 EXTERN int		XRaiseWindow(Display *d, Window w);
+#endif
+#ifndef XRefreshKeyboardMapping_TCL_DECLARED
+#define XRefreshKeyboardMapping_TCL_DECLARED
 /* 58 */
 EXTERN int		XRefreshKeyboardMapping(XMappingEvent *x);
+#endif
+#ifndef XResizeWindow_TCL_DECLARED
+#define XResizeWindow_TCL_DECLARED
 /* 59 */
 EXTERN int		XResizeWindow(Display *d, Window w, unsigned int ui1,
 				unsigned int ui2);
+#endif
+#ifndef XSelectInput_TCL_DECLARED
+#define XSelectInput_TCL_DECLARED
 /* 60 */
 EXTERN int		XSelectInput(Display *d, Window w, long l);
+#endif
+#ifndef XSendEvent_TCL_DECLARED
+#define XSendEvent_TCL_DECLARED
 /* 61 */
 EXTERN Status		XSendEvent(Display *d, Window w, Bool b, long l,
 				XEvent *x);
+#endif
+#ifndef XSetCommand_TCL_DECLARED
+#define XSetCommand_TCL_DECLARED
 /* 62 */
 EXTERN int		XSetCommand(Display *d, Window w, char **c, int i);
+#endif
+#ifndef XSetIconName_TCL_DECLARED
+#define XSetIconName_TCL_DECLARED
 /* 63 */
 EXTERN int		XSetIconName(Display *d, Window w, _Xconst char *c);
+#endif
+#ifndef XSetInputFocus_TCL_DECLARED
+#define XSetInputFocus_TCL_DECLARED
 /* 64 */
 EXTERN int		XSetInputFocus(Display *d, Window w, int i, Time t);
+#endif
+#ifndef XSetSelectionOwner_TCL_DECLARED
+#define XSetSelectionOwner_TCL_DECLARED
 /* 65 */
 EXTERN int		XSetSelectionOwner(Display *d, Atom a, Window w,
 				Time t);
+#endif
+#ifndef XSetWindowBackground_TCL_DECLARED
+#define XSetWindowBackground_TCL_DECLARED
 /* 66 */
 EXTERN int		XSetWindowBackground(Display *d, Window w,
 				unsigned long ul);
+#endif
+#ifndef XSetWindowBackgroundPixmap_TCL_DECLARED
+#define XSetWindowBackgroundPixmap_TCL_DECLARED
 /* 67 */
 EXTERN int		XSetWindowBackgroundPixmap(Display *d, Window w,
 				Pixmap p);
+#endif
+#ifndef XSetWindowBorder_TCL_DECLARED
+#define XSetWindowBorder_TCL_DECLARED
 /* 68 */
 EXTERN int		XSetWindowBorder(Display *d, Window w,
 				unsigned long ul);
+#endif
+#ifndef XSetWindowBorderPixmap_TCL_DECLARED
+#define XSetWindowBorderPixmap_TCL_DECLARED
 /* 69 */
 EXTERN int		XSetWindowBorderPixmap(Display *d, Window w,
 				Pixmap p);
+#endif
+#ifndef XSetWindowBorderWidth_TCL_DECLARED
+#define XSetWindowBorderWidth_TCL_DECLARED
 /* 70 */
 EXTERN int		XSetWindowBorderWidth(Display *d, Window w,
 				unsigned int ui);
+#endif
+#ifndef XSetWindowColormap_TCL_DECLARED
+#define XSetWindowColormap_TCL_DECLARED
 /* 71 */
 EXTERN int		XSetWindowColormap(Display *d, Window w, Colormap c);
+#endif
+#ifndef XTranslateCoordinates_TCL_DECLARED
+#define XTranslateCoordinates_TCL_DECLARED
 /* 72 */
 EXTERN Bool		XTranslateCoordinates(Display *d, Window w1,
 				Window w2, int i1, int i2, int *i3, int *i4,
 				Window *w3);
+#endif
+#ifndef XUngrabKeyboard_TCL_DECLARED
+#define XUngrabKeyboard_TCL_DECLARED
 /* 73 */
 EXTERN int		XUngrabKeyboard(Display *d, Time t);
+#endif
+#ifndef XUngrabPointer_TCL_DECLARED
+#define XUngrabPointer_TCL_DECLARED
 /* 74 */
 EXTERN int		XUngrabPointer(Display *d, Time t);
+#endif
+#ifndef XUnmapWindow_TCL_DECLARED
+#define XUnmapWindow_TCL_DECLARED
 /* 75 */
 EXTERN int		XUnmapWindow(Display *d, Window w);
+#endif
+#ifndef XWindowEvent_TCL_DECLARED
+#define XWindowEvent_TCL_DECLARED
 /* 76 */
 EXTERN int		XWindowEvent(Display *d, Window w, long l, XEvent *x);
+#endif
+#ifndef XDestroyIC_TCL_DECLARED
+#define XDestroyIC_TCL_DECLARED
 /* 77 */
 EXTERN void		XDestroyIC(XIC x);
+#endif
+#ifndef XFilterEvent_TCL_DECLARED
+#define XFilterEvent_TCL_DECLARED
 /* 78 */
 EXTERN Bool		XFilterEvent(XEvent *x, Window w);
+#endif
+#ifndef XmbLookupString_TCL_DECLARED
+#define XmbLookupString_TCL_DECLARED
 /* 79 */
 EXTERN int		XmbLookupString(XIC xi, XKeyPressedEvent *xk,
 				char *c, int i, KeySym *k, Status *s);
+#endif
+#ifndef TkPutImage_TCL_DECLARED
+#define TkPutImage_TCL_DECLARED
 /* 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);
+#endif
 /* Slot 81 is reserved */
+#ifndef XParseColor_TCL_DECLARED
+#define XParseColor_TCL_DECLARED
 /* 82 */
 EXTERN Status		XParseColor(Display *display, Colormap map,
 				_Xconst char *spec, XColor *colorPtr);
+#endif
+#ifndef XCreateGC_TCL_DECLARED
+#define XCreateGC_TCL_DECLARED
 /* 83 */
 EXTERN GC		XCreateGC(Display *display, Drawable d,
 				unsigned long valuemask, XGCValues *values);
+#endif
+#ifndef XFreeGC_TCL_DECLARED
+#define XFreeGC_TCL_DECLARED
 /* 84 */
 EXTERN int		XFreeGC(Display *display, GC gc);
+#endif
+#ifndef XInternAtom_TCL_DECLARED
+#define XInternAtom_TCL_DECLARED
 /* 85 */
 EXTERN Atom		XInternAtom(Display *display,
 				_Xconst char *atom_name, Bool only_if_exists);
+#endif
+#ifndef XSetBackground_TCL_DECLARED
+#define XSetBackground_TCL_DECLARED
 /* 86 */
 EXTERN int		XSetBackground(Display *display, GC gc,
 				unsigned long foreground);
+#endif
+#ifndef XSetForeground_TCL_DECLARED
+#define XSetForeground_TCL_DECLARED
 /* 87 */
 EXTERN int		XSetForeground(Display *display, GC gc,
 				unsigned long foreground);
+#endif
+#ifndef XSetClipMask_TCL_DECLARED
+#define XSetClipMask_TCL_DECLARED
 /* 88 */
 EXTERN int		XSetClipMask(Display *display, GC gc, Pixmap pixmap);
+#endif
+#ifndef XSetClipOrigin_TCL_DECLARED
+#define XSetClipOrigin_TCL_DECLARED
 /* 89 */
 EXTERN int		XSetClipOrigin(Display *display, GC gc,
 				int clip_x_origin, int clip_y_origin);
+#endif
+#ifndef XSetTSOrigin_TCL_DECLARED
+#define XSetTSOrigin_TCL_DECLARED
 /* 90 */
 EXTERN int		XSetTSOrigin(Display *display, GC gc,
 				int ts_x_origin, int ts_y_origin);
+#endif
+#ifndef XChangeGC_TCL_DECLARED
+#define XChangeGC_TCL_DECLARED
 /* 91 */
 EXTERN int		XChangeGC(Display *d, GC gc, unsigned long mask,
 				XGCValues *values);
+#endif
+#ifndef XSetFont_TCL_DECLARED
+#define XSetFont_TCL_DECLARED
 /* 92 */
 EXTERN int		XSetFont(Display *display, GC gc, Font font);
+#endif
+#ifndef XSetArcMode_TCL_DECLARED
+#define XSetArcMode_TCL_DECLARED
 /* 93 */
 EXTERN int		XSetArcMode(Display *display, GC gc, int arc_mode);
+#endif
+#ifndef XSetStipple_TCL_DECLARED
+#define XSetStipple_TCL_DECLARED
 /* 94 */
 EXTERN int		XSetStipple(Display *display, GC gc, Pixmap stipple);
+#endif
+#ifndef XSetFillRule_TCL_DECLARED
+#define XSetFillRule_TCL_DECLARED
 /* 95 */
 EXTERN int		XSetFillRule(Display *display, GC gc, int fill_rule);
+#endif
+#ifndef XSetFillStyle_TCL_DECLARED
+#define XSetFillStyle_TCL_DECLARED
 /* 96 */
 EXTERN int		XSetFillStyle(Display *display, GC gc,
 				int fill_style);
+#endif
+#ifndef XSetFunction_TCL_DECLARED
+#define XSetFunction_TCL_DECLARED
 /* 97 */
 EXTERN int		XSetFunction(Display *display, GC gc, int function);
+#endif
+#ifndef XSetLineAttributes_TCL_DECLARED
+#define XSetLineAttributes_TCL_DECLARED
 /* 98 */
 EXTERN int		XSetLineAttributes(Display *display, GC gc,
 				unsigned int line_width, int line_style,
 				int cap_style, int join_style);
+#endif
+#ifndef _XInitImageFuncPtrs_TCL_DECLARED
+#define _XInitImageFuncPtrs_TCL_DECLARED
 /* 99 */
 EXTERN int		_XInitImageFuncPtrs(XImage *image);
+#endif
+#ifndef XCreateIC_TCL_DECLARED
+#define XCreateIC_TCL_DECLARED
 /* 100 */
 EXTERN XIC		XCreateIC(XIM xim, ...);
+#endif
+#ifndef XGetVisualInfo_TCL_DECLARED
+#define XGetVisualInfo_TCL_DECLARED
 /* 101 */
 EXTERN XVisualInfo *	XGetVisualInfo(Display *display, long vinfo_mask,
 				XVisualInfo *vinfo_template,
 				int *nitems_return);
+#endif
+#ifndef XSetWMClientMachine_TCL_DECLARED
+#define XSetWMClientMachine_TCL_DECLARED
 /* 102 */
 EXTERN void		XSetWMClientMachine(Display *display, Window w,
 				XTextProperty *text_prop);
+#endif
+#ifndef XStringListToTextProperty_TCL_DECLARED
+#define XStringListToTextProperty_TCL_DECLARED
 /* 103 */
 EXTERN Status		XStringListToTextProperty(char **list, int count,
 				XTextProperty *text_prop_return);
+#endif
+#ifndef XDrawLine_TCL_DECLARED
+#define XDrawLine_TCL_DECLARED
 /* 104 */
 EXTERN int		XDrawLine(Display *d, Drawable dr, GC g, int x1,
 				int y1, int x2, int y2);
+#endif
+#ifndef XWarpPointer_TCL_DECLARED
+#define XWarpPointer_TCL_DECLARED
 /* 105 */
 EXTERN int		XWarpPointer(Display *d, Window s, Window dw, int sx,
 				int sy, unsigned int sw, unsigned int sh,
 				int dx, int dy);
+#endif
+#ifndef XFillRectangle_TCL_DECLARED
+#define XFillRectangle_TCL_DECLARED
 /* 106 */
 EXTERN int		XFillRectangle(Display *display, Drawable d, GC gc,
 				int x, int y, unsigned int width,
 				unsigned int height);
+#endif
+#ifndef XFlush_TCL_DECLARED
+#define XFlush_TCL_DECLARED
 /* 107 */
 EXTERN int		XFlush(Display *display);
+#endif
+#ifndef XGrabServer_TCL_DECLARED
+#define XGrabServer_TCL_DECLARED
 /* 108 */
 EXTERN int		XGrabServer(Display *display);
+#endif
+#ifndef XUngrabServer_TCL_DECLARED
+#define XUngrabServer_TCL_DECLARED
 /* 109 */
 EXTERN int		XUngrabServer(Display *display);
+#endif
+#ifndef XFree_TCL_DECLARED
+#define XFree_TCL_DECLARED
 /* 110 */
-EXTERN int		XFree(void *data);
+EXTERN int		XFree(VOID *data);
+#endif
+#ifndef XNoOp_TCL_DECLARED
+#define XNoOp_TCL_DECLARED
 /* 111 */
 EXTERN int		XNoOp(Display *display);
+#endif
+#ifndef XSynchronize_TCL_DECLARED
+#define XSynchronize_TCL_DECLARED
 /* 112 */
 EXTERN XAfterFunction	XSynchronize(Display *display, Bool onoff);
+#endif
+#ifndef XSync_TCL_DECLARED
+#define XSync_TCL_DECLARED
 /* 113 */
 EXTERN int		XSync(Display *display, Bool discard);
+#endif
+#ifndef XVisualIDFromVisual_TCL_DECLARED
+#define XVisualIDFromVisual_TCL_DECLARED
 /* 114 */
 EXTERN VisualID		XVisualIDFromVisual(Visual *visual);
+#endif
 /* Slot 115 is reserved */
 /* Slot 116 is reserved */
 /* Slot 117 is reserved */
@@ -374,15 +716,24 @@ EXTERN VisualID		XVisualIDFromVisual(Visual *visual);
 /* Slot 130 is reserved */
 /* Slot 131 is reserved */
 /* Slot 132 is reserved */
+#ifndef XDrawSegments_TCL_DECLARED
+#define XDrawSegments_TCL_DECLARED
 /* 133 */
 EXTERN int		XDrawSegments(Display *d, Drawable dr, GC gc,
 				XSegment *s, int n);
+#endif
+#ifndef XDrawPoint_TCL_DECLARED
+#define XDrawPoint_TCL_DECLARED
 /* 134 */
 EXTERN int		XDrawPoint(Display *d, Drawable dr, GC gc, int x,
 				int y);
+#endif
+#ifndef XDrawPoints_TCL_DECLARED
+#define XDrawPoints_TCL_DECLARED
 /* 135 */
 EXTERN int		XDrawPoints(Display *d, Drawable dr, GC gc,
 				XPoint *p, int n, int m);
+#endif
 /* Slot 136 is reserved */
 /* Slot 137 is reserved */
 /* Slot 138 is reserved */
@@ -405,272 +756,551 @@ EXTERN int		XDrawPoints(Display *d, Drawable dr, GC gc,
 /* Slot 155 is reserved */
 /* Slot 156 is reserved */
 /* Slot 157 is reserved */
+#ifndef TkUnusedStubEntry_TCL_DECLARED
+#define TkUnusedStubEntry_TCL_DECLARED
 /* 158 */
 EXTERN void		TkUnusedStubEntry(void);
+#endif
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
+#ifndef XSetDashes_TCL_DECLARED
+#define XSetDashes_TCL_DECLARED
 /* 0 */
 EXTERN int		XSetDashes(Display *display, GC gc, int dash_offset,
 				_Xconst char *dash_list, int n);
+#endif
+#ifndef XGetModifierMapping_TCL_DECLARED
+#define XGetModifierMapping_TCL_DECLARED
 /* 1 */
 EXTERN XModifierKeymap * XGetModifierMapping(Display *d);
+#endif
+#ifndef XCreateImage_TCL_DECLARED
+#define XCreateImage_TCL_DECLARED
 /* 2 */
 EXTERN XImage *		XCreateImage(Display *d, Visual *v, unsigned int ui1,
 				int i1, int i2, char *cp, unsigned int ui2,
 				unsigned int ui3, int i3, int i4);
+#endif
+#ifndef XGetImage_TCL_DECLARED
+#define XGetImage_TCL_DECLARED
 /* 3 */
 EXTERN XImage *		XGetImage(Display *d, Drawable dr, int i1, int i2,
 				unsigned int ui1, unsigned int ui2,
 				unsigned long ul, int i3);
+#endif
+#ifndef XGetAtomName_TCL_DECLARED
+#define XGetAtomName_TCL_DECLARED
 /* 4 */
 EXTERN char *		XGetAtomName(Display *d, Atom a);
+#endif
+#ifndef XKeysymToString_TCL_DECLARED
+#define XKeysymToString_TCL_DECLARED
 /* 5 */
 EXTERN char *		XKeysymToString(KeySym k);
+#endif
+#ifndef XCreateColormap_TCL_DECLARED
+#define XCreateColormap_TCL_DECLARED
 /* 6 */
 EXTERN Colormap		XCreateColormap(Display *d, Window w, Visual *v,
 				int i);
+#endif
+#ifndef XGContextFromGC_TCL_DECLARED
+#define XGContextFromGC_TCL_DECLARED
 /* 7 */
 EXTERN GContext		XGContextFromGC(GC g);
+#endif
+#ifndef XKeycodeToKeysym_TCL_DECLARED
+#define XKeycodeToKeysym_TCL_DECLARED
 /* 8 */
 EXTERN KeySym		XKeycodeToKeysym(Display *d, KeyCode k, int i);
+#endif
+#ifndef XStringToKeysym_TCL_DECLARED
+#define XStringToKeysym_TCL_DECLARED
 /* 9 */
 EXTERN KeySym		XStringToKeysym(_Xconst char *c);
+#endif
+#ifndef XRootWindow_TCL_DECLARED
+#define XRootWindow_TCL_DECLARED
 /* 10 */
 EXTERN Window		XRootWindow(Display *d, int i);
+#endif
+#ifndef XSetErrorHandler_TCL_DECLARED
+#define XSetErrorHandler_TCL_DECLARED
 /* 11 */
 EXTERN XErrorHandler	XSetErrorHandler(XErrorHandler x);
+#endif
+#ifndef XAllocColor_TCL_DECLARED
+#define XAllocColor_TCL_DECLARED
 /* 12 */
 EXTERN Status		XAllocColor(Display *d, Colormap c, XColor *xp);
+#endif
+#ifndef XBell_TCL_DECLARED
+#define XBell_TCL_DECLARED
 /* 13 */
 EXTERN int		XBell(Display *d, int i);
+#endif
+#ifndef XChangeProperty_TCL_DECLARED
+#define XChangeProperty_TCL_DECLARED
 /* 14 */
 EXTERN void		XChangeProperty(Display *d, Window w, Atom a1,
 				Atom a2, int i1, int i2,
 				_Xconst unsigned char *c, int i3);
+#endif
+#ifndef XChangeWindowAttributes_TCL_DECLARED
+#define XChangeWindowAttributes_TCL_DECLARED
 /* 15 */
 EXTERN void		XChangeWindowAttributes(Display *d, Window w,
 				unsigned long ul, XSetWindowAttributes *x);
+#endif
+#ifndef XConfigureWindow_TCL_DECLARED
+#define XConfigureWindow_TCL_DECLARED
 /* 16 */
 EXTERN void		XConfigureWindow(Display *d, Window w,
 				unsigned int i, XWindowChanges *x);
+#endif
+#ifndef XCopyArea_TCL_DECLARED
+#define XCopyArea_TCL_DECLARED
 /* 17 */
 EXTERN void		XCopyArea(Display *d, Drawable dr1, Drawable dr2,
 				GC g, int i1, int i2, unsigned int ui1,
 				unsigned int ui2, int i3, int i4);
+#endif
+#ifndef XCopyPlane_TCL_DECLARED
+#define XCopyPlane_TCL_DECLARED
 /* 18 */
 EXTERN void		XCopyPlane(Display *d, Drawable dr1, Drawable dr2,
 				GC g, int i1, int i2, unsigned int ui1,
 				unsigned int ui2, int i3, int i4,
 				unsigned long ul);
+#endif
+#ifndef XCreateBitmapFromData_TCL_DECLARED
+#define XCreateBitmapFromData_TCL_DECLARED
 /* 19 */
 EXTERN Pixmap		XCreateBitmapFromData(Display *display, Drawable d,
 				_Xconst char *data, unsigned int width,
 				unsigned int height);
+#endif
+#ifndef XDefineCursor_TCL_DECLARED
+#define XDefineCursor_TCL_DECLARED
 /* 20 */
 EXTERN int		XDefineCursor(Display *d, Window w, Cursor c);
+#endif
+#ifndef XDestroyWindow_TCL_DECLARED
+#define XDestroyWindow_TCL_DECLARED
 /* 21 */
 EXTERN void		XDestroyWindow(Display *d, Window w);
+#endif
+#ifndef XDrawArc_TCL_DECLARED
+#define XDrawArc_TCL_DECLARED
 /* 22 */
 EXTERN void		XDrawArc(Display *d, Drawable dr, GC g, int i1,
 				int i2, unsigned int ui1, unsigned int ui2,
 				int i3, int i4);
+#endif
+#ifndef XDrawLines_TCL_DECLARED
+#define XDrawLines_TCL_DECLARED
 /* 23 */
 EXTERN int		XDrawLines(Display *d, Drawable dr, GC g, XPoint *x,
 				int i1, int i2);
+#endif
+#ifndef XDrawRectangle_TCL_DECLARED
+#define XDrawRectangle_TCL_DECLARED
 /* 24 */
 EXTERN void		XDrawRectangle(Display *d, Drawable dr, GC g, int i1,
 				int i2, unsigned int ui1, unsigned int ui2);
+#endif
+#ifndef XFillArc_TCL_DECLARED
+#define XFillArc_TCL_DECLARED
 /* 25 */
 EXTERN void		XFillArc(Display *d, Drawable dr, GC g, int i1,
 				int i2, unsigned int ui1, unsigned int ui2,
 				int i3, int i4);
+#endif
+#ifndef XFillPolygon_TCL_DECLARED
+#define XFillPolygon_TCL_DECLARED
 /* 26 */
 EXTERN void		XFillPolygon(Display *d, Drawable dr, GC g,
 				XPoint *x, int i1, int i2, int i3);
+#endif
+#ifndef XFillRectangles_TCL_DECLARED
+#define XFillRectangles_TCL_DECLARED
 /* 27 */
 EXTERN int		XFillRectangles(Display *d, Drawable dr, GC g,
 				XRectangle *x, int i);
+#endif
+#ifndef XFreeColormap_TCL_DECLARED
+#define XFreeColormap_TCL_DECLARED
 /* 28 */
 EXTERN int		XFreeColormap(Display *d, Colormap c);
+#endif
+#ifndef XFreeColors_TCL_DECLARED
+#define XFreeColors_TCL_DECLARED
 /* 29 */
 EXTERN int		XFreeColors(Display *d, Colormap c,
 				unsigned long *ulp, int i, unsigned long ul);
+#endif
+#ifndef XFreeModifiermap_TCL_DECLARED
+#define XFreeModifiermap_TCL_DECLARED
 /* 30 */
 EXTERN int		XFreeModifiermap(XModifierKeymap *x);
+#endif
+#ifndef XGetGeometry_TCL_DECLARED
+#define XGetGeometry_TCL_DECLARED
 /* 31 */
 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);
+#endif
+#ifndef XGetWindowProperty_TCL_DECLARED
+#define XGetWindowProperty_TCL_DECLARED
 /* 32 */
 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);
+#endif
+#ifndef XGrabKeyboard_TCL_DECLARED
+#define XGrabKeyboard_TCL_DECLARED
 /* 33 */
 EXTERN int		XGrabKeyboard(Display *d, Window w, Bool b, int i1,
 				int i2, Time t);
+#endif
+#ifndef XGrabPointer_TCL_DECLARED
+#define XGrabPointer_TCL_DECLARED
 /* 34 */
 EXTERN int		XGrabPointer(Display *d, Window w1, Bool b,
 				unsigned int ui, int i1, int i2, Window w2,
 				Cursor c, Time t);
+#endif
+#ifndef XKeysymToKeycode_TCL_DECLARED
+#define XKeysymToKeycode_TCL_DECLARED
 /* 35 */
 EXTERN KeyCode		XKeysymToKeycode(Display *d, KeySym k);
+#endif
+#ifndef XMapWindow_TCL_DECLARED
+#define XMapWindow_TCL_DECLARED
 /* 36 */
 EXTERN void		XMapWindow(Display *d, Window w);
+#endif
+#ifndef XMoveResizeWindow_TCL_DECLARED
+#define XMoveResizeWindow_TCL_DECLARED
 /* 37 */
 EXTERN void		XMoveResizeWindow(Display *d, Window w, int i1,
 				int i2, unsigned int ui1, unsigned int ui2);
+#endif
+#ifndef XMoveWindow_TCL_DECLARED
+#define XMoveWindow_TCL_DECLARED
 /* 38 */
 EXTERN void		XMoveWindow(Display *d, Window w, int i1, int i2);
+#endif
+#ifndef XQueryPointer_TCL_DECLARED
+#define XQueryPointer_TCL_DECLARED
 /* 39 */
 EXTERN Bool		XQueryPointer(Display *d, Window w1, Window *w2,
 				Window *w3, int *i1, int *i2, int *i3,
 				int *i4, unsigned int *ui);
+#endif
+#ifndef XRaiseWindow_TCL_DECLARED
+#define XRaiseWindow_TCL_DECLARED
 /* 40 */
 EXTERN void		XRaiseWindow(Display *d, Window w);
+#endif
+#ifndef XRefreshKeyboardMapping_TCL_DECLARED
+#define XRefreshKeyboardMapping_TCL_DECLARED
 /* 41 */
 EXTERN void		XRefreshKeyboardMapping(XMappingEvent *x);
+#endif
+#ifndef XResizeWindow_TCL_DECLARED
+#define XResizeWindow_TCL_DECLARED
 /* 42 */
 EXTERN void		XResizeWindow(Display *d, Window w, unsigned int ui1,
 				unsigned int ui2);
+#endif
+#ifndef XSelectInput_TCL_DECLARED
+#define XSelectInput_TCL_DECLARED
 /* 43 */
 EXTERN void		XSelectInput(Display *d, Window w, long l);
+#endif
+#ifndef XSendEvent_TCL_DECLARED
+#define XSendEvent_TCL_DECLARED
 /* 44 */
 EXTERN Status		XSendEvent(Display *d, Window w, Bool b, long l,
 				XEvent *x);
+#endif
+#ifndef XSetIconName_TCL_DECLARED
+#define XSetIconName_TCL_DECLARED
 /* 45 */
 EXTERN void		XSetIconName(Display *d, Window w, _Xconst char *c);
+#endif
+#ifndef XSetInputFocus_TCL_DECLARED
+#define XSetInputFocus_TCL_DECLARED
 /* 46 */
 EXTERN void		XSetInputFocus(Display *d, Window w, int i, Time t);
+#endif
+#ifndef XSetSelectionOwner_TCL_DECLARED
+#define XSetSelectionOwner_TCL_DECLARED
 /* 47 */
 EXTERN int		XSetSelectionOwner(Display *d, Atom a, Window w,
 				Time t);
+#endif
+#ifndef XSetWindowBackground_TCL_DECLARED
+#define XSetWindowBackground_TCL_DECLARED
 /* 48 */
 EXTERN void		XSetWindowBackground(Display *d, Window w,
 				unsigned long ul);
+#endif
+#ifndef XSetWindowBackgroundPixmap_TCL_DECLARED
+#define XSetWindowBackgroundPixmap_TCL_DECLARED
 /* 49 */
 EXTERN void		XSetWindowBackgroundPixmap(Display *d, Window w,
 				Pixmap p);
+#endif
+#ifndef XSetWindowBorder_TCL_DECLARED
+#define XSetWindowBorder_TCL_DECLARED
 /* 50 */
 EXTERN void		XSetWindowBorder(Display *d, Window w,
 				unsigned long ul);
+#endif
+#ifndef XSetWindowBorderPixmap_TCL_DECLARED
+#define XSetWindowBorderPixmap_TCL_DECLARED
 /* 51 */
 EXTERN void		XSetWindowBorderPixmap(Display *d, Window w,
 				Pixmap p);
+#endif
+#ifndef XSetWindowBorderWidth_TCL_DECLARED
+#define XSetWindowBorderWidth_TCL_DECLARED
 /* 52 */
 EXTERN void		XSetWindowBorderWidth(Display *d, Window w,
 				unsigned int ui);
+#endif
+#ifndef XSetWindowColormap_TCL_DECLARED
+#define XSetWindowColormap_TCL_DECLARED
 /* 53 */
 EXTERN void		XSetWindowColormap(Display *d, Window w, Colormap c);
+#endif
+#ifndef XUngrabKeyboard_TCL_DECLARED
+#define XUngrabKeyboard_TCL_DECLARED
 /* 54 */
 EXTERN void		XUngrabKeyboard(Display *d, Time t);
+#endif
+#ifndef XUngrabPointer_TCL_DECLARED
+#define XUngrabPointer_TCL_DECLARED
 /* 55 */
 EXTERN int		XUngrabPointer(Display *d, Time t);
+#endif
+#ifndef XUnmapWindow_TCL_DECLARED
+#define XUnmapWindow_TCL_DECLARED
 /* 56 */
 EXTERN void		XUnmapWindow(Display *d, Window w);
+#endif
+#ifndef TkPutImage_TCL_DECLARED
+#define TkPutImage_TCL_DECLARED
 /* 57 */
 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);
+#endif
+#ifndef XParseColor_TCL_DECLARED
+#define XParseColor_TCL_DECLARED
 /* 58 */
 EXTERN Status		XParseColor(Display *display, Colormap map,
 				_Xconst char *spec, XColor *colorPtr);
+#endif
+#ifndef XCreateGC_TCL_DECLARED
+#define XCreateGC_TCL_DECLARED
 /* 59 */
 EXTERN GC		XCreateGC(Display *display, Drawable d,
 				unsigned long valuemask, XGCValues *values);
+#endif
+#ifndef XFreeGC_TCL_DECLARED
+#define XFreeGC_TCL_DECLARED
 /* 60 */
 EXTERN int		XFreeGC(Display *display, GC gc);
+#endif
+#ifndef XInternAtom_TCL_DECLARED
+#define XInternAtom_TCL_DECLARED
 /* 61 */
 EXTERN Atom		XInternAtom(Display *display,
 				_Xconst char *atom_name, Bool only_if_exists);
+#endif
+#ifndef XSetBackground_TCL_DECLARED
+#define XSetBackground_TCL_DECLARED
 /* 62 */
 EXTERN int		XSetBackground(Display *display, GC gc,
 				unsigned long foreground);
+#endif
+#ifndef XSetForeground_TCL_DECLARED
+#define XSetForeground_TCL_DECLARED
 /* 63 */
 EXTERN int		XSetForeground(Display *display, GC gc,
 				unsigned long foreground);
+#endif
+#ifndef XSetClipMask_TCL_DECLARED
+#define XSetClipMask_TCL_DECLARED
 /* 64 */
 EXTERN int		XSetClipMask(Display *display, GC gc, Pixmap pixmap);
+#endif
+#ifndef XSetClipOrigin_TCL_DECLARED
+#define XSetClipOrigin_TCL_DECLARED
 /* 65 */
 EXTERN int		XSetClipOrigin(Display *display, GC gc,
 				int clip_x_origin, int clip_y_origin);
+#endif
+#ifndef XSetTSOrigin_TCL_DECLARED
+#define XSetTSOrigin_TCL_DECLARED
 /* 66 */
 EXTERN int		XSetTSOrigin(Display *display, GC gc,
 				int ts_x_origin, int ts_y_origin);
+#endif
+#ifndef XChangeGC_TCL_DECLARED
+#define XChangeGC_TCL_DECLARED
 /* 67 */
 EXTERN int		XChangeGC(Display *d, GC gc, unsigned long mask,
 				XGCValues *values);
+#endif
+#ifndef XSetFont_TCL_DECLARED
+#define XSetFont_TCL_DECLARED
 /* 68 */
 EXTERN int		XSetFont(Display *display, GC gc, Font font);
+#endif
+#ifndef XSetArcMode_TCL_DECLARED
+#define XSetArcMode_TCL_DECLARED
 /* 69 */
 EXTERN int		XSetArcMode(Display *display, GC gc, int arc_mode);
+#endif
+#ifndef XSetStipple_TCL_DECLARED
+#define XSetStipple_TCL_DECLARED
 /* 70 */
 EXTERN int		XSetStipple(Display *display, GC gc, Pixmap stipple);
+#endif
+#ifndef XSetFillRule_TCL_DECLARED
+#define XSetFillRule_TCL_DECLARED
 /* 71 */
 EXTERN int		XSetFillRule(Display *display, GC gc, int fill_rule);
+#endif
+#ifndef XSetFillStyle_TCL_DECLARED
+#define XSetFillStyle_TCL_DECLARED
 /* 72 */
 EXTERN int		XSetFillStyle(Display *display, GC gc,
 				int fill_style);
+#endif
+#ifndef XSetFunction_TCL_DECLARED
+#define XSetFunction_TCL_DECLARED
 /* 73 */
 EXTERN int		XSetFunction(Display *display, GC gc, int function);
+#endif
+#ifndef XSetLineAttributes_TCL_DECLARED
+#define XSetLineAttributes_TCL_DECLARED
 /* 74 */
 EXTERN int		XSetLineAttributes(Display *display, GC gc,
 				unsigned int line_width, int line_style,
 				int cap_style, int join_style);
+#endif
+#ifndef _XInitImageFuncPtrs_TCL_DECLARED
+#define _XInitImageFuncPtrs_TCL_DECLARED
 /* 75 */
 EXTERN int		_XInitImageFuncPtrs(XImage *image);
+#endif
+#ifndef XCreateIC_TCL_DECLARED
+#define XCreateIC_TCL_DECLARED
 /* 76 */
 EXTERN XIC		XCreateIC(void);
+#endif
+#ifndef XGetVisualInfo_TCL_DECLARED
+#define XGetVisualInfo_TCL_DECLARED
 /* 77 */
 EXTERN XVisualInfo *	XGetVisualInfo(Display *display, long vinfo_mask,
 				XVisualInfo *vinfo_template,
 				int *nitems_return);
+#endif
+#ifndef XSetWMClientMachine_TCL_DECLARED
+#define XSetWMClientMachine_TCL_DECLARED
 /* 78 */
 EXTERN void		XSetWMClientMachine(Display *display, Window w,
 				XTextProperty *text_prop);
+#endif
+#ifndef XStringListToTextProperty_TCL_DECLARED
+#define XStringListToTextProperty_TCL_DECLARED
 /* 79 */
 EXTERN Status		XStringListToTextProperty(char **list, int count,
 				XTextProperty *text_prop_return);
+#endif
+#ifndef XDrawSegments_TCL_DECLARED
+#define XDrawSegments_TCL_DECLARED
 /* 80 */
 EXTERN int		XDrawSegments(Display *display, Drawable d, GC gc,
 				XSegment *segments, int nsegments);
+#endif
+#ifndef XForceScreenSaver_TCL_DECLARED
+#define XForceScreenSaver_TCL_DECLARED
 /* 81 */
 EXTERN void		XForceScreenSaver(Display *display, int mode);
+#endif
+#ifndef XDrawLine_TCL_DECLARED
+#define XDrawLine_TCL_DECLARED
 /* 82 */
 EXTERN int		XDrawLine(Display *d, Drawable dr, GC g, int x1,
 				int y1, int x2, int y2);
+#endif
+#ifndef XFillRectangle_TCL_DECLARED
+#define XFillRectangle_TCL_DECLARED
 /* 83 */
 EXTERN int		XFillRectangle(Display *display, Drawable d, GC gc,
 				int x, int y, unsigned int width,
 				unsigned int height);
+#endif
+#ifndef XClearWindow_TCL_DECLARED
+#define XClearWindow_TCL_DECLARED
 /* 84 */
 EXTERN void		XClearWindow(Display *d, Window w);
+#endif
+#ifndef XDrawPoint_TCL_DECLARED
+#define XDrawPoint_TCL_DECLARED
 /* 85 */
 EXTERN int		XDrawPoint(Display *display, Drawable d, GC gc,
 				int x, int y);
+#endif
+#ifndef XDrawPoints_TCL_DECLARED
+#define XDrawPoints_TCL_DECLARED
 /* 86 */
 EXTERN int		XDrawPoints(Display *display, Drawable d, GC gc,
 				XPoint *points, int npoints, int mode);
+#endif
+#ifndef XWarpPointer_TCL_DECLARED
+#define XWarpPointer_TCL_DECLARED
 /* 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);
+#endif
+#ifndef XQueryColor_TCL_DECLARED
+#define XQueryColor_TCL_DECLARED
 /* 88 */
 EXTERN void		XQueryColor(Display *display, Colormap colormap,
 				XColor *def_in_out);
+#endif
+#ifndef XQueryColors_TCL_DECLARED
+#define XQueryColors_TCL_DECLARED
 /* 89 */
 EXTERN void		XQueryColors(Display *display, Colormap colormap,
 				XColor *defs_in_out, int ncolors);
+#endif
+#ifndef XQueryTree_TCL_DECLARED
+#define XQueryTree_TCL_DECLARED
 /* 90 */
 EXTERN Status		XQueryTree(Display *d, Window w1, Window *w2,
 				Window *w3, Window **w4, unsigned int *ui);
+#endif
+#ifndef XSync_TCL_DECLARED
+#define XSync_TCL_DECLARED
 /* 91 */
 EXTERN int		XSync(Display *display, Bool discard);
+#endif
 /* Slot 92 is reserved */
 /* Slot 93 is reserved */
 /* Slot 94 is reserved */
@@ -737,15 +1367,18 @@ EXTERN int		XSync(Display *display, Bool discard);
 /* Slot 155 is reserved */
 /* Slot 156 is reserved */
 /* Slot 157 is reserved */
+#ifndef TkUnusedStubEntry_TCL_DECLARED
+#define TkUnusedStubEntry_TCL_DECLARED
 /* 158 */
 EXTERN void		TkUnusedStubEntry(void);
+#endif
 #endif /* AQUA */
 
 typedef struct TkIntXlibStubs {
     int magic;
-    void *hooks;
+    struct TkIntXlibStubHooks *hooks;
 
-#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
+#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
     int (*xSetDashes) (Display *display, GC gc, int dash_offset, _Xconst char *dash_list, int n); /* 0 */
     XModifierKeymap * (*xGetModifierMapping) (Display *d); /* 1 */
     XImage * (*xCreateImage) (Display *d, Visual *v, unsigned int ui1, int i1, int i2, char *cp, unsigned int ui2, unsigned int ui3, int i3, int i4); /* 2 */
@@ -827,7 +1460,7 @@ typedef struct TkIntXlibStubs {
     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 */
-    void (*reserved81)(void);
+    VOID *reserved81;
     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 */
@@ -856,54 +1489,54 @@ typedef struct TkIntXlibStubs {
     int (*xFlush) (Display *display); /* 107 */
     int (*xGrabServer) (Display *display); /* 108 */
     int (*xUngrabServer) (Display *display); /* 109 */
-    int (*xFree) (void *data); /* 110 */
+    int (*xFree) (VOID *data); /* 110 */
     int (*xNoOp) (Display *display); /* 111 */
     XAfterFunction (*xSynchronize) (Display *display, Bool onoff); /* 112 */
     int (*xSync) (Display *display, Bool discard); /* 113 */
     VisualID (*xVisualIDFromVisual) (Visual *visual); /* 114 */
-    void (*reserved115)(void);
-    void (*reserved116)(void);
-    void (*reserved117)(void);
-    void (*reserved118)(void);
-    void (*reserved119)(void);
-    void (*reserved120)(void);
-    void (*reserved121)(void);
-    void (*reserved122)(void);
-    void (*reserved123)(void);
-    void (*reserved124)(void);
-    void (*reserved125)(void);
-    void (*reserved126)(void);
-    void (*reserved127)(void);
-    void (*reserved128)(void);
-    void (*reserved129)(void);
-    void (*reserved130)(void);
-    void (*reserved131)(void);
-    void (*reserved132)(void);
+    VOID *reserved115;
+    VOID *reserved116;
+    VOID *reserved117;
+    VOID *reserved118;
+    VOID *reserved119;
+    VOID *reserved120;
+    VOID *reserved121;
+    VOID *reserved122;
+    VOID *reserved123;
+    VOID *reserved124;
+    VOID *reserved125;
+    VOID *reserved126;
+    VOID *reserved127;
+    VOID *reserved128;
+    VOID *reserved129;
+    VOID *reserved130;
+    VOID *reserved131;
+    VOID *reserved132;
     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 */
-    void (*reserved136)(void);
-    void (*reserved137)(void);
-    void (*reserved138)(void);
-    void (*reserved139)(void);
-    void (*reserved140)(void);
-    void (*reserved141)(void);
-    void (*reserved142)(void);
-    void (*reserved143)(void);
-    void (*reserved144)(void);
-    void (*reserved145)(void);
-    void (*reserved146)(void);
-    void (*reserved147)(void);
-    void (*reserved148)(void);
-    void (*reserved149)(void);
-    void (*reserved150)(void);
-    void (*reserved151)(void);
-    void (*reserved152)(void);
-    void (*reserved153)(void);
-    void (*reserved154)(void);
-    void (*reserved155)(void);
-    void (*reserved156)(void);
-    void (*reserved157)(void);
+    VOID *reserved136;
+    VOID *reserved137;
+    VOID *reserved138;
+    VOID *reserved139;
+    VOID *reserved140;
+    VOID *reserved141;
+    VOID *reserved142;
+    VOID *reserved143;
+    VOID *reserved144;
+    VOID *reserved145;
+    VOID *reserved146;
+    VOID *reserved147;
+    VOID *reserved148;
+    VOID *reserved149;
+    VOID *reserved150;
+    VOID *reserved151;
+    VOID *reserved152;
+    VOID *reserved153;
+    VOID *reserved154;
+    VOID *reserved155;
+    VOID *reserved156;
+    VOID *reserved157;
     void (*tkUnusedStubEntry) (void); /* 158 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
@@ -999,318 +1632,546 @@ typedef struct TkIntXlibStubs {
     void (*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 */
-    void (*reserved92)(void);
-    void (*reserved93)(void);
-    void (*reserved94)(void);
-    void (*reserved95)(void);
-    void (*reserved96)(void);
-    void (*reserved97)(void);
-    void (*reserved98)(void);
-    void (*reserved99)(void);
-    void (*reserved100)(void);
-    void (*reserved101)(void);
-    void (*reserved102)(void);
-    void (*reserved103)(void);
-    void (*reserved104)(void);
-    void (*reserved105)(void);
-    void (*reserved106)(void);
-    void (*reserved107)(void);
-    void (*reserved108)(void);
-    void (*reserved109)(void);
-    void (*reserved110)(void);
-    void (*reserved111)(void);
-    void (*reserved112)(void);
-    void (*reserved113)(void);
-    void (*reserved114)(void);
-    void (*reserved115)(void);
-    void (*reserved116)(void);
-    void (*reserved117)(void);
-    void (*reserved118)(void);
-    void (*reserved119)(void);
-    void (*reserved120)(void);
-    void (*reserved121)(void);
-    void (*reserved122)(void);
-    void (*reserved123)(void);
-    void (*reserved124)(void);
-    void (*reserved125)(void);
-    void (*reserved126)(void);
-    void (*reserved127)(void);
-    void (*reserved128)(void);
-    void (*reserved129)(void);
-    void (*reserved130)(void);
-    void (*reserved131)(void);
-    void (*reserved132)(void);
-    void (*reserved133)(void);
-    void (*reserved134)(void);
-    void (*reserved135)(void);
-    void (*reserved136)(void);
-    void (*reserved137)(void);
-    void (*reserved138)(void);
-    void (*reserved139)(void);
-    void (*reserved140)(void);
-    void (*reserved141)(void);
-    void (*reserved142)(void);
-    void (*reserved143)(void);
-    void (*reserved144)(void);
-    void (*reserved145)(void);
-    void (*reserved146)(void);
-    void (*reserved147)(void);
-    void (*reserved148)(void);
-    void (*reserved149)(void);
-    void (*reserved150)(void);
-    void (*reserved151)(void);
-    void (*reserved152)(void);
-    void (*reserved153)(void);
-    void (*reserved154)(void);
-    void (*reserved155)(void);
-    void (*reserved156)(void);
-    void (*reserved157)(void);
+    VOID *reserved92;
+    VOID *reserved93;
+    VOID *reserved94;
+    VOID *reserved95;
+    VOID *reserved96;
+    VOID *reserved97;
+    VOID *reserved98;
+    VOID *reserved99;
+    VOID *reserved100;
+    VOID *reserved101;
+    VOID *reserved102;
+    VOID *reserved103;
+    VOID *reserved104;
+    VOID *reserved105;
+    VOID *reserved106;
+    VOID *reserved107;
+    VOID *reserved108;
+    VOID *reserved109;
+    VOID *reserved110;
+    VOID *reserved111;
+    VOID *reserved112;
+    VOID *reserved113;
+    VOID *reserved114;
+    VOID *reserved115;
+    VOID *reserved116;
+    VOID *reserved117;
+    VOID *reserved118;
+    VOID *reserved119;
+    VOID *reserved120;
+    VOID *reserved121;
+    VOID *reserved122;
+    VOID *reserved123;
+    VOID *reserved124;
+    VOID *reserved125;
+    VOID *reserved126;
+    VOID *reserved127;
+    VOID *reserved128;
+    VOID *reserved129;
+    VOID *reserved130;
+    VOID *reserved131;
+    VOID *reserved132;
+    VOID *reserved133;
+    VOID *reserved134;
+    VOID *reserved135;
+    VOID *reserved136;
+    VOID *reserved137;
+    VOID *reserved138;
+    VOID *reserved139;
+    VOID *reserved140;
+    VOID *reserved141;
+    VOID *reserved142;
+    VOID *reserved143;
+    VOID *reserved144;
+    VOID *reserved145;
+    VOID *reserved146;
+    VOID *reserved147;
+    VOID *reserved148;
+    VOID *reserved149;
+    VOID *reserved150;
+    VOID *reserved151;
+    VOID *reserved152;
+    VOID *reserved153;
+    VOID *reserved154;
+    VOID *reserved155;
+    VOID *reserved156;
+    VOID *reserved157;
     void (*tkUnusedStubEntry) (void); /* 158 */
 #endif /* AQUA */
 } TkIntXlibStubs;
 
-extern const TkIntXlibStubs *tkIntXlibStubsPtr;
+extern TkIntXlibStubs *tkIntXlibStubsPtr;
 
 #ifdef __cplusplus
 }
 #endif
 
-#if defined(USE_TK_STUBS)
+#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
 
 /*
  * Inline function declarations:
  */
 
-#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
+#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
+#ifndef XSetDashes
 #define XSetDashes \
 	(tkIntXlibStubsPtr->xSetDashes) /* 0 */
+#endif
+#ifndef XGetModifierMapping
 #define XGetModifierMapping \
 	(tkIntXlibStubsPtr->xGetModifierMapping) /* 1 */
+#endif
+#ifndef XCreateImage
 #define XCreateImage \
 	(tkIntXlibStubsPtr->xCreateImage) /* 2 */
+#endif
+#ifndef XGetImage
 #define XGetImage \
 	(tkIntXlibStubsPtr->xGetImage) /* 3 */
+#endif
+#ifndef XGetAtomName
 #define XGetAtomName \
 	(tkIntXlibStubsPtr->xGetAtomName) /* 4 */
+#endif
+#ifndef XKeysymToString
 #define XKeysymToString \
 	(tkIntXlibStubsPtr->xKeysymToString) /* 5 */
+#endif
+#ifndef XCreateColormap
 #define XCreateColormap \
 	(tkIntXlibStubsPtr->xCreateColormap) /* 6 */
+#endif
+#ifndef XCreatePixmapCursor
 #define XCreatePixmapCursor \
 	(tkIntXlibStubsPtr->xCreatePixmapCursor) /* 7 */
+#endif
+#ifndef XCreateGlyphCursor
 #define XCreateGlyphCursor \
 	(tkIntXlibStubsPtr->xCreateGlyphCursor) /* 8 */
+#endif
+#ifndef XGContextFromGC
 #define XGContextFromGC \
 	(tkIntXlibStubsPtr->xGContextFromGC) /* 9 */
+#endif
+#ifndef XListHosts
 #define XListHosts \
 	(tkIntXlibStubsPtr->xListHosts) /* 10 */
+#endif
+#ifndef XKeycodeToKeysym
 #define XKeycodeToKeysym \
 	(tkIntXlibStubsPtr->xKeycodeToKeysym) /* 11 */
+#endif
+#ifndef XStringToKeysym
 #define XStringToKeysym \
 	(tkIntXlibStubsPtr->xStringToKeysym) /* 12 */
+#endif
+#ifndef XRootWindow
 #define XRootWindow \
 	(tkIntXlibStubsPtr->xRootWindow) /* 13 */
+#endif
+#ifndef XSetErrorHandler
 #define XSetErrorHandler \
 	(tkIntXlibStubsPtr->xSetErrorHandler) /* 14 */
+#endif
+#ifndef XIconifyWindow
 #define XIconifyWindow \
 	(tkIntXlibStubsPtr->xIconifyWindow) /* 15 */
+#endif
+#ifndef XWithdrawWindow
 #define XWithdrawWindow \
 	(tkIntXlibStubsPtr->xWithdrawWindow) /* 16 */
+#endif
+#ifndef XGetWMColormapWindows
 #define XGetWMColormapWindows \
 	(tkIntXlibStubsPtr->xGetWMColormapWindows) /* 17 */
+#endif
+#ifndef XAllocColor
 #define XAllocColor \
 	(tkIntXlibStubsPtr->xAllocColor) /* 18 */
+#endif
+#ifndef XBell
 #define XBell \
 	(tkIntXlibStubsPtr->xBell) /* 19 */
+#endif
+#ifndef XChangeProperty
 #define XChangeProperty \
 	(tkIntXlibStubsPtr->xChangeProperty) /* 20 */
+#endif
+#ifndef XChangeWindowAttributes
 #define XChangeWindowAttributes \
 	(tkIntXlibStubsPtr->xChangeWindowAttributes) /* 21 */
+#endif
+#ifndef XClearWindow
 #define XClearWindow \
 	(tkIntXlibStubsPtr->xClearWindow) /* 22 */
+#endif
+#ifndef XConfigureWindow
 #define XConfigureWindow \
 	(tkIntXlibStubsPtr->xConfigureWindow) /* 23 */
+#endif
+#ifndef XCopyArea
 #define XCopyArea \
 	(tkIntXlibStubsPtr->xCopyArea) /* 24 */
+#endif
+#ifndef XCopyPlane
 #define XCopyPlane \
 	(tkIntXlibStubsPtr->xCopyPlane) /* 25 */
+#endif
+#ifndef XCreateBitmapFromData
 #define XCreateBitmapFromData \
 	(tkIntXlibStubsPtr->xCreateBitmapFromData) /* 26 */
+#endif
+#ifndef XDefineCursor
 #define XDefineCursor \
 	(tkIntXlibStubsPtr->xDefineCursor) /* 27 */
+#endif
+#ifndef XDeleteProperty
 #define XDeleteProperty \
 	(tkIntXlibStubsPtr->xDeleteProperty) /* 28 */
+#endif
+#ifndef XDestroyWindow
 #define XDestroyWindow \
 	(tkIntXlibStubsPtr->xDestroyWindow) /* 29 */
+#endif
+#ifndef XDrawArc
 #define XDrawArc \
 	(tkIntXlibStubsPtr->xDrawArc) /* 30 */
+#endif
+#ifndef XDrawLines
 #define XDrawLines \
 	(tkIntXlibStubsPtr->xDrawLines) /* 31 */
+#endif
+#ifndef XDrawRectangle
 #define XDrawRectangle \
 	(tkIntXlibStubsPtr->xDrawRectangle) /* 32 */
+#endif
+#ifndef XFillArc
 #define XFillArc \
 	(tkIntXlibStubsPtr->xFillArc) /* 33 */
+#endif
+#ifndef XFillPolygon
 #define XFillPolygon \
 	(tkIntXlibStubsPtr->xFillPolygon) /* 34 */
+#endif
+#ifndef XFillRectangles
 #define XFillRectangles \
 	(tkIntXlibStubsPtr->xFillRectangles) /* 35 */
+#endif
+#ifndef XForceScreenSaver
 #define XForceScreenSaver \
 	(tkIntXlibStubsPtr->xForceScreenSaver) /* 36 */
+#endif
+#ifndef XFreeColormap
 #define XFreeColormap \
 	(tkIntXlibStubsPtr->xFreeColormap) /* 37 */
+#endif
+#ifndef XFreeColors
 #define XFreeColors \
 	(tkIntXlibStubsPtr->xFreeColors) /* 38 */
+#endif
+#ifndef XFreeCursor
 #define XFreeCursor \
 	(tkIntXlibStubsPtr->xFreeCursor) /* 39 */
+#endif
+#ifndef XFreeModifiermap
 #define XFreeModifiermap \
 	(tkIntXlibStubsPtr->xFreeModifiermap) /* 40 */
+#endif
+#ifndef XGetGeometry
 #define XGetGeometry \
 	(tkIntXlibStubsPtr->xGetGeometry) /* 41 */
+#endif
+#ifndef XGetInputFocus
 #define XGetInputFocus \
 	(tkIntXlibStubsPtr->xGetInputFocus) /* 42 */
+#endif
+#ifndef XGetWindowProperty
 #define XGetWindowProperty \
 	(tkIntXlibStubsPtr->xGetWindowProperty) /* 43 */
+#endif
+#ifndef XGetWindowAttributes
 #define XGetWindowAttributes \
 	(tkIntXlibStubsPtr->xGetWindowAttributes) /* 44 */
+#endif
+#ifndef XGrabKeyboard
 #define XGrabKeyboard \
 	(tkIntXlibStubsPtr->xGrabKeyboard) /* 45 */
+#endif
+#ifndef XGrabPointer
 #define XGrabPointer \
 	(tkIntXlibStubsPtr->xGrabPointer) /* 46 */
+#endif
+#ifndef XKeysymToKeycode
 #define XKeysymToKeycode \
 	(tkIntXlibStubsPtr->xKeysymToKeycode) /* 47 */
+#endif
+#ifndef XLookupColor
 #define XLookupColor \
 	(tkIntXlibStubsPtr->xLookupColor) /* 48 */
+#endif
+#ifndef XMapWindow
 #define XMapWindow \
 	(tkIntXlibStubsPtr->xMapWindow) /* 49 */
+#endif
+#ifndef XMoveResizeWindow
 #define XMoveResizeWindow \
 	(tkIntXlibStubsPtr->xMoveResizeWindow) /* 50 */
+#endif
+#ifndef XMoveWindow
 #define XMoveWindow \
 	(tkIntXlibStubsPtr->xMoveWindow) /* 51 */
+#endif
+#ifndef XNextEvent
 #define XNextEvent \
 	(tkIntXlibStubsPtr->xNextEvent) /* 52 */
+#endif
+#ifndef XPutBackEvent
 #define XPutBackEvent \
 	(tkIntXlibStubsPtr->xPutBackEvent) /* 53 */
+#endif
+#ifndef XQueryColors
 #define XQueryColors \
 	(tkIntXlibStubsPtr->xQueryColors) /* 54 */
+#endif
+#ifndef XQueryPointer
 #define XQueryPointer \
 	(tkIntXlibStubsPtr->xQueryPointer) /* 55 */
+#endif
+#ifndef XQueryTree
 #define XQueryTree \
 	(tkIntXlibStubsPtr->xQueryTree) /* 56 */
+#endif
+#ifndef XRaiseWindow
 #define XRaiseWindow \
 	(tkIntXlibStubsPtr->xRaiseWindow) /* 57 */
+#endif
+#ifndef XRefreshKeyboardMapping
 #define XRefreshKeyboardMapping \
 	(tkIntXlibStubsPtr->xRefreshKeyboardMapping) /* 58 */
+#endif
+#ifndef XResizeWindow
 #define XResizeWindow \
 	(tkIntXlibStubsPtr->xResizeWindow) /* 59 */
+#endif
+#ifndef XSelectInput
 #define XSelectInput \
 	(tkIntXlibStubsPtr->xSelectInput) /* 60 */
+#endif
+#ifndef XSendEvent
 #define XSendEvent \
 	(tkIntXlibStubsPtr->xSendEvent) /* 61 */
+#endif
+#ifndef XSetCommand
 #define XSetCommand \
 	(tkIntXlibStubsPtr->xSetCommand) /* 62 */
+#endif
+#ifndef XSetIconName
 #define XSetIconName \
 	(tkIntXlibStubsPtr->xSetIconName) /* 63 */
+#endif
+#ifndef XSetInputFocus
 #define XSetInputFocus \
 	(tkIntXlibStubsPtr->xSetInputFocus) /* 64 */
+#endif
+#ifndef XSetSelectionOwner
 #define XSetSelectionOwner \
 	(tkIntXlibStubsPtr->xSetSelectionOwner) /* 65 */
+#endif
+#ifndef XSetWindowBackground
 #define XSetWindowBackground \
 	(tkIntXlibStubsPtr->xSetWindowBackground) /* 66 */
+#endif
+#ifndef XSetWindowBackgroundPixmap
 #define XSetWindowBackgroundPixmap \
 	(tkIntXlibStubsPtr->xSetWindowBackgroundPixmap) /* 67 */
+#endif
+#ifndef XSetWindowBorder
 #define XSetWindowBorder \
 	(tkIntXlibStubsPtr->xSetWindowBorder) /* 68 */
+#endif
+#ifndef XSetWindowBorderPixmap
 #define XSetWindowBorderPixmap \
 	(tkIntXlibStubsPtr->xSetWindowBorderPixmap) /* 69 */
+#endif
+#ifndef XSetWindowBorderWidth
 #define XSetWindowBorderWidth \
 	(tkIntXlibStubsPtr->xSetWindowBorderWidth) /* 70 */
+#endif
+#ifndef XSetWindowColormap
 #define XSetWindowColormap \
 	(tkIntXlibStubsPtr->xSetWindowColormap) /* 71 */
+#endif
+#ifndef XTranslateCoordinates
 #define XTranslateCoordinates \
 	(tkIntXlibStubsPtr->xTranslateCoordinates) /* 72 */
+#endif
+#ifndef XUngrabKeyboard
 #define XUngrabKeyboard \
 	(tkIntXlibStubsPtr->xUngrabKeyboard) /* 73 */
+#endif
+#ifndef XUngrabPointer
 #define XUngrabPointer \
 	(tkIntXlibStubsPtr->xUngrabPointer) /* 74 */
+#endif
+#ifndef XUnmapWindow
 #define XUnmapWindow \
 	(tkIntXlibStubsPtr->xUnmapWindow) /* 75 */
+#endif
+#ifndef XWindowEvent
 #define XWindowEvent \
 	(tkIntXlibStubsPtr->xWindowEvent) /* 76 */
+#endif
+#ifndef XDestroyIC
 #define XDestroyIC \
 	(tkIntXlibStubsPtr->xDestroyIC) /* 77 */
+#endif
+#ifndef XFilterEvent
 #define XFilterEvent \
 	(tkIntXlibStubsPtr->xFilterEvent) /* 78 */
+#endif
+#ifndef XmbLookupString
 #define XmbLookupString \
 	(tkIntXlibStubsPtr->xmbLookupString) /* 79 */
+#endif
+#ifndef TkPutImage
 #define TkPutImage \
 	(tkIntXlibStubsPtr->tkPutImage) /* 80 */
+#endif
 /* Slot 81 is reserved */
+#ifndef XParseColor
 #define XParseColor \
 	(tkIntXlibStubsPtr->xParseColor) /* 82 */
+#endif
+#ifndef XCreateGC
 #define XCreateGC \
 	(tkIntXlibStubsPtr->xCreateGC) /* 83 */
+#endif
+#ifndef XFreeGC
 #define XFreeGC \
 	(tkIntXlibStubsPtr->xFreeGC) /* 84 */
+#endif
+#ifndef XInternAtom
 #define XInternAtom \
 	(tkIntXlibStubsPtr->xInternAtom) /* 85 */
+#endif
+#ifndef XSetBackground
 #define XSetBackground \
 	(tkIntXlibStubsPtr->xSetBackground) /* 86 */
+#endif
+#ifndef XSetForeground
 #define XSetForeground \
 	(tkIntXlibStubsPtr->xSetForeground) /* 87 */
+#endif
+#ifndef XSetClipMask
 #define XSetClipMask \
 	(tkIntXlibStubsPtr->xSetClipMask) /* 88 */
+#endif
+#ifndef XSetClipOrigin
 #define XSetClipOrigin \
 	(tkIntXlibStubsPtr->xSetClipOrigin) /* 89 */
+#endif
+#ifndef XSetTSOrigin
 #define XSetTSOrigin \
 	(tkIntXlibStubsPtr->xSetTSOrigin) /* 90 */
+#endif
+#ifndef XChangeGC
 #define XChangeGC \
 	(tkIntXlibStubsPtr->xChangeGC) /* 91 */
+#endif
+#ifndef XSetFont
 #define XSetFont \
 	(tkIntXlibStubsPtr->xSetFont) /* 92 */
+#endif
+#ifndef XSetArcMode
 #define XSetArcMode \
 	(tkIntXlibStubsPtr->xSetArcMode) /* 93 */
+#endif
+#ifndef XSetStipple
 #define XSetStipple \
 	(tkIntXlibStubsPtr->xSetStipple) /* 94 */
+#endif
+#ifndef XSetFillRule
 #define XSetFillRule \
 	(tkIntXlibStubsPtr->xSetFillRule) /* 95 */
+#endif
+#ifndef XSetFillStyle
 #define XSetFillStyle \
 	(tkIntXlibStubsPtr->xSetFillStyle) /* 96 */
+#endif
+#ifndef XSetFunction
 #define XSetFunction \
 	(tkIntXlibStubsPtr->xSetFunction) /* 97 */
+#endif
+#ifndef XSetLineAttributes
 #define XSetLineAttributes \
 	(tkIntXlibStubsPtr->xSetLineAttributes) /* 98 */
+#endif
+#ifndef _XInitImageFuncPtrs
 #define _XInitImageFuncPtrs \
 	(tkIntXlibStubsPtr->_XInitImageFuncPtrs) /* 99 */
+#endif
+#ifndef XCreateIC
 #define XCreateIC \
 	(tkIntXlibStubsPtr->xCreateIC) /* 100 */
+#endif
+#ifndef XGetVisualInfo
 #define XGetVisualInfo \
 	(tkIntXlibStubsPtr->xGetVisualInfo) /* 101 */
+#endif
+#ifndef XSetWMClientMachine
 #define XSetWMClientMachine \
 	(tkIntXlibStubsPtr->xSetWMClientMachine) /* 102 */
+#endif
+#ifndef XStringListToTextProperty
 #define XStringListToTextProperty \
 	(tkIntXlibStubsPtr->xStringListToTextProperty) /* 103 */
+#endif
+#ifndef XDrawLine
 #define XDrawLine \
 	(tkIntXlibStubsPtr->xDrawLine) /* 104 */
+#endif
+#ifndef XWarpPointer
 #define XWarpPointer \
 	(tkIntXlibStubsPtr->xWarpPointer) /* 105 */
+#endif
+#ifndef XFillRectangle
 #define XFillRectangle \
 	(tkIntXlibStubsPtr->xFillRectangle) /* 106 */
+#endif
+#ifndef XFlush
 #define XFlush \
 	(tkIntXlibStubsPtr->xFlush) /* 107 */
+#endif
+#ifndef XGrabServer
 #define XGrabServer \
 	(tkIntXlibStubsPtr->xGrabServer) /* 108 */
+#endif
+#ifndef XUngrabServer
 #define XUngrabServer \
 	(tkIntXlibStubsPtr->xUngrabServer) /* 109 */
+#endif
+#ifndef XFree
 #define XFree \
 	(tkIntXlibStubsPtr->xFree) /* 110 */
+#endif
+#ifndef XNoOp
 #define XNoOp \
 	(tkIntXlibStubsPtr->xNoOp) /* 111 */
+#endif
+#ifndef XSynchronize
 #define XSynchronize \
 	(tkIntXlibStubsPtr->xSynchronize) /* 112 */
+#endif
+#ifndef XSync
 #define XSync \
 	(tkIntXlibStubsPtr->xSync) /* 113 */
+#endif
+#ifndef XVisualIDFromVisual
 #define XVisualIDFromVisual \
 	(tkIntXlibStubsPtr->xVisualIDFromVisual) /* 114 */
+#endif
 /* Slot 115 is reserved */
 /* Slot 116 is reserved */
 /* Slot 117 is reserved */
@@ -1329,12 +2190,18 @@ extern const TkIntXlibStubs *tkIntXlibStubsPtr;
 /* Slot 130 is reserved */
 /* Slot 131 is reserved */
 /* Slot 132 is reserved */
+#ifndef XDrawSegments
 #define XDrawSegments \
 	(tkIntXlibStubsPtr->xDrawSegments) /* 133 */
+#endif
+#ifndef XDrawPoint
 #define XDrawPoint \
 	(tkIntXlibStubsPtr->xDrawPoint) /* 134 */
+#endif
+#ifndef XDrawPoints
 #define XDrawPoints \
 	(tkIntXlibStubsPtr->xDrawPoints) /* 135 */
+#endif
 /* Slot 136 is reserved */
 /* Slot 137 is reserved */
 /* Slot 138 is reserved */
@@ -1357,194 +2224,380 @@ extern const TkIntXlibStubs *tkIntXlibStubsPtr;
 /* Slot 155 is reserved */
 /* Slot 156 is reserved */
 /* Slot 157 is reserved */
+#ifndef TkUnusedStubEntry
 #define TkUnusedStubEntry \
 	(tkIntXlibStubsPtr->tkUnusedStubEntry) /* 158 */
+#endif
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
+#ifndef XSetDashes
 #define XSetDashes \
 	(tkIntXlibStubsPtr->xSetDashes) /* 0 */
+#endif
+#ifndef XGetModifierMapping
 #define XGetModifierMapping \
 	(tkIntXlibStubsPtr->xGetModifierMapping) /* 1 */
+#endif
+#ifndef XCreateImage
 #define XCreateImage \
 	(tkIntXlibStubsPtr->xCreateImage) /* 2 */
+#endif
+#ifndef XGetImage
 #define XGetImage \
 	(tkIntXlibStubsPtr->xGetImage) /* 3 */
+#endif
+#ifndef XGetAtomName
 #define XGetAtomName \
 	(tkIntXlibStubsPtr->xGetAtomName) /* 4 */
+#endif
+#ifndef XKeysymToString
 #define XKeysymToString \
 	(tkIntXlibStubsPtr->xKeysymToString) /* 5 */
+#endif
+#ifndef XCreateColormap
 #define XCreateColormap \
 	(tkIntXlibStubsPtr->xCreateColormap) /* 6 */
+#endif
+#ifndef XGContextFromGC
 #define XGContextFromGC \
 	(tkIntXlibStubsPtr->xGContextFromGC) /* 7 */
+#endif
+#ifndef XKeycodeToKeysym
 #define XKeycodeToKeysym \
 	(tkIntXlibStubsPtr->xKeycodeToKeysym) /* 8 */
+#endif
+#ifndef XStringToKeysym
 #define XStringToKeysym \
 	(tkIntXlibStubsPtr->xStringToKeysym) /* 9 */
+#endif
+#ifndef XRootWindow
 #define XRootWindow \
 	(tkIntXlibStubsPtr->xRootWindow) /* 10 */
+#endif
+#ifndef XSetErrorHandler
 #define XSetErrorHandler \
 	(tkIntXlibStubsPtr->xSetErrorHandler) /* 11 */
+#endif
+#ifndef XAllocColor
 #define XAllocColor \
 	(tkIntXlibStubsPtr->xAllocColor) /* 12 */
+#endif
+#ifndef XBell
 #define XBell \
 	(tkIntXlibStubsPtr->xBell) /* 13 */
+#endif
+#ifndef XChangeProperty
 #define XChangeProperty \
 	(tkIntXlibStubsPtr->xChangeProperty) /* 14 */
+#endif
+#ifndef XChangeWindowAttributes
 #define XChangeWindowAttributes \
 	(tkIntXlibStubsPtr->xChangeWindowAttributes) /* 15 */
+#endif
+#ifndef XConfigureWindow
 #define XConfigureWindow \
 	(tkIntXlibStubsPtr->xConfigureWindow) /* 16 */
+#endif
+#ifndef XCopyArea
 #define XCopyArea \
 	(tkIntXlibStubsPtr->xCopyArea) /* 17 */
+#endif
+#ifndef XCopyPlane
 #define XCopyPlane \
 	(tkIntXlibStubsPtr->xCopyPlane) /* 18 */
+#endif
+#ifndef XCreateBitmapFromData
 #define XCreateBitmapFromData \
 	(tkIntXlibStubsPtr->xCreateBitmapFromData) /* 19 */
+#endif
+#ifndef XDefineCursor
 #define XDefineCursor \
 	(tkIntXlibStubsPtr->xDefineCursor) /* 20 */
+#endif
+#ifndef XDestroyWindow
 #define XDestroyWindow \
 	(tkIntXlibStubsPtr->xDestroyWindow) /* 21 */
+#endif
+#ifndef XDrawArc
 #define XDrawArc \
 	(tkIntXlibStubsPtr->xDrawArc) /* 22 */
+#endif
+#ifndef XDrawLines
 #define XDrawLines \
 	(tkIntXlibStubsPtr->xDrawLines) /* 23 */
+#endif
+#ifndef XDrawRectangle
 #define XDrawRectangle \
 	(tkIntXlibStubsPtr->xDrawRectangle) /* 24 */
+#endif
+#ifndef XFillArc
 #define XFillArc \
 	(tkIntXlibStubsPtr->xFillArc) /* 25 */
+#endif
+#ifndef XFillPolygon
 #define XFillPolygon \
 	(tkIntXlibStubsPtr->xFillPolygon) /* 26 */
+#endif
+#ifndef XFillRectangles
 #define XFillRectangles \
 	(tkIntXlibStubsPtr->xFillRectangles) /* 27 */
+#endif
+#ifndef XFreeColormap
 #define XFreeColormap \
 	(tkIntXlibStubsPtr->xFreeColormap) /* 28 */
+#endif
+#ifndef XFreeColors
 #define XFreeColors \
 	(tkIntXlibStubsPtr->xFreeColors) /* 29 */
+#endif
+#ifndef XFreeModifiermap
 #define XFreeModifiermap \
 	(tkIntXlibStubsPtr->xFreeModifiermap) /* 30 */
+#endif
+#ifndef XGetGeometry
 #define XGetGeometry \
 	(tkIntXlibStubsPtr->xGetGeometry) /* 31 */
+#endif
+#ifndef XGetWindowProperty
 #define XGetWindowProperty \
 	(tkIntXlibStubsPtr->xGetWindowProperty) /* 32 */
+#endif
+#ifndef XGrabKeyboard
 #define XGrabKeyboard \
 	(tkIntXlibStubsPtr->xGrabKeyboard) /* 33 */
+#endif
+#ifndef XGrabPointer
 #define XGrabPointer \
 	(tkIntXlibStubsPtr->xGrabPointer) /* 34 */
+#endif
+#ifndef XKeysymToKeycode
 #define XKeysymToKeycode \
 	(tkIntXlibStubsPtr->xKeysymToKeycode) /* 35 */
+#endif
+#ifndef XMapWindow
 #define XMapWindow \
 	(tkIntXlibStubsPtr->xMapWindow) /* 36 */
+#endif
+#ifndef XMoveResizeWindow
 #define XMoveResizeWindow \
 	(tkIntXlibStubsPtr->xMoveResizeWindow) /* 37 */
+#endif
+#ifndef XMoveWindow
 #define XMoveWindow \
 	(tkIntXlibStubsPtr->xMoveWindow) /* 38 */
+#endif
+#ifndef XQueryPointer
 #define XQueryPointer \
 	(tkIntXlibStubsPtr->xQueryPointer) /* 39 */
+#endif
+#ifndef XRaiseWindow
 #define XRaiseWindow \
 	(tkIntXlibStubsPtr->xRaiseWindow) /* 40 */
+#endif
+#ifndef XRefreshKeyboardMapping
 #define XRefreshKeyboardMapping \
 	(tkIntXlibStubsPtr->xRefreshKeyboardMapping) /* 41 */
+#endif
+#ifndef XResizeWindow
 #define XResizeWindow \
 	(tkIntXlibStubsPtr->xResizeWindow) /* 42 */
+#endif
+#ifndef XSelectInput
 #define XSelectInput \
 	(tkIntXlibStubsPtr->xSelectInput) /* 43 */
+#endif
+#ifndef XSendEvent
 #define XSendEvent \
 	(tkIntXlibStubsPtr->xSendEvent) /* 44 */
+#endif
+#ifndef XSetIconName
 #define XSetIconName \
 	(tkIntXlibStubsPtr->xSetIconName) /* 45 */
+#endif
+#ifndef XSetInputFocus
 #define XSetInputFocus \
 	(tkIntXlibStubsPtr->xSetInputFocus) /* 46 */
+#endif
+#ifndef XSetSelectionOwner
 #define XSetSelectionOwner \
 	(tkIntXlibStubsPtr->xSetSelectionOwner) /* 47 */
+#endif
+#ifndef XSetWindowBackground
 #define XSetWindowBackground \
 	(tkIntXlibStubsPtr->xSetWindowBackground) /* 48 */
+#endif
+#ifndef XSetWindowBackgroundPixmap
 #define XSetWindowBackgroundPixmap \
 	(tkIntXlibStubsPtr->xSetWindowBackgroundPixmap) /* 49 */
+#endif
+#ifndef XSetWindowBorder
 #define XSetWindowBorder \
 	(tkIntXlibStubsPtr->xSetWindowBorder) /* 50 */
+#endif
+#ifndef XSetWindowBorderPixmap
 #define XSetWindowBorderPixmap \
 	(tkIntXlibStubsPtr->xSetWindowBorderPixmap) /* 51 */
+#endif
+#ifndef XSetWindowBorderWidth
 #define XSetWindowBorderWidth \
 	(tkIntXlibStubsPtr->xSetWindowBorderWidth) /* 52 */
+#endif
+#ifndef XSetWindowColormap
 #define XSetWindowColormap \
 	(tkIntXlibStubsPtr->xSetWindowColormap) /* 53 */
+#endif
+#ifndef XUngrabKeyboard
 #define XUngrabKeyboard \
 	(tkIntXlibStubsPtr->xUngrabKeyboard) /* 54 */
+#endif
+#ifndef XUngrabPointer
 #define XUngrabPointer \
 	(tkIntXlibStubsPtr->xUngrabPointer) /* 55 */
+#endif
+#ifndef XUnmapWindow
 #define XUnmapWindow \
 	(tkIntXlibStubsPtr->xUnmapWindow) /* 56 */
+#endif
+#ifndef TkPutImage
 #define TkPutImage \
 	(tkIntXlibStubsPtr->tkPutImage) /* 57 */
+#endif
+#ifndef XParseColor
 #define XParseColor \
 	(tkIntXlibStubsPtr->xParseColor) /* 58 */
+#endif
+#ifndef XCreateGC
 #define XCreateGC \
 	(tkIntXlibStubsPtr->xCreateGC) /* 59 */
+#endif
+#ifndef XFreeGC
 #define XFreeGC \
 	(tkIntXlibStubsPtr->xFreeGC) /* 60 */
+#endif
+#ifndef XInternAtom
 #define XInternAtom \
 	(tkIntXlibStubsPtr->xInternAtom) /* 61 */
+#endif
+#ifndef XSetBackground
 #define XSetBackground \
 	(tkIntXlibStubsPtr->xSetBackground) /* 62 */
+#endif
+#ifndef XSetForeground
 #define XSetForeground \
 	(tkIntXlibStubsPtr->xSetForeground) /* 63 */
+#endif
+#ifndef XSetClipMask
 #define XSetClipMask \
 	(tkIntXlibStubsPtr->xSetClipMask) /* 64 */
+#endif
+#ifndef XSetClipOrigin
 #define XSetClipOrigin \
 	(tkIntXlibStubsPtr->xSetClipOrigin) /* 65 */
+#endif
+#ifndef XSetTSOrigin
 #define XSetTSOrigin \
 	(tkIntXlibStubsPtr->xSetTSOrigin) /* 66 */
+#endif
+#ifndef XChangeGC
 #define XChangeGC \
 	(tkIntXlibStubsPtr->xChangeGC) /* 67 */
+#endif
+#ifndef XSetFont
 #define XSetFont \
 	(tkIntXlibStubsPtr->xSetFont) /* 68 */
+#endif
+#ifndef XSetArcMode
 #define XSetArcMode \
 	(tkIntXlibStubsPtr->xSetArcMode) /* 69 */
+#endif
+#ifndef XSetStipple
 #define XSetStipple \
 	(tkIntXlibStubsPtr->xSetStipple) /* 70 */
+#endif
+#ifndef XSetFillRule
 #define XSetFillRule \
 	(tkIntXlibStubsPtr->xSetFillRule) /* 71 */
+#endif
+#ifndef XSetFillStyle
 #define XSetFillStyle \
 	(tkIntXlibStubsPtr->xSetFillStyle) /* 72 */
+#endif
+#ifndef XSetFunction
 #define XSetFunction \
 	(tkIntXlibStubsPtr->xSetFunction) /* 73 */
+#endif
+#ifndef XSetLineAttributes
 #define XSetLineAttributes \
 	(tkIntXlibStubsPtr->xSetLineAttributes) /* 74 */
+#endif
+#ifndef _XInitImageFuncPtrs
 #define _XInitImageFuncPtrs \
 	(tkIntXlibStubsPtr->_XInitImageFuncPtrs) /* 75 */
+#endif
+#ifndef XCreateIC
 #define XCreateIC \
 	(tkIntXlibStubsPtr->xCreateIC) /* 76 */
+#endif
+#ifndef XGetVisualInfo
 #define XGetVisualInfo \
 	(tkIntXlibStubsPtr->xGetVisualInfo) /* 77 */
+#endif
+#ifndef XSetWMClientMachine
 #define XSetWMClientMachine \
 	(tkIntXlibStubsPtr->xSetWMClientMachine) /* 78 */
+#endif
+#ifndef XStringListToTextProperty
 #define XStringListToTextProperty \
 	(tkIntXlibStubsPtr->xStringListToTextProperty) /* 79 */
+#endif
+#ifndef XDrawSegments
 #define XDrawSegments \
 	(tkIntXlibStubsPtr->xDrawSegments) /* 80 */
+#endif
+#ifndef XForceScreenSaver
 #define XForceScreenSaver \
 	(tkIntXlibStubsPtr->xForceScreenSaver) /* 81 */
+#endif
+#ifndef XDrawLine
 #define XDrawLine \
 	(tkIntXlibStubsPtr->xDrawLine) /* 82 */
+#endif
+#ifndef XFillRectangle
 #define XFillRectangle \
 	(tkIntXlibStubsPtr->xFillRectangle) /* 83 */
+#endif
+#ifndef XClearWindow
 #define XClearWindow \
 	(tkIntXlibStubsPtr->xClearWindow) /* 84 */
+#endif
+#ifndef XDrawPoint
 #define XDrawPoint \
 	(tkIntXlibStubsPtr->xDrawPoint) /* 85 */
+#endif
+#ifndef XDrawPoints
 #define XDrawPoints \
 	(tkIntXlibStubsPtr->xDrawPoints) /* 86 */
+#endif
+#ifndef XWarpPointer
 #define XWarpPointer \
 	(tkIntXlibStubsPtr->xWarpPointer) /* 87 */
+#endif
+#ifndef XQueryColor
 #define XQueryColor \
 	(tkIntXlibStubsPtr->xQueryColor) /* 88 */
+#endif
+#ifndef XQueryColors
 #define XQueryColors \
 	(tkIntXlibStubsPtr->xQueryColors) /* 89 */
+#endif
+#ifndef XQueryTree
 #define XQueryTree \
 	(tkIntXlibStubsPtr->xQueryTree) /* 90 */
+#endif
+#ifndef XSync
 #define XSync \
 	(tkIntXlibStubsPtr->xSync) /* 91 */
+#endif
 /* Slot 92 is reserved */
 /* Slot 93 is reserved */
 /* Slot 94 is reserved */
@@ -1611,11 +2664,13 @@ extern const TkIntXlibStubs *tkIntXlibStubsPtr;
 /* Slot 155 is reserved */
 /* Slot 156 is reserved */
 /* Slot 157 is reserved */
+#ifndef TkUnusedStubEntry
 #define TkUnusedStubEntry \
 	(tkIntXlibStubsPtr->tkUnusedStubEntry) /* 158 */
+#endif
 #endif /* AQUA */
 
-#endif /* defined(USE_TK_STUBS) */
+#endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
 
 /* !END!: Do not edit above this line. */
 
diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h
index b6c7920..9112f58 100644
--- a/generic/tkPlatDecls.h
+++ b/generic/tkPlatDecls.h
@@ -33,23 +33,43 @@ extern "C" {
  * Exported function declarations:
  */
 
-#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
+#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
+#ifndef Tk_AttachHWND_TCL_DECLARED
+#define Tk_AttachHWND_TCL_DECLARED
 /* 0 */
 EXTERN Window		Tk_AttachHWND(Tk_Window tkwin, HWND hwnd);
+#endif
+#ifndef Tk_GetHINSTANCE_TCL_DECLARED
+#define Tk_GetHINSTANCE_TCL_DECLARED
 /* 1 */
 EXTERN HINSTANCE	Tk_GetHINSTANCE(void);
+#endif
+#ifndef Tk_GetHWND_TCL_DECLARED
+#define Tk_GetHWND_TCL_DECLARED
 /* 2 */
 EXTERN HWND		Tk_GetHWND(Window window);
+#endif
+#ifndef Tk_HWNDToWindow_TCL_DECLARED
+#define Tk_HWNDToWindow_TCL_DECLARED
 /* 3 */
 EXTERN Tk_Window	Tk_HWNDToWindow(HWND hwnd);
+#endif
+#ifndef Tk_PointerEvent_TCL_DECLARED
+#define Tk_PointerEvent_TCL_DECLARED
 /* 4 */
 EXTERN void		Tk_PointerEvent(HWND hwnd, int x, int y);
+#endif
+#ifndef Tk_TranslateWinEvent_TCL_DECLARED
+#define Tk_TranslateWinEvent_TCL_DECLARED
 /* 5 */
 EXTERN int		Tk_TranslateWinEvent(HWND hwnd, UINT message,
 				WPARAM wParam, LPARAM lParam,
 				LRESULT *result);
+#endif
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
+#ifndef Tk_MacOSXSetEmbedHandler_TCL_DECLARED
+#define Tk_MacOSXSetEmbedHandler_TCL_DECLARED
 /* 0 */
 EXTERN void		Tk_MacOSXSetEmbedHandler(
 				Tk_MacOSXEmbedRegisterWinProc *registerWinProcPtr,
@@ -57,41 +77,75 @@ EXTERN void		Tk_MacOSXSetEmbedHandler(
 				Tk_MacOSXEmbedMakeContainerExistProc *containerExistProcPtr,
 				Tk_MacOSXEmbedGetClipProc *getClipProc,
 				Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc);
+#endif
+#ifndef Tk_MacOSXTurnOffMenus_TCL_DECLARED
+#define Tk_MacOSXTurnOffMenus_TCL_DECLARED
 /* 1 */
 EXTERN void		Tk_MacOSXTurnOffMenus(void);
+#endif
+#ifndef Tk_MacOSXTkOwnsCursor_TCL_DECLARED
+#define Tk_MacOSXTkOwnsCursor_TCL_DECLARED
 /* 2 */
 EXTERN void		Tk_MacOSXTkOwnsCursor(int tkOwnsIt);
+#endif
+#ifndef TkMacOSXInitMenus_TCL_DECLARED
+#define TkMacOSXInitMenus_TCL_DECLARED
 /* 3 */
 EXTERN void		TkMacOSXInitMenus(Tcl_Interp *interp);
+#endif
+#ifndef TkMacOSXInitAppleEvents_TCL_DECLARED
+#define TkMacOSXInitAppleEvents_TCL_DECLARED
 /* 4 */
 EXTERN void		TkMacOSXInitAppleEvents(Tcl_Interp *interp);
+#endif
+#ifndef TkGenWMConfigureEvent_TCL_DECLARED
+#define TkGenWMConfigureEvent_TCL_DECLARED
 /* 5 */
 EXTERN void		TkGenWMConfigureEvent(Tk_Window tkwin, int x, int y,
 				int width, int height, int flags);
+#endif
+#ifndef TkMacOSXInvalClipRgns_TCL_DECLARED
+#define TkMacOSXInvalClipRgns_TCL_DECLARED
 /* 6 */
 EXTERN void		TkMacOSXInvalClipRgns(Tk_Window tkwin);
+#endif
+#ifndef TkMacOSXGetDrawablePort_TCL_DECLARED
+#define TkMacOSXGetDrawablePort_TCL_DECLARED
 /* 7 */
-EXTERN void *		TkMacOSXGetDrawablePort(Drawable drawable);
+EXTERN VOID *		TkMacOSXGetDrawablePort(Drawable drawable);
+#endif
+#ifndef TkMacOSXGetRootControl_TCL_DECLARED
+#define TkMacOSXGetRootControl_TCL_DECLARED
 /* 8 */
-EXTERN void *		TkMacOSXGetRootControl(Drawable drawable);
+EXTERN VOID *		TkMacOSXGetRootControl(Drawable drawable);
+#endif
+#ifndef Tk_MacOSXSetupTkNotifier_TCL_DECLARED
+#define Tk_MacOSXSetupTkNotifier_TCL_DECLARED
 /* 9 */
 EXTERN void		Tk_MacOSXSetupTkNotifier(void);
+#endif
+#ifndef Tk_MacOSXIsAppInFront_TCL_DECLARED
+#define Tk_MacOSXIsAppInFront_TCL_DECLARED
 /* 10 */
 EXTERN int		Tk_MacOSXIsAppInFront(void);
+#endif
 /* Slot 11 is reserved */
 /* Slot 12 is reserved */
 /* Slot 13 is reserved */
 /* Slot 14 is reserved */
 /* Slot 15 is reserved */
+#ifndef TkUnusedStubEntry_TCL_DECLARED
+#define TkUnusedStubEntry_TCL_DECLARED
 /* 16 */
 EXTERN void		TkUnusedStubEntry(void);
+#endif
 #endif /* AQUA */
 
 typedef struct TkPlatStubs {
     int magic;
-    void *hooks;
+    struct TkPlatStubHooks *hooks;
 
-#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
+#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
     Window (*tk_AttachHWND) (Tk_Window tkwin, HWND hwnd); /* 0 */
     HINSTANCE (*tk_GetHINSTANCE) (void); /* 1 */
     HWND (*tk_GetHWND) (Window window); /* 2 */
@@ -107,78 +161,114 @@ typedef struct TkPlatStubs {
     void (*tkMacOSXInitAppleEvents) (Tcl_Interp *interp); /* 4 */
     void (*tkGenWMConfigureEvent) (Tk_Window tkwin, int x, int y, int width, int height, int flags); /* 5 */
     void (*tkMacOSXInvalClipRgns) (Tk_Window tkwin); /* 6 */
-    void * (*tkMacOSXGetDrawablePort) (Drawable drawable); /* 7 */
-    void * (*tkMacOSXGetRootControl) (Drawable drawable); /* 8 */
+    VOID * (*tkMacOSXGetDrawablePort) (Drawable drawable); /* 7 */
+    VOID * (*tkMacOSXGetRootControl) (Drawable drawable); /* 8 */
     void (*tk_MacOSXSetupTkNotifier) (void); /* 9 */
     int (*tk_MacOSXIsAppInFront) (void); /* 10 */
-    void (*reserved11)(void);
-    void (*reserved12)(void);
-    void (*reserved13)(void);
-    void (*reserved14)(void);
-    void (*reserved15)(void);
+    VOID *reserved11;
+    VOID *reserved12;
+    VOID *reserved13;
+    VOID *reserved14;
+    VOID *reserved15;
     void (*tkUnusedStubEntry) (void); /* 16 */
 #endif /* AQUA */
 } TkPlatStubs;
 
-extern const TkPlatStubs *tkPlatStubsPtr;
+extern TkPlatStubs *tkPlatStubsPtr;
 
 #ifdef __cplusplus
 }
 #endif
 
-#if defined(USE_TK_STUBS)
+#if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS)
 
 /*
  * Inline function declarations:
  */
 
-#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
+#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
+#ifndef Tk_AttachHWND
 #define Tk_AttachHWND \
 	(tkPlatStubsPtr->tk_AttachHWND) /* 0 */
+#endif
+#ifndef Tk_GetHINSTANCE
 #define Tk_GetHINSTANCE \
 	(tkPlatStubsPtr->tk_GetHINSTANCE) /* 1 */
+#endif
+#ifndef Tk_GetHWND
 #define Tk_GetHWND \
 	(tkPlatStubsPtr->tk_GetHWND) /* 2 */
+#endif
+#ifndef Tk_HWNDToWindow
 #define Tk_HWNDToWindow \
 	(tkPlatStubsPtr->tk_HWNDToWindow) /* 3 */
+#endif
+#ifndef Tk_PointerEvent
 #define Tk_PointerEvent \
 	(tkPlatStubsPtr->tk_PointerEvent) /* 4 */
+#endif
+#ifndef Tk_TranslateWinEvent
 #define Tk_TranslateWinEvent \
 	(tkPlatStubsPtr->tk_TranslateWinEvent) /* 5 */
+#endif
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
+#ifndef Tk_MacOSXSetEmbedHandler
 #define Tk_MacOSXSetEmbedHandler \
 	(tkPlatStubsPtr->tk_MacOSXSetEmbedHandler) /* 0 */
+#endif
+#ifndef Tk_MacOSXTurnOffMenus
 #define Tk_MacOSXTurnOffMenus \
 	(tkPlatStubsPtr->tk_MacOSXTurnOffMenus) /* 1 */
+#endif
+#ifndef Tk_MacOSXTkOwnsCursor
 #define Tk_MacOSXTkOwnsCursor \
 	(tkPlatStubsPtr->tk_MacOSXTkOwnsCursor) /* 2 */
+#endif
+#ifndef TkMacOSXInitMenus
 #define TkMacOSXInitMenus \
 	(tkPlatStubsPtr->tkMacOSXInitMenus) /* 3 */
+#endif
+#ifndef TkMacOSXInitAppleEvents
 #define TkMacOSXInitAppleEvents \
 	(tkPlatStubsPtr->tkMacOSXInitAppleEvents) /* 4 */
+#endif
+#ifndef TkGenWMConfigureEvent
 #define TkGenWMConfigureEvent \
 	(tkPlatStubsPtr->tkGenWMConfigureEvent) /* 5 */
+#endif
+#ifndef TkMacOSXInvalClipRgns
 #define TkMacOSXInvalClipRgns \
 	(tkPlatStubsPtr->tkMacOSXInvalClipRgns) /* 6 */
+#endif
+#ifndef TkMacOSXGetDrawablePort
 #define TkMacOSXGetDrawablePort \
 	(tkPlatStubsPtr->tkMacOSXGetDrawablePort) /* 7 */
+#endif
+#ifndef TkMacOSXGetRootControl
 #define TkMacOSXGetRootControl \
 	(tkPlatStubsPtr->tkMacOSXGetRootControl) /* 8 */
+#endif
+#ifndef Tk_MacOSXSetupTkNotifier
 #define Tk_MacOSXSetupTkNotifier \
 	(tkPlatStubsPtr->tk_MacOSXSetupTkNotifier) /* 9 */
+#endif
+#ifndef Tk_MacOSXIsAppInFront
 #define Tk_MacOSXIsAppInFront \
 	(tkPlatStubsPtr->tk_MacOSXIsAppInFront) /* 10 */
+#endif
 /* Slot 11 is reserved */
 /* Slot 12 is reserved */
 /* Slot 13 is reserved */
 /* Slot 14 is reserved */
 /* Slot 15 is reserved */
+#ifndef TkUnusedStubEntry
 #define TkUnusedStubEntry \
 	(tkPlatStubsPtr->tkUnusedStubEntry) /* 16 */
+#endif
 #endif /* AQUA */
 
-#endif /* defined(USE_TK_STUBS) */
+#endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
 
 /* !END!: Do not edit above this line. */
 
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 9102ec5..8e1f27d 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -267,9 +267,9 @@ void TkSubtractRegion (TkRegion a, TkRegion b, TkRegion c)
 
 /* !BEGIN!: Do not edit below this line. */
 
-static const TkIntStubs tkIntStubs = {
+TkIntStubs tkIntStubs = {
     TCL_STUB_MAGIC,
-    0,
+    NULL,
     TkAllocWindow, /* 0 */
     TkBezierPoints, /* 1 */
     TkBezierScreenPoints, /* 2 */
@@ -354,7 +354,7 @@ static const TkIntStubs tkIntStubs = {
     TkSelEventProc, /* 81 */
     TkSelInit, /* 82 */
     TkSelPropProc, /* 83 */
-    0, /* 84 */
+    NULL, /* 84 */
     TkSetWindowMenuBar, /* 85 */
     TkStringToKeysym, /* 86 */
     TkThickPolyLineToArea, /* 87 */
@@ -390,48 +390,48 @@ static const TkIntStubs tkIntStubs = {
     TkRectInRegion, /* 117 */
     TkSetRegion, /* 118 */
     TkUnionRectWithRegion, /* 119 */
-    0, /* 120 */
-#if !(defined(_WIN32) || defined(MAC_OSX_TK)) /* X11 */
-    0, /* 121 */
+    NULL, /* 120 */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
+    NULL, /* 121 */
 #endif /* X11 */
-#if defined(_WIN32) /* WIN */
-    0, /* 121 */
+#if defined(__WIN32__) /* WIN */
+    NULL, /* 121 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    0, /* 121 */ /* Dummy entry for stubs table backwards compatibility */
+    NULL, /* 121 */ /* Dummy entry for stubs table backwards compatibility */
     TkpCreateNativeBitmap, /* 121 */
 #endif /* AQUA */
-#if !(defined(_WIN32) || defined(MAC_OSX_TK)) /* X11 */
-    0, /* 122 */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
+    NULL, /* 122 */
 #endif /* X11 */
-#if defined(_WIN32) /* WIN */
-    0, /* 122 */
+#if defined(__WIN32__) /* WIN */
+    NULL, /* 122 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    0, /* 122 */ /* Dummy entry for stubs table backwards compatibility */
+    NULL, /* 122 */ /* Dummy entry for stubs table backwards compatibility */
     TkpDefineNativeBitmaps, /* 122 */
 #endif /* AQUA */
-    0, /* 123 */
-#if !(defined(_WIN32) || defined(MAC_OSX_TK)) /* X11 */
-    0, /* 124 */
+    NULL, /* 123 */
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
+    NULL, /* 124 */
 #endif /* X11 */
-#if defined(_WIN32) /* WIN */
-    0, /* 124 */
+#if defined(__WIN32__) /* WIN */
+    NULL, /* 124 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
-    0, /* 124 */ /* Dummy entry for stubs table backwards compatibility */
+    NULL, /* 124 */ /* Dummy entry for stubs table backwards compatibility */
     TkpGetNativeAppBitmap, /* 124 */
 #endif /* AQUA */
-    0, /* 125 */
-    0, /* 126 */
-    0, /* 127 */
-    0, /* 128 */
-    0, /* 129 */
-    0, /* 130 */
-    0, /* 131 */
-    0, /* 132 */
-    0, /* 133 */
-    0, /* 134 */
+    NULL, /* 125 */
+    NULL, /* 126 */
+    NULL, /* 127 */
+    NULL, /* 128 */
+    NULL, /* 129 */
+    NULL, /* 130 */
+    NULL, /* 131 */
+    NULL, /* 132 */
+    NULL, /* 133 */
+    NULL, /* 134 */
     TkpDrawHighlightBorder, /* 135 */
     TkSetFocusWin, /* 136 */
     TkpSetKeycodeAndState, /* 137 */
@@ -452,20 +452,20 @@ static const TkIntStubs tkIntStubs = {
     TkpDrawFrame, /* 152 */
     TkCreateThreadExitHandler, /* 153 */
     TkDeleteThreadExitHandler, /* 154 */
-    0, /* 155 */
+    NULL, /* 155 */
     TkpTestembedCmd, /* 156 */
     TkpTesttextCmd, /* 157 */
-    0, /* 158 */
-    0, /* 159 */
-    0, /* 160 */
-    0, /* 161 */
-    0, /* 162 */
-    0, /* 163 */
-    0, /* 164 */
-    0, /* 165 */
-    0, /* 166 */
-    0, /* 167 */
-    0, /* 168 */
+    NULL, /* 158 */
+    NULL, /* 159 */
+    NULL, /* 160 */
+    NULL, /* 161 */
+    NULL, /* 162 */
+    NULL, /* 163 */
+    NULL, /* 164 */
+    NULL, /* 165 */
+    NULL, /* 166 */
+    NULL, /* 167 */
+    NULL, /* 168 */
     TkStateParseProc, /* 169 */
     TkStatePrintProc, /* 170 */
     TkCanvasDashParseProc, /* 171 */
@@ -478,20 +478,20 @@ static const TkIntStubs tkIntStubs = {
     TkOrientPrintProc, /* 178 */
     TkSmoothParseProc, /* 179 */
     TkSmoothPrintProc, /* 180 */
-    0, /* 181 */
-    0, /* 182 */
-    0, /* 183 */
-    0, /* 184 */
-    0, /* 185 */
+    NULL, /* 181 */
+    NULL, /* 182 */
+    NULL, /* 183 */
+    NULL, /* 184 */
+    NULL, /* 185 */
     TkUnusedStubEntry, /* 186 */
 };
 
-static const TkIntPlatStubs tkIntPlatStubs = {
+TkIntPlatStubs tkIntPlatStubs = {
     TCL_STUB_MAGIC,
-    0,
-#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
+    NULL,
+#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
     TkAlignImageData, /* 0 */
-    0, /* 1 */
+    NULL, /* 1 */
     TkGenerateActivateEvents, /* 2 */
     TkpGetMS, /* 3 */
     TkPointerDeadWindow, /* 4 */
@@ -539,8 +539,8 @@ static const TkIntPlatStubs tkIntPlatStubs = {
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
     TkGenerateActivateEvents, /* 0 */
-    0, /* 1 */
-    0, /* 2 */
+    NULL, /* 1 */
+    NULL, /* 2 */
     TkPointerDeadWindow, /* 3 */
     TkpSetCapture, /* 4 */
     TkpSetCursor, /* 5 */
@@ -551,14 +551,14 @@ static const TkIntPlatStubs tkIntPlatStubs = {
     TkMacOSXDispatchMenuEvent, /* 10 */
     TkMacOSXInstallCursor, /* 11 */
     TkMacOSXHandleTearoffMenu, /* 12 */
-    0, /* 13 */
+    NULL, /* 13 */
     TkMacOSXDoHLEvent, /* 14 */
-    0, /* 15 */
+    NULL, /* 15 */
     TkMacOSXGetXWindow, /* 16 */
     TkMacOSXGrowToplevel, /* 17 */
     TkMacOSXHandleMenuSelect, /* 18 */
-    0, /* 19 */
-    0, /* 20 */
+    NULL, /* 19 */
+    NULL, /* 20 */
     TkMacOSXInvalidateWindow, /* 21 */
     TkMacOSXIsCharacterMissing, /* 22 */
     TkMacOSXMakeRealWindowExist, /* 23 */
@@ -586,7 +586,7 @@ static const TkIntPlatStubs tkIntPlatStubs = {
     TkMacOSXPreprocessMenu, /* 45 */
     TkpIsWindowFloating, /* 46 */
     TkMacOSXGetCapture, /* 47 */
-    0, /* 48 */
+    NULL, /* 48 */
     TkGetTransientMaster, /* 49 */
     TkGenerateButtonEvent, /* 50 */
     TkGenWMDestroyEvent, /* 51 */
@@ -595,7 +595,7 @@ static const TkIntPlatStubs tkIntPlatStubs = {
     TkMacOSXDrawable, /* 54 */
     TkpScanWindowId, /* 55 */
 #endif /* AQUA */
-#if !(defined(_WIN32) || defined(__CYGWIN__) || defined(MAC_OSX_TK)) /* X11 */
+#if !(defined(__WIN32__) || defined(__CYGWIN__) || defined(MAC_OSX_TK)) /* X11 */
     TkCreateXEventSource, /* 0 */
     TkFreeWindowId, /* 1 */
     TkInitXId, /* 2 */
@@ -613,10 +613,10 @@ static const TkIntPlatStubs tkIntPlatStubs = {
 #endif /* X11 */
 };
 
-static const TkIntXlibStubs tkIntXlibStubs = {
+TkIntXlibStubs tkIntXlibStubs = {
     TCL_STUB_MAGIC,
-    0,
-#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
+    NULL,
+#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
     XSetDashes, /* 0 */
     XGetModifierMapping, /* 1 */
     XCreateImage, /* 2 */
@@ -698,7 +698,7 @@ static const TkIntXlibStubs tkIntXlibStubs = {
     XFilterEvent, /* 78 */
     XmbLookupString, /* 79 */
     TkPutImage, /* 80 */
-    0, /* 81 */
+    NULL, /* 81 */
     XParseColor, /* 82 */
     XCreateGC, /* 83 */
     XFreeGC, /* 84 */
@@ -732,49 +732,49 @@ static const TkIntXlibStubs tkIntXlibStubs = {
     XSynchronize, /* 112 */
     XSync, /* 113 */
     XVisualIDFromVisual, /* 114 */
-    0, /* 115 */
-    0, /* 116 */
-    0, /* 117 */
-    0, /* 118 */
-    0, /* 119 */
-    0, /* 120 */
-    0, /* 121 */
-    0, /* 122 */
-    0, /* 123 */
-    0, /* 124 */
-    0, /* 125 */
-    0, /* 126 */
-    0, /* 127 */
-    0, /* 128 */
-    0, /* 129 */
-    0, /* 130 */
-    0, /* 131 */
-    0, /* 132 */
+    NULL, /* 115 */
+    NULL, /* 116 */
+    NULL, /* 117 */
+    NULL, /* 118 */
+    NULL, /* 119 */
+    NULL, /* 120 */
+    NULL, /* 121 */
+    NULL, /* 122 */
+    NULL, /* 123 */
+    NULL, /* 124 */
+    NULL, /* 125 */
+    NULL, /* 126 */
+    NULL, /* 127 */
+    NULL, /* 128 */
+    NULL, /* 129 */
+    NULL, /* 130 */
+    NULL, /* 131 */
+    NULL, /* 132 */
     XDrawSegments, /* 133 */
     XDrawPoint, /* 134 */
     XDrawPoints, /* 135 */
-    0, /* 136 */
-    0, /* 137 */
-    0, /* 138 */
-    0, /* 139 */
-    0, /* 140 */
-    0, /* 141 */
-    0, /* 142 */
-    0, /* 143 */
-    0, /* 144 */
-    0, /* 145 */
-    0, /* 146 */
-    0, /* 147 */
-    0, /* 148 */
-    0, /* 149 */
-    0, /* 150 */
-    0, /* 151 */
-    0, /* 152 */
-    0, /* 153 */
-    0, /* 154 */
-    0, /* 155 */
-    0, /* 156 */
-    0, /* 157 */
+    NULL, /* 136 */
+    NULL, /* 137 */
+    NULL, /* 138 */
+    NULL, /* 139 */
+    NULL, /* 140 */
+    NULL, /* 141 */
+    NULL, /* 142 */
+    NULL, /* 143 */
+    NULL, /* 144 */
+    NULL, /* 145 */
+    NULL, /* 146 */
+    NULL, /* 147 */
+    NULL, /* 148 */
+    NULL, /* 149 */
+    NULL, /* 150 */
+    NULL, /* 151 */
+    NULL, /* 152 */
+    NULL, /* 153 */
+    NULL, /* 154 */
+    NULL, /* 155 */
+    NULL, /* 156 */
+    NULL, /* 157 */
     TkUnusedStubEntry, /* 158 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
@@ -870,80 +870,80 @@ static const TkIntXlibStubs tkIntXlibStubs = {
     XQueryColors, /* 89 */
     XQueryTree, /* 90 */
     XSync, /* 91 */
-    0, /* 92 */
-    0, /* 93 */
-    0, /* 94 */
-    0, /* 95 */
-    0, /* 96 */
-    0, /* 97 */
-    0, /* 98 */
-    0, /* 99 */
-    0, /* 100 */
-    0, /* 101 */
-    0, /* 102 */
-    0, /* 103 */
-    0, /* 104 */
-    0, /* 105 */
-    0, /* 106 */
-    0, /* 107 */
-    0, /* 108 */
-    0, /* 109 */
-    0, /* 110 */
-    0, /* 111 */
-    0, /* 112 */
-    0, /* 113 */
-    0, /* 114 */
-    0, /* 115 */
-    0, /* 116 */
-    0, /* 117 */
-    0, /* 118 */
-    0, /* 119 */
-    0, /* 120 */
-    0, /* 121 */
-    0, /* 122 */
-    0, /* 123 */
-    0, /* 124 */
-    0, /* 125 */
-    0, /* 126 */
-    0, /* 127 */
-    0, /* 128 */
-    0, /* 129 */
-    0, /* 130 */
-    0, /* 131 */
-    0, /* 132 */
-    0, /* 133 */
-    0, /* 134 */
-    0, /* 135 */
-    0, /* 136 */
-    0, /* 137 */
-    0, /* 138 */
-    0, /* 139 */
-    0, /* 140 */
-    0, /* 141 */
-    0, /* 142 */
-    0, /* 143 */
-    0, /* 144 */
-    0, /* 145 */
-    0, /* 146 */
-    0, /* 147 */
-    0, /* 148 */
-    0, /* 149 */
-    0, /* 150 */
-    0, /* 151 */
-    0, /* 152 */
-    0, /* 153 */
-    0, /* 154 */
-    0, /* 155 */
-    0, /* 156 */
-    0, /* 157 */
+    NULL, /* 92 */
+    NULL, /* 93 */
+    NULL, /* 94 */
+    NULL, /* 95 */
+    NULL, /* 96 */
+    NULL, /* 97 */
+    NULL, /* 98 */
+    NULL, /* 99 */
+    NULL, /* 100 */
+    NULL, /* 101 */
+    NULL, /* 102 */
+    NULL, /* 103 */
+    NULL, /* 104 */
+    NULL, /* 105 */
+    NULL, /* 106 */
+    NULL, /* 107 */
+    NULL, /* 108 */
+    NULL, /* 109 */
+    NULL, /* 110 */
+    NULL, /* 111 */
+    NULL, /* 112 */
+    NULL, /* 113 */
+    NULL, /* 114 */
+    NULL, /* 115 */
+    NULL, /* 116 */
+    NULL, /* 117 */
+    NULL, /* 118 */
+    NULL, /* 119 */
+    NULL, /* 120 */
+    NULL, /* 121 */
+    NULL, /* 122 */
+    NULL, /* 123 */
+    NULL, /* 124 */
+    NULL, /* 125 */
+    NULL, /* 126 */
+    NULL, /* 127 */
+    NULL, /* 128 */
+    NULL, /* 129 */
+    NULL, /* 130 */
+    NULL, /* 131 */
+    NULL, /* 132 */
+    NULL, /* 133 */
+    NULL, /* 134 */
+    NULL, /* 135 */
+    NULL, /* 136 */
+    NULL, /* 137 */
+    NULL, /* 138 */
+    NULL, /* 139 */
+    NULL, /* 140 */
+    NULL, /* 141 */
+    NULL, /* 142 */
+    NULL, /* 143 */
+    NULL, /* 144 */
+    NULL, /* 145 */
+    NULL, /* 146 */
+    NULL, /* 147 */
+    NULL, /* 148 */
+    NULL, /* 149 */
+    NULL, /* 150 */
+    NULL, /* 151 */
+    NULL, /* 152 */
+    NULL, /* 153 */
+    NULL, /* 154 */
+    NULL, /* 155 */
+    NULL, /* 156 */
+    NULL, /* 157 */
     TkUnusedStubEntry, /* 158 */
 #endif /* AQUA */
 };
 
-static const TkPlatStubs tkPlatStubs = {
+TkPlatStubs tkPlatStubs = {
     TCL_STUB_MAGIC,
-    0,
-#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
+    NULL,
+#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
     Tk_AttachHWND, /* 0 */
     Tk_GetHINSTANCE, /* 1 */
     Tk_GetHWND, /* 2 */
@@ -963,23 +963,23 @@ static const TkPlatStubs tkPlatStubs = {
     TkMacOSXGetRootControl, /* 8 */
     Tk_MacOSXSetupTkNotifier, /* 9 */
     Tk_MacOSXIsAppInFront, /* 10 */
-    0, /* 11 */
-    0, /* 12 */
-    0, /* 13 */
-    0, /* 14 */
-    0, /* 15 */
+    NULL, /* 11 */
+    NULL, /* 12 */
+    NULL, /* 13 */
+    NULL, /* 14 */
+    NULL, /* 15 */
     TkUnusedStubEntry, /* 16 */
 #endif /* AQUA */
 };
 
-static const TkStubHooks tkStubHooks = {
+static TkStubHooks tkStubHooks = {
     &tkPlatStubs,
     &tkIntStubs,
     &tkIntPlatStubs,
     &tkIntXlibStubs
 };
 
-const TkStubs tkStubs = {
+TkStubs tkStubs = {
     TCL_STUB_MAGIC,
     &tkStubHooks,
     Tk_MainLoop, /* 0 */
@@ -1200,8 +1200,8 @@ const TkStubs tkStubs = {
     Tk_InitConsoleChannels, /* 215 */
     Tk_CreateConsoleWindow, /* 216 */
     Tk_CreateSmoothMethod, /* 217 */
-    0, /* 218 */
-    0, /* 219 */
+    NULL, /* 218 */
+    NULL, /* 219 */
     Tk_GetDash, /* 220 */
     Tk_CreateOutline, /* 221 */
     Tk_DeleteOutline, /* 222 */
@@ -1256,12 +1256,12 @@ const TkStubs tkStubs = {
     Tk_Interp, /* 271 */
     Tk_CreateOldImageType, /* 272 */
     Tk_CreateOldPhotoImageFormat, /* 273 */
-    0, /* 274 */
-    0, /* 275 */
-    0, /* 276 */
-    0, /* 277 */
-    0, /* 278 */
-    0, /* 279 */
+    NULL, /* 274 */
+    NULL, /* 275 */
+    NULL, /* 276 */
+    NULL, /* 277 */
+    NULL, /* 278 */
+    NULL, /* 279 */
     TkUnusedStubEntry, /* 280 */
 };
 
-- 
cgit v0.12


From 22e941ecb6c39df473fa3ed938bdaeb0784aff76 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Wed, 9 Sep 2020 19:25:22 +0000
Subject: Fix [ab1feaea9c]: Aqua initialization issues exposed by Scid vs Mac.

---
 macosx/tkMacOSXInit.c       | 91 ++++++++++++++++++++++++++++-----------------
 macosx/tkMacOSXSubwindows.c | 27 +++++++++-----
 macosx/tkMacOSXWm.c         |  6 ++-
 3 files changed, 78 insertions(+), 46 deletions(-)

diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index 51c1e37..2cf4b0c 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -285,7 +285,6 @@ TkpInit(
 
     if (!initialized) {
 	struct stat st;
-
 	initialized = 1;
 
 	/*
@@ -340,15 +339,15 @@ TkpInit(
 	[NSApp _setup:interp];
 
         /*
-         * WARNING: The finishLaunching method runs asynchronously, apparently
-         * in a separate thread.  This creates a race between the
-         * initialization of the NSApplication and the initialization of Tk.
-         * If Tk wins the race bad things happen with the root window (see
-         * below).  If the NSApplication wins then an AppleEvent created during
-         * launch, e.g. by dropping a file icon on the application icon, will
-         * be delivered before the procedure meant to to handle the AppleEvent
-         * has been defined.  This is now handled by processing the AppleEvent
-         * as an idle task.  See tkMacOSXHLEvents.c.
+         * WARNING: The finishLaunching method runs asynchronously. This
+         * creates a race between the initialization of the NSApplication and
+         * the initialization of Tk.  If Tk wins the race bad things happen
+         * with the root window (see below).  If the NSApplication wins then an
+         * AppleEvent created during launch, e.g. by dropping a file icon on
+         * the application icon, will be delivered before the procedure meant
+         * to to handle the AppleEvent has been defined.  This is now handled
+         * by processing the AppleEvent as an idle task.  See
+         * tkMacOSXHLEvents.c.
          */
 
 	[NSApp finishLaunching];
@@ -377,35 +376,47 @@ TkpInit(
 	Tcl_DoOneEvent(TCL_WINDOW_EVENTS | TCL_DONT_WAIT);
 
 	/*
-	 * If we don't have a TTY and stdin is a special character file of
+	 * If we don't have a TTY or stdin is a special character file of
 	 * length 0, (e.g. /dev/null, which is what Finder sets when double
 	 * clicking Wish) then use the Tk based console interpreter.
 	 */
 
-	if (getenv("TK_CONSOLE") ||
-		(!isatty(0) && (fstat(0, &st) ||
-		(S_ISCHR(st.st_mode) && st.st_blocks == 0)))) {
-	    Tk_InitConsoleChannels(interp);
-	    Tcl_RegisterChannel(interp, Tcl_GetStdChannel(TCL_STDIN));
-	    Tcl_RegisterChannel(interp, Tcl_GetStdChannel(TCL_STDOUT));
-	    Tcl_RegisterChannel(interp, Tcl_GetStdChannel(TCL_STDERR));
-
-	    /*
-	     * Only show the console if we don't have a startup script and
-	     * tcl_interactive hasn't been set already.
-	     */
-
-	    if (Tcl_GetStartupScript(NULL) == NULL) {
-		const char *intvar = Tcl_GetVar2(interp,
-			"tcl_interactive", NULL, TCL_GLOBAL_ONLY);
-
-		if (intvar == NULL) {
-		    Tcl_SetVar2(interp, "tcl_interactive", NULL, "1",
-			    TCL_GLOBAL_ONLY);
+	if (!isatty(0) && (fstat(0, &st) || (S_ISCHR(st.st_mode) && st.st_blocks == 0))) {
+	    if (getenv("TK_CONSOLE")) {
+		Tk_InitConsoleChannels(interp);
+		Tcl_RegisterChannel(interp, Tcl_GetStdChannel(TCL_STDIN));
+		Tcl_RegisterChannel(interp, Tcl_GetStdChannel(TCL_STDOUT));
+		Tcl_RegisterChannel(interp, Tcl_GetStdChannel(TCL_STDERR));
+
+		/*
+		 * Only show the console if we don't have a startup script and
+		 * tcl_interactive hasn't been set already.
+		 */
+
+		if (Tcl_GetStartupScript(NULL) == NULL) {
+		    const char *intvar = Tcl_GetVar2(interp,
+						     "tcl_interactive", NULL, TCL_GLOBAL_ONLY);
+
+		    if (intvar == NULL) {
+			Tcl_SetVar2(interp, "tcl_interactive", NULL, "1",
+				    TCL_GLOBAL_ONLY);
+		    }
 		}
-	    }
-	    if (Tk_CreateConsoleWindow(interp) == TCL_ERROR) {
-		return TCL_ERROR;
+		if (Tk_CreateConsoleWindow(interp) == TCL_ERROR) {
+		    return TCL_ERROR;
+		}
+	    } else {
+
+		/*
+		 * When launched as a macOS application with no console,
+		 * redirect stderr and stdout to /dev/null. This avoids waiting
+		 * forever for those files to become writable if the underlying
+		 * Tcl program tries to write to them with a puts command.
+		 */
+
+		FILE *null = fopen("/dev/null", "w");
+		dup2(fileno(null), STDOUT_FILENO);
+		dup2(fileno(null), STDERR_FILENO);
 	    }
 	}
 
@@ -433,6 +444,18 @@ TkpInit(
 	    TkMacOSXIconBitmapObjCmd, NULL, NULL);
     Tcl_CreateObjCommand(interp, "::tk::mac::GetAppPath",
 	    TkMacOSXGetAppPathCmd, NULL, NULL);
+
+     /*
+      * The root window has been created and mapped, but XMapWindow deferred its
+      * call to makeKeyAndOrderFront because the first call to XMapWindow
+      * occurs too early in the initialization process for that.  Process idle
+      * tasks now, so the root window is configured, then order it front.
+      */
+
+     while(Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {};
+     for (NSWindow *window in [NSApp windows]) {
+	 [window makeKeyAndOrderFront:NSApp];
+     }
     return TCL_OK;
 }
 
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index 002eae6..682fbb3 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -143,6 +143,7 @@ XMapWindow(
     TkWindow *winPtr = macWin->winPtr;
     NSWindow *win = TkMacOSXGetNSWindowForDrawable(window);
     XEvent event;
+    static Bool initialized = NO;
 
     /*
      * Under certain situations it's possible for this function to be called
@@ -172,12 +173,14 @@ XMapWindow(
 
 	    TkMacOSXApplyWindowAttributes(winPtr, win);
 	    [win setExcludedFromWindowsMenu:NO];
-	    [NSApp activateIgnoringOtherApps:NO];
+	    [NSApp activateIgnoringOtherApps:initialized];
 	    [view addTkDirtyRect: [view bounds]];
-	    if ([win canBecomeKeyWindow]) {
-		[win makeKeyAndOrderFront:NSApp];
-	    } else {
-		[win orderFrontRegardless];
+	    if (initialized) {
+		if ([win canBecomeKeyWindow]) {
+		    [win makeKeyAndOrderFront:NSApp];
+		} else {
+		    [win orderFrontRegardless];
+		}
 	    }
 	} else {
 	    TkWindow *contWinPtr = TkpGetOtherWindow(winPtr);
@@ -233,11 +236,15 @@ XMapWindow(
      * Generate VisibilityNotify events for window and all mapped children.
      */
 
-    event.xany.send_event = False;
-    event.xany.display = display;
-    event.xvisibility.type = VisibilityNotify;
-    event.xvisibility.state = VisibilityUnobscured;
-    NotifyVisibility(winPtr, &event);
+    if (initialized) {
+	event.xany.send_event = False;
+	event.xany.display = display;
+	event.xvisibility.type = VisibilityNotify;
+	event.xvisibility.state = VisibilityUnobscured;
+	NotifyVisibility(winPtr, &event);
+    } else {
+	initialized = YES;
+    }
     return Success;
 }
 
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 6b7871f..a72874e 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -1827,7 +1827,7 @@ WmDeiconifyCmd(
 	    ZoomState : NormalState);
     [win setExcludedFromWindowsMenu:NO];
     TkMacOSXApplyWindowAttributes(winPtr, win);
-    [win orderFront:nil];
+    [win orderFront:NSApp];
     if (wmPtr->icon) {
 	Tk_UnmapWindow((Tk_Window)wmPtr->icon);
     }
@@ -6124,6 +6124,8 @@ TkMacOSXMakeRealWindowExist(
     NSRect contentRect = NSMakeRect(5 - structureRect.origin.x,
 	    TkMacOSXZeroScreenHeight() - (TkMacOSXZeroScreenTop() + 5 +
 	    structureRect.origin.y + structureRect.size.height + 200), 200, 200);
+    if (wmPtr->hints.initial_state == WithdrawnState) {
+    }
     TKWindow *window = [[winClass alloc] initWithContentRect:contentRect
 	    styleMask:styleMask backing:NSBackingStoreBuffered defer:YES];
     if (!window) {
@@ -6921,7 +6923,7 @@ ApplyContainerOverrideChanges(
 	    [macWindow setExcludedFromWindowsMenu:YES];
 	    [macWindow setStyleMask:styleMask];
 	    if (wmPtr->hints.initial_state == NormalState) {
-		[macWindow orderFront:nil];
+		[macWindow orderFront:NSApp];
 	    }
 	    if (wmPtr->container != NULL) {
 		wmPtr->flags |= WM_TOPMOST;
-- 
cgit v0.12


From 6604cc608a78318d07dae478b95d7788354e6c3b Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Wed, 9 Sep 2020 21:02:50 +0000
Subject: Also fix [3762a0a944] using the suggestion in the ticket from
 Christopher Chavez.

---
 macosx/tkMacOSXWm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index a72874e..b55f039 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -6891,7 +6891,7 @@ ApplyContainerOverrideChanges(
 	}
     } else {
 	if (wmPtr->macClass == kSimpleWindowClass &&
-		oldAttributes == kWindowNoActivatesAttribute) {
+	    (oldAttributes & kWindowNoActivatesAttribute)) {
 	    wmPtr->macClass = kDocumentWindowClass;
 	    wmPtr->attributes =
 		    macClassAttrs[kDocumentWindowClass].defaultAttrs;
-- 
cgit v0.12


From cbd1d502879113bb4e0a5dee3a9f2eef2214332a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 10 Sep 2020 07:39:03 +0000
Subject: More usages for TKFLEXARRAY

---
 generic/tkFont.c | 8 ++++----
 generic/tkText.c | 4 ++--
 generic/tkText.h | 2 +-
 unix/tkUnixWm.c  | 4 ++--
 win/tkWinWm.c    | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/generic/tkFont.c b/generic/tkFont.c
index 67d0b36..05d75db 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.c
@@ -96,7 +96,7 @@ typedef struct TextLayout {
 				 * layout. */
     int numChunks;		/* Number of chunks actually used in following
 				 * array. */
-    LayoutChunk chunks[1];	/* Array of chunks. The actual size will be
+    LayoutChunk chunks[TKFLEXARRAY];/* Array of chunks. The actual size will be
 				 * maxChunks. THIS FIELD MUST BE THE LAST IN
 				 * THE STRUCTURE. */
 } TextLayout;
@@ -2002,8 +2002,8 @@ Tk_ComputeTextLayout(
 
     maxChunks = 1;
 
-    layoutPtr = (TextLayout *)ckalloc(sizeof(TextLayout)
-	    + (maxChunks-1) * sizeof(LayoutChunk));
+    layoutPtr = (TextLayout *)ckalloc(offsetof(TextLayout, chunks)
+	    + maxChunks * sizeof(LayoutChunk));
     layoutPtr->tkfont = tkfont;
     layoutPtr->string = string;
     layoutPtr->numChunks = 0;
@@ -3827,7 +3827,7 @@ NewChunk(
     maxChunks = *maxPtr;
     if (layoutPtr->numChunks == maxChunks) {
 	maxChunks *= 2;
-	s = sizeof(TextLayout) + ((maxChunks - 1) * sizeof(LayoutChunk));
+	s = offsetof(TextLayout, chunks) + (maxChunks * sizeof(LayoutChunk));
 	layoutPtr = (TextLayout *)ckrealloc(layoutPtr, s);
 
 	*layoutPtrPtr = layoutPtr;
diff --git a/generic/tkText.c b/generic/tkText.c
index 0eb256f..f636549 100644
--- a/generic/tkText.c
+++ b/generic/tkText.c
@@ -4539,8 +4539,8 @@ TkTextGetTabs(
      * Parse the elements of the list one at a time to fill in the array.
      */
 
-    tabArrayPtr = (TkTextTabArray *)ckalloc(sizeof(TkTextTabArray)
-	    + (count - 1) * sizeof(TkTextTab));
+    tabArrayPtr = (TkTextTabArray *)ckalloc(offsetof(TkTextTabArray, tabs)
+	    + count * sizeof(TkTextTab));
     tabArrayPtr->numTabs = 0;
     prevStop = 0.0;
     lastStop = 0.0;
diff --git a/generic/tkText.h b/generic/tkText.h
index 973ae74..e9e6303 100644
--- a/generic/tkText.h
+++ b/generic/tkText.h
@@ -489,7 +489,7 @@ typedef struct TkTextTabArray {
     double tabIncrement;	/* The accurate fractional pixel increment
 				 * between interpolated tabs we have to create
 				 * when we exceed numTabs. */
-    TkTextTab tabs[1];		/* Array of tabs. The actual size will be
+    TkTextTab tabs[TKFLEXARRAY];/* Array of tabs. The actual size will be
 				 * numTabs. THIS FIELD MUST BE THE LAST IN THE
 				 * STRUCTURE. */
 } TkTextTabArray;
diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c
index 656c0b7..06d908b 100644
--- a/unix/tkUnixWm.c
+++ b/unix/tkUnixWm.c
@@ -27,8 +27,8 @@ typedef struct ProtocolHandler {
 				/* Next in list of protocol handlers for the
 				 * same top-level window, or NULL for end of
 				 * list. */
-    Tcl_Interp *interp;		/* Interpreter in which to invoke command. */
-    char command[1];		/* Tcl command to invoke when a client message
+    Tcl_Interp *interp;	/* Interpreter in which to invoke command. */
+    char command[TKFLEXARRAY];	/* Tcl command to invoke when a client message
 				 * for this protocol arrives. The actual size
 				 * of the structure varies to accommodate the
 				 * needs of the actual command. THIS MUST BE
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index d7ac13a..324511a 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.c
@@ -57,8 +57,8 @@ typedef struct ProtocolHandler {
 				/* Next in list of protocol handlers for the
 				 * same top-level window, or NULL for end of
 				 * list. */
-    Tcl_Interp *interp;		/* Interpreter in which to invoke command. */
-    char command[1];		/* Tcl command to invoke when a client message
+    Tcl_Interp *interp;	/* Interpreter in which to invoke command. */
+    char command[TKFLEXARRAY];	/* Tcl command to invoke when a client message
 				 * for this protocol arrives. The actual size
 				 * of the structure varies to accommodate the
 				 * needs of the actual command. THIS MUST BE
-- 
cgit v0.12


From 0e5885d7fab885a2ef6ee3d709a6745b0bf585fb Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 10 Sep 2020 08:56:18 +0000
Subject: More use of TCL_UNUSED() and C++-safe typecasts. Use Tk_Offset() in
 stead of sizeof() when using flexible arrays

---
 generic/tkFont.c     |  59 +++++++++++----------
 generic/tkSelect.c   |  65 ++++++++++++------------
 generic/tkText.c     | 141 ++++++++++++++++++++++++---------------------------
 generic/tkTextDisp.c | 126 ++++++++++++++++++++++-----------------------
 unix/tkUnixWm.c      |   2 +-
 win/tkWinWm.c        |   2 +-
 6 files changed, 193 insertions(+), 202 deletions(-)

diff --git a/generic/tkFont.c b/generic/tkFont.c
index 0b858fc..ab431a0 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.c
@@ -380,7 +380,7 @@ void
 TkFontPkgInit(
     TkMainInfo *mainPtr)	/* The application being created. */
 {
-    TkFontInfo *fiPtr = ckalloc(sizeof(TkFontInfo));
+    TkFontInfo *fiPtr = (TkFontInfo *)ckalloc(sizeof(TkFontInfo));
 
     Tcl_InitHashTable(&fiPtr->fontCache, TCL_STRING_KEYS);
     Tcl_InitHashTable(&fiPtr->namedTable, TCL_STRING_KEYS);
@@ -473,7 +473,7 @@ Tk_FontObjCmd(
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     int index;
-    Tk_Window tkwin = clientData;
+    Tk_Window tkwin = (Tk_Window)clientData;
     TkFontInfo *fiPtr = ((TkWindow *) tkwin)->mainPtr->fontInfoPtr;
     static const char *const optionStrings[] = {
 	"actual",	"configure",	"create",	"delete",
@@ -617,9 +617,9 @@ Tk_FontObjCmd(
     	}
     	string = Tcl_GetString(objv[2]);
     	namedHashPtr = Tcl_FindHashEntry(&fiPtr->namedTable, string);
-	nfPtr = NULL;		/* lint. */
+	nfPtr = NULL;
     	if (namedHashPtr != NULL) {
-    	    nfPtr = Tcl_GetHashValue(namedHashPtr);
+    	    nfPtr = (NamedFont *)Tcl_GetHashValue(namedHashPtr);
     	}
     	if ((namedHashPtr == NULL) || nfPtr->deletePending) {
     	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
@@ -797,10 +797,10 @@ Tk_FontObjCmd(
 	resultPtr = Tcl_NewObj();
 	namedHashPtr = Tcl_FirstHashEntry(&fiPtr->namedTable, &search);
 	while (namedHashPtr != NULL) {
-	    NamedFont *nfPtr = Tcl_GetHashValue(namedHashPtr);
+	    NamedFont *nfPtr = (NamedFont *)Tcl_GetHashValue(namedHashPtr);
 
 	    if (!nfPtr->deletePending) {
-		char *string = Tcl_GetHashKey(&fiPtr->namedTable,
+		char *string = (char *)Tcl_GetHashKey(&fiPtr->namedTable,
 			namedHashPtr);
 
 		Tcl_ListObjAppendElement(NULL, resultPtr,
@@ -843,7 +843,7 @@ UpdateDependentFonts(
     Tcl_HashEntry *cacheHashPtr;
     Tcl_HashSearch search;
     TkFont *fontPtr;
-    NamedFont *nfPtr = Tcl_GetHashValue(namedHashPtr);
+    NamedFont *nfPtr = (NamedFont *)Tcl_GetHashValue(namedHashPtr);
 
     if (nfPtr->refCount == 0) {
 	/*
@@ -856,7 +856,7 @@ UpdateDependentFonts(
 
     cacheHashPtr = Tcl_FirstHashEntry(&fiPtr->fontCache, &search);
     while (cacheHashPtr != NULL) {
-	for (fontPtr = Tcl_GetHashValue(cacheHashPtr);
+	for (fontPtr = (TkFont *)Tcl_GetHashValue(cacheHashPtr);
 		fontPtr != NULL; fontPtr = fontPtr->nextPtr) {
 	    if (fontPtr->namedHashPtr == namedHashPtr) {
 		TkpGetFontFromAttributes(fontPtr, tkwin, &nfPtr->fa);
@@ -874,7 +874,7 @@ static void
 TheWorldHasChanged(
     ClientData clientData)	/* Info about application's fonts. */
 {
-    TkFontInfo *fiPtr = clientData;
+    TkFontInfo *fiPtr = (TkFontInfo *)clientData;
 
     /*
      * On macOS it is catastrophic to recompute all widgets while the
@@ -964,7 +964,7 @@ TkCreateNamedFont(
 
     namedHashPtr = Tcl_CreateHashEntry(&fiPtr->namedTable, name, &isNew);
     if (!isNew) {
-	nfPtr = Tcl_GetHashValue(namedHashPtr);
+	nfPtr = (NamedFont *)Tcl_GetHashValue(namedHashPtr);
 	if (!nfPtr->deletePending) {
 	    if (interp) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
@@ -986,7 +986,7 @@ TkCreateNamedFont(
 	return TCL_OK;
     }
 
-    nfPtr = ckalloc(sizeof(NamedFont));
+    nfPtr = (NamedFont *)ckalloc(sizeof(NamedFont));
     nfPtr->deletePending = 0;
     Tcl_SetHashValue(namedHashPtr, nfPtr);
     nfPtr->fa = *faPtr;
@@ -1025,7 +1025,7 @@ TkDeleteNamedFont(
 	}
 	return TCL_ERROR;
     }
-    nfPtr = Tcl_GetHashValue(namedHashPtr);
+    nfPtr = (NamedFont *)Tcl_GetHashValue(namedHashPtr);
     if (nfPtr->refCount != 0) {
 	nfPtr->deletePending = 1;
     } else {
@@ -1114,7 +1114,7 @@ Tk_AllocFontFromObj(
 	SetFontFromAny(interp, objPtr);
     }
 
-    oldFontPtr = objPtr->internalRep.twoPtrValue.ptr1;
+    oldFontPtr = (TkFont *)objPtr->internalRep.twoPtrValue.ptr1;
     if (oldFontPtr != NULL) {
 	if (oldFontPtr->resourceRefCount == 0) {
 	    /*
@@ -1143,7 +1143,7 @@ Tk_AllocFontFromObj(
 	cacheHashPtr = Tcl_CreateHashEntry(&fiPtr->fontCache,
 		Tcl_GetString(objPtr), &isNew);
     }
-    firstFontPtr = Tcl_GetHashValue(cacheHashPtr);
+    firstFontPtr = (TkFont *)Tcl_GetHashValue(cacheHashPtr);
     for (fontPtr = firstFontPtr; (fontPtr != NULL);
 	    fontPtr = fontPtr->nextPtr) {
 	if (Tk_Screen(tkwin) == fontPtr->screen) {
@@ -1166,7 +1166,7 @@ Tk_AllocFontFromObj(
 	 * Construct a font based on a named font.
 	 */
 
-	nfPtr = Tcl_GetHashValue(namedHashPtr);
+	nfPtr = (NamedFont *)Tcl_GetHashValue(namedHashPtr);
 	nfPtr->refCount++;
 
 	fontPtr = TkpGetFontFromAttributes(NULL, tkwin, &nfPtr->fa);
@@ -1299,7 +1299,7 @@ Tk_GetFontFromObj(
 	SetFontFromAny(NULL, objPtr);
     }
 
-    fontPtr = objPtr->internalRep.twoPtrValue.ptr1;
+    fontPtr = (TkFont *)objPtr->internalRep.twoPtrValue.ptr1;
     if (fontPtr != NULL) {
 	if (fontPtr->resourceRefCount == 0) {
 	    /*
@@ -1326,7 +1326,7 @@ Tk_GetFontFromObj(
 	hashPtr = Tcl_FindHashEntry(&fiPtr->fontCache, Tcl_GetString(objPtr));
     }
     if (hashPtr != NULL) {
-	for (fontPtr = Tcl_GetHashValue(hashPtr); fontPtr != NULL;
+	for (fontPtr = (TkFont *)Tcl_GetHashValue(hashPtr); fontPtr != NULL;
 		fontPtr = fontPtr->nextPtr) {
 	    if (Tk_Screen(tkwin) == fontPtr->screen) {
 		fontPtr->objRefCount++;
@@ -1361,7 +1361,7 @@ Tk_GetFontFromObj(
 
 static int
 SetFontFromAny(
-    Tcl_Interp *interp,		/* Used for error reporting if not NULL. */
+    TCL_UNUSED(Tcl_Interp *),	/* Used for error reporting if not NULL. */
     Tcl_Obj *objPtr)		/* The object to convert. */
 {
     const Tcl_ObjType *typePtr;
@@ -1437,8 +1437,7 @@ Tk_FreeFont(
     if (fontPtr == NULL) {
 	return;
     }
-    fontPtr->resourceRefCount--;
-    if (fontPtr->resourceRefCount > 0) {
+    if (fontPtr->resourceRefCount-- > 1) {
 	return;
     }
     if (fontPtr->namedHashPtr != NULL) {
@@ -1447,7 +1446,7 @@ Tk_FreeFont(
 	 * the named font and free it if no-one else is using it.
 	 */
 
-	nfPtr = Tcl_GetHashValue(fontPtr->namedHashPtr);
+	nfPtr = (NamedFont *)Tcl_GetHashValue(fontPtr->namedHashPtr);
 	nfPtr->refCount--;
 	if ((nfPtr->refCount == 0) && nfPtr->deletePending) {
 	    Tcl_DeleteHashEntry(fontPtr->namedHashPtr);
@@ -1455,7 +1454,7 @@ Tk_FreeFont(
 	}
     }
 
-    prevPtr = Tcl_GetHashValue(fontPtr->cacheHashPtr);
+    prevPtr = (TkFont *)Tcl_GetHashValue(fontPtr->cacheHashPtr);
     if (prevPtr == fontPtr) {
 	if (fontPtr->nextPtr == NULL) {
 	    Tcl_DeleteHashEntry(fontPtr->cacheHashPtr);
@@ -1533,7 +1532,7 @@ static void
 FreeFontObj(
     Tcl_Obj *objPtr)		/* The object we are releasing. */
 {
-    TkFont *fontPtr = objPtr->internalRep.twoPtrValue.ptr1;
+    TkFont *fontPtr = (TkFont *)objPtr->internalRep.twoPtrValue.ptr1;
 
     if (fontPtr != NULL) {
 	fontPtr->objRefCount--;
@@ -1568,7 +1567,7 @@ DupFontObjProc(
     Tcl_Obj *srcObjPtr,		/* The object we are copying from. */
     Tcl_Obj *dupObjPtr)		/* The object we are copying to. */
 {
-    TkFont *fontPtr = srcObjPtr->internalRep.twoPtrValue.ptr1;
+    TkFont *fontPtr = (TkFont *)srcObjPtr->internalRep.twoPtrValue.ptr1;
 
     dupObjPtr->typePtr = srcObjPtr->typePtr;
     dupObjPtr->internalRep.twoPtrValue.ptr1 = fontPtr;
@@ -2007,8 +2006,8 @@ Tk_ComputeTextLayout(
 
     maxChunks = 1;
 
-    layoutPtr = ckalloc(sizeof(TextLayout)
-	    + (maxChunks-1) * sizeof(LayoutChunk));
+    layoutPtr = (TextLayout *)ckalloc(Tk_Offset(TextLayout, chunks)
+	    + maxChunks * sizeof(LayoutChunk));
     layoutPtr->tkfont = tkfont;
     layoutPtr->string = string;
     layoutPtr->numChunks = 0;
@@ -3405,7 +3404,7 @@ noMapping:	;
 static int
 ConfigAttributesObj(
     Tcl_Interp *interp,		/* Interp for error return. */
-    Tk_Window tkwin,		/* For display on which font will be used. */
+    TCL_UNUSED(Tk_Window),		/* For display on which font will be used. */
     int objc,			/* Number of elements in argv. */
     Tcl_Obj *const objv[],	/* Command line options. */
     TkFontAttributes *faPtr)	/* Font attributes structure whose fields are
@@ -3780,7 +3779,7 @@ NewChunk(
     maxChunks = *maxPtr;
     if (layoutPtr->numChunks == maxChunks) {
 	maxChunks *= 2;
-	s = sizeof(TextLayout) + ((maxChunks - 1) * sizeof(LayoutChunk));
+	s = Tk_Offset(TextLayout, chunks) + (maxChunks * sizeof(LayoutChunk));
 	layoutPtr = ckrealloc(layoutPtr, s);
 
 	*layoutPtrPtr = layoutPtr;
@@ -4244,7 +4243,7 @@ TkDebugFont(
     hashPtr = Tcl_FindHashEntry(
 	    &((TkWindow *) tkwin)->mainPtr->fontInfoPtr->fontCache, name);
     if (hashPtr != NULL) {
-	fontPtr = Tcl_GetHashValue(hashPtr);
+	fontPtr = (TkFont *)Tcl_GetHashValue(hashPtr);
 	if (fontPtr == NULL) {
 	    Tcl_Panic("TkDebugFont found empty hash table entry");
 	}
@@ -4297,7 +4296,7 @@ TkFontGetFirstTextLayout(
     }
     chunkPtr = layoutPtr->chunks;
     numBytesInChunk = chunkPtr->numBytes;
-    strncpy(dst, chunkPtr->start, (size_t) numBytesInChunk);
+    strncpy(dst, chunkPtr->start, numBytesInChunk);
     *font = layoutPtr->tkfont;
     return numBytesInChunk;
 }
diff --git a/generic/tkSelect.c b/generic/tkSelect.c
index ef16ff5..91f0836 100644
--- a/generic/tkSelect.c
+++ b/generic/tkSelect.c
@@ -125,7 +125,7 @@ Tk_CreateSelHandler(
 				 * listed in the ICCCM will be tolerated
 				 * (blech). */
 {
-    register TkSelHandler *selPtr;
+    TkSelHandler *selPtr;
     TkWindow *winPtr = (TkWindow *) tkwin;
 
     if (winPtr->dispPtr->multipleAtom == None) {
@@ -139,7 +139,7 @@ Tk_CreateSelHandler(
 
     for (selPtr = winPtr->selHandlerList; ; selPtr = selPtr->nextPtr) {
 	if (selPtr == NULL) {
-	    selPtr = ckalloc(sizeof(TkSelHandler));
+	    selPtr = (TkSelHandler *)ckalloc(sizeof(TkSelHandler));
 	    selPtr->nextPtr = winPtr->selHandlerList;
 	    winPtr->selHandlerList = selPtr;
 	    break;
@@ -177,7 +177,7 @@ Tk_CreateSelHandler(
 	target = winPtr->dispPtr->utf8Atom;
 	for (selPtr = winPtr->selHandlerList; ; selPtr = selPtr->nextPtr) {
 	    if (selPtr == NULL) {
-		selPtr = ckalloc(sizeof(TkSelHandler));
+		selPtr = (TkSelHandler *)ckalloc(sizeof(TkSelHandler));
 		selPtr->nextPtr = winPtr->selHandlerList;
 		winPtr->selHandlerList = selPtr;
 		selPtr->selection = selection;
@@ -239,9 +239,9 @@ Tk_DeleteSelHandler(
 				 * removed. */
 {
     TkWindow *winPtr = (TkWindow *) tkwin;
-    register TkSelHandler *selPtr, *prevPtr;
-    register TkSelInProgress *ipPtr;
-    ThreadSpecificData *tsdPtr =
+    TkSelHandler *selPtr, *prevPtr;
+    TkSelInProgress *ipPtr;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     /*
@@ -353,7 +353,7 @@ Tk_OwnSelection(
     ClientData clientData)	/* Arbitrary one-word argument to pass to
 				 * proc. */
 {
-    register TkWindow *winPtr = (TkWindow *) tkwin;
+    TkWindow *winPtr = (TkWindow *) tkwin;
     TkDisplay *dispPtr = winPtr->dispPtr;
     TkSelectionInfo *infoPtr;
     Tk_LostSelProc *clearProc = NULL;
@@ -382,7 +382,7 @@ Tk_OwnSelection(
 	}
     }
     if (infoPtr == NULL) {
-	infoPtr = ckalloc(sizeof(TkSelectionInfo));
+	infoPtr = (TkSelectionInfo *)ckalloc(sizeof(TkSelectionInfo));
 	infoPtr->selection = selection;
 	infoPtr->nextPtr = dispPtr->selectionInfoPtr;
 	dispPtr->selectionInfoPtr = infoPtr;
@@ -460,7 +460,7 @@ Tk_ClearSelection(
     Tk_Window tkwin,		/* Window that selects a display. */
     Atom selection)		/* Selection to be cancelled. */
 {
-    register TkWindow *winPtr = (TkWindow *) tkwin;
+    TkWindow *winPtr = (TkWindow *) tkwin;
     TkDisplay *dispPtr = winPtr->dispPtr;
     TkSelectionInfo *infoPtr;
     TkSelectionInfo *prevPtr;
@@ -556,7 +556,7 @@ Tk_GetSelection(
     TkWindow *winPtr = (TkWindow *) tkwin;
     TkDisplay *dispPtr = winPtr->dispPtr;
     TkSelectionInfo *infoPtr;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     if (dispPtr->multipleAtom == None) {
@@ -577,7 +577,7 @@ Tk_GetSelection(
 	}
     }
     if (infoPtr != NULL) {
-	register TkSelHandler *selPtr;
+	TkSelHandler *selPtr;
 	int offset, result, count;
 	char buffer[TK_SEL_BYTES_AT_ONCE+1];
 	TkSelInProgress ip;
@@ -670,7 +670,7 @@ Tk_SelectionObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tk_Window tkwin = clientData;
+    Tk_Window tkwin = (Tk_Window)clientData;
     const char *path = NULL;
     Atom selection;
     const char *selName = NULL;
@@ -830,7 +830,7 @@ Tk_SelectionObjCmd(
 	Atom target, format;
 	const char *targetName = NULL;
 	const char *formatName = NULL;
-	register CommandInfo *cmdInfoPtr;
+	CommandInfo *cmdInfoPtr;
 	int cmdLength;
 	static const char *const handleOptionStrings[] = {
 	    "-format", "-selection", "-type", NULL
@@ -904,7 +904,7 @@ Tk_SelectionObjCmd(
 	if (cmdLength == 0) {
 	    Tk_DeleteSelHandler(tkwin, selection, target);
 	} else {
-	    cmdInfoPtr = ckalloc(Tk_Offset(CommandInfo, command)
+	    cmdInfoPtr = (CommandInfo *)ckalloc(Tk_Offset(CommandInfo, command)
 		    + 1 + cmdLength);
 	    cmdInfoPtr->interp = interp;
 	    cmdInfoPtr->charOffset = 0;
@@ -919,7 +919,7 @@ Tk_SelectionObjCmd(
     }
 
     case SELECTION_OWN: {
-	register LostCommand *lostPtr;
+	LostCommand *lostPtr;
 	Tcl_Obj *commandObj = NULL;
 	static const char *const ownOptionStrings[] = {
 	    "-command", "-displayof", "-selection", NULL
@@ -1008,7 +1008,7 @@ Tk_SelectionObjCmd(
 	    Tk_OwnSelection(tkwin, selection, NULL, NULL);
 	    return TCL_OK;
 	}
-	lostPtr = ckalloc(sizeof(LostCommand));
+	lostPtr = (LostCommand *)ckalloc(sizeof(LostCommand));
 	lostPtr->interp = interp;
 	lostPtr->cmdObj = commandObj;
 	Tcl_IncrRefCount(commandObj);
@@ -1040,7 +1040,7 @@ Tk_SelectionObjCmd(
 TkSelInProgress *
 TkSelGetInProgress(void)
 {
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     return tsdPtr->pendingPtr;
@@ -1067,7 +1067,7 @@ void
 TkSelSetInProgress(
     TkSelInProgress *pendingPtr)
 {
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     tsdPtr->pendingPtr = pendingPtr;
@@ -1092,12 +1092,12 @@ TkSelSetInProgress(
 
 void
 TkSelDeadWindow(
-    register TkWindow *winPtr)	/* Window that's being deleted. */
+    TkWindow *winPtr)	/* Window that's being deleted. */
 {
-    register TkSelHandler *selPtr;
-    register TkSelInProgress *ipPtr;
+    TkSelHandler *selPtr;
+    TkSelInProgress *ipPtr;
     TkSelectionInfo *infoPtr, *prevPtr, *nextPtr;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     /*
@@ -1170,7 +1170,7 @@ TkSelInit(
     Tk_Window tkwin)		/* Window token (used to find display to
 				 * initialize). */
 {
-    register TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr;
+    TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr;
 
     /*
      * Fetch commonly-used atoms.
@@ -1221,9 +1221,9 @@ TkSelInit(
 void
 TkSelClearSelection(
     Tk_Window tkwin,		/* Window for which event was targeted. */
-    register XEvent *eventPtr)	/* X SelectionClear event. */
+    XEvent *eventPtr)	/* X SelectionClear event. */
 {
-    register TkWindow *winPtr = (TkWindow *) tkwin;
+    TkWindow *winPtr = (TkWindow *) tkwin;
     TkDisplay *dispPtr = winPtr->dispPtr;
     TkSelectionInfo *infoPtr;
     TkSelectionInfo *prevPtr;
@@ -1285,16 +1285,15 @@ TkSelClearSelection(
  *--------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 SelGetProc(
     ClientData clientData,	/* Dynamic string holding partially assembled
 				 * selection. */
-    Tcl_Interp *interp,		/* Interpreter used for error reporting (not
+    TCL_UNUSED(Tcl_Interp *),	/* Interpreter used for error reporting (not
 				 * used). */
     const char *portion)	/* New information to be appended. */
 {
-    Tcl_DStringAppend(clientData, portion, -1);
+    Tcl_DStringAppend((Tcl_DString *)clientData, portion, -1);
     return TCL_OK;
 }
 
@@ -1411,7 +1410,7 @@ HandleTclCommand(
 		cmdInfoPtr->charOffset += numChars;
 		length = p - string;
 		if (length > 0) {
-		    strncpy(cmdInfoPtr->buffer, string, (size_t) length);
+		    strncpy(cmdInfoPtr->buffer, string, length);
 		}
 		cmdInfoPtr->buffer[length] = '\0';
 	    }
@@ -1470,7 +1469,7 @@ TkSelDefaultSelection(
     Atom *typePtr)		/* Store here the type of the selection, for
 				 * use in converting to proper X format. */
 {
-    register TkWindow *winPtr = (TkWindow *) infoPtr->owner;
+    TkWindow *winPtr = (TkWindow *) infoPtr->owner;
     TkDisplay *dispPtr = winPtr->dispPtr;
 
     if (target == dispPtr->timestampAtom) {
@@ -1483,7 +1482,7 @@ TkSelDefaultSelection(
     }
 
     if (target == dispPtr->targetsAtom) {
-	register TkSelHandler *selPtr;
+	TkSelHandler *selPtr;
 	int length;
 	Tcl_DString ds;
 
@@ -1509,7 +1508,7 @@ TkSelDefaultSelection(
 	    Tcl_DStringFree(&ds);
 	    return -1;
 	}
-	memcpy(buffer, Tcl_DStringValue(&ds), (unsigned) (1+length));
+	memcpy(buffer, Tcl_DStringValue(&ds), length + 1);
 	Tcl_DStringFree(&ds);
 	*typePtr = XA_ATOM;
 	return length;
@@ -1566,7 +1565,7 @@ static void
 LostSelection(
     ClientData clientData)	/* Pointer to LostCommand structure. */
 {
-    LostCommand *lostPtr = clientData;
+    LostCommand *lostPtr = (LostCommand *)clientData;
     Tcl_Interp *interp = lostPtr->interp;
     Tcl_InterpState savedState;
     int code;
diff --git a/generic/tkText.c b/generic/tkText.c
index 2ddfea1..5996688 100644
--- a/generic/tkText.c
+++ b/generic/tkText.c
@@ -14,9 +14,9 @@
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
-#include "default.h"
 #include "tkInt.h"
 #include "tkUndo.h"
+#include "default.h"
 
 #if defined(MAC_OSX_TK)
 #define Style TkStyle
@@ -461,7 +461,7 @@ Tk_TextObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tk_Window tkwin = clientData;
+    Tk_Window tkwin = (Tk_Window)clientData;
 
     if (objc < 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "pathName ?-option value ...?");
@@ -502,7 +502,7 @@ CreateWidget(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    register TkText *textPtr;
+    TkText *textPtr;
     Tk_OptionTable optionTable;
     TkTextIndex startIndex;
     Tk_Window newWin;
@@ -523,7 +523,7 @@ CreateWidget(
      * and 'insert', 'current' mark pointers are all NULL to start.
      */
 
-    textPtr = ckalloc(sizeof(TkText));
+    textPtr = (TkText *)ckalloc(sizeof(TkText));
     memset(textPtr, 0, sizeof(TkText));
 
     textPtr->tkwin = newWin;
@@ -534,7 +534,7 @@ CreateWidget(
 	    textPtr, TextCmdDeletedProc);
 
     if (sharedPtr == NULL) {
-	sharedPtr = ckalloc(sizeof(TkSharedText));
+	sharedPtr = (TkSharedText *)ckalloc(sizeof(TkSharedText));
 	memset(sharedPtr, 0, sizeof(TkSharedText));
 
 	sharedPtr->refCount = 0;
@@ -632,7 +632,7 @@ CreateWidget(
      */
 
     textPtr->selTagPtr = TkTextCreateTag(textPtr, "sel", NULL);
-    textPtr->selTagPtr->reliefString =
+    textPtr->selTagPtr->reliefString = (char *)
 	    ckalloc(sizeof(DEF_TEXT_SELECT_RELIEF));
     strcpy(textPtr->selTagPtr->reliefString, DEF_TEXT_SELECT_RELIEF);
     Tk_GetRelief(interp, DEF_TEXT_SELECT_RELIEF, &textPtr->selTagPtr->relief);
@@ -699,7 +699,7 @@ TextWidgetObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    register TkText *textPtr = clientData;
+    TkText *textPtr = (TkText *)clientData;
     int result = TCL_OK;
     int index;
 
@@ -864,11 +864,10 @@ TextWidgetObjCmd(
 
 	for (i = 2; i < objc-2; i++) {
 	    int value;
-	    size_t length;
-	    const char *option = Tcl_GetString(objv[i]);
+	    int length;
+	    const char *option = Tcl_GetStringFromObj(objv[i], &length);
 	    char c;
 
-	    length = objv[i]->length;
 	    if (length < 2 || option[0] != '-') {
 		goto badOption;
 	    }
@@ -1126,7 +1125,7 @@ TextWidgetObjCmd(
 
 		objc -= 2;
 		objv += 2;
-		indices = ckalloc((objc + 1) * sizeof(TkTextIndex));
+		indices = (TkTextIndex *)ckalloc((objc + 1) * sizeof(TkTextIndex));
 
 		/*
 		 * First pass verifies that all indices are valid.
@@ -1154,8 +1153,8 @@ TextWidgetObjCmd(
 			    COUNT_INDICES);
 		    objc++;
 		}
-		useIdx = ckalloc(objc);
-		memset(useIdx, 0, (size_t) objc);
+		useIdx = (char *)ckalloc(objc);
+		memset(useIdx, 0, objc);
 
 		/*
 		 * Do a decreasing order sort so that we delete the end ranges
@@ -1260,7 +1259,7 @@ TextWidgetObjCmd(
 	Tcl_Obj *objPtr = NULL;
 	int i, found = 0, visible = 0;
 	const char *name;
-	size_t length;
+	int length;
 
 	if (objc < 3) {
 	    Tcl_WrongNumArgs(interp, 2, objv,
@@ -1276,14 +1275,12 @@ TextWidgetObjCmd(
 
 	i = 2;
 	if (objc > 3) {
-	    name = Tcl_GetString(objv[i]);
-	    length = objv[i]->length;
+	    name = Tcl_GetStringFromObj(objv[i], &length);
 	    if (length > 1 && name[0] == '-') {
 		if (strncmp("-displaychars", name, length) == 0) {
 		    i++;
 		    visible = 1;
-		    name = Tcl_GetString(objv[i]);
-		    length = objv[i]->length;
+		    name = Tcl_GetStringFromObj(objv[i], &length);
 		}
 		if ((i < objc-1) && (length == 2) && !strcmp("--", name)) {
 		    i++;
@@ -1610,7 +1607,7 @@ SharedTextObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    register TkSharedText *sharedPtr = clientData;
+    TkSharedText *sharedPtr = (TkSharedText *)clientData;
     int result = TCL_OK;
     int index;
 
@@ -1980,7 +1977,7 @@ DestroyText(
 	for (hPtr = Tcl_FirstHashEntry(&sharedTextPtr->windowTable, &search);
 		hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
 	    TkTextEmbWindowClient *loop;
-	    TkTextSegment *ewPtr = Tcl_GetHashValue(hPtr);
+	    TkTextSegment *ewPtr = (TkTextSegment *)Tcl_GetHashValue(hPtr);
 
 	    loop = ewPtr->body.ew.clients;
 	    if (loop->textPtr == textPtr) {
@@ -2012,7 +2009,7 @@ DestroyText(
 
 	for (hPtr = Tcl_FirstHashEntry(&sharedTextPtr->tagTable, &search);
 		hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
-	    tagPtr = Tcl_GetHashValue(hPtr);
+	    tagPtr = (TkTextTag *)Tcl_GetHashValue(hPtr);
 
 	    /*
 	     * No need to use 'TkTextDeleteTag' since we've already removed
@@ -2078,7 +2075,7 @@ DestroyText(
 static int
 ConfigureText(
     Tcl_Interp *interp,		/* Used for error reporting. */
-    register TkText *textPtr,	/* Information about widget; may or may not
+    TkText *textPtr,	/* Information about widget; may or may not
 				 * already have values for some fields. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -2381,7 +2378,7 @@ static void
 TextWorldChangedCallback(
     ClientData instanceData)	/* Information about widget. */
 {
-    TkText *textPtr = instanceData;
+    TkText *textPtr = (TkText *)instanceData;
 
     TextWorldChanged(textPtr, TK_TEXT_LINE_GEOMETRY);
 }
@@ -2470,9 +2467,9 @@ TextWorldChanged(
 static void
 TextEventProc(
     ClientData clientData,	/* Information about window. */
-    register XEvent *eventPtr)	/* Information about event. */
+    XEvent *eventPtr)	/* Information about event. */
 {
-    register TkText *textPtr = clientData;
+    TkText *textPtr = (TkText *)clientData;
     TkTextIndex index, index2;
 
     if (eventPtr->type == Expose) {
@@ -2581,7 +2578,7 @@ static void
 TextCmdDeletedProc(
     ClientData clientData)	/* Pointer to widget record for widget. */
 {
-    TkText *textPtr = clientData;
+    TkText *textPtr = (TkText *)clientData;
     Tk_Window tkwin = textPtr->tkwin;
 
     /*
@@ -2634,14 +2631,13 @@ InsertChars(
     int viewUpdate)		/* Update the view if set. */
 {
     int lineIndex;
-    size_t length;
+    int length;
     TkText *tPtr;
     int *lineAndByteIndex;
     int resetViewCount;
     int pixels[2*PIXEL_CLIENTS];
-    const char *string = Tcl_GetString(stringPtr);
+    const char *string = Tcl_GetStringFromObj(stringPtr, &length);
 
-    length = stringPtr->length;
     if (sharedTextPtr == NULL) {
 	sharedTextPtr = textPtr->sharedTextPtr;
     }
@@ -2667,7 +2663,7 @@ InsertChars(
 
     resetViewCount = 0;
     if (sharedTextPtr->refCount > PIXEL_CLIENTS) {
-	lineAndByteIndex = ckalloc(sizeof(int) * 2 * sharedTextPtr->refCount);
+	lineAndByteIndex = (int *)ckalloc(sizeof(int) * 2 * sharedTextPtr->refCount);
     } else {
 	lineAndByteIndex = pixels;
     }
@@ -2916,7 +2912,7 @@ TextUndoRedoCallback(
     Tcl_Obj *objPtr)		/* Arguments of a command to be handled by the
 				 * shared text data structure. */
 {
-    TkSharedText *sharedPtr = clientData;
+    TkSharedText *sharedPtr = (TkSharedText *)clientData;
     int res, objc;
     Tcl_Obj **objv;
     TkText *textPtr;
@@ -3155,9 +3151,7 @@ DeleteIndexRange(
 
     for (i=0, hPtr=Tcl_FirstHashEntry(&sharedTextPtr->tagTable, &search);
 	    hPtr != NULL; i++, hPtr = Tcl_NextHashEntry(&search)) {
-        TkTextTag *tagPtr = Tcl_GetHashValue(hPtr);
-
-        TkBTreeTag(&index1, &index2, tagPtr, 0);
+        TkBTreeTag(&index1, &index2, (TkTextTag *)Tcl_GetHashValue(hPtr), 0);
     }
 
     /*
@@ -3191,7 +3185,7 @@ DeleteIndexRange(
 
     resetViewCount = 0;
     if (sharedTextPtr->refCount > PIXEL_CLIENTS) {
-	lineAndByteIndex = ckalloc(sizeof(int) * 2 * sharedTextPtr->refCount);
+	lineAndByteIndex = (int *)ckalloc(sizeof(int) * 2 * sharedTextPtr->refCount);
     } else {
 	lineAndByteIndex = pixels;
     }
@@ -3380,7 +3374,7 @@ TextFetchSelection(
 				 * not including terminating NULL
 				 * character. */
 {
-    register TkText *textPtr = clientData;
+    TkText *textPtr = (TkText *)clientData;
     TkTextIndex eof;
     int count, chunkSize, offsetInSeg;
     TkTextSearch search;
@@ -3464,7 +3458,7 @@ TextFetchSelection(
 	    if ((segPtr->typePtr == &tkTextCharType)
 		    && !TkTextIsElided(textPtr, &textPtr->selIndex, NULL)) {
 		memcpy(buffer, segPtr->body.chars + offsetInSeg,
-			(size_t) chunkSize);
+			chunkSize);
 		buffer += chunkSize;
 		maxBytes -= chunkSize;
 		count += chunkSize;
@@ -3511,7 +3505,7 @@ void
 TkTextLostSelection(
     ClientData clientData)	/* Information about text widget. */
 {
-    register TkText *textPtr = clientData;
+    TkText *textPtr = (TkText *)clientData;
 
     if (TkpAlwaysShowSelection(textPtr->tkwin)) {
 	TkTextIndex start, end;
@@ -3596,7 +3590,7 @@ static void
 TextBlinkProc(
     ClientData clientData)	/* Pointer to record describing text. */
 {
-    register TkText *textPtr = clientData;
+    TkText *textPtr = (TkText *)clientData;
     TkTextIndex index;
     int x, y, w, h, charWidth;
 
@@ -3976,7 +3970,7 @@ TextSearchGetLineIndex(
 {
     const TkTextIndex *indexPtr;
     int line;
-    TkText *textPtr = searchSpecPtr->clientData;
+    TkText *textPtr = (TkText *)searchSpecPtr->clientData;
 
     indexPtr = TkTextGetIndexFromObj(interp, textPtr, objPtr);
     if (indexPtr == NULL) {
@@ -4041,7 +4035,7 @@ TextSearchIndexInLine(
     TkTextSegment *segPtr;
     TkTextIndex curIndex;
     int index, leftToScan;
-    TkText *textPtr = searchSpecPtr->clientData;
+    TkText *textPtr = (TkText *)searchSpecPtr->clientData;
 
     index = 0;
     curIndex.tree = textPtr->sharedTextPtr->tree;
@@ -4111,7 +4105,7 @@ TextSearchAddNextLine(
     TkTextLine *linePtr, *thisLinePtr;
     TkTextIndex curIndex;
     TkTextSegment *segPtr;
-    TkText *textPtr = searchSpecPtr->clientData;
+    TkText *textPtr = (TkText *)searchSpecPtr->clientData;
     int nothingYet = 1;
 
     /*
@@ -4233,7 +4227,7 @@ TextSearchFoundMatch(
     TkTextIndex curIndex, foundIndex;
     TkTextSegment *segPtr;
     TkTextLine *linePtr;
-    TkText *textPtr = searchSpecPtr->clientData;
+    TkText *textPtr = (TkText *)searchSpecPtr->clientData;
 
     if (lineNum == searchSpecPtr->stopLine) {
 	/*
@@ -4284,7 +4278,7 @@ TextSearchFoundMatch(
      * reached the end of the match or we have reached the end of the line.
      */
 
-    linePtr = clientData;
+    linePtr = (TkTextLine *)clientData;
     if (linePtr == NULL) {
 	linePtr = TkBTreeFindLine(textPtr->sharedTextPtr->tree, textPtr,
 		lineNum);
@@ -4494,8 +4488,8 @@ TkTextGetTabs(
      * Parse the elements of the list one at a time to fill in the array.
      */
 
-    tabArrayPtr = ckalloc(sizeof(TkTextTabArray)
-	    + (count - 1) * sizeof(TkTextTab));
+    tabArrayPtr = (TkTextTabArray *)ckalloc(Tk_Offset(TkTextTabArray, tabs)
+	    + count * sizeof(TkTextTab));
     tabArrayPtr->numTabs = 0;
     prevStop = 0.0;
     lastStop = 0.0;
@@ -4621,7 +4615,7 @@ TkTextGetTabs(
 
 static int
 TextDumpCmd(
-    register TkText *textPtr,	/* Information about text widget. */
+    TkText *textPtr,	/* Information about text widget. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. Someone else has already
@@ -4708,14 +4702,13 @@ TextDumpCmd(
     if (objc == arg) {
 	TkTextIndexForwChars(NULL, &index1, 1, &index2, COUNT_INDICES);
     } else {
-	size_t length;
+	int length;
 	const char *str;
 
 	if (TkTextGetObjIndex(interp, textPtr, objv[arg], &index2) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	str = Tcl_GetString(objv[arg]);
-	length = objv[arg]->length;
+	str = Tcl_GetStringFromObj(objv[arg], &length);
 	if (strncmp(str, "end", length) == 0) {
 	    atEnd = 1;
 	}
@@ -4859,7 +4852,7 @@ DumpLine(
 		 */
 
 		int length = last - first;
-		char *range = ckalloc(length + 1);
+		char *range = (char *)ckalloc(length + 1);
 
 		memcpy(range, segPtr->body.chars + first, length);
 		range[length] = '\0';
@@ -4890,7 +4883,7 @@ DumpLine(
 		    name = NULL;
 		    lineChanged = 0;
 		} else {
-		    name = Tcl_GetHashKey(&textPtr->sharedTextPtr->markTable,
+		    name = (const char *)Tcl_GetHashKey(&textPtr->sharedTextPtr->markTable,
 			    markPtr->hPtr);
 		}
 		if (name != NULL) {
@@ -5016,7 +5009,7 @@ DumpSegment(
     const char *value,		/* Segment value. */
     Tcl_Obj *command,		/* Script callback. */
     const TkTextIndex *index,	/* index with line/byte position info. */
-    int what)			/* Look for TK_DUMP_INDEX bit. */
+    TCL_UNUSED(int))		/* Look for TK_DUMP_INDEX bit. */
 {
     char buffer[TK_POS_CHARS];
     Tcl_Obj *values[3], *tuple;
@@ -5518,7 +5511,7 @@ void
 TkTextRunAfterSyncCmd(
     ClientData clientData)		/* Information about text widget. */
 {
-    register TkText *textPtr = (TkText *) clientData;
+    TkText *textPtr = (TkText *)clientData;
     int code;
 
     if ((textPtr->tkwin == NULL) || (textPtr->flags & DESTROYED)) {
@@ -5592,7 +5585,7 @@ SearchPerform(
 
     if (toPtr != NULL) {
 	const TkTextIndex *indexToPtr, *indexFromPtr;
-	TkText *textPtr = searchSpecPtr->clientData;
+	TkText *textPtr = (TkText *)searchSpecPtr->clientData;
 
 	indexToPtr = TkTextGetIndexFromObj(interp, textPtr, toPtr);
 	if (indexToPtr == NULL) {
@@ -5673,7 +5666,8 @@ SearchCore(
      * they are Unicode char offsets.
      */
 
-    int firstOffset, lastOffset, matchOffset, matchLength;
+    int firstOffset, lastOffset;
+    int matchOffset, matchLength;
     int passes;
     int lineNum = searchSpecPtr->startLine;
     int code = TCL_OK;
@@ -5746,8 +5740,7 @@ SearchCore(
 	 * it has dual purpose.
 	 */
 
-	pattern = Tcl_GetString(patObj);
-	matchLength = patObj->length;
+	pattern = Tcl_GetStringFromObj(patObj, &matchLength);
 	nl = strchr(pattern, '\n');
 
 	/*
@@ -5916,7 +5909,7 @@ SearchCore(
 			}
 			while (p >= startOfLine + firstOffset) {
 			    if (matchLength == 0 || (p[0] == c && !strncmp(
-				     p, pattern, (size_t) matchLength))) {
+				     p, pattern, matchLength))) {
 				goto backwardsMatch;
 			    }
 			    p--;
@@ -5945,7 +5938,7 @@ SearchCore(
 		     */
 
 		    p = startOfLine + lastOffset - firstNewLine - 1;
-		    if (strncmp(p, pattern, (unsigned) firstNewLine + 1)) {
+		    if (strncmp(p, pattern, firstNewLine + 1)) {
 			/*
 			 * No match.
 			 */
@@ -6011,7 +6004,7 @@ SearchCore(
 				 * result.
 				 */
 
-				if (strncmp(p,pattern,(size_t)matchLength)) {
+				if (strncmp(p, pattern, matchLength)) {
 				    p = NULL;
 				}
 				break;
@@ -6259,8 +6252,8 @@ SearchCore(
 			 */
 
 			if ((match &&
-				firstOffset+info.matches[0].end != lastTotal &&
-				firstOffset+info.matches[0].end < prevFullLine)
+				firstOffset + info.matches[0].end != lastTotal &&
+				firstOffset + info.matches[0].end < prevFullLine)
 				|| info.extendStart < 0) {
 			    break;
 			}
@@ -6329,8 +6322,8 @@ SearchCore(
 				 * Possible overlap or enclosure.
 				 */
 
-				if (thisOffset-lastNonOverlap >=
-					lastBackwardsMatchOffset+matchLength){
+				if (thisOffset - lastNonOverlap >=
+					lastBackwardsMatchOffset + matchLength){
 				    /*
 				     * Totally encloses previous match, so
 				     * forget the previous match.
@@ -6434,7 +6427,7 @@ SearchCore(
 			     * matches on the heap.
 			     */
 
-			    int *newArray =
+			    int *newArray = (int *)
 				    ckalloc(4 * matchNum * sizeof(int));
 			    memcpy(newArray, storeMatch, matchNum*sizeof(int));
 			    memcpy(newArray + 2*matchNum, storeLength,
@@ -6695,8 +6688,8 @@ SearchCore(
 
 static Tcl_Obj *
 GetLineStartEnd(
-    ClientData clientData,
-    Tk_Window tkwin,
+    TCL_UNUSED(void *),
+    TCL_UNUSED(Tk_Window),
     char *recordPtr,		/* Pointer to widget record. */
     int internalOffset)		/* Offset within *recordPtr containing the
 				 * line value. */
@@ -6730,9 +6723,9 @@ GetLineStartEnd(
 
 static int
 SetLineStartEnd(
-    ClientData clientData,
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interp; may be used for errors. */
-    Tk_Window tkwin,		/* Window for which option is being set. */
+    TCL_UNUSED(Tk_Window),	/* Window for which option is being set. */
     Tcl_Obj **value,		/* Pointer to the pointer to the value object.
 				 * We use a pointer to the pointer because we
 				 * may need to return a value (NULL). */
@@ -6789,8 +6782,8 @@ SetLineStartEnd(
 
 static void
 RestoreLineStartEnd(
-    ClientData clientData,
-    Tk_Window tkwin,
+    TCL_UNUSED(void *),
+    TCL_UNUSED(Tk_Window),
     char *internalPtr,		/* Pointer to storage for value. */
     char *oldInternalPtr)	/* Pointer to old value. */
 {
@@ -6848,7 +6841,7 @@ ObjectIsEmpty(
 
 int
 TkpTesttextCmd(
-    ClientData clientData,	/* Main window for application. */
+    TCL_UNUSED(void *),	/* Main window for application. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])		/* Argument strings. */
@@ -6867,7 +6860,7 @@ TkpTesttextCmd(
     if (Tcl_GetCommandInfo(interp, Tcl_GetString(objv[1]), &info) == 0) {
 	return TCL_ERROR;
     }
-    textPtr = info.objClientData;
+    textPtr = (TkText *)info.objClientData;
     len = strlen(Tcl_GetString(objv[2]));
     if (strncmp(Tcl_GetString(objv[2]), "byteindex", len) == 0) {
 	if (objc != 5) {
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 6d680f6..6ab8508 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -444,8 +444,8 @@ typedef struct TextDInfo {
 
 typedef struct CharInfo {
     int numBytes;		/* Number of bytes to display. */
-    char chars[1];		/* UTF characters to display. Actual size will
-				 * be numBytes, not 1. THIS MUST BE THE LAST
+    char chars[1];		/* UTF characters to display.
+				 * Allocated as large as necessary. THIS MUST BE THE LAST
 				 * FIELD IN THE STRUCTURE. */
 } CharInfo;
 
@@ -658,10 +658,10 @@ void
 TkTextCreateDInfo(
     TkText *textPtr)		/* Overall information for text widget. */
 {
-    register TextDInfo *dInfoPtr;
+    TextDInfo *dInfoPtr;
     XGCValues gcValues;
 
-    dInfoPtr = ckalloc(sizeof(TextDInfo));
+    dInfoPtr = (TextDInfo *)ckalloc(sizeof(TextDInfo));
     Tcl_InitHashTable(&dInfoPtr->styleTable, sizeof(StyleValues)/sizeof(int));
     dInfoPtr->dLinePtr = NULL;
     dInfoPtr->copyGC = NULL;
@@ -717,7 +717,7 @@ void
 TkTextFreeDInfo(
     TkText *textPtr)		/* Overall information for text widget. */
 {
-    register TextDInfo *dInfoPtr = textPtr->dInfoPtr;
+    TextDInfo *dInfoPtr = textPtr->dInfoPtr;
 
     /*
      * Be careful to free up styleTable *after* freeing up all the DLines, so
@@ -773,7 +773,7 @@ GetStyle(
 				 * information is wanted. */
 {
     TkTextTag **tagPtrs;
-    register TkTextTag *tagPtr;
+    TkTextTag *tagPtr;
     StyleValues styleValues;
     TextStyle *stylePtr;
     Tcl_HashEntry *hPtr;
@@ -1002,7 +1002,7 @@ GetStyle(
     hPtr = Tcl_CreateHashEntry(&textPtr->dInfoPtr->styleTable,
 	    (char *) &styleValues, &isNew);
     if (!isNew) {
-	stylePtr = Tcl_GetHashValue(hPtr);
+	stylePtr = (TextStyle *)Tcl_GetHashValue(hPtr);
 	stylePtr->refCount++;
 	return stylePtr;
     }
@@ -1011,7 +1011,7 @@ GetStyle(
      * No existing style matched. Make a new one.
      */
 
-    stylePtr = ckalloc(sizeof(TextStyle));
+    stylePtr = (TextStyle *)ckalloc(sizeof(TextStyle));
     stylePtr->refCount = 1;
     if (styleValues.border != NULL) {
 	gcValues.foreground = Tk_3DBorderColor(styleValues.border)->pixel;
@@ -1069,7 +1069,7 @@ GetStyle(
 static void
 FreeStyle(
     TkText *textPtr,		/* Information about overall widget. */
-    register TextStyle *stylePtr)
+    TextStyle *stylePtr)
 				/* Information about style to free. */
 {
     stylePtr->refCount--;
@@ -1132,7 +1132,7 @@ LayoutDLine(
 				 * necessarily point to a character
 				 * segment. */
 {
-    register DLine *dlPtr;	/* New display line. */
+    DLine *dlPtr;	/* New display line. */
     TkTextSegment *segPtr;	/* Current segment in text. */
     TkTextDispChunk *lastChunkPtr;
 				/* Last chunk allocated so far for line. */
@@ -1186,7 +1186,7 @@ LayoutDLine(
      * Create and initialize a new DLine structure.
      */
 
-    dlPtr = ckalloc(sizeof(DLine));
+    dlPtr = (DLine *)ckalloc(sizeof(DLine));
     dlPtr->index = *indexPtr;
     dlPtr->byteCount = 0;
     dlPtr->y = 0;
@@ -1435,7 +1435,7 @@ LayoutDLine(
 	    continue;
 	}
 	if (chunkPtr == NULL) {
-	    chunkPtr = ckalloc(sizeof(TkTextDispChunk));
+	    chunkPtr = (TkTextDispChunk *)ckalloc(sizeof(TkTextDispChunk));
 	    chunkPtr->nextPtr = NULL;
 	    chunkPtr->clientData = NULL;
 	}
@@ -1833,8 +1833,8 @@ static void
 UpdateDisplayInfo(
     TkText *textPtr)		/* Text widget to update. */
 {
-    register TextDInfo *dInfoPtr = textPtr->dInfoPtr;
-    register DLine *dlPtr, *prevPtr;
+    TextDInfo *dInfoPtr = textPtr->dInfoPtr;
+    DLine *dlPtr, *prevPtr;
     TkTextIndex index;
     TkTextLine *lastLinePtr;
     int y, maxY, xPixelOffset, maxOffset, lineHeight;
@@ -1871,7 +1871,7 @@ UpdateDisplayInfo(
     y = dInfoPtr->y - dInfoPtr->newTopPixelOffset;
     maxY = dInfoPtr->maxY;
     while (1) {
-	register DLine *newPtr;
+	DLine *newPtr;
 
 	if (index.linePtr == lastLinePtr) {
 	    break;
@@ -1982,7 +1982,7 @@ UpdateDisplayInfo(
 	 */
 
 	if (index.linePtr != prevPtr->index.linePtr) {
-	    register DLine *nextPtr;
+	    DLine *nextPtr;
 
 	    nextPtr = dlPtr;
 	    while ((nextPtr != NULL)
@@ -2351,7 +2351,7 @@ UpdateDisplayInfo(
 static void
 FreeDLines(
     TkText *textPtr,		/* Information about overall text widget. */
-    register DLine *firstPtr,	/* Pointer to first DLine to free up. */
+    DLine *firstPtr,	/* Pointer to first DLine to free up. */
     DLine *lastPtr,		/* Pointer to DLine just after last one to
 				 * free (NULL means everything starting with
 				 * firstPtr). */
@@ -2364,8 +2364,8 @@ FreeDLines(
 				 * we shouldn't invalidate anything for the
 				 * overall widget. */
 {
-    register TkTextDispChunk *chunkPtr, *nextChunkPtr;
-    register DLine *nextDLinePtr;
+    TkTextDispChunk *chunkPtr, *nextChunkPtr;
+    DLine *nextDLinePtr;
 
     if (action == DLINE_FREE_TEMP) {
 	lineHeightsRecalculated++;
@@ -2384,7 +2384,7 @@ FreeDLines(
 	if (textPtr->dInfoPtr->dLinePtr == firstPtr) {
 	    textPtr->dInfoPtr->dLinePtr = lastPtr;
 	} else {
-	    register DLine *prevPtr;
+	    DLine *prevPtr;
 
 	    for (prevPtr = textPtr->dInfoPtr->dLinePtr;
 		    prevPtr->nextPtr != firstPtr; prevPtr = prevPtr->nextPtr) {
@@ -2432,14 +2432,14 @@ FreeDLines(
 static void
 DisplayDLine(
     TkText *textPtr,		/* Text widget in which to draw line. */
-    register DLine *dlPtr,	/* Information about line to draw. */
+    DLine *dlPtr,	/* Information about line to draw. */
     DLine *prevPtr,		/* Line just before one to draw, or NULL if
 				 * dlPtr is the top line. */
     Pixmap pixmap)		/* Pixmap to use for double-buffering. Caller
 				 * must make sure it's large enough to hold
 				 * line. */
 {
-    register TkTextDispChunk *chunkPtr;
+    TkTextDispChunk *chunkPtr;
     TextDInfo *dInfoPtr = textPtr->dInfoPtr;
     Display *display;
     int height, y_off;
@@ -2611,7 +2611,7 @@ DisplayDLine(
 static void
 DisplayLineBackground(
     TkText *textPtr,		/* Text widget containing line. */
-    register DLine *dlPtr,	/* Information about line to draw. */
+    DLine *dlPtr,	/* Information about line to draw. */
     DLine *prevPtr,		/* Line just above dlPtr, or NULL if dlPtr is
 				 * the top-most line in the window. */
     Pixmap pixmap)		/* Pixmap to use for double-buffering. Caller
@@ -3007,7 +3007,7 @@ static void
 AsyncUpdateLineMetrics(
     ClientData clientData)	/* Information about widget. */
 {
-    register TkText *textPtr = clientData;
+    TkText *textPtr = (TkText *)clientData;
     TextDInfo *dInfoPtr = textPtr->dInfoPtr;
     int lineNum;
 
@@ -4164,9 +4164,9 @@ static void
 DisplayText(
     ClientData clientData)	/* Information about widget. */
 {
-    register TkText *textPtr = clientData;
+    TkText *textPtr = (TkText *)clientData;
     TextDInfo *dInfoPtr = textPtr->dInfoPtr;
-    register DLine *dlPtr;
+    DLine *dlPtr;
     DLine *prevPtr;
     Pixmap pixmap;
     int maxHeight, borders;
@@ -4254,7 +4254,7 @@ DisplayText(
      */
 
     for (dlPtr = dInfoPtr->dLinePtr; dlPtr != NULL; dlPtr = dlPtr->nextPtr) {
-	register DLine *dlPtr2;
+	DLine *dlPtr2;
 	int offset, height, y, oldY;
 	TkRegion damageRgn;
 
@@ -4552,7 +4552,7 @@ DisplayText(
 		 * proc of embedded windows only.
 		 */
 #endif
-		register TkTextDispChunk *chunkPtr;
+		TkTextDispChunk *chunkPtr;
 
 		for (chunkPtr = dlPtr->chunkPtr; (chunkPtr != NULL);
 			chunkPtr = chunkPtr->nextPtr) {
@@ -4754,7 +4754,7 @@ TextInvalidateRegion(
     TkText *textPtr,		/* Widget record for text widget. */
     TkRegion region)		/* Region of area to redraw. */
 {
-    register DLine *dlPtr;
+    DLine *dlPtr;
     TextDInfo *dInfoPtr = textPtr->dInfoPtr;
     int maxY, inset;
     XRectangle rect;
@@ -5012,7 +5012,7 @@ TextRedrawTag(
     int withTag)		/* 1 means redraw characters that have the
 				 * tag, 0 means redraw those without. */
 {
-    register DLine *dlPtr;
+    DLine *dlPtr;
     DLine *endPtr;
     int tagOn;
     TkTextSearch search;
@@ -5352,7 +5352,7 @@ TkTextSetYView(
 				 * are to be off the top of the screen. */
 {
     TextDInfo *dInfoPtr = textPtr->dInfoPtr;
-    register DLine *dlPtr;
+    DLine *dlPtr;
     int bottomY, close, lineIndex;
     TkTextIndex tmpIndex, rounded;
     int lineHeight;
@@ -6180,7 +6180,7 @@ TkTextYviewCmd(
 
     pickPlace = 0;
     if (Tcl_GetString(objv[2])[0] == '-') {
-	register const char *switchStr =
+	const char *switchStr =
 		Tcl_GetStringFromObj(objv[2], &switchLength);
 
 	if ((switchLength >= 2) && (strncmp(switchStr, "-pickplace",
@@ -6358,7 +6358,7 @@ TkTextPendingsync(
 
 int
 TkTextScanCmd(
-    register TkText *textPtr,	/* Information about text widget. */
+    TkText *textPtr,	/* Information about text widget. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. Someone else has already
@@ -6844,7 +6844,7 @@ static void
 AsyncUpdateYScrollbar(
     ClientData clientData)	/* Information about widget. */
 {
-    register TkText *textPtr = clientData;
+    TkText *textPtr = (TkText *)clientData;
 
     textPtr->dInfoPtr->scrollbarTimer = NULL;
 
@@ -6879,7 +6879,7 @@ AsyncUpdateYScrollbar(
 static DLine *
 FindDLine(
     TkText *textPtr,		/* Widget record for text widget. */
-    register DLine *dlPtr,	/* Pointer to first in list of DLines to
+    DLine *dlPtr,	/* Pointer to first in list of DLines to
 				 * search. */
     const TkTextIndex *indexPtr)/* Index of desired character. */
 {
@@ -7049,7 +7049,7 @@ TkTextPixelIndex(
 				 * border of the widget). */
 {
     TextDInfo *dInfoPtr = textPtr->dInfoPtr;
-    register DLine *dlPtr, *validDlPtr;
+    DLine *dlPtr, *validDlPtr;
     int nearby = 0;
 
     /*
@@ -7151,7 +7151,7 @@ DlineIndexOfX(
 				 * the character nearest to x. */
 {
     TextDInfo *dInfoPtr = textPtr->dInfoPtr;
-    register TkTextDispChunk *chunkPtr;
+    TkTextDispChunk *chunkPtr;
 
     /*
      * Scan through the line's chunks to find the one that contains the
@@ -7279,7 +7279,7 @@ DlineXOfIndex(
     int byteIndex)		/* The byte index for which we want the
 				 * coordinate. */
 {
-    register TkTextDispChunk *chunkPtr = dlPtr->chunkPtr;
+    TkTextDispChunk *chunkPtr = dlPtr->chunkPtr;
     int x = 0;
 
     if (byteIndex == 0 || chunkPtr == NULL) {
@@ -7349,7 +7349,7 @@ TkTextIndexBbox(
 {
     TextDInfo *dInfoPtr = textPtr->dInfoPtr;
     DLine *dlPtr;
-    register TkTextDispChunk *chunkPtr;
+    TkTextDispChunk *chunkPtr;
     int byteCount;
 
     /*
@@ -7541,14 +7541,14 @@ TkTextDLineInfo(
 
 static void
 ElideBboxProc(
-    TkText *textPtr,
+    TCL_UNUSED(TkText *),
     TkTextDispChunk *chunkPtr,	/* Chunk containing desired char. */
-    int index,			/* Index of desired character within the
+    TCL_UNUSED(int),		/* Index of desired character within the
 				 * chunk. */
     int y,			/* Topmost pixel in area allocated for this
 				 * line. */
-    int lineHeight,		/* Height of line, in pixels. */
-    int baseline,		/* Location of line's baseline, in pixels
+    TCL_UNUSED(int),	/* Height of line, in pixels. */
+    TCL_UNUSED(int),	/* Location of line's baseline, in pixels
 				 * measured down from y. */
     int *xPtr, int *yPtr,	/* Gets filled in with coords of character's
 				 * upper-left pixel. X-coord is in same
@@ -7569,8 +7569,8 @@ ElideBboxProc(
 
 static int
 ElideMeasureProc(
-    TkTextDispChunk *chunkPtr,	/* Chunk containing desired coord. */
-    int x)			/* X-coordinate, in same coordinate system as
+    TCL_UNUSED(TkTextDispChunk *),	/* Chunk containing desired coord. */
+    TCL_UNUSED(int))		/* X-coordinate, in same coordinate system as
 				 * chunkPtr->x. */
 {
     return 0 /*chunkPtr->numBytes - 1*/;
@@ -7599,8 +7599,8 @@ ElideMeasureProc(
 
 int
 TkTextCharLayoutProc(
-    TkText *textPtr,		/* Text widget being layed out. */
-    TkTextIndex *indexPtr,	/* Index of first character to lay out
+    TCL_UNUSED(TkText *),	/* Text widget being layed out. */
+    TCL_UNUSED(TkTextIndex *),	/* Index of first character to lay out
 				 * (corresponds to segPtr and offset). */
     TkTextSegment *segPtr,	/* Segment being layed out. */
     int byteOffset,		/* Byte offset within segment of first
@@ -7614,7 +7614,7 @@ TkTextCharLayoutProc(
     TkWrapMode wrapMode,	/* How to handle line wrapping:
 				 * TEXT_WRAPMODE_CHAR, TEXT_WRAPMODE_NONE, or
 				 * TEXT_WRAPMODE_WORD. */
-    register TkTextDispChunk *chunkPtr)
+    TkTextDispChunk *chunkPtr)
 				/* Structure to fill in with information about
 				 * this chunk. The x field has already been
 				 * set by the caller. */
@@ -7765,9 +7765,9 @@ TkTextCharLayoutProc(
     chunkPtr->breakIndex = -1;
 
 #if !TK_LAYOUT_WITH_BASE_CHUNKS
-    ciPtr = ckalloc((Tk_Offset(CharInfo, chars) + 1) + bytesThatFit);
+    ciPtr = (CharInfo *)ckalloc((Tk_Offset(CharInfo, chars) + 1) + bytesThatFit);
     chunkPtr->clientData = ciPtr;
-    memcpy(ciPtr->chars, p, (unsigned) bytesThatFit);
+    memcpy(ciPtr->chars, p, bytesThatFit);
 #endif /* TK_LAYOUT_WITH_BASE_CHUNKS */
 
     ciPtr->numBytes = bytesThatFit;
@@ -7878,7 +7878,7 @@ CharChunkMeasureChars(
 				 * here. */
 {
     Tk_Font tkfont = chunkPtr->stylePtr->sValuePtr->tkfont;
-    CharInfo *ciPtr = chunkPtr->clientData;
+    CharInfo *ciPtr = (CharInfo *)chunkPtr->clientData;
 
 #if !TK_LAYOUT_WITH_BASE_CHUNKS
     if (chars == NULL) {
@@ -7953,21 +7953,21 @@ CharChunkMeasureChars(
 
 static void
 CharDisplayProc(
-    TkText *textPtr,
+    TCL_UNUSED(TkText *),
     TkTextDispChunk *chunkPtr,	/* Chunk that is to be drawn. */
     int x,			/* X-position in dst at which to draw this
 				 * chunk (may differ from the x-position in
 				 * the chunk because of scrolling). */
     int y,			/* Y-position at which to draw this chunk in
 				 * dst. */
-    int height,			/* Total height of line. */
+    TCL_UNUSED(int),		/* Total height of line. */
     int baseline,		/* Offset of baseline from y. */
     Display *display,		/* Display to use for drawing. */
     Drawable dst,		/* Pixmap or window in which to draw chunk. */
-    int screenY)		/* Y-coordinate in text window that
+    TCL_UNUSED(int))	/* Y-coordinate in text window that
 				 * corresponds to y. */
 {
-    CharInfo *ciPtr = chunkPtr->clientData;
+    CharInfo *ciPtr = (CharInfo *)chunkPtr->clientData;
     const char *string;
     TextStyle *stylePtr;
     StyleValues *sValuePtr;
@@ -8115,10 +8115,10 @@ CharDisplayProc(
 
 static void
 CharUndisplayProc(
-    TkText *textPtr,		/* Overall information about text widget. */
+    TCL_UNUSED(TkText *),	/* Overall information about text widget. */
     TkTextDispChunk *chunkPtr)	/* Chunk that is about to be freed. */
 {
-    CharInfo *ciPtr = chunkPtr->clientData;
+    CharInfo *ciPtr = (CharInfo *)chunkPtr->clientData;
 
     if (ciPtr) {
 #if TK_LAYOUT_WITH_BASE_CHUNKS
@@ -8204,13 +8204,13 @@ CharMeasureProc(
 
 static void
 CharBboxProc(
-    TkText *textPtr,
+    TCL_UNUSED(TkText *),
     TkTextDispChunk *chunkPtr,	/* Chunk containing desired char. */
     int byteIndex,		/* Byte offset of desired character within the
 				 * chunk. */
     int y,			/* Topmost pixel in area allocated for this
 				 * line. */
-    int lineHeight,		/* Height of line, in pixels. */
+    TCL_UNUSED(int),	/* Height of line, in pixels. */
     int baseline,		/* Location of line's baseline, in pixels
 				 * measured down from y. */
     int *xPtr, int *yPtr,	/* Gets filled in with coords of character's
@@ -8221,7 +8221,7 @@ CharBboxProc(
     int *heightPtr)		/* Gets filled in with height of character, in
 				 * pixels. */
 {
-    CharInfo *ciPtr = chunkPtr->clientData;
+    CharInfo *ciPtr = (CharInfo *)chunkPtr->clientData;
     int maxX;
 
     maxX = chunkPtr->width + chunkPtr->x;
@@ -8384,7 +8384,7 @@ AdjustForTab(
 	if (chunkPtr2->displayProc != CharDisplayProc) {
 	    continue;
 	}
-	ciPtr = chunkPtr2->clientData;
+	ciPtr = (CharInfo *)chunkPtr2->clientData;
 	for (p = ciPtr->chars, i = 0; i < ciPtr->numBytes; p++, i++) {
 	    if (isdigit(UCHAR(*p))) {
 		gotDigit = 1;
@@ -8405,7 +8405,7 @@ AdjustForTab(
     if (decimalChunkPtr != NULL) {
 	int curX;
 
-	ciPtr = decimalChunkPtr->clientData;
+	ciPtr = (CharInfo *)decimalChunkPtr->clientData;
 	CharChunkMeasureChars(decimalChunkPtr, NULL, 0, 0, decimal,
 		decimalChunkPtr->x, -1, 0, &curX);
 	desired = tabX - (curX - x);
@@ -8676,7 +8676,7 @@ MeasureChars(
     int curX, width, ch;
     const char *special, *end, *start;
 
-    ch = 0;			/* lint. */
+    ch = 0;
     curX = startX;
     start = source + rangeStart;
     end = start + rangeLength;
diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c
index 00893f2..029f3aa 100644
--- a/unix/tkUnixWm.c
+++ b/unix/tkUnixWm.c
@@ -27,7 +27,7 @@ typedef struct ProtocolHandler {
 				/* Next in list of protocol handlers for the
 				 * same top-level window, or NULL for end of
 				 * list. */
-    Tcl_Interp *interp;		/* Interpreter in which to invoke command. */
+    Tcl_Interp *interp;	/* Interpreter in which to invoke command. */
     char command[1];		/* Tcl command to invoke when a client message
 				 * for this protocol arrives. The actual size
 				 * of the structure varies to accommodate the
diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index 923a58f..ff3f07f 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.c
@@ -57,7 +57,7 @@ typedef struct ProtocolHandler {
 				/* Next in list of protocol handlers for the
 				 * same top-level window, or NULL for end of
 				 * list. */
-    Tcl_Interp *interp;		/* Interpreter in which to invoke command. */
+    Tcl_Interp *interp;	/* Interpreter in which to invoke command. */
     char command[1];		/* Tcl command to invoke when a client message
 				 * for this protocol arrives. The actual size
 				 * of the structure varies to accommodate the
-- 
cgit v0.12


From 23f8f1f53c2ab0960a3389b9342637f928e27e2b Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 10 Sep 2020 12:38:56 +0000
Subject: Add helper xvfb-run script

---
 unix/xvfb-run | 191 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 191 insertions(+)
 create mode 100755 unix/xvfb-run

diff --git a/unix/xvfb-run b/unix/xvfb-run
new file mode 100755
index 0000000..62388fd
--- /dev/null
+++ b/unix/xvfb-run
@@ -0,0 +1,191 @@
+#!/bin/sh
+
+# This script starts an instance of Xvfb, the "fake" X server, runs a command
+# with that server available, and kills the X server when done.  The return
+# value of the command becomes the return value of this script.
+#
+# If anyone is using this to build a Debian package, make sure the package
+# Build-Depends on xvfb and xauth.
+
+set -e
+
+PROGNAME=xvfb-run
+SERVERNUM=99
+AUTHFILE=
+ERRORFILE=/dev/null
+XVFBARGS="-screen 0 1280x1024x24"
+LISTENTCP="-nolisten tcp"
+XAUTHPROTO=.
+
+# Query the terminal to establish a default number of columns to use for
+# displaying messages to the user.  This is used only as a fallback in the event
+# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
+# script is running, and this cannot, only being calculated once.)
+DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
+case "$DEFCOLUMNS" in
+    *[!0-9]*|'') DEFCOLUMNS=80 ;;
+esac
+
+# Display a message, wrapping lines at the terminal width.
+message () {
+    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
+}
+
+# Display an error message.
+error () {
+    message "error: $*" >&2
+}
+
+# Display a usage message.
+usage () {
+    if [ -n "$*" ]; then
+        message "usage error: $*"
+    fi
+    cat <<EOF
+Usage: $PROGNAME [OPTION ...] COMMAND
+Run COMMAND (usually an X client) in a virtual X server environment.
+Options:
+-a        --auto-servernum          try to get a free server number, starting at
+                                    --server-num
+-e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
+                                    output (default: $ERRORFILE)
+-f FILE   --auth-file=FILE          file used to store auth cookie
+                                    (default: ./.Xauthority)
+-h        --help                    display this usage message and exit
+-n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
+-l        --listen-tcp              enable TCP port listening in the X server
+-p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
+                                    (default: xauth command's default)
+-s ARGS   --server-args=ARGS        arguments (other than server number and
+                                    "-nolisten tcp") to pass to the Xvfb server
+                                    (default: "$XVFBARGS")
+EOF
+}
+
+# Find a free server number by looking at .X*-lock files in /tmp.
+find_free_servernum() {
+    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
+    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
+    # anyway.
+    #local i
+
+    i=$SERVERNUM
+    while [ -f /tmp/.X$i-lock ]; do
+        i=$(($i + 1))
+    done
+    echo $i
+}
+
+# Clean up files
+clean_up() {
+    if [ -e "$AUTHFILE" ]; then
+        XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >>"$ERRORFILE" 2>&1
+    fi
+    if [ -n "$XVFB_RUN_TMPDIR" ]; then
+        if ! rm -r "$XVFB_RUN_TMPDIR"; then
+            error "problem while cleaning up temporary directory"
+            exit 5
+        fi
+    fi
+    if [ -n "$XVFBPID" ]; then
+        kill "$XVFBPID" >>"$ERRORFILE" 2>&1
+    fi
+}
+
+# Parse the command line.
+ARGS=$(getopt --options +ae:f:hn:lp:s:w: \
+       --long auto-servernum,error-file:,auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
+       --name "$PROGNAME" -- "$@")
+GETOPT_STATUS=$?
+
+if [ $GETOPT_STATUS -ne 0 ]; then
+    error "internal error; getopt exited with status $GETOPT_STATUS"
+    exit 6
+fi
+
+eval set -- "$ARGS"
+
+while :; do
+    case "$1" in
+        -a|--auto-servernum) SERVERNUM=$(find_free_servernum); AUTONUM="yes" ;;
+        -e|--error-file) ERRORFILE="$2"; shift ;;
+        -f|--auth-file) AUTHFILE="$2"; shift ;;
+        -h|--help) SHOWHELP="yes" ;;
+        -n|--server-num) SERVERNUM="$2"; shift ;;
+        -l|--listen-tcp) LISTENTCP="" ;;
+        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
+        -s|--server-args) XVFBARGS="$2"; shift ;;
+        -w|--wait) shift ;;
+        --) shift; break ;;
+        *) error "internal error; getopt permitted \"$1\" unexpectedly"
+           exit 6
+           ;;
+    esac
+    shift
+done
+
+if [ "$SHOWHELP" ]; then
+    usage
+    exit 0
+fi
+
+if [ -z "$*" ]; then
+    usage "need a command to run" >&2
+    exit 2
+fi
+
+if ! command -v xauth >/dev/null; then
+    error "xauth command not found"
+    exit 3
+fi
+
+# tidy up after ourselves
+trap clean_up EXIT
+
+# If the user did not specify an X authorization file to use, set up a temporary
+# directory to house one.
+if [ -z "$AUTHFILE" ]; then
+    XVFB_RUN_TMPDIR="$(mktemp -d -t $PROGNAME.XXXXXX)"
+    AUTHFILE="$XVFB_RUN_TMPDIR/Xauthority"
+    # Create empty file to avoid xauth warning
+    touch "$AUTHFILE"
+fi
+
+# Start Xvfb.
+MCOOKIE=$(mcookie)
+tries=10
+while [ $tries -gt 0 ]; do
+    tries=$(( $tries - 1 ))
+    XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
+add :$SERVERNUM $XAUTHPROTO $MCOOKIE
+EOF
+    # handle SIGUSR1 so Xvfb knows to send a signal when it's ready to accept
+    # connections
+    trap : USR1
+    (trap '' USR1; exec Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP -auth $AUTHFILE >>"$ERRORFILE" 2>&1) &
+    XVFBPID=$!
+
+    wait || :
+    if kill -0 $XVFBPID 2>/dev/null; then
+        break
+    elif [ -n "$AUTONUM" ]; then
+        # The display is in use so try another one (if '-a' was specified).
+        SERVERNUM=$((SERVERNUM + 1))
+        SERVERNUM=$(find_free_servernum)
+        continue
+    fi
+    error "Xvfb failed to start" >&2
+    XVFBPID=
+    exit 1
+done
+
+# Start the command and save its exit status.
+set +e
+DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1
+RETVAL=$?
+set -e
+
+# Return the executed command's exit status.
+exit $RETVAL
+
+# vim:set ai et sts=4 sw=4 tw=80:
-- 
cgit v0.12


From 01d74802c021f72a1e0a64326659150bef5dc665 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 11 Sep 2020 07:45:51 +0000
Subject: In xvfb-run, don't try to query the terminal width, because we don't
 have one

---
 unix/xvfb-run | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/unix/xvfb-run b/unix/xvfb-run
index 5eb77ac..b7a9d3d 100755
--- a/unix/xvfb-run
+++ b/unix/xvfb-run
@@ -17,18 +17,9 @@ XVFBARGS="-screen 0 1280x1024x24"
 LISTENTCP="-nolisten tcp"
 XAUTHPROTO=.
 
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-case "$DEFCOLUMNS" in
-    *[!0-9]*|'') DEFCOLUMNS=80 ;;
-esac
-
-# Display a message, wrapping lines at the terminal width.
+# Display a message.
 message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
+    echo "$PROGNAME: $*"
 }
 
 # Display an error message.
-- 
cgit v0.12


From cd9987e74b4772140be98620c89fde03aac58ea2 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Sat, 12 Sep 2020 21:30:41 +0000
Subject: Add a disclosure triangle that works in Big Sur

---
 macosx/ttkMacOSXTheme.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 59 insertions(+), 3 deletions(-)

diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c
index df597f4..e999fc2 100644
--- a/macosx/ttkMacOSXTheme.c
+++ b/macosx/ttkMacOSXTheme.c
@@ -303,9 +303,10 @@ static void GetBackgroundColor(
 
 
 /*----------------------------------------------------------------------
- * +++ Single Arrow Buttons --
+ * +++ Single Arrow Images --
  *
- * Used in ListHeaders and Comboboxes.
+ * Used in ListHeaders and Comboboxes as well as disclosure triangles in
+ * macOS 11.
  */
 
 static void DrawDownArrow(
@@ -352,6 +353,48 @@ static void DrawUpArrow(
     CGContextStrokePath(context);
 }
 
+static void DrawClosedDisclosure(
+    CGContextRef context,
+    CGRect bounds,
+    CGFloat inset,
+    CGFloat size,
+    CGFloat *rgba)
+{
+    CGFloat x, y;
+
+    CGContextSetRGBStrokeColor(context, rgba[0], rgba[1], rgba[2], rgba[3]);
+    CGContextSetLineWidth(context, 1.5);
+    x = bounds.origin.x + inset;
+    y = bounds.origin.y + trunc(bounds.size.height / 2);
+    CGContextBeginPath(context);
+    CGPoint arrow[3] = {
+	{x, y - size / 4 - 1}, {x + size / 2, y}, {x, y + size / 4 + 1}
+    };
+    CGContextAddLines(context, arrow, 3);
+    CGContextStrokePath(context);
+}
+
+static void DrawOpenDisclosure(
+    CGContextRef context,
+    CGRect bounds,
+    CGFloat inset,
+    CGFloat size,
+    CGFloat *rgba)
+{
+    CGFloat x, y;
+
+    CGContextSetRGBStrokeColor(context, rgba[0], rgba[1], rgba[2], rgba[3]);
+    CGContextSetLineWidth(context, 1.5);
+    x = bounds.origin.x + inset;
+    y = bounds.origin.y + trunc(bounds.size.height / 2);
+    CGContextBeginPath(context);
+    CGPoint arrow[3] = {
+	{x, y - size / 4}, {x + size / 2, y + size / 2}, {x + size, y - size / 4}
+    };
+    CGContextAddLines(context, arrow, 3);
+    CGContextStrokePath(context);
+}
+
 /*----------------------------------------------------------------------
  * +++ Double Arrow Buttons --
  *
@@ -3001,8 +3044,21 @@ static void DisclosureElementDraw(
 	};
 
 	BEGIN_DRAWING(d)
-	ChkErr(HIThemeDrawButton, &bounds, &info, dc.context, HIOrientation,
+	if ([NSApp macOSVersion] >= 110000) {
+	    CGFloat rgba[4];
+	    NSColorSpace *deviceRGB = [NSColorSpace deviceRGBColorSpace];
+	    NSColor *stroke = [[NSColor textColor]
+		colorUsingColorSpace: deviceRGB];
+	    [stroke getComponents: rgba];
+	    if (state & TTK_TREEVIEW_STATE_OPEN) {
+		DrawOpenDisclosure(dc.context, bounds, 2, 8, rgba);
+	    } else {
+		DrawClosedDisclosure(dc.context, bounds, 2, 12, rgba);
+	    }
+	} else {
+	    ChkErr(HIThemeDrawButton, &bounds, &info, dc.context, HIOrientation,
 	    NULL);
+	}
 	END_DRAWING
     }
 }
-- 
cgit v0.12


From 0e615addeecefdcb56a2623a7a6fe871bb2d4c05 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Sat, 12 Sep 2020 22:10:22 +0000
Subject: Apply patch from Christopher Chavez to address UBSan warnings about
 alignment in ttkMacOSXTheme.c

---
 macosx/ttkMacOSXTheme.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c
index e999fc2..316d52e 100644
--- a/macosx/ttkMacOSXTheme.c
+++ b/macosx/ttkMacOSXTheme.c
@@ -2144,10 +2144,13 @@ static void TrackElementDraw(
     Tcl_GetDoubleFromObj(NULL, elem->valueObj, &value);
     factor = RangeToFactor(to);
 
+    // HIThemeTrackDrawInfo uses 2-byte alignment; assign to separate
+    // bounds variable to avoid UBSan (-fsanitize=alignment) complaint.
+    CGRect bounds = BoxToRect(d, b);
     HIThemeTrackDrawInfo info = {
 	.version = 0,
 	.kind = data->kind,
-	.bounds = BoxToRect(d, b),
+	.bounds = bounds,
 	.min = from * factor,
 	.max = to * factor,
 	.value = value * factor,
@@ -2282,13 +2285,16 @@ static void PbarElementDraw(
     Tcl_GetIntFromObj(NULL, pbar->phaseObj, &phase);
     factor = RangeToFactor(maximum);
 
+    // HIThemeTrackDrawInfo uses 2-byte alignment; assign to separate
+    // bounds variable to avoid UBSan (-fsanitize=alignment) complaint.
+    CGRect bounds = BoxToRect(d, b);
     HIThemeTrackDrawInfo info = {
 	.version = 0,
 	.kind =
 	    (!strcmp("indeterminate",
 	    Tcl_GetString(pbar->modeObj)) && value) ?
 	    kThemeIndeterminateBar : kThemeProgressBar,
-	.bounds = BoxToRect(d, b),
+	.bounds = bounds,
 	.min = 0,
 	.max = maximum * factor,
 	.value = value * factor,
-- 
cgit v0.12


From 26d2f8ec042c3a1c076a64a8651aa88294ff6a0f Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Sat, 12 Sep 2020 22:14:23 +0000
Subject: Adjust comment styling.

---
 macosx/ttkMacOSXTheme.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c
index 316d52e..a9c2195 100644
--- a/macosx/ttkMacOSXTheme.c
+++ b/macosx/ttkMacOSXTheme.c
@@ -2144,8 +2144,11 @@ static void TrackElementDraw(
     Tcl_GetDoubleFromObj(NULL, elem->valueObj, &value);
     factor = RangeToFactor(to);
 
-    // HIThemeTrackDrawInfo uses 2-byte alignment; assign to separate
-    // bounds variable to avoid UBSan (-fsanitize=alignment) complaint.
+    /*
+     * HIThemeTrackDrawInfo uses 2-byte alignment; assigning to a separate
+     * bounds variable avoids UBSan (-fsanitize=alignment) complaints.
+     */
+    
     CGRect bounds = BoxToRect(d, b);
     HIThemeTrackDrawInfo info = {
 	.version = 0,
@@ -2285,8 +2288,11 @@ static void PbarElementDraw(
     Tcl_GetIntFromObj(NULL, pbar->phaseObj, &phase);
     factor = RangeToFactor(maximum);
 
-    // HIThemeTrackDrawInfo uses 2-byte alignment; assign to separate
-    // bounds variable to avoid UBSan (-fsanitize=alignment) complaint.
+    /*
+     * HIThemeTrackDrawInfo uses 2-byte alignment; assigning to a separate
+     * bounds variable avoids UBSan (-fsanitize=alignment) complaints.
+     */
+
     CGRect bounds = BoxToRect(d, b);
     HIThemeTrackDrawInfo info = {
 	.version = 0,
-- 
cgit v0.12


From 226a13396d2297d895bd3ec41c6c61ceb3c8927c Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Mon, 14 Sep 2020 06:47:51 +0000
Subject: image photo svg: add a test for an image without any of  "width",
 "height" and "viewbox". tksvg 0.3 failes here.

---
 tests/imgSVGnano.test | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tests/imgSVGnano.test b/tests/imgSVGnano.test
index 44b4e72..e1993d8 100644
--- a/tests/imgSVGnano.test
+++ b/tests/imgSVGnano.test
@@ -207,6 +207,21 @@ test imgSVGnano-4.2 {error on file not accessible on reread due to configure} -s
     tcltest::removeFile tmpplus.svg
 } -returnCodes error -match glob -result {couldn't open "*/tmpplus.svg": no such file or directory}
 
+# Special images
+test imgSVGnano-3.10 {image without any of  "width", "height" and "viewbox"} -body {
+    image create photo foo -data\
+			{<?xml version="1.0"?><!DOCTYPE svg PUBLIC\
+			"-//W3C//DTD SVG 1.0//EN\"\
+			"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\
+			<svg xmlns="http://www.w3.org/2000/svg">\
+			<g style="fill-opacity:0.7;">\
+			<circle cx="6.5cm" cy="2cm" r="100" style="fill:green;\
+			stroke:black; stroke-width:0.1cm" transform="translate(-70,150)"/>\
+			</g></svg>}
+} -cleanup {
+    rename foo ""
+} -result {foo}
+
 };# end of namespace svgnano
 
 namespace delete svgnano
-- 
cgit v0.12


From 8c5d9cc760f5cb4bfb683f45434de387a36e8d2e Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Mon, 14 Sep 2020 06:56:32 +0000
Subject: Correct test number

---
 tests/imgSVGnano.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/imgSVGnano.test b/tests/imgSVGnano.test
index e1993d8..df827b2 100644
--- a/tests/imgSVGnano.test
+++ b/tests/imgSVGnano.test
@@ -208,7 +208,7 @@ test imgSVGnano-4.2 {error on file not accessible on reread due to configure} -s
 } -returnCodes error -match glob -result {couldn't open "*/tmpplus.svg": no such file or directory}
 
 # Special images
-test imgSVGnano-3.10 {image without any of  "width", "height" and "viewbox"} -body {
+test imgSVGnano-5.0 {image without any of  "width", "height" and "viewbox"} -body {
     image create photo foo -data\
 			{<?xml version="1.0"?><!DOCTYPE svg PUBLIC\
 			"-//W3C//DTD SVG 1.0//EN\"\
-- 
cgit v0.12


From 4511e01659c99d0bd13e19048e94bf5a543ef00d Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Mon, 14 Sep 2020 07:13:41 +0000
Subject: Correct tksvg comment origin to AndroWish, add CHW as contributor.
 The auriocus project is deleted.

---
 generic/tkImgSVGnano.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/generic/tkImgSVGnano.c b/generic/tkImgSVGnano.c
index 7575f86..6d88466 100644
--- a/generic/tkImgSVGnano.c
+++ b/generic/tkImgSVGnano.c
@@ -5,6 +5,7 @@
  *
  * Copyright (c) 2013-14 Mikko Mononen memon@inside.org
  * Copyright (c) 2018 Christian Gollwitzer auriocus@gmx.de
+ * Copyright (c) 2018 Christian Werner https://www.androwish.org/
  * Copyright (c) 2018 Rene Zaumseil r.zaumseil@freenet.de
  *
  * See the file "license.terms" for information on usage and redistribution of
@@ -12,7 +13,7 @@
  *
  * This handler is build using the original nanosvg library files from
  * https://github.com/memononen/nanosvg and the tcl extension files from
- * https://github.com/auriocus/tksvg
+ * androwish https://www.androwish.org/ .
  *
  */
 
-- 
cgit v0.12


From 075429fc2cc7afc986bc3839feacf935c89ccbc7 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 14 Sep 2020 07:36:16 +0000
Subject: Use consistant $idx < 0 in stead of $idx != -1 for checking index
 meaning 'not found'

---
 library/demos/entry3.tcl      | 2 +-
 library/demos/items.tcl       | 4 ++--
 library/demos/ixset           | 2 +-
 library/demos/knightstour.tcl | 8 ++++----
 library/fontchooser.tcl       | 2 +-
 library/iconlist.tcl          | 2 +-
 library/spinbox.tcl           | 4 ++--
 library/tearoff.tcl           | 4 ++--
 library/ttk/fonts.tcl         | 2 +-
 tests/color.test              | 2 +-
 tests/imgBmap.test            | 4 ++--
 tests/imgPhoto.test           | 4 ++--
 tests/textWind.test           | 2 +-
 tests/tk.test                 | 2 +-
 tests/ttk/vsapi.test          | 2 +-
 15 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/library/demos/entry3.tcl b/library/demos/entry3.tcl
index d4435c6..acde1b3 100644
--- a/library/demos/entry3.tcl
+++ b/library/demos/entry3.tcl
@@ -102,7 +102,7 @@ foreach {chars digit} {abc 2 def 3 ghi 4 jkl 5 mno 6 pqrs 7 tuv 8 wxyz 9} {
 
 proc validatePhoneChange {W vmode idx char} {
     global phoneNumberMap entry3content
-    if {$idx == -1} {return 1}
+    if {$idx < 0} {return 1}
     after idle [list $W configure -validate $vmode -invcmd bell]
     if {
 	!($idx<3 || $idx==6 || $idx==7 || $idx==11 || $idx>15) &&
diff --git a/library/demos/items.tcl b/library/demos/items.tcl
index be9214a..c3e14c1 100644
--- a/library/demos/items.tcl
+++ b/library/demos/items.tcl
@@ -250,14 +250,14 @@ proc itemsUnderArea {c} {
     set area [$c find withtag area]
     set items ""
     foreach i [$c find enclosed $areaX1 $areaY1 $areaX2 $areaY2] {
-	if {[lsearch [$c gettags $i] item] != -1} {
+	if {[lsearch [$c gettags $i] item] >= 0} {
 	    lappend items $i
 	}
     }
     puts stdout "Items enclosed by area: $items"
     set items ""
     foreach i [$c find overlapping $areaX1 $areaY1 $areaX2 $areaY2] {
-	if {[lsearch [$c gettags $i] item] != -1} {
+	if {[lsearch [$c gettags $i] item] >= 0} {
 	    lappend items $i
 	}
     }
diff --git a/library/demos/ixset b/library/demos/ixset
index 13235de..7cc35aa 100644
--- a/library/demos/ixset
+++ b/library/demos/ixset
@@ -54,7 +54,7 @@ proc readsettings {} {
     global screencyc ;	set screencyc	600
 
     set xfd [open "|xset q" r]
-    while {[gets $xfd line] > -1} {
+    while {[gets $xfd line] >= 0} {
 	switch -- [lindex $line 0] {
 	    auto {
 		set rpt [lindex $line 1]
diff --git a/library/demos/knightstour.tcl b/library/demos/knightstour.tcl
index b5cffa8..20e3d04 100644
--- a/library/demos/knightstour.tcl
+++ b/library/demos/knightstour.tcl
@@ -29,7 +29,7 @@ proc ValidMoves {square} {
     foreach pair {{-1 -2} {-2 -1} {-2 1} {-1 2} {1 2} {2 1} {2 -1} {1 -2}} {
         set col [expr {($square % 8) + [lindex $pair 0]}]
         set row [expr {($square / 8) + [lindex $pair 1]}]
-        if {$row > -1 && $row < 8 && $col > -1 && $col < 8} {
+        if {$row >= 0 && $row < 8 && $col >= 0 && $col < 8} {
             lappend moves [expr {$row * 8 + $col}]
         }
     }
@@ -41,7 +41,7 @@ proc CheckSquare {square} {
     variable visited
     set moves 0
     foreach test [ValidMoves $square] {
-        if {[lsearch -exact -integer $visited $test] == -1} {
+        if {[lsearch -exact -integer $visited $test] < 0} {
             incr moves
         }
     }
@@ -55,7 +55,7 @@ proc Next {square} {
     set minimum 9
     set nextSquare -1
     foreach testSquare [ValidMoves $square] {
-        if {[lsearch -exact -integer $visited $testSquare] == -1} {
+        if {[lsearch -exact -integer $visited $testSquare] < 0} {
             set count [CheckSquare $testSquare]
             if {$count < $minimum} {
                 set minimum $count
@@ -190,7 +190,7 @@ proc CreateGUI {} {
     ttk::button $dlg.tf.b1 -text Start -command [list Tour $dlg]
     ttk::button $dlg.tf.b2 -text Exit -command [list Exit $dlg]
     set square 0
-    for {set row 7} {$row != -1} {incr row -1} {
+    for {set row 7} {$row >= 0} {incr row -1} {
         for {set col 0} {$col < 8} {incr col} {
             if {(($col & 1) ^ ($row & 1))} {
                 set fill tan3 ; set dfill tan4
diff --git a/library/fontchooser.tcl b/library/fontchooser.tcl
index 9197aea..a9bd706 100644
--- a/library/fontchooser.tcl
+++ b/library/fontchooser.tcl
@@ -384,7 +384,7 @@ proc ::tk::fontchooser::Tracer {var1 var2 op} {
         $S(W).l${var}s selection clear 0 end
         set n [lsearch -exact $S(${var}s,lcase) $value]
         $S(W).l${var}s selection set $n
-        if {$n != -1} {
+        if {$n >= 0} {
             set S($var) [lindex $S(${var}s) $n]
             $S(W).e$var icursor end
             $S(W).e$var selection clear
diff --git a/library/iconlist.tcl b/library/iconlist.tcl
index eed7476..369add0 100644
--- a/library/iconlist.tcl
+++ b/library/iconlist.tcl
@@ -697,7 +697,7 @@ package require Tk 8.6
 	    }
 	}
 
-	if {$theIndex > -1} {
+	if {$theIndex >= 0} {
 	    $w selection clear 0 end
 	    $w selection set $theIndex
 	    $w selection anchor $theIndex
diff --git a/library/spinbox.tcl b/library/spinbox.tcl
index f5a2ad3..2b387d2 100644
--- a/library/spinbox.tcl
+++ b/library/spinbox.tcl
@@ -483,10 +483,10 @@ proc ::tk::spinbox::MouseSelect {w x {cursor {}}} {
 	word {
 	    if {$cur < [$w index anchor]} {
 		set before [tcl_wordBreakBefore [$w get] $cur]
-		set after [tcl_wordBreakAfter [$w get] [expr {$anchor-1}]]
+		set after [tcl_wordBreakAfter [$w get] $anchor-1]
 	    } else {
 		set before [tcl_wordBreakBefore [$w get] $anchor]
-		set after [tcl_wordBreakAfter [$w get] [expr {$cur - 1}]]
+		set after [tcl_wordBreakAfter [$w get] $cur-1]
 	    }
 	    if {$before < 0} {
 		set before 0
diff --git a/library/tearoff.tcl b/library/tearoff.tcl
index 4c8b404..dece4df 100644
--- a/library/tearoff.tcl
+++ b/library/tearoff.tcl
@@ -153,7 +153,7 @@ proc ::tk::MenuDup {src dst type} {
 
     # Copy tags to x, replacing each substring of src with dst.
 
-    while {[set index [string first $src $tags]] != -1} {
+    while {[set index [string first $src $tags]] >= 0} {
 	if {$index > 0} {
 	    append x [string range $tags 0 $index-1]$dst
 	}
@@ -170,7 +170,7 @@ proc ::tk::MenuDup {src dst type} {
 
 	# Copy script to x, replacing each substring of event with dst.
 
-	while {[set index [string first $event $script]] != -1} {
+	while {[set index [string first $event $script]] >= 0} {
 	    if {$index > 0} {
 		append x [string range $script 0 $index-1]
 	    }
diff --git a/library/ttk/fonts.tcl b/library/ttk/fonts.tcl
index a2781c6..bf4ccd0 100644
--- a/library/ttk/fonts.tcl
+++ b/library/ttk/fonts.tcl
@@ -82,7 +82,7 @@ switch -- [tk windowingsystem] {
                 set F(family) "MS Sans Serif"
             }
         } else {
-            if {[lsearch -exact [font families] Tahoma] != -1} {
+            if {[lsearch -exact [font families] Tahoma] >= 0} {
                 set F(family) "Tahoma"
             } else {
                 set F(family) "MS Sans Serif"
diff --git a/tests/color.test b/tests/color.test
index 4cdaf23..2fd09d2 100644
--- a/tests/color.test
+++ b/tests/color.test
@@ -162,7 +162,7 @@ test color-1.4 {Tk_AllocColorFromObj - try other colors in list} colorsFree {
 test color-1.5 {Color table} nonPortable {
     set fd [open ../xlib/rgb.txt]
     set result {}
-    while {[gets $fd line] != -1} {
+    while {[gets $fd line] >= 0} {
     	if {[string index $line 0] == "!"} continue
 	set rgb [c255 [winfo rgb . [lrange $line 3 end]]]
 	if {$rgb != [lrange $line 0 2] } {
diff --git a/tests/imgBmap.test b/tests/imgBmap.test
index a2ebdfa..8da1742 100644
--- a/tests/imgBmap.test
+++ b/tests/imgBmap.test
@@ -503,8 +503,8 @@ test imageBmap-11.2 {ImgBmapDelete procedure} -body {
 test imageBmap-12.1 {ImgBmapCmdDeletedProc procedure} -body {
     image create bitmap i2 -file foo.bm -maskfile foo2.bm
     rename i2 {}
-    list [lsearch -exact [imageNames] i2] [catch {i2 foo} msg] $msg
-} -result {-1 1 {invalid command name "i2"}}
+    list [expr {i2 in [imageNames]}] [catch {i2 foo} msg] $msg
+} -result {0 1 {invalid command name "i2"}}
 
 removeFile foo.bm
 removeFile foo2.bm
diff --git a/tests/imgPhoto.test b/tests/imgPhoto.test
index 3c4c7a5..7767690 100644
--- a/tests/imgPhoto.test
+++ b/tests/imgPhoto.test
@@ -952,8 +952,8 @@ test imgPhoto-9.1 {ImgPhotoCmdDeletedProc procedure} -constraints {
 } -body {
     image create photo photo2 -file $teapotPhotoFile
     rename photo2 {}
-    list [lsearch -exact [imageNames] photo2] [catch {photo2 foo} msg] $msg
-} -result {-1 1 {invalid command name "photo2"}}
+    list [expr {photo2 in [imageNames]}] [catch {photo2 foo} msg] $msg
+} -result {0 1 {invalid command name "photo2"}}
 
 test imgPhoto-10.1 {Tk_ImgPhotoPutBlock procedure} -setup {
     imageCleanup
diff --git a/tests/textWind.test b/tests/textWind.test
index db75c68..f2b5703 100644
--- a/tests/textWind.test
+++ b/tests/textWind.test
@@ -773,7 +773,7 @@ test textWind-10.6 {EmbWinLayoutProc procedure, error in creating window} -setup
     .t delete 1.0 end
     proc bgerror args {
         global msg
-        if {[lsearch -exact $msg $args] == -1} {
+        if {[lsearch -exact $msg $args] < 0} {
             lappend msg $args
         }
     }
diff --git a/tests/tk.test b/tests/tk.test
index 748a6cf..30a36d9 100644
--- a/tests/tk.test
+++ b/tests/tk.test
@@ -157,7 +157,7 @@ test tk-6.5 {tk inactive} -body {
     update
     after 100
     set i [tk inactive]
-    expr {$i == -1 || ( $i > 90 && $i < 200 )}
+    expr {$i < 0 || ( $i > 90 && $i < 200 )}
 } -result 1
 
 test tk-7.1 {tk inactive in a safe interpreter} -body {
diff --git a/tests/ttk/vsapi.test b/tests/ttk/vsapi.test
index bb88fef..3966bd9 100644
--- a/tests/ttk/vsapi.test
+++ b/tests/ttk/vsapi.test
@@ -6,7 +6,7 @@ package require tcltest ; namespace import -force tcltest::*
 loadTestedCommands
 
 testConstraint xpnative \
-    [expr {[lsearch -exact [ttk::style theme names] xpnative] != -1}]
+    [expr {"xpnative" in [ttk::style theme names]}]
 
 test vsapi-1.1 "WINDOW WP_SMALLCLOSEBUTTON" -constraints {xpnative} -body {
     ttk::style element create smallclose vsapi \
-- 
cgit v0.12


From 19013242170fcb53f480c10a5ca48578456d2f1b Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 14 Sep 2020 08:01:13 +0000
Subject: Missing quotes in test-cases

---
 tests/imgBmap.test  | 2 +-
 tests/imgPhoto.test | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/imgBmap.test b/tests/imgBmap.test
index 8da1742..56484a6 100644
--- a/tests/imgBmap.test
+++ b/tests/imgBmap.test
@@ -503,7 +503,7 @@ test imageBmap-11.2 {ImgBmapDelete procedure} -body {
 test imageBmap-12.1 {ImgBmapCmdDeletedProc procedure} -body {
     image create bitmap i2 -file foo.bm -maskfile foo2.bm
     rename i2 {}
-    list [expr {i2 in [imageNames]}] [catch {i2 foo} msg] $msg
+    list [expr {"i2" in [imageNames]}] [catch {i2 foo} msg] $msg
 } -result {0 1 {invalid command name "i2"}}
 
 removeFile foo.bm
diff --git a/tests/imgPhoto.test b/tests/imgPhoto.test
index 7767690..140d7fa 100644
--- a/tests/imgPhoto.test
+++ b/tests/imgPhoto.test
@@ -952,7 +952,7 @@ test imgPhoto-9.1 {ImgPhotoCmdDeletedProc procedure} -constraints {
 } -body {
     image create photo photo2 -file $teapotPhotoFile
     rename photo2 {}
-    list [expr {photo2 in [imageNames]}] [catch {photo2 foo} msg] $msg
+    list [expr {"photo2" in [imageNames]}] [catch {photo2 foo} msg] $msg
 } -result {0 1 {invalid command name "photo2"}}
 
 test imgPhoto-10.1 {Tk_ImgPhotoPutBlock procedure} -setup {
-- 
cgit v0.12


From ad861a0433fe3325ce081e6df2b40ed7fd670fe9 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 14 Sep 2020 10:33:31 +0000
Subject: Prevent the usage of the term safe/unsafe child

---
 doc/selection.n                 |  2 +-
 generic/tkImgBmap.c             |  2 +-
 generic/tkImgPNG.c              |  4 +-
 generic/tkImgPPM.c              |  4 +-
 generic/tkInt.h                 |  6 +--
 generic/tkMain.c                |  8 +++-
 generic/tkOption.c              | 78 ++++++++++++++++++-------------------
 library/safetk.tcl              |  2 +-
 macosx/ttkMacOSXTheme.c         |  2 +-
 tests/safePrimarySelection.test | 86 ++++++++++++++++++++---------------------
 tests/unixEmbed.test            |  2 +-
 11 files changed, 101 insertions(+), 95 deletions(-)

diff --git a/doc/selection.n b/doc/selection.n
index bb4cf09..a2c5ae5 100644
--- a/doc/selection.n
+++ b/doc/selection.n
@@ -150,7 +150,7 @@ A GUI event, for example \fB<<PasteSelection>>\fR, can copy the \fBPRIMARY\fR se
 .PP
 On X11, the \fBPRIMARY\fR selection is a system-wide feature of the X server, allowing communication between different processes that are X11 clients.
 .PP
-On Windows, the \fBPRIMARY\fR selection is not provided by the system, but only by Tk, and so it is shared only between windows of a parent interpreter and its unsafe child interpreters.  It is not shared between interpreters in different processes or different threads.  Each parent interpreter has a separate \fBPRIMARY\fR selection that is shared only with its unsafe childs.
+On Windows, the \fBPRIMARY\fR selection is not provided by the system, but only by Tk, and so it is shared only between windows of a parent interpreter and its child interpreters.  It is not shared between interpreters in different processes or different threads.  Each parent interpreter has a separate \fBPRIMARY\fR selection that is shared only with its child interpreters which are not safe interpreters.
 .PP
 .SH SECURITY
 .PP
diff --git a/generic/tkImgBmap.c b/generic/tkImgBmap.c
index c6ab05d..04027b0 100644
--- a/generic/tkImgBmap.c
+++ b/generic/tkImgBmap.c
@@ -1083,7 +1083,7 @@ GetByte(
     int size;
 
     size = Tcl_Read(chan, &buffer, 1);
-    if (size <= 0) {
+    if (size != 1) {
 	return EOF;
     } else {
 	return buffer;
diff --git a/generic/tkImgPNG.c b/generic/tkImgPNG.c
index c6f2dcb..07b4f8b 100644
--- a/generic/tkImgPNG.c
+++ b/generic/tkImgPNG.c
@@ -626,7 +626,7 @@ ReadData(
 	int blockSz = PNG_MIN(destSz, PNG_BLOCK_SZ);
 
 	blockSz = Tcl_Read(pngPtr->channel, (char *)destPtr, blockSz);
-	if (blockSz < 0) {
+	if (blockSz == -1) {
 	    /* TODO: failure info... */
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "channel read failed: %s", Tcl_PosixError(interp)));
@@ -2884,7 +2884,7 @@ WriteData(
 	}
 
 	memcpy(destPtr+objSz, srcPtr, srcSz);
-    } else if (Tcl_Write(pngPtr->channel, (const char *) srcPtr, srcSz) < 0) {
+    } else if (Tcl_Write(pngPtr->channel, (const char *) srcPtr, srcSz) == -1) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"write to channel failed: %s", Tcl_PosixError(interp)));
 	return TCL_ERROR;
diff --git a/generic/tkImgPPM.c b/generic/tkImgPPM.c
index 6f084f0..89d4387 100644
--- a/generic/tkImgPPM.c
+++ b/generic/tkImgPPM.c
@@ -323,8 +323,8 @@ FileWritePPM(
 	    pixelPtr = pixLinePtr;
 	    for (w = blockPtr->width; w > 0; w--) {
 		if (    Tcl_Write(chan,(char *)&pixelPtr[0], 1) == -1 ||
-			Tcl_Write(chan,(char *)&pixelPtr[greenOffset],1)==-1 ||
-			Tcl_Write(chan,(char *)&pixelPtr[blueOffset],1) ==-1) {
+			Tcl_Write(chan,(char *)&pixelPtr[greenOffset],1) == -1 ||
+			Tcl_Write(chan,(char *)&pixelPtr[blueOffset],1) == -1) {
 		    goto writeerror;
 		}
 		pixelPtr += blockPtr->pixelSize;
diff --git a/generic/tkInt.h b/generic/tkInt.h
index 9f22b99..c1c9f88 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -363,9 +363,9 @@ typedef struct TkDisplay {
      */
 
     Tcl_HashTable maintainHashTable;
-				/* Hash table that maps from a master's
-				 * Tk_Window token to a list of slaves managed
-				 * by that master. */
+				/* Hash table that maps from a container's
+				 * Tk_Window token to a list of windows managed
+				 * by that container. */
     int geomInit;
 
 #define TkGetGeomMaster(tkwin) (((TkWindow *)tkwin)->maintainerPtr != NULL ? \
diff --git a/generic/tkMain.c b/generic/tkMain.c
index c6c9835..32006b3 100644
--- a/generic/tkMain.c
+++ b/generic/tkMain.c
@@ -40,6 +40,9 @@ static const char DEFAULT_PRIMARY_PROMPT[] = "% ";
  * to strcmp here.
  */
 #ifdef _WIN32
+#ifdef __cplusplus
+extern "C" {
+#endif
 /*  Little hack to eliminate the need for "tclInt.h" here:
     Just copy a small portion of TclIntPlatStubs, just
     enough to make it work. See [600b72bfbc] */
@@ -50,6 +53,9 @@ typedef struct {
     int (*tclpIsAtty) (int fd); /* 16 */
 } TclIntPlatStubs;
 extern const TclIntPlatStubs *tclIntPlatStubsPtr;
+#ifdef __cplusplus
+}
+#endif
 #   include "tkWinInt.h"
 #else
 #   define TCHAR char
@@ -417,7 +423,7 @@ StdinProc(
 
     count = Tcl_Gets(chan, &isPtr->line);
 
-    if (count == -1 && !isPtr->gotPartial) {
+    if ((count == -1) && !isPtr->gotPartial) {
 	if (isPtr->tty) {
 	    Tcl_Exit(0);
 	} else {
diff --git a/generic/tkOption.c b/generic/tkOption.c
index 8aaf805..15fc405 100644
--- a/generic/tkOption.c
+++ b/generic/tkOption.c
@@ -254,16 +254,16 @@ Tk_AddOption(
 				 * TK_MAX_PRIO. */
 {
     TkWindow *winPtr = ((TkWindow *) tkwin)->mainPtr->winPtr;
-    register ElArray **arrayPtrPtr;
-    register Element *elPtr;
+    ElArray **arrayPtrPtr;
+    Element *elPtr;
     Element newEl;
-    register const char *p;
+    const char *p;
     const char *field;
     int count, firstField;
-    ptrdiff_t length;
+    size_t length;
 #define TMP_SIZE 100
     char tmp[TMP_SIZE+1];
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     if (winPtr->mainPtr->optionRootPtr == NULL) {
@@ -311,7 +311,7 @@ Tk_AddOption(
 	if (length > TMP_SIZE) {
 	    length = TMP_SIZE;
 	}
-	strncpy(tmp, field, (size_t) length);
+	strncpy(tmp, field, length);
 	tmp[length] = 0;
 	newEl.nameUid = Tk_GetUid(tmp);
 	if (isupper(UCHAR(*field))) {
@@ -407,11 +407,11 @@ Tk_GetOption(
 {
     Tk_Uid nameId, classId = NULL;
     const char *masqName;
-    register Element *elPtr, *bestPtr;
-    register int count;
+    Element *elPtr, *bestPtr;
+    int count;
     StackLevel *levelPtr;
     int stackDepth[NUM_STACKS];
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     /*
@@ -521,8 +521,8 @@ Tk_GetOption(
     if (masqName != NULL) {
 	char *masqClass;
 	Tk_Uid nodeId, winClassId, winNameId;
-	unsigned int classNameLength;
-	register Element *nodePtr, *leafPtr;
+	size_t classNameLength;
+	Element *nodePtr, *leafPtr;
 	static const int searchOrder[] = {
 	    EXACT_NODE_NAME, WILDCARD_NODE_NAME, EXACT_NODE_CLASS,
 	    WILDCARD_NODE_CLASS, -1
@@ -534,8 +534,8 @@ Tk_GetOption(
 	 * Extract the masquerade class name from the name field.
 	 */
 
-	classNameLength	= (unsigned) (masqName - name);
-	masqClass = ckalloc(classNameLength + 1);
+	classNameLength	= (size_t) (masqName - name);
+	masqClass = (char *)ckalloc(classNameLength + 1);
 	strncpy(masqClass, name, classNameLength);
 	masqClass[classNameLength] = '\0';
 
@@ -615,9 +615,9 @@ Tk_OptionObjCmd(
     int objc,			/* Number of Tcl_Obj arguments. */
     Tcl_Obj *const objv[])	/* Tcl_Obj arguments. */
 {
-    Tk_Window tkwin = clientData;
+    Tk_Window tkwin = (Tk_Window)clientData;
     int index, result;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
     static const char *const optionCmds[] = {
 	"add", "clear", "get", "readfile", NULL
@@ -738,9 +738,9 @@ Tk_OptionObjCmd(
 
 void
 TkOptionDeadWindow(
-    register TkWindow *winPtr)	/* Window to be cleaned up. */
+    TkWindow *winPtr)	/* Window to be cleaned up. */
 {
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     /*
@@ -796,7 +796,7 @@ TkOptionClassChanged(
 {
     int i, j, *basePtr;
     ElArray *arrayPtr;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     if (winPtr->optionLevel == -1) {
@@ -922,7 +922,7 @@ AddFromString(
 				 * TK_INTERACTIVE_PRIO. Must be between 0 and
 				 * TK_MAX_PRIO. */
 {
-    register char *src, *dst;
+    char *src, *dst;
     char *name, *value;
     int lineNum;
 
@@ -1115,7 +1115,7 @@ ReadOptionFile(
     Tcl_IncrRefCount(buffer);
     Tcl_SetChannelOption(NULL, chan, "-encoding", "utf-8");
     bufferSize = Tcl_ReadChars(chan, buffer, -1, 0);
-    if (bufferSize < 0) {
+    if (bufferSize == -1) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"error reading file \"%s\": %s",
 		fileName, Tcl_PosixError(interp)));
@@ -1149,7 +1149,7 @@ static ElArray *
 NewArray(
     int numEls)			/* How many elements of space to allocate. */
 {
-    register ElArray *arrayPtr = ckalloc(EL_ARRAY_SIZE(numEls));
+    ElArray *arrayPtr = (ElArray *)ckalloc(EL_ARRAY_SIZE(numEls));
 
     arrayPtr->arraySize = numEls;
     arrayPtr->numUsed = 0;
@@ -1176,17 +1176,17 @@ NewArray(
 
 static ElArray *
 ExtendArray(
-    register ElArray *arrayPtr,	/* Array to be extended. */
-    register Element *elPtr)	/* Element to be copied into array. */
+    ElArray *arrayPtr,	/* Array to be extended. */
+    Element *elPtr)	/* Element to be copied into array. */
 {
     /*
      * If the current array has filled up, make it bigger.
      */
 
     if (arrayPtr->numUsed >= arrayPtr->arraySize) {
-	register int newSize = 2*arrayPtr->arraySize;
+	int newSize = 2*arrayPtr->arraySize;
 
-	arrayPtr = ckrealloc(arrayPtr, EL_ARRAY_SIZE(newSize));
+	arrayPtr = (ElArray *)ckrealloc(arrayPtr, EL_ARRAY_SIZE(newSize));
 	arrayPtr->arraySize = newSize;
 	arrayPtr->nextToUse = &arrayPtr->els[arrayPtr->numUsed];
     }
@@ -1225,9 +1225,9 @@ SetupStacks(
 {
     int level, i;
     const int *iPtr;
-    register StackLevel *levelPtr;
-    register ElArray *arrayPtr;
-    ThreadSpecificData *tsdPtr =
+    StackLevel *levelPtr;
+    ElArray *arrayPtr;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     /*
@@ -1304,7 +1304,7 @@ SetupStacks(
      */
 
     if (tsdPtr->curLevel >= tsdPtr->numLevels) {
-	StackLevel *newLevels =
+	StackLevel *newLevels = (StackLevel *)
 		ckalloc(tsdPtr->numLevels * 2 * sizeof(StackLevel));
 
 	memcpy(newLevels, tsdPtr->levels,
@@ -1331,7 +1331,7 @@ SetupStacks(
      */
 
     for (iPtr = searchOrder; *iPtr != -1; iPtr++) {
-	register Element *elPtr;
+	Element *elPtr;
 	int count;
 	Tk_Uid id;
 
@@ -1386,9 +1386,9 @@ ExtendStacks(
     int leaf)			/* If zero, then don't copy exact leaf
 				 * elements. */
 {
-    register int count;
-    register Element *elPtr;
-    ThreadSpecificData *tsdPtr =
+    int count;
+    Element *elPtr;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     for (elPtr = arrayPtr->els, count = arrayPtr->numUsed;
@@ -1419,9 +1419,9 @@ ExtendStacks(
 
 static void
 OptionThreadExitProc(
-    ClientData clientData)	/* not used */
+    TCL_UNUSED(void *))
 {
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     if (tsdPtr->initialized) {
@@ -1453,13 +1453,13 @@ OptionThreadExitProc(
 
 static void
 OptionInit(
-    register TkMainInfo *mainPtr)
+    TkMainInfo *mainPtr)
 				/* Top-level information about window that
 				 * isn't initialized yet. */
 {
     int i;
     Tcl_Interp *interp;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
     Element *defaultMatchPtr = &tsdPtr->defaultMatch;
 
@@ -1474,7 +1474,7 @@ OptionInit(
 	tsdPtr->curLevel = -1;
 	tsdPtr->serial = 0;
 
-	tsdPtr->levels = ckalloc(5 * sizeof(StackLevel));
+	tsdPtr->levels = (StackLevel *)ckalloc(5 * sizeof(StackLevel));
 	for (i = 0; i < NUM_STACKS; i++) {
 	    tsdPtr->stacks[i] = NewArray(10);
 	    tsdPtr->levels[0].bases[i] = 0;
@@ -1521,7 +1521,7 @@ ClearOptionTree(
     ElArray *arrayPtr)		/* Array of options; delete everything
 				 * referred to recursively by this. */
 {
-    register Element *elPtr;
+    Element *elPtr;
     int count;
 
     for (count = arrayPtr->numUsed, elPtr = arrayPtr->els;  count > 0;
diff --git a/library/safetk.tcl b/library/safetk.tcl
index 841a0b6..9e71cc6 100644
--- a/library/safetk.tcl
+++ b/library/safetk.tcl
@@ -220,7 +220,7 @@ proc ::safe::tkTopLevel {child display} {
     set w ".safe$tkSafeId"
     if {[catch {toplevel $w -screen $display -class SafeTk} msg]} {
 	return -code error -errorcode {TK TOPLEVEL SAFE} \
-	    "Unable to create toplevel for safe child \"$child\" ($msg)"
+	    "Unable to create toplevel for \"$child\" ($msg)"
     }
     Log $child "New toplevel $w" NOTICE
 
diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c
index a9c2195..3541dd8 100644
--- a/macosx/ttkMacOSXTheme.c
+++ b/macosx/ttkMacOSXTheme.c
@@ -2148,7 +2148,7 @@ static void TrackElementDraw(
      * HIThemeTrackDrawInfo uses 2-byte alignment; assigning to a separate
      * bounds variable avoids UBSan (-fsanitize=alignment) complaints.
      */
-    
+
     CGRect bounds = BoxToRect(d, b);
     HIThemeTrackDrawInfo info = {
 	.version = 0,
diff --git a/tests/safePrimarySelection.test b/tests/safePrimarySelection.test
index e6ef487..8475ce3 100644
--- a/tests/safePrimarySelection.test
+++ b/tests/safePrimarySelection.test
@@ -17,8 +17,8 @@ tcltest::loadTestedCommands
 # - Tests 3.*, 6.* test that the fix for ticket de156e9efe implemented in branch
 #   bug-de156e9efe has been applied and still works.  They test that a Safe Base
 #   child interpreter cannot write to the PRIMARY selection.
-# - The other tests verify that the parent interpreter and an unsafe child CAN
-#   write to the PRIMARY selection, and therefore that the test scripts
+# - The other tests verify that the parent interpreter and an child interpreter
+#   CAN write to the PRIMARY selection, and therefore that the test scripts
 #   themselves are valid.
 # - A text, entry, ttk::entry, listbox, spinbox or ttk::spinbox widget can have
 #   option -exportselection 1, meaning (in an unsafe interpreter) that a
@@ -33,7 +33,7 @@ namespace eval ::_test_tmp {}
 # ------------------------------------------------------------------------------
 #  Proc ::_test_tmp::unsafeInterp
 # ------------------------------------------------------------------------------
-# Command that creates an unsafe child interpreter and tries to load Tk.
+# Command that creates an child interpreter and tries to load Tk.
 # - This is necessary for loading Tk if the tests are done in the build
 #   directory without installing Tk.  In that case the usual auto_path loading
 #   mechanism cannot work because the tk binary is not where pkgIndex.tcl says
@@ -331,7 +331,7 @@ test safePrimarySelection-1.10 {parent interpreter, ttk::spinbox spun/selected/s
     ::_test_tmp::clearPrimarySelection
 } -result {3}
 
-test safePrimarySelection-2.1 {unsafe child interpreter, text, no existing selection} -setup {
+test safePrimarySelection-2.1 {child interpreter, text, no existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
@@ -348,7 +348,7 @@ test safePrimarySelection-2.1 {unsafe child interpreter, text, no existing selec
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-2.2 {unsafe child interpreter, entry, no existing selection} -setup {
+test safePrimarySelection-2.2 {child interpreter, entry, no existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
@@ -365,7 +365,7 @@ test safePrimarySelection-2.2 {unsafe child interpreter, entry, no existing sele
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-2.3 {unsafe child interpreter, ttk::entry, no existing selection} -setup {
+test safePrimarySelection-2.3 {child interpreter, ttk::entry, no existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
@@ -382,7 +382,7 @@ test safePrimarySelection-2.3 {unsafe child interpreter, ttk::entry, no existing
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-2.4 {unsafe child interpreter, listbox, no existing selection} -setup {
+test safePrimarySelection-2.4 {child interpreter, listbox, no existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
@@ -399,7 +399,7 @@ test safePrimarySelection-2.4 {unsafe child interpreter, listbox, no existing se
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-2.5 {unsafe child interpreter, spinbox as entry, no existing selection} -setup {
+test safePrimarySelection-2.5 {child interpreter, spinbox as entry, no existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
@@ -416,7 +416,7 @@ test safePrimarySelection-2.5 {unsafe child interpreter, spinbox as entry, no ex
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-2.6 {unsafe child interpreter, spinbox spun, no existing selection} -setup {
+test safePrimarySelection-2.6 {child interpreter, spinbox spun, no existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
@@ -433,7 +433,7 @@ test safePrimarySelection-2.6 {unsafe child interpreter, spinbox spun, no existi
     ::_test_tmp::clearPrimarySelection
 } -result {2}
 
-test safePrimarySelection-2.7 {unsafe child interpreter, spinbox spun/selected/spun, no existing selection} -setup {
+test safePrimarySelection-2.7 {child interpreter, spinbox spun/selected/spun, no existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
@@ -450,7 +450,7 @@ test safePrimarySelection-2.7 {unsafe child interpreter, spinbox spun/selected/s
     ::_test_tmp::clearPrimarySelection
 } -result {3}
 
-test safePrimarySelection-2.8 {unsafe child interpreter, ttk::spinbox as entry, no existing selection} -setup {
+test safePrimarySelection-2.8 {child interpreter, ttk::spinbox as entry, no existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
@@ -467,7 +467,7 @@ test safePrimarySelection-2.8 {unsafe child interpreter, ttk::spinbox as entry,
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-2.9 {unsafe child interpreter, ttk::spinbox spun, no existing selection} -setup {
+test safePrimarySelection-2.9 {child interpreter, ttk::spinbox spun, no existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
@@ -484,7 +484,7 @@ test safePrimarySelection-2.9 {unsafe child interpreter, ttk::spinbox spun, no e
     ::_test_tmp::clearPrimarySelection
 } -result {2}
 
-test safePrimarySelection-2.10 {unsafe child interpreter, ttk::spinbox spun/selected/spun, no existing selection} -setup {
+test safePrimarySelection-2.10 {child interpreter, ttk::spinbox spun/selected/spun, no existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
@@ -501,7 +501,7 @@ test safePrimarySelection-2.10 {unsafe child interpreter, ttk::spinbox spun/sele
     ::_test_tmp::clearPrimarySelection
 } -result {3}
 
-test safePrimarySelection-3.1 {IMPORTANT, safe child interpreter, text, no existing selection} -setup {
+test safePrimarySelection-3.1 {IMPORTANT, safe interpreter, text, no existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
@@ -522,7 +522,7 @@ test safePrimarySelection-3.1 {IMPORTANT, safe child interpreter, text, no exist
     ::_test_tmp::clearPrimarySelection
 } -result {----}
 
-test safePrimarySelection-3.2 {IMPORTANT, safe child interpreter, entry, no existing selection} -setup {
+test safePrimarySelection-3.2 {IMPORTANT, safe interpreter, entry, no existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
@@ -543,7 +543,7 @@ test safePrimarySelection-3.2 {IMPORTANT, safe child interpreter, entry, no exis
     ::_test_tmp::clearPrimarySelection
 } -result {----}
 
-test safePrimarySelection-3.3 {IMPORTANT, safe child interpreter, ttk::entry, no existing selection} -setup {
+test safePrimarySelection-3.3 {IMPORTANT, safe interpreter, ttk::entry, no existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
@@ -564,7 +564,7 @@ test safePrimarySelection-3.3 {IMPORTANT, safe child interpreter, ttk::entry, no
     ::_test_tmp::clearPrimarySelection
 } -result {----}
 
-test safePrimarySelection-3.4 {IMPORTANT, safe child interpreter, listbox, no existing selection} -setup {
+test safePrimarySelection-3.4 {IMPORTANT, safe interpreter, listbox, no existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
@@ -585,7 +585,7 @@ test safePrimarySelection-3.4 {IMPORTANT, safe child interpreter, listbox, no ex
     ::_test_tmp::clearPrimarySelection
 } -result {----}
 
-test safePrimarySelection-3.5 {IMPORTANT, safe child interpreter, spinbox as entry, no existing selection} -setup {
+test safePrimarySelection-3.5 {IMPORTANT, safe interpreter, spinbox as entry, no existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
@@ -606,7 +606,7 @@ test safePrimarySelection-3.5 {IMPORTANT, safe child interpreter, spinbox as ent
     ::_test_tmp::clearPrimarySelection
 } -result {----}
 
-test safePrimarySelection-3.6 {IMPORTANT, safe child interpreter, spinbox spun, no existing selection} -setup {
+test safePrimarySelection-3.6 {IMPORTANT, safe interpreter, spinbox spun, no existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
@@ -627,7 +627,7 @@ test safePrimarySelection-3.6 {IMPORTANT, safe child interpreter, spinbox spun,
     ::_test_tmp::clearPrimarySelection
 } -result {----}
 
-test safePrimarySelection-3.7 {IMPORTANT, safe child interpreter, spinbox spun/selected/spun, no existing selection} -setup {
+test safePrimarySelection-3.7 {IMPORTANT, safe interpreter, spinbox spun/selected/spun, no existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
@@ -648,7 +648,7 @@ test safePrimarySelection-3.7 {IMPORTANT, safe child interpreter, spinbox spun/s
     ::_test_tmp::clearPrimarySelection
 } -result {----}
 
-test safePrimarySelection-3.8 {IMPORTANT, safe child interpreter, ttk::spinbox as entry, no existing selection} -setup {
+test safePrimarySelection-3.8 {IMPORTANT, safe interpreter, ttk::spinbox as entry, no existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
@@ -669,7 +669,7 @@ test safePrimarySelection-3.8 {IMPORTANT, safe child interpreter, ttk::spinbox a
     ::_test_tmp::clearPrimarySelection
 } -result {----}
 
-test safePrimarySelection-3.9 {IMPORTANT, safe child interpreter, ttk::spinbox spun, no existing selection} -setup {
+test safePrimarySelection-3.9 {IMPORTANT, safe interpreter, ttk::spinbox spun, no existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
@@ -690,7 +690,7 @@ test safePrimarySelection-3.9 {IMPORTANT, safe child interpreter, ttk::spinbox s
     ::_test_tmp::clearPrimarySelection
 } -result {----}
 
-test safePrimarySelection-3.10 {IMPORTANT, safe child interpreter, ttk::spinbox spun/selected/spun, no existing selection} -setup {
+test safePrimarySelection-3.10 {IMPORTANT, safe interpreter, ttk::spinbox spun/selected/spun, no existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::clearPrimarySelection
@@ -831,7 +831,7 @@ test safePrimarySelection-4.10 {parent interpreter, ttk::spinbox spun/selected/s
     ::_test_tmp::clearPrimarySelection
 } -result {3}
 
-test safePrimarySelection-5.1 {unsafe child interpreter, text, existing selection} -setup {
+test safePrimarySelection-5.1 {child interpreter, text, existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
@@ -848,7 +848,7 @@ test safePrimarySelection-5.1 {unsafe child interpreter, text, existing selectio
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-5.2 {unsafe child interpreter, entry, existing selection} -setup {
+test safePrimarySelection-5.2 {child interpreter, entry, existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
@@ -865,7 +865,7 @@ test safePrimarySelection-5.2 {unsafe child interpreter, entry, existing selecti
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-5.3 {unsafe child interpreter, ttk::entry, existing selection} -setup {
+test safePrimarySelection-5.3 {child interpreter, ttk::entry, existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
@@ -882,7 +882,7 @@ test safePrimarySelection-5.3 {unsafe child interpreter, ttk::entry, existing se
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-5.4 {unsafe child interpreter, listbox, existing selection} -setup {
+test safePrimarySelection-5.4 {child interpreter, listbox, existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
@@ -899,7 +899,7 @@ test safePrimarySelection-5.4 {unsafe child interpreter, listbox, existing selec
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-5.5 {unsafe child interpreter, spinbox as entry, existing selection} -setup {
+test safePrimarySelection-5.5 {child interpreter, spinbox as entry, existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
@@ -916,7 +916,7 @@ test safePrimarySelection-5.5 {unsafe child interpreter, spinbox as entry, exist
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-5.6 {unsafe child interpreter, spinbox spun, existing selection} -setup {
+test safePrimarySelection-5.6 {child interpreter, spinbox spun, existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
@@ -933,7 +933,7 @@ test safePrimarySelection-5.6 {unsafe child interpreter, spinbox spun, existing
     ::_test_tmp::clearPrimarySelection
 } -result {2}
 
-test safePrimarySelection-5.7 {unsafe child interpreter, spinbox spun/selected/spun, existing selection} -setup {
+test safePrimarySelection-5.7 {child interpreter, spinbox spun/selected/spun, existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
@@ -950,7 +950,7 @@ test safePrimarySelection-5.7 {unsafe child interpreter, spinbox spun/selected/s
     ::_test_tmp::clearPrimarySelection
 } -result {3}
 
-test safePrimarySelection-5.8 {unsafe child interpreter, ttk::spinbox as entry, existing selection} -setup {
+test safePrimarySelection-5.8 {child interpreter, ttk::spinbox as entry, existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
@@ -967,7 +967,7 @@ test safePrimarySelection-5.8 {unsafe child interpreter, ttk::spinbox as entry,
     ::_test_tmp::clearPrimarySelection
 } -result {PAYLOAD}
 
-test safePrimarySelection-5.9 {unsafe child interpreter, ttk::spinbox spun, existing selection} -setup {
+test safePrimarySelection-5.9 {child interpreter, ttk::spinbox spun, existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
@@ -984,7 +984,7 @@ test safePrimarySelection-5.9 {unsafe child interpreter, ttk::spinbox spun, exis
     ::_test_tmp::clearPrimarySelection
 } -result {2}
 
-test safePrimarySelection-5.10 {unsafe child interpreter, ttk::spinbox spun/selected/spun, existing selection} -setup {
+test safePrimarySelection-5.10 {child interpreter, ttk::spinbox spun/selected/spun, existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
@@ -1001,7 +1001,7 @@ test safePrimarySelection-5.10 {unsafe child interpreter, ttk::spinbox spun/sele
     ::_test_tmp::clearPrimarySelection
 } -result {3}
 
-test safePrimarySelection-6.1 {IMPORTANT, safe child interpreter, text, existing selection} -setup {
+test safePrimarySelection-6.1 {IMPORTANT, safe interpreter, text, existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
@@ -1022,7 +1022,7 @@ test safePrimarySelection-6.1 {IMPORTANT, safe child interpreter, text, existing
     ::_test_tmp::clearPrimarySelection
 } -result {OLD_VALUE----OLD_VALUE}
 
-test safePrimarySelection-6.2 {IMPORTANT, safe child interpreter, entry, existing selection} -setup {
+test safePrimarySelection-6.2 {IMPORTANT, safe interpreter, entry, existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
@@ -1043,7 +1043,7 @@ test safePrimarySelection-6.2 {IMPORTANT, safe child interpreter, entry, existin
     ::_test_tmp::clearPrimarySelection
 } -result {OLD_VALUE----OLD_VALUE}
 
-test safePrimarySelection-6.3 {IMPORTANT, safe child interpreter, ttk::entry, existing selection} -setup {
+test safePrimarySelection-6.3 {IMPORTANT, safe interpreter, ttk::entry, existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
@@ -1064,7 +1064,7 @@ test safePrimarySelection-6.3 {IMPORTANT, safe child interpreter, ttk::entry, ex
     ::_test_tmp::clearPrimarySelection
 } -result {OLD_VALUE----OLD_VALUE}
 
-test safePrimarySelection-6.4 {IMPORTANT, safe child interpreter, listbox, existing selection} -setup {
+test safePrimarySelection-6.4 {IMPORTANT, safe interpreter, listbox, existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
@@ -1085,7 +1085,7 @@ test safePrimarySelection-6.4 {IMPORTANT, safe child interpreter, listbox, exist
     ::_test_tmp::clearPrimarySelection
 } -result {OLD_VALUE----OLD_VALUE}
 
-test safePrimarySelection-6.5 {IMPORTANT, safe child interpreter, spinbox as entry, existing selection} -setup {
+test safePrimarySelection-6.5 {IMPORTANT, safe interpreter, spinbox as entry, existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
@@ -1106,7 +1106,7 @@ test safePrimarySelection-6.5 {IMPORTANT, safe child interpreter, spinbox as ent
     ::_test_tmp::clearPrimarySelection
 } -result {OLD_VALUE----OLD_VALUE}
 
-test safePrimarySelection-6.6 {IMPORTANT, safe child interpreter, spinbox spun, existing selection} -setup {
+test safePrimarySelection-6.6 {IMPORTANT, safe interpreter, spinbox spun, existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
@@ -1127,7 +1127,7 @@ test safePrimarySelection-6.6 {IMPORTANT, safe child interpreter, spinbox spun,
     ::_test_tmp::clearPrimarySelection
 } -result {OLD_VALUE----OLD_VALUE}
 
-test safePrimarySelection-6.7 {IMPORTANT, safe child interpreter, spinbox spun/selected/spun, existing selection} -setup {
+test safePrimarySelection-6.7 {IMPORTANT, safe interpreter, spinbox spun/selected/spun, existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
@@ -1148,7 +1148,7 @@ test safePrimarySelection-6.7 {IMPORTANT, safe child interpreter, spinbox spun/s
     ::_test_tmp::clearPrimarySelection
 } -result {OLD_VALUE----OLD_VALUE}
 
-test safePrimarySelection-6.8 {IMPORTANT, safe child interpreter, ttk::spinbox as entry, existing selection} -setup {
+test safePrimarySelection-6.8 {IMPORTANT, safe interpreter, ttk::spinbox as entry, existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
@@ -1169,7 +1169,7 @@ test safePrimarySelection-6.8 {IMPORTANT, safe child interpreter, ttk::spinbox a
     ::_test_tmp::clearPrimarySelection
 } -result {OLD_VALUE----OLD_VALUE}
 
-test safePrimarySelection-6.9 {IMPORTANT, safe child interpreter, ttk::spinbox spun, existing selection} -setup {
+test safePrimarySelection-6.9 {IMPORTANT, safe interpreter, ttk::spinbox spun, existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
@@ -1190,7 +1190,7 @@ test safePrimarySelection-6.9 {IMPORTANT, safe child interpreter, ttk::spinbox s
     ::_test_tmp::clearPrimarySelection
 } -result {OLD_VALUE----OLD_VALUE}
 
-test safePrimarySelection-6.10 {IMPORTANT, safe child interpreter, ttk::spinbox spun/selected/spun, existing selection} -setup {
+test safePrimarySelection-6.10 {IMPORTANT, safe interpreter, ttk::spinbox spun/selected/spun, existing selection} -setup {
     catch {interp delete child2}
     destroy {*}[winfo children .]
     ::_test_tmp::setPrimarySelection
diff --git a/tests/unixEmbed.test b/tests/unixEmbed.test
index 0f9033f..cd7f15f 100644
--- a/tests/unixEmbed.test
+++ b/tests/unixEmbed.test
@@ -16,7 +16,7 @@ namespace eval ::_test_tmp {}
 # ------------------------------------------------------------------------------
 #  Proc ::_test_tmp::testInterp
 # ------------------------------------------------------------------------------
-# Command that creates an unsafe child interpreter and tries to load Tk.
+# Command that creates an child interpreter and tries to load Tk.
 # This code is borrowed from safePrimarySelection.test
 # This is necessary for loading Tktest if the tests are done in the build
 # directory without installing Tk.  In that case the usual auto_path loading
-- 
cgit v0.12


From 0e6c603dbde531da22b1b65b987b69e463761b4a Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Mon, 14 Sep 2020 15:03:44 +0000
Subject: Fix [71e18c5c0a]: Aqua invalid selector crash when switching between
 normal and full screen mode.

---
 macosx/tkMacOSXMouseEvent.c | 24 ++++++++++++++----------
 macosx/tkMacOSXTest.c       | 12 ++++++------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index 9e57e7d..00477dd 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -54,6 +54,7 @@ enum {
     NSWindow *eventWindow = [theEvent window];
     NSEventType eventType = [theEvent type];
     NSRect viewFrame = [[eventWindow contentView] frame];
+    NSPoint location = [theEvent locationInWindow];
     TkWindow *winPtr = NULL, *grabWinPtr;
     Tk_Window tkwin = None, capture, target;
     NSPoint local, global;
@@ -71,13 +72,12 @@ enum {
      * If this event is not for a Tk toplevel, it should just be passed up the
      * responder chain.  However, there is an exception for synthesized events,
      * which are used in testing.  Those events are recognized by having their
-     * (unused) pressure field set to the impossible value -1.0.
+     * (unused) context pointer set to 1.
      */
 
-    if (![eventWindow isMemberOfClass:[TKWindow class]]) {
-	if (eventWindow && [theEvent pressure] != -1.0) {
+    if (eventWindow && ![eventWindow isMemberOfClass:[TKWindow class]]) {
+	if ([theEvent context] != (void *) 1)
 	    return theEvent;
-	}
     }
 
     /*
@@ -85,8 +85,9 @@ enum {
      */
 
     if (eventWindow) {
-	inTitleBar = viewFrame.size.height < [theEvent locationInWindow].y;
+	inTitleBar = viewFrame.size.height < location.y;
     }
+
     button = [theEvent buttonNumber] + Button1;
     switch (eventType) {
     case NSRightMouseUp:
@@ -101,13 +102,16 @@ enum {
 	buttonState |= TkGetButtonMask(button);
 	break;
     case NSMouseEntered:
-	if (!inTitleBar) {
+	if ([eventWindow respondsToSelector:@selector(mouseInResizeArea)] &&
+	    !inTitleBar) {
 	    [(TKWindow *)eventWindow setMouseInResizeArea:YES];
 	}
 	break;
     case NSMouseExited:
-	[(TKWindow *)eventWindow setMouseInResizeArea:NO];
-	break;
+	if ([eventWindow respondsToSelector:@selector(mouseInResizeArea)]) {
+	    [(TKWindow *)eventWindow setMouseInResizeArea:NO];
+	    break;
+	}
     case NSLeftMouseUp:
     case NSLeftMouseDown:
     case NSMouseMoved:
@@ -129,8 +133,8 @@ enum {
      */
 
     if (eventType == NSLeftMouseDown || eventType == NSLeftMouseDragged) {
-	if ([(TKWindow *)eventWindow mouseInResizeArea] &&
-	    ([eventWindow styleMask] & NSResizableWindowMask)) {
+	if ([eventWindow respondsToSelector:@selector(mouseInResizeArea)] &&
+	    [(TKWindow *) eventWindow mouseInResizeArea]) {
 
 	    /*
 	     * When the left button is pressed in the resize area, we receive
diff --git a/macosx/tkMacOSXTest.c b/macosx/tkMacOSXTest.c
index 52cda8f..16fe37e 100644
--- a/macosx/tkMacOSXTest.c
+++ b/macosx/tkMacOSXTest.c
@@ -178,8 +178,8 @@ TkTestLogDisplay(
  *      location.  It injects NSEvents into the NSApplication event queue, as
  *      opposed to adding events to the Tcl queue as event generate would do.
  *      One application is for testing the grab command. These events have
- *      pressure = -1.0 as a signal indicating that they should not be ignored
- *      by [NSApp tkProcessMouseEvent].
+ *      their unused context property set to 1 as a signal indicating that they
+ *      should not be ignored by [NSApp tkProcessMouseEvent].
  *
  * Results:
  *	A standard Tcl result.
@@ -238,17 +238,17 @@ PressButtonObjCmd(
 	modifierFlags:0
 	timestamp:GetCurrentEventTime()
 	windowNumber:wNum
-	context:nil
+	context:(void *) 1
 	eventNumber:0
 	clickCount:1
-	pressure:-1.0];
+	pressure:0.0];
     [NSApp postEvent:motion atStart:NO];
     press = [NSEvent mouseEventWithType:NSLeftMouseDown
 	location:loc
 	modifierFlags:0
 	timestamp:GetCurrentEventTime()
 	windowNumber:wNum
-	context:nil
+	context:(void *)1
 	eventNumber:1
 	clickCount:1
 	pressure:-1.0];
@@ -258,7 +258,7 @@ PressButtonObjCmd(
 	modifierFlags:0
 	timestamp:GetCurrentEventTime()
 	windowNumber:wNum
-	context:nil
+	context:(void*) 1
 	eventNumber:2
 	clickCount:1
 	pressure:-1.0];
-- 
cgit v0.12


From 88805737f2a709fbffe45f53758427a866664e1c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 14 Sep 2020 16:42:20 +0000
Subject: Extend .gitattributes and .fossil-settings/encoding-glob for file
 types .bmp, .cur, .ico and .rc

---
 .fossil-settings/encoding-glob | 6 ++++++
 .gitattributes                 | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/.fossil-settings/encoding-glob b/.fossil-settings/encoding-glob
index d1fd9fc..d0ad4b9 100644
--- a/.fossil-settings/encoding-glob
+++ b/.fossil-settings/encoding-glob
@@ -2,4 +2,10 @@ win/buildall.vc.bat
 win/makefile.vc
 win/mkd.bat
 win/rmd.bat
+win/rules-ext.vc
 win/rules.vc
+win/targets.vc
+win/rc/*.bmp
+win/rc/*.cur
+win/rc/*.ico
+win/rc/*.rc
diff --git a/.gitattributes b/.gitattributes
index e9a67c8..fe89ab8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -22,15 +22,19 @@
 
 # Declare files that will always have CRLF line endings on checkout.
 *.bat eol=crlf
+*.rc eol=crlf
 *.sln eol=crlf
 *.vc eol=crlf
 
 # Denote all files that are truly binary and should not be modified.
 *.a binary
+*.bmp binary
+*.cur binary
 *.dll binary
 *.exe binary
 *.gif binary
 *.gz binary
+*.ico binary
 *.jpg binary
 *.lib binary
 *.pdf binary
-- 
cgit v0.12


From 4ee5781a03c8e0291da78312759c0d170f25dd02 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 15 Sep 2020 08:44:54 +0000
Subject: More usage of TCL_UNUSED() and explicit type-casts

---
 generic/tkBind.c      | 80 +++++++++++++++++++++++++-------------------------
 generic/tkBusy.c      | 34 ++++++++++-----------
 generic/tkClipboard.c | 25 ++++++++--------
 generic/tkCmds.c      | 81 +++++++++++++++++++++++----------------------------
 generic/tkConfig.c    | 28 +++++++++---------
 generic/tkConsole.c   | 68 ++++++++++++++++++++----------------------
 generic/tkEvent.c     | 72 ++++++++++++++++++++++-----------------------
 generic/tkGet.c       |  8 ++---
 generic/tkGrab.c      | 39 ++++++++++++-------------
 generic/tkObj.c       | 40 ++++++++++++-------------
 generic/tkOldConfig.c | 29 +++++++++---------
 generic/tkStyle.c     | 73 ++++++++++++++++++++++------------------------
 12 files changed, 278 insertions(+), 299 deletions(-)

diff --git a/generic/tkBind.c b/generic/tkBind.c
index bdc1f45..979d61e 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -790,7 +790,7 @@ GetButtonNumber(
 }
 
 static Time
-CurrentTimeInMilliSecs()
+CurrentTimeInMilliSecs(void)
 {
     Tcl_Time now;
     Tcl_GetTime(&now);
@@ -942,7 +942,7 @@ ClearList(
 
 static PSEntry *
 FreePatSeqEntry(
-    PSList *pool,
+    TCL_UNUSED(PSList *),
     PSEntry *entry)
 {
     PSEntry *next = PSList_Next(entry);
@@ -1043,7 +1043,7 @@ MakeListEntry(
     assert(TEST_PSENTRY(psPtr));
 
     if (PSList_IsEmpty(pool)) {
-	newEntry = ckalloc(sizeof(PSEntry));
+	newEntry = (PSEntry *)ckalloc(sizeof(PSEntry));
 	newEntry->lastModMaskArr = NULL;
 	DEBUG(countEntryItems += 1;)
     } else {
@@ -1120,7 +1120,7 @@ GetLookupForEvent(
     key.object = object;
     key.type = eventPtr->xev.type;
     hPtr = Tcl_FindHashEntry(&lookupTables->listTable, (char *) &key);
-    return hPtr ? Tcl_GetHashValue(hPtr) : NULL;
+    return hPtr ? (PSList *)Tcl_GetHashValue(hPtr) : NULL;
 }
 
 /*
@@ -1158,13 +1158,13 @@ ClearLookupTable(
 	nextPtr = Tcl_NextHashEntry(&search);
 
 	if (object) {
-	    const PatternTableKey *key = Tcl_GetHashKey(&lookupTables->listTable, hPtr);
+	    const PatternTableKey *key = (const PatternTableKey *)Tcl_GetHashKey(&lookupTables->listTable, hPtr);
 	    if (key->object != object) {
 		continue;
 	    }
 	}
 
-	psList = Tcl_GetHashValue(hPtr);
+	psList = (PSList *)Tcl_GetHashValue(hPtr);
 	PSList_Move(pool, psList);
 	ckfree(psList);
 	DEBUG(countListItems -= 1;)
@@ -1375,7 +1375,7 @@ TkBindInit(
 
     mainPtr->bindingTable = Tk_CreateBindingTable(mainPtr->interp);
 
-    bindInfoPtr = ckalloc(sizeof(BindInfo));
+    bindInfoPtr = (BindInfo *)ckalloc(sizeof(BindInfo));
     InitVirtualEventTable(&bindInfoPtr->virtualEventTable);
     bindInfoPtr->screenInfo.curDispPtr = NULL;
     bindInfoPtr->screenInfo.curScreenIndex = -1;
@@ -1451,7 +1451,7 @@ Tk_CreateBindingTable(
     Tcl_Interp *interp)		/* Interpreter to associate with the binding table: commands are
     				 * executed in this interpreter. */
 {
-    BindingTable *bindPtr = ckalloc(sizeof(BindingTable));
+    BindingTable *bindPtr = (BindingTable *)ckalloc(sizeof(BindingTable));
     unsigned i;
 
     assert(interp);
@@ -1510,7 +1510,7 @@ Tk_DeleteBindingTable(
 	PatSeq *nextPtr;
 	PatSeq *psPtr;
 
-	for (psPtr = Tcl_GetHashValue(hPtr); psPtr; psPtr = nextPtr) {
+	for (psPtr = (PatSeq *)Tcl_GetHashValue(hPtr); psPtr; psPtr = nextPtr) {
 	    assert(TEST_PSENTRY(psPtr));
 	    nextPtr = psPtr->nextSeqPtr;
 	    FreePatSeq(psPtr);
@@ -1577,12 +1577,12 @@ InsertPatSeq(
 	hPtr = Tcl_CreateHashEntry(&lookupTables->listTable, (char *) &key, &isNew);
 
 	if (isNew) {
-	    psList = ckalloc(sizeof(PSList));
+	    psList = (PSList *)ckalloc(sizeof(PSList));
 	    PSList_Init(psList);
 	    Tcl_SetHashValue(hPtr, psList);
 	    DEBUG(countListItems += 1;)
 	} else {
-	    psList = Tcl_GetHashValue(hPtr);
+	    psList = (PSList *)Tcl_GetHashValue(hPtr);
 	}
 
 	psEntry = MakeListEntry(&lookupTables->entryPool, psPtr, 0);
@@ -1670,7 +1670,7 @@ Tk_CreateBinding(
 	 */
 
 	hPtr = Tcl_CreateHashEntry(&bindPtr->objectTable, (char *) object, &isNew);
-	psPtr->ptr.nextObj = isNew ? NULL : Tcl_GetHashValue(hPtr);
+	psPtr->ptr.nextObj = isNew ? NULL : (PatSeq *)Tcl_GetHashValue(hPtr);
 	Tcl_SetHashValue(hPtr, psPtr);
 	InsertPatSeq(&bindPtr->lookupTables, psPtr);
     }
@@ -1680,14 +1680,14 @@ Tk_CreateBinding(
 	size_t length1 = strlen(oldStr);
 	size_t length2 = strlen(script);
 
-	newStr = ckalloc(length1 + length2 + 2);
+	newStr = (char *)ckalloc(length1 + length2 + 2);
 	memcpy(newStr, oldStr, length1);
 	newStr[length1] = '\n';
 	memcpy(newStr + length1 + 1, script, length2 + 1);
     } else {
 	size_t length = strlen(script);
 
-	newStr = ckalloc(length + 1);
+	newStr = (char *)ckalloc(length + 1);
 	memcpy(newStr, script, length + 1);
     }
     ckfree(oldStr);
@@ -1742,7 +1742,7 @@ Tk_DeleteBinding(
 	if (!(hPtr = Tcl_FindHashEntry(&bindPtr->objectTable, (char *) object))) {
 	    Tcl_Panic("Tk_DeleteBinding couldn't find object table entry");
 	}
-	prevPtr = Tcl_GetHashValue(hPtr);
+	prevPtr = (PatSeq *)Tcl_GetHashValue(hPtr);
 	if (prevPtr == psPtr) {
 	    Tcl_SetHashValue(hPtr, psPtr->ptr.nextObj);
 	} else {
@@ -1843,7 +1843,7 @@ Tk_GetAllBindings(
 	 * For each binding, output information about each of the patterns in its sequence.
 	 */
 
-	for (psPtr = Tcl_GetHashValue(hPtr); psPtr; psPtr = psPtr->ptr.nextObj) {
+	for (psPtr = (const PatSeq *)Tcl_GetHashValue(hPtr); psPtr; psPtr = psPtr->ptr.nextObj) {
 	    assert(TEST_PSENTRY(psPtr));
 	    Tcl_ListObjAppendElement(NULL, resultObj, GetPatternObj(psPtr));
 	}
@@ -1882,7 +1882,7 @@ RemovePatSeqFromLookup(
     SetupPatternKey(&key, psPtr);
 
     if ((hPtr = Tcl_FindHashEntry(&lookupTables->listTable, (char *) &key))) {
-	PSList *psList = Tcl_GetHashValue(hPtr);
+	PSList *psList = (PSList *)Tcl_GetHashValue(hPtr);
 	PSEntry *psEntry;
 
 	TK_DLIST_FOREACH(psEntry, psList) {
@@ -1966,7 +1966,7 @@ DeletePatSeq(
     assert(!psPtr->added);
     assert(!psPtr->owned);
 
-    prevPtr = Tcl_GetHashValue(psPtr->hPtr);
+    prevPtr = (PatSeq *)Tcl_GetHashValue(psPtr->hPtr);
     nextPtr = psPtr->ptr.nextObj;
 
     /*
@@ -2037,7 +2037,7 @@ Tk_DeleteAllBindings(
     ClearLookupTable(&bindPtr->lookupTables, object);
     ClearPromotionLists(bindPtr, object);
 
-    for (psPtr = Tcl_GetHashValue(hPtr); psPtr; psPtr = nextPtr) {
+    for (psPtr = (PatSeq *)Tcl_GetHashValue(hPtr); psPtr; psPtr = nextPtr) {
 	assert(TEST_PSENTRY(psPtr));
 	DEBUG(psPtr->added = 0;)
 	nextPtr = DeletePatSeq(psPtr);
@@ -2362,7 +2362,7 @@ Tk_BindEvent(
 
     if ((size_t) numObjects > SIZE_OF_ARRAY(matchPtrBuf)) {
 	/* it's unrealistic that the buffer size is too small, but who knows? */
-	matchPtrArr = ckalloc(numObjects*sizeof(matchPtrArr[0]));
+	matchPtrArr = (PatSeq **)ckalloc(numObjects*sizeof(matchPtrArr[0]));
     }
     memset(matchPtrArr, 0, numObjects*sizeof(matchPtrArr[0]));
 
@@ -2403,8 +2403,8 @@ Tk_BindEvent(
 	PSList *psSuccList = PromArr_First(bindPtr->promArr);
 	PatSeq *bestPtr;
 
-	psl[0] = GetLookupForEvent(physTables, curEvent, objArr[k], 1);
-	psl[1] = GetLookupForEvent(physTables, curEvent, objArr[k], 0);
+	psl[0] = GetLookupForEvent(physTables, curEvent, (Tcl_Obj *)objArr[k], 1);
+	psl[1] = GetLookupForEvent(physTables, curEvent, (Tcl_Obj *)objArr[k], 0);
 
 	assert(psl[0] == NULL || psl[0] != psl[1]);
 
@@ -3468,7 +3468,7 @@ DeleteVirtualEventTable(
 	PatSeq *nextPtr;
 	PatSeq *psPtr;
 
-	for (psPtr = Tcl_GetHashValue(hPtr); psPtr; psPtr = nextPtr) {
+	for (psPtr = (PatSeq *)Tcl_GetHashValue(hPtr); psPtr; psPtr = nextPtr) {
 	    assert(TEST_PSENTRY(psPtr));
 	    nextPtr = psPtr->nextSeqPtr;
 	    DEBUG(psPtr->owned = 0;)
@@ -3550,7 +3550,7 @@ CreateVirtualEvent(
      * Make virtual event own the physical event.
      */
 
-    owned = Tcl_GetHashValue(vhPtr);
+    owned = (PhysOwned *)Tcl_GetHashValue(vhPtr);
 
     if (!PhysOwned_Contains(owned, psPtr)) {
 	PhysOwned_Append(&owned, psPtr);
@@ -3612,7 +3612,7 @@ DeleteVirtualEvent(
     if (!(vhPtr = Tcl_FindHashEntry(&vetPtr->nameTable, virtUid))) {
 	return TCL_OK;
     }
-    owned = Tcl_GetHashValue(vhPtr);
+    owned = (PhysOwned *)Tcl_GetHashValue(vhPtr);
 
     eventPSPtr = NULL;
     if (eventString) {
@@ -3744,7 +3744,7 @@ GetVirtualEvent(
     }
 
     resultObj = Tcl_NewObj();
-    owned = Tcl_GetHashValue(vhPtr);
+    owned = (const PhysOwned *)Tcl_GetHashValue(vhPtr);
     for (iPhys = 0; iPhys < PhysOwned_Size(owned); ++iPhys) {
 	Tcl_ListObjAppendElement(NULL, resultObj, GetPatternObj(PhysOwned_Get(owned, iPhys)));
     }
@@ -3833,7 +3833,7 @@ HandleEventGenerate(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    union { XEvent general; XVirtualEvent virtual; } event;
+    union { XEvent general; XVirtualEvent virt; } event;
 
     const char *p;
     const char *name;
@@ -3936,7 +3936,7 @@ HandleEventGenerate(
 	} else if (flags & BUTTON) {
 	    event.general.xbutton.button = pat.info;
 	} else if (flags & VIRTUAL) {
-	    event.virtual.name = pat.name;
+	    event.virt.name = pat.name;
 	}
     }
     if (flags & (CREATE|UNMAP|MAP|REPARENT|CONFIG|GRAVITY|CIRC)) {
@@ -4376,7 +4376,7 @@ HandleEventGenerate(
 	     * refcount before firing it into the low-level event subsystem; the
 	     * refcount will be decremented once the event has been processed.
 	     */
-	    event.virtual.user_data = userDataObj;
+	    event.virt.user_data = userDataObj;
 	    Tcl_IncrRefCount(userDataObj);
 	}
 
@@ -4636,7 +4636,7 @@ FindSequence(
     assert(lookupTables);
     assert(eventString);
 
-    psPtr = ckalloc(PATSEQ_MEMSIZE(patsBufSize));
+    psPtr = (PatSeq *)ckalloc(PATSEQ_MEMSIZE(patsBufSize));
 
     /*
      *------------------------------------------------------------------
@@ -4648,7 +4648,7 @@ FindSequence(
 	if (numPats >= patsBufSize) {
 	    unsigned pos = patPtr - psPtr->pats;
 	    patsBufSize += patsBufSize;
-	    psPtr = ckrealloc(psPtr, PATSEQ_MEMSIZE(patsBufSize));
+	    psPtr = (PatSeq *)ckrealloc(psPtr, PATSEQ_MEMSIZE(patsBufSize));
 	    patPtr = psPtr->pats + pos;
 	}
 
@@ -4697,18 +4697,18 @@ FindSequence(
 	return NULL;
     }
     if (patsBufSize > numPats) {
-	psPtr = ckrealloc(psPtr, PATSEQ_MEMSIZE(numPats));
+	psPtr = (PatSeq *)ckrealloc(psPtr, PATSEQ_MEMSIZE(numPats));
     }
 
     patPtr = psPtr->pats;
-    psPtr->object = object;
+    psPtr->object = (Tcl_Obj *)object;
     SetupPatternKey(&key, psPtr);
     hPtr = Tcl_CreateHashEntry(&lookupTables->patternTable, (char *) &key, &isNew);
     if (!isNew) {
 	unsigned sequenceSize = numPats*sizeof(TkPattern);
 	PatSeq *psPtr2;
 
-	for (psPtr2 = Tcl_GetHashValue(hPtr); psPtr2; psPtr2 = psPtr2->nextSeqPtr) {
+	for (psPtr2 = (PatSeq *)Tcl_GetHashValue(hPtr); psPtr2; psPtr2 = psPtr2->nextSeqPtr) {
 	    assert(TEST_PSENTRY(psPtr2));
 	    if (numPats == psPtr2->numPats && memcmp(patPtr, psPtr2->pats, sequenceSize) == 0) {
 		ckfree(psPtr);
@@ -4744,7 +4744,7 @@ FindSequence(
     psPtr->added = 0;
     psPtr->modMaskUsed = (modMask != 0);
     psPtr->script = NULL;
-    psPtr->nextSeqPtr = Tcl_GetHashValue(hPtr);
+    psPtr->nextSeqPtr = (PatSeq *)Tcl_GetHashValue(hPtr);
     psPtr->hPtr = hPtr;
     psPtr->ptr.nextObj = NULL;
     assert(psPtr->ptr.owners == NULL);
@@ -4886,7 +4886,7 @@ ParseEventDescription(
 
 	    size = p - field;
 	    if (size >= sizeof(buf)) {
-		bufPtr = ckalloc(size + 1);
+		bufPtr = (char *)ckalloc(size + 1);
 	    }
 	    strncpy(bufPtr, field, size);
 	    bufPtr[size] = '\0';
@@ -4918,7 +4918,7 @@ ParseEventDescription(
 		if (!(hPtr = Tcl_FindHashEntry(&modTable, field))) {
 		    break;
 		}
-		modPtr = Tcl_GetHashValue(hPtr);
+		modPtr = (ModInfo *)Tcl_GetHashValue(hPtr);
 		patPtr->modMask |= modPtr->mask;
 		if (modPtr->flags & MULT_CLICKS) {
 		    unsigned i = modPtr->flags & MULT_CLICKS;
@@ -4933,7 +4933,7 @@ ParseEventDescription(
 
 	    eventFlags = 0;
 	    if ((hPtr = Tcl_FindHashEntry(&eventTable, field))) {
-		const EventInfo *eiPtr = Tcl_GetHashValue(hPtr);
+		const EventInfo *eiPtr = (const EventInfo *)Tcl_GetHashValue(hPtr);
 
 		patPtr->eventType = eiPtr->type;
 		eventFlags = flagArray[eiPtr->type];
@@ -5169,7 +5169,7 @@ GetPatternObj(
 		case ButtonPress:
 		case ButtonRelease:
 		    assert(patPtr->info <= Button5);
-		    Tcl_AppendPrintfToObj(patternObj, "-%d", (int) patPtr->info);
+		    Tcl_AppendPrintfToObj(patternObj, "-%u", (unsigned) patPtr->info);
 		    break;
 #if PRINT_SHORT_MOTION_SYNTAX
 		case MotionNotify: {
@@ -5257,7 +5257,7 @@ TkKeysymToString(
     Tcl_HashEntry *hPtr = Tcl_FindHashEntry(&nameTable, (char *)keysym);
 
     if (hPtr) {
-	return Tcl_GetHashValue(hPtr);
+	return (const char *)Tcl_GetHashValue(hPtr);
     }
 #endif /* REDO_KEYSYM_LOOKUP */
 
diff --git a/generic/tkBusy.c b/generic/tkBusy.c
index 7bd9a44..1e4e91f 100644
--- a/generic/tkBusy.c
+++ b/generic/tkBusy.c
@@ -54,7 +54,7 @@ static void		MakeTransparentWindowExist(Tk_Window tkwin,
 			    Window parent);
 static inline Tk_Window	NextChild(Tk_Window tkwin);
 static void		RefWinEventProc(ClientData clientData,
-			    register XEvent *eventPtr);
+			    XEvent *eventPtr);
 static inline void	SetWindowInstanceData(Tk_Window tkwin,
 			    ClientData instanceData);
 
@@ -122,13 +122,12 @@ SetWindowInstanceData(
  *----------------------------------------------------------------------
  */
 
-/* ARGSUSED */
 static void
 BusyCustodyProc(
     ClientData clientData,	/* Information about the busy window. */
-    Tk_Window tkwin)		/* Not used. */
+    TCL_UNUSED(Tk_Window))		/* Not used. */
 {
-    Busy *busyPtr = clientData;
+    Busy *busyPtr = (Busy *)clientData;
 
     Tk_DeleteEventHandler(busyPtr->tkBusy, StructureNotifyMask, BusyEventProc,
 	    busyPtr);
@@ -156,12 +155,11 @@ BusyCustodyProc(
  *----------------------------------------------------------------------
  */
 
-/* ARGSUSED */
 static void
 BusyGeometryProc(
-    ClientData clientData,	/* Information about window that got new
+    TCL_UNUSED(void *),	/* Information about window that got new
 				 * preferred geometry. */
-    Tk_Window tkwin)		/* Other Tk-related information about the
+    TCL_UNUSED(Tk_Window))		/* Other Tk-related information about the
 				 * window. */
 {
     /* Should never get here */
@@ -249,9 +247,9 @@ DoConfigureNotify(
 static void
 RefWinEventProc(
     ClientData clientData,	/* Busy window record */
-    register XEvent *eventPtr)	/* Event which triggered call to routine */
+    XEvent *eventPtr)	/* Event which triggered call to routine */
 {
-    register Busy *busyPtr = clientData;
+    Busy *busyPtr = (Busy *)clientData;
 
     switch (eventPtr->type) {
     case ReparentNotify:
@@ -333,7 +331,7 @@ static void
 DestroyBusy(
     void *data)			/* Busy window structure record */
 {
-    register Busy *busyPtr = data;
+    Busy *busyPtr = (Busy *)data;
 
     if (busyPtr->hashPtr != NULL) {
 	Tcl_DeleteHashEntry(busyPtr->hashPtr);
@@ -377,7 +375,7 @@ BusyEventProc(
     ClientData clientData,	/* Busy window record */
     XEvent *eventPtr)		/* Event which triggered call to routine */
 {
-    Busy *busyPtr = clientData;
+    Busy *busyPtr = (Busy *)clientData;
 
     if (eventPtr->type == DestroyNotify) {
 	busyPtr->tkBusy = NULL;
@@ -527,10 +525,10 @@ CreateBusy(
     Window parent;
     Tk_FakeWin *winPtr;
 
-    busyPtr = ckalloc(sizeof(Busy));
+    busyPtr = (Busy *)ckalloc(sizeof(Busy));
     x = y = 0;
     length = strlen(Tk_Name(tkRef));
-    name = ckalloc(length + 6);
+    name = (char *)ckalloc(length + 6);
     if (Tk_IsTopLevel(tkRef)) {
 	fmt = "_Busy";		/* Child */
 	tkParent = tkRef;
@@ -696,7 +694,7 @@ GetBusy(
 		Tcl_GetString(windowObj), NULL);
 	return NULL;
     }
-    return Tcl_GetHashValue(hPtr);
+    return (Busy *)Tcl_GetHashValue(hPtr);
 }
 
 /*
@@ -746,7 +744,7 @@ HoldBusy(
 	Tcl_SetHashValue(hPtr, busyPtr);
 	busyPtr->hashPtr = hPtr;
     } else {
-	busyPtr = Tcl_GetHashValue(hPtr);
+	busyPtr = (Busy *)Tcl_GetHashValue(hPtr);
     }
 
     busyPtr->tablePtr = busyTablePtr;
@@ -789,7 +787,7 @@ Tk_BusyObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tk_Window tkwin = clientData;
+    Tk_Window tkwin = (Tk_Window)clientData;
     Tcl_HashTable *busyTablePtr = &((TkWindow *) tkwin)->mainPtr->busyTable;
     Busy *busyPtr;
     Tcl_Obj *objPtr;
@@ -855,7 +853,7 @@ Tk_BusyObjCmd(
 	}
 	Tcl_Preserve(busyPtr);
 	if (objc <= 4) {
-	    objPtr = Tk_GetOptionInfo(interp, (char *) busyPtr,
+	    objPtr = Tk_GetOptionInfo(interp, (char *)busyPtr,
 		    busyPtr->optionTable, (objc == 4) ? objv[3] : NULL,
 		    busyPtr->tkBusy);
 	    if (objPtr == NULL) {
@@ -877,7 +875,7 @@ Tk_BusyObjCmd(
 	objPtr = Tcl_NewObj();
 	for (hPtr = Tcl_FirstHashEntry(busyTablePtr, &cursor); hPtr != NULL;
 		hPtr = Tcl_NextHashEntry(&cursor)) {
-	    busyPtr = Tcl_GetHashValue(hPtr);
+	    busyPtr = (Busy *)Tcl_GetHashValue(hPtr);
 	    if (pattern == NULL ||
 		    Tcl_StringCaseMatch(Tk_PathName(busyPtr->tkRef), pattern, 0)) {
 		Tcl_ListObjAppendElement(interp, objPtr,
diff --git a/generic/tkClipboard.c b/generic/tkClipboard.c
index 2e504eb..703ef41 100644
--- a/generic/tkClipboard.c
+++ b/generic/tkClipboard.c
@@ -56,7 +56,7 @@ ClipboardHandler(
     char *buffer,		/* Place to store converted selection. */
     int maxBytes)		/* Maximum # of bytes to store at buffer. */
 {
-    TkClipboardTarget *targetPtr = clientData;
+    TkClipboardTarget *targetPtr = (TkClipboardTarget *)clientData;
     TkClipboardBuffer *cbPtr;
     char *srcPtr, *destPtr;
     size_t count = 0;
@@ -173,11 +173,11 @@ ClipboardAppHandler(
 
 static int
 ClipboardWindowHandler(
-    ClientData clientData,	/* Not used. */
-    int offset,			/* Return selection bytes starting at this
+    TCL_UNUSED(void *),	/* Not used. */
+    TCL_UNUSED(int),			/* Return selection bytes starting at this
 				 * offset. */
     char *buffer,		/* Place to store converted selection. */
-    int maxBytes)		/* Maximum # of bytes to store at buffer. */
+    TCL_UNUSED(int))		/* Maximum # of bytes to store at buffer. */
 {
     buffer[0] = '.';
     buffer[1] = 0;
@@ -206,7 +206,7 @@ static void
 ClipboardLostSel(
     ClientData clientData)	/* Pointer to TkDisplay structure. */
 {
-    TkDisplay *dispPtr = clientData;
+    TkDisplay *dispPtr = (TkDisplay *)clientData;
 
     dispPtr->clipboardActive = 0;
 }
@@ -359,7 +359,7 @@ Tk_ClipboardAppend(
 	}
     }
     if (targetPtr == NULL) {
-	targetPtr = ckalloc(sizeof(TkClipboardTarget));
+	targetPtr = (TkClipboardTarget *)ckalloc(sizeof(TkClipboardTarget));
 	targetPtr->type = type;
 	targetPtr->format = format;
 	targetPtr->firstBufferPtr = targetPtr->lastBufferPtr = NULL;
@@ -381,7 +381,7 @@ Tk_ClipboardAppend(
      * Append a new buffer to the buffer chain.
      */
 
-    cbPtr = ckalloc(sizeof(TkClipboardBuffer));
+    cbPtr = (TkClipboardBuffer *)ckalloc(sizeof(TkClipboardBuffer));
     cbPtr->nextPtr = NULL;
     if (targetPtr->lastBufferPtr != NULL) {
 	targetPtr->lastBufferPtr->nextPtr = cbPtr;
@@ -391,7 +391,7 @@ Tk_ClipboardAppend(
     targetPtr->lastBufferPtr = cbPtr;
 
     cbPtr->length = strlen(buffer);
-    cbPtr->buffer = ckalloc(cbPtr->length + 1);
+    cbPtr->buffer = (char *)ckalloc(cbPtr->length + 1);
     strcpy(cbPtr->buffer, buffer);
 
     TkSelUpdateClipboard((TkWindow *) dispPtr->clipWindow, targetPtr);
@@ -423,7 +423,7 @@ Tk_ClipboardObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument strings. */
 {
-    Tk_Window tkwin = (Tk_Window) clientData;
+    Tk_Window tkwin = (Tk_Window)clientData;
     const char *path = NULL;
     Atom selection;
     static const char *const optionStrings[] = { "append", "clear", "get", NULL };
@@ -636,8 +636,8 @@ Tk_ClipboardObjCmd(
 
 int
 TkClipInit(
-    Tcl_Interp *interp,		/* Interpreter to use for error reporting. */
-    register TkDisplay *dispPtr)/* Display to initialize. */
+    TCL_UNUSED(Tcl_Interp *),		/* Interpreter to use for error reporting. */
+    TkDisplay *dispPtr)/* Display to initialize. */
 {
     XSetWindowAttributes atts;
 
@@ -700,12 +700,11 @@ TkClipInit(
  *--------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 ClipboardGetProc(
     ClientData clientData,	/* Dynamic string holding partially assembled
 				 * selection. */
-    Tcl_Interp *interp,		/* Interpreter used for error reporting (not
+    TCL_UNUSED(Tcl_Interp *),		/* Interpreter used for error reporting (not
 				 * used). */
     const char *portion)	/* New information to be appended. */
 {
diff --git a/generic/tkCmds.c b/generic/tkCmds.c
index 89b5254..193c3d6 100644
--- a/generic/tkCmds.c
+++ b/generic/tkCmds.c
@@ -99,7 +99,7 @@ Tk_BellObjCmd(
 	"-displayof", "-nice", NULL
     };
     enum options { TK_BELL_DISPLAYOF, TK_BELL_NICE };
-    Tk_Window tkwin = clientData;
+    Tk_Window tkwin = (Tk_Window)clientData;
     int i, index, nice = 0;
     Tk_ErrorHandler handler;
 
@@ -163,7 +163,7 @@ Tk_BindObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tk_Window tkwin = clientData;
+    Tk_Window tkwin = (Tk_Window)clientData;
     TkWindow *winPtr;
     ClientData object;
     const char *string;
@@ -187,7 +187,7 @@ Tk_BindObjCmd(
 	}
 	object = (ClientData) winPtr->pathName;
     } else {
-	winPtr = clientData;
+	winPtr = (TkWindow *)clientData;
 	object = (ClientData) Tk_GetUid(string);
     }
 
@@ -285,10 +285,10 @@ TkBindEventProc(
 	 */
 
 	if (winPtr->numTags > MAX_OBJS) {
-	    objPtr = ckalloc(winPtr->numTags * sizeof(ClientData));
+	    objPtr = (void **)ckalloc(winPtr->numTags * sizeof(void *));
 	}
 	for (i = 0; i < winPtr->numTags; i++) {
-	    p = winPtr->tagPtr[i];
+	    p = (const char *)winPtr->tagPtr[i];
 	    if (*p == '.') {
 		hPtr = Tcl_FindHashEntry(&winPtr->mainPtr->nameTable, p);
 		if (hPtr != NULL) {
@@ -347,7 +347,7 @@ Tk_BindtagsObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tk_Window tkwin = clientData;
+    Tk_Window tkwin = (Tk_Window)clientData;
     TkWindow *winPtr, *winPtr2;
     int i, length;
     const char *p;
@@ -399,7 +399,7 @@ Tk_BindtagsObjCmd(
     }
 
     winPtr->numTags = length;
-    winPtr->tagPtr = ckalloc(length * sizeof(ClientData));
+    winPtr->tagPtr = (void **)ckalloc(length * sizeof(void *));
     for (i = 0; i < length; i++) {
 	p = Tcl_GetString(tags[i]);
 	if (p[0] == '.') {
@@ -412,7 +412,7 @@ Tk_BindtagsObjCmd(
 	     * is one.
 	     */
 
-	    copy = ckalloc(strlen(p) + 1);
+	    copy = (char *)ckalloc(strlen(p) + 1);
 	    strcpy(copy, p);
 	    winPtr->tagPtr[i] = (ClientData) copy;
 	} else {
@@ -448,7 +448,7 @@ TkFreeBindingTags(
     const char *p;
 
     for (i = 0; i < winPtr->numTags; i++) {
-	p = winPtr->tagPtr[i];
+	p = (const char *)winPtr->tagPtr[i];
 	if (*p == '.') {
 	    /*
 	     * Names starting with "." are malloced rather than Uids, so they
@@ -488,7 +488,7 @@ Tk_DestroyObjCmd(
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     Tk_Window window;
-    Tk_Window tkwin = clientData;
+    Tk_Window tkwin = (Tk_Window)clientData;
     int i;
 
     for (i = 1; i < objc; i++) {
@@ -527,7 +527,6 @@ Tk_DestroyObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tk_LowerObjCmd(
     ClientData clientData,	/* Main window associated with interpreter. */
@@ -535,7 +534,7 @@ Tk_LowerObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tk_Window mainwin = clientData;
+    Tk_Window mainwin = (Tk_Window)clientData;
     Tk_Window tkwin, other;
 
     if ((objc != 2) && (objc != 3)) {
@@ -587,7 +586,6 @@ Tk_LowerObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tk_RaiseObjCmd(
     ClientData clientData,	/* Main window associated with interpreter. */
@@ -595,7 +593,7 @@ Tk_RaiseObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tk_Window mainwin = clientData;
+    Tk_Window mainwin = (Tk_Window)clientData;
     Tk_Window tkwin, other;
 
     if ((objc != 2) && (objc != 3)) {
@@ -683,7 +681,7 @@ AppnameCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tk_Window tkwin = clientData;
+    Tk_Window tkwin = (Tk_Window)clientData;
     TkWindow *winPtr;
     const char *string;
 
@@ -715,7 +713,7 @@ CaretCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tk_Window tkwin = clientData;
+    Tk_Window tkwin = (Tk_Window)clientData;
     int index;
     Tcl_Obj *objPtr;
     TkCaret *caretPtr;
@@ -807,7 +805,7 @@ ScalingCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tk_Window tkwin = clientData;
+    Tk_Window tkwin = (Tk_Window)clientData;
     Screen *screenPtr;
     int skip, width, height;
     double d;
@@ -858,7 +856,7 @@ UseinputmethodsCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tk_Window tkwin = clientData;
+    Tk_Window tkwin = (Tk_Window)clientData;
     TkDisplay *dispPtr;
     int skip;
 
@@ -906,7 +904,7 @@ UseinputmethodsCmd(
 
 int
 WindowingsystemCmd(
-    ClientData clientData,	/* Main window associated with interpreter. */
+    TCL_UNUSED(void *),	/* Main window associated with interpreter. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -935,7 +933,7 @@ InactiveCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tk_Window tkwin = clientData;
+    Tk_Window tkwin = (Tk_Window)clientData;
     int skip = TkGetDisplayOf(interp, objc - 1, objv + 1, &tkwin);
 
     if (skip < 0) {
@@ -991,7 +989,6 @@ InactiveCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tk_TkwaitObjCmd(
     ClientData clientData,	/* Main window associated with interpreter. */
@@ -999,7 +996,7 @@ Tk_TkwaitObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tk_Window tkwin = clientData;
+    Tk_Window tkwin = (Tk_Window)clientData;
     int done, index;
     int code = TCL_OK;
     static const char *const optionStrings[] = {
@@ -1120,28 +1117,26 @@ Tk_TkwaitObjCmd(
     return code;
 }
 
-	/* ARGSUSED */
 static char *
 WaitVariableProc(
     ClientData clientData,	/* Pointer to integer to set to 1. */
-    Tcl_Interp *interp,		/* Interpreter containing variable. */
-    const char *name1,		/* Name of variable. */
-    const char *name2,		/* Second part of variable name. */
-    int flags)			/* Information about what happened. */
+    TCL_UNUSED(Tcl_Interp *),		/* Interpreter containing variable. */
+    TCL_UNUSED(const char *),		/* Name of variable. */
+    TCL_UNUSED(const char *),		/* Second part of variable name. */
+    TCL_UNUSED(int))			/* Information about what happened. */
 {
-    int *donePtr = clientData;
+    int *donePtr = (int *)clientData;
 
     *donePtr = 1;
     return NULL;
 }
 
-	/*ARGSUSED*/
 static void
 WaitVisibilityProc(
     ClientData clientData,	/* Pointer to integer to set to 1. */
     XEvent *eventPtr)		/* Information about event (not used). */
 {
-    int *donePtr = clientData;
+    int *donePtr = (int *)clientData;
 
     if (eventPtr->type == VisibilityNotify) {
 	*donePtr = 1;
@@ -1155,7 +1150,7 @@ WaitWindowProc(
     ClientData clientData,	/* Pointer to integer to set to 1. */
     XEvent *eventPtr)		/* Information about event. */
 {
-    int *donePtr = clientData;
+    int *donePtr = (int *)clientData;
 
     if (eventPtr->type == DestroyNotify) {
 	*donePtr = 1;
@@ -1179,10 +1174,9 @@ WaitWindowProc(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tk_UpdateObjCmd(
-    ClientData clientData,	/* Main window associated with interpreter. */
+    TCL_UNUSED(void *),	/* Main window associated with interpreter. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -1288,7 +1282,7 @@ Tk_WinfoObjCmd(
     int index, x, y, width, height, useX, useY, c_class, skip;
     const char *string;
     TkWindow *winPtr;
-    Tk_Window tkwin = clientData;
+    Tk_Window tkwin = (Tk_Window)clientData;
 
     static const TkStateMap visualMap[] = {
 	{PseudoColor,	"pseudocolor"},
@@ -1579,11 +1573,11 @@ Tk_WinfoObjCmd(
 	objv += skip;
 	string = Tcl_GetString(objv[2]);
 	Tcl_SetObjResult(interp,
-		Tcl_NewLongObj((long) Tk_InternAtom(tkwin, string)));
+		Tcl_NewWideIntObj(Tk_InternAtom(tkwin, string)));
 	break;
     case WIN_ATOMNAME: {
 	const char *name;
-	long id;
+	Tcl_WideInt id;
 
 	skip = TkGetDisplayOf(interp, objc - 2, objv + 2, &tkwin);
 	if (skip < 0) {
@@ -1594,7 +1588,7 @@ Tk_WinfoObjCmd(
 	    return TCL_ERROR;
 	}
 	objv += skip;
-	if (Tcl_GetLongFromObj(interp, objv[2], &id) != TCL_OK) {
+	if (Tcl_GetWideIntFromObj(interp, objv[2], &id) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	name = Tk_GetAtomName(tkwin, (Atom) id);
@@ -1774,7 +1768,7 @@ Tk_WinfoObjCmd(
 	break;
     }
     case WIN_VISUALSAVAILABLE: {
-	XVisualInfo template, *visInfoPtr;
+	XVisualInfo templ, *visInfoPtr;
 	int count, i;
 	int includeVisualId;
 	Tcl_Obj *strPtr, *resultPtr;
@@ -1795,9 +1789,9 @@ Tk_WinfoObjCmd(
 	    return TCL_ERROR;
 	}
 
-	template.screen = Tk_ScreenNumber(tkwin);
+	templ.screen = Tk_ScreenNumber(tkwin);
 	visInfoPtr = XGetVisualInfo(Tk_Display(tkwin), VisualScreenMask,
-		&template, &count);
+		&templ, &count);
 	if (visInfoPtr == NULL) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "can't find any visuals for screen", -1));
@@ -2094,7 +2088,7 @@ TkGetDisplayOf(
     }
     string = Tcl_GetStringFromObj(objv[0], &length);
     if ((length >= 2) &&
-	    (strncmp(string, "-displayof", (unsigned) length) == 0)) {
+	    (strncmp(string, "-displayof", length) == 0)) {
         if (objc < 2) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "value for \"-displayof\" missing", -1));
@@ -2128,12 +2122,11 @@ TkGetDisplayOf(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 TkDeadAppObjCmd(
-    ClientData clientData,	/* Dummy. */
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,			/* Number of arguments. */
+    TCL_UNUSED(int),			/* Number of arguments. */
     Tcl_Obj *const objv[])		/* Argument strings. */
 {
     Tcl_SetObjResult(interp, Tcl_ObjPrintf(
diff --git a/generic/tkConfig.c b/generic/tkConfig.c
index 7e0943d..46338e2 100644
--- a/generic/tkConfig.c
+++ b/generic/tkConfig.c
@@ -178,7 +178,7 @@ Tk_CreateOptionTable(
     const Tk_OptionSpec *specPtr, *specPtr2;
     Option *optionPtr;
     int numOptions, i;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     /*
@@ -202,7 +202,7 @@ Tk_CreateOptionTable(
     hashEntryPtr = Tcl_CreateHashEntry(&tsdPtr->hashTable, (char *) templatePtr,
 	    &newEntry);
     if (!newEntry) {
-	tablePtr = Tcl_GetHashValue(hashEntryPtr);
+	tablePtr = (OptionTable *)Tcl_GetHashValue(hashEntryPtr);
 	tablePtr->refCount++;
 	return (Tk_OptionTable) tablePtr;
     }
@@ -216,7 +216,7 @@ Tk_CreateOptionTable(
     for (specPtr = templatePtr; specPtr->type != TK_OPTION_END; specPtr++) {
 	numOptions++;
     }
-    tablePtr = ckalloc(sizeof(OptionTable) + (numOptions * sizeof(Option)));
+    tablePtr = (OptionTable *)ckalloc(sizeof(OptionTable) + (numOptions * sizeof(Option)));
     tablePtr->refCount = 1;
     tablePtr->hashEntryPtr = hashEntryPtr;
     tablePtr->nextPtr = NULL;
@@ -266,7 +266,7 @@ Tk_CreateOptionTable(
 		    || (specPtr->type == TK_OPTION_BORDER))
 		    && (specPtr->clientData != NULL)) {
 		optionPtr->extra.monoColorPtr =
-			Tcl_NewStringObj(specPtr->clientData, -1);
+			Tcl_NewStringObj((const char *)specPtr->clientData, -1);
 		Tcl_IncrRefCount(optionPtr->extra.monoColorPtr);
 	    }
 
@@ -275,7 +275,7 @@ Tk_CreateOptionTable(
 		 * Get the custom parsing, etc., functions.
 		 */
 
-		optionPtr->extra.custom = specPtr->clientData;
+		optionPtr->extra.custom = (const Tk_ObjCustomOption *)specPtr->clientData;
 	    }
 	}
 	if (((specPtr->type == TK_OPTION_STRING)
@@ -300,7 +300,7 @@ Tk_CreateOptionTable(
 
     if (specPtr->clientData != NULL) {
 	tablePtr->nextPtr = (OptionTable *)
-		Tk_CreateOptionTable(interp, specPtr->clientData);
+		Tk_CreateOptionTable(interp, (Tk_OptionSpec *)specPtr->clientData);
     }
 
     return (Tk_OptionTable) tablePtr;
@@ -332,8 +332,7 @@ Tk_DeleteOptionTable(
     Option *optionPtr;
     int count;
 
-    tablePtr->refCount--;
-    if (tablePtr->refCount > 0) {
+    if (tablePtr->refCount-- > 1) {
 	return;
     }
 
@@ -1166,9 +1165,9 @@ TkGetOptionSpec(
 
 static void
 FreeOptionInternalRep(
-    register Tcl_Obj *objPtr)	/* Object whose internal rep to free. */
+    Tcl_Obj *objPtr)	/* Object whose internal rep to free. */
 {
-    register Tk_OptionTable tablePtr = (Tk_OptionTable) objPtr->internalRep.twoPtrValue.ptr1;
+    Tk_OptionTable tablePtr = (Tk_OptionTable) objPtr->internalRep.twoPtrValue.ptr1;
 
     Tk_DeleteOptionTable(tablePtr);
     objPtr->typePtr = NULL;
@@ -1192,7 +1191,7 @@ DupOptionInternalRep(
     Tcl_Obj *srcObjPtr,		/* The object we are copying from. */
     Tcl_Obj *dupObjPtr)		/* The object we are copying to. */
 {
-    register OptionTable *tablePtr = (OptionTable *) srcObjPtr->internalRep.twoPtrValue.ptr1;
+    OptionTable *tablePtr = (OptionTable *) srcObjPtr->internalRep.twoPtrValue.ptr1;
     tablePtr->refCount++;
     dupObjPtr->typePtr = srcObjPtr->typePtr;
     dupObjPtr->internalRep = srcObjPtr->internalRep;
@@ -1289,7 +1288,7 @@ Tk_SetOptions(
 	     * more space.
 	     */
 
-	    newSavePtr = ckalloc(sizeof(Tk_SavedOptions));
+	    newSavePtr = (Tk_SavedOptions *)ckalloc(sizeof(Tk_SavedOptions));
 	    newSavePtr->recordPtr = recordPtr;
 	    newSavePtr->tkwin = tkwin;
 	    newSavePtr->numItems = 0;
@@ -1529,7 +1528,6 @@ Tk_FreeSavedOptions(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 void
 Tk_FreeConfigOptions(
     char *recordPtr,		/* Record whose fields contain current values
@@ -2068,7 +2066,7 @@ Tk_GetOptionValue(
 
 Tcl_Obj *
 TkDebugConfig(
-    Tcl_Interp *interp,		/* Interpreter in which the table is
+    TCL_UNUSED(Tcl_Interp *),		/* Interpreter in which the table is
 				 * defined. */
     Tk_OptionTable table)	/* Table about which information is to be
 				 * returned. May not necessarily exist in the
@@ -2078,7 +2076,7 @@ TkDebugConfig(
     Tcl_HashEntry *hashEntryPtr;
     Tcl_HashSearch search;
     Tcl_Obj *objPtr;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     objPtr = Tcl_NewObj();
diff --git a/generic/tkConsole.c b/generic/tkConsole.c
index 701ce77..095d132 100644
--- a/generic/tkConsole.c
+++ b/generic/tkConsole.c
@@ -67,7 +67,7 @@ static int	InterpreterObjCmd(ClientData clientData, Tcl_Interp *interp,
 
 static const Tcl_ChannelType consoleChannelType = {
     "console",			/* Type name. */
-    TCL_CHANNEL_VERSION_5,	/* v4 channel */
+    TCL_CHANNEL_VERSION_5,	/* v5 channel */
     ConsoleClose,		/* Close proc. */
     ConsoleInput,		/* Input proc. */
     ConsoleOutput,		/* Output proc. */
@@ -228,7 +228,7 @@ Tk_InitConsoleChannels(
         return;
     }
 
-    consoleInitPtr = Tcl_GetThreadData(&consoleInitKey, (int) sizeof(int));
+    consoleInitPtr = (int *)Tcl_GetThreadData(&consoleInitKey, (int) sizeof(int));
     if (*consoleInitPtr) {
 	/*
 	 * We've already initialized console channels in this thread.
@@ -256,13 +256,13 @@ Tk_InitConsoleChannels(
      * interp for it to live in.
      */
 
-    info = ckalloc(sizeof(ConsoleInfo));
+    info = (ConsoleInfo *) ckalloc(sizeof(ConsoleInfo));
     info->consoleInterp = NULL;
     info->interp = NULL;
     info->refCount = 0;
 
     if (doIn) {
-	ChannelData *data = ckalloc(sizeof(ChannelData));
+	ChannelData *data = (ChannelData *)ckalloc(sizeof(ChannelData));
 
 	data->info = info;
 	data->info->refCount++;
@@ -279,7 +279,7 @@ Tk_InitConsoleChannels(
     }
 
     if (doOut) {
-	ChannelData *data = ckalloc(sizeof(ChannelData));
+	ChannelData *data = (ChannelData *)ckalloc(sizeof(ChannelData));
 
 	data->info = info;
 	data->info->refCount++;
@@ -296,7 +296,7 @@ Tk_InitConsoleChannels(
     }
 
     if (doErr) {
-	ChannelData *data = ckalloc(sizeof(ChannelData));
+	ChannelData *data = (ChannelData *)ckalloc(sizeof(ChannelData));
 
 	data->info = info;
 	data->info->refCount++;
@@ -378,7 +378,7 @@ Tk_CreateConsoleWindow(
 	     * New ConsoleInfo for a new console window.
 	     */
 
-	    info = ckalloc(sizeof(ConsoleInfo));
+	    info = (ConsoleInfo *)ckalloc(sizeof(ConsoleInfo));
 	    info->refCount = 0;
 
 	    /*
@@ -408,7 +408,7 @@ Tk_CreateConsoleWindow(
 	    }
 	}
     } else {
-	info = ckalloc(sizeof(ConsoleInfo));
+	info = (ConsoleInfo *)ckalloc(sizeof(ConsoleInfo));
 	info->refCount = 0;
     }
 
@@ -457,7 +457,7 @@ Tk_CreateConsoleWindow(
 	if (mainWindow) {
 	    Tk_DeleteEventHandler(mainWindow, StructureNotifyMask,
 		    ConsoleEventProc, info);
-	    if (--info->refCount <= 0) {
+	    if (info->refCount-- <= 1) {
 		ckfree(info);
 	    }
 	}
@@ -498,7 +498,7 @@ ConsoleOutput(
     int toWrite,		/* How many bytes to write? */
     int *errorCode)		/* Where to store error code. */
 {
-    ChannelData *data = instanceData;
+    ChannelData *data = (ChannelData *)instanceData;
     ConsoleInfo *info = data->info;
 
     *errorCode = 0;
@@ -559,14 +559,13 @@ ConsoleOutput(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 ConsoleInput(
-    ClientData instanceData,	/* Unused. */
-    char *buf,			/* Where to store data read. */
-    int bufSize,		/* How much space is available in the
+    TCL_UNUSED(void *),
+    TCL_UNUSED(char *),			/* Where to store data read. */
+    TCL_UNUSED(int),		/* How much space is available in the
 				 * buffer? */
-    int *errorCode)		/* Where to store error code. */
+    TCL_UNUSED(int *))		/* Where to store error code. */
 {
     return 0;			/* Always return EOF. */
 }
@@ -587,17 +586,16 @@ ConsoleInput(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 ConsoleClose(
-    ClientData instanceData,	/* Unused. */
-    Tcl_Interp *interp)		/* Unused. */
+    ClientData instanceData,
+    TCL_UNUSED(Tcl_Interp *))
 {
-    ChannelData *data = instanceData;
+    ChannelData *data = (ChannelData *)instanceData;
     ConsoleInfo *info = data->info;
 
     if (info) {
-	if (--info->refCount <= 0) {
+	if (info->refCount-- <= 1) {
 	    /*
 	     * Assuming the Tcl_Interp * fields must already be NULL.
 	     */
@@ -639,11 +637,10 @@ Console2Close(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static void
 ConsoleWatch(
-    ClientData instanceData,	/* Device ID for the channel. */
-    int mask)			/* OR-ed combination of TCL_READABLE,
+    TCL_UNUSED(void *),	/* Device ID for the channel. */
+    TCL_UNUSED(int))			/* OR-ed combination of TCL_READABLE,
 				 * TCL_WRITABLE and TCL_EXCEPTION, for the
 				 * events we are interested in. */
 {
@@ -666,14 +663,13 @@ ConsoleWatch(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 ConsoleHandle(
-    ClientData instanceData,	/* Device ID for the channel. */
-    int direction,		/* TCL_READABLE or TCL_WRITABLE to indicate
+    TCL_UNUSED(void *),	/* Device ID for the channel. */
+    TCL_UNUSED(int),		/* TCL_READABLE or TCL_WRITABLE to indicate
 				 * which direction of the channel is being
 				 * requested. */
-    ClientData *handlePtr)	/* Where to store handle */
+    TCL_UNUSED(void **))	/* Where to store handle */
 {
     return TCL_ERROR;
 }
@@ -707,7 +703,7 @@ ConsoleObjCmd(
 	"eval", "hide", "show", "title", NULL};
     enum option {CON_EVAL, CON_HIDE, CON_SHOW, CON_TITLE};
     Tcl_Obj *cmd = NULL;
-    ConsoleInfo *info = clientData;
+    ConsoleInfo *info = (ConsoleInfo *)clientData;
     Tcl_Interp *consoleInterp = info->consoleInterp;
 
     if (objc < 2) {
@@ -797,7 +793,7 @@ InterpreterObjCmd(
     int index, result = TCL_OK;
     static const char *const options[] = {"eval", "record", NULL};
     enum option {OTHER_EVAL, OTHER_RECORD};
-    ConsoleInfo *info = clientData;
+    ConsoleInfo *info = (ConsoleInfo *)clientData;
     Tcl_Interp *otherInterp = info->interp;
 
     if (objc < 2) {
@@ -865,7 +861,7 @@ static void
 DeleteConsoleInterp(
     ClientData clientData)
 {
-    Tcl_Interp *interp = clientData;
+    Tcl_Interp *interp = (Tcl_Interp *)clientData;
 
     Tcl_DeleteInterp(interp);
 }
@@ -892,13 +888,13 @@ InterpDeleteProc(
     ClientData clientData,
     Tcl_Interp *interp)
 {
-    ConsoleInfo *info = clientData;
+    ConsoleInfo *info = (ConsoleInfo *)clientData;
 
     if (info->consoleInterp == interp) {
 	Tcl_DeleteThreadExitHandler(DeleteConsoleInterp, info->consoleInterp);
 	info->consoleInterp = NULL;
     }
-    if (--info->refCount <= 0) {
+    if (info->refCount-- <= 1) {
 	ckfree(info);
     }
 }
@@ -924,12 +920,12 @@ static void
 ConsoleDeleteProc(
     ClientData clientData)
 {
-    ConsoleInfo *info = clientData;
+    ConsoleInfo *info = (ConsoleInfo *)clientData;
 
     if (info->consoleInterp) {
 	Tcl_DeleteInterp(info->consoleInterp);
     }
-    if (--info->refCount <= 0) {
+    if (info->refCount-- <= 1) {
 	ckfree(info);
     }
 }
@@ -959,14 +955,14 @@ ConsoleEventProc(
     XEvent *eventPtr)
 {
     if (eventPtr->type == DestroyNotify) {
-	ConsoleInfo *info = clientData;
+	ConsoleInfo *info = (ConsoleInfo *)clientData;
 	Tcl_Interp *consoleInterp = info->consoleInterp;
 
 	if (consoleInterp && !Tcl_InterpDeleted(consoleInterp)) {
 	    Tcl_EvalEx(consoleInterp, "tk::ConsoleExit", -1, TCL_EVAL_GLOBAL);
 	}
 
-	if (--info->refCount <= 0) {
+	if (info->refCount-- <= 1) {
 	    ckfree(info);
 	}
     }
diff --git a/generic/tkEvent.c b/generic/tkEvent.c
index 0994a07..456b86d 100644
--- a/generic/tkEvent.c
+++ b/generic/tkEvent.c
@@ -685,8 +685,8 @@ Tk_CreateEventHandler(
     Tk_EventProc *proc,		/* Function to call for each selected event */
     ClientData clientData)	/* Arbitrary data to pass to proc. */
 {
-    register TkEventHandler *handlerPtr;
-    register TkWindow *winPtr = (TkWindow *) token;
+    TkEventHandler *handlerPtr;
+    TkWindow *winPtr = (TkWindow *)token;
 
     /*
      * Skim through the list of existing handlers to (a) compute the overall
@@ -701,7 +701,7 @@ Tk_CreateEventHandler(
 	 * No event handlers defined at all, so must create.
 	 */
 
-	handlerPtr = ckalloc(sizeof(TkEventHandler));
+	handlerPtr = (TkEventHandler *)ckalloc(sizeof(TkEventHandler));
 	winPtr->handlerList = handlerPtr;
     } else {
 	int found = 0;
@@ -732,7 +732,7 @@ Tk_CreateEventHandler(
 	 * No event handler matched, so create a new one.
 	 */
 
-	handlerPtr->nextPtr = ckalloc(sizeof(TkEventHandler));
+	handlerPtr->nextPtr = (TkEventHandler *)ckalloc(sizeof(TkEventHandler));
 	handlerPtr = handlerPtr->nextPtr;
     }
 
@@ -775,11 +775,11 @@ Tk_DeleteEventHandler(
     Tk_EventProc *proc,
     ClientData clientData)
 {
-    register TkEventHandler *handlerPtr;
-    register InProgress *ipPtr;
+    TkEventHandler *handlerPtr;
+    InProgress *ipPtr;
     TkEventHandler *prevPtr;
-    register TkWindow *winPtr = (TkWindow *) token;
-    ThreadSpecificData *tsdPtr =
+    TkWindow *winPtr = (TkWindow *) token;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     /*
@@ -851,10 +851,10 @@ Tk_CreateGenericHandler(
     ClientData clientData)	/* One-word value to pass to proc. */
 {
     GenericHandler *handlerPtr;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
-    handlerPtr = ckalloc(sizeof(GenericHandler));
+    handlerPtr = (GenericHandler *)ckalloc(sizeof(GenericHandler));
 
     handlerPtr->proc		= proc;
     handlerPtr->clientData	= clientData;
@@ -892,7 +892,7 @@ Tk_DeleteGenericHandler(
     ClientData clientData)
 {
     GenericHandler * handler;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     for (handler=tsdPtr->genericList ; handler ; handler=handler->nextPtr) {
@@ -925,7 +925,7 @@ Tk_CreateClientMessageHandler(
     Tk_ClientMessageProc *proc)	/* Function to call on event. */
 {
     GenericHandler *handlerPtr;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     /*
@@ -933,7 +933,7 @@ Tk_CreateClientMessageHandler(
      * with an extra clientData field we'll never use.
      */
 
-    handlerPtr = ckalloc(sizeof(GenericHandler));
+    handlerPtr = (GenericHandler *)ckalloc(sizeof(GenericHandler));
 
     handlerPtr->proc = (Tk_GenericProc *) proc;
     handlerPtr->clientData = NULL;	/* never used */
@@ -971,7 +971,7 @@ Tk_DeleteClientMessageHandler(
     Tk_ClientMessageProc *proc)
 {
     GenericHandler * handler;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     for (handler=tsdPtr->cmList ; handler!=NULL ; handler=handler->nextPtr) {
@@ -1002,7 +1002,7 @@ Tk_DeleteClientMessageHandler(
 void
 TkEventInit(void)
 {
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     tsdPtr->handlersActive	= 0;
@@ -1035,9 +1035,9 @@ TkEventInit(void)
 static int
 TkXErrorHandler(
     ClientData clientData,	/* Pointer to flag we set. */
-    XErrorEvent *errEventPtr)	/* X error info. */
+    TCL_UNUSED(XErrorEvent *))	/* X error info. */
 {
-    int *error = clientData;
+    int *error = (int *)clientData;
 
     *error = 1;
     return 0;
@@ -1124,12 +1124,12 @@ void
 Tk_HandleEvent(
     XEvent *eventPtr)	/* Event to dispatch. */
 {
-    register TkEventHandler *handlerPtr;
+    TkEventHandler *handlerPtr;
     TkWindow *winPtr;
     unsigned long mask;
     InProgress ip;
     Tcl_Interp *interp = NULL;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
 #if !defined(MAC_OSX_TK) && !defined(_WIN32)
@@ -1337,9 +1337,9 @@ TkEventDeadWindow(
     TkWindow *winPtr)		/* Information about the window that is being
 				 * deleted. */
 {
-    register TkEventHandler *handlerPtr;
-    register InProgress *ipPtr;
-    ThreadSpecificData *tsdPtr =
+    TkEventHandler *handlerPtr;
+    InProgress *ipPtr;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     /*
@@ -1387,8 +1387,8 @@ Time
 TkCurrentTime(
     TkDisplay *dispPtr)		/* Display for which the time is desired. */
 {
-    register XEvent *eventPtr;
-    ThreadSpecificData *tsdPtr =
+    XEvent *eventPtr;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     if (tsdPtr->pendingPtr == NULL) {
@@ -1442,7 +1442,7 @@ Tk_RestrictEvents(
 				 * argument. */
 {
     Tk_RestrictProc *prev;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     prev = tsdPtr->restrictProc;
@@ -1535,7 +1535,7 @@ Tk_QueueWindowEvent(
      */
 
     if (!(dispPtr->flags & TK_DISPLAY_COLLAPSE_MOTION_EVENTS)) {
-	wevPtr = ckalloc(sizeof(TkWindowEvent));
+	wevPtr = (TkWindowEvent *)ckalloc(sizeof(TkWindowEvent));
 	wevPtr->header.proc = WindowEventProc;
 	wevPtr->event = *eventPtr;
 	Tcl_QueueEvent(&wevPtr->header, position);
@@ -1567,7 +1567,7 @@ Tk_QueueWindowEvent(
 	}
     }
 
-    wevPtr = ckalloc(sizeof(TkWindowEvent));
+    wevPtr = (TkWindowEvent *)ckalloc(sizeof(TkWindowEvent));
     wevPtr->header.proc = WindowEventProc;
     wevPtr->event = *eventPtr;
     if ((eventPtr->type == MotionNotify) && (position == TCL_QUEUE_TAIL)) {
@@ -1698,7 +1698,7 @@ WindowEventProc(
 {
     TkWindowEvent *wevPtr = (TkWindowEvent *) evPtr;
     Tk_RestrictAction result;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     if (!(flags & TCL_WINDOW_EVENTS)) {
@@ -1799,7 +1799,7 @@ DelayedMotionProc(
     ClientData clientData)	/* Pointer to display containing a delayed
 				 * motion event to be serviced. */
 {
-    TkDisplay *dispPtr = clientData;
+    TkDisplay *dispPtr = (TkDisplay *)clientData;
 
     if (dispPtr->delayedMotionPtr == NULL) {
 	Tcl_Panic("DelayedMotionProc found no delayed mouse motion event");
@@ -1831,7 +1831,7 @@ TkCreateExitHandler(
 {
     ExitHandler *exitPtr;
 
-    exitPtr = ckalloc(sizeof(ExitHandler));
+    exitPtr = (ExitHandler *)ckalloc(sizeof(ExitHandler));
     exitPtr->proc = proc;
     exitPtr->clientData = clientData;
     Tcl_MutexLock(&exitMutex);
@@ -1927,10 +1927,10 @@ TkCreateThreadExitHandler(
     ClientData clientData)	/* Arbitrary value to pass to proc. */
 {
     ExitHandler *exitPtr;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
-    exitPtr = ckalloc(sizeof(ExitHandler));
+    exitPtr = (ExitHandler *)ckalloc(sizeof(ExitHandler));
     exitPtr->proc = proc;
     exitPtr->clientData = clientData;
 
@@ -1968,7 +1968,7 @@ TkDeleteThreadExitHandler(
     ClientData clientData)	/* Arbitrary value to pass to proc. */
 {
     ExitHandler *exitPtr, *prevPtr;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     for (prevPtr = NULL, exitPtr = tsdPtr->firstExitPtr; exitPtr != NULL;
@@ -2007,7 +2007,7 @@ TkDeleteThreadExitHandler(
 
 void
 TkFinalize(
-    ClientData clientData)	/* Arbitrary value to pass to proc. */
+    TCL_UNUSED(void *))	/* Arbitrary value to pass to proc. */
 {
     ExitHandler *exitPtr;
 
@@ -2059,10 +2059,10 @@ TkFinalize(
 
 void
 TkFinalizeThread(
-    ClientData clientData)	/* Arbitrary value to pass to proc. */
+    TCL_UNUSED(void *))	/* Arbitrary value to pass to proc. */
 {
     ExitHandler *exitPtr;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     Tcl_DeleteThreadExitHandler(TkFinalizeThread, NULL);
diff --git a/generic/tkGet.c b/generic/tkGet.c
index 6eff3a3..f2aed2c 100644
--- a/generic/tkGet.c
+++ b/generic/tkGet.c
@@ -493,10 +493,10 @@ Tk_NameOfJustify(
 
 static void
 FreeUidThreadExitProc(
-    ClientData clientData)		/* Not used. */
+    TCL_UNUSED(void *))
 {
-    ThreadSpecificData *tsdPtr =
-            Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
+	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     Tcl_DeleteHashTable(&tsdPtr->uidTable);
     tsdPtr->initialized = 0;
@@ -529,7 +529,7 @@ Tk_GetUid(
     const char *string)		/* String to convert. */
 {
     int dummy;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
             Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
     Tcl_HashTable *tablePtr = &tsdPtr->uidTable;
 
diff --git a/generic/tkGrab.c b/generic/tkGrab.c
index 2855637..a1ff46c 100644
--- a/generic/tkGrab.c
+++ b/generic/tkGrab.c
@@ -166,7 +166,6 @@ static void		ReleaseButtonGrab(TkDisplay *dispPtr);
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tk_GrabObjCmd(
     ClientData clientData,	/* Main window associated with interpreter. */
@@ -223,7 +222,7 @@ Tk_GrabObjCmd(
 	    Tcl_WrongNumArgs(interp, 1, objv, "?-global? window");
 	    return TCL_ERROR;
 	}
-	tkwin = Tk_NameToWindow(interp, arg, clientData);
+	tkwin = Tk_NameToWindow(interp, arg, (Tk_Window)clientData);
 	if (tkwin == NULL) {
 	    return TCL_ERROR;
 	}
@@ -239,7 +238,7 @@ Tk_GrabObjCmd(
 	    Tcl_WrongNumArgs(interp, 1, objv, "?-global? window");
 	    return TCL_ERROR;
 	}
-	tkwin = Tk_NameToWindow(interp, Tcl_GetString(objv[2]), clientData);
+	tkwin = Tk_NameToWindow(interp, Tcl_GetString(objv[2]), (Tk_Window)clientData);
 	if (tkwin == NULL) {
 	    return TCL_ERROR;
 	}
@@ -265,7 +264,7 @@ Tk_GrabObjCmd(
 	}
 	if (objc == 3) {
 	    tkwin = Tk_NameToWindow(interp, Tcl_GetString(objv[2]),
-		    clientData);
+		    (Tk_Window)clientData);
 	    if (tkwin == NULL) {
 		return TCL_ERROR;
 	    }
@@ -294,7 +293,7 @@ Tk_GrabObjCmd(
 	    Tcl_WrongNumArgs(interp, 1, objv, "release window");
 	    return TCL_ERROR;
 	}
-	tkwin = Tk_NameToWindow(interp, Tcl_GetString(objv[2]), clientData);
+	tkwin = Tk_NameToWindow(interp, Tcl_GetString(objv[2]), (Tk_Window)clientData);
 	if (tkwin == NULL) {
 	    Tcl_ResetResult(interp);
 	} else {
@@ -311,7 +310,7 @@ Tk_GrabObjCmd(
 	if (objc == 3) {
 	    globalGrab = 0;
 	    tkwin = Tk_NameToWindow(interp, Tcl_GetString(objv[2]),
-		    clientData);
+		    (Tk_Window)clientData);
 	} else {
 	    globalGrab = 1;
 
@@ -327,7 +326,7 @@ Tk_GrabObjCmd(
 		return TCL_ERROR;
 	    }
 	    tkwin = Tk_NameToWindow(interp, Tcl_GetString(objv[3]),
-		    clientData);
+		    (Tk_Window)clientData);
 	}
 	if (tkwin == NULL) {
 	    return TCL_ERROR;
@@ -344,7 +343,7 @@ Tk_GrabObjCmd(
 	    return TCL_ERROR;
 	}
 	winPtr = (TkWindow *) Tk_NameToWindow(interp, Tcl_GetString(objv[2]),
-		clientData);
+		(Tk_Window)clientData);
 	if (winPtr == NULL) {
 	    return TCL_ERROR;
 	}
@@ -638,7 +637,7 @@ Tk_Ungrab(
 
 static void
 ReleaseButtonGrab(
-    register TkDisplay *dispPtr)/* Display whose button grab is to be
+    TkDisplay *dispPtr)/* Display whose button grab is to be
 				 * released. */
 {
     unsigned int serial;
@@ -684,11 +683,11 @@ ReleaseButtonGrab(
 
 int
 TkPointerEvent(
-    register XEvent *eventPtr,	/* Pointer to the event. */
+    XEvent *eventPtr,	/* Pointer to the event. */
     TkWindow *winPtr)		/* Tk's information for window where event was
 				 * reported. */
 {
-    register TkWindow *winPtr2;
+    TkWindow *winPtr2;
     TkDisplay *dispPtr = winPtr->dispPtr;
     unsigned int serial;
     int outsideGrabTree = 0;
@@ -872,7 +871,7 @@ TkPointerEvent(
 	} else {
 	    if (eventPtr->xbutton.button != AnyButton &&
 		    ((eventPtr->xbutton.state & ALL_BUTTONS)
-		    == (unsigned int)TkGetButtonMask(eventPtr->xbutton.button))) {
+		    == TkGetButtonMask(eventPtr->xbutton.button))) {
 		ReleaseButtonGrab(dispPtr);			/* Note 4. */
 	    }
 	}
@@ -907,14 +906,14 @@ TkPointerEvent(
 
 void
 TkChangeEventWindow(
-    register XEvent *eventPtr,	/* Event to retarget. Must have type
+    XEvent *eventPtr,	/* Event to retarget. Must have type
 				 * ButtonPress, ButtonRelease, KeyPress,
 				 * KeyRelease, MotionNotify, EnterNotify, or
 				 * LeaveNotify. */
     TkWindow *winPtr)		/* New target window for event. */
 {
     int x, y, sameScreen, bd;
-    register TkWindow *childPtr;
+    TkWindow *childPtr;
 
     eventPtr->xmotion.window = Tk_WindowId(winPtr);
     if (eventPtr->xmotion.root ==
@@ -995,7 +994,7 @@ TkInOutEvents(
     Tcl_QueuePosition position)	/* Position at which events are added to the
 				 * system event queue. */
 {
-    register TkWindow *winPtr;
+    TkWindow *winPtr;
     int upLevels, downLevels, i, j, focus;
 
     /*
@@ -1188,7 +1187,7 @@ MovePointer2(
 
 void
 TkGrabDeadWindow(
-    register TkWindow *winPtr)	/* Window that is in the process of being
+    TkWindow *winPtr)	/* Window that is in the process of being
 				 * deleted. */
 {
     TkDisplay *dispPtr = winPtr->dispPtr;
@@ -1278,7 +1277,7 @@ GrabRestrictProc(
     ClientData arg,
     XEvent *eventPtr)
 {
-    GrabInfo *info = arg;
+    GrabInfo *info = (GrabInfo *)arg;
     int mode, diff;
 
     /*
@@ -1336,7 +1335,7 @@ QueueGrabWindowChange(
 {
     NewGrabWinEvent *grabEvPtr;
 
-    grabEvPtr = ckalloc(sizeof(NewGrabWinEvent));
+    grabEvPtr = (NewGrabWinEvent *)ckalloc(sizeof(NewGrabWinEvent));
     grabEvPtr->header.proc = GrabWinEventProc;
     grabEvPtr->dispPtr = dispPtr;
     if (grabWinPtr == NULL) {
@@ -1371,7 +1370,7 @@ QueueGrabWindowChange(
 static int
 GrabWinEventProc(
     Tcl_Event *evPtr,		/* Event of type NewGrabWinEvent. */
-    int flags)			/* Flags argument to Tcl_DoOneEvent: indicates
+    TCL_UNUSED(int))			/* Flags argument to Tcl_DoOneEvent: indicates
 				 * what kinds of events are being processed
 				 * right now. */
 {
@@ -1416,7 +1415,7 @@ FindCommonAncestor(
     int *countPtr2)		/* Store nesting level of winPtr2 within
 				 * common ancestor here. */
 {
-    register TkWindow *winPtr;
+    TkWindow *winPtr;
     TkWindow *ancestorPtr;
     int count1, count2, i;
 
diff --git a/generic/tkObj.c b/generic/tkObj.c
index 559f0e2..716c7e1 100644
--- a/generic/tkObj.c
+++ b/generic/tkObj.c
@@ -149,7 +149,7 @@ static const Tcl_ObjType windowObjType = {
 static ThreadSpecificData *
 GetTypeCache(void)
 {
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     if (tsdPtr->doubleTypePtr == NULL) {
@@ -408,8 +408,8 @@ FreePixelInternalRep(
 
 static void
 DupPixelInternalRep(
-    register Tcl_Obj *srcPtr,	/* Object with internal rep to copy. */
-    register Tcl_Obj *copyPtr)	/* Object with internal rep to set. */
+    Tcl_Obj *srcPtr,	/* Object with internal rep to copy. */
+    Tcl_Obj *copyPtr)	/* Object with internal rep to set. */
 {
     copyPtr->typePtr = srcPtr->typePtr;
 
@@ -419,7 +419,7 @@ DupPixelInternalRep(
 	PixelRep *oldPtr, *newPtr;
 
 	oldPtr = GET_COMPLEXPIXEL(srcPtr);
-	newPtr = ckalloc(sizeof(PixelRep));
+	newPtr = (PixelRep *)ckalloc(sizeof(PixelRep));
 	newPtr->value = oldPtr->value;
 	newPtr->units = oldPtr->units;
 	newPtr->tkwin = oldPtr->tkwin;
@@ -503,7 +503,7 @@ SetPixelFromAny(
     if ((units < 0) && (i == d)) {
 	SET_SIMPLEPIXEL(objPtr, i);
     } else {
-	PixelRep *pixelPtr = ckalloc(sizeof(PixelRep));
+	PixelRep *pixelPtr = (PixelRep *)ckalloc(sizeof(PixelRep));
 
 	pixelPtr->value = d;
 	pixelPtr->units = units;
@@ -564,7 +564,7 @@ Tk_GetMMFromObj(
 	}
     }
 
-    mmPtr = objPtr->internalRep.twoPtrValue.ptr1;
+    mmPtr = (MMRep *)objPtr->internalRep.twoPtrValue.ptr1;
     if (mmPtr->tkwin != tkwin) {
 	d = mmPtr->value;
 	if (mmPtr->units == -1) {
@@ -628,14 +628,14 @@ FreeMMInternalRep(
 
 static void
 DupMMInternalRep(
-    register Tcl_Obj *srcPtr,	/* Object with internal rep to copy. */
-    register Tcl_Obj *copyPtr)	/* Object with internal rep to set. */
+    Tcl_Obj *srcPtr,	/* Object with internal rep to copy. */
+    Tcl_Obj *copyPtr)	/* Object with internal rep to set. */
 {
     MMRep *oldPtr, *newPtr;
 
     copyPtr->typePtr = srcPtr->typePtr;
-    oldPtr = srcPtr->internalRep.twoPtrValue.ptr1;
-    newPtr = ckalloc(sizeof(MMRep));
+    oldPtr = (MMRep *)srcPtr->internalRep.twoPtrValue.ptr1;
+    newPtr = (MMRep *)ckalloc(sizeof(MMRep));
     newPtr->value = oldPtr->value;
     newPtr->units = oldPtr->units;
     newPtr->tkwin = oldPtr->tkwin;
@@ -664,13 +664,13 @@ DupMMInternalRep(
 
 static void
 UpdateStringOfMM(
-    register Tcl_Obj *objPtr)   /* pixel obj with string rep to update. */
+    Tcl_Obj *objPtr)   /* pixel obj with string rep to update. */
 {
     MMRep *mmPtr;
     char buffer[TCL_DOUBLE_SPACE];
     size_t len;
 
-    mmPtr = objPtr->internalRep.twoPtrValue.ptr1;
+    mmPtr = (MMRep *)objPtr->internalRep.twoPtrValue.ptr1;
     /* assert( mmPtr->units == -1 && objPtr->bytes == NULL ); */
     if ((mmPtr->units != -1) || (objPtr->bytes != NULL)) {
 	Tcl_Panic("UpdateStringOfMM: false precondition");
@@ -679,7 +679,7 @@ UpdateStringOfMM(
     Tcl_PrintDouble(NULL, mmPtr->value, buffer);
     len = strlen(buffer);
 
-    objPtr->bytes = ckalloc(len + 1);
+    objPtr->bytes = (char *)ckalloc(len + 1);
     strcpy(objPtr->bytes, buffer);
     objPtr->length = len;
 }
@@ -787,7 +787,7 @@ SetMMFromAny(
 
     objPtr->typePtr = &mmObjType;
 
-    mmPtr = ckalloc(sizeof(MMRep));
+    mmPtr = (MMRep *)ckalloc(sizeof(MMRep));
     mmPtr->value = d;
     mmPtr->units = units;
     mmPtr->tkwin = NULL;
@@ -827,7 +827,7 @@ TkGetWindowFromObj(
     Tk_Window *windowPtr)	/* Place to store resulting window. */
 {
     TkMainInfo *mainPtr = ((TkWindow *) tkwin)->mainPtr;
-    register WindowRep *winPtr;
+    WindowRep *winPtr;
 
     if (objPtr->typePtr != &windowObjType) {
 	int result = SetWindowFromAny(interp, objPtr);
@@ -836,7 +836,7 @@ TkGetWindowFromObj(
 	}
     }
 
-    winPtr = objPtr->internalRep.twoPtrValue.ptr1;
+    winPtr = (WindowRep *)objPtr->internalRep.twoPtrValue.ptr1;
     if (winPtr->tkwin == NULL
 	    || winPtr->mainPtr == NULL
 	    || winPtr->mainPtr != mainPtr
@@ -882,8 +882,8 @@ TkGetWindowFromObj(
 
 static int
 SetWindowFromAny(
-    Tcl_Interp *interp,		/* Used for error reporting if not NULL. */
-    register Tcl_Obj *objPtr)	/* The object to convert. */
+    TCL_UNUSED(Tcl_Interp *),
+    Tcl_Obj *objPtr)	/* The object to convert. */
 {
     const Tcl_ObjType *typePtr;
     WindowRep *winPtr;
@@ -898,7 +898,7 @@ SetWindowFromAny(
 	typePtr->freeIntRepProc(objPtr);
     }
 
-    winPtr = ckalloc(sizeof(WindowRep));
+    winPtr = (WindowRep *)ckalloc(sizeof(WindowRep));
     winPtr->tkwin = NULL;
     winPtr->mainPtr = NULL;
     winPtr->epoch = 0;
@@ -993,7 +993,7 @@ TkNewWindowObj(
 {
     Tcl_Obj *objPtr = Tcl_NewStringObj(Tk_PathName(tkwin), -1);
     TkMainInfo *mainPtr = ((TkWindow *) tkwin)->mainPtr;
-    register WindowRep *winPtr;
+    WindowRep *winPtr;
 
     SetWindowFromAny(NULL, objPtr);
 
diff --git a/generic/tkOldConfig.c b/generic/tkOldConfig.c
index d05a2c7..d01da95 100644
--- a/generic/tkOldConfig.c
+++ b/generic/tkOldConfig.c
@@ -82,7 +82,7 @@ Tk_ConfigureWidget(
 				 * considered. Also, may have
 				 * TK_CONFIG_ARGV_ONLY set. */
 {
-    register Tk_ConfigSpec *specPtr, *staticSpecs;
+    Tk_ConfigSpec *specPtr, *staticSpecs;
     Tk_Uid value;		/* Value of option from database. */
     int needFlags;		/* Specs must contain this set of flags or
 				 * else they are not considered. */
@@ -245,8 +245,8 @@ FindConfigSpec(
     int hateFlags)		/* Flags that must NOT be present in matching
 				 * entry. */
 {
-    register Tk_ConfigSpec *specPtr;
-    register char c;		/* First character of current argument. */
+    Tk_ConfigSpec *specPtr;
+    char c;		/* First character of current argument. */
     Tk_ConfigSpec *matchPtr;	/* Matching spec, or NULL. */
     size_t length;
 
@@ -376,7 +376,7 @@ DoConfig(
 	    if (nullValue) {
 		newStr = NULL;
 	    } else {
-		newStr = ckalloc(strlen(value) + 1);
+		newStr = (char *)ckalloc(strlen(value) + 1);
 		strcpy(newStr, value);
 	    }
 	    oldStr = *((char **) ptr);
@@ -603,7 +603,7 @@ Tk_ConfigureInfo(
 				 * be present in config specs for them to be
 				 * considered. */
 {
-    register Tk_ConfigSpec *specPtr, *staticSpecs;
+    Tk_ConfigSpec *specPtr, *staticSpecs;
     int needFlags, hateFlags;
     char *list;
     const char *leader = "{";
@@ -686,7 +686,7 @@ FormatConfigInfo(
     Tcl_Interp *interp,		/* Interpreter to use for things like
 				 * floating-point precision. */
     Tk_Window tkwin,		/* Window corresponding to widget. */
-    register const Tk_ConfigSpec *specPtr,
+    const Tk_ConfigSpec *specPtr,
 				/* Pointer to information describing
 				 * option. */
     char *widgRec)		/* Pointer to record holding current values of
@@ -971,7 +971,6 @@ Tk_ConfigureValue(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 void
 Tk_FreeOptions(
     const Tk_ConfigSpec *specs,	/* Describes legal options. */
@@ -983,7 +982,7 @@ Tk_FreeOptions(
 				 * be present in config specs for them to be
 				 * considered. */
 {
-    register const Tk_ConfigSpec *specPtr;
+    const Tk_ConfigSpec *specPtr;
     char *ptr;
 
     for (specPtr = specs; specPtr->type != TK_CONFIG_END; specPtr++) {
@@ -1071,10 +1070,10 @@ GetCachedSpecs(
      * self-initializing code.
      */
 
-    specCacheTablePtr =
+    specCacheTablePtr = (Tcl_HashTable *)
 	    Tcl_GetAssocData(interp, "tkConfigSpec.threadTable", NULL);
     if (specCacheTablePtr == NULL) {
-	specCacheTablePtr = ckalloc(sizeof(Tcl_HashTable));
+	specCacheTablePtr = (Tcl_HashTable *)ckalloc(sizeof(Tcl_HashTable));
 	Tcl_InitHashTable(specCacheTablePtr, TCL_ONE_WORD_KEYS);
 	Tcl_SetAssocData(interp, "tkConfigSpec.threadTable",
 		DeleteSpecCacheTable, specCacheTablePtr);
@@ -1088,7 +1087,7 @@ GetCachedSpecs(
     entryPtr = Tcl_CreateHashEntry(specCacheTablePtr, (char *) staticSpecs,
 	    &isNew);
     if (isNew) {
-	unsigned int entrySpace = sizeof(Tk_ConfigSpec);
+	size_t entrySpace = sizeof(Tk_ConfigSpec);
 	const Tk_ConfigSpec *staticSpecPtr;
 	Tk_ConfigSpec *specPtr;
 
@@ -1107,7 +1106,7 @@ GetCachedSpecs(
 	 * from the origin.
 	 */
 
-	cachedSpecs = ckalloc(entrySpace);
+	cachedSpecs = (Tk_ConfigSpec *)ckalloc(entrySpace);
 	memcpy(cachedSpecs, staticSpecs, entrySpace);
 	Tcl_SetHashValue(entryPtr, cachedSpecs);
 
@@ -1131,7 +1130,7 @@ GetCachedSpecs(
 	    }
 	}
     } else {
-	cachedSpecs = Tcl_GetHashValue(entryPtr);
+	cachedSpecs = (Tk_ConfigSpec *)Tcl_GetHashValue(entryPtr);
     }
 
     return cachedSpecs;
@@ -1157,9 +1156,9 @@ GetCachedSpecs(
 static void
 DeleteSpecCacheTable(
     ClientData clientData,
-    Tcl_Interp *interp)
+    TCL_UNUSED(Tcl_Interp *))
 {
-    Tcl_HashTable *tablePtr = clientData;
+    Tcl_HashTable *tablePtr = (Tcl_HashTable *)clientData;
     Tcl_HashEntry *entryPtr;
     Tcl_HashSearch search;
 
diff --git a/generic/tkStyle.c b/generic/tkStyle.c
index 9cf95d0..1289f14 100644
--- a/generic/tkStyle.c
+++ b/generic/tkStyle.c
@@ -178,9 +178,9 @@ static const Tcl_ObjType styleObjType = {
 
 void
 TkStylePkgInit(
-    TkMainInfo *mainPtr)	/* The application being created. */
+    TCL_UNUSED(TkMainInfo *))	/* The application being created. */
 {
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     if (tsdPtr->nbInit != 0) {
@@ -233,9 +233,9 @@ TkStylePkgInit(
 
 void
 TkStylePkgFree(
-    TkMainInfo *mainPtr)	/* The application being deleted. */
+    TCL_UNUSED(TkMainInfo *))	/* The application being deleted. */
 {
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
     Tcl_HashSearch search;
     Tcl_HashEntry *entryPtr;
@@ -264,7 +264,7 @@ TkStylePkgFree(
 
     entryPtr = Tcl_FirstHashEntry(&tsdPtr->engineTable, &search);
     while (entryPtr != NULL) {
-	enginePtr = Tcl_GetHashValue(entryPtr);
+	enginePtr = (StyleEngine *)Tcl_GetHashValue(entryPtr);
 	FreeStyleEngine(enginePtr);
 	ckfree(enginePtr);
 	entryPtr = Tcl_NextHashEntry(&search);
@@ -307,7 +307,7 @@ Tk_RegisterStyleEngine(
     Tk_StyleEngine parent)	/* The engine's parent. NULL means the default
 				 * system engine. */
 {
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
     Tcl_HashEntry *entryPtr;
     int newEntry;
@@ -331,8 +331,8 @@ Tk_RegisterStyleEngine(
      * Allocate and intitialize a new engine.
      */
 
-    enginePtr = ckalloc(sizeof(StyleEngine));
-    InitStyleEngine(enginePtr, Tcl_GetHashKey(&tsdPtr->engineTable, entryPtr),
+    enginePtr = (StyleEngine *)ckalloc(sizeof(StyleEngine));
+    InitStyleEngine(enginePtr, (const char *)Tcl_GetHashKey(&tsdPtr->engineTable, entryPtr),
 	    (StyleEngine *) parent);
     Tcl_SetHashValue(entryPtr, enginePtr);
 
@@ -364,7 +364,7 @@ InitStyleEngine(
     StyleEngine *parentPtr)	/* The engine's parent. NULL means the default
 				 * system engine. */
 {
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
     int elementId;
 
@@ -389,7 +389,7 @@ InitStyleEngine(
      */
 
     if (tsdPtr->nbElements > 0) {
-	enginePtr->elements = ckalloc(
+	enginePtr->elements = (StyledElement *)ckalloc(
 		sizeof(StyledElement) * tsdPtr->nbElements);
 	for (elementId = 0; elementId < tsdPtr->nbElements; elementId++) {
 	    InitStyledElement(enginePtr->elements+elementId);
@@ -419,7 +419,7 @@ static void
 FreeStyleEngine(
     StyleEngine *enginePtr)	/* The style engine to free. */
 {
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
     int elementId;
 
@@ -454,7 +454,7 @@ Tk_GetStyleEngine(
     const char *name)		/* Name of the engine to retrieve. NULL or
 				 * empty means the default system engine. */
 {
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
     Tcl_HashEntry *entryPtr;
 
@@ -467,7 +467,7 @@ Tk_GetStyleEngine(
 	return NULL;
     }
 
-    return Tcl_GetHashValue(entryPtr);
+    return (Tk_StyleEngine)Tcl_GetHashValue(entryPtr);
 }
 
 /*
@@ -521,7 +521,7 @@ InitElement(
 
 static void
 FreeElement(
-    Element *elementPtr)	/* The element to free. */
+    TCL_UNUSED(Element *))	/* The element to free. */
 {
     /* Nothing to do. */
 }
@@ -604,7 +604,7 @@ CreateElement(
 				 * created explicitly (being registered) or
 				 * implicitly (by a derived element). */
 {
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
     Tcl_HashEntry *entryPtr, *engineEntryPtr;
     Tcl_HashSearch search;
@@ -642,10 +642,10 @@ CreateElement(
      * Reallocate element table.
      */
 
-    tsdPtr->elements = ckrealloc(tsdPtr->elements,
+    tsdPtr->elements = (Element *)ckrealloc(tsdPtr->elements,
 	    sizeof(Element) * tsdPtr->nbElements);
     InitElement(tsdPtr->elements+elementId,
-	    Tcl_GetHashKey(&tsdPtr->elementTable, entryPtr), elementId,
+	    (const char *)Tcl_GetHashKey(&tsdPtr->elementTable, entryPtr), elementId,
 	    genericId, create);
 
     /*
@@ -654,9 +654,9 @@ CreateElement(
 
     engineEntryPtr = Tcl_FirstHashEntry(&tsdPtr->engineTable, &search);
     while (engineEntryPtr != NULL) {
-	enginePtr = Tcl_GetHashValue(engineEntryPtr);
+	enginePtr = (StyleEngine *)Tcl_GetHashValue(engineEntryPtr);
 
-	enginePtr->elements = ckrealloc(enginePtr->elements,
+	enginePtr->elements = (StyledElement *)ckrealloc(enginePtr->elements,
 		sizeof(StyledElement) * tsdPtr->nbElements);
 	InitStyledElement(enginePtr->elements+elementId);
 
@@ -686,7 +686,7 @@ int
 Tk_GetElementId(
     const char *name)		/* Name of the element. */
 {
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
     Tcl_HashEntry *entryPtr;
     int genericId = -1;
@@ -759,7 +759,7 @@ Tk_RegisterStyledElement(
     StyledElement *elementPtr;
     Tk_ElementSpec *specPtr;
     int nbOptions;
-    register Tk_ElementOptionSpec *srcOptions, *dstOptions;
+    Tk_ElementOptionSpec *srcOptions, *dstOptions;
 
     if (templatePtr->version != TK_STYLE_VERSION_1) {
 	/*
@@ -786,16 +786,16 @@ Tk_RegisterStyledElement(
 
     elementPtr = ((StyleEngine *) engine)->elements+elementId;
 
-    specPtr = ckalloc(sizeof(Tk_ElementSpec));
+    specPtr = (Tk_ElementSpec *)ckalloc(sizeof(Tk_ElementSpec));
     specPtr->version = templatePtr->version;
-    specPtr->name = ckalloc(strlen(templatePtr->name)+1);
+    specPtr->name = (char *)ckalloc(strlen(templatePtr->name)+1);
     strcpy(specPtr->name, templatePtr->name);
     nbOptions = 0;
     for (nbOptions = 0, srcOptions = templatePtr->options;
 	    srcOptions->name != NULL; nbOptions++, srcOptions++) {
 	/* empty body */
     }
-    specPtr->options =
+    specPtr->options = (Tk_ElementOptionSpec *)
 	    ckalloc(sizeof(Tk_ElementOptionSpec) * (nbOptions+1));
     for (srcOptions = templatePtr->options, dstOptions = specPtr->options;
 	    /* End condition within loop */; srcOptions++, dstOptions++) {
@@ -804,7 +804,7 @@ Tk_RegisterStyledElement(
 	    break;
 	}
 
-	dstOptions->name = ckalloc(strlen(srcOptions->name)+1);
+	dstOptions->name = (char *)ckalloc(strlen(srcOptions->name)+1);
 	strcpy(dstOptions->name, srcOptions->name);
 	dstOptions->type = srcOptions->type;
     }
@@ -844,7 +844,7 @@ GetStyledElement(
     int elementId)		/* Unique element ID */
 {
     StyledElement *elementPtr;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
     StyleEngine *enginePtr2;
 
@@ -924,7 +924,7 @@ InitWidgetSpec(
      */
 
     widgetSpecPtr->optionsPtr =
-	    ckalloc(sizeof(Tk_OptionSpec *) * nbOptions);
+	    (const Tk_OptionSpec **)ckalloc(sizeof(Tk_OptionSpec *) * nbOptions);
     for (i = 0, elementOptionPtr = elementPtr->specPtr->options;
 	    i < nbOptions; i++, elementOptionPtr++) {
 	widgetOptionPtr = TkGetOptionSpec(elementOptionPtr->name, optionTable);
@@ -1008,7 +1008,7 @@ GetWidgetSpec(
      */
 
     i = elementPtr->nbWidgetSpecs++;
-    elementPtr->widgetSpecs = ckrealloc(elementPtr->widgetSpecs,
+    elementPtr->widgetSpecs = (StyledWidgetSpec *)ckrealloc(elementPtr->widgetSpecs,
 	    sizeof(StyledWidgetSpec) * elementPtr->nbWidgetSpecs);
     widgetSpecPtr = elementPtr->widgetSpecs+i;
     InitWidgetSpec(widgetSpecPtr, elementPtr, optionTable);
@@ -1229,7 +1229,7 @@ Tk_CreateStyle(
     Tk_StyleEngine engine,	/* The style engine. */
     ClientData clientData)	/* Private data passed as is to engine code. */
 {
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
     Tcl_HashEntry *entryPtr;
     int newEntry;
@@ -1253,8 +1253,8 @@ Tk_CreateStyle(
      * Allocate and intitialize a new style.
      */
 
-    stylePtr = ckalloc(sizeof(Style));
-    InitStyle(stylePtr, Tcl_GetHashKey(&tsdPtr->styleTable, entryPtr),
+    stylePtr = (Style *)ckalloc(sizeof(Style));
+    InitStyle(stylePtr, (const char *)Tcl_GetHashKey(&tsdPtr->styleTable, entryPtr),
 	    (engine!=NULL ? (StyleEngine*) engine : tsdPtr->defaultEnginePtr),
 	    clientData);
     Tcl_SetHashValue(entryPtr, stylePtr);
@@ -1344,10 +1344,9 @@ Tk_GetStyle(
     const char *name)		/* Name of the style to retrieve. NULL or empty
 				 * means the default system style. */
 {
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
     Tcl_HashEntry *entryPtr;
-    Style *stylePtr;
 
     /*
      * Search for a corresponding entry in the style table.
@@ -1362,9 +1361,7 @@ Tk_GetStyle(
 	}
 	return NULL;
     }
-    stylePtr = Tcl_GetHashValue(entryPtr);
-
-    return (Tk_Style) stylePtr;
+    return (Tk_Style)Tcl_GetHashValue(entryPtr);
 }
 
 /*
@@ -1379,7 +1376,7 @@ Tk_GetStyle(
 
 void
 Tk_FreeStyle(
-    Tk_Style style)
+    TCL_UNUSED(Tk_Style))
 {
 }
 
@@ -1456,7 +1453,7 @@ Tk_GetStyleFromObj(
  */
 void
 Tk_FreeStyleFromObj(
-    Tcl_Obj *objPtr)
+    TCL_UNUSED(Tcl_Obj *))
 {
 }
 
-- 
cgit v0.12


From 1d31e1c050a57604362a5558615e0c788788f99d Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Tue, 15 Sep 2020 15:54:29 +0000
Subject: tkimgscgnano: removed "origin Androwish" in comment. This is
 incomplete and not important.

---
 generic/tkImgSVGnano.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/generic/tkImgSVGnano.c b/generic/tkImgSVGnano.c
index 6d88466..c18b181 100644
--- a/generic/tkImgSVGnano.c
+++ b/generic/tkImgSVGnano.c
@@ -12,8 +12,7 @@
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
  * This handler is build using the original nanosvg library files from
- * https://github.com/memononen/nanosvg and the tcl extension files from
- * androwish https://www.androwish.org/ .
+ * https://github.com/memononen/nanosvg
  *
  */
 
-- 
cgit v0.12


From b64a5a5eac960a2b2d4ac92330811743117ca6cf Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Tue, 15 Sep 2020 20:10:01 +0000
Subject: More aqua initialization issues

---
 macosx/tkMacOSXInit.c        | 35 ++++++++++++++++++++---------------
 macosx/tkMacOSXSubwindows.c  |  1 +
 macosx/tkMacOSXWindowEvent.c |  1 +
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index 2cf4b0c..6d3ac1c 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -278,19 +278,19 @@ TkpInit(
     static int initialized = 0;
 
     /*
-     * Since it is possible for TkInit to be called multiple times and we
-     * don't want to do the following initialization multiple times we protect
-     * against doing it more than once.
+     * TkpInit can be called multiple times with different interpreters. But
+     * The application initialization should only be done onece.
      */
 
     if (!initialized) {
 	struct stat st;
-	initialized = 1;
 
 	/*
 	 * Initialize/check OS version variable for runtime checks.
 	 */
 
+	initialized = 1;
+
 #if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
 #   error Mac OS X 10.6 required
 #endif
@@ -427,6 +427,22 @@ TkpInit(
 	 */
 
 	TkMacOSXServices_Init(interp);
+
+	/*
+	 * The root window has been created and mapped, but XMapWindow deferred its
+	 * call to makeKeyAndOrderFront because the first call to XMapWindow
+	 * occurs too early in the initialization process for that.  Process idle
+	 * tasks now, so the root window is configured, then order it front.
+	 */
+
+	while(Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {};
+	for (NSWindow *window in [NSApp windows]) {
+	    TkWindow *winPtr = TkMacOSXGetTkWindow(window);
+	    if (winPtr && Tk_IsMapped(winPtr)) {
+		[window makeKeyAndOrderFront:NSApp];
+		break;
+	    }
+	}
     }
 
     if (tkLibPath[0] != '\0') {
@@ -445,17 +461,6 @@ TkpInit(
     Tcl_CreateObjCommand(interp, "::tk::mac::GetAppPath",
 	    TkMacOSXGetAppPathCmd, NULL, NULL);
 
-     /*
-      * The root window has been created and mapped, but XMapWindow deferred its
-      * call to makeKeyAndOrderFront because the first call to XMapWindow
-      * occurs too early in the initialization process for that.  Process idle
-      * tasks now, so the root window is configured, then order it front.
-      */
-
-     while(Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {};
-     for (NSWindow *window in [NSApp windows]) {
-	 [window makeKeyAndOrderFront:NSApp];
-     }
     return TCL_OK;
 }
 
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index 682fbb3..6ac766c 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -315,6 +315,7 @@ XUnmapWindow(
 	if (!Tk_IsEmbedded(winPtr) &&
 		winPtr->wmInfoPtr->hints.initial_state!=IconicState) {
 	    [win orderOut:nil];
+	    [win setExcludedFromWindowsMenu:YES];
 	}
 	TkMacOSXInvalClipRgns((Tk_Window)winPtr);
 
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 9e6c3dd..fcbd134 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -211,6 +211,7 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
     TkWindow *winPtr = TkMacOSXGetTkWindow(window);
     if (winPtr) {
 	TKContentView *view = [window contentView];
+
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101500
 	if (@available(macOS 10.15, *)) {
 	    [view viewDidChangeEffectiveAppearance];
-- 
cgit v0.12


From f99b5fe83fa62c2567c8f52e3d7d3801e1531cba Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Tue, 15 Sep 2020 21:11:13 +0000
Subject: Fix the build of Tk trunk against Tcl trunk.

---
 generic/tkClipboard.c | 4 ++--
 win/tkWinMenu.c       | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/generic/tkClipboard.c b/generic/tkClipboard.c
index dc83238..67b91a2 100644
--- a/generic/tkClipboard.c
+++ b/generic/tkClipboard.c
@@ -174,10 +174,10 @@ ClipboardAppHandler(
 static TkSizeT
 ClipboardWindowHandler(
     TCL_UNUSED(void *),	/* Not used. */
-    TCL_UNUSED(int),			/* Return selection bytes starting at this
+    TCL_UNUSED(TkSizeT),			/* Return selection bytes starting at this
 				 * offset. */
     char *buffer,		/* Place to store converted selection. */
-    TCL_UNUSED(int))		/* Maximum # of bytes to store at buffer. */
+    TCL_UNUSED(TkSizeT))		/* Maximum # of bytes to store at buffer. */
 {
     buffer[0] = '.';
     buffer[1] = 0;
diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c
index ee377e2..7ed8310 100644
--- a/win/tkWinMenu.c
+++ b/win/tkWinMenu.c
@@ -1252,8 +1252,7 @@ TkWinHandleMenuEvent(
 	hashEntryPtr = Tcl_FindHashEntry(&tsdPtr->winMenuTable,
 		*plParam);
 	if (hashEntryPtr != NULL) {
-	    TkSizeT i, len;
-	    int underline;
+	    TkSizeT i, len, underline;
 	    Tcl_Obj *labelPtr;
 	    WCHAR *wlabel;
 	    int menuChar;
-- 
cgit v0.12


From 2c3b3f9e49d15b92c67ba934c9503623b466acda Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Tue, 15 Sep 2020 21:48:58 +0000
Subject: My fixes for build fails against Tcl 9 headers.

---
 generic/tkInt.h      |  4 +++-
 generic/tkStubInit.c | 20 ++++++--------------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/generic/tkInt.h b/generic/tkInt.h
index 0e72161..b2ac833 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -94,8 +94,10 @@
 #   define TKFLEXARRAY 1
 #endif
 
-#ifndef Tcl_GetParent
+#if (TCL_MAJOR_VERSION < 9)
+#  ifndef Tcl_GetParent
 #   define Tcl_GetParent Tcl_GetMaster
+#  endif
 #endif
 
 /*
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index c1151d4..8d863c1 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -59,6 +59,12 @@ static int TkWinGetPlatformId(void) {
 #   define TkWinGetPlatformId 0
 #endif
 
+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
@@ -73,21 +79,7 @@ static int TkWinGetPlatformId(void) {
 #define Tk_PhotoPutZoomedBlock_Panic 0
 #define Tk_PhotoSetSize_Panic 0
 #define Tk_CreateOldPhotoImageFormat 0
-#ifdef MAC_OSX_TK
-static int
-doNothing(void)
-{
-    /* dummy implementation, no need to do anything */
-    return 0;
-}
-#endif
 #else
-static int
-doNothing(void)
-{
-    /* dummy implementation, no need to do anything */
-    return 0;
-}
 #define Tk_FreeXId ((void (*)(Display *, XID))(void *)doNothing)
 #define Tk_FreeStyleFromObj ((void (*)(Tcl_Obj *))(void *)doNothing)
 #define Tk_GetStyleFromObj getStyleFromObj
-- 
cgit v0.12


From 0a2028696498075a876a3a507484ef9ebfcf1dd6 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Wed, 16 Sep 2020 01:23:01 +0000
Subject: Deal with the deprecation of the context property of mouse NSEvents.

---
 macosx/tkMacOSXMouseEvent.c |  4 ++--
 macosx/tkMacOSXTest.c       | 30 ++++++++++++++++++------------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index 00477dd..804531b 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -72,11 +72,11 @@ enum {
      * If this event is not for a Tk toplevel, it should just be passed up the
      * responder chain.  However, there is an exception for synthesized events,
      * which are used in testing.  Those events are recognized by having their
-     * (unused) context pointer set to 1.
+     * both the windowNumber and the eventNumber set to -1.
      */
 
     if (eventWindow && ![eventWindow isMemberOfClass:[TKWindow class]]) {
-	if ([theEvent context] != (void *) 1)
+	if ([theEvent windowNumber] != -1 || [theEvent eventNumber] != -1)
 	    return theEvent;
     }
 
diff --git a/macosx/tkMacOSXTest.c b/macosx/tkMacOSXTest.c
index 16fe37e..7981f7e 100644
--- a/macosx/tkMacOSXTest.c
+++ b/macosx/tkMacOSXTest.c
@@ -197,7 +197,8 @@ PressButtonObjCmd(
     int objc,
     Tcl_Obj *const objv[])
 {
-    int x = 0, y = 0, i, value, wNum;
+    int x = 0, y = 0, i, value;
+    NSInteger signal = -1;
     CGPoint pt;
     NSPoint loc;
     NSEvent *motion, *press, *release;
@@ -231,15 +232,20 @@ PressButtonObjCmd(
     pt.x = loc.x = x;
     pt.y = y;
     loc.y = ScreenHeight - y;
-    wNum = 0;
+
+    /*
+     *  We set the window number and the eventNumber to -1 as a signal to
+     *  processMouseEvent.
+     */
+
     CGWarpMouseCursorPosition(pt);
     motion = [NSEvent mouseEventWithType:NSMouseMoved
 	location:loc
 	modifierFlags:0
 	timestamp:GetCurrentEventTime()
-	windowNumber:wNum
-	context:(void *) 1
-	eventNumber:0
+	windowNumber:signal
+	context:nil
+	eventNumber:signal
 	clickCount:1
 	pressure:0.0];
     [NSApp postEvent:motion atStart:NO];
@@ -247,19 +253,19 @@ PressButtonObjCmd(
 	location:loc
 	modifierFlags:0
 	timestamp:GetCurrentEventTime()
-	windowNumber:wNum
-	context:(void *)1
-	eventNumber:1
+	windowNumber:signal
+	context:nil
+	eventNumber:signal
 	clickCount:1
-	pressure:-1.0];
+	pressure:0.0];
     [NSApp postEvent:press atStart:NO];
     release = [NSEvent mouseEventWithType:NSLeftMouseUp
 	location:loc
 	modifierFlags:0
 	timestamp:GetCurrentEventTime()
-	windowNumber:wNum
-	context:(void*) 1
-	eventNumber:2
+	windowNumber:signal
+	context:nil
+	eventNumber:signal
 	clickCount:1
 	pressure:-1.0];
     [NSApp postEvent:release atStart:NO];
-- 
cgit v0.12


From 761843548be8498985191acfad67cdc3f60af994 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 16 Sep 2020 09:48:08 +0000
Subject: Since 'underline' is an int in TkMenuEntry (tkMenu.h), it (still)
 should be an int here too.

---
 win/tkWinMenu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c
index 7ed8310..ee377e2 100644
--- a/win/tkWinMenu.c
+++ b/win/tkWinMenu.c
@@ -1252,7 +1252,8 @@ TkWinHandleMenuEvent(
 	hashEntryPtr = Tcl_FindHashEntry(&tsdPtr->winMenuTable,
 		*plParam);
 	if (hashEntryPtr != NULL) {
-	    TkSizeT i, len, underline;
+	    TkSizeT i, len;
+	    int underline;
 	    Tcl_Obj *labelPtr;
 	    WCHAR *wlabel;
 	    int menuChar;
-- 
cgit v0.12


From 366274267444686d4349c1e8acfd1d86f5574d09 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 16 Sep 2020 13:31:44 +0000
Subject: (cherry-pick): Require Tcltest 2.2 as a miminum. Run X11 testcases on
 Travis in 3 Ubuntu variants: Xenial, Bionic and Focal. (MacOS/XQuartz not
 working yet)

---
 .fossil-settings/encoding-glob |   4 +
 .gitignore                     |   4 +-
 .travis.yml                    |  28 ++++++
 tests/all.tcl                  |   5 +-
 tests/bell.test                |   2 +-
 tests/bgerror.test             |   2 +-
 tests/bind.test                |  60 ++++++-------
 tests/bitmap.test              |   2 +-
 tests/border.test              |   2 +-
 tests/button.test              |   6 +-
 tests/canvImg.test             |   2 +-
 tests/canvPs.test              |   2 +-
 tests/canvRect.test            |   4 +-
 tests/canvText.test            |   2 +-
 tests/canvWind.test            |   2 +-
 tests/canvas.test              |  14 +--
 tests/choosedir.test           |   2 +-
 tests/clipboard.test           |   2 +-
 tests/clrpick.test             |   2 +-
 tests/cmds.test                |   2 +-
 tests/color.test               |   4 +-
 tests/config.test              |   2 +-
 tests/constraints.tcl          |  14 +--
 tests/cursor.test              |   2 +-
 tests/dialog.test              |   2 +-
 tests/embed.test               |   2 +-
 tests/entry.test               |  20 ++---
 tests/event.test               |   8 +-
 tests/filebox.test             |   4 +-
 tests/focus.test               |   2 +-
 tests/focusTcl.test            |   2 +-
 tests/font.test                |  64 ++++++-------
 tests/frame.test               |   8 +-
 tests/geometry.test            |   4 +-
 tests/get.test                 |   2 +-
 tests/grab.test                |   2 +-
 tests/grid.test                |  20 ++---
 tests/id.test                  |   2 +-
 tests/image.test               |   6 +-
 tests/imgBmap.test             |   2 +-
 tests/imgPPM.test              |   2 +-
 tests/imgPhoto.test            |   6 +-
 tests/listbox.test             |   8 +-
 tests/main.test                |   2 +-
 tests/menu.test                | 126 +++++++++++++-------------
 tests/menuDraw.test            |   4 +-
 tests/menubut.test             |   2 +-
 tests/message.test             |   2 +-
 tests/msgbox.test              |  12 +--
 tests/obj.test                 |   2 +-
 tests/oldpack.test             |   2 +-
 tests/option.test              |   2 +-
 tests/pack.test                |   4 +-
 tests/panedwindow.test         | 198 ++++++++++++++++++++---------------------
 tests/place.test               |   6 +-
 tests/raise.test               |   2 +-
 tests/safe.test                |   8 +-
 tests/scale.test               |   2 +-
 tests/scrollbar.test           |  22 ++---
 tests/select.test              |   2 +-
 tests/send.test                |   2 +-
 tests/spinbox.test             |  18 ++--
 tests/text.test                |  30 +++----
 tests/textBTree.test           |   2 +-
 tests/textDisp.test            |  16 ++--
 tests/textImage.test           |   8 +-
 tests/textIndex.test           |  22 ++---
 tests/textMark.test            |   2 +-
 tests/textTag.test             |   6 +-
 tests/textWind.test            |   4 +-
 tests/tk.test                  |   4 +-
 tests/ttk/all.tcl              |   4 +-
 tests/ttk/combobox.test        |   5 +-
 tests/ttk/image.test           |   2 +-
 tests/ttk/labelframe.test      |   2 +-
 tests/ttk/panedwindow.test     |   6 +-
 tests/ttk/scrollbar.test       |   8 +-
 tests/ttk/spinbox.test         |   4 +-
 tests/ttk/treetags.test        |   6 +-
 tests/ttk/ttk.test             |   2 +-
 tests/ttk/validate.test        |   4 +-
 tests/unixButton.test          |   4 +-
 tests/unixEmbed.test           |   4 +-
 tests/unixFont.test            |   8 +-
 tests/unixMenu.test            |   4 +-
 tests/unixSelect.test          |   4 +-
 tests/util.test                |   2 +-
 tests/visual.test              |   2 +-
 tests/visual_bb.test           |  14 +--
 tests/winButton.test           |   4 +-
 tests/winClipboard.test        |   2 +-
 tests/winDialog.test           |   2 +-
 tests/winFont.test             |   2 +-
 tests/winMenu.test             |   2 +-
 tests/winMsgbox.test           |   2 +-
 tests/winSend.test             |   2 +-
 tests/winWm.test               |   2 +-
 tests/window.test              |   2 +-
 tests/winfo.test               |   4 +-
 tests/wm.test                  |   2 +-
 tests/xmfbox.test              |   6 +-
 101 files changed, 501 insertions(+), 465 deletions(-)

diff --git a/.fossil-settings/encoding-glob b/.fossil-settings/encoding-glob
index 7175730..1dd88e7 100644
--- a/.fossil-settings/encoding-glob
+++ b/.fossil-settings/encoding-glob
@@ -4,3 +4,7 @@ win/makefile.vc
 win/mkd.bat
 win/rmd.bat
 win/rules.vc
+win/rc/*.bmp
+win/rc/*.cur
+win/rc/*.ico
+win/rc/*.rc
diff --git a/.gitignore b/.gitignore
index 9f57b81..a49e849 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 *.bundle
 *.dll
 *.dylib
+*.dylib.E
 *.exe
 *.exp
 *.lib
@@ -14,6 +15,7 @@
 .fslckout
 Makefile
 Tk-Info.plist
+Wish-Info.plist
 autom4te.cache
 config.cache
 config.log
@@ -55,5 +57,5 @@ unix/tclIndex
 win/Debug*
 win/Release*
 win/*.manifest
-win/nmhlp-out.txt
 win/nmakehlp.out
+win/nmhlp-out.txt
diff --git a/.travis.yml b/.travis.yml
index 5015f19..5a03c08 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,7 @@ addons:
       - gcc-multilib
       - tcl-dev
       - libx11-dev
+      - xvfb
   homebrew:
     packages:
       - tcl-tk
@@ -22,16 +23,43 @@ jobs:
     - name: "Linux/GCC/Shared"
       os: linux
       dist: focal
+      services:
+        - xvfb
       compiler: gcc
       env:
         - BUILD_DIR=unix
+      script: &x11gui
+        - make binaries libraries tktest
+        - make install
+        - make test
     - name: "Linux/GCC/Shared/no-xft"
       os: linux
       dist: focal
+      services:
+        - xvfb
       compiler: gcc
       env:
         - BUILD_DIR=unix
         - CFGOPT="--disable-xft"
+      script: *x11gui
+    - name: "Linux/GCC/Shared/bionic"
+      os: linux
+      dist: bionic
+      services:
+        - xvfb
+      compiler: gcc
+      env:
+        - BUILD_DIR=unix
+      script: *x11gui
+    - name: "Linux/GCC/Shared/xenial"
+      os: linux
+      dist: xenial
+      services:
+        - xvfb
+      compiler: gcc
+      env:
+        - BUILD_DIR=unix
+      script: *x11gui
     - name: "Linux/GCC/Static"
       os: linux
       dist: focal
diff --git a/tests/all.tcl b/tests/all.tcl
index d15e5ca..3b6b75f 100644
--- a/tests/all.tcl
+++ b/tests/all.tcl
@@ -14,6 +14,7 @@ package require tcltest 2.2
 tcltest::configure {*}$argv
 tcltest::configure -testdir [file normalize [file dirname [info script]]]
 tcltest::configure -loadfile \
-	[file join [tcltest::testsDirectory] constraints.tcl]
+    [file join [tcltest::testsDirectory] constraints.tcl]
 tcltest::configure -singleproc 1
-tcltest::runAllTests
+set ErrorOnFailures [info exists env(ERROR_ON_FAILURES)]
+if {[tcltest::runAllTests] && $ErrorOnFailures} {exit 1}
diff --git a/tests/bell.test b/tests/bell.test
index 16fea0f..54cad3e 100644
--- a/tests/bell.test
+++ b/tests/bell.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-2000 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/bgerror.test b/tests/bgerror.test
index fa33d31..b1baa31 100644
--- a/tests/bgerror.test
+++ b/tests/bgerror.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/bind.test b/tests/bind.test
index 96449d1..f857dc0 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 tk useinputmethods 0
@@ -22,7 +22,7 @@ proc setup {} {
     frame .b.f -class Test -width 150 -height 100
     pack .b.f
     focus -force .b.f
-    foreach p [event info] {event delete $p}    
+    foreach p [event info] {event delete $p}
     update
 }
 proc setup2 {} {
@@ -175,7 +175,7 @@ test bind-4.2 {TkBindEventProc procedure} {
     bind .b.f <Enter> {lappend x "%W enter .b.f"}
     bindtags .b.f {.b.f {a b} xyz}
     set x {}
-    event gen .b.f <Enter> 
+    event gen .b.f <Enter>
     set x
 } {{.b.f enter .b.f} {.b.f enter {a b}} {.b.f enter xyz}}
 test bind-4.3 {TkBindEventProc procedure} {
@@ -545,10 +545,10 @@ test bind-13.10 {Tk_BindEvent procedure: collapse Motions} {
     setup
     bind .b.f <Motion> "lappend x Motion%#(%x,%y)"
     set x {}
-    event gen .b.f <Motion> -serial 100 -x 100 -y 200 -when tail 
+    event gen .b.f <Motion> -serial 100 -x 100 -y 200 -when tail
     update
     event gen .b.f <Motion> -serial 101 -x 200 -y 300 -when tail
-    event gen .b.f <Motion> -serial 102 -x 300 -y 400 -when tail 
+    event gen .b.f <Motion> -serial 102 -x 300 -y 400 -when tail
     update
     set x
 } {Motion100(100,200) Motion102(300,400)}
@@ -556,10 +556,10 @@ test bind-13.11 {Tk_BindEvent procedure: collapse repeating modifiers} {
     setup
     bind .b.f <Key> "lappend x %K%#"
     bind .b.f <KeyRelease> "lappend x %K%#"
-    event gen .b.f <Key-Shift_L> -serial 100 -when tail 
-    event gen .b.f <KeyRelease-Shift_L> -serial 101 -when tail 
-    event gen .b.f <Key-Shift_L> -serial 102 -when tail 
-    event gen .b.f <KeyRelease-Shift_L> -serial 103 -when tail 
+    event gen .b.f <Key-Shift_L> -serial 100 -when tail
+    event gen .b.f <KeyRelease-Shift_L> -serial 101 -when tail
+    event gen .b.f <Key-Shift_L> -serial 102 -when tail
+    event gen .b.f <KeyRelease-Shift_L> -serial 103 -when tail
     update
 } {}
 test bind-13.12 {Tk_BindEvent procedure: valid key detail} {
@@ -694,7 +694,7 @@ test bind-13.26 {Tk_BindEvent procedure: no detail virtual pattern list} {
     setup
     bind .b.f <Button-2> {set x Button-2}
     set x {}
-    event gen .b.f <Button-2> 
+    event gen .b.f <Button-2>
     set x
 } {Button-2}
 test bind-13.27 {Tk_BindEvent procedure: detail virtual pattern list} {
@@ -849,7 +849,7 @@ test bind-13.43 {Tk_BindEvent procedure: break in script} testcbind {
 } {b1}
 
 proc bgerror msg {
-    global x 
+    global x
     lappend x $msg
 }
 test bind-13.44 {Tk_BindEvent procedure: error in script} {
@@ -910,7 +910,7 @@ test bind-14.3 {TkBindDeadWindow: pending C bindings} testcbind {
     }
     set y
 } {a1 b1 d2}
-    
+
 test bind-15.1 {MatchPatterns procedure, ignoring type mismatches} {
     setup
     bind .b.f ab {set x 1}
@@ -1037,7 +1037,7 @@ test bind-15.14 {MatchPatterns procedure, checking "nearby"} {
     setup
     bind .b.f <Double-1> {set x 1}
     set x 0
-    event gen .b.f <Button-2> 
+    event gen .b.f <Button-2>
     event gen .b.f <ButtonRelease-2>
     event gen .b.f <Button-1> -x 30 -y 40
     event gen .b.f <Button-1> -x 31 -y 39
@@ -1048,7 +1048,7 @@ test bind-15.15 {MatchPatterns procedure, checking "nearby"} {
     setup
     bind .b.f <Double-1> {set x 1}
     set x 0
-    event gen .b.f <Button-2> 
+    event gen .b.f <Button-2>
     event gen .b.f <ButtonRelease-2>
     event gen .b.f <Button-1> -x 30 -y 40
     event gen .b.f <Button-1> -x 29 -y 41
@@ -1059,7 +1059,7 @@ test bind-15.16 {MatchPatterns procedure, checking "nearby"} {
     setup
     bind .b.f <Double-1> {set x 1}
     set x 0
-    event gen .b.f <Button-2> 
+    event gen .b.f <Button-2>
     event gen .b.f <ButtonRelease-2>
     event gen .b.f <Button-1> -x 30 -y 40
     event gen .b.f <Button-1> -x 40 -y 40
@@ -1070,7 +1070,7 @@ test bind-15.17 {MatchPatterns procedure, checking "nearby"} {
     setup
     bind .b.f <Double-1> {set x 1}
     set x 0
-    event gen .b.f <Button-2> 
+    event gen .b.f <Button-2>
     event gen .b.f <ButtonRelease-2>
     event gen .b.f <Button-1> -x 30 -y 40
     event gen .b.f <Button-1> -x 20 -y 40
@@ -1081,7 +1081,7 @@ test bind-15.18 {MatchPatterns procedure, checking "nearby"} {
     setup
     bind .b.f <Double-1> {set x 1}
     set x 0
-    event gen .b.f <Button-2> 
+    event gen .b.f <Button-2>
     event gen .b.f <ButtonRelease-2>
     event gen .b.f <Button-1> -x 30 -y 40
     event gen .b.f <Button-1> -x 30 -y 30
@@ -1092,7 +1092,7 @@ test bind-15.19 {MatchPatterns procedure, checking "nearby"} {
     setup
     bind .b.f <Double-1> {set x 1}
     set x 0
-    event gen .b.f <Button-2> 
+    event gen .b.f <Button-2>
     event gen .b.f <ButtonRelease-2>
     event gen .b.f <Button-1> -x 30 -y 40
     event gen .b.f <Button-1> -x 30 -y 50
@@ -1103,7 +1103,7 @@ test bind-15.20 {MatchPatterns procedure, checking "nearby"} {
     setup
     bind .b.f <Double-1> {set x 1}
     set x 0
-    event gen .b.f <Button-2> 
+    event gen .b.f <Button-2>
     event gen .b.f <ButtonRelease-2>
     event gen .b.f <Button-1> -time 300
     event gen .b.f <Button-1> -time 700
@@ -1114,7 +1114,7 @@ test bind-15.21 {MatchPatterns procedure, checking "nearby"} {
     setup
     bind .b.f <Double-1> {set x 1}
     set x 0
-    event gen .b.f <Button-2> 
+    event gen .b.f <Button-2>
     event gen .b.f <ButtonRelease-2>
     event gen .b.f <Button-1> -time 300
     event gen .b.f <Button-1> -time 900
@@ -1700,7 +1700,7 @@ test bind-18.3 {CreateVirtualEvent procedure: new physical} {
 } {<Control-Key-v>}
 test bind-18.4 {CreateVirtualEvent procedure: duplicate physical} {
     setup
-    event add <<xyz>> <Control-v> 
+    event add <<xyz>> <Control-v>
     event add <<xyz>> <Control-v>
     event info <<xyz>>
 } {<Control-Key-v>}
@@ -1757,13 +1757,13 @@ test bind-19.7 {DeleteVirtualEvent procedure: owns 1, delete all} {
     setup
     event add <<xyz>> <Control-v>
     event delete <<xyz>>
-    event info 
+    event info
 } {}
 test bind-19.8 {DeleteVirtualEvent procedure: owns 1, delete 1} {
     setup
     event add <<xyz>> <Control-v>
     event delete <<xyz>> <Control-v>
-    event info 
+    event info
 } {}
 test bind-19.9 {DeleteVirtualEvent procedure: owns many, delete all} {
     setup
@@ -1800,7 +1800,7 @@ test bind-19.12 {DeleteVirtualEvent procedure: owned by 1, first in chain} {
     event gen .b.f <ButtonRelease-2>
     event gen .b.f <Control-Button-2>
     event gen .b.f <Control-ButtonRelease-2>
-    event delete <<xyz>> 
+    event delete <<xyz>>
     event gen .b.f <Button-2>
     event gen .b.f <ButtonRelease-2>
     event gen .b.f <Control-Button-2>
@@ -1846,7 +1846,7 @@ test bind-19.14 {DeleteVirtualEvent procedure: owned by 1, last in chain} {
     event gen .b.f <Control-ButtonRelease-2>
     event gen .b.f <Shift-Button-2>
     event gen .b.f <Shift-ButtonRelease-2>
-    event delete <<xyz>> 
+    event delete <<xyz>>
     event gen .b.f <Button-2>
     event gen .b.f <ButtonRelease-2>
     event gen .b.f <Control-Button-2>
@@ -1873,7 +1873,7 @@ test bind-19.15 {DeleteVirtualEvent procedure: owned by many, first} {
     event gen .b.g <ButtonRelease-2>
     event gen .b.h <Button-2>
     event gen .b.h <ButtonRelease-2>
-    event delete <<xyz>> 
+    event delete <<xyz>>
     event gen .b.f <Button-2>
     event gen .b.f <ButtonRelease-2>
     event gen .b.g <Button-2>
@@ -1931,7 +1931,7 @@ test bind-19.17 {DeleteVirtualEvent procedure: owned by many, last} {
     event gen .b.g <ButtonRelease-2>
     event gen .b.h <Button-2>
     event gen .b.h <ButtonRelease-2>
-    event delete <<def>> 
+    event delete <<def>>
     event gen .b.f <Button-2>
     event gen .b.f <ButtonRelease-2>
     event gen .b.g <Button-2>
@@ -2100,7 +2100,7 @@ foreach check {
     {bind-22.22 <Configure> %a {-above [winfo id .b]} {[winfo id .b]}}
     {bind-22.23 <Key> %b       {-above .} {{1 {<Key> event doesn't accept "-above" option}}}}
 
-    {bind-22.24 <Configure> %B {-borderwidth xyz} {{1 {bad screen distance "xyz"}}}}    
+    {bind-22.24 <Configure> %B {-borderwidth xyz} {{1 {bad screen distance "xyz"}}}}
     {bind-22.25 <Configure> %B {-borderwidth 2i} {[winfo pixels .b.f 2i]}}
     {bind-22.26 <Key> %k       {-borderwidth 2i} {{1 {<Key> event doesn't accept "-borderwidth" option}}}}
 
@@ -2536,7 +2536,7 @@ test bind-26.3 {event names} {
     destroy .b.f
     set x
 } {<Destroy> destroyed}
-foreach check { 
+foreach check {
     {bind-26.4  Motion     Motion}
     {bind-26.5  Button     Button}
     {bind-26.6  ButtonPress   Button}
@@ -2563,7 +2563,7 @@ foreach check {
     } [list "event $event" <$canonicalEvent>]
 }
 # These events require an extra argument to [event generate]
-foreach check { 
+foreach check {
     {bind-26.19 Circulate Circulate}
     {bind-26.20 Configure Configure}
     {bind-26.21 Gravity   Gravity}
diff --git a/tests/bitmap.test b/tests/bitmap.test
index 6e2255c..05086c3 100644
--- a/tests/bitmap.test
+++ b/tests/bitmap.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/border.test b/tests/border.test
index 30aed91..5b2155d 100644
--- a/tests/border.test
+++ b/tests/border.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/button.test b/tests/button.test
index 927aac0..fc8040d 100644
--- a/tests/button.test
+++ b/tests/button.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -804,7 +804,7 @@ test button-14.1 {size behaviouor} {
     foreach class {label button radiobutton checkbutton} {
 	eval destroy [winfo children .]
 
-	$class .a -text Hej 
+	$class .a -text Hej
 	$class .b -text Hej -width 10 -height 1
 	$class .c -text "" -width 10 -height 1
 
@@ -817,7 +817,7 @@ test button-14.1 {size behaviouor} {
 	    # A one line text should be as high as -height 1
 	    lappend res2 [expr {[winfo reqheight .a] == [winfo reqheight .b]}]
 	    lappend res $res2
-	    
+
 	    # Do the second round with another font
 	    .a configure -font "Arial 20"
 	    .b configure -font "Arial 20"
diff --git a/tests/canvImg.test b/tests/canvImg.test
index 1dffc5e..92ec6a8 100644
--- a/tests/canvImg.test
+++ b/tests/canvImg.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/canvPs.test b/tests/canvPs.test
index f2df447..f605f2f 100644
--- a/tests/canvPs.test
+++ b/tests/canvPs.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/canvRect.test b/tests/canvRect.test
index b6c828e..b36cf21 100644
--- a/tests/canvRect.test
+++ b/tests/canvRect.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -292,7 +292,7 @@ test canvRect-10.1 {TranslateRectOval procedure} {
 test canvRect-11.1 {RectOvalToPostscript procedure} {nonPortable macCrash} {
     # Crashes on Mac because the XGetImage() call isn't implemented, causing a
     # dereference of NULL.
-    
+
     .c configure -bd 0 -highlightthickness 0
     .c delete withtag all
     .c create rect 50 60 90 80 -fill black -stipple gray50 -outline {}
diff --git a/tests/canvText.test b/tests/canvText.test
index 7eef938..7608f86 100644
--- a/tests/canvText.test
+++ b/tests/canvText.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/canvWind.test b/tests/canvWind.test
index 9844ff0..65b7b76 100644
--- a/tests/canvWind.test
+++ b/tests/canvWind.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/canvas.test b/tests/canvas.test
index 6fea894..ac9ed4e 100644
--- a/tests/canvas.test
+++ b/tests/canvas.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-2000 Ajuba Solutions.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -251,7 +251,7 @@ test canvas-9.1 {canvas id creation and deletion} -setup {
 	    .c delete $id
 	}
     }] 0]
-	
+
     set x ""
 } -result {}
 test canvas-10.1 {find items using tag expressions} -setup {
@@ -416,10 +416,10 @@ test canvas-12.1 {canvas mm obj, patch SF-403327, 102471} -setup {
     destroy .c
     pack [canvas .c]
 } -body {
-    set qx [expr {1.+1.}] 
-    # qx has type double and no string representation 
+    set qx [expr {1.+1.}]
+    # qx has type double and no string representation
     .c scale all $qx 0 1. 1.
-    # qx has now type MMRep and no string representation 
+    # qx has now type MMRep and no string representation
     list $qx [string length $qx]
 } -result {2.0 3}
 test canvas-12.2 {canvas mm obj, patch SF-403327, 102471} -setup {
@@ -428,9 +428,9 @@ test canvas-12.2 {canvas mm obj, patch SF-403327, 102471} -setup {
 } -body {
     set val 10
     incr val
-    # qx has type double and no string representation 
+    # qx has type double and no string representation
     .c scale all $val 0 1 1
-    # qx has now type MMRep and no string representation 
+    # qx has now type MMRep and no string representation
     incr val
 } -result 12
 
diff --git a/tests/choosedir.test b/tests/choosedir.test
index 01a319f..05d3675 100644
--- a/tests/choosedir.test
+++ b/tests/choosedir.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/clipboard.test b/tests/clipboard.test
index 37e45a3..f8d6b1f 100644
--- a/tests/clipboard.test
+++ b/tests/clipboard.test
@@ -11,7 +11,7 @@
 # environment variable TK_ALT_DISPLAY is set to an alternate display.
 #
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/clrpick.test b/tests/clrpick.test
index 8b3769e..2fa8c36 100644
--- a/tests/clrpick.test
+++ b/tests/clrpick.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/cmds.test b/tests/cmds.test
index f630209..84e24b3 100644
--- a/tests/cmds.test
+++ b/tests/cmds.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/color.test b/tests/color.test
index aa20099..c65d6ee 100644
--- a/tests/color.test
+++ b/tests/color.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -168,7 +168,7 @@ test color-1.5 {Color table} nonPortable {
 	if {$rgb != [lrange $line 0 2] } {
 		append result $line\n
 	}
-	
+
     }
     return $result
 } {}
diff --git a/tests/config.test b/tests/config.test
index 0d1e0e1..bf00e20 100644
--- a/tests/config.test
+++ b/tests/config.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/constraints.tcl b/tests/constraints.tcl
index 01089aa..78dbaf2 100644
--- a/tests/constraints.tcl
+++ b/tests/constraints.tcl
@@ -5,7 +5,7 @@ if {[namespace exists tk::test]} {
     return
 }
 
-package require Tk 8.4
+package require Tk
 tk appname tktest
 wm title . tktest
 # If the main window isn't already mapped (e.g. because the tests are
@@ -17,7 +17,7 @@ if {![winfo ismapped .]} {
     update
 }
 
-package require tcltest 2.1
+package require tcltest 2.2
 
 namespace eval tk {
     namespace eval test {
@@ -36,7 +36,7 @@ namespace eval tk {
 	}
 
 	namespace eval bg {
-	    # Manage a background process.  
+	    # Manage a background process.
 	    # Replace with slave interp or thread?
 	    namespace import ::tcltest::interpreter
 	    namespace import ::tk::test::loadTkCommand
@@ -124,7 +124,7 @@ namespace eval tk {
 	    eval destroy [winfo children .]
 	}
 
-	namespace export fixfocus 
+	namespace export fixfocus
 	proc fixfocus {} {
             catch {destroy .focus}
             toplevel .focus
@@ -144,13 +144,14 @@ namespace import -force tk::test::*
 namespace import -force tcltest::testConstraint
 testConstraint notAqua [expr {[tk windowingsystem] ne "aqua"}]
 testConstraint aqua [expr {[tk windowingsystem] eq "aqua"}]
+testConstraint x11 [expr {[tk windowingsystem] eq "x11"}]
 testConstraint nonwin [expr {[tk windowingsystem] ne "win32"}]
 testConstraint userInteraction 0
 testConstraint nonUnixUserInteraction [expr {
-    [testConstraint userInteraction] || 
+    [testConstraint userInteraction] ||
     ([testConstraint unix] && [testConstraint notAqua])
 }]
-testConstraint haveDISPLAY [info exists env(DISPLAY)]
+testConstraint haveDISPLAY [expr {[info exists env(DISPLAY)] && [testConstraint x11]}]
 testConstraint altDisplay  [info exists env(TK_ALT_DISPLAY)]
 testConstraint noExceed [expr {
     ![testConstraint unix] || [catch {font actual "\{xyz"}]
@@ -169,7 +170,6 @@ testConstraint testembed     [llength [info commands testembed]]
 testConstraint testfont      [llength [info commands testfont]]
 testConstraint testmakeexist [llength [info commands testmakeexist]]
 testConstraint testmenubar   [llength [info commands testmenubar]]
-testConstraint testmenubar   [llength [info commands testmenubar]]
 testConstraint testmetrics   [llength [info commands testmetrics]]
 testConstraint testobjconfig [llength [info commands testobjconfig]]
 testConstraint testsend      [llength [info commands testsend]]
diff --git a/tests/cursor.test b/tests/cursor.test
index 539e933..02ad78c 100644
--- a/tests/cursor.test
+++ b/tests/cursor.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/dialog.test b/tests/dialog.test
index 538461b..8a21d59 100644
--- a/tests/dialog.test
+++ b/tests/dialog.test
@@ -1,7 +1,7 @@
 # This file is a Tcl script to test out Tk's "tk_dialog" command.
 # It is organized in the standard fashion for Tcl tests.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/embed.test b/tests/embed.test
index bac2675..865b594 100644
--- a/tests/embed.test
+++ b/tests/embed.test
@@ -4,7 +4,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/entry.test b/tests/entry.test
index da3637d..2e828cf 100644
--- a/tests/entry.test
+++ b/tests/entry.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -44,9 +44,9 @@ foreach test {
     {-bg #ff0000 #ff0000 non-existent {unknown color name "non-existent"}}
     {-borderwidth 1.3 1 badValue {bad screen distance "badValue"}}
     {-cursor arrow arrow badValue {bad cursor spec "badValue"}}
-    {-disabledbackground green green non-existent 
+    {-disabledbackground green green non-existent
 	{unknown color name "non-existent"}}
-    {-disabledforeground blue blue non-existent 
+    {-disabledforeground blue blue non-existent
 	{unknown color name "non-existent"}}
     {-exportselection yes 1 xyzzy {expected boolean value but got "xyzzy"}}
     {-fg #110022 #110022 bogus {unknown color name "bogus"}}
@@ -65,14 +65,14 @@ foreach test {
     {-invalidcommand "any string" "any string" {} {}}
     {-invcmd "any string" "any string" {} {}}
     {-justify right right bogus {bad justification "bogus": must be left, right, or center}}
-    {-readonlybackground green green non-existent 
+    {-readonlybackground green green non-existent
 	{unknown color name "non-existent"}}
     {-relief groove groove 1.5 {bad relief "1.5": must be flat, groove, raised, ridge, solid, or sunken}}
     {-selectbackground #110022 #110022 bogus {unknown color name "bogus"}}
     {-selectborderwidth 1.3 1 badValue {bad screen distance "badValue"}}
     {-selectforeground #654321 #654321 bogus {unknown color name "bogus"}}
     {-show * * {} {}}
-    {-state n normal bogus 
+    {-state n normal bogus
 	{bad state "bogus": must be disabled, normal, or readonly}}
     {-takefocus "any string" "any string" {} {}}
     {-textvariable i i {} {}}
@@ -506,13 +506,13 @@ test entry-3.74 {EntryWidgetCmd procedure, "xview" widget command} {
 test entry-3.75 {EntryWidgetCmd procedure, "xview" widget command} {
     .e xview 30
     update
-    .e xview scroll 2 units 
+    .e xview scroll 2 units
     .e index @0
 } {32}
 test entry-3.76 {EntryWidgetCmd procedure, "xview" widget command} {
     .e xview 30
     update
-    .e xview scroll -1 units 
+    .e xview scroll -1 units
     .e index @0
 } {29}
 test entry-3.77 {EntryWidgetCmd procedure, "xview" widget command} {
@@ -1202,14 +1202,14 @@ test entry-13.9 {GetEntryIndex procedure} {
 } {1 6}
 selection clear .e
 test entry-13.10 {GetEntryIndex procedure} unix {
-    # On unix, when selection is cleared, entry widget's internal 
+    # On unix, when selection is cleared, entry widget's internal
     # selection range is reset.
 
     list [catch {.e index sel.first} msg] $msg
 } {1 {selection isn't in widget .e}}
 test entry-13.11 {GetEntryIndex procedure} win {
     # On mac and pc, when selection is cleared, entry widget remembers
-    # last selected range.  When selection ownership is restored to 
+    # last selected range.  When selection ownership is restored to
     # entry, the old range will be rehighlighted.
 
     list [catch {selection get}] [.e index sel.first]
@@ -1388,7 +1388,7 @@ test entry-18.1 {Entry widget vs hiding} {
     interp hide {} .e
     destroy .e
     list [winfo children .] [interp hidden]
-} [list {} $l]    
+} [list {} $l]
 
 ##
 ## Entry widget VALIDATION tests
diff --git a/tests/event.test b/tests/event.test
index 95be5f4..4fb2429 100644
--- a/tests/event.test
+++ b/tests/event.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -326,7 +326,7 @@ test event-3.1(click-drag) {click and drag in a text widget, this tests\
 
     # Save the position of the insert cursor
     lappend result [$e index insert]
-    
+
     # Now drag until selend is highlighted, then click up
 
     set current $anchor
@@ -390,7 +390,7 @@ test event-3.2(click-drag) {click and drag in an entry widget, this\
 
     # Save the position of the insert cursor
     lappend result [$e index insert]
-    
+
     # Now drag until selend is highlighted, then click up
 
     set current $anchor
@@ -743,7 +743,7 @@ test event-7.2(double-click) {A double click on a lone character\
     set result [list]
     lappend result [$e index insert]
     lappend result [_get_selection $e]
-  
+
     # Clear selection by clicking at 0,0
 
     event generate $e <ButtonPress-1> -x 0 -y 0
diff --git a/tests/filebox.test b/tests/filebox.test
index 7b9fa2c..5addcf0 100644
--- a/tests/filebox.test
+++ b/tests/filebox.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -162,7 +162,7 @@ foreach mode $modes {
     catch {tk_getOpenFile -foo 1} msg
     regsub -all ,      $msg "" options
     regsub \"-foo\" $options "" options
-    
+
     foreach option $options {
         if {[string index $option 0] eq "-"} {
 	    test filebox-1.2-$mode$option "tk_getOpenFile command" -body {
diff --git a/tests/focus.test b/tests/focus.test
index 5cc3abe..eee0ee6 100644
--- a/tests/focus.test
+++ b/tests/focus.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/focusTcl.test b/tests/focusTcl.test
index 1f5eed5..1812a38 100644
--- a/tests/focusTcl.test
+++ b/tests/focusTcl.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/font.test b/tests/font.test
index 2defb29..6175b32 100644
--- a/tests/font.test
+++ b/tests/font.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -37,14 +37,14 @@ proc clearnondefaultfonts {} {
 proc setup {} {
     catch {destroy .b.f}
     clearnondefaultfonts
-    label .b.f 
+    label .b.f
     pack .b.f
     update
 }
 
 label .b.l -padx 0 -pady 0 -bd 0 -highlightthickness 0 -justify left -text "0" -font "Courier -12"
 pack .b.l
-canvas .b.c -closeenough 0 
+canvas .b.c -closeenough 0
 .b.c create text 0 0 -tags text -anchor nw -just left -font "Courier -12"
 pack .b.c
 update
@@ -104,7 +104,7 @@ test font-2.1 {TkFontPkgFree} {
 
     # Tests cancelling the idle handler for TheWorldHasChanged,
     # because app goes away before idle serviced.
-    
+
     foo eval {
 	.b config -font wiggles
 	font config wiggles -size 24
@@ -129,7 +129,7 @@ test font-4.1 {font command: actual: arguments} {
     list [catch {font actual xyz -displayof} msg] $msg
 } {1 {value for "-displayof" missing}}
 test font-4.2 {font command: actual: arguments} {
-    # (objc < 3) 
+    # (objc < 3)
     list [catch {font actual} msg] $msg
 } {1 {wrong # args: should be "font actual font ?-displayof window? ?option? ?--? ?char?"}}
 test font-4.3 {font command: actual: arguments} {
@@ -167,7 +167,7 @@ test font-4.11 {font command: bad option} {
 } {1 {bad option "-style": must be -family, -size, -weight, -slant, -underline, or -overstrike}}
 
 test font-5.1 {font command: configure} {
-    # (objc < 3) 
+    # (objc < 3)
     list [catch {font configure} msg] $msg
 } {1 {wrong # args: should be "font configure fontname ?options?"}}
 test font-5.2 {font command: configure: non-existent font} {
@@ -175,7 +175,7 @@ test font-5.2 {font command: configure: non-existent font} {
     list [catch {font configure xyz} msg] $msg
 } {1 {named font "xyz" doesn't exist}}
 test font-5.3 {font command: configure: "deleted" font} {
-    # (nfPtr->deletePending != 0) 
+    # (nfPtr->deletePending != 0)
     setup
     font create xyz
     .b.f configure -font xyz
@@ -237,12 +237,12 @@ test font-6.4 {font command: create: generate name} {
     font configure font2 -family
 } {four}
 test font-6.5 {font command: create: bad option creating new font} {
-    # name was specified so skip = 3 
+    # name was specified so skip = 3
     setup
     list [catch {font create xyz -xyz times} msg] $msg
 } {1 {bad option "-xyz": must be -family, -size, -weight, -slant, -underline, or -overstrike}}
 test font-6.6 {font command: create: bad option creating new font} {
-    # name was not specified so skip = 2 
+    # name was not specified so skip = 2
     setup
     list [catch {font create -xyz times} msg] $msg
 } {1 {bad option "-xyz": must be -family, -size, -weight, -slant, -underline, or -overstrike}}
@@ -254,11 +254,11 @@ test font-6.7 {font command: create: already exists} {
 } {1 {named font "xyz" already exists}}
 
 test font-7.1 {font command: delete: arguments} {
-    # (objc < 3) 
+    # (objc < 3)
     list [catch {font delete} msg] $msg
 } {1 {wrong # args: should be "font delete fontname ?fontname ...?"}}
 test font-7.2 {font command: delete: loop test} {
-    # for (i = 2; i < objc; i++) 
+    # for (i = 2; i < objc; i++)
     setup
     set x {}
     font create a -underline 1
@@ -284,7 +284,7 @@ test font-7.3 {font command: delete: loop test} {
     lappend x [lsort [getnondefaultfonts]]
 } {{a b c d e} {b c e}}
 test font-7.4 {font command: delete: non-existent} {
-    # (namedHashPtr == NULL) 
+    # (namedHashPtr == NULL)
     setup
     list [catch {font delete xyz} msg] $msg
 } {1 {named font "xyz" doesn't exist}}
@@ -328,11 +328,11 @@ test font-9.1 {font command: measure: arguments} {
     list [catch {expr {[font measure xyz -displayof]>0}} msg] $msg
 } {0 1}
 test font-9.2 {font command: measure: arguments} {
-    # (objc - skip != 4) 
+    # (objc - skip != 4)
     list [catch {font measure} msg] $msg
 } {1 {wrong # args: should be "font measure font ?-displayof window? text"}}
 test font-9.3 {font command: measure: arguments} {
-    # (objc - skip != 4) 
+    # (objc - skip != 4)
     list [catch {font measure xyz abc def} msg] $msg
 } {1 {wrong # args: should be "font measure font ?-displayof window? text"}}
 test font-9.4 {font command: measure: arguments} {noExceed} {
@@ -361,7 +361,7 @@ test font-10.2 {font command: metrics: arguments} {
     list [catch {font metrics xyz -displayof} msg] $msg
 } {1 {value for "-displayof" missing}}
 test font-10.3 {font command: metrics: arguments} {
-    # (objc < 3) 
+    # (objc < 3)
     list [catch {font metrics} msg] $msg
 } {1 {wrong # args: should be "font metrics font ?-displayof window? ?option?"}}
 test font-10.4 {font command: metrics: arguments} {
@@ -382,7 +382,7 @@ test font-10.7 {font command: metrics: get all metrics} {
     array set a [font metrics {-family xyz}]
     set x [lsort [array names a]]
     unset a
-    set x    
+    set x
 } {-ascent -descent -fixed -linespace}
 test font-10.8 {font command: metrics: bad metric} {
     # (Tcl_GetIndexFromObj() != TCL_OK)
@@ -515,10 +515,10 @@ test font-15.4 {Tk_AllocFontFromObj procedure: bump ref count} {
     lindex [font actual {-family fixed}] 0
 } {-family}
 test font-15.5 {Tk_AllocFontFromObj procedure: get named font} {
-    # (namedHashPtr != NULL) 
+    # (namedHashPtr != NULL)
     setup
-    font create xyz 
-    .b.f config -font xyz 
+    font create xyz
+    .b.f config -font xyz
 } {}
 test font-15.6 {Tk_AllocFontFromObj procedure: not a named font} {
     # not (namedHashPtr != NULL)
@@ -526,17 +526,17 @@ test font-15.6 {Tk_AllocFontFromObj procedure: not a named font} {
     .b.f config -font {times 20}
 } {}
 test font-15.7 {Tk_AllocFontFromObj procedure: get native font} unix {
-    # not (fontPtr == NULL) 
+    # not (fontPtr == NULL)
     setup
     .b.f config -font fixed
 } {}
 test font-15.8 {Tk_AllocFontFromObj procedure: get native font} win {
-    # not (fontPtr == NULL) 
+    # not (fontPtr == NULL)
     setup
     .b.f config -font oemfixed
 } {}
 test font-15.10 {Tk_AllocFontFromObj procedure: get attribute font} {
-    # (fontPtr == NULL) 
+    # (fontPtr == NULL)
     list [catch {.b.f config -font {xxx yyy zzz}} msg] $msg
 } {1 {expected integer but got "yyy"}}
 test font-15.11 {Tk_AllocFontFromObj procedure: no match} {noExceed} {
@@ -560,7 +560,7 @@ test font-15.14 {Tk_AllocFontFromObj procedure: underline position} {
     setup
     .b.f config -text "underline" -font "times -8 underline"
     update
-} {}    
+} {}
 
 test font-16.1 {Tk_NameOfFont procedure} {
     setup
@@ -600,7 +600,7 @@ test font-17.3 {Tk_FreeFont procedure: multiple ref} {
     set x
 } {-family fixed}
 test font-17.4 {Tk_FreeFont procedure: named font} {
-    # (fontPtr->namedHashPtr != NULL) 
+    # (fontPtr->namedHashPtr != NULL)
     setup
     font create xyz
     .b.f config -font xyz
@@ -608,7 +608,7 @@ test font-17.4 {Tk_FreeFont procedure: named font} {
     expr {"xyz" in [font names]}
 } {1}
 test font-17.5 {Tk_FreeFont procedure: named font} {
-    # not (fontPtr->refCount == 0) 
+    # not (fontPtr->refCount == 0)
     setup
     font create xyz -underline 1
     .b.f config -font xyz
@@ -619,7 +619,7 @@ test font-17.5 {Tk_FreeFont procedure: named font} {
 } {0 1}
 test font-17.6 {Tk_FreeFont procedure: named font not deleted yet} {
     setup
-    font create xyz 
+    font create xyz
     .b.f config -font xyz
     button .b.b -font xyz
     font delete xyz
@@ -873,7 +873,7 @@ test font-25.1 {Tk_FreeTextLayout procedure} {
     .b.f config -text foo
     .b.f config -text boo
 } {}
-    
+
 test font-26.1 {Tk_DrawTextLayout procedure: auto-detect last char} {
     .b.f config -text foo
 } {}
@@ -908,7 +908,7 @@ test font-27.3 {Tk_UnderlineTextLayout procedure: underline is visible} {
     .b.f config -text "000          00000" -wrap [expr $ax*7] -under 5
     .b.f config -wrap -1 -under -1
 } {}
-    
+
 test font-28.1 {Tk_PointToChar procedure: above all lines} {
     csetup "000"
     .b.c index text @-1,0
@@ -962,7 +962,7 @@ test font-28.11 {Tk_PointToChar procedure: below all chunks} {
     csetup "000 0000000"
     .b.c index text @0,1000000
 } {11}
-    
+
 test font-29.1 {Tk_CharBBox procedure: index < 0} {
     .b.f config -text "000" -underline -1
 } {}
@@ -1113,14 +1113,14 @@ test font-31.6 {Tk_IntersectTextLayout procedure: ignore spaces at eol} {
 test font-32.1 {Tk_TextLayoutToPostscript: ensure buffer doesn't overflow} {
     # If there were a whole bunch of returns or tabs in a row, then the
     # temporary buffer could overflow and write on the stack.
-    
+
     csetup "qwertyuiopasdfghjklzxcvbnm1234qwertyuiopasdfghjklzxcvbnm\n"
     .b.c itemconfig text -width 800
     .b.c insert text end "qwertyuiopasdfghjklzxcvbnm1234qwertyuiopasdfghjklzxcvbnm\n"
     .b.c insert text end "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     .b.c insert text end "end"
     set x [.b.c postscript]
-    set i [string first "(qwerty" $x] 
+    set i [string first "(qwerty" $x]
     string range $x $i [expr {$i + 278}]
 } {(qwertyuiopasdfghjklzxcvbnm1234qwertyuiopasdfghjklzxcvbnm)]
 [(qwertyuiopasdfghjklzxcvbnm1234qwertyuiopasdfghjklzxcvbnm)]
@@ -1219,7 +1219,7 @@ test font-36.1 {GetAttributeInfoObj procedure: unknown attribute} {
 } {1 {bad option "-xyz": must be -family, -size, -weight, -slant, -underline, or -overstrike}}
 
 test font-37.1 {GetAttributeInfoObj procedure: all attributes} {
-    # not (objPtr != NULL) 
+    # not (objPtr != NULL)
     setup
     font create xyz -family xyz
     font config xyz
diff --git a/tests/frame.test b/tests/frame.test
index affdac6..9bb3377 100644
--- a/tests/frame.test
+++ b/tests/frame.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -420,7 +420,7 @@ test frame-3.17 {TkCreateFrame procedure} {defaultPseudocolor8 nonPortable} {
 } {1}
 test frame-3.18 {TkCreateFrame procedure} {defaultPseudocolor8 haveGrayscale8 nonPortable} {
     catch {destroy .t}
-    toplevel .t -visual {grayscale 8} -width 300 -height 200 -bg #434343 
+    toplevel .t -visual {grayscale 8} -width 300 -height 200 -bg #434343
     wm geometry .t +0+0
     update
     colorsFree .t 131 131 131
@@ -449,7 +449,7 @@ test frame-3.20 {TkCreateFrame procedure} {defaultPseudocolor8 haveGrayscale8 no
 test frame-3.21 {TkCreateFrame procedure} {defaultPseudocolor8 haveGrayscale8 nonPortable} {
     catch {destroy .t}
     set x ok
-    toplevel .t -visual {grayscale 8} -width 300 -height 200 -bg #434343 
+    toplevel .t -visual {grayscale 8} -width 300 -height 200 -bg #434343
     wm geometry .t +0+0
     update
     colorsFree .t 131 131 131
@@ -692,7 +692,7 @@ test frame-12.2 {FrameWorldChanged procedure} {
     place .f -x 0 -y 0 -width 100 -height 100
     pack [frame .f.f] -fill both -expand 1
 
-    set result {} 
+    set result {}
     foreach lp {nw n ne en e es se s sw ws w wn} {
         .f configure -labelanchor $lp
         update
diff --git a/tests/geometry.test b/tests/geometry.test
index 04ab578..b5b6c77 100644
--- a/tests/geometry.test
+++ b/tests/geometry.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -229,7 +229,7 @@ test geometry-4.10 {Tk_MaintainGeometry and Tk_UnmaintainGeometry} {
     wm geometry .t +0+0
     tkwait visibility .t
     update
-    frame .t.f 
+    frame .t.f
     pack .t.f
     button .t.quit -text Quit -command exit
     pack .t.quit -in .t.f
diff --git a/tests/get.test b/tests/get.test
index d3a4228..89b41d4 100644
--- a/tests/get.test
+++ b/tests/get.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/grab.test b/tests/grab.test
index 2f4f73b..1301776 100644
--- a/tests/grab.test
+++ b/tests/grab.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-2000 by Ajuba Solutions.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/grid.test b/tests/grid.test
index fee81b5..1b9b54e 100644
--- a/tests/grid.test
+++ b/tests/grid.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -559,7 +559,7 @@ test grid-9.11 {slaves} {
 	lappend a $col{[grid slaves . -column $col]}
     }
     set a
-} {{0{.0-x .0}} {1{.1-x .1}} {2{.2-x .2}} 3{} 0{.0} {1{.1 .0-x}} {2{.2 .1-x}} 3{.2-x}} 
+} {{0{.0-x .0}} {1{.1-x .1}} {2{.2-x .2}} 3{} 0{.0} {1{.1 .0-x}} {2{.2 .1-x}} 3{.2-x}}
 grid_reset 9.11
 
 # column/row configure
@@ -1026,7 +1026,7 @@ test grid-11.16 {default widget placement} {
     foreach l {a b c d e} {
         frame .$l -width 50 -height 50
     }
-    grid .a .b .c .d -sticky news 
+    grid .a .b .c .d -sticky news
     grid  x  ^  x .e -sticky news
     update
     set res ""
@@ -1119,13 +1119,13 @@ test grid-12.1 {-sticky} {
 (nesw) 0 0 250 150
 }
 grid_reset 12.1
-   
+
 test grid-12.2 {-sticky} {
     frame .f -bg red
     list [catch "grid .f -sticky glue" msg] $msg
 } {1 {bad stickyness value "glue": must be a string containing n, e, s, and/or w}}
 grid_reset 12.2
-   
+
 test grid-12.3 {-sticky} {
     frame .f -bg red
     grid .f -sticky {n,s,e,w}
@@ -1315,8 +1315,8 @@ grid_reset 13.13
 test grid-14.1 {structure notify} {
     frame .f -width 200 -height 100 -highlightthickness 0 -bg red
     frame .g -width 200 -height 100 -highlightthickness 0 -bg red
-    grid .f 
-    grid .g -in .f    
+    grid .f
+    grid .g -in .f
     update
     set a ""
     lappend a "[winfo x .g],[winfo y .g] \
@@ -1330,9 +1330,9 @@ test grid-14.1 {structure notify} {
 grid_reset 14.1
 
 test grid-14.2 {structure notify} {
-    frame .f -width 200 -height 100 
-    frame .f.g -width 200 -height 100 
-    grid .f 
+    frame .f -width 200 -height 100
+    frame .f.g -width 200 -height 100
+    grid .f
     grid .f.g
     update
     set a ""
diff --git a/tests/id.test b/tests/id.test
index de0d965..8ee55bf 100644
--- a/tests/id.test
+++ b/tests/id.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/image.test b/tests/image.test
index c6c4f8a..813ff8a 100644
--- a/tests/image.test
+++ b/tests/image.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 namespace import -force ::tk::test::loadTkCommand
@@ -221,7 +221,7 @@ test image-8.1 {Tk_ImageCmd procedure, "inuse" option} testImageType {
     image delete myimage2
     set res
 } [list 0 1]
-    
+
 
 test image-9.1 {Tk_ImageChanged procedure} testImageType {
     .c delete all
@@ -430,7 +430,7 @@ test image-15.1 {deleting image does not make widgets forget about it} {
     image create photo foo -width 20 -height 20
     lappend x [.c bbox i1] [image names]
 } {10 10 20 20 foo {} {10 10 30 30} foo}
-    
+
 destroy .c
 eval image delete [image names]
 
diff --git a/tests/imgBmap.test b/tests/imgBmap.test
index edbb8c3..17cbce5 100644
--- a/tests/imgBmap.test
+++ b/tests/imgBmap.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/imgPPM.test b/tests/imgPPM.test
index 8dec8c2..c9acaec 100644
--- a/tests/imgPPM.test
+++ b/tests/imgPPM.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/imgPhoto.test b/tests/imgPhoto.test
index 2b5f7ec..eda0c13 100644
--- a/tests/imgPhoto.test
+++ b/tests/imgPhoto.test
@@ -9,7 +9,7 @@
 #
 # Author: Paul Mackerras (paulus@cs.anu.edu.au)
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -456,7 +456,7 @@ test imgPhoto-4.74 {ImgPhotoCmd procedure: put option error handling} -setup {
     image delete photo1
 } -returnCodes 1 -result {wrong # args: should be "photo1 put data ?options?"}
 test imgPhoto-4.75 {<photo> read command: filename starting with '-'} -constraints {
-    hasTeapotPhoto 
+    hasTeapotPhoto
 } -body {
     file copy -force $teapotPhotoFile -teapotPhotoFile
     image create photo photo1
@@ -712,7 +712,7 @@ test imgPhoto-14.4 {GIF buffer overflow} -setup {
 	mf9mzP9m//+ZAP+ZM/+ZZv+Zmf+ZzP+Z///MAP/MM//MZv/Mmf/MzP/M////
 	AP//M///Zv//mf//zP///yH5BAEAABAALAAAAAAKAAoAABUSAAD/HEiwoMGD
 	CBMqXMiwYcKAADs=
-    } 
+    }
 } -cleanup {
     image delete $i
 } -returnCodes error -result {malformed image}
diff --git a/tests/listbox.test b/tests/listbox.test
index 62b8cc1..f3dfd76 100644
--- a/tests/listbox.test
+++ b/tests/listbox.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -888,7 +888,7 @@ test listbox-4.12 {ConfigureListbox procedure, listvar -> different listvar} {
     catch {destroy .l}
     set x [list a b c d]
     set y [list 1 2 3 4]
-    listbox .l 
+    listbox .l
     .l configure -listvar x
     .l configure -listvar y
     .l insert end 5 6 7 8
@@ -994,7 +994,7 @@ test listbox-5.6 {ListboxComputeGeometry procedure} {
     pack [listbox .l -font {{open look glyph}}]
     update
 } {}
-    
+
 
 catch {destroy .l}
 listbox .l -height 2 -xscrollcommand "record x" -yscrollcommand "record y"
@@ -2067,7 +2067,7 @@ test listbox-25.2 {listbox item configurations and widget based inserts} {
     .l insert 0 1 2 3 4
     list [.l itemcget 0 -fg] [.l itemcget 4 -fg]
 } [list {} red]
-    
+
 # state issues
 test listbox-26.1 {listbox disabled state disallows inserts} {
     catch {destroy .l}
diff --git a/tests/main.test b/tests/main.test
index 1d33fbb..e63c5e1 100644
--- a/tests/main.test
+++ b/tests/main.test
@@ -8,7 +8,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/menu.test b/tests/menu.test
index c797281..635e22f 100644
--- a/tests/menu.test
+++ b/tests/menu.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -151,7 +151,7 @@ foreach configTest {
     {-cursor arrow arrow badValue {bad cursor spec "badValue"}}
     {-disabledforeground #00ff00 #00ff00 xyzzy {unknown color name "xyzzy"}}
     {-fg #110022 #110022 bogus {unknown color name "bogus"}}
-    {-font -Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-* 
+    {-font -Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*
 	    -Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-* {}
 	    {font "" doesn't exist}}
     {-foreground #110022 #110022 bogus {unknown color name "bogus"}}
@@ -186,7 +186,7 @@ destroy .m1
 # We need to test all of the options with all of the different types of
 # menu entries. The following code sets up .m1 with 6 items. It then
 # runs through the big table below it.
-# index 0 is tearoff, 1 command, 2 cascade, 3 separator, 4 checkbutton, 
+# index 0 is tearoff, 1 command, 2 cascade, 3 separator, 4 checkbutton,
 # 5 radiobutton
 
 menu .m1
@@ -202,14 +202,14 @@ if {[testConstraint hasEarthPhoto]} {
 }
 
 foreach configTest {
-    {-activebackground 
-        {{#012345 
-            {{unknown option "-activebackground"} #012345 #012345 
+    {-activebackground
+        {{#012345
+            {{unknown option "-activebackground"} #012345 #012345
             {unknown option "-activebackground"} #012345 #012345
             }
         }
-        {non-existent 
-            {{unknown option "-activebackground"} 
+        {non-existent
+            {{unknown option "-activebackground"}
 	    {unknown color name "non-existent"}
 	    {unknown color name "non-existent"}
 	    {unknown option "-activebackground"}
@@ -219,13 +219,13 @@ foreach configTest {
 	}}
     }
     {-activeforeground
-    	{{#ff0000 
+    	{{#ff0000
 	    {{unknown option "-activeforeground"}
 	    #ff0000 #ff0000 {unknown option "-activeforeground"} #ff0000 #ff0000
 	    }
 	}
 	{non-existent
-	    {{unknown option "-activeforeground"} 
+	    {{unknown option "-activeforeground"}
 	    {unknown color name "non-existent"}
 	    {unknown color name "non-existent"}
 	    {unknown option "-activeforeground"}
@@ -235,20 +235,20 @@ foreach configTest {
 	}}
     }
     {-accelerator
-    	{{"Ctrl+S" 
+    	{{"Ctrl+S"
 	    {{unknown option "-accelerator"}
-	    "Ctrl+S" "Ctrl+S" {unknown option "-accelerator"} 
+	    "Ctrl+S" "Ctrl+S" {unknown option "-accelerator"}
 	    "Ctrl+S" "Ctrl+S"
 	    }
 	}}
     }
     {-background
-    	{{#ff0000 
+    	{{#ff0000
     	    {#ff0000 #ff0000 #ff0000 #ff0000 #ff0000 #ff0000
 	    }
 	}
 	{non-existent
-	    {{unknown color name "non-existent"} 
+	    {{unknown color name "non-existent"}
 	    {unknown color name "non-existent"}
 	    {unknown color name "non-existent"}
 	    {unknown color name "non-existent"}
@@ -258,13 +258,13 @@ foreach configTest {
 	}}
     }
     {-bitmap
-    	{{questhead 
-	    {{unknown option "-bitmap"} questhead questhead 
+    	{{questhead
+	    {{unknown option "-bitmap"} questhead questhead
 	    {unknown option "-bitmap"} questhead questhead
 	    }
 	}
 	{badValue
-	    {{unknown option "-bitmap"} 
+	    {{unknown option "-bitmap"}
 	    {bitmap "badValue" not defined}
 	    {bitmap "badValue" not defined}
 	    {unknown option "-bitmap"}
@@ -275,23 +275,23 @@ foreach configTest {
     }
     {-columnbreak
 	{{1
-	    {{unknown option "-columnbreak"} 1 1 
+	    {{unknown option "-columnbreak"} 1 1
 	    {unknown option "-columnbreak"} 1 1}
 	}}
     }
     {-command
-    	{{beep 
-	    {{unknown option "-command"} beep beep 
+    	{{beep
+	    {{unknown option "-command"} beep beep
 	    {unknown option "-command"} beep beep
 	    }
 	}}
     }
     {-font
-    	{{-Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-* 
+    	{{-Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*
 	    {{unknown option "-font"}
     	    -Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*
-    	    -Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-* 
-	    {unknown option "-font"} 
+    	    -Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*
+	    {unknown option "-font"}
     	    -Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*
     	    -Adobe-Helvetica-Medium-R-Normal--*-120-*-*-*-*-*-*
 	    }
@@ -307,13 +307,13 @@ foreach configTest {
 	}}
     }
     {-foreground
-    	{{#110022 
-	    {{unknown option "-foreground"} #110022 #110022 
+    	{{#110022
+	    {{unknown option "-foreground"} #110022 #110022
 	    {unknown option "-foreground"} #110022 #110022
 	    }
 	}
 	{non-existent
-	    {{unknown option "-foreground"} 
+	    {{unknown option "-foreground"}
 	    {unknown color name "non-existent"}
 	    {unknown color name "non-existent"}
 	    {unknown option "-foreground"}
@@ -323,13 +323,13 @@ foreach configTest {
 	}}
     }
     {-image
-    	{{image1 
-	    {{unknown option "-image"} image1 image1 
+    	{{image1
+	    {{unknown option "-image"} image1 image1
 	    {unknown option "-image"} image1 image1
 	    }
 	}
 	{bogus
-	    {{unknown option "-image"} 
+	    {{unknown option "-image"}
 	    {image "bogus" doesn't exist}
 	    {image "bogus" doesn't exist}
 	    {unknown option "-image"}
@@ -348,25 +348,25 @@ foreach configTest {
 	}}
     }
     {-indicatoron
-    	{{1 
+    	{{1
 	    {{unknown option "-indicatoron"}
 	    {unknown option "-indicatoron"}
-	    {unknown option "-indicatoron"} 
+	    {unknown option "-indicatoron"}
 	    {unknown option "-indicatoron"} 1 1
 	    }
 	}}
     }
     {-label
-    	{{test 
-	    {{unknown option "-label"} test test 
+    	{{test
+	    {{unknown option "-label"} test test
 	    {unknown option "-label"} test test
 	    }
 	}}
     }
     {-menu
-    	{{.m2 
+    	{{.m2
 	    {{unknown option "-menu"}
-	    {unknown option "-menu"} .m2 
+	    {unknown option "-menu"} .m2
 	    {unknown option "-menu"}
 	    {unknown option "-menu"}
 	    {unknown option "-menu"}
@@ -375,7 +375,7 @@ foreach configTest {
     }
     {-offvalue
     	{{off
-	    {{unknown option "-offvalue"} 
+	    {{unknown option "-offvalue"}
 	    {unknown option "-offvalue"}
 	    {unknown option "-offvalue"}
 	    {unknown option "-offvalue"}
@@ -390,23 +390,23 @@ foreach configTest {
 	    {unknown option "-onvalue"}
 	    {unknown option "-onvalue"}
 	    {unknown option "-onvalue"}
-    	    on 
+    	    on
 	    {unknown option "-onvalue"}
 	    }
 	}}
     }
     {-selectcolor
-    	{{#110022 
-	    {{unknown option "-selectcolor"} 
+    	{{#110022
+	    {{unknown option "-selectcolor"}
+	    {unknown option "-selectcolor"}
 	    {unknown option "-selectcolor"}
-	    {unknown option "-selectcolor"} 
 	    {unknown option "-selectcolor"}
     	    #110022
     	    #110022
 	    }
 	}
 	{non-existent
-	    {{unknown option "-selectcolor"} 
+	    {{unknown option "-selectcolor"}
 	    {unknown option "-selectcolor"}
 	    {unknown option "-selectcolor"}
 	    {unknown option "-selectcolor"}
@@ -416,15 +416,15 @@ foreach configTest {
 	}}
     }
     {-selectimage
-    	{{image1 
+    	{{image1
     	    {{unknown option "-selectimage"}
     	    {unknown option "-selectimage"}
-    	    {unknown option "-selectimage"} 
+    	    {unknown option "-selectimage"}
     	    {unknown option "-selectimage"} image1 image1
 	    }
 	}
 	{bogus
-	    {{unknown option "-selectimage"} 
+	    {{unknown option "-selectimage"}
 	    {unknown option "-selectimage"}
 	    {unknown option "-selectimage"}
 	    {unknown option "-selectimage"}
@@ -443,7 +443,7 @@ foreach configTest {
 	}}
     }
     {-state
-    	{{normal 
+    	{{normal
     	    {normal normal normal {unknown option "-state"} normal normal
 	    }
 	}}
@@ -462,7 +462,7 @@ foreach configTest {
     	{{"any string"
     	    {{unknown option "-variable"}
     	    {unknown option "-variable"}
-    	    {unknown option "-variable"} 
+    	    {unknown option "-variable"}
     	    {unknown option "-variable"}
     	    "any string"
     	    "any string"
@@ -470,13 +470,13 @@ foreach configTest {
 	}}
     }
     {-underline
-    	{{0 
-    	    {{unknown option "-underline"} 0 0 
+    	{{0
+    	    {{unknown option "-underline"} 0 0
     	    {unknown option "-underline"} 0 0
 	    }
 	}
 	{3p
-	    {{unknown option "-underline"} 
+	    {{unknown option "-underline"}
 	    {expected integer but got "3p"}
 	    {expected integer but got "3p"}
 	    {unknown option "-underline"}
@@ -651,7 +651,7 @@ test menu-3.26 {MenuWidgetCmd procedure, "delete" option} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "foo"
-    list [catch {.m1 delete 1 0} msg] $msg [destroy .m1] 
+    list [catch {.m1 delete 1 0} msg] $msg [destroy .m1]
 } {0 {} {}}
 test menu-3.27 {MenuWidgetCmd procedure, "delete" option} {
     catch {destroy .m1}
@@ -894,7 +894,7 @@ test menu-3.64 {MenuWidgetCmd procedure, "unpost" option} {nonUnixUserInteractio
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "menu-3.68 - hit Escape"
-    .m1 post 40 40 
+    .m1 post 40 40
     list [catch {.m1 unpost} msg] $msg [destroy .m1]
 } {0 {} {}}
 test menu-3.65 {MenuWidgetCmd procedure, "yposition" option} {
@@ -981,7 +981,7 @@ test menu-4.5 {TkInvokeMenu: checkbutton array element} {
     catch {destroy .m1}
     catch {unset foo}
     menu .m1
-    .m1 add checkbutton -label "test" -variable foo(1) -onvalue on 
+    .m1 add checkbutton -label "test" -variable foo(1) -onvalue on
     list [catch {.m1 invoke 1} msg] $msg [catch {set foo(1)} msg2] $msg2 [catch {unset foo} msg3] $msg3 [destroy .m1]
 } {0 {} 0 on 0 {} {}}
 test menu-4.6 {TkInvokeMenu: radiobutton} {
@@ -1408,7 +1408,7 @@ test menu-8.4 {DestroyMenuEntry} {
     menu .m1
     .m1 add checkbutton -variable foo
     list [catch {.m1 delete 1} msg] $msg [destroy .m1]
-} {0 {} {}} 
+} {0 {} {}}
 test menu-8.5 {DestroyMenuEntry} {
     catch {destroy .m1}
     menu .m1
@@ -1437,7 +1437,7 @@ test menu-8.7 {DestroyMenuEntry} {
 test menu-9.1 {ConfigureMenu} {
     catch {destroy .m1}
     menu .m1
-    list [catch {.m1 configure -postcommand "beep"} msg] $msg [.m1 cget -postcommand] [destroy .m1]    
+    list [catch {.m1 configure -postcommand "beep"} msg] $msg [.m1 cget -postcommand] [destroy .m1]
 } {0 {} beep {}}
 test menu-9.2 {ConfigureMenu} {
     catch {destroy .m1}
@@ -1528,7 +1528,7 @@ test menu-11.3 {ConfigureMenuEntry} {
 } {0 {} test {}}
 test menu-11.4 {ConfigureMenuEntry} {
     catch {destroy .m1}
-    menu .m1 
+    menu .m1
     .m1 add command
     list [catch {.m1 entryconfigure 1 -accel "S"} msg] $msg [.m1 entrycget 1 -accel] [destroy .m1]
 } {0 {} S {}}
@@ -1583,13 +1583,13 @@ test menu-11.12 {ConfigureMenuEntry} {
     catch {destroy .m4}
     catch {destroy .m5}
     menu .m1
-    menu .m2 
+    menu .m2
     .m2 add cascade -menu .m1
-    menu .m3 
+    menu .m3
     .m3 add cascade -menu .m1
-    menu .m4 
+    menu .m4
     .m4 add cascade -menu .m1
-    menu .m5 
+    menu .m5
     .m5 add cascade
     list [catch {.m5 entryconfigure 1 -label "test" -menu .m1} msg] $msg [destroy .m1 .m2 .m3 .m4 .m5]
 } {0 {} {}}
@@ -1599,11 +1599,11 @@ test menu-11.13 {ConfigureMenuEntry} {
     catch {destroy .m3}
     catch {destroy .m4}
     menu .m1
-    menu .m2 
+    menu .m2
     .m2 add cascade -menu .m1
-    menu .m3 
+    menu .m3
     .m3 add cascade -menu .m1
-    menu .m4 
+    menu .m4
     .m4 add cascade -menu .m1
     list [catch {.m3 entryconfigure 1 -label "test" -menu .m1} msg] $msg [destroy .m1 .m2 .m3 .m4]
 } {0 {} {}}
@@ -2511,7 +2511,7 @@ test menu-32.8 {Ensure all menu clone commands are deleted} {
 test menu-32.9 {Ensure deleting of clones doesn't corrupt menu refs} {
     catch {destroy .menubar}
     catch {destroy .menubar.test}
-    
+
     menu .menubar
     . configure -menu .menubar
     menu .menubar.test
diff --git a/tests/menuDraw.test b/tests/menuDraw.test
index 225223c..fd69425 100644
--- a/tests/menuDraw.test
+++ b/tests/menuDraw.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -51,7 +51,7 @@ test menuDraw-5.2 {TkMenuConfigureDrawOptions - old menu} {
 test menuDraw-5.3 {TkMenuConfigureDrawOptions - no disabledFg} {
 	catch {destroy .m1}
 	list [menu .m1 -disabledforeground ""] [destroy .m1]
-} {.m1 {}}	
+} {.m1 {}}
 
 test menuDraw-6.1 {TkMenuConfigureEntryDrawOptions - no tkfont specified} {
     catch {destroy .m1}
diff --git a/tests/menubut.test b/tests/menubut.test
index 3dfa1b5..ef29fcb 100644
--- a/tests/menubut.test
+++ b/tests/menubut.test
@@ -10,7 +10,7 @@
 # XXX of a procedure has tests then the whole procedure has tests,
 # XXX but many procedures have no tests.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/message.test b/tests/message.test
index 93344c4..500db55 100644
--- a/tests/message.test
+++ b/tests/message.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-2000 by Ajuba Solutions.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/msgbox.test b/tests/msgbox.test
index ec98c89..bcbaf92 100644
--- a/tests/msgbox.test
+++ b/tests/msgbox.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -108,11 +108,11 @@ proc SendEventToMsg {parent btn type} {
 set parent .
 
 set specs {
-    {"abortretryignore"  MB_ABORTRETRYIGNORE  3  {"abort"  "retry"  "ignore"}} 
-    {"ok"  		 MB_OK  	      1  {"ok"                      }} 
-    {"okcancel" 	 MB_OKCANCEL 	      2  {"ok"     "cancel"         }} 
-    {"retrycancel" 	 MB_RETRYCANCEL       2  {"retry"  "cancel"         }} 
-    {"yesno" 		 MB_YESNO 	      2  {"yes"    "no"             }} 
+    {"abortretryignore"  MB_ABORTRETRYIGNORE  3  {"abort"  "retry"  "ignore"}}
+    {"ok"  		 MB_OK  	      1  {"ok"                      }}
+    {"okcancel" 	 MB_OKCANCEL 	      2  {"ok"     "cancel"         }}
+    {"retrycancel" 	 MB_RETRYCANCEL       2  {"retry"  "cancel"         }}
+    {"yesno" 		 MB_YESNO 	      2  {"yes"    "no"             }}
     {"yesnocancel" 	 MB_YESNOCANCEL       3  {"yes"    "no"     "cancel"}}
 }
 
diff --git a/tests/obj.test b/tests/obj.test
index 25bd70f..fae6d51 100644
--- a/tests/obj.test
+++ b/tests/obj.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/oldpack.test b/tests/oldpack.test
index 2f9b979..c95e131 100644
--- a/tests/oldpack.test
+++ b/tests/oldpack.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/option.test b/tests/option.test
index 1bfcb7c..8a1cf2a 100644
--- a/tests/option.test
+++ b/tests/option.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/pack.test b/tests/pack.test
index edb9f18..83525a1 100644
--- a/tests/pack.test
+++ b/tests/pack.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -1019,7 +1019,7 @@ test pack-18.1 {unmap slaves when master unmapped} {tempNotPc} {
 
     wm geometry .pack +100+100
 
-    # On the PC, when the width/height is configured while the window is 
+    # On the PC, when the width/height is configured while the window is
     # unmapped, the changes don't take effect until the window is remapped.
     # Who knows why?
 
diff --git a/tests/panedwindow.test b/tests/panedwindow.test
index b075e18..a1562a0 100644
--- a/tests/panedwindow.test
+++ b/tests/panedwindow.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -166,7 +166,7 @@ test panedwindow-4.5 {forget subcommand, panes are unmapped} {
 
     lappend result [winfo ismapped .b] [winfo ismapped .c]
     destroy .p .b .c
-    
+
     set result
 } [list 1 1 0 1]
 test panedwindow-4.6 {forget subcommand, changes reqsize of panedwindow} {
@@ -364,7 +364,7 @@ test panedwindow-9.5 {sash dragto subcommand, errors} {
     destroy .p .b .c
     set result
 } [list 1 "expected integer but got \"bar\""]
-    
+
 test panedwindow-10.1 {sash mark/sash dragto interaction} {
     panedwindow .p -borderwidth 0 -sashpad 0 -sashwidth 4 -showhandle false
     .p add [frame .f -width 20 -height 20] [button .c -text foobar]
@@ -612,7 +612,7 @@ test panedwindow-12.17 {moving sash into "virtual" space on \
     destroy .p .f .f2 .f3
     set result
 } {68 100}
-    
+
 test panedwindow-13.1 {horizontal panedwindow lays out widgets properly} {
     panedwindow .p -showhandle false -borderwidth 2 -sashpad 2 -sashwidth 2
     foreach win {.p.f .p.f2 .p.f3} {.p add [frame $win -width 20 -height 10]}
@@ -801,7 +801,7 @@ test panedwindow-14.1 {PanestructureProc, widget yields managements} {
 test panedwindow-14.2 {PanedWindowLostSlaveProc, widget yields management} {
     # Check that the paned window correctly yields geometry management of
     # a slave when some other geometry manager steals the slave from us.
-    
+
     # This test should not cause a core dump, and it should not cause a
     # memory leak.
     destroy .p .b
@@ -868,15 +868,15 @@ test panedwindow-18.1 {MoveSash, move right} {
 
     # Get the requested width of the paned window
     lappend result [winfo reqwidth .p]
-    
+
     .p sash place 0 30 0
-    
+
     # Get the reqwidth again, to make sure it hasn't changed
     lappend result [winfo reqwidth .p]
 
     # Check that the sash moved
     lappend result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2
 
@@ -889,11 +889,11 @@ test panedwindow-18.2 {MoveSash, move right (unmapped) clipped by reqwidth} {
     }
 
     .p sash place 0 100 0
-    
+
     # Get the new sash coord; it should be clipped by the reqwidth of
     # the panedwindow.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2
 
@@ -904,17 +904,17 @@ test panedwindow-18.3 {MoveSash, move right (mapped, width < reqwidth) clipped b
     foreach w {.f1 .f2} c {red blue} {
 	.p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew
     }
-    
+
     # Put the panedwindow up on the display and give it a width < reqwidth
     place .p -x 0 -y 0 -width 32
     update
 
     .p sash place 0 100 0
-    
+
     # Get the new sash coord; it should be clipped by the visible width of
     # the panedwindow.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2
 
@@ -925,17 +925,17 @@ test panedwindow-18.4 {MoveSash, move right (mapped, width > reqwidth) clipped b
     foreach w {.f1 .f2} c {red blue} {
 	.p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew
     }
-    
+
     # Put the panedwindow up on the display and give it a width > reqwidth
     place .p -x 0 -y 0 -width 102
     update
 
     .p sash place 0 200 0
-    
+
     # Get the new sash coord; it should be clipped by the visible width of
     # the panedwindow.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2
 
@@ -948,11 +948,11 @@ test panedwindow-18.5 {MoveSash, move right respects minsize} {
     }
 
     .p sash place 0 100 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2
 
@@ -965,10 +965,10 @@ test panedwindow-18.6 {MoveSash, move right respects minsize} {
     }
 
     .p sash place 0 100 0
-    
+
     # Get the new sash coord; it should have moved as far as possible.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -981,11 +981,11 @@ test panedwindow-18.7 {MoveSash, move right pushes other sashes} {
     }
 
     .p sash place 0 100 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     set result [.p sash coord 1]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -998,11 +998,11 @@ test panedwindow-18.8 {MoveSash, move right pushes other sashes, respects minsiz
     }
 
     .p sash place 0 100 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     set result [.p sash coord 1]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1016,11 +1016,11 @@ test panedwindow-18.9 {MoveSash, move right respects minsize, exludes pad} {
     }
 
     .p sash place 0 100 0
-    
-    # Get the new sash coord; it should have moved as far as possible, 
+
+    # Get the new sash coord; it should have moved as far as possible,
     # respecting minsizes.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1034,11 +1034,11 @@ test panedwindow-18.10 {MoveSash, move right, negative minsize becomes 0} {
     }
 
     .p sash place 0 50 0
-    
-    # Get the new sash coord; it should have moved as far as possible, 
+
+    # Get the new sash coord; it should have moved as far as possible,
     # respecting minsizes.
     set result [list [.p sash coord 0] [.p sash coord 1]]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1053,15 +1053,15 @@ test panedwindow-18.11 {MoveSash, move left} {
 
     # Get the requested width of the paned window
     lappend result [winfo reqwidth .p]
-    
+
     .p sash place 0 10 0
-    
+
     # Get the reqwidth again, to make sure it hasn't changed
     lappend result [winfo reqwidth .p]
 
     # Check that the sash moved
     lappend result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2
 
@@ -1074,11 +1074,11 @@ test panedwindow-18.12 {MoveSash, move left, can't move outside of window} {
     }
 
     .p sash place 0 -100 0
-    
+
     # Get the new sash coord; it should be clipped by the reqwidth of
     # the panedwindow.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2
 
@@ -1091,11 +1091,11 @@ test panedwindow-18.13 {MoveSash, move left respects minsize} {
     }
 
     .p sash place 0 0 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2
 
@@ -1108,10 +1108,10 @@ test panedwindow-18.14 {MoveSash, move left respects minsize} {
     }
 
     .p sash place 1 0 0
-    
+
     # Get the new sash coord; it should have moved as far as possible.
     set result [.p sash coord 1]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1124,11 +1124,11 @@ test panedwindow-18.15 {MoveSash, move left pushes other sashes} {
     }
 
     .p sash place 1 0 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1141,11 +1141,11 @@ test panedwindow-18.16 {MoveSash, move left pushes other sashes, respects minsiz
     }
 
     .p sash place 1 0 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1159,11 +1159,11 @@ test panedwindow-18.17 {MoveSash, move left respects minsize, exludes pad} {
     }
 
     .p sash place 1 0 0
-    
-    # Get the new sash coord; it should have moved as far as possible, 
+
+    # Get the new sash coord; it should have moved as far as possible,
     # respecting minsizes.
     set result [.p sash coord 1]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1177,11 +1177,11 @@ test panedwindow-18.18 {MoveSash, move left, negative minsize becomes 0} {
     }
 
     .p sash place 1 10 0
-    
-    # Get the new sash coord; it should have moved as far as possible, 
+
+    # Get the new sash coord; it should have moved as far as possible,
     # respecting minsizes.
     set result [list [.p sash coord 0] [.p sash coord 1]]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1198,15 +1198,15 @@ test panedwindow-19.1 {MoveSash, move down} {
 
     # Get the requested width of the paned window
     lappend result [winfo reqheight .p]
-    
+
     .p sash place 0 0 30
-    
+
     # Get the reqwidth again, to make sure it hasn't changed
     lappend result [winfo reqheight .p]
 
     # Check that the sash moved
     lappend result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2
 
@@ -1220,11 +1220,11 @@ test panedwindow-19.2 {MoveSash, move down (unmapped) clipped by reqheight} {
     }
 
     .p sash place 0 0 100
-    
+
     # Get the new sash coord; it should be clipped by the reqheight of
     # the panedwindow.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2
 
@@ -1236,17 +1236,17 @@ test panedwindow-19.3 {MoveSash, move down (mapped, height < reqheight) clipped
     foreach w {.f1 .f2} c {red blue} {
 	.p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew
     }
-    
+
     # Put the panedwindow up on the display and give it a height < reqheight
     place .p -x 0 -y 0 -height 32
     update
 
     .p sash place 0 0 100
-    
+
     # Get the new sash coord; it should be clipped by the visible height of
     # the panedwindow.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2
 
@@ -1258,17 +1258,17 @@ test panedwindow-19.4 {MoveSash, move down (mapped, height > reqheight) clipped
     foreach w {.f1 .f2} c {red blue} {
 	.p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew
     }
-    
+
     # Put the panedwindow up on the display and give it a width > reqwidth
     place .p -x 0 -y 0 -height 102
     update
 
     .p sash place 0 0 200
-    
+
     # Get the new sash coord; it should be clipped by the visible width of
     # the panedwindow.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2
 
@@ -1282,11 +1282,11 @@ test panedwindow-19.5 {MoveSash, move down respects minsize} {
     }
 
     .p sash place 0 0 100
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2
 
@@ -1300,11 +1300,11 @@ test panedwindow-19.6 {MoveSash, move down respects minsize} {
     }
 
     .p sash place 0 0 100
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1318,11 +1318,11 @@ test panedwindow-19.7 {MoveSash, move down pushes other sashes} {
     }
 
     .p sash place 0 0 100
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     set result [.p sash coord 1]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1336,11 +1336,11 @@ test panedwindow-19.8 {MoveSash, move down pushes other sashes, respects minsize
     }
 
     .p sash place 0 0 100
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     set result [.p sash coord 1]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1355,11 +1355,11 @@ test panedwindow-19.9 {MoveSash, move down respects minsize, exludes pad} {
     }
 
     .p sash place 0 0 100
-    
-    # Get the new sash coord; it should have moved as far as possible, 
+
+    # Get the new sash coord; it should have moved as far as possible,
     # respecting minsizes.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1374,11 +1374,11 @@ test panedwindow-19.10 {MoveSash, move right, negative minsize becomes 0} {
     }
 
     .p sash place 0 0 50
-    
-    # Get the new sash coord; it should have moved as far as possible, 
+
+    # Get the new sash coord; it should have moved as far as possible,
     # respecting minsizes.
     set result [list [.p sash coord 0] [.p sash coord 1]]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1394,15 +1394,15 @@ test panedwindow-19.11 {MoveSash, move up} {
 
     # Get the requested width of the paned window
     lappend result [winfo reqheight .p]
-    
+
     .p sash place 0 0 10
-    
+
     # Get the reqwidth again, to make sure it hasn't changed
     lappend result [winfo reqheight .p]
 
     # Check that the sash moved
     lappend result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2
 
@@ -1416,11 +1416,11 @@ test panedwindow-19.12 {MoveSash, move up, can't move outside of window} {
     }
 
     .p sash place 0 0 -100
-    
+
     # Get the new sash coord; it should be clipped by the reqwidth of
     # the panedwindow.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2
 
@@ -1434,11 +1434,11 @@ test panedwindow-19.13 {MoveSash, move up respects minsize} {
     }
 
     .p sash place 0 0 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2
 
@@ -1452,10 +1452,10 @@ test panedwindow-19.14 {MoveSash, move up respects minsize} {
     }
 
     .p sash place 1 0 0
-    
+
     # Get the new sash coord; it should have moved as far as possible.
     set result [.p sash coord 1]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1469,11 +1469,11 @@ test panedwindow-19.15 {MoveSash, move up pushes other sashes} {
     }
 
     .p sash place 1 0 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1487,11 +1487,11 @@ test panedwindow-19.16 {MoveSash, move up pushes other sashes, respects minsize}
     }
 
     .p sash place 1 0 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     set result [.p sash coord 0]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1506,11 +1506,11 @@ test panedwindow-19.17 {MoveSash, move up respects minsize, exludes pad} {
     }
 
     .p sash place 1 0 0
-    
-    # Get the new sash coord; it should have moved as far as possible, 
+
+    # Get the new sash coord; it should have moved as far as possible,
     # respecting minsizes.
     set result [.p sash coord 1]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1525,11 +1525,11 @@ test panedwindow-19.18 {MoveSash, move up, negative minsize becomes 0} {
     }
 
     .p sash place 1 0 10
-    
-    # Get the new sash coord; it should have moved as far as possible, 
+
+    # Get the new sash coord; it should have moved as far as possible,
     # respecting minsizes.
     set result [list [.p sash coord 0] [.p sash coord 1]]
-    
+
     # Cleanup
     destroy .p .f1 .f2 .f3
 
@@ -1629,7 +1629,7 @@ foreach bd {0 2} {
 		    set result
 		} [list [expr {(2 * $bd) + 20 + (2 * $h)}] \
 			[expr {(2 * $bd) + 20}]]
-		
+
 		test panedwindow-20.[incr i]-$bd-$sp-$sw-$h \
 			{ComputeGeometry, three panes, reqsize set properly} {
 		    panedwindow .p -borderwidth $bd -sashpad $sp \
@@ -1643,7 +1643,7 @@ foreach bd {0 2} {
 		    set result
 		} [list [expr {(2 * $bd) + ($h?12:(2*$sw)) + (4*$sp) + 60}] \
 			[expr {(2 * $bd) + 20}]]
-		
+
 		test panedwindow-20.[incr i]-$bd-$sp-$sw-$h \
 			{ComputeGeometry, sash coords} {
 		    panedwindow .p -borderwidth $bd -sashpad $sp \
@@ -1681,7 +1681,7 @@ foreach bd {0 2} {
 			    [expr {$bd+3}] 20 20] \
 			[list [expr {$bd+95+($h?12:2*$sw)+(4*$sp)}] \
 			    [expr {$bd+3}] 20 20]]
-		
+
 		test panedwindow-20.[incr i]-$bd-$sp-$sw-$h \
 			{ComputeGeometry, one slave, vertical} {
 		    # With just one slave, sashpad and sashwidth should not
@@ -1697,7 +1697,7 @@ foreach bd {0 2} {
 		    set result
 		} [list [expr {(2 * $bd) + 20}] \
 			[expr {(2 * $bd) + 20 + (2 * $h)}]]
-		
+
 		test panedwindow-20.[incr i]-$bd-$sp-$sw-$h \
 			{ComputeGeometry, three panes, vertical} {
 		    panedwindow .p -borderwidth $bd -sashpad $sp \
@@ -1712,7 +1712,7 @@ foreach bd {0 2} {
 		    set result
 		} [list [expr {(2 * $bd) + 20}] \
 			[expr {(2 * $bd) + ($h?12:(2*$sw)) + (4*$sp) + 60}]]
-		
+
 		test panedwindow-20.[incr i]-$bd-$sp-$sw-$h \
 			{ComputeGeometry, sash coords, vertical} {
 		    panedwindow .p -borderwidth $bd -sashpad $sp \
@@ -1774,7 +1774,7 @@ test panedwindow-21.2 {destroyed slave causes geometry recomputation} {
     destroy .p .f2
     set result
 } 20
-    
+
 test panedwindow-22.1 {ArrangePanes, extra space is given to the last pane} {
     panedwindow .p -showhandle false -borderwidth 0 -sashpad 0 -sashwidth 2
     .p add [frame .f1 -width 20 -height 20 -bg blue] \
diff --git a/tests/place.test b/tests/place.test
index ac2ece7..cc37e48 100644
--- a/tests/place.test
+++ b/tests/place.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -303,7 +303,7 @@ test place-9.12 {PlaceObjCmd, slaves errors} {
     destroy .foo
     set res
 } [list 1 "wrong # args: should be \"place slaves pathName\""]
-    
+
 test place-10.1 {ConfigureSlave} {
     catch {destroy .foo}
     frame .foo
@@ -332,7 +332,7 @@ test place-10.4 {ConfigureSlave} {
     destroy .foo
     set res
 } [list 1 "value for \"-y\" missing"]
-	
+
 test place-11.1 {PlaceObjCmd, slaves command} {
     catch {destroy .foo}
     frame .foo
diff --git a/tests/raise.test b/tests/raise.test
index a17fa2e..3b6d3e2 100644
--- a/tests/raise.test
+++ b/tests/raise.test
@@ -8,7 +8,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/safe.test b/tests/safe.test
index 3e9f716..9e502ce 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -14,7 +14,7 @@ tcltest::loadTestedCommands
 
 # Can't find a usable tk.tcl in the following directories:
 #     {$p(:26:)}
-# 
+#
 # $p(:26:)/tk.tcl: script error
 # script error
 #     invoked from within
@@ -22,8 +22,8 @@ tcltest::loadTestedCommands
 #     ("uplevel" body line 1)
 #     invoked from within
 # "uplevel #0 [list source $file]"
-# 
-# 
+#
+#
 # This probably means that tk wasn't installed properly.
 
 ## it indicates that something went wrong sourcing tk.tcl.
diff --git a/tests/scale.test b/tests/scale.test
index f8e58bb..4d38a75 100644
--- a/tests/scale.test
+++ b/tests/scale.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/scrollbar.test b/tests/scrollbar.test
index 35f48bd..6920228 100644
--- a/tests/scrollbar.test
+++ b/tests/scrollbar.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -22,7 +22,7 @@ proc getTroughSize {w} {
 	    return [expr [winfo height $w] - 2*[testmetrics cyvscroll $w]]
 	} else {
 	    return [expr [winfo width $w] - 2*[testmetrics cxhscroll $w]]
-	}	    
+	}
     } else {
 	if [string match v* [$w cget -orient]] {
 	    return [expr [winfo height $w] \
@@ -45,7 +45,7 @@ proc getTroughSize {w} {
 foreach {width height} [wm minsize .] {
     set height [expr ($height < 200) ? 200 : $height]
     set width [expr ($width < 1) ? 1 : $width]
-} 
+}
 
 frame .f -height $height -width $width
 pack .f -side left
@@ -351,15 +351,15 @@ test scrollbar-3.59 {ScrollbarWidgetCmd procedure, "set" option} {
     set result
 } {0.0 0.3}
 test scrollbar-3.60 {ScrollbarWidgetCmd procedure, "set" option} {
-    .s set 1.1 .4 
+    .s set 1.1 .4
     .s get
 } {1.0 1.0}
 test scrollbar-3.61 {ScrollbarWidgetCmd procedure, "set" option} {
-    .s set .5 -.3 
+    .s set .5 -.3
     .s get
 } {0.5 0.5}
 test scrollbar-3.62 {ScrollbarWidgetCmd procedure, "set" option} {
-    .s set .5 87 
+    .s set .5 87
     .s get
 } {0.5 1.0}
 test scrollbar-3.63 {ScrollbarWidgetCmd procedure, "set" option} {
@@ -383,15 +383,15 @@ test scrollbar-3.67 {ScrollbarWidgetCmd procedure, "set" option} {
     list [catch {.s set 1 2 3 jkl} msg] $msg
 } {1 {expected integer but got "jkl"}}
 test scrollbar-3.68 {ScrollbarWidgetCmd procedure, "set" option} {
-    .s set -10 50 20 30 
+    .s set -10 50 20 30
     .s get
 } {0 50 0 0}
 test scrollbar-3.69 {ScrollbarWidgetCmd procedure, "set" option} {
-    .s set 100 -10 20 30 
+    .s set 100 -10 20 30
     .s get
 } {100 0 20 30}
 test scrollbar-3.70 {ScrollbarWidgetCmd procedure, "set" option} {
-    .s set 100 50 30 20 
+    .s set 100 50 30 20
     .s get
 } {100 50 30 30}
 test scrollbar-3.71 {ScrollbarWidgetCmd procedure, "set" option} {
@@ -462,7 +462,7 @@ test scrollbar-6.12 {ScrollbarPosition procedure} unix {
     .s identify 8 19
 } {arrow1}
 test scrollbar-6.14 {ScrollbarPosition procedure} win {
-    .s identify [expr [winfo width .s] / 2] 0 
+    .s identify [expr [winfo width .s] / 2] 0
 } {arrow1}
 test scrollbar-6.15 {ScrollbarPosition procedure} {testmetrics win} {
     .s identify [expr [winfo width .s] / 2] [expr [testmetrics cyvscroll .s] - 1]
@@ -561,7 +561,7 @@ test scrollbar-6.41 {ScrollbarPosition procedure} unix {
 } {slider}
 test scrollbar-6.43 {ScrollbarPosition procedure} {testmetrics win} {
     .t.s identify [expr int(.4 / [.t.s delta 1 0]) + [testmetrics cxhscroll .t.s] \
-		       - 1] [expr [winfo height .t.s] / 2] 
+		       - 1] [expr [winfo height .t.s] / 2]
 } {slider}
 test scrollbar-6.44 {ScrollbarPosition procedure} unix {
     .t.s identify 100 18
diff --git a/tests/select.test b/tests/select.test
index 8cbfd39..9d741ff 100644
--- a/tests/select.test
+++ b/tests/select.test
@@ -11,7 +11,7 @@
 # environment variable TK_ALT_DISPLAY is set to an alternate display.
 #
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/send.test b/tests/send.test
index d3fce3b..b4ed50b 100644
--- a/tests/send.test
+++ b/tests/send.test
@@ -10,7 +10,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/spinbox.test b/tests/spinbox.test
index 68c6fae..5b58117 100644
--- a/tests/spinbox.test
+++ b/tests/spinbox.test
@@ -4,7 +4,7 @@
 # Copyright (c) 1998-2000 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -48,7 +48,7 @@ foreach test {
     {-buttoncursor arrow arrow badValue {bad cursor spec "badValue"}}
     {-command {a command} {a command} {} {}}
     {-cursor arrow arrow badValue {bad cursor spec "badValue"}}
-    {-disabledbackground green green non-existent 
+    {-disabledbackground green green non-existent
 	{unknown color name "non-existent"}}
     {-disabledforeground #110022 #110022 bogus {unknown color name "bogus"}}
     {-exportselection yes 1 xyzzy {expected boolean value but got "xyzzy"}}
@@ -71,7 +71,7 @@ foreach test {
     {-invalidcommand "a command" "a command" {} {}}
     {-invcmd "a command" "a command" {} {}}
     {-justify right right bogus {bad justification "bogus": must be left, right, or center}}
-    {-readonlybackground green green non-existent 
+    {-readonlybackground green green non-existent
 	{unknown color name "non-existent"}}
     {-relief groove groove 1.5 {bad relief "1.5": must be flat, groove, raised, ridge, solid, or sunken}}
     {-repeatdelay 500 500 3p {expected integer but got "3p"}}
@@ -484,13 +484,13 @@ test spinbox-3.74 {SpinboxWidgetCmd procedure, "xview" widget command} {
 test spinbox-3.75 {SpinboxWidgetCmd procedure, "xview" widget command} {
     .e xview 30
     update
-    .e xview scroll 2 units 
+    .e xview scroll 2 units
     .e index @0
 } {32}
 test spinbox-3.76 {SpinboxWidgetCmd procedure, "xview" widget command} {
     .e xview 30
     update
-    .e xview scroll -1 units 
+    .e xview scroll -1 units
     .e index @0
 } {29}
 test spinbox-3.77 {SpinboxWidgetCmd procedure, "xview" widget command} {
@@ -636,7 +636,7 @@ test spinbox-5.11 {ConfigureSpinbox procedure} {
     pack [spinbox .e -font {{open look glyph}}]
     .e scan dragto 30
     update
-} {}    
+} {}
 
 # No tests for DisplaySpinbox.
 
@@ -1132,14 +1132,14 @@ test spinbox-13.9 {GetSpinboxIndex procedure} {
 } {1 6}
 selection clear .e
 test spinbox-13.10 {GetSpinboxIndex procedure} unix {
-    # On unix, when selection is cleared, spinbox widget's internal 
+    # On unix, when selection is cleared, spinbox widget's internal
     # selection range is reset.
 
     list [catch {.e index sel.first} msg] $msg
 } {1 {selection isn't in widget .e}}
 test spinbox-13.11 {GetSpinboxIndex procedure} win {
     # On mac and pc, when selection is cleared, spinbox widget remembers
-    # last selected range.  When selection ownership is restored to 
+    # last selected range.  When selection ownership is restored to
     # spinbox, the old range will be rehighlighted.
 
     list [catch {selection get}] [.e index sel.first]
@@ -1291,7 +1291,7 @@ test spinbox-18.1 {Spinbox widget vs hiding} {
     interp hide {} .e
     destroy .e
     list [winfo children .] [interp hidden]
-} [list {} $l]    
+} [list {} $l]
 
 ##
 ## Spinbox widget VALIDATION tests
diff --git a/tests/text.test b/tests/text.test
index 2ca5d54..d06b8b3 100644
--- a/tests/text.test
+++ b/tests/text.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 namespace import -force tcltest::test
@@ -141,7 +141,7 @@ if {$tcl_platform(platform) == "windows"} {
 test text-2.5 {Tk_TextCmd procedure} {
     catch {destroy .t2}
     text .t2
-    .t2 tag cget sel -relief 
+    .t2 tag cget sel -relief
 } $relief
 test text-2.6 {Tk_TextCmd procedure} {
     catch {destroy .t2}
@@ -535,7 +535,7 @@ test text-9.26 {TextWidgetCmd procedure, "get" option} {
 test text-9.26a {TextWidgetCmd procedure, "get" option} {
     list [.t index "5.6 -4a chars"] [.t index "5.8-4d chars"]
 } {5.1 5.1}
-.t delete 5.4 
+.t delete 5.4
 .t tag add elide 5.5 5.6
 test text-9.27 {TextWidgetCmd procedure, "get" option} {
     .t get -displaychars 5.2 5.8
@@ -880,7 +880,7 @@ test text-0.2.51 {counting with tag priority eliding} {
     lappend res [.t index "1.0 +1 indices"]
     lappend res [.t index "1.0 +1 display indices"]
     lappend res [.t index "1.0 +1 display chars"]
-    lappend res [.t index end] 
+    lappend res [.t index end]
     lappend res [.t index "end -1 indices"]
     lappend res [.t index "end -1 display indices"]
     lappend res [.t index "end -1 display chars"]
@@ -1568,7 +1568,7 @@ test text-20.35a {TextSearchCmd procedure, regexp finds empty lines} {
     tk::TextSetCursor .t 4.0
     .t search -forward -regexp {^$} insert end
 } {4.0}
-    
+
 catch {destroy .t2}
 toplevel .t2
 wm geometry .t2 +0+0
@@ -2037,7 +2037,7 @@ test text-20.105 {TextSearchCmd, multiline regexp matching} {
     deleteWindows
     pack [text .t2]
     .t2 insert 1.0 {    Tcl_Obj *objPtr));
-static Tcl_Obj*         FSNormalizeAbsolutePath 
+static Tcl_Obj*         FSNormalizeAbsolutePath
 			    _ANSI_ARGS_((Tcl_Interp* interp, Tcl_Obj *pathPtr));}
     set markExpr "^(\[A-Za-z0-9~_\]+\[ \t\n\r\]*\\(|(\[^ \t\(#\n\r/@:\*\]\[^=\(\r\n\]*\[ \t\]+\\*?)?"
     append markExpr "(\[A-Za-z0-9~_\]+(<\[^>\]*>)?(::)?(\[A-Za-z0-9~_\]+::)*\[-A-Za-z0-9~_+ <>\|\\*/\]+|\[A-Za-z0-9~_\]+)"
@@ -2053,7 +2053,7 @@ test text-20.106 {TextSearchCmd, multiline regexp matching} {
     pack [text .t2]
     .t2 insert 1.0 {static int		SetFsPathFromAny _ANSI_ARGS_((Tcl_Interp *interp,
 			    Tcl_Obj *objPtr));
-static Tcl_Obj*         FSNormalizeAbsolutePath 
+static Tcl_Obj*         FSNormalizeAbsolutePath
 			    _ANSI_ARGS_((Tcl_Interp* interp, Tcl_Obj *pathPtr));}
     set markExpr "^(\[A-Za-z0-9~_\]+\[ \t\n\r\]*\\(|(\[^ \t\(#\n\r/@:\*\]\[^=\(\r\n\]*\[ \t\]+\\*?)?"
     append markExpr "(\[A-Za-z0-9~_\]+(<\[^>\]*>)?(::)?(\[A-Za-z0-9~_\]+::)*\[-A-Za-z0-9~_+ <>\|\\*/\]+|\[A-Za-z0-9~_\]+)"
@@ -2066,7 +2066,7 @@ test text-20.107 {TextSearchCmd, multiline regexp matching} {
     .t2 insert 1.0 {
 static int		SetFsPathFromAny _ANSI_ARGS_((Tcl_Interp *interp,
 			    Tcl_Obj *objPtr));
-static Tcl_Obj*         FSNormalizeAbsolutePath 
+static Tcl_Obj*         FSNormalizeAbsolutePath
 			    _ANSI_ARGS_((Tcl_Interp* interp, Tcl_Obj *pathPtr));}
     set markExpr "^(\[A-Za-z0-9~_\]+\[ \t\n\r\]*\\(|(\[^ \t\(#\n\r/@:\*\]\[^=\(\r\n\]*\[ \t\]+\\*?)?"
     append markExpr "(\[A-Za-z0-9~_\]+(<\[^>\]*>)?(::)?(\[A-Za-z0-9~_\]+::)*\[-A-Za-z0-9~_+ <>\|\\*/\]+|\[A-Za-z0-9~_\]+)"
@@ -3457,8 +3457,8 @@ test text-29.5 {peer widgets} {
     update ; update
     set p1 [.tt.t count -update -ypixels 1.0 end]
     set p2 [.t count -update -ypixels 5.0 11.0]
-    if {$p1 == $p2} { 
-	set res "ok" 
+    if {$p1 == $p2} {
+	set res "ok"
     } else {
         set res "$p1 and $p2 not equal"
     }
@@ -3555,7 +3555,7 @@ test text-29.12 {peer widgets} {
     for {set i 1} {$i < 20} {incr i} {
 	.t insert end "Line $i\n"
     }
-    .t tag add sel 1.0 3.0 5.0 7.0 9.0 11.0 13.0 15.0 17.0 19.0 
+    .t tag add sel 1.0 3.0 5.0 7.0 9.0 11.0 13.0 15.0 17.0 19.0
     set res {}
     lappend res [.t tag prevrange sel 1.0]
     .t configure -start 6 -end 12
@@ -3575,7 +3575,7 @@ test text-29.13 {peer widgets} {
     for {set i 1} {$i < 20} {incr i} {
 	.t insert end "Line $i\n"
     }
-    .t tag add sel 1.0 3.0 9.0 11.0 13.0 15.0 17.0 19.0 
+    .t tag add sel 1.0 3.0 9.0 11.0 13.0 15.0 17.0 19.0
     set res {}
     .t configure -start 6 -end 12
     lappend res [.t tag ranges sel]
@@ -3594,7 +3594,7 @@ test text-29.14 {peer widgets} {
     for {set i 1} {$i < 20} {incr i} {
 	.t insert end "Line $i\n"
     }
-    .t tag add sel 1.0 7.0 9.0 11.0 13.0 15.0 17.0 19.0 
+    .t tag add sel 1.0 7.0 9.0 11.0 13.0 15.0 17.0 19.0
     set res {}
     .t configure -start 6 -end 12
     lappend res [.t tag ranges sel]
@@ -3637,7 +3637,7 @@ test text-29.16 {peer widgets} {
     lappend res [.t index sel.last]
     destroy .t
     set res
-} {1.0 11.0} 
+} {1.0 11.0}
 test text-29.17 {peer widgets} {
     destroy .t
     pack [text .t]
@@ -3649,7 +3649,7 @@ test text-29.17 {peer widgets} {
     set res [list [catch {.t index sel.first} msg] $msg]
     destroy .t
     set res
-} {1 {text doesn't contain any characters tagged with "sel"}} 
+} {1 {text doesn't contain any characters tagged with "sel"}}
 
 proc makeText {} {
     set w .g
diff --git a/tests/textBTree.test b/tests/textBTree.test
index 1eb7c75..0fa27bb 100644
--- a/tests/textBTree.test
+++ b/tests/textBTree.test
@@ -8,7 +8,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/textDisp.test b/tests/textDisp.test
index bb009ad..aed22c1 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 namespace import -force tcltest::test
@@ -590,7 +590,7 @@ if {$tcl_platform(platform) == "windows"} {
 test textDisp-4.6 {UpdateDisplayInfo, tiny window} {
     # This test was failing on Windows because the title bar on .
     # was a certain minimum size and it was interfering with the size
-    # requested.  The "overrideredirect" gets rid of the titlebar so 
+    # requested.  The "overrideredirect" gets rid of the titlebar so
     # the toplevel can shrink to the appropriate size.  On Unix, setting
     # the overrideredirect on "." confuses the window manager and
     # causes subsequent tests to fail.
@@ -622,7 +622,7 @@ set hlth [.t cget -highlightthickness]
 test textDisp-4.7 {UpdateDisplayInfo, filling in extra vertical space} {
     # This test was failing on Windows because the title bar on .
     # was a certain minimum size and it was interfering with the size
-    # requested.  The "overrideredirect" gets rid of the titlebar so 
+    # requested.  The "overrideredirect" gets rid of the titlebar so
     # the toplevel can shrink to the appropriate size.  On Unix, setting
     # the overrideredirect on "." confuses the window manager and
     # causes subsequent tests to fail.
@@ -638,7 +638,7 @@ test textDisp-4.7 {UpdateDisplayInfo, filling in extra vertical space} {
     update
     set x [list [.t index @0,0] $tk_textRelayout $tk_textRedraw]
     wm overrideredirect . 0
-    update 
+    update
     set x
 } {8.0 {16.0 17.0 15.0 14.0 13.0 12.0 11.0 10.0 9.0 8.0} {8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0}}
 test textDisp-4.8 {UpdateDisplayInfo, filling in extra vertical space} {
@@ -1863,7 +1863,7 @@ test textDisp-14.14 {TkTextXviewCmd procedure} {
     .t insert end "a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 b0 b1 b2 b3 b4 b5 b6 b7 b8 b9 c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 c0 c1 c2 c3 c4 c5 c6 c7 c8 c9\n"
     .t insert end "xxxx xxxxxxxxx xxxxxxxxxxxxx"
     .t xview moveto 0
-    .t xview scroll 21 u  
+    .t xview scroll 21 u
     set x [.t index @0,22]
     .t xview scroll -1 u
     lappend x [.t index @0,22]
@@ -2317,7 +2317,7 @@ test textDisp-17.8 {TkTextScanCmd procedure} {textfonts} {
     .t xview moveto 0
     .t scan mark 0 60
     .t scan dragto 30 100
-    .t scan dragto 25 95 
+    .t scan dragto 25 95
     .t index @0,0
 } {4.7}
 test textDisp-17.9 {TkTextScanCmd procedure} {textfonts} {
@@ -2925,7 +2925,7 @@ test textDisp-21.4 {count -displaylines regression} {
 Use the Up (cursor) key to scroll up one line at a time.  At the second press, the cursor either gets locked or jumps several lines.
 
 Connect with Tkcon.  The command
-.u count -displaylines \ 
+.u count -displaylines \
 3.10 2.173
 should give answer -1; it gives me 5.
 
@@ -3819,7 +3819,7 @@ test textDisp-29.2.5 {miscellaneous: can show last character} {
     set iWidth [lindex [.t2.t bbox end-2c] 2]
     .t2.t xview scroll 2 units
     set iWidth2 [lindex [.t2.t bbox end-2c] 2]
-    
+
     if {($iWidth == $iWidth2) && $iWidth >= 2} {
 	set result "correct"
     } else {
diff --git a/tests/textImage.test b/tests/textImage.test
index 47ea298..6cb3761 100644
--- a/tests/textImage.test
+++ b/tests/textImage.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -167,7 +167,7 @@ test textImage-1.17 {basic cget options} {
 	set result ""
 	foreach i {align padx pady image name} {
 	    lappend result $i:[.t image cget small -$i]
-	} 
+	}
 	set result
 } {align:center padx:0 pady:0 image:small name:}
 
@@ -185,7 +185,7 @@ test textImage-1.18 {basic configure options} {
 	set result ""
 	foreach {option value}  {align top padx 5 pady 7 image large name none} {
 	    .t image configure small -$option $value
-	} 
+	}
 	update
 	.t image configure small
 } {{-align {} {} center top} {-padx {} {} 0 5} {-pady {} {} 0 7} {-image {} {} {} large} {-name {} {} {} none}}
@@ -238,7 +238,7 @@ test textImage-3.1 {image change propagation} {
 	    vary configure -width $i -height $i
 	    update
 	    lappend result $i:[.t bbox vary]
-	} 
+	}
 	set result
 } {{base:0 0 5 5} {10:0 0 10 10} {20:0 0 20 20} {40:0 0 40 40}}
 
diff --git a/tests/textIndex.test b/tests/textIndex.test
index e78e54b..c53707b 100644
--- a/tests/textIndex.test
+++ b/tests/textIndex.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 namespace import -force tcltest::test
@@ -17,7 +17,7 @@ pack append . .t {top expand fill}
 update
 .t debug on
 wm geometry . {}
-  
+
 # The statements below reset the main window;  it's needed if the window
 # manager is mwm to make mwm forget about a previous minimum size setting.
 
@@ -74,7 +74,7 @@ test textIndex-1.9 {TkTextMakeByteIndex: shortcut for 0} {testtext} {
     testtext .t byteindex 3 80
 } {3.5 5}
 test textIndex-1.10 {TkTextMakeByteIndex: verify index is in range} {testtext} {
-    # for (segPtr = indexPtr->linePtr->segPtr; ; segPtr = segPtr->nextPtr) 
+    # for (segPtr = indexPtr->linePtr->segPtr; ; segPtr = segPtr->nextPtr)
     # one segment
 
     testtext .t byteindex 3 5
@@ -84,7 +84,7 @@ test textIndex-1.11 {TkTextMakeByteIndex: verify index is in range} {testtext} {
     #     index += segPtr->size
     # Multiple segments, make sure add segment size to index.
 
-    .t mark set foo 3.2 
+    .t mark set foo 3.2
     set x [testtext .t byteindex 3 7]
     .t mark unset foo
     set x
@@ -117,7 +117,7 @@ test textIndex-1.16 {TkTextMakeByteIndex: UTF-8 characters} {testtext} {
 } {5.18 20}
 test textIndex-1.17 {TkTextMakeByteIndex: prevent splitting UTF-8 character} \
 	{testtext} {
-    # ((byteIndex > index) && (segPtr->typePtr == &tkTextCharType)) 
+    # ((byteIndex > index) && (segPtr->typePtr == &tkTextCharType))
     # Wrong answer would be \xb9 (the 2nd byte of UTF rep of 0x4e4f).
 
     set x [testtext .t byteindex 5 2]
@@ -125,7 +125,7 @@ test textIndex-1.17 {TkTextMakeByteIndex: prevent splitting UTF-8 character} \
 } {{5.2 4} y}
 test textIndex-1.18 {TkTextMakeByteIndex: prevent splitting UTF-8 character} \
 	{testtext} {
-    # ((byteIndex > index) && (segPtr->typePtr == &tkTextCharType)) 
+    # ((byteIndex > index) && (segPtr->typePtr == &tkTextCharType))
     testtext .t byteindex 5 1
     .t get insert
 } "\u4e4f"
@@ -168,7 +168,7 @@ test textIndex-2.9 {TkTextMakeCharIndex: verify index is in range} {
     # for (segPtr = indexPtr->linePtr->segPtr; ; segPtr = segPtr->nextPtr)
     # Multiple segments, make sure add segment size to index.
 
-    .t mark set foo 3.2 
+    .t mark set foo 3.2
     set x [.t index 3.7]
     .t mark unset foo
     set x
@@ -439,7 +439,7 @@ test textIndex-12.5 {TkTextIndexForwChars: find index} {
 test textIndex-12.6 {TkTextIndexForwChars: find index} {
     # for ( ; segPtr != NULL; segPtr = segPtr->nextPtr)
     # border condition: segPtr == NULL -> beginning of next line
-    
+
     .t index {2.3 + 11 chars}
 } 3.0
 test textIndex-12.7 {TkTextIndexForwChars: find index} {
@@ -458,7 +458,7 @@ test textIndex-12.9 {TkTextIndexForwChars: find index} {
     .t image create 2.4 -image textimage
     set x [.t get {2.3 + 3 chars}]
     .t delete 2.4
-    set x    
+    set x
 } "f"
 test textIndex-12.10 {TkTextIndexForwChars: find index} {
     # dstPtr->byteIndex += segPtr->size - byteOffset
@@ -588,11 +588,11 @@ test textIndex-14.11 {TkTextIndexBackChars: move to previous segment} {
     set x
 } 2.9
 test textIndex-14.12 {TkTextIndexBackChars: move to previous line} {
-    # (lineIndex == 0) 
+    # (lineIndex == 0)
     .t index {1.5 - 10 chars}
 } 1.0
 test textIndex-14.13 {TkTextIndexBackChars: move to previous line} {
-    # not (lineIndex == 0) 
+    # not (lineIndex == 0)
     .t index {2.5 - 10 chars}
 } 1.2
 test textIndex-14.14 {TkTextIndexBackChars: move to previous line} {
diff --git a/tests/textMark.test b/tests/textMark.test
index 67b9ae5..4b2c63a 100644
--- a/tests/textMark.test
+++ b/tests/textMark.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/textTag.test b/tests/textTag.test
index be31ebb..aed0491 100644
--- a/tests/textTag.test
+++ b/tests/textTag.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 namespace import -force tcltest::test
@@ -21,7 +21,7 @@ update
 .t debug on
 wm geometry . {}
 set bigFont {Helvetica 24}
-  
+
 # The statements below reset the main window;  it's needed if the window
 # manager is mwm, to make mwm forget about a previous minimum size setting.
 
@@ -798,7 +798,7 @@ test textTag-18.1 {TkTextPickCurrent tag bindings} {
     text .t -width 30 -height 4 -relief sunken -borderwidth 10 \
       -highlightthickness 10 -pady 2
     pack .t
-    
+
     .t insert end " Tag here " TAG " no tag here"
     .t tag configure TAG -borderwidth 4 -relief raised
     .t tag bind TAG <Enter>  {lappend res "%x %y tag-Enter"}
diff --git a/tests/textWind.test b/tests/textWind.test
index 2e16f7b..6eb9b0f 100644
--- a/tests/textWind.test
+++ b/tests/textWind.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -36,7 +36,7 @@ update
 .t debug on
 wm geometry . {}
 set color [expr {[winfo depth .t] > 1 ? "green" : "black"}]
-  
+
 # The statements below reset the main window;  it's needed if the window
 # manager is mwm to make mwm forget about a previous minimum size setting.
 
diff --git a/tests/tk.test b/tests/tk.test
index 02b4257..9673caa 100644
--- a/tests/tk.test
+++ b/tests/tk.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # Copyright (c) 2002 ActiveState Corporation.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -65,7 +65,7 @@ test tk-3.8 {tk command: scaling: negative} {
 test tk-3.9 {tk command: scaling: too big} {
     tk scaling 1000000
     expr {[tk scaling] < 10000}
-} {1}    
+} 1
 test tk-3.10 {tk command: scaling: widthmm} {
     tk scaling 1.25
     expr {int((25.4*[winfo screenwidth .])/(72*1.25)+0.5)-[winfo screenmmwidth .]}
diff --git a/tests/ttk/all.tcl b/tests/ttk/all.tcl
index f03cd56..a75172f 100644
--- a/tests/ttk/all.tcl
+++ b/tests/ttk/all.tcl
@@ -16,5 +16,5 @@ tcltest::configure -testdir [file normalize [file dirname [info script]]]
 tcltest::configure -loadfile \
     [file join [file dirname [tcltest::testsDirectory]] constraints.tcl]
 tcltest::configure -singleproc 1
-tcltest::runAllTests
-
+set ErrorOnFailures [info exists env(ERROR_ON_FAILURES)]
+if {[tcltest::runAllTests] && $ErrorOnFailures} {exit 1}
diff --git a/tests/ttk/combobox.test b/tests/ttk/combobox.test
index 43f3cf1..577d449 100644
--- a/tests/ttk/combobox.test
+++ b/tests/ttk/combobox.test
@@ -3,7 +3,8 @@
 #
 
 package require Tk 8.5
-package require tcltest ; namespace import -force tcltest::*
+package require tcltest 2.2
+namespace import -force tcltest::*
 loadTestedCommands
 
 test combobox-1.0 "Combobox tests -- setup" -body {
@@ -38,7 +39,7 @@ test combobox-2.3 "current -- change value" -body {
     .cb current
 } -result 1
 
-test combobox-2.4 "current -- value not in list" -body { 
+test combobox-2.4 "current -- value not in list" -body {
     .cb set "z"
     .cb current
 } -result -1
diff --git a/tests/ttk/image.test b/tests/ttk/image.test
index a55f7f8..5e48d5c 100644
--- a/tests/ttk/image.test
+++ b/tests/ttk/image.test
@@ -23,7 +23,7 @@ test image-2.0 "Deletion of displayed image (label)" -setup {
 } -cleanup {
     destroy .ttk_image20
 } -result {}
-    
+
 test image-2.1 "Deletion of displayed image (checkbutton)" -setup {
      image create photo test.image -width 10 -height 10
 } -body {
diff --git a/tests/ttk/labelframe.test b/tests/ttk/labelframe.test
index 28b4d2e..649c35f 100644
--- a/tests/ttk/labelframe.test
+++ b/tests/ttk/labelframe.test
@@ -70,7 +70,7 @@ test labelframe-3.6 "Destroy child slave" -body {
 # @@@ but seems to succeed if it's some other widget class.
 # @@@ I suspect a race condition; unable to track it down ATM.
 #
-# @@@ FOLLOWUP: This *may* have been caused by a bug in ManagerIdleProc 
+# @@@ FOLLOWUP: This *may* have been caused by a bug in ManagerIdleProc
 # @@@ (see manager.c r1.11). There's still probably a race condition in here.
 #
 test labelframe-4.1 "Add nonchild slave" -body {
diff --git a/tests/ttk/panedwindow.test b/tests/ttk/panedwindow.test
index 7fe5c87..c1fc6ac 100644
--- a/tests/ttk/panedwindow.test
+++ b/tests/ttk/panedwindow.test
@@ -110,8 +110,8 @@ test panedwindow-2.end "Cleanup" -body { destroy .pw }
 #
 test panedwindow-3.0 "configure pane" -body {
     ttk::panedwindow .pw
-    .pw add [listbox .pw.lb1] 
-    .pw add [listbox .pw.lb2] 
+    .pw add [listbox .pw.lb1]
+    .pw add [listbox .pw.lb2]
     .pw pane 1 -weight 2
     .pw pane 1 -weight
 } -result 2
@@ -253,7 +253,7 @@ test paned-propagation-setup "Setup." -body {
     frame .pw.f2 -width 100 -height 50
 
     list [winfo reqwidth .pw.f1] [winfo reqheight .pw.f1]
-} -result [list 100 50] 
+} -result [list 100 50]
 
 test paned-propagation-1 "Initial request size" -body {
     .pw add .pw.f1
diff --git a/tests/ttk/scrollbar.test b/tests/ttk/scrollbar.test
index 0464273..1f8d158 100644
--- a/tests/ttk/scrollbar.test
+++ b/tests/ttk/scrollbar.test
@@ -9,8 +9,8 @@ test scrollbar-swapout-1 "Use core scrollbars on OSX..." -constraints {
 } -body {
     ttk::scrollbar .sb -command "yadda"
     list [winfo class .sb] [.sb cget -command]
-} -result [list Scrollbar yadda] -cleanup { 
-    destroy .sb 
+} -result [list Scrollbar yadda] -cleanup {
+    destroy .sb
 }
 
 test scrollbar-swapout-2 "... unless -style is specified ..." -constraints {
@@ -18,7 +18,7 @@ test scrollbar-swapout-2 "... unless -style is specified ..." -constraints {
 } -body {
     ttk::style layout Vertical.Custom.TScrollbar \
     	[ttk::style layout Vertical.TScrollbar] ; # See #1833339
-    ttk::scrollbar .sb -command "yadda" -style Custom.TScrollbar 
+    ttk::scrollbar .sb -command "yadda" -style Custom.TScrollbar
     list [winfo class .sb] [.sb cget -command] [.sb cget -style]
 } -result [list TScrollbar yadda Custom.TScrollbar] -cleanup {
     destroy .sb
@@ -27,7 +27,7 @@ test scrollbar-swapout-2 "... unless -style is specified ..." -constraints {
 test scrollbar-swapout-3 "... or -class." -constraints {
     coreScrollbar
 } -body {
-    ttk::scrollbar .sb -command "yadda" -class Custom.TScrollbar 
+    ttk::scrollbar .sb -command "yadda" -class Custom.TScrollbar
     list [winfo class .sb] [.sb cget -command]
 } -result [list Custom.TScrollbar yadda] -cleanup {
     destroy .sb
diff --git a/tests/ttk/spinbox.test b/tests/ttk/spinbox.test
index 08f2bda..38bae14 100644
--- a/tests/ttk/spinbox.test
+++ b/tests/ttk/spinbox.test
@@ -253,7 +253,7 @@ test spinbox-nostomp-3 "don't stomp on -variable (configure; -from/to)" -body {
 
 test spinbox-nostomp-4 "don't stomp on -variable (configure; -values)" -body {
     set SBV Apr
-    ttk::spinbox .sb 
+    ttk::spinbox .sb
     .sb configure -textvariable SBV -values {Jan Feb Mar Apr May Jun Jul Aug}
     list $SBV [.sb get]
 } -cleanup {
@@ -278,7 +278,7 @@ test spinbox-dieoctaldie-1 "Cope with leading zeros" -body {
     event generate .sb <<Decrement>>; lappend result $secs
 
     set result
-} -result [list 07 08 09 10 11 10 09 08 07] -cleanup { 
+} -result [list 07 08 09 10 11 10 09 08 07] -cleanup {
     destroy .sb
     unset secs
 }
diff --git a/tests/ttk/treetags.test b/tests/ttk/treetags.test
index 7f26e2f..f91673f 100644
--- a/tests/ttk/treetags.test
+++ b/tests/ttk/treetags.test
@@ -105,7 +105,7 @@ test treetags-1.8 "tag names" -body {
 } -result [list tag1 tag2 tag3]
 
 test treetags-1.9 "tag names - tag added to item" -body {
-    $tv item item1 -tags tag4 
+    $tv item item1 -tags tag4
     lsort [$tv tag names]
 } -result [list tag1 tag2 tag3 tag4]
 
@@ -201,12 +201,12 @@ test treetags-3.4 "stomp tags in tag binding procedure" -body {
     set result [list]
     $tv tag bind rm1 <<Remove>> { lappend ::result rm1 [%W focus] <<Remove>> }
     $tv tag bind rm2 <<Remove>> {
-    	lappend ::result rm2 [%W focus] <<Remove>> 
+    	lappend ::result rm2 [%W focus] <<Remove>>
 	%W item [%W focus] -tags {tag1}
     }
     $tv tag bind rm3 <<Remove>> { lappend ::result rm3 [%W focus] <<Remove>> }
 
-    $tv item item1 -tags {rm1 rm2 rm3} 
+    $tv item item1 -tags {rm1 rm2 rm3}
     $tv focus item1
     event generate $tv <<Remove>>
     set result
diff --git a/tests/ttk/ttk.test b/tests/ttk/ttk.test
index def709e..f3abdef 100644
--- a/tests/ttk/ttk.test
+++ b/tests/ttk/ttk.test
@@ -206,7 +206,7 @@ test ttk-2.8 "bug 3223850: button state disabled during click" -setup {
     destroy .b
     set ttk28 {}
     pack [ttk::button .b -command {set ::ttk28 failed}]
-} -body { 
+} -body {
     bind .b <ButtonPress-1> {after 0 {.b configure -state disabled}}
     after 1 {event generate .b <ButtonPress-1>}
     after 20 {event generate .b <ButtonRelease-1>}
diff --git a/tests/ttk/validate.test b/tests/ttk/validate.test
index 417deac..0a743b3 100644
--- a/tests/ttk/validate.test
+++ b/tests/ttk/validate.test
@@ -4,7 +4,7 @@
 ##
 
 package require Tk 8.5
-package require tcltest 2.1
+package require tcltest 2.2
 namespace import -force tcltest::*
 
 loadTestedCommands
@@ -161,7 +161,7 @@ test validate-1.18 {entry widget validation} -constraints coreEntry -body {
     list [.e cget -validate] $::vVals
 } -result {none {.e -1 -1 nextdata newdata {} all forced}}
 # DIFFERENCE: ttk::entry doesn't validate when setting linked -variable
-# DIFFERENCE: ttk::entry doesn't disable validation 
+# DIFFERENCE: ttk::entry doesn't disable validation
 
 proc doval {W d i P s S v V} {
     set ::vVals [list $W $d $i $P $s $S $v $V]
diff --git a/tests/unixButton.test b/tests/unixButton.test
index a51e259..8efe976 100644
--- a/tests/unixButton.test
+++ b/tests/unixButton.test
@@ -8,13 +8,13 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
 # Create entries in the option database to be sure that geometry options
 # like border width have predictable values.
- 
+
 option add *Label.borderWidth 2
 option add *Label.highlightThickness 0
 option add *Label.font {Helvetica -12 bold}
diff --git a/tests/unixEmbed.test b/tests/unixEmbed.test
index 1e8f03b..b74b075 100644
--- a/tests/unixEmbed.test
+++ b/tests/unixEmbed.test
@@ -1,4 +1,4 @@
-# This file is a Tcl script to test out the procedures in the file 
+# This file is a Tcl script to test out the procedures in the file
 # tkUnixEmbed.c.  It is organized in the standard fashion for Tcl
 # tests.
 #
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/unixFont.test b/tests/unixFont.test
index 27826d4..440fdc5 100644
--- a/tests/unixFont.test
+++ b/tests/unixFont.test
@@ -1,4 +1,4 @@
-# This file is a Tcl script to test out the procedures in tkUnixFont.c. 
+# This file is a Tcl script to test out the procedures in tkUnixFont.c.
 # It is organized in the standard fashion for Tcl tests.
 #
 # Many of these tests are visually oriented and cannot be checked
@@ -6,13 +6,13 @@
 # underlined?"); these tests attempt to exercise the code in question,
 # but there are no results that can be checked.  Some tests depend on the
 # fonts having or not having certain properties, which may not be valid
-# at all sites.  
+# at all sites.
 #
 # Copyright (c) 1996 Sun Microsystems, Inc.
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -124,7 +124,7 @@ test unixfont-2.11 {TkpGetFontFromAttributes: font cannot be loaded} unix {
 
     font actual {-size 14}
     set x {}
-} {}    
+} {}
 
 test unixfont-3.1 {TkpDeleteFont procedure} unix {
     font actual {-family xyz}
diff --git a/tests/unixMenu.test b/tests/unixMenu.test
index 802a7c2..e6f5074 100644
--- a/tests/unixMenu.test
+++ b/tests/unixMenu.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -931,7 +931,7 @@ test unixMenu-25.19 {TkpComputeStandardMenuGeometry - three columns} unix {
     .m1 add command -label four
     .m1 add command -label five -columnbreak 1
     .m1 add command -label six
-    list [update idletasks] [destroy .m1]    
+    list [update idletasks] [destroy .m1]
 } {{} {}}
 test unixMenu-25.20 {TkpComputeStandardMenuGeometry - hide margin} unix {
     catch {destroy .m1}
diff --git a/tests/unixSelect.test b/tests/unixSelect.test
index c3ed11d..c09bffe 100644
--- a/tests/unixSelect.test
+++ b/tests/unixSelect.test
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -345,7 +345,7 @@ test unixSelect-1.19 {TkSelGetSelection procedure: INCR i18n text, utf-8} unix {
 } {1 2122 4222}
 test unixSelect-1.20 {Automatic UTF8_STRING support for selection handle} unix {
     # See Bug #666346 "Selection handling crashes under KDE 3.0"
-    label .l 
+    label .l
     selection handle .l  [list handler STRING]
     set selValue "This is the selection value"
     selection own .l
diff --git a/tests/util.test b/tests/util.test
index 86271c5..6fa0dab 100644
--- a/tests/util.test
+++ b/tests/util.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/visual.test b/tests/visual.test
index 1006e18..1c9b306 100644
--- a/tests/visual.test
+++ b/tests/visual.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/visual_bb.test b/tests/visual_bb.test
index 6b10f76..4560e6b 100644
--- a/tests/visual_bb.test
+++ b/tests/visual_bb.test
@@ -6,7 +6,7 @@
 # at the window to make sure it appears as expected.  Individual tests
 # are kept in separate ".tcl" files in this directory.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -48,7 +48,7 @@ test 1.1 "running visual tests" {userInteraction} {
     frame .menu -relief raised -borderwidth 1
     message .msg -font {Times 18} -relief raised -width 4i \
 	    -borderwidth 1 -text "This application provides a collection of visual tests for the Tk toolkit.  Each menu entry invokes a test, which displays information on the screen.  You can then verify visually that the information is being displayed in the correct way.  The tests under the \"Postscript\" menu exercise the Postscript-generation capabilities of canvas widgets."
-    
+
     pack .menu -side top -fill x
     pack .msg -side bottom -expand yes -fill both
 
@@ -60,7 +60,7 @@ test 1.1 "running visual tests" {userInteraction} {
     menubutton .menu.file -text "File" -menu .menu.file.m
     menu .menu.file.m
     .menu.file.m add command -label "Quit" -command end
-    
+
     menubutton .menu.group1 -text "Group 1" -menu .menu.group1.m
     menu .menu.group1.m
     .menu.group1.m add command -label "Canvas arcs" -command {runTest arc.tcl}
@@ -72,7 +72,7 @@ test 1.1 "running visual tests" {userInteraction} {
 	    -command {runTest butGeom.tcl}
     .menu.group1.m add command -label "Label/button colors" \
 	    -command {runTest butGeom2.tcl}
-    
+
     menubutton .menu.ps -text "Canvas Postscript" -menu .menu.ps.m
     menu .menu.ps.m
     .menu.ps.m add command -label "Rectangles and other graphics" \
@@ -85,11 +85,11 @@ test 1.1 "running visual tests" {userInteraction} {
 	    -command {runTest canvPsImg.tcl}
     .menu.ps.m add command -label "Arcs" \
 	    -command {runTest canvPsArc.tcl}
-    
+
     pack .menu.file .menu.group1 .menu.ps -side left -padx 1m
-    
+
     # Set up for keyboard-based menu traversal
-    
+
     bind . <Any-FocusIn> {
 	if {("%d" == "NotifyVirtual") && ("%m" == "NotifyNormal")} {
 	    focus .menu
diff --git a/tests/winButton.test b/tests/winButton.test
index 5e3dcfb..b431ca3 100644
--- a/tests/winButton.test
+++ b/tests/winButton.test
@@ -8,7 +8,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -93,7 +93,7 @@ test winbutton-1.4 {TkpComputeButtonGeometry procedure} {win nonPortable} {
 	    [winfo reqwidth .b2] [winfo reqheight .b2] \
 	    [winfo reqwidth .b3] [winfo reqheight .b3] \
 	    [winfo reqwidth .b4] [winfo reqheight .b4]
-} {58 24 67 33 88 30 90 28} 
+} {58 24 67 33 88 30 90 28}
 test winbutton-1.5 {TkpComputeButtonGeometry procedure} {win nonPortable} {
     deleteWindows
     label .l1 -text "This is a long string that will wrap around on several lines.\n\nIt also has a blank line (above)." -wraplength 1.5i -padx 0 -pady 0
diff --git a/tests/winClipboard.test b/tests/winClipboard.test
index ec84362..1776941 100644
--- a/tests/winClipboard.test
+++ b/tests/winClipboard.test
@@ -10,7 +10,7 @@
 # Copyright (c) 1998-2000 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/winDialog.test b/tests/winDialog.test
index bb515af..477e8c9 100644
--- a/tests/winDialog.test
+++ b/tests/winDialog.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # Copyright (c) 1998-1999 ActiveState Corporation.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/winFont.test b/tests/winFont.test
index c61d124..b4e8516 100644
--- a/tests/winFont.test
+++ b/tests/winFont.test
@@ -10,7 +10,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/winMenu.test b/tests/winMenu.test
index 7240bf5..d3114bd 100644
--- a/tests/winMenu.test
+++ b/tests/winMenu.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/winMsgbox.test b/tests/winMsgbox.test
index f467896..dc1b208 100644
--- a/tests/winMsgbox.test
+++ b/tests/winMsgbox.test
@@ -2,7 +2,7 @@
 #
 # Copyright (c) 2007 Pat Thoyts <patthoyts@users.sourceforge.net>
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/winSend.test b/tests/winSend.test
index cd130fb..eba3ec3 100644
--- a/tests/winSend.test
+++ b/tests/winSend.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/winWm.test b/tests/winWm.test
index 933d09e..838af04 100644
--- a/tests/winWm.test
+++ b/tests/winWm.test
@@ -9,7 +9,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/window.test b/tests/window.test
index 2c8f19d..e53f6cb 100644
--- a/tests/window.test
+++ b/tests/window.test
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 testConstraint unthreaded [expr {
diff --git a/tests/winfo.test b/tests/winfo.test
index 4ce87eb..50decf5 100644
--- a/tests/winfo.test
+++ b/tests/winfo.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -290,7 +290,7 @@ test winfo-12.2 {GetDisplayOf procedure} {
 } {1 {bad window path name "bad_window"}}
 
 # Some embedding tests
-# 
+#
 
 proc MakeEmbed {} {
     frame .con -container 1
diff --git a/tests/wm.test b/tests/wm.test
index 15526e7..15ceb2f 100644
--- a/tests/wm.test
+++ b/tests/wm.test
@@ -11,7 +11,7 @@
 # Window manager tests that only work on a specific platform should be placed
 # in unixWm.test or winWm.test.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
diff --git a/tests/xmfbox.test b/tests/xmfbox.test
index b60bf48..ac1f4bb 100644
--- a/tests/xmfbox.test
+++ b/tests/xmfbox.test
@@ -1,4 +1,4 @@
-# xmfbox.test -- 
+# xmfbox.test --
 #
 #	This file is a Tcl script to test the file dialog that's used
 #	when the tk_strictMotif flag is set. Because the file dialog
@@ -10,7 +10,7 @@
 # Contributions from Don Porter, NIST, 2002.  (not subject to US copyright)
 # All rights reserved.
 
-package require tcltest 2.1
+package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
@@ -51,7 +51,7 @@ proc cleanup {} {
     } msg4]
 
     if {$err0 || $err1 || $err2 || $err3 || $err4} {
-	error [list $msg0 $msg1 $msg2 $msg3 $msg4] 
+	error [list $msg0 $msg1 $msg2 $msg3 $msg4]
     }
     catch {unset foo}
     catch {destroy .foo}
-- 
cgit v0.12


From e7fd8a6d2e5e2e7c3a4b8b4a833e7cf5778e27e7 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 16 Sep 2020 15:01:34 +0000
Subject: scrollbar and iconlist bindings can be simplified too

---
 library/iconlist.tcl | 15 +++------------
 library/scrlbar.tcl  |  6 ------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/library/iconlist.tcl b/library/iconlist.tcl
index 4c50122..f9dff2e 100644
--- a/library/iconlist.tcl
+++ b/library/iconlist.tcl
@@ -446,18 +446,9 @@ package require Tk
 	bind $canvas <Control-B1-Motion> {;}
 	bind $canvas <Shift-B1-Motion>	[namespace code {my ShiftMotion1 %x %y}]
 
-	if {[tk windowingsystem] eq "aqua"} {
-	    bind $canvas <Shift-MouseWheel>	[namespace code {my MouseWheel [expr {40 * (%D)}]}]
-	    bind $canvas <Option-Shift-MouseWheel>	[namespace code {my MouseWheel [expr {400 * (%D)}]}]
-	} else {
-	    bind $canvas <Shift-MouseWheel>	[namespace code {my MouseWheel %D}]
-	}
-	if {[tk windowingsystem] eq "x11"} {
-	    bind $canvas <Shift-Button-4>	[namespace code {my MouseWheel 120}]
-	    bind $canvas <Shift-Button-5>	[namespace code {my MouseWheel -120}]
-	    bind $canvas <Button-6>		[namespace code {my MouseWheel 120}]
-	    bind $canvas <Button-7>		[namespace code {my MouseWheel -120}]
-	}
+	bind $canvas <Shift-MouseWheel>	[namespace code {my MouseWheel %D}]
+	bind $canvas <Option-Shift-MouseWheel>	[namespace code {my MouseWheel [expr {10*%D}]}]
+
 
 	bind $canvas <<PrevLine>>	[namespace code {my UpDown -1}]
 	bind $canvas <<NextLine>>	[namespace code {my UpDown  1}]
diff --git a/library/scrlbar.tcl b/library/scrlbar.tcl
index a25194a..a8ea3bf 100644
--- a/library/scrlbar.tcl
+++ b/library/scrlbar.tcl
@@ -135,12 +135,6 @@ bind Scrollbar <MouseWheel> {
 bind Scrollbar <Option-MouseWheel> {
     tk::ScrollByUnits %W hv [expr {%D/-3.0}]
 }
-bind Scrollbar <Shift-MouseWheel> {
-    tk::ScrollByUnits %W hv [expr {%D/-30.0}]
-}
-bind Scrollbar <Shift-Option-MouseWheel> {
-    tk::ScrollByUnits %W hv [expr {%D/-3.0}]
-}
 
 # tk::ScrollButtonDown --
 # This procedure is invoked when a button is pressed in a scrollbar.
-- 
cgit v0.12


From 06ab717260bbdc988e95498dc27019590a249f5a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 16 Sep 2020 15:10:17 +0000
Subject: Adjust documentation to new behaviour

---
 doc/bind.n | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/doc/bind.n b/doc/bind.n
index 96c5d34..94f63a1 100644
--- a/doc/bind.n
+++ b/doc/bind.n
@@ -214,11 +214,7 @@ values should scroll up and negative values should scroll down.
 Horizontal scrolling uses \fBShift-MouseWheel\fR events, with positive
 \fB%D\fR \fIdelta\fR substitution indicating left scrolling and negative
 right scrolling.
-Only Windows and macOS Aqua typically fire \fBMouseWheel\fR and
-\fBShift-MouseWheel\fR events.  On
-X11 vertical scrolling is rather supported through \fBButton-4\fR and
-\fBButton-5\fR events, and horizontal scrolling through \fBShift-Button-4\fR
-and \fBShift-Button-5\fR events.  Horizontal scrolling events may fire from
+Horizontal scrolling events may fire from
 many different hardware units such as tilt wheels or touchpads.  Horizontal
 scrolling can also be emulated by holding Shift and scrolling vertically.
 .RE
-- 
cgit v0.12


From 6f513fe5a5c89d582255d1dde62602939f3bc945 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 16 Sep 2020 20:29:50 +0000
Subject: Fix MSVC warning: warning C4018: '<' : signed/unsigned mismatch

---
 win/tkWinMenu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c
index ee377e2..e03c50f 100644
--- a/win/tkWinMenu.c
+++ b/win/tkWinMenu.c
@@ -1280,7 +1280,7 @@ TkWinHandleMenuEvent(
 		    Tcl_DStringFree(&ds);
 		    Tcl_DStringInit(&ds);
 		    wlabel = Tcl_UtfToWCharDString(src, len, &ds);
-		    if ((underline + 1 < len + 1) && (menuChar ==
+		    if (((TkSizeT)underline + 1 < len + 1) && (menuChar ==
 				Tcl_UniCharToUpper(wlabel[underline]))) {
 			*plResult = (2 << 16) | i;
 			returnResult = 1;
-- 
cgit v0.12


From 17dd85791c375152cf5980dafd0f4383004fe123 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Wed, 16 Sep 2020 20:59:22 +0000
Subject: Fix [ea665e08f3]:  Endless loop when reading svg file

---
 generic/nanosvg.h | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/generic/nanosvg.h b/generic/nanosvg.h
index 7bb13d2..47a2c83 100644
--- a/generic/nanosvg.h
+++ b/generic/nanosvg.h
@@ -1670,25 +1670,32 @@ static int nsvg__parseRotate(float* xform, const char* str)
 static void nsvg__parseTransform(float* xform, const char* str)
 {
 	float t[6];
+        int len;
 	nsvg__xformIdentity(xform);
 	while (*str)
 	{
 		if (strncmp(str, "matrix", 6) == 0)
-			str += nsvg__parseMatrix(t, str);
+			len = nsvg__parseMatrix(t, str);
 		else if (strncmp(str, "translate", 9) == 0)
-			str += nsvg__parseTranslate(t, str);
+			len = nsvg__parseTranslate(t, str);
 		else if (strncmp(str, "scale", 5) == 0)
-			str += nsvg__parseScale(t, str);
+			len = nsvg__parseScale(t, str);
 		else if (strncmp(str, "rotate", 6) == 0)
-			str += nsvg__parseRotate(t, str);
+			len = nsvg__parseRotate(t, str);
 		else if (strncmp(str, "skewX", 5) == 0)
-			str += nsvg__parseSkewX(t, str);
+			len = nsvg__parseSkewX(t, str);
 		else if (strncmp(str, "skewY", 5) == 0)
-			str += nsvg__parseSkewY(t, str);
+			len = nsvg__parseSkewY(t, str);
 		else{
 			++str;
 			continue;
 		}
+                if (len != 0) {
+			str += len;
+                } else {
+			++str;
+			continue;
+                }
 
 		nsvg__xformPremultiply(xform, t);
 	}
-- 
cgit v0.12


From c4d109c37eaf3da5573c1cb5196bc4457fe3179e Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 17 Sep 2020 12:13:47 +0000
Subject: Extend .fossil-settings/ignore-glob and .gitattributes

---
 .fossil-settings/ignore-glob | 11 ++++++++++-
 .gitattributes               |  4 ++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/.fossil-settings/ignore-glob b/.fossil-settings/ignore-glob
index ba419e1..c62c87c 100644
--- a/.fossil-settings/ignore-glob
+++ b/.fossil-settings/ignore-glob
@@ -1,9 +1,12 @@
 *.a
 *.dll
 *.dylib
+*.dylib.E
 *.exe
 *.exp
+*.la
 *.lib
+*.lo
 *.o
 *.obj
 *.pdb
@@ -11,6 +14,7 @@
 *.sl
 *.so
 */Makefile
+*/autom4te.cache
 */config.cache
 */config.log
 */config.status
@@ -19,8 +23,13 @@
 */tktest*
 */versions.vc
 doc/man.macros
+html
+macosx/configure
 win/Debug*
 win/Release*
+win/*.manifest
 win/nmhlp-out.txt
+win/nmakehlp.out
 unix/tk.pc
-html/*
+unix/Tk-Info.plist
+unix/Wish-Info.plist
diff --git a/.gitattributes b/.gitattributes
index e9a67c8..fe89ab8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -22,15 +22,19 @@
 
 # Declare files that will always have CRLF line endings on checkout.
 *.bat eol=crlf
+*.rc eol=crlf
 *.sln eol=crlf
 *.vc eol=crlf
 
 # Denote all files that are truly binary and should not be modified.
 *.a binary
+*.bmp binary
+*.cur binary
 *.dll binary
 *.exe binary
 *.gif binary
 *.gz binary
+*.ico binary
 *.jpg binary
 *.lib binary
 *.pdf binary
-- 
cgit v0.12


From 86b3ba7b5f84494334733d2043f6199c3d798540 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 17 Sep 2020 15:35:04 +0000
Subject: Don't run 'oldpack' tests when Tk is compiled with
 -DTK_NO_DEPRECATED.

---
 tests/oldpack.test | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/oldpack.test b/tests/oldpack.test
index 46b3111..e39ae08 100644
--- a/tests/oldpack.test
+++ b/tests/oldpack.test
@@ -30,8 +30,13 @@ frame .pack.violet -width 80 -height 20
 label .pack.violet.l -text P -bd 2 -relief raised
 place .pack.violet.l -relwidth 1.0 -relheight 1.0
 
+if {![catch {pack ap .pack .pack.red top}]} {
+	
+# Don't execute any of this file if Tk is compiled with -DTCL_NO_DEPRECATED
+	
+
 test oldpack-1.1 {basic positioning} -body {
-    pack ap .pack .pack.red top
+    #pack ap .pack .pack.red top
     update
     winfo geometry .pack.red
 } -result 10x20+45+0
@@ -544,6 +549,7 @@ test oldpack-9.3 {information output} -body {
         [pack info .pack.green] [pack info .pack.violet]
 } -result {{.pack.blue .pack.red .pack.green .pack.violet} {-in .pack -anchor center -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top} {-in .pack -anchor center -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top} {-in .pack -anchor center -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top} {-in .pack -anchor center -expand 0 -fill none -ipadx 0 -ipady 0 -padx 0 -pady 0 -side top}}
 
+}
 destroy .pack
 
 # cleanup
-- 
cgit v0.12


From 31aef8c3ec4eb7586b974773140793a5e0c61ad8 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 17 Sep 2020 15:48:52 +0000
Subject: typo in unixEmbed.test testcase. Make install-sh executable

---
 tests/unixEmbed.test | 2 +-
 unix/install-sh      | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 unix/install-sh

diff --git a/tests/unixEmbed.test b/tests/unixEmbed.test
index 2dd32dc..4372253 100644
--- a/tests/unixEmbed.test
+++ b/tests/unixEmbed.test
@@ -976,7 +976,7 @@ test unixEmbed-7.1 {TkpRedirectKeyEvent procedure, forward keystroke} -constrain
 	    update
 	    bind .t1 <Key> {lappend y {key %A}}
 	    set y {}
-	    event generate .t1 <Keys> -keysym a
+	    event generate .t1 <Key> -keysym a
 	    set y
     }]
     update
diff --git a/unix/install-sh b/unix/install-sh
old mode 100644
new mode 100755
-- 
cgit v0.12


From 32168d08399e99c9efa0508a9d12e9a69d0acb4c Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Thu, 17 Sep 2020 17:46:19 +0000
Subject: Deal with timing issues for AppleEvents which arrive during the
 launch process.

---
 macosx/tkMacOSXHLEvents.c | 45 ++++++++++++++++++++++++++++++++++++++-------
 macosx/tkMacOSXInit.c     | 10 +++++-----
 2 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/macosx/tkMacOSXHLEvents.c b/macosx/tkMacOSXHLEvents.c
index 88036ee..70e3bf2 100644
--- a/macosx/tkMacOSXHLEvents.c
+++ b/macosx/tkMacOSXHLEvents.c
@@ -39,6 +39,7 @@ typedef struct AppleEventInfo {
     const char *procedure;
     Tcl_DString command;
     NSAppleEventDescriptor *replyEvent; /* Only used for DoScriptText. */
+    int retryCount;
 } AppleEventInfo;
 
 /*
@@ -148,6 +149,7 @@ static const char *scriptTextProc = "::tk::mac::DoScriptText";
     AEKeyword keyword;
     Tcl_DString pathName;
 
+
     /*
      * Do nothing if we don't have an interpreter.
      */
@@ -215,7 +217,13 @@ static const char *scriptTextProc = "::tk::mac::DoScriptText";
     AEInfo->interp = _eventInterp;
     AEInfo->procedure = openDocumentProc;
     AEInfo->replyEvent = nil;
-    Tcl_DoWhenIdle(ProcessAppleEvent, (ClientData)AEInfo);
+    AEInfo->retryCount = 0;
+
+    if (Tcl_FindCommand(_eventInterp, "::tk::mac::OpenDocuments", NULL, 0)){
+	ProcessAppleEvent((ClientData)AEInfo);
+    } else {
+	Tcl_CreateTimerHandler(500, ProcessAppleEvent, (ClientData)AEInfo);
+    }
 }
 
 - (void) handlePrintDocumentsEvent: (NSAppleEventDescriptor *)event
@@ -232,7 +240,8 @@ static const char *scriptTextProc = "::tk::mac::DoScriptText";
     AEInfo->interp = _eventInterp;
     AEInfo->procedure = printDocProc;
     AEInfo->replyEvent = nil;
-    Tcl_DoWhenIdle(ProcessAppleEvent, (ClientData)AEInfo);
+    AEInfo->retryCount = 0;
+    ProcessAppleEvent((ClientData)AEInfo);
 }
 
 - (void) handleDoScriptEvent: (NSAppleEventDescriptor *)event
@@ -293,7 +302,8 @@ static const char *scriptTextProc = "::tk::mac::DoScriptText";
                 AEInfo->interp = _eventInterp;
                 AEInfo->procedure = scriptFileProc;
                 AEInfo->replyEvent = nil;
-                Tcl_DoWhenIdle(ProcessAppleEvent, (ClientData)AEInfo);
+		AEInfo->retryCount = 0;
+                ProcessAppleEvent((ClientData)AEInfo);
             }
         }
     } else if (noErr == AEGetParamPtr(theDesc, keyDirectObject, typeUTF8Text, &type,
@@ -317,12 +327,13 @@ static const char *scriptTextProc = "::tk::mac::DoScriptText";
 		Tcl_DStringAppendElement(scriptTextCommand, data);
 		AEInfo->interp = _eventInterp;
 		AEInfo->procedure = scriptTextProc;
+		AEInfo->retryCount = 0;
                 if (Tcl_FindCommand(AEInfo->interp, AEInfo->procedure, NULL, 0)) {
                     AEInfo->replyEvent = replyEvent;
                     ProcessAppleEvent((ClientData)AEInfo);
                 } else {
                     AEInfo->replyEvent = nil;
-                    Tcl_DoWhenIdle(ProcessAppleEvent, (ClientData)AEInfo);
+                    ProcessAppleEvent((ClientData)AEInfo);
                 }
 	    }
 	}
@@ -343,7 +354,8 @@ static const char *scriptTextProc = "::tk::mac::DoScriptText";
     AEInfo->interp = _eventInterp;
     AEInfo->procedure = launchURLProc;
     AEInfo->replyEvent = nil;
-    Tcl_DoWhenIdle(ProcessAppleEvent, (ClientData)AEInfo);
+    AEInfo->retryCount = 0;
+    ProcessAppleEvent((ClientData)AEInfo);
 }
 
 @end
@@ -378,8 +390,27 @@ static void ProcessAppleEvent(
 {
     int code;
     AppleEventInfo *AEInfo = (AppleEventInfo*) clientData;
-    if (!AEInfo->interp ||
-        !Tcl_FindCommand(AEInfo->interp, AEInfo->procedure, NULL, 0)) {
+    static Bool retry = NO;
+
+    if (!AEInfo->interp) {
+	return;
+    }
+
+    /*
+     * Apple events that are delivered during the app startup can arrive
+     * before the Tcl procedure for handling the events has been defined.
+     * If the command is not found we create a timer handler to process
+     * the event later, hopefully after the command has been created.
+     * We retry up to 2 times before giving up.
+     */
+
+    if (!Tcl_FindCommand(AEInfo->interp, AEInfo->procedure, NULL, 0)) {
+	if (AEInfo->retryCount < 2) {
+	    AEInfo->retryCount++;
+	    Tcl_CreateTimerHandler(200, ProcessAppleEvent, clientData);
+	} else {
+	    ckfree(clientData);
+	}
 	return;
     }
     code = Tcl_EvalEx(AEInfo->interp, Tcl_DStringValue(&AEInfo->command),
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index 6d3ac1c..2601d6b 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -145,7 +145,7 @@ static int		TkMacOSXGetAppPathCmd(ClientData cd, Tcl_Interp *ip,
      */
 
     [NSApp _lockAutoreleasePool];
-    while (Tcl_DoOneEvent(TCL_WINDOW_EVENTS| TCL_DONT_WAIT)) {}
+    while (Tcl_DoOneEvent(TCL_WINDOW_EVENTS|TCL_DONT_WAIT)) {}
     [NSApp _unlockAutoreleasePool];
 }
 
@@ -336,7 +336,6 @@ TkpInit(
 			      nil]];
 	[TKApplication sharedApplication];
 	[pool drain];
-	[NSApp _setup:interp];
 
         /*
          * WARNING: The finishLaunching method runs asynchronously. This
@@ -345,11 +344,12 @@ TkpInit(
          * with the root window (see below).  If the NSApplication wins then an
          * AppleEvent created during launch, e.g. by dropping a file icon on
          * the application icon, will be delivered before the procedure meant
-         * to to handle the AppleEvent has been defined.  This is now handled
-         * by processing the AppleEvent as an idle task.  See
-         * tkMacOSXHLEvents.c.
+         * to to handle the AppleEvent has been defined.  This is handled in
+         * tkMacOSXHLEvents.c by scheduling a timer event to handle the
+         * ApplEvent later, after the required procedure has been defined.
          */
 
+	[NSApp _setup:interp];
 	[NSApp finishLaunching];
 
         /*
-- 
cgit v0.12


From 48ef08146870342d47fdf371add8000fabd08894 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Fri, 18 Sep 2020 04:04:15 +0000
Subject: Fix [4f4f03f5eb]: in Aqua allow mouse drags across the titlebar while
 ignoring button presses in the title bar.

---
 macosx/tkMacOSXMouseEvent.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index 804531b..bf70c60 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -132,7 +132,10 @@ enum {
      * [39cbacb9e8].
      */
 
-    if (eventType == NSLeftMouseDown || eventType == NSLeftMouseDragged) {
+    if (eventType == NSLeftMouseDragged) {
+	    buttonState &= ~TkGetButtonMask(Button1);
+    }
+    if (eventType == NSLeftMouseDown) {
 	if ([eventWindow respondsToSelector:@selector(mouseInResizeArea)] &&
 	    [(TKWindow *) eventWindow mouseInResizeArea]) {
 
-- 
cgit v0.12


From 322c529d4842cb7cb068d0cee5164d80e2085574 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 18 Sep 2020 11:00:06 +0000
Subject: Remove unused variable

---
 macosx/tkMacOSXHLEvents.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/macosx/tkMacOSXHLEvents.c b/macosx/tkMacOSXHLEvents.c
index 70e3bf2..258740b 100644
--- a/macosx/tkMacOSXHLEvents.c
+++ b/macosx/tkMacOSXHLEvents.c
@@ -390,7 +390,6 @@ static void ProcessAppleEvent(
 {
     int code;
     AppleEventInfo *AEInfo = (AppleEventInfo*) clientData;
-    static Bool retry = NO;
 
     if (!AEInfo->interp) {
 	return;
-- 
cgit v0.12


From 971e564fd07029199b132900f4390cd8d51fdff1 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 18 Sep 2020 12:35:25 +0000
Subject: Don't depend on lsearch returning -1 any more

---
 tests/oldpack.test | 4 ++--
 tests/text.test    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/oldpack.test b/tests/oldpack.test
index e39ae08..35fd0f6 100644
--- a/tests/oldpack.test
+++ b/tests/oldpack.test
@@ -31,9 +31,9 @@ label .pack.violet.l -text P -bd 2 -relief raised
 place .pack.violet.l -relwidth 1.0 -relheight 1.0
 
 if {![catch {pack ap .pack .pack.red top}]} {
-	
+
 # Don't execute any of this file if Tk is compiled with -DTCL_NO_DEPRECATED
-	
+
 
 test oldpack-1.1 {basic positioning} -body {
     #pack ap .pack .pack.red top
diff --git a/tests/text.test b/tests/text.test
index 3802746..b3e10bc 100644
--- a/tests/text.test
+++ b/tests/text.test
@@ -7034,12 +7034,12 @@ test text-27.28 {edit undo and edit redo do not leave \
     .t edit separator
     .t insert end "Again hello.\n"
     .t edit undo
-    lappend res [lsearch [.t mark names] tk::undoMark*]
+    lappend res [expr {[lsearch [.t mark names] tk::undoMark*]<0}]
     .t edit redo
-    lappend res [lsearch [.t mark names] tk::undoMark*]
+    lappend res [expr {[lsearch [.t mark names] tk::undoMark*]<0}]
 } -cleanup {
     destroy .t
-} -result [list -1 -1]
+} -result {1 1}
 
 
 test text-28.1 {bug fix - 624372, ControlUtfProc long lines} -body {
-- 
cgit v0.12


From 02392d62379c5e78f7573f7b3fedd71515f69ca8 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Fri, 18 Sep 2020 15:41:09 +0000
Subject: Fix the button state for drags.

---
 macosx/tkMacOSXMouseEvent.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index bf70c60..6f1b7cd 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -132,9 +132,6 @@ enum {
      * [39cbacb9e8].
      */
 
-    if (eventType == NSLeftMouseDragged) {
-	    buttonState &= ~TkGetButtonMask(Button1);
-    }
     if (eventType == NSLeftMouseDown) {
 	if ([eventWindow respondsToSelector:@selector(mouseInResizeArea)] &&
 	    [(TKWindow *) eventWindow mouseInResizeArea]) {
-- 
cgit v0.12


From 8535b555cbfc1a1b94bf7803ba146bec4ae8b092 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 18 Sep 2020 20:04:40 +0000
Subject: Make sure Travis uses the latest public Tcl 8.6 version for testing

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5a03c08..cd5085e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ addons:
       - gcc-mingw-w64-i686
       - gcc-mingw-w64-x86-64
       - gcc-multilib
-      - tcl-dev
+      - tcl8.6-dev
       - libx11-dev
       - xvfb
   homebrew:
-- 
cgit v0.12


From 886d0a169c21734e775e8d85abd92a744157c368 Mon Sep 17 00:00:00 2001
From: Kevin Walzer <kw@codebykevin.com>
Date: Sat, 19 Sep 2020 17:31:00 +0000
Subject: Restore console

---
 macosx/tkMacOSXInit.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index 2601d6b..2fbfd4d 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -381,8 +381,9 @@ TkpInit(
 	 * clicking Wish) then use the Tk based console interpreter.
 	 */
 
-	if (!isatty(0) && (fstat(0, &st) || (S_ISCHR(st.st_mode) && st.st_blocks == 0))) {
-	    if (getenv("TK_CONSOLE")) {
+	if (getenv("TK_CONSOLE") ||
+		(!isatty(0) && (fstat(0, &st) ||
+		(S_ISCHR(st.st_mode) && st.st_blocks == 0)))) {
 		Tk_InitConsoleChannels(interp);
 		Tcl_RegisterChannel(interp, Tcl_GetStdChannel(TCL_STDIN));
 		Tcl_RegisterChannel(interp, Tcl_GetStdChannel(TCL_STDOUT));
@@ -400,11 +401,11 @@ TkpInit(
 		    if (intvar == NULL) {
 			Tcl_SetVar2(interp, "tcl_interactive", NULL, "1",
 				    TCL_GLOBAL_ONLY);
+			NSLog(@"tcl_interactive");
 		    }
 		}
 		if (Tk_CreateConsoleWindow(interp) == TCL_ERROR) {
 		    return TCL_ERROR;
-		}
 	    } else {
 
 		/*
-- 
cgit v0.12


From b2860267059c788e0ee6018d84f65dd406d5335b Mon Sep 17 00:00:00 2001
From: Kevin Walzer <kw@codebykevin.com>
Date: Sat, 19 Sep 2020 18:14:34 +0000
Subject: Remove debugging statement

---
 macosx/tkMacOSXInit.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index 2fbfd4d..7f3f241 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -401,7 +401,6 @@ TkpInit(
 		    if (intvar == NULL) {
 			Tcl_SetVar2(interp, "tcl_interactive", NULL, "1",
 				    TCL_GLOBAL_ONLY);
-			NSLog(@"tcl_interactive");
 		    }
 		}
 		if (Tk_CreateConsoleWindow(interp) == TCL_ERROR) {
-- 
cgit v0.12


From d0d64252096e9dd308d7460e9dc384b440dd8f43 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Sat, 19 Sep 2020 22:10:01 +0000
Subject: Fix the regression with ScidvsMac; reorganize the code in the rest of
 TkpInit and edit misleading comments.

---
 macosx/tkMacOSXInit.c | 113 +++++++++++++++++++++++++++-----------------------
 1 file changed, 62 insertions(+), 51 deletions(-)

diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index 7f3f241..5bd1e57 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -284,17 +284,29 @@ TkpInit(
 
     if (!initialized) {
 	struct stat st;
+	Bool isBeingLaunched;
+	Bool shouldOpenConsole = NO;
 
 	/*
 	 * Initialize/check OS version variable for runtime checks.
 	 */
 
-	initialized = 1;
-
 #if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
 #   error Mac OS X 10.6 required
 #endif
 
+	initialized = 1;
+	fstat(0, &st);
+
+	/*
+	 * If we don't have a TTY or stdin is a special character file of
+	 * length 0, (e.g. /dev/null, which is what Finder sets when double
+	 * clicking Wish) then we are being launched as a macOS app.
+	 */
+
+	isBeingLaunched = (!isatty(0) ||
+			   (S_ISCHR(st.st_mode) && st.st_blocks == 0));
+
 #ifdef TK_FRAMEWORK
 	/*
 	 * When Tk is in a framework, force tcl_findLibrary to look in the
@@ -312,16 +324,6 @@ TkpInit(
 #endif
 
 	/*
-	 * FIXME: Close stdin & stdout for remote debugging otherwise we will
-	 * fight with gdb for stdin & stdout
-	 */
-
-	if (getenv("XCNOSTDIN") != NULL) {
-	    close(0);
-	    close(1);
-	}
-
-	/*
 	 * Instantiate our NSApplication object. This needs to be done before
 	 * we check whether to open a console window.
 	 */
@@ -376,49 +378,54 @@ TkpInit(
 	Tcl_DoOneEvent(TCL_WINDOW_EVENTS | TCL_DONT_WAIT);
 
 	/*
-	 * If we don't have a TTY or stdin is a special character file of
-	 * length 0, (e.g. /dev/null, which is what Finder sets when double
-	 * clicking Wish) then use the Tk based console interpreter.
+	 * Decide whether to open a console window.  If the TK_CONSOLE
+	 * environment variable is not defined we only show the console if
+	 * there is no startup script.
 	 */
 
-	if (getenv("TK_CONSOLE") ||
-		(!isatty(0) && (fstat(0, &st) ||
-		(S_ISCHR(st.st_mode) && st.st_blocks == 0)))) {
-		Tk_InitConsoleChannels(interp);
-		Tcl_RegisterChannel(interp, Tcl_GetStdChannel(TCL_STDIN));
-		Tcl_RegisterChannel(interp, Tcl_GetStdChannel(TCL_STDOUT));
-		Tcl_RegisterChannel(interp, Tcl_GetStdChannel(TCL_STDERR));
-
-		/*
-		 * Only show the console if we don't have a startup script and
-		 * tcl_interactive hasn't been set already.
-		 */
-
-		if (Tcl_GetStartupScript(NULL) == NULL) {
-		    const char *intvar = Tcl_GetVar2(interp,
-						     "tcl_interactive", NULL, TCL_GLOBAL_ONLY);
-
-		    if (intvar == NULL) {
-			Tcl_SetVar2(interp, "tcl_interactive", NULL, "1",
-				    TCL_GLOBAL_ONLY);
-		    }
-		}
-		if (Tk_CreateConsoleWindow(interp) == TCL_ERROR) {
-		    return TCL_ERROR;
-	    } else {
-
-		/*
-		 * When launched as a macOS application with no console,
-		 * redirect stderr and stdout to /dev/null. This avoids waiting
-		 * forever for those files to become writable if the underlying
-		 * Tcl program tries to write to them with a puts command.
-		 */
-
-		FILE *null = fopen("/dev/null", "w");
-		dup2(fileno(null), STDOUT_FILENO);
-		dup2(fileno(null), STDERR_FILENO);
+	if (getenv("TK_CONSOLE")) {
+	    shouldOpenConsole = YES;
+	} else if (Tcl_GetStartupScript(NULL) == NULL) {
+	    const char *intvar = Tcl_GetVar2(interp, "tcl_interactive",
+					     NULL, TCL_GLOBAL_ONLY);
+	    if (intvar == NULL) {
+		Tcl_SetVar2(interp, "tcl_interactive", NULL, "1",
+			    TCL_GLOBAL_ONLY);
+	    }
+	    shouldOpenConsole = YES;
+	}
+	if (shouldOpenConsole) {
+	    Tk_InitConsoleChannels(interp);
+	    Tcl_RegisterChannel(interp, Tcl_GetStdChannel(TCL_STDIN));
+	    Tcl_RegisterChannel(interp, Tcl_GetStdChannel(TCL_STDOUT));
+	    Tcl_RegisterChannel(interp, Tcl_GetStdChannel(TCL_STDERR));
+	    if (Tk_CreateConsoleWindow(interp) == TCL_ERROR) {
+		return TCL_ERROR;
 	    }
 	}
+	if (isBeingLaunched && !shouldOpenConsole) {
+
+	    /*
+	     * When launched as a macOS application with no console,
+	     * redirect stderr and stdout to /dev/null. This avoids waiting
+	     * forever for those files to become writable if the underlying
+	     * Tcl program tries to write to them with a puts command.
+	     */
+
+	    FILE *null = fopen("/dev/null", "w");
+	    dup2(fileno(null), STDOUT_FILENO);
+	    dup2(fileno(null), STDERR_FILENO);
+	}
+
+	/*
+	 * FIXME: Close stdin & stdout for remote debugging if XCNOSTDIN is
+	 * set.  Otherwise we will fight with gdb for stdin & stdout
+	 */
+
+	if (getenv("XCNOSTDIN") != NULL) {
+	    close(0);
+	    close(1);
+	}
 
 	/*
 	 * Initialize the NSServices object here. Apple's docs say to do this
@@ -445,6 +452,10 @@ TkpInit(
 	}
     }
 
+    /*
+     * Initialization steps that are needed for all interpreters.
+     */
+
     if (tkLibPath[0] != '\0') {
 	Tcl_SetVar2(interp, "tk_library", NULL, tkLibPath, TCL_GLOBAL_ONLY);
     }
-- 
cgit v0.12


From 3d4ce1dd066a78e295cf5ddc7ae6e30ed057d3f6 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Sat, 19 Sep 2020 22:32:17 +0000
Subject: Tiny code improvement

---
 macosx/tkMacOSXInit.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index 5bd1e57..c4ae077 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -402,8 +402,7 @@ TkpInit(
 	    if (Tk_CreateConsoleWindow(interp) == TCL_ERROR) {
 		return TCL_ERROR;
 	    }
-	}
-	if (isBeingLaunched && !shouldOpenConsole) {
+	} else if (isBeingLaunched) {
 
 	    /*
 	     * When launched as a macOS application with no console,
-- 
cgit v0.12


From e1716fd8b1debf155c619ae32316de18418dc25b Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Sun, 20 Sep 2020 04:30:26 +0000
Subject: Don't open a console when running Wish from the command line; further
 simplification.

---
 macosx/tkMacOSXInit.c | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index c4ae077..d77da23 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -284,7 +284,6 @@ TkpInit(
 
     if (!initialized) {
 	struct stat st;
-	Bool isBeingLaunched;
 	Bool shouldOpenConsole = NO;
 
 	/*
@@ -296,16 +295,6 @@ TkpInit(
 #endif
 
 	initialized = 1;
-	fstat(0, &st);
-
-	/*
-	 * If we don't have a TTY or stdin is a special character file of
-	 * length 0, (e.g. /dev/null, which is what Finder sets when double
-	 * clicking Wish) then we are being launched as a macOS app.
-	 */
-
-	isBeingLaunched = (!isatty(0) ||
-			   (S_ISCHR(st.st_mode) && st.st_blocks == 0));
 
 #ifdef TK_FRAMEWORK
 	/*
@@ -380,12 +369,12 @@ TkpInit(
 	/*
 	 * Decide whether to open a console window.  If the TK_CONSOLE
 	 * environment variable is not defined we only show the console if
-	 * there is no startup script.
+	 * stdin is not a tty and there is no startup script.
 	 */
 
 	if (getenv("TK_CONSOLE")) {
 	    shouldOpenConsole = YES;
-	} else if (Tcl_GetStartupScript(NULL) == NULL) {
+	} else if (!isatty(0) && Tcl_GetStartupScript(NULL) == NULL) {
 	    const char *intvar = Tcl_GetVar2(interp, "tcl_interactive",
 					     NULL, TCL_GLOBAL_ONLY);
 	    if (intvar == NULL) {
@@ -402,7 +391,7 @@ TkpInit(
 	    if (Tk_CreateConsoleWindow(interp) == TCL_ERROR) {
 		return TCL_ERROR;
 	    }
-	} else if (isBeingLaunched) {
+	} else if (!isatty(0)) {
 
 	    /*
 	     * When launched as a macOS application with no console,
-- 
cgit v0.12


From 3d52135c3200fb2ac393404e0b106839fdac97c7 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 20 Sep 2020 16:06:03 +0000
Subject: Fix [d91e05bf20]: text widget will not process a <<copy>> when
 disabled

---
 library/text.tcl | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/library/text.tcl b/library/text.tcl
index 0fa37e7..ec8f3d3 100644
--- a/library/text.tcl
+++ b/library/text.tcl
@@ -571,12 +571,7 @@ proc ::tk::TextButton1 {w x y} {
     } else {
 	$w mark gravity $anchorname left
     }
-    # Allow focus in any case on Windows, because that will let the
-    # selection be displayed even for state disabled text widgets.
-    if {[tk windowingsystem] eq "win32" \
-	    || [$w cget -state] eq "normal"} {
-	focus $w
-    }
+    focus $w
     if {[$w cget -autoseparators]} {
 	$w edit separator
     }
-- 
cgit v0.12


From aa1c6622027872fa5412d9bb438494b3e54588ea Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 20 Sep 2020 21:07:40 +0000
Subject: Now (really) swap Buttons 2|3 on MacOS. Adapt all bindings not
 depending on aqua any more

---
 library/demos/cscroll.tcl   |  8 ++++++--
 library/demos/ctext.tcl     |  6 +++++-
 library/demos/floor.tcl     |  9 +++++++--
 library/demos/items.tcl     | 17 ++++++++++++-----
 library/entry.tcl           | 25 ++++++-------------------
 library/scale.tcl           |  8 --------
 library/spinbox.tcl         | 27 +++++++--------------------
 library/text.tcl            | 27 +++++++--------------------
 library/tk.tcl              |  9 +++------
 library/ttk/entry.tcl       | 16 +++++-----------
 library/ttk/scrollbar.tcl   | 14 ++------------
 macosx/tkMacOSXMouseEvent.c |  3 +++
 12 files changed, 63 insertions(+), 106 deletions(-)

diff --git a/library/demos/cscroll.tcl b/library/demos/cscroll.tcl
index aa0a948..186ee48 100644
--- a/library/demos/cscroll.tcl
+++ b/library/demos/cscroll.tcl
@@ -56,9 +56,9 @@ for {set i 0} {$i < 20} {incr i} {
 $c bind all <Enter> "scrollEnter $c"
 $c bind all <Leave> "scrollLeave $c"
 $c bind all <Button-1> "scrollButton $c"
-bind $c <Button-2> "$c scan mark %x %y"
-bind $c <B2-Motion> "$c scan dragto %x %y"
 if {[package vsatisfies [package provide Tk] 8.7-]} {
+    bind $c <Button-2> "$c scan mark %x %y"
+    bind $c <B2-Motion> "$c scan dragto %x %y"
     bind $c <MouseWheel> {
 	%W yview scroll [expr {%D/-30.0}] units
     }
@@ -72,6 +72,8 @@ if {[package vsatisfies [package provide Tk] 8.7-]} {
 	%W xview scroll [expr {%D/-3.0}] units
     }
 } elseif {[tk windowingsystem] eq "aqua"} {
+    bind $c <Button-3> "$c scan mark %x %y"
+    bind $c <B3-Motion> "$c scan dragto %x %y"
     bind $c <MouseWheel> {
 	%W yview scroll [expr {-(%D)}] units
     }
@@ -85,6 +87,8 @@ if {[package vsatisfies [package provide Tk] 8.7-]} {
 	%W xview scroll [expr {-10 * (%D)}] units
     }
 } else {
+    bind $c <Button-2> "$c scan mark %x %y"
+    bind $c <B2-Motion> "$c scan dragto %x %y"
     # We must make sure that positive and negative movements are rounded
     # equally to integers, avoiding the problem that
     #     (int)1/30 = 0,
diff --git a/library/demos/ctext.tcl b/library/demos/ctext.tcl
index 502c9d0..d3fec33 100644
--- a/library/demos/ctext.tcl
+++ b/library/demos/ctext.tcl
@@ -50,7 +50,11 @@ $c bind text <Return> "textInsert $c \\n"
 $c bind text <Control-h> "textBs $c"
 $c bind text <BackSpace> "textBs $c"
 $c bind text <Delete> "textDel $c"
-$c bind text <Button-2> "textPaste $c @%x,%y"
+if {[tk windowingsystem] eq "aqua" && ![package vsatisfies [package provide Tk] 8.7-]} {
+    $c bind text <Button-3> "textPaste $c @%x,%y"
+} else {
+    $c bind text <Button-2> "textPaste $c @%x,%y"
+}
 
 # Next, create some items that allow the text's anchor position
 # to be edited.
diff --git a/library/demos/floor.tcl b/library/demos/floor.tcl
index b5d3c64..eb2ea7f 100644
--- a/library/demos/floor.tcl
+++ b/library/demos/floor.tcl
@@ -1359,8 +1359,13 @@ $c bind floor2 <Button-1> "floorDisplay $c 2"
 $c bind floor3 <Button-1> "floorDisplay $c 3"
 $c bind room <Enter> "newRoom $c"
 $c bind room <Leave> {set currentRoom ""}
-bind $c <Button-2> "$c scan mark %x %y"
-bind $c <B2-Motion> "$c scan dragto %x %y"
+if {[tk windowingsystem] eq "aqua" && ![package vsatisfies [package provide Tk] 8.7-]} {
+    bind $c <Button-3> "$c scan mark %x %y"
+    bind $c <B3-Motion> "$c scan dragto %x %y"
+} else {
+    bind $c <Button-2> "$c scan mark %x %y"
+    bind $c <B2-Motion> "$c scan dragto %x %y"
+}
 bind $c <Destroy> "unset currentRoom"
 set currentRoom ""
 trace variable currentRoom w "roomChanged $c"
diff --git a/library/demos/items.tcl b/library/demos/items.tcl
index 30fda5c..1297046 100644
--- a/library/demos/items.tcl
+++ b/library/demos/items.tcl
@@ -17,7 +17,7 @@ wm iconname $w "Items"
 positionWindow $w
 set c $w.frame.c
 
-label $w.msg -font $font -wraplength 5i -justify left -text "This window contains a canvas widget with examples of the various kinds of items supported by canvases.  The following operations are supported:\n  Button-1 drag:\tmoves item under pointer.\n  Button-2 drag:\trepositions view.\n  Button-3 drag:\tstrokes out area.\n  Ctrl+f:\t\tprints items under area."
+label $w.msg -font $font -wraplength 5i -justify left -text "This window contains a canvas widget with examples of the various kinds of items supported by canvases.  The following operations are supported:\n  Left-Button drag:\tmoves item under pointer.\n  Middle-Button drag:\trepositions view.\n  Right-Button drag:\tstrokes out area.\n  Ctrl+f:\t\tprints items under area."
 pack $w.msg -side top
 
 ## See Code / Dismiss buttons
@@ -173,10 +173,17 @@ $c create text 28.5c 17.4c -text Scale: -anchor s
 
 $c bind item <Enter> "itemEnter $c"
 $c bind item <Leave> "itemLeave $c"
-bind $c <Button-2> "$c scan mark %x %y"
-bind $c <B2-Motion> "$c scan dragto %x %y"
-bind $c <Button-3> "itemMark $c %x %y"
-bind $c <B3-Motion> "itemStroke $c %x %y"
+if {[tk windowingsystem] eq "aqua" && ![package vsatisfies [package provide Tk] 8.7-]} {
+    bind $c <Button-2> "itemMark $c %x %y"
+    bind $c <B2-Motion> "itemStroke $c %x %y"
+    bind $c <Button-3> "$c scan mark %x %y"
+    bind $c <B3-Motion> "$c scan dragto %x %y"
+} else {
+    bind $c <Button-2> "$c scan mark %x %y"
+    bind $c <B2-Motion> "$c scan dragto %x %y"
+    bind $c <Button-3> "itemMark $c %x %y"
+    bind $c <B3-Motion> "itemStroke $c %x %y"
+}
 bind $c <<NextChar>> "itemsUnderArea $c"
 bind $c <Button-1> "itemStartDrag $c %x %y"
 bind $c <B1-Motion> "itemDrag $c %x %y"
diff --git a/library/entry.tcl b/library/entry.tcl
index 6539af7..f95d6bd 100644
--- a/library/entry.tcl
+++ b/library/entry.tcl
@@ -293,28 +293,15 @@ bind Entry <<TkAccentBackspace>> {
 
 # A few additional bindings of my own.
 
-if {[tk windowingsystem] ne "aqua"} {
-    bind Entry <Button-2> {
-        if {!$tk_strictMotif} {
-        ::tk::EntryScanMark %W %x
-        }
-    }
-    bind Entry <B2-Motion> {
-        if {!$tk_strictMotif} {
-        ::tk::EntryScanDrag %W %x
-        }
-    }
-} else {
-    bind Entry <Button-3> {
-        if {!$tk_strictMotif} {
+bind Entry <Button-2> {
+    if {!$tk_strictMotif} {
         ::tk::EntryScanMark %W %x
-        }
     }
-    bind Entry <B3-Motion> {
-        if {!$tk_strictMotif} {
+}
+bind Entry <B2-Motion> {
+    if {!$tk_strictMotif} {
         ::tk::EntryScanDrag %W %x
-        }
-    }
+     }
 }
 
 # ::tk::EntryClosestGap --
diff --git a/library/scale.tcl b/library/scale.tcl
index cc0de20..130c491 100644
--- a/library/scale.tcl
+++ b/library/scale.tcl
@@ -60,14 +60,6 @@ bind Scale <ButtonRelease-2> {
     tk::ScaleEndDrag %W
     tk::ScaleActivate %W %x %y
 }
-if {[tk windowingsystem] eq "win32"} {
-    # On Windows do the same with button 3, as that is the right mouse button
-    bind Scale <Button-3>	[bind Scale <Button-2>]
-    bind Scale <B3-Motion>	[bind Scale <B2-Motion>]
-    bind Scale <B3-Leave>	[bind Scale <B2-Leave>]
-    bind Scale <B3-Enter>	[bind Scale <B2-Enter>]
-    bind Scale <ButtonRelease-3> [bind Scale <ButtonRelease-2>]
-}
 bind Scale <Control-Button-1> {
     tk::ScaleControlPress %W %x %y
 }
diff --git a/library/spinbox.tcl b/library/spinbox.tcl
index 6ba7842..938e409 100644
--- a/library/spinbox.tcl
+++ b/library/spinbox.tcl
@@ -280,27 +280,14 @@ bind Spinbox <Meta-Delete> {
 
 # A few additional bindings of my own.
 
-if {[tk windowingsystem] ne "aqua"} {
-    bind Spinbox <Button-2> {
-        if {!$tk_strictMotif} {
-        ::tk::EntryScanMark %W %x
-        }
-    }
-    bind Spinbox <B2-Motion> {
-        if {!$tk_strictMotif} {
-        ::tk::EntryScanDrag %W %x
-        }
-    }
-} else {
-    bind Spinbox <Button-3> {
-        if {!$tk_strictMotif} {
-        ::tk::EntryScanMark %W %x
-        }
+bind Spinbox <Button-2> {
+    if {!$tk_strictMotif} {
+	::tk::EntryScanMark %W %x
     }
-    bind Spinbox <B3-Motion> {
-        if {!$tk_strictMotif} {
-        ::tk::EntryScanDrag %W %x
-        }
+}
+bind Spinbox <B2-Motion> {
+    if {!$tk_strictMotif} {
+	::tk::EntryScanDrag %W %x
     }
 }
 
diff --git a/library/text.tcl b/library/text.tcl
index 67a787a..7f56c0b 100644
--- a/library/text.tcl
+++ b/library/text.tcl
@@ -429,27 +429,14 @@ bind Text <Control-h> {
 	%W see insert
     }
 }
-if {[tk windowingsystem] ne "aqua"} {
-    bind Text <Button-2> {
-        if {!$tk_strictMotif} {
-        tk::TextScanMark %W %x %y
-        }
-    }
-    bind Text <B2-Motion> {
-        if {!$tk_strictMotif} {
-        tk::TextScanDrag %W %x %y
-        }
-    }
-} else {
-    bind Text <Button-3> {
-        if {!$tk_strictMotif} {
-        tk::TextScanMark %W %x %y
-        }
+bind Text <Button-2> {
+    if {!$tk_strictMotif} {
+	tk::TextScanMark %W %x %y
     }
-    bind Text <B3-Motion> {
-        if {!$tk_strictMotif} {
-        tk::TextScanDrag %W %x %y
-        }
+}
+bind Text <B2-Motion> {
+    if {!$tk_strictMotif} {
+	tk::TextScanDrag %W %x %y
     }
 }
 set ::tk::Priv(prevPos) {}
diff --git a/library/tk.tcl b/library/tk.tcl
index 85421ef..dfa60d4 100644
--- a/library/tk.tcl
+++ b/library/tk.tcl
@@ -366,15 +366,16 @@ if {![llength [info command tk_chooseDirectory]]} {
 # Define the set of common virtual events.
 #----------------------------------------------------------------------
 
+event add <<ContextMenu>>	<Button-3>
+event add <<PasteSelection>>	<ButtonRelease-2>
+
 switch -exact -- [tk windowingsystem] {
     "x11" {
 	event add <<Cut>>		<Control-x> <F20> <Control-Lock-X>
 	event add <<Copy>>		<Control-c> <F16> <Control-Lock-C>
 	event add <<Paste>>		<Control-v> <F18> <Control-Lock-V>
-	event add <<PasteSelection>>	<ButtonRelease-2>
 	event add <<Undo>>		<Control-z> <Control-Lock-Z>
 	event add <<Redo>>		<Control-Z> <Control-Lock-z>
-	event add <<ContextMenu>>	<Button-3>
 	# On Darwin/Aqua, buttons from left to right are 1,3,2.  On Darwin/X11 with recent
 	# XQuartz as the X server, they are 1,2,3; other X servers may differ.
 
@@ -422,10 +423,8 @@ switch -exact -- [tk windowingsystem] {
 	event add <<Cut>>		<Control-x> <Shift-Delete> <Control-Lock-X>
 	event add <<Copy>>		<Control-c> <Control-Insert> <Control-Lock-C>
 	event add <<Paste>>		<Control-v> <Shift-Insert> <Control-Lock-V>
-	event add <<PasteSelection>>	<ButtonRelease-2>
   	event add <<Undo>>		<Control-z> <Control-Lock-Z>
 	event add <<Redo>>		<Control-y> <Control-Lock-Y>
-	event add <<ContextMenu>>	<Button-3>
 
 	event add <<SelectAll>>		<Control-slash> <Control-a> <Control-Lock-A>
 	event add <<SelectNone>>	<Control-backslash>
@@ -455,9 +454,7 @@ switch -exact -- [tk windowingsystem] {
 	event add <<Cut>>		<Command-x> <F2> <Command-Lock-X>
 	event add <<Copy>>		<Command-c> <F3> <Command-Lock-C>
 	event add <<Paste>>		<Command-v> <F4> <Command-Lock-V>
-	event add <<PasteSelection>>	<ButtonRelease-3>
 	event add <<Clear>>		<Clear>
-	event add <<ContextMenu>>	<Button-2>
 
 	# Official bindings
 	# See http://support.apple.com/kb/HT1343
diff --git a/library/ttk/entry.tcl b/library/ttk/entry.tcl
index 2f3c1a6..a4528fa 100644
--- a/library/ttk/entry.tcl
+++ b/library/ttk/entry.tcl
@@ -82,20 +82,14 @@ bind TEntry <<ToggleSelection>> {
     %W instate {!readonly !disabled} { %W icursor @%x ; focus %W }
 }
 
-## Button2 (Button3 on Aqua) bindings:
+## Button2 bindings:
 #	Used for scanning and primary transfer.
-#	Note: ButtonRelease-2 (ButtonRelease-3 on Aqua)
+#	Note: ButtonRelease-2
 #	is mapped to <<PasteSelection>> in tk.tcl.
 #
-if {[tk windowingsystem] ne "aqua"} {
-    bind TEntry <Button-2> 		{ ttk::entry::ScanMark %W %x }
-    bind TEntry <B2-Motion> 		{ ttk::entry::ScanDrag %W %x }
-    bind TEntry <ButtonRelease-2>	{ ttk::entry::ScanRelease %W %x }
-} else {
-    bind TEntry <Button-3> 		{ ttk::entry::ScanMark %W %x }
-    bind TEntry <B3-Motion> 		{ ttk::entry::ScanDrag %W %x }
-    bind TEntry <ButtonRelease-3>	{ ttk::entry::ScanRelease %W %x }
-}
+bind TEntry <Button-2> 			{ ttk::entry::ScanMark %W %x }
+bind TEntry <B2-Motion> 		{ ttk::entry::ScanDrag %W %x }
+bind TEntry <ButtonRelease-2>		{ ttk::entry::ScanRelease %W %x }
 bind TEntry <<PasteSelection>>		{ ttk::entry::ScanRelease %W %x }
 
 ## Keyboard navigation bindings:
diff --git a/library/ttk/scrollbar.tcl b/library/ttk/scrollbar.tcl
index 4ac0760..8f6cf64 100644
--- a/library/ttk/scrollbar.tcl
+++ b/library/ttk/scrollbar.tcl
@@ -19,18 +19,8 @@ bind TScrollbar <ButtonRelease-2>	{ ttk::scrollbar::Release %W %x %y }
 
 # Redirect scrollwheel bindings to the scrollbar widget
 #
-# The shift-bindings scroll left/right (not up/down)
-# if a widget has both possibilities
-set eventList [list <MouseWheel>]
-switch [tk windowingsystem] {
-    aqua {
-        lappend eventList <Option-MouseWheel>
-    }
-}
-foreach event $eventList {
-    bind TScrollbar $event [bind Scrollbar $event]
-}
-unset eventList event
+bind TScrollbar <MouseWheel> [bind Scrollbar <MouseWheel>]
+bind TScrollbar <Option-MouseWheel> [bind Scrollbar <Option-MouseWheel>]
 
 proc ttk::scrollbar::Scroll {w n units} {
     set cmd [$w cget -command]
diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index 67840ed..58e2f73 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -89,6 +89,9 @@ enum {
     }
 
     button = [theEvent buttonNumber] + Button1;
+    if ((button & -2) == Button2) {
+	button ^= 1; /* Swap buttons 2/3 */
+    }
     switch (eventType) {
     case NSRightMouseUp:
     case NSOtherMouseUp:
-- 
cgit v0.12


From 220460c737b212c39bb974c53980e5f122d7475d Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 21 Sep 2020 10:09:01 +0000
Subject: Fix [f3cd942e9e]: trunk: .mymenu index end no longer works on an
 empty menu

---
 generic/tkMenu.c | 4 ++--
 tests/menu.test  | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/generic/tkMenu.c b/generic/tkMenu.c
index 3b648ff..6f36d7e 100644
--- a/generic/tkMenu.c
+++ b/generic/tkMenu.c
@@ -2128,7 +2128,7 @@ GetMenuIndex(
     const char *string;
 
     if (TkGetIntForIndex(objPtr, menuPtr->numEntries - 1, lastOK, indexPtr) == TCL_OK) {
-	if (*indexPtr != TCL_INDEX_NONE) {
+	if (*indexPtr != TCL_INDEX_NONE || menuPtr->numEntries == 0) {
 	    if (*indexPtr >= menuPtr->numEntries) {
 		*indexPtr = menuPtr->numEntries - ((lastOK) ? 0 : 1);
 	    }
@@ -2360,7 +2360,7 @@ MenuAddOrInsert(
     }
     if (index == TCL_INDEX_NONE) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		"bad index \"%s\"", Tcl_GetString(indexPtr)));
+		"bad menu entry index \"%s\"", Tcl_GetString(indexPtr)));
 	Tcl_SetErrorCode(interp, "TK", "MENU", "INDEX", NULL);
 	return TCL_ERROR;
     }
diff --git a/tests/menu.test b/tests/menu.test
index 03e0dab..55315bd 100644
--- a/tests/menu.test
+++ b/tests/menu.test
@@ -1858,6 +1858,14 @@ test menu-3.70 {MenuWidgetCmd procedure, "xposition" option} -setup {
 } -cleanup {
     destroy .m1
 } -result {}
+test menu-3.71 {MenuWidgetCmd procedure, "index end" option, bug [f3cd942e9e]} -setup {
+    destroy .m1
+} -body {
+    menu .m1
+    list [.m1 index "end"]
+} -cleanup {
+    destroy .m1
+} -result none
 
 
 test menu-4.1 {TkInvokeMenu: disabled} -setup {
-- 
cgit v0.12


From 483a7f2dbd65aef5e33e27a71af323d481383a3a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 21 Sep 2020 11:30:12 +0000
Subject: Invert Scrollwheel direction on X11

---
 generic/tkEvent.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tkEvent.c b/generic/tkEvent.c
index d05557a..dfadc3e 100644
--- a/generic/tkEvent.c
+++ b/generic/tkEvent.c
@@ -1148,7 +1148,7 @@ Tk_HandleEvent(
 	} else if (eventPtr->type == ButtonPress) {
 	    eventPtr->type = MouseWheelEvent;
 	    eventPtr->xany.send_event = -1;
-	    eventPtr->xkey.keycode = (eventPtr->xbutton.button & 1) ? 120 : -120;
+	    eventPtr->xkey.keycode = (eventPtr->xbutton.button & 1) ? -120 : 120;
 	    if (eventPtr->xkey.keycode > Button5) {
 		eventPtr->xkey.state ^= ShiftMask;
 	    }
-- 
cgit v0.12


From 5e2225d853694bed068a250b19d22a5dea0abcf3 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 21 Sep 2020 12:59:20 +0000
Subject: Another bugfix: xbutton.button and xkey.keycode are actually the same
 field. Doogh....

---
 generic/tkEvent.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/generic/tkEvent.c b/generic/tkEvent.c
index dfadc3e..ea7b282 100644
--- a/generic/tkEvent.c
+++ b/generic/tkEvent.c
@@ -1146,10 +1146,11 @@ Tk_HandleEvent(
 	if (eventPtr->type == ButtonRelease) {
 	    return;
 	} else if (eventPtr->type == ButtonPress) {
+	    int but = eventPtr->xbutton.button;
 	    eventPtr->type = MouseWheelEvent;
 	    eventPtr->xany.send_event = -1;
-	    eventPtr->xkey.keycode = (eventPtr->xbutton.button & 1) ? -120 : 120;
-	    if (eventPtr->xkey.keycode > Button5) {
+	    eventPtr->xkey.keycode = (but & 1) ? -120 : 120;
+	    if (but > Button5) {
 		eventPtr->xkey.state ^= ShiftMask;
 	    }
 	}
-- 
cgit v0.12


From 03fa2d79059c6bd7b0cf7974effb2c6176a9ac40 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 21 Sep 2020 14:37:34 +0000
Subject: Doc format warnings

---
 doc/grid.n  | 6 +++---
 doc/pack.n  | 2 +-
 doc/place.n | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/grid.n b/doc/grid.n
index b4f7699..5a175c7 100644
--- a/doc/grid.n
+++ b/doc/grid.n
@@ -285,15 +285,15 @@ The size is determined either by the \fIcontent\fR occupying the largest
 row or column, or the largest column or row with a \fB\-minsize\fR,
 \fB\-weight\fR, or \fB\-pad\fR that is non-zero.
 .TP
-\fBgrid slaves \window\fR ?\fI\-option value\fR?
+\fBgrid slaves \fIwindow\fR ?\fI\-option value\fR?
 .
-If no options are supplied, a list of all of the content in \window\fR
+If no options are supplied, a list of all of the content in \fIwindow\fR
 are returned, most recently managed first.
 \fIOption\fR can be either \fB\-row\fR or \fB\-column\fR which
 causes only the content in the row (or column) specified by \fIvalue\fR
 to be returned.
-.TP
 .VS "TIP 581"
+.TP
 \fBgrid content \fIwindow\fR ?\fI\-option value\fR?
 .
 Synonym for . \fBgrid slaves \fIwindow\fR ?\fI\-option value\fR?
diff --git a/doc/pack.n b/doc/pack.n
index f60bdb2..3ee14dd 100644
--- a/doc/pack.n
+++ b/doc/pack.n
@@ -155,8 +155,8 @@ Returns a list of all of the content windows in the packing order for \fIwindow\
 The order of the content windows in the list is the same as their order in
 the packing order.
 If \fIwindow\fR has no content then an empty string is returned.
-.TP
 .VS "TIP 581"
+.TP
 \fBpack content \fIwindow\fR
 .
 Synonym for . \fBpack slaves \fIwindow\fR
diff --git a/doc/place.n b/doc/place.n
index f52ec53..6a30c55 100644
--- a/doc/place.n
+++ b/doc/place.n
@@ -194,8 +194,8 @@ command.
 \fBplace slaves \fIwindow\fR
 Returns a list of all the content windows for which \fIwindow\fR is the container.
 If there is no content for \fIwindow\fR then an empty string is returned.
-.TP
 .VS "TIP 581"
+.TP
 \fBplace content \fIwindow\fR
 .
 Synonym for . \fBplace slaves \fIwindow\fR
-- 
cgit v0.12


From 3c51939b4ba5c06f904a8d502f76c10c979acde9 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 21 Sep 2020 14:54:14 +0000
Subject: Make demo's like floor/items/ctext behave the same on MacOS as other
 platforms: Switch between buttons 2/3 platform-based. More demo cleanups,
 nothing functional

---
 library/demos/arrow.tcl    |  8 ++++----
 library/demos/bind.tcl     | 16 ++++++++--------
 library/demos/colors.tcl   |  2 +-
 library/demos/cscroll.tcl  | 44 +++++++++++++++++++++++++++++++++-----------
 library/demos/ctext.tcl    |  6 +++++-
 library/demos/floor.tcl    | 15 ++++++++++-----
 library/demos/image2.tcl   |  2 +-
 library/demos/items.tcl    | 23 +++++++++++++++--------
 library/demos/ixset        |  2 +-
 library/demos/pendulum.tcl |  2 +-
 library/demos/plot.tcl     |  6 +++---
 library/demos/ruler.tcl    |  6 +++---
 library/demos/square       |  2 +-
 library/demos/tcolor       |  2 +-
 library/demos/twind.tcl    |  6 +++---
 15 files changed, 90 insertions(+), 52 deletions(-)

diff --git a/library/demos/arrow.tcl b/library/demos/arrow.tcl
index 12249c0..3d0b406 100644
--- a/library/demos/arrow.tcl
+++ b/library/demos/arrow.tcl
@@ -154,11 +154,11 @@ $c bind box <Enter> "$c itemconfigure current $demo_arrowInfo(activeStyle)"
 $c bind box <Leave> "$c itemconfigure current $demo_arrowInfo(boxStyle)"
 $c bind box <B1-Enter> " "
 $c bind box <B1-Leave> " "
-$c bind box1 <1> {set demo_arrowInfo(motionProc) arrowMove1}
-$c bind box2 <1> {set demo_arrowInfo(motionProc) arrowMove2}
-$c bind box3 <1> {set demo_arrowInfo(motionProc) arrowMove3}
+$c bind box1 <Button-1> {set demo_arrowInfo(motionProc) arrowMove1}
+$c bind box2 <Button-1> {set demo_arrowInfo(motionProc) arrowMove2}
+$c bind box3 <Button-1> {set demo_arrowInfo(motionProc) arrowMove3}
 $c bind box <B1-Motion> "\$demo_arrowInfo(motionProc) $c %x %y"
-bind $c <Any-ButtonRelease-1> "arrowSetup $c"
+bind $c <ButtonRelease-1> "arrowSetup $c"
 
 # arrowMove1 --
 # This procedure is called for each mouse motion event on box1 (the
diff --git a/library/demos/bind.tcl b/library/demos/bind.tcl
index 03f6d3b..9146362 100644
--- a/library/demos/bind.tcl
+++ b/library/demos/bind.tcl
@@ -63,16 +63,16 @@ $w.text insert end \
 # Create bindings for tags.
 
 foreach tag {d1 d2 d3 d4 d5 d6} {
-    $w.text tag bind $tag <Any-Enter> "$w.text tag configure $tag $bold"
-    $w.text tag bind $tag <Any-Leave> "$w.text tag configure $tag $normal"
+    $w.text tag bind $tag <Enter> "$w.text tag configure $tag $bold"
+    $w.text tag bind $tag <Leave> "$w.text tag configure $tag $normal"
 }
 # Main widget program sets variable tk_demoDirectory
-$w.text tag bind d1 <1> {source [file join $tk_demoDirectory items.tcl]}
-$w.text tag bind d2 <1> {source [file join $tk_demoDirectory plot.tcl]}
-$w.text tag bind d3 <1> {source [file join $tk_demoDirectory ctext.tcl]}
-$w.text tag bind d4 <1> {source [file join $tk_demoDirectory arrow.tcl]}
-$w.text tag bind d5 <1> {source [file join $tk_demoDirectory ruler.tcl]}
-$w.text tag bind d6 <1> {source [file join $tk_demoDirectory cscroll.tcl]}
+$w.text tag bind d1 <Button-1> {source [file join $tk_demoDirectory items.tcl]}
+$w.text tag bind d2 <Button-1> {source [file join $tk_demoDirectory plot.tcl]}
+$w.text tag bind d3 <Button-1> {source [file join $tk_demoDirectory ctext.tcl]}
+$w.text tag bind d4 <Button-1> {source [file join $tk_demoDirectory arrow.tcl]}
+$w.text tag bind d5 <Button-1> {source [file join $tk_demoDirectory ruler.tcl]}
+$w.text tag bind d6 <Button-1> {source [file join $tk_demoDirectory cscroll.tcl]}
 
 $w.text mark set insert 0.0
 $w.text configure -state disabled
diff --git a/library/demos/colors.tcl b/library/demos/colors.tcl
index 99dec92..fdfdc5b 100644
--- a/library/demos/colors.tcl
+++ b/library/demos/colors.tcl
@@ -32,7 +32,7 @@ listbox $w.frame.list -yscroll "$w.frame.scroll set" \
 	-width 20 -height 16 -setgrid 1
 pack $w.frame.list $w.frame.scroll -side left -fill y -expand 1
 
-bind $w.frame.list <Double-1> {
+bind $w.frame.list <Double-Button-1> {
     tk_setPalette [selection get]
 }
 $w.frame.list insert 0 gray60 gray70 gray80 gray85 gray90 gray95 \
diff --git a/library/demos/cscroll.tcl b/library/demos/cscroll.tcl
index 443b102..f64ca5d 100644
--- a/library/demos/cscroll.tcl
+++ b/library/demos/cscroll.tcl
@@ -53,12 +53,12 @@ for {set i 0} {$i < 20} {incr i} {
     }
 }
 
-$c bind all <Any-Enter> "scrollEnter $c"
-$c bind all <Any-Leave> "scrollLeave $c"
-$c bind all <1> "scrollButton $c"
-bind $c <2> "$c scan mark %x %y"
-bind $c <B2-Motion> "$c scan dragto %x %y"
+$c bind all <Enter> "scrollEnter $c"
+$c bind all <Leave> "scrollLeave $c"
+$c bind all <Button-1> "scrollButton $c"
 if {[tk windowingsystem] eq "aqua"} {
+    bind $c <Button-3> "$c scan mark %x %y"
+    bind $c <B3-Motion> "$c scan dragto %x %y"
     bind $c <MouseWheel> {
 	%W yview scroll [expr {-(%D)}] units
     }
@@ -72,11 +72,33 @@ if {[tk windowingsystem] eq "aqua"} {
 	%W xview scroll [expr {-10 * (%D)}] units
     }
 } else {
+    bind $c <Button-2> "$c scan mark %x %y"
+    bind $c <B2-Motion> "$c scan dragto %x %y"
+    # We must make sure that positive and negative movements are rounded
+    # equally to integers, avoiding the problem that
+    #     (int)1/30 = 0,
+    # but
+    #     (int)-1/30 = -1
+    # The following code ensure equal +/- behaviour.
     bind $c <MouseWheel> {
-	%W yview scroll [expr {-(%D / 30)}] units
+	if {%D >= 0} {
+	    %W yview scroll [expr {%D/-30}] units
+	} else {
+	    %W yview scroll [expr {(%D-29)/-30}] units
+	}
+    }
+    bind $c <Option-MouseWheel> {
+	%W yview scroll [expr {%D/-3}] units
     }
     bind $c <Shift-MouseWheel> {
-	%W xview scroll [expr {-(%D / 30)}] units
+	if {%D >= 0} {
+	    %W xview scroll [expr {%D/-30}] units
+	} else {
+	    %W xview scroll [expr {(%D-29)/-30}] units
+	}
+    }
+    bind $c <Shift-Option-MouseWheel> {
+	%W xview scroll [expr {%D/-3}] units
     }
 }
 
@@ -85,22 +107,22 @@ if {[tk windowingsystem] eq "x11"} {
     # the wheel to the extended buttons.  If you have a mousewheel, find
     # Linux configuration info at:
     #	http://linuxreviews.org/howtos/xfree/mouse/
-    bind $c <4> {
+    bind $c <Button-4> {
 	if {!$tk_strictMotif} {
 	    %W yview scroll -5 units
 	}
     }
-    bind $c <Shift-4> {
+    bind $c <Shift-Button-4> {
 	if {!$tk_strictMotif} {
 	    %W xview scroll -5 units
 	}
     }
-    bind $c <5> {
+    bind $c <Button-5> {
 	if {!$tk_strictMotif} {
 	    %W yview scroll 5 units
 	}
     }
-    bind $c <Shift-5> {
+    bind $c <Shift-Button-5> {
 	if {!$tk_strictMotif} {
 	    %W xview scroll 5 units
 	}
diff --git a/library/demos/ctext.tcl b/library/demos/ctext.tcl
index 502c9d0..5acc82f 100644
--- a/library/demos/ctext.tcl
+++ b/library/demos/ctext.tcl
@@ -50,7 +50,11 @@ $c bind text <Return> "textInsert $c \\n"
 $c bind text <Control-h> "textBs $c"
 $c bind text <BackSpace> "textBs $c"
 $c bind text <Delete> "textDel $c"
-$c bind text <Button-2> "textPaste $c @%x,%y"
+if {[tk windowingsystem] eq "aqua"} {
+    $c bind text <Button-3> "textPaste $c @%x,%y"
+} else {
+    $c bind text <Button-2> "textPaste $c @%x,%y"
+}
 
 # Next, create some items that allow the text's anchor position
 # to be edited.
diff --git a/library/demos/floor.tcl b/library/demos/floor.tcl
index d5ef3a0..37e1b95 100644
--- a/library/demos/floor.tcl
+++ b/library/demos/floor.tcl
@@ -1354,13 +1354,18 @@ floorDisplay $c 3
 
 # Set up event bindings for canvas:
 
-$c bind floor1 <1> "floorDisplay $c 1"
-$c bind floor2 <1> "floorDisplay $c 2"
-$c bind floor3 <1> "floorDisplay $c 3"
+$c bind floor1 <Button-1> "floorDisplay $c 1"
+$c bind floor2 <Button-1> "floorDisplay $c 2"
+$c bind floor3 <Button-1> "floorDisplay $c 3"
 $c bind room <Enter> "newRoom $c"
 $c bind room <Leave> {set currentRoom ""}
-bind $c <2> "$c scan mark %x %y"
-bind $c <B2-Motion> "$c scan dragto %x %y"
+if {[tk windowingsystem] eq "aqua"} {
+    bind $c <Button-3> "$c scan mark %x %y"
+    bind $c <B3-Motion> "$c scan dragto %x %y"
+} else {
+    bind $c <Button-2> "$c scan mark %x %y"
+    bind $c <B2-Motion> "$c scan dragto %x %y"
+}
 bind $c <Destroy> "unset currentRoom"
 set currentRoom ""
 trace variable currentRoom w "roomChanged $c"
diff --git a/library/demos/image2.tcl b/library/demos/image2.tcl
index 2d7ba03..7af52be 100644
--- a/library/demos/image2.tcl
+++ b/library/demos/image2.tcl
@@ -95,7 +95,7 @@ listbox $w.f.list -width 20 -height 10 -yscrollcommand "$w.f.scroll set"
 ttk::scrollbar $w.f.scroll -command "$w.f.list yview"
 pack $w.f.list $w.f.scroll -side left -fill y -expand 1
 $w.f.list insert 0 earth.gif earthris.gif teapot.ppm
-bind $w.f.list <Double-1> "loadImage $w %x %y"
+bind $w.f.list <Double-Button-1> "loadImage $w %x %y"
 
 catch {image delete image2a}
 image create photo image2a
diff --git a/library/demos/items.tcl b/library/demos/items.tcl
index c3e14c1..545877c 100644
--- a/library/demos/items.tcl
+++ b/library/demos/items.tcl
@@ -17,7 +17,7 @@ wm iconname $w "Items"
 positionWindow $w
 set c $w.frame.c
 
-label $w.msg -font $font -wraplength 5i -justify left -text "This window contains a canvas widget with examples of the various kinds of items supported by canvases.  The following operations are supported:\n  Button-1 drag:\tmoves item under pointer.\n  Button-2 drag:\trepositions view.\n  Button-3 drag:\tstrokes out area.\n  Ctrl+f:\t\tprints items under area."
+label $w.msg -font $font -wraplength 5i -justify left -text "This window contains a canvas widget with examples of the various kinds of items supported by canvases.  The following operations are supported:\n  Left-Button drag:\tmoves item under pointer.\n  Middle-Button drag:\trepositions view.\n  Right-Button drag:\tstrokes out area.\n  Ctrl+f:\t\tprints items under area."
 pack $w.msg -side top
 
 ## See Code / Dismiss buttons
@@ -171,14 +171,21 @@ $c create text 28.5c 17.4c -text Scale: -anchor s
 
 # Set up event bindings for canvas:
 
-$c bind item <Any-Enter> "itemEnter $c"
-$c bind item <Any-Leave> "itemLeave $c"
-bind $c <2> "$c scan mark %x %y"
-bind $c <B2-Motion> "$c scan dragto %x %y"
-bind $c <3> "itemMark $c %x %y"
-bind $c <B3-Motion> "itemStroke $c %x %y"
+$c bind item <Enter> "itemEnter $c"
+$c bind item <Leave> "itemLeave $c"
+if {[tk windowingsystem] eq "aqua"} {
+    bind $c <Button-2> "itemMark $c %x %y"
+    bind $c <B2-Motion> "itemStroke $c %x %y"
+    bind $c <Button-3> "$c scan mark %x %y"
+    bind $c <B3-Motion> "$c scan dragto %x %y"
+} else {
+    bind $c <Button-2> "$c scan mark %x %y"
+    bind $c <B2-Motion> "$c scan dragto %x %y"
+    bind $c <Button-3> "itemMark $c %x %y"
+    bind $c <B3-Motion> "itemStroke $c %x %y"
+}
 bind $c <<NextChar>> "itemsUnderArea $c"
-bind $c <1> "itemStartDrag $c %x %y"
+bind $c <Button-1> "itemStartDrag $c %x %y"
 bind $c <B1-Motion> "itemDrag $c %x %y"
 
 # Utility procedures for highlighting the item under the pointer:
diff --git a/library/demos/ixset b/library/demos/ixset
index 7cc35aa..85664d9 100644
--- a/library/demos/ixset
+++ b/library/demos/ixset
@@ -197,7 +197,7 @@ proc createwindows {} {
 
     bind . <Return> {.buttons.ok   flash; .buttons.ok   invoke}
     bind . <Escape> {.buttons.quit flash; .buttons.quit invoke}
-    bind . <1> {
+    bind . <Button-1> {
 	if {![string match .buttons* %W]} {
 	    .buttons.apply  configure -state normal
 	    .buttons.cancel configure -state normal
diff --git a/library/demos/pendulum.tcl b/library/demos/pendulum.tcl
index 6422c67..9833e8f 100644
--- a/library/demos/pendulum.tcl
+++ b/library/demos/pendulum.tcl
@@ -113,7 +113,7 @@ bind $w.c <Destroy> {
     after cancel $animationCallbacks(pendulum)
     unset animationCallbacks(pendulum)
 }
-bind $w.c <1> {
+bind $w.c <Button-1> {
     after cancel $animationCallbacks(pendulum)
     showPendulum %W at %x %y
 }
diff --git a/library/demos/plot.tcl b/library/demos/plot.tcl
index e7f0361..453b7a6 100644
--- a/library/demos/plot.tcl
+++ b/library/demos/plot.tcl
@@ -55,9 +55,9 @@ foreach point {
     $c addtag point withtag $item
 }
 
-$c bind point <Any-Enter> "$c itemconfig current -fill red"
-$c bind point <Any-Leave> "$c itemconfig current -fill SkyBlue2"
-$c bind point <1> "plotDown $c %x %y"
+$c bind point <Enter> "$c itemconfig current -fill red"
+$c bind point <Leave> "$c itemconfig current -fill SkyBlue2"
+$c bind point <Button-1> "plotDown $c %x %y"
 $c bind point <ButtonRelease-1> "$c dtag selected"
 bind $c <B1-Motion> "plotMove $c %x %y"
 
diff --git a/library/demos/ruler.tcl b/library/demos/ruler.tcl
index f7bc37b..0b78370 100644
--- a/library/demos/ruler.tcl
+++ b/library/demos/ruler.tcl
@@ -77,10 +77,10 @@ $c addtag well withtag [$c create rect 13.2c 1c 13.8c 0.5c \
 $c addtag well withtag [rulerMkTab $c [winfo pixels $c 13.5c] \
 	[winfo pixels $c .65c]]
 
-$c bind well <1> "rulerNewTab $c %x %y"
-$c bind tab <1> "rulerSelectTab $c %x %y"
+$c bind well <Button-1> "rulerNewTab $c %x %y"
+$c bind tab <Button-1> "rulerSelectTab $c %x %y"
 bind $c <B1-Motion> "rulerMoveTab $c %x %y"
-bind $c <Any-ButtonRelease-1> "rulerReleaseTab $c"
+bind $c <ButtonRelease-1> "rulerReleaseTab $c"
 
 # rulerNewTab --
 # Does all the work of creating a tab stop, including creating the
diff --git a/library/demos/square b/library/demos/square
index 6ce91b8..9f200ba 100644
--- a/library/demos/square
+++ b/library/demos/square
@@ -18,7 +18,7 @@ square .s
 pack .s -expand yes -fill both
 wm minsize . 1 1
 
-bind .s <1> {center %x %y}
+bind .s <Button-1> {center %x %y}
 bind .s <B1-Motion> {center %x %y}
 bind .s a animate
 focus .s
diff --git a/library/demos/tcolor b/library/demos/tcolor
index d8067cc..0aa133b 100644
--- a/library/demos/tcolor
+++ b/library/demos/tcolor
@@ -90,7 +90,7 @@ foreach i {
     grid columnconfigure . 0 -weight 1
     listbox .names.lb -width 20 -height 12 -yscrollcommand ".names.s set" \
 	-exportselection false
-    bind .names.lb <Double-1> {
+    bind .names.lb <Double-Button-1> {
 	    tc_loadNamedColor [.names.lb get [.names.lb curselection]]
     }
     scrollbar .names.s -orient vertical -command ".names.lb yview"
diff --git a/library/demos/twind.tcl b/library/demos/twind.tcl
index 45d1da8..74f11eb 100644
--- a/library/demos/twind.tcl
+++ b/library/demos/twind.tcl
@@ -265,9 +265,9 @@ proc createPlot {t} {
 	$c addtag point withtag $item
     }
 
-    $c bind point <Any-Enter> "$c itemconfig current -fill red"
-    $c bind point <Any-Leave> "$c itemconfig current -fill SkyBlue2"
-    $c bind point <1> "embPlotDown $c %x %y"
+    $c bind point <Enter> "$c itemconfig current -fill red"
+    $c bind point <Leave> "$c itemconfig current -fill SkyBlue2"
+    $c bind point <Button-1> "embPlotDown $c %x %y"
     $c bind point <ButtonRelease-1> "$c dtag selected"
     bind $c <B1-Motion> "embPlotMove $c %x %y"
     return $c
-- 
cgit v0.12


From 57354234e74f25a654c0ff2eaa75cf88677ce88f Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Mon, 21 Sep 2020 16:24:46 +0000
Subject: Remove an unused variable and an unnecessary include directive.

---
 macosx/tkMacOSXInit.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index d77da23..0eed316 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -14,8 +14,6 @@
  */
 
 #include "tkMacOSXPrivate.h"
-
-#include <sys/stat.h>
 #include <dlfcn.h>
 #include <objc/objc-auto.h>
 
@@ -283,7 +281,6 @@ TkpInit(
      */
 
     if (!initialized) {
-	struct stat st;
 	Bool shouldOpenConsole = NO;
 
 	/*
-- 
cgit v0.12


From d2fd6862ea162c34c2c597bcf0bee2a5dd5ed2d0 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 21 Sep 2020 18:47:04 +0000
Subject: Fix [6ecae50f5c]: menu-16.3 fails

---
 generic/tkMenu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/generic/tkMenu.c b/generic/tkMenu.c
index 6f36d7e..0a297a6 100644
--- a/generic/tkMenu.c
+++ b/generic/tkMenu.c
@@ -2128,7 +2128,8 @@ GetMenuIndex(
     const char *string;
 
     if (TkGetIntForIndex(objPtr, menuPtr->numEntries - 1, lastOK, indexPtr) == TCL_OK) {
-	if (*indexPtr != TCL_INDEX_NONE || menuPtr->numEntries == 0) {
+	/* TCL_INDEX_NONE is only accepted if it does not result from a negative number */
+	if (*indexPtr != TCL_INDEX_NONE || Tcl_GetString(objPtr)[0] != '-') {
 	    if (*indexPtr >= menuPtr->numEntries) {
 		*indexPtr = menuPtr->numEntries - ((lastOK) ? 0 : 1);
 	    }
-- 
cgit v0.12


From 2ddbd6c1ba118d38fc027b6f0b6e7a495cbe4bef Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Mon, 21 Sep 2020 19:54:53 +0000
Subject: Add test imgSVGnano-5.1 guarding against regression regarding ticket
 [ea665e08f3]

---
 tests/imgSVGnano.test | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tests/imgSVGnano.test b/tests/imgSVGnano.test
index df827b2..3bee035 100644
--- a/tests/imgSVGnano.test
+++ b/tests/imgSVGnano.test
@@ -222,6 +222,19 @@ test imgSVGnano-5.0 {image without any of  "width", "height" and "viewbox"} -bod
     rename foo ""
 } -result {foo}
 
+test imgSVGnano-5.1 {bug ea665e08f3 - too many values in parameters of the transform attribute} -body {
+    # shall not loop endlessly
+    image create photo foo -data\
+			{<?xml version="1.0"?><!DOCTYPE svg PUBLIC\
+			"-//W3C//DTD SVG 1.0//EN\"\
+			"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\
+			<svg xmlns="http://www.w3.org/2000/svg">\
+			<circle cx="6.5cm" cy="2cm" r="100" transform="skewX(1 1)"/>\
+			</g></svg>}
+} -cleanup {
+    rename foo ""
+} -result {foo}
+
 };# end of namespace svgnano
 
 namespace delete svgnano
-- 
cgit v0.12


From 65572b6aec4b3b2c81e579d3efd302ec7982ea56 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 22 Sep 2020 14:06:35 +0000
Subject: Experiment: See if we can have a Travis build fail when a test-case
 fails

---
 .travis.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index cd5085e..5646bf7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,12 @@ jobs:
       script: &x11gui
         - make binaries libraries tktest
         - make install
-        - make test
+        - make test-classic "-file color.test" >out-classic.txt
+        - cat out-classic.txt
+        - grep -q "Failed\t0" out-classic.txt
+        - make test-ttk "-file entry.test" >out-ttk.txt
+        - cat out-ttk.txt
+        - grep -q "Failed\t0" out-ttk.txt
     - name: "Linux/GCC/Shared/no-xft"
       os: linux
       dist: focal
-- 
cgit v0.12


From 4a021085fc056a549067c6b2370a1910be133fd7 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 22 Sep 2020 15:43:06 +0000
Subject: re-generate unix/configure

---
 unix/configure | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/unix/configure b/unix/configure
index 13c36a9..c535fe8 100755
--- a/unix/configure
+++ b/unix/configure
@@ -663,6 +663,9 @@ TK_MAJOR_VERSION
 TK_VERSION
 TK_DEMO_DIR
 DEMO_DIR
+UNIX_LIBNOTIFY_OBJS
+LIBNOTIFY_LIBS
+LIBNOTIFY_CFLAGS
 UNIX_FONT_OBJS
 XFT_LIBS
 XFT_CFLAGS
@@ -778,6 +781,7 @@ enable_symbols
 enable_aqua
 with_x
 enable_xft
+enable_libnotify
 enable_xss
 enable_framework
 '
@@ -1421,6 +1425,7 @@ Optional Features:
   --enable-symbols        build with debugging symbols (default: off)
   --enable-aqua=yes|no    use Aqua windowingsystem on Mac OS X (default: no)
   --enable-xft            use freetype/fontconfig/xft (default: on)
+  --enable-libnotify      use libnotify (default: on)
   --enable-xss            use XScreenSaver for activity timer (default: on)
   --enable-framework      package shared libraries in MacOSX frameworks
                           (default: off)
@@ -7817,6 +7822,50 @@ $as_echo "#define HAVE_XFT 1" >>confdefs.h
 fi
 
 #--------------------------------------------------------------------
+#	Check for libnotify.
+#--------------------------------------------------------------------
+
+if test $tk_aqua = no; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use libnotify" >&5
+$as_echo_n "checking whether to use libnotify... " >&6; }
+    # Check whether --enable-libnotify was given.
+if test "${enable_libnotify+set}" = set; then :
+  enableval=$enable_libnotify; enable_libnotify=$enableval
+else
+  enable_libfnotify="default"
+fi
+
+    LIBNOTIFY_CFLAGS=""
+    LIBNOTIFY_LIBS=""
+    if test "$enable_libnotify" = "no" ; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_libnotify" >&5
+$as_echo "$enable_libnotify" >&6; }
+    else
+	found_libnotify="yes"
+		LIBNOTIFY_CFLAGS=`pkg-config --cflags libnotify 2>/dev/null` || found_libnotify="no"
+	LIBNOTIFY_LIBS=`pkg-config --libs libnotify 2>/dev/null` || found_libnotify="no"
+	if test "$found_libnotify" = "no" ; then
+	    found_libnotify=yes
+	    LIBNOTIFY_CFLAGS=`pkg-config --cflags libnotify 2>/dev/null` || found_libnotify="no"
+	    LIBNOTIFY_LIBS=`pkg-config --libs libnotify 2>/dev/null` || found_libnotify="no"
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_libnotify" >&5
+$as_echo "$found_libnotify" >&6; }
+    fi
+    if test $enable_libnotify = "yes" ; then
+	UNIX_LIBNOTIFY_OBJS=tkUnixSysNotify.o
+
+$as_echo "#define HAVE_LIBNOTIFY 1" >>confdefs.h
+
+    else
+	UNIX_LIBNOTIFY_OBJS=""
+    fi
+
+
+
+fi
+
+#--------------------------------------------------------------------
 # XXX Do this last.
 # It might modify XLIBSW which could affect other tests.
 #
-- 
cgit v0.12


From 5a024656faa09acb77aa34603e41b1cd5e38fbe5 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Tue, 22 Sep 2020 19:53:41 +0000
Subject: Fix [aa4be2c1b8]: Aqua test suite hangs.

---
 macosx/tkMacOSXInit.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index 0eed316..bda5f46 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -16,6 +16,7 @@
 #include "tkMacOSXPrivate.h"
 #include <dlfcn.h>
 #include <objc/objc-auto.h>
+#include <sys/stat.h>
 
 static char tkLibPath[PATH_MAX + 1] = "";
 
@@ -281,7 +282,10 @@ TkpInit(
      */
 
     if (!initialized) {
+	struct stat st;
 	Bool shouldOpenConsole = NO;
+        Bool stdinIsNullish = (!isatty(0) &&
+	    (fstat(0, &st) || (S_ISCHR(st.st_mode) && st.st_blocks == 0)));
 
 	/*
 	 * Initialize/check OS version variable for runtime checks.
@@ -371,7 +375,7 @@ TkpInit(
 
 	if (getenv("TK_CONSOLE")) {
 	    shouldOpenConsole = YES;
-	} else if (!isatty(0) && Tcl_GetStartupScript(NULL) == NULL) {
+	} else if (stdinIsNullish && Tcl_GetStartupScript(NULL) == NULL) {
 	    const char *intvar = Tcl_GetVar2(interp, "tcl_interactive",
 					     NULL, TCL_GLOBAL_ONLY);
 	    if (intvar == NULL) {
@@ -388,7 +392,7 @@ TkpInit(
 	    if (Tk_CreateConsoleWindow(interp) == TCL_ERROR) {
 		return TCL_ERROR;
 	    }
-	} else if (!isatty(0)) {
+	} else if (stdinIsNullish) {
 
 	    /*
 	     * When launched as a macOS application with no console,
-- 
cgit v0.12


From ae1b79d466c7d533c3bb7722d7e19860461055fa Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 23 Sep 2020 09:33:54 +0000
Subject: Add TESTFLAGS= part

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5646bf7..3699bbb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,10 +31,10 @@ jobs:
       script: &x11gui
         - make binaries libraries tktest
         - make install
-        - make test-classic "-file color.test" >out-classic.txt
+        - make test-classic TESTFLAGS="-file color.test" >out-classic.txt
         - cat out-classic.txt
         - grep -q "Failed\t0" out-classic.txt
-        - make test-ttk "-file entry.test" >out-ttk.txt
+        - make test-ttk >out-ttk.txt
         - cat out-ttk.txt
         - grep -q "Failed\t0" out-ttk.txt
     - name: "Linux/GCC/Shared/no-xft"
-- 
cgit v0.12


From 88a38acd049b4cef382444545c2e48764f4a43e3 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 23 Sep 2020 10:33:56 +0000
Subject: Mark many testcases with "failsOnUbuntu" (Not all, I still want to
 see the remainings failing)

---
 .travis.yml          |  6 +++---
 tests/bitmap.test    |  4 +++-
 tests/border.test    |  4 +++-
 tests/canvText.test  |  1 +
 tests/cursor.test    |  4 +++-
 tests/focus.test     |  4 +++-
 tests/font.test      | 20 +++++++++++---------
 tests/pack.test      |  6 ++++--
 tests/place.test     |  5 +++--
 tests/safe.test      | 14 +++-----------
 tests/scrollbar.test | 12 +++++++-----
 tests/textDisp.test  |  4 +++-
 tests/textWind.test  |  4 +++-
 tests/unixFont.test  | 30 ++++++++++++++++--------------
 tests/unixWm.test    | 22 ++++++++++++----------
 tests/winfo.test     |  6 ++++--
 tests/wm.test        | 18 ++++++++++--------
 17 files changed, 92 insertions(+), 72 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3699bbb..0ac80ca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,12 +31,12 @@ jobs:
       script: &x11gui
         - make binaries libraries tktest
         - make install
-        - make test-classic TESTFLAGS="-file color.test" >out-classic.txt
-        - cat out-classic.txt
-        - grep -q "Failed\t0" out-classic.txt
         - make test-ttk >out-ttk.txt
         - cat out-ttk.txt
         - grep -q "Failed\t0" out-ttk.txt
+        - make test-classic >out-classic.txt
+        - cat out-classic.txt
+        - grep -q "Failed\t0" out-classic.txt
     - name: "Linux/GCC/Shared/no-xft"
       os: linux
       dist: focal
diff --git a/tests/bitmap.test b/tests/bitmap.test
index 05086c3..b0f0503 100644
--- a/tests/bitmap.test
+++ b/tests/bitmap.test
@@ -10,6 +10,8 @@ package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+
 test bitmap-1.1 {Tk_AllocBitmapFromObj - converting internal reps} testbitmap {
     set x gray25
     lindex $x 0
@@ -64,7 +66,7 @@ test bitmap-3.1 {Tk_FreeBitmapFromObj - reference counts} testbitmap {
     lappend result [testbitmap questhead]
 } {{{3 1}} {{2 1}} {{1 1}} {}}
 
-test bitmap-4.1 {FreeBitmapObjProc} testbitmap {
+test bitmap-4.1 {FreeBitmapObjProc} {testbitmap failsOnUbuntu} {
     destroy .b
     set x [format questhead]
     button .b -bitmap $x
diff --git a/tests/border.test b/tests/border.test
index 5b2155d..7899cd9 100644
--- a/tests/border.test
+++ b/tests/border.test
@@ -14,6 +14,8 @@ if {[testConstraint pseudocolor8]} {
     wm geom .t +0+0
 }
 
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+
 test border-1.1 {Tk_AllocBorderFromObj - converting internal reps} testborder {
     set x orange
     lindex $x 0
@@ -102,7 +104,7 @@ test border-3.4 {Tk_Free3DBorder - unlinking from list} {pseudocolor8 testborder
     lappend result [testborder purple]
 } {{{4 1} {3 0} {2 0} {1 0}} {{4 1} {2 0} {1 0}} {{4 1} {2 0}} {{2 0}} {}}
 
-test border-4.1 {FreeBorderObjProc} testborder {
+test border-4.1 {FreeBorderObjProc} {testborder failsOnUbuntu} {
     destroy .b
     set x [format purple]
     button .b -bg $x -text .b1
diff --git a/tests/canvText.test b/tests/canvText.test
index 7608f86..f79e6df 100644
--- a/tests/canvText.test
+++ b/tests/canvText.test
@@ -21,6 +21,7 @@ set font "-adobe-times-medium-r-normal--*-200-*-*-*-*-*-*"
 set ay [font metrics $font -linespace]
 set ax [font measure $font 0]
 
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
 
 foreach test {
     {-anchor nw nw xyz {bad anchor position "xyz": must be n, ne, e, se, s, sw, w, nw, or center}}
diff --git a/tests/cursor.test b/tests/cursor.test
index 02ad78c..2a1d274 100644
--- a/tests/cursor.test
+++ b/tests/cursor.test
@@ -10,6 +10,8 @@ package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+
 test cursor-1.1 {Tk_AllocCursorFromObj - converting internal reps} {testcursor} {
     set x watch
     lindex $x 0
@@ -105,7 +107,7 @@ test cursor-3.1 {Tk_FreeCursorFromObj - reference counts} {testcursor} {
     lappend result [testcursor heart]
 } {{{3 1}} {{2 1}} {{1 1}} {}}
 
-test cursor-4.1 {FreeCursorObjProc} {testcursor} {
+test cursor-4.1 {FreeCursorObjProc} {testcursor failsOnUbuntu} {
     destroy .b
     set x [format heart]
     button .b -cursor $x
diff --git a/tests/focus.test b/tests/focus.test
index eee0ee6..62e00c8 100644
--- a/tests/focus.test
+++ b/tests/focus.test
@@ -13,6 +13,8 @@ tcltest::loadTestedCommands
 button .b -text .b -relief raised -bd 2
 pack .b
 
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+
 proc focusSetup {} {
     catch {destroy .t}
     toplevel .t
@@ -511,7 +513,7 @@ test focus-4.4 {TkFocusDeadWindow procedure} {unix testwrapper} {
 
 setupbg
 test focus-5.1 {ChangeXFocus procedure, don't take focus unless have it} \
-	{unix testwrapper secureserver} {
+	{unix testwrapper secureserver failsOnUbuntu} {
     focusSetup
     focus -force .t
     update
diff --git a/tests/font.test b/tests/font.test
index 6175b32..c3f6413 100644
--- a/tests/font.test
+++ b/tests/font.test
@@ -17,6 +17,8 @@ update idletasks
 
 set defaultfontlist [font names]
 
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+
 proc getnondefaultfonts {} {
     global defaultfontlist
     set nondeffonts [list ]
@@ -154,7 +156,7 @@ test font-4.8 {font command: actual: all attributes} {
     # not (objc > 3) so objPtr = NULL
     lindex [font actual {-family times}] 0
 } {-family}
-test font-4.9 {font command: actual} {unix noExceed} {
+test font-4.9 {font command: actual} {unix noExceed failsOnUbuntu} {
     # (objc > 3) so objPtr = objv[3 + skip]
     string tolower [font actual {-family times} -family]
 } {times}
@@ -318,7 +320,7 @@ test font-8.3 {font command: families: arguments} {
     # (objc - skip != 2) when skip == 2
     list [catch {font families -displayof . xyz} msg] $msg
 } {1 {wrong # args: should be "font families ?-displayof window?"}}
-test font-8.4 {font command: families} {
+test font-8.4 {font command: families} failsOnUbuntu {
     # TkpGetFontFamilies()
     regexp -nocase times [font families]
 } {1}
@@ -339,7 +341,7 @@ test font-9.4 {font command: measure: arguments} {noExceed} {
     # (tkfont == NULL)
     list [catch {font measure "\{xyz" abc} msg] $msg
 } [list 1 "font \"{xyz\" doesn't exist"]
-test font-9.5 {font command: measure} {
+test font-9.5 {font command: measure} failsOnUbuntu {
     # Tk_TextWidth()
     expr [font measure $fixed "abcdefg"]==[font measure $fixed "a"]*7
 } {1}
@@ -388,7 +390,7 @@ test font-10.8 {font command: metrics: bad metric} {
     # (Tcl_GetIndexFromObj() != TCL_OK)
     list [catch {font metrics $fixed -xyz} msg] $msg
 } {1 {bad metric "-xyz": must be -ascent, -descent, -linespace, or -fixed}}
-test font-10.9 {font command: metrics: get individual metrics} {
+test font-10.9 {font command: metrics: get individual metrics} failsOnUbuntu {
     font metrics $fixed -ascent
     font metrics $fixed -descent
     font metrics $fixed -linespace
@@ -628,7 +630,7 @@ test font-17.6 {Tk_FreeFont procedure: named font not deleted yet} {
     list [lindex [font actual xyz] 0] [lindex $x 0]
 } {-family -family}
 
-test font-18.1 {FreeFontObjProc} testfont {
+test font-18.1 {FreeFontObjProc} {testfont failsOnUbuntu} {
     destroy .b1
     set x [format {Courier 12}]
     button .b1 -font $x
@@ -696,7 +698,7 @@ test font-21.8 {Tk_PostscriptFontName procedure: spaces} unix {
 	set x {LucidaBright}
     }
 } {LucidaBright}
-test font-21.9 {Tk_PostscriptFontName procedure: spaces} unix {
+test font-21.9 {Tk_PostscriptFontName procedure: spaces} {unix failsOnUbuntu} {
     psfontname "{new century schoolbook} 10"
 } {NewCenturySchlbk-Roman}
 set i 10
@@ -795,7 +797,7 @@ test font-24.4 {Tk_ComputeTextLayout: calls Tk_MeasureChars} {
     .b.l config -text "000\n000"
     getsize
 } "[expr $ax*3] [expr $ay*2]"
-test font-24.5 {Tk_ComputeTextLayout: break line} {
+test font-24.5 {Tk_ComputeTextLayout: break line} failsOnUbuntu {
     .b.l config -text "000\t00000" -wrap [expr 9*$ax]
     set x [getsize]
     .b.l config -wrap 0
@@ -1110,7 +1112,7 @@ test font-31.6 {Tk_IntersectTextLayout procedure: ignore spaces at eol} {
     set x
 } {}
 
-test font-32.1 {Tk_TextLayoutToPostscript: ensure buffer doesn't overflow} {
+test font-32.1 {Tk_TextLayoutToPostscript: ensure buffer doesn't overflow} failsOnUbuntu {
     # If there were a whole bunch of returns or tabs in a row, then the
     # temporary buffer could overflow and write on the stack.
 
@@ -1346,7 +1348,7 @@ test font-43.1 {FieldSpecified procedure: specified vs. non-specified} {
 
 set oldscale [tk scaling]
 tk scaling 0.5
-test font-44.1 {TkFontGetPixels: size < 0} {
+test font-44.1 {TkFontGetPixels: size < 0} failsOnUbuntu {
     font actual {times -12} -size
 } {24}
 test font-44.2 {TkFontGetPoints: size >= 0} {noExceed} {
diff --git a/tests/pack.test b/tests/pack.test
index 83525a1..a71fe7b 100644
--- a/tests/pack.test
+++ b/tests/pack.test
@@ -10,6 +10,8 @@ package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+
 # Utility procedures:
 
 proc pack1 {args} {
@@ -1011,7 +1013,7 @@ test pack-17.1 {PackLostSlaveProc procedure} {
 	[catch {pack info .pack.a} msg] $msg
 } {place 20x40+40+10 1 {window ".pack.a" isn't packed}}
 
-test pack-18.1 {unmap slaves when master unmapped} {tempNotPc} {
+test pack-18.1 {unmap slaves when master unmapped} {tempNotPc failsOnUbuntu} {
 
     # adjust the position of .pack before test to avoid a screen switch
     # that occurs with window managers that have desktops four times as big
@@ -1039,7 +1041,7 @@ test pack-18.1 {unmap slaves when master unmapped} {tempNotPc} {
     update
     lappend result [winfo ismapped .pack.a]
 } {1 0 200 75 0 1}
-test pack-18.2 {unmap slaves when master unmapped} {
+test pack-18.2 {unmap slaves when master unmapped} failsOnUbuntu {
 
     # adjust the position of .pack before test to avoid a screen switch
     # that occurs with window managers that have desktops four times as big
diff --git a/tests/place.test b/tests/place.test
index cc37e48..e8419ea 100644
--- a/tests/place.test
+++ b/tests/place.test
@@ -11,6 +11,7 @@ tcltest::loadTestedCommands
 
 # Used for constraining memory leak tests
 testConstraint memory [llength [info commands memory]]
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
 
 # XXX - This test file is woefully incomplete.  At present, only a
 # few of the features are tested.
@@ -197,7 +198,7 @@ test place-7.10 {ReconfigurePlacement procedure, computing size} {
 } {30 60}
 
 
-test place-8.1 {MasterStructureProc, mapping and unmapping slaves} {
+test place-8.1 {MasterStructureProc, mapping and unmapping slaves} failsOnUbuntu {
     place forget .t.f2
     place forget .t.f
     place .t.f2 -relx 1.0 -rely 1.0 -anchor sw
@@ -213,7 +214,7 @@ test place-8.1 {MasterStructureProc, mapping and unmapping slaves} {
     update
     lappend result [winfo ismapped .t.f2]
 } {1 0 40 30 0 1}
-test place-8.2 {MasterStructureProc, mapping and unmapping slaves} {
+test place-8.2 {MasterStructureProc, mapping and unmapping slaves} failsOnUbuntu {
     place forget .t.f2
     place forget .t.f
     place .t.f -x 0 -y 0 -width 200 -height 100
diff --git a/tests/safe.test b/tests/safe.test
index 9e502ce..432bc01 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -30,14 +30,6 @@ tcltest::loadTestedCommands
 ## Ensure that any changes that occured to tk.tcl will work or
 ## are properly prevented in a safe interpreter.  -- hobbs
 
-# The set of hidden commands is platform dependent:
-
-if {[string equal $tcl_platform(platform) "windows"]} {
-    set hidden_cmds {bell cd clipboard encoding exec exit fconfigure file glob grab load menu open pwd selection socket source tk_chooseColor tk_chooseDirectory tk_getOpenFile tk_getSaveFile tk_messageBox toplevel unload wm}
-} else {
-    set hidden_cmds {bell cd clipboard encoding exec exit fconfigure file glob grab load menu open pwd selection send socket source toplevel unload wm}
-}
-
 set saveAutoPath $::auto_path
 set auto_path [list [info library] $::tk_library]
 
@@ -48,14 +40,14 @@ test safe-1.1 {Safe Tk loading into an interpreter} {
     set x {}
     set x
 } ""
-test safe-1.2 {Safe Tk loading into an interpreter} {
+test safe-1.2 {Safe Tk loading into an interpreter} -body {
     catch {safe::interpDelete a}
     safe::interpCreate a
     safe::loadTk a
     set l [lsort [interp hidden a]]
     safe::interpDelete a
     set l
-} $hidden_cmds
+} -match glob -result {bell cd clipboard encoding exec exit fconfigure*glob grab load menu open pwd selection send socket source*toplevel unload wm}
 test safe-1.3 {Safe Tk loading into an interpreter} -body {
     catch {safe::interpDelete a}
     safe::interpCreate a
@@ -63,7 +55,7 @@ test safe-1.3 {Safe Tk loading into an interpreter} -body {
     set l [lsort [interp aliases a]]
     safe::interpDelete a
     set l
-} -match glob -result {*encoding*exit*file*load*source*}
+} -match glob -result {*encoding*exit*load*source*}
 
 test safe-2.1 {Unsafe commands not available} {
     catch {safe::interpDelete a}
diff --git a/tests/scrollbar.test b/tests/scrollbar.test
index 6920228..8b631fa 100644
--- a/tests/scrollbar.test
+++ b/tests/scrollbar.test
@@ -38,6 +38,8 @@ proc getTroughSize {w} {
     }
 }
 
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+
 # XXX Note: this test file is woefully incomplete.  Right now there are
 # only bits and pieces of tests.  Please make this file more complete
 # as you fix bugs and add features.
@@ -255,13 +257,13 @@ test scrollbar-3.35 {ScrollbarWidgetCmd procedure, "fraction" option} {
     format {%.6g} [.s fraction 4 21]
 } [format %.6g [expr (21.0 - ([winfo height .s] - [getTroughSize .s])/2.0) \
        /([getTroughSize .s] - 1)]]
-test scrollbar-3.36 {ScrollbarWidgetCmd procedure, "fraction" option} unix {
+test scrollbar-3.36 {ScrollbarWidgetCmd procedure, "fraction" option} {unix failsOnUbuntu} {
     format {%.6g} [.s fraction 4 179]
 } {1}
 test scrollbar-3.37 {ScrollbarWidgetCmd procedure, "fraction" option} {testmetrics} {
     format {%.6g} [.s fraction 4 [expr 200 - [testmetrics cyvscroll .s]]]
 } {1}
-test scrollbar-3.38 {ScrollbarWidgetCmd procedure, "fraction" option} unix {
+test scrollbar-3.38 {ScrollbarWidgetCmd procedure, "fraction" option} {unix failsOnUbuntu} {
     format {%.6g} [.s fraction 4 178]
 } {0.993711}
 test scrollbar-3.39 {ScrollbarWidgetCmd procedure, "fraction" option} {testmetrics win} {
@@ -458,7 +460,7 @@ test scrollbar-6.10 {ScrollbarPosition procedure} {
 test scrollbar-6.11 {ScrollbarPosition procedure} unix {
     .s identify 8 4
 } {arrow1}
-test scrollbar-6.12 {ScrollbarPosition procedure} unix {
+test scrollbar-6.12 {ScrollbarPosition procedure} {unix failsOnUbuntu} {
     .s identify 8 19
 } {arrow1}
 test scrollbar-6.14 {ScrollbarPosition procedure} win {
@@ -516,7 +518,7 @@ test scrollbar-6.28 {ScrollbarPosition procedure} {testmetrics win} {
     .s identify [expr [winfo width .s] / 2] [expr [winfo height .s] \
 						 - [testmetrics cyvscroll .s] - 1]
 } {trough2}
-test scrollbar-6.29 {ScrollbarPosition procedure} unix {
+test scrollbar-6.29 {ScrollbarPosition procedure} {unix failsOnUbuntu} {
     .s identify 8 180
 } {arrow2}
 test scrollbar-6.30 {ScrollbarPosition procedure} unix {
@@ -532,7 +534,7 @@ test scrollbar-6.33 {ScrollbarPosition procedure} win {
 test scrollbar-6.34 {ScrollbarPosition procedure} unix {
     .s identify 4 100
 } {trough2}
-test scrollbar-6.35 {ScrollbarPosition procedure} unix {
+test scrollbar-6.35 {ScrollbarPosition procedure} {unix failsOnUbuntu} {
     .s identify 18 100
 } {trough2}
 test scrollbar-6.37 {ScrollbarPosition procedure} win {
diff --git a/tests/textDisp.test b/tests/textDisp.test
index aed22c1..8d130ae 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -79,6 +79,8 @@ wm positionfrom . user
 wm deiconify .
 update
 
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+
 # Some window managers (like olwm under SunOS 4.1.3) misbehave in a way
 # that tends to march windows off the top and left of the screen.  If
 # this happens, some tests will fail because parts of the window will
@@ -2512,7 +2514,7 @@ test textDisp-19.7 {GetYView procedure} {
     update; after 1; update
     set x $scrollInfo
 } {0.125 0.75}
-test textDisp-19.8 {GetYView procedure} {
+test textDisp-19.8 {GetYView procedure} failsOnUbuntu {
     .t configure -wrap char
     .t delete 1.0 end
     .t insert 1.0 "Line 1"
diff --git a/tests/textWind.test b/tests/textWind.test
index 6eb9b0f..c665006 100644
--- a/tests/textWind.test
+++ b/tests/textWind.test
@@ -45,6 +45,8 @@ wm minsize . 1 1
 wm positionfrom . user
 wm deiconify .
 
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+
 test textWind-1.1 {basic tests of options} {fonts} {
     .t delete 1.0 end
     .t insert end "This is the first line"
@@ -493,7 +495,7 @@ test textWind-10.6 {EmbWinLayoutProc procedure, error in creating window} {textf
     update
     lappend msg [.t bbox 1.5]
 } [list {{can't embed .t2 relative to .t}} {{window name "t2" already exists in parent}} [list 40 [expr {11+$fixedDiff/2}] 0 0]]
-test textWind-10.6.1 {EmbWinLayoutProc procedure, error in creating window} {
+test textWind-10.6.1 {EmbWinLayoutProc procedure, error in creating window} failsOnUbuntu {
     .t delete 1.0 end
     .t insert 1.0 "Some sample text"
     catch {destroy .t2}
diff --git a/tests/unixFont.test b/tests/unixFont.test
index 440fdc5..8129279 100644
--- a/tests/unixFont.test
+++ b/tests/unixFont.test
@@ -45,6 +45,8 @@ toplevel .b
 wm geom .b +0+0
 update idletasks
 
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+
 # Font should be fixed width and have chars missing below char 32, so can
 # test control char expansion and missing character code.
 
@@ -69,7 +71,7 @@ proc getsize {} {
 test unixfont-1.1 {TkpGetNativeFont procedure: not native} {unix noExceed} {
     list [catch {font measure {} xyz} msg] $msg
 } {1 {font "" doesn't exist}}
-test unixfont-1.2 {TkpGetNativeFont procedure: native} unix {
+test unixfont-1.2 {TkpGetNativeFont procedure: native} {unix failsOnUbuntu} {
     font measure fixed 0
 } {6}
 
@@ -78,21 +80,21 @@ test unixfont-2.1 {TkpGetFontFromAttributes procedure: no family} unix {
     set x {}
 } {}
 test unixfont-2.2 {TkpGetFontFromAttributes procedure: Times relatives} \
-	{unix noExceed hasTimesNew} {
+	{unix noExceed hasTimesNew failsOnUbuntu} {
     set x {}
     lappend x [lindex [font actual {-family "Times New Roman"}] 1]
     lappend x [lindex [font actual {-family "New York"}] 1]
     lappend x [lindex [font actual {-family "Times"}] 1]
 } {times times times}
 test unixfont-2.3 {TkpGetFontFromAttributes procedure: Courier relatives} \
-	{unix noExceed hasCourierNew} {
+	{unix noExceed hasCourierNew failsOnUbuntu} {
     set x {}
     lappend x [lindex [font actual {-family "Courier New"}] 1]
     lappend x [lindex [font actual {-family "Monaco"}] 1]
     lappend x [lindex [font actual {-family "Courier"}] 1]
 } {courier courier courier}
 test unixfont-2.4 {TkpGetFontFromAttributes procedure: Helvetica relatives} \
-	{unix noExceed hasArial} {
+	{unix noExceed hasArial failsOnUbuntu} {
     set x {}
     lappend x [lindex [font actual {-family "Arial"}] 1]
     lappend x [lindex [font actual {-family "Geneva"}] 1]
@@ -102,16 +104,16 @@ test unixfont-2.5 {TkpGetFontFromAttributes procedure: fallback} unix {
     font actual {-xyz-xyz-*-*-*-*-*-*-*-*-*-*-*-*}
     set x {}
 } {}
-test unixfont-2.6 {TkpGetFontFromAttributes: fallback to fixed family} unix {
+test unixfont-2.6 {TkpGetFontFromAttributes: fallback to fixed family} {unix failsOnUbuntu} {
     lindex [font actual {-family fixed -size 10}] 1
 } {fixed}
 test unixfont-2.7 {TkpGetFontFromAttributes: fixed family not available!} unix {
     # no test available
 } {}
-test unixfont-2.8 {TkpGetFontFromAttributes: loop over returned font names} unix {
+test unixfont-2.8 {TkpGetFontFromAttributes: loop over returned font names} {unix failsOnUbuntu} {
     lindex [font actual {-family fixed -size 31}] 1
 } {fixed}
-test unixfont-2.9 {TkpGetFontFromAttributes: reject adobe courier if possible} {unix noExceed} {
+test unixfont-2.9 {TkpGetFontFromAttributes: reject adobe courier if possible} {unix noExceed failsOnUbuntu} {
     lindex [font actual {-family courier}] 1
 } {courier}
 test unixfont-2.10 {TkpGetFontFromAttributes: scalable font found} unix {
@@ -166,11 +168,11 @@ test unixfont-5.7 {Tk_MeasureChars procedure: already saw space in line} unix {
     .b.l config -text "000000     00000"
     getsize
 } "[expr $ax*6] [expr $ay*2]"
-test unixfont-5.8 {Tk_MeasureChars procedure: internal spaces significant} unix {
+test unixfont-5.8 {Tk_MeasureChars procedure: internal spaces significant} {unix failsOnUbuntu} {
     .b.l config -text "00  000     00000"
     getsize
 } "[expr $ax*7] [expr $ay*2]"
-test unixfont-5.9 {Tk_MeasureChars procedure: TK_PARTIAL_OK} unix {
+test unixfont-5.9 {Tk_MeasureChars procedure: TK_PARTIAL_OK} {unix failsOnUbuntu} {
     .b.c dchars $t 0 end
     .b.c insert $t 0 "0000"
     .b.c index $t @[expr int($ax*2.5)],1
@@ -186,7 +188,7 @@ test unixfont-5.11 {Tk_MeasureChars: TK_AT_LEAST_ONE + not even one char fit!} u
     .b.l config -wrap $a
     set x
 } "$ax [expr $ay*6]"
-test unixfont-5.12 {Tk_MeasureChars procedure: include eol spaces} unix {
+test unixfont-5.12 {Tk_MeasureChars procedure: include eol spaces} {unix failsOnUbuntu} {
     .b.l config -text "000   \n000"
     getsize
 } "[expr $ax*6] [expr $ay*2]"
@@ -253,7 +255,7 @@ test unixfont-8.3 {AllocFont procedure: can't parse info from name} unix {
     catch {unset fontArray}
     set result
 } {-family -overstrike -size -slant -underline -weight}
-test unixfont-8.4 {AllocFont procedure: classify characters} unix {
+test unixfont-8.4 {AllocFont procedure: classify characters} {unix failsOnUbuntu} {
     set x 0
     incr x [font measure $courier "\u4000"]   ;# 6
     incr x [font measure $courier "\002"]   ;# 4
@@ -264,7 +266,7 @@ test unixfont-8.4 {AllocFont procedure: classify characters} unix {
 test unixfont-8.5 {AllocFont procedure: setup widths of normal chars} unix {
     font metrics $courier -fixed
 } {1}
-test unixfont-8.6 {AllocFont procedure: setup widths of special chars} unix {
+test unixfont-8.6 {AllocFont procedure: setup widths of special chars} {unix failsOnUbuntu} {
     set x 0
     incr x [font measure $courier "\001"]   ;# 4
     incr x [font measure $courier "\002"]   ;# 4
@@ -292,7 +294,7 @@ test unixfont-8.11 {AllocFont procedure: XA_UNDERLINE_POSITION was 0} unix {
     set x {}
 } {}
 
-test unixfont-9.1 {GetControlCharSubst procedure: 2 chars subst} unix {
+test unixfont-9.1 {GetControlCharSubst procedure: 2 chars subst} {unix failsOnUbuntu} {
     .b.c dchars $t 0 end
     .b.c insert $t 0 "0\a0"
     set x {}
@@ -301,7 +303,7 @@ test unixfont-9.1 {GetControlCharSubst procedure: 2 chars subst} unix {
     lappend x [.b.c index $t @[expr $ax*2],0]
     lappend x [.b.c index $t @[expr $ax*3],0]
 } {0 1 1 2}
-test unixfont-9.2 {GetControlCharSubst procedure: 4 chars subst} unix {
+test unixfont-9.2 {GetControlCharSubst procedure: 4 chars subst} {unix failsOnUbuntu} {
     .b.c dchars $t 0 end
     .b.c insert $t 0 "0\0010"
     set x {}
diff --git a/tests/unixWm.test b/tests/unixWm.test
index d579fc7..7c427ec 100644
--- a/tests/unixWm.test
+++ b/tests/unixWm.test
@@ -13,6 +13,8 @@ tcltest::loadTestedCommands
 
 namespace import -force ::tk::test:loadTkCommand
 
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+
 proc sleep ms {
     global x
     after $ms {set x 1}
@@ -269,7 +271,7 @@ test unixWm-8.3 {icon windows} unix {
     toplevel .t -width 100 -height 30
     list [catch {wm iconwindow .t b c} msg] $msg
 } {1 {wrong # args: should be "wm iconwindow window ?pathName?"}}
-test unixWm-8.4 {icon windows} unix {
+test unixWm-8.4 {icon windows} {unix failsOnUbuntu} {
     destroy .t
     destroy .icon
     toplevel .t -width 100 -height 30
@@ -388,7 +390,7 @@ test unixWm-9.2 {TkWmMapWindow procedure, command property} {unix testwrapper} {
 } {test
 command
 }
-test unixWm-9.3 {TkWmMapWindow procedure, iconic windows} unix {
+test unixWm-9.3 {TkWmMapWindow procedure, iconic windows} {unix failsOnUbuntu} {
     destroy .t
     toplevel .t -width 100 -height 300 -bg blue
     wm geom .t +0+0
@@ -615,7 +617,7 @@ test unixWm-16.2 {Tk_WmCmd procedure, "deiconify" option} unix {
     destroy .icon
     set result
 } {1 {can't deiconify .icon: it is an icon for .t}}
-test unixWm-16.3 {Tk_WmCmd procedure, "deiconify" option} unix {
+test unixWm-16.3 {Tk_WmCmd procedure, "deiconify" option} {unix failsOnUbuntu} {
     wm iconify .t
     set result {}
     lappend result [winfo ismapped .t] [wm state .t]
@@ -828,7 +830,7 @@ test unixWm-23.4 {Tk_WmCmd procedure, "iconify" option} unix {
     destroy .t2
     set result
 } {1 {can't iconify .t2: it is an icon for .t}}
-test unixWm-23.5 {Tk_WmCmd procedure, "iconify" option} unix {
+test unixWm-23.5 {Tk_WmCmd procedure, "iconify" option} {unix failsOnUbuntu} {
     destroy .t2
     toplevel .t2
     wm geom .t2 +0+0
@@ -839,7 +841,7 @@ test unixWm-23.5 {Tk_WmCmd procedure, "iconify" option} unix {
     destroy .t2
     set result
 } {0}
-test unixWm-23.6 {Tk_WmCmd procedure, "iconify" option} unix {
+test unixWm-23.6 {Tk_WmCmd procedure, "iconify" option} {unix failsOnUbuntu} {
     destroy .t2
     toplevel .t2
     wm geom .t2 -0+0
@@ -1405,7 +1407,7 @@ test unixWm-41.4 {ConfigureEvent procedure, synthesized Configure events} unix {
 # No tests for ReparentEvent or ComputeReparentGeometry; I can't figure
 # out how to exercise these procedures reliably.
 
-test unixWm-42.1 {WrapperEventProc procedure, map and unmap events} unix {
+test unixWm-42.1 {WrapperEventProc procedure, map and unmap events} {unix failsOnUbuntu} {
     destroy .t
     toplevel .t -width 400 -height 150
     wm geometry .t +0+0
@@ -1578,7 +1580,7 @@ test unixWm-45.1 {UpdateSizeHints procedure, grid information} {unix testwrapper
 	    [expr [lindex $property 7]] [expr [lindex $property 8]] \
 	    [expr [lindex $property 9]] [expr [lindex $property 10]]
 } {40 30 320 210 10 5}
-test unixWm-45.2 {UpdateSizeHints procedure} {unix testwrapper} {
+test unixWm-45.2 {UpdateSizeHints procedure} {unix testwrapper failsOnUbuntu} {
     destroy .t
     toplevel .t -width 80 -height 60
     wm minsize .t 30 40
@@ -1606,7 +1608,7 @@ test unixWm-45.3 {UpdateSizeHints procedure, grid with menu} {testmenubar testwr
 	    [expr [lindex $property 7]] [expr [lindex $property 8]] \
 	    [expr [lindex $property 9]] [expr [lindex $property 10]]
 } {60 40 53 320 233 10 5}
-test unixWm-45.4 {UpdateSizeHints procedure, not resizable with menu} {testmenubar testwrapper} {
+test unixWm-45.4 {UpdateSizeHints procedure, not resizable with menu} {testmenubar testwrapper failsOnUbuntu} {
     destroy .t
     toplevel .t -width 80 -height 60
     frame .t.menu -height 23 -width 50
@@ -1753,7 +1755,7 @@ test unixWm-49.2 {Tk_GetRootCoords procedure, menubars} {unix testmenubar} {
 
 deleteWindows
 wm iconify .
-test unixWm-50.1 {Tk_CoordsToWindow procedure, finding a toplevel, x-coords} unix {
+test unixWm-50.1 {Tk_CoordsToWindow procedure, finding a toplevel, x-coords} {unix failsOnUbuntu} {
     deleteWindows
     toplevel .t -width 300 -height 400 -bg green
     wm geom .t +40+0
@@ -1910,7 +1912,7 @@ test unixWm-50.8 {Tk_CoordsToWindow procedure, more basics} unix {
 	    [winfo containing [expr $x + 350] $y] \
 	    [winfo containing [expr $x + 450] $y]
 } {.t .t.f .t.f.f .t {}}
-test unixWm-50.9 {Tk_CoordsToWindow procedure, unmapped windows} unix {
+test unixWm-50.9 {Tk_CoordsToWindow procedure, unmapped windows} {unix failsOnUbuntu} {
     destroy .t
     destroy .t2
     sleep 500		;# Give window manager time to catch up.
diff --git a/tests/winfo.test b/tests/winfo.test
index 50decf5..b393b1a 100644
--- a/tests/winfo.test
+++ b/tests/winfo.test
@@ -35,6 +35,8 @@ proc eatColors {w {options ""}} {
     update
 }
 
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+
 # XXX - This test file is woefully incomplete.  At present, only a
 # few of the winfo options are tested.
 
@@ -218,7 +220,7 @@ test winfo-9.2 {"winfo viewable" command} {
 test winfo-9.3 {"winfo viewable" command} {
     winfo viewable .
 } {1}
-test winfo-9.4 {"winfo viewable" command} {
+test winfo-9.4 {"winfo viewable" command} failsOnUbuntu {
     wm iconify .
     winfo viewable .
 } {0}
@@ -239,7 +241,7 @@ test winfo-9.6 {"winfo viewable" command} {
     update
     list [winfo viewable .f1] [winfo viewable .f1.f2]
 } {0 0}
-test winfo-9.7 {"winfo viewable" command} {
+test winfo-9.7 {"winfo viewable" command} failsOnUbuntu {
     deleteWindows
     frame .f1 -width 100 -height 100 -relief raised -bd 2
     place .f1 -x 0 -y 0
diff --git a/tests/wm.test b/tests/wm.test
index 15ceb2f..eeeea8d 100644
--- a/tests/wm.test
+++ b/tests/wm.test
@@ -27,6 +27,8 @@ proc stdWindow {} {
     update
 }
 
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+
 # [raise] and [lower] may return before the window manager has completed the
 # operation. The raiseDelay procedure idles for a while to give the operation
 # a chance to complete.
@@ -805,7 +807,7 @@ test wm-iconify-2.4.2 {Misc errors} -constraints !win -setup {
     destroy .t2 .r.f
 } -result {can't iconify .t2: it is an embedded window}
 
-test wm-iconify-3.1 {iconify behavior} -body {
+test wm-iconify-3.1 {iconify behavior} -constraints failsOnUbuntu -body {
     toplevel .t2
     wm geom .t2 -0+0
     update
@@ -1404,7 +1406,7 @@ test wm-stackorder-2.7 {stacking order: no children returns self} -setup {
 
 deleteWindows
 
-test wm-stackorder-3.1 {unmapped toplevel} -body {
+test wm-stackorder-3.1 {unmapped toplevel} -constraints failsOnUbuntu -body {
     toplevel .t1 ; update
     toplevel .t2 ; update
     wm iconify .t1
@@ -1690,7 +1692,7 @@ test wm-transient-3.3 {withdraw/deiconify on the master
 } -result {withdrawn 0 normal 1}
 
 test wm-transient-4.1 {transient toplevel is withdrawn
-        when mapped if master is iconic} -body {
+        when mapped if master is iconic} -constraints failsOnUbuntu -body {
     toplevel .master
     wm iconify .master
     update
@@ -1702,7 +1704,7 @@ test wm-transient-4.1 {transient toplevel is withdrawn
     deleteWindows
 } -result {withdrawn 0}
 test wm-transient-4.2 {already mapped transient toplevel
-        is withdrawn if master is iconic} -body {
+        is withdrawn if master is iconic} -constraints failsOnUbuntu -body {
     toplevel .master
     wm iconify .master
     update
@@ -1715,7 +1717,7 @@ test wm-transient-4.2 {already mapped transient toplevel
     deleteWindows
 } -result {withdrawn 0}
 test wm-transient-4.3 {iconify/deiconify on the master
-        does a withdraw/deiconify on the transient} -setup {
+        does a withdraw/deiconify on the transient} -constraints failsOnUbuntu -setup {
     set results [list]
 } -body {
     toplevel .master
@@ -1891,7 +1893,7 @@ test wm-transient-7.5 {Reassign transient, destroy transient} -body {
     deleteWindows
 }
 
-test wm-transient-8.1 {transient to withdrawn window, Bug 1163496} -setup {
+test wm-transient-8.1 {transient to withdrawn window, Bug 1163496} -constraints failsOnUbuntu -setup {
     deleteWindows
     set result {}
 } -body {
@@ -1968,7 +1970,7 @@ test wm-state-2.7 {state change before map} -body {
 } -cleanup {
     deleteWindows
 } -result {iconic}
-test wm-state-2.8 {state change after map} -body {
+test wm-state-2.8 {state change after map} -constraints failsOnUbuntu -body {
     toplevel .t
     update
     wm state .t iconic
@@ -1976,7 +1978,7 @@ test wm-state-2.8 {state change after map} -body {
 } -cleanup {
     deleteWindows
 } -result {iconic}
-test wm-state-2.9 {state change after map} -body {
+test wm-state-2.9 {state change after map} -constraints failsOnUbuntu -body {
     toplevel .t
     update
     wm iconify .t
-- 
cgit v0.12


From f05d35b656076f1289333777861f981fe8c44c13 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 23 Sep 2020 10:51:31 +0000
Subject: Don't set ERROR_ON_FAILURES, it doesn't work for Tk. no unset
 hidden_cmds

---
 .travis.yml     | 2 --
 tests/safe.test | 1 -
 2 files changed, 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0ac80ca..0a63e50 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -184,8 +184,6 @@ before_install:
   - cd ${BUILD_DIR}
 install:
   - ./configure ${CFGOPT} --prefix=$HOME || (cat config.log && exit 1)
-before_script:
-  - export ERROR_ON_FAILURES=1
 script:
   - make binaries libraries tktest
   - make install
diff --git a/tests/safe.test b/tests/safe.test
index 432bc01..d5488dc 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -203,6 +203,5 @@ test safe-7.1 {canvas printing} {
 
 # cleanup
 set ::auto_path $saveAutoPath
-unset hidden_cmds
 cleanupTests
 return
-- 
cgit v0.12


From 5dd5e3ad85119209cd8bbe431f51488fbc67b2e2 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 23 Sep 2020 12:29:50 +0000
Subject: testcase cleanup

---
 tests/font.test    |  96 +++++++++++++-------------
 tests/safe.test    | 170 +++++++++++++++++++++++++--------------------
 tests/tk.test      | 198 +++++++++++++++++++++++++++++------------------------
 tests/unixWm.test  |   8 +--
 tests/winFont.test |  20 +++---
 tests/winMenu.test |   4 +-
 tests/winWm.test   |  16 ++---
 7 files changed, 275 insertions(+), 237 deletions(-)

diff --git a/tests/font.test b/tests/font.test
index c3f6413..fbd0a52 100644
--- a/tests/font.test
+++ b/tests/font.test
@@ -140,7 +140,7 @@ test font-4.3 {font command: actual: arguments} {
 } {1 {wrong # args: should be "font actual font ?-displayof window? ?option? ?--? ?char?"}}
 test font-4.4 {font command: actual: displayof specified, so skip to next} {
     catch {font actual xyz -displayof . -size}
-} {0}
+} 0
 test font-4.5 {font command: actual: displayof specified, so skip to next} {
     lindex [font actual xyz -displayof .] 0
 } {-family}
@@ -148,7 +148,7 @@ test font-4.6 {font command: actual: arguments} {
     # (objc - skip > 4) when skip == 2
     list [catch {font actual xyz -displayof . abc def} msg] $msg
 } {1 {wrong # args: should be "font actual font ?-displayof window? ?option? ?--? ?char?"}}
-test font-4.7 {font command: actual: arguments} {noExceed} {
+test font-4.7 {font command: actual: arguments} noExceed {
     # (tkfont == NULL)
     list [catch {font actual "\{xyz"} msg] $msg
 } [list 1 "font \"{xyz\" doesn't exist"]
@@ -159,7 +159,7 @@ test font-4.8 {font command: actual: all attributes} {
 test font-4.9 {font command: actual} {unix noExceed failsOnUbuntu} {
     # (objc > 3) so objPtr = objv[3 + skip]
     string tolower [font actual {-family times} -family]
-} {times}
+} times
 test font-4.10 {font command: actual} win {
     # (objc > 3) so objPtr = objv[3 + skip]
     font actual {-family times} -family
@@ -215,19 +215,19 @@ test font-6.1 {font command: create: make up name} {
     setup
     font create
     expr {"font1" in [font names]}
-} {1}
+} 1
 test font-6.2 {font command: create: name specified} {
     # not (objc < 3)
     setup
     font create xyz
     expr {"xyz" in [font names]}
-} {1}
+} 1
 test font-6.3 {font command: create: name not really specified} {
     # (name[0] == '-') so name = NULL
     setup
     font create -family xyz
     expr {"font1" in [font names]}
-} {1}
+} 1
 test font-6.4 {font command: create: generate name} {
     # (name == NULL)
     setup
@@ -237,7 +237,7 @@ test font-6.4 {font command: create: generate name} {
     font delete font2
     font create -family four
     font configure font2 -family
-} {four}
+} four
 test font-6.5 {font command: create: bad option creating new font} {
     # name was specified so skip = 3
     setup
@@ -305,7 +305,7 @@ test font-7.6 {font command: delete: actually delete} {
     font create xyz -underline 1
     font delete xyz
     catch {font config xyz}
-} {1}
+} 1
 setup
 
 test font-8.1 {font command: families: arguments} {
@@ -323,7 +323,7 @@ test font-8.3 {font command: families: arguments} {
 test font-8.4 {font command: families} failsOnUbuntu {
     # TkpGetFontFamilies()
     regexp -nocase times [font families]
-} {1}
+} 1
 
 test font-9.1 {font command: measure: arguments} {
     # (skip < 0)
@@ -337,14 +337,14 @@ test font-9.3 {font command: measure: arguments} {
     # (objc - skip != 4)
     list [catch {font measure xyz abc def} msg] $msg
 } {1 {wrong # args: should be "font measure font ?-displayof window? text"}}
-test font-9.4 {font command: measure: arguments} {noExceed} {
+test font-9.4 {font command: measure: arguments} noExceed {
     # (tkfont == NULL)
     list [catch {font measure "\{xyz" abc} msg] $msg
 } [list 1 "font \"{xyz\" doesn't exist"]
 test font-9.5 {font command: measure} failsOnUbuntu {
     # Tk_TextWidth()
     expr [font measure $fixed "abcdefg"]==[font measure $fixed "a"]*7
-} {1}
+} 1
 test font-9.6 {font command: measure -d} {
      list [catch {expr {[font measure $fixed -d] > 0}} msg] $msg
 } {0 1}
@@ -374,7 +374,7 @@ test font-10.5 {font command: metrics: arguments} {
     # (objc - skip) > 4) when skip == 2
     list [catch {font metrics xyz -displayof . abc} msg] $msg
 } {1 {bad metric "abc": must be -ascent, -descent, -linespace, or -fixed}}
-test font-10.6 {font command: metrics: bad font} {noExceed} {
+test font-10.6 {font command: metrics: bad font} noExceed {
     # (tkfont == NULL)
     list [catch {font metrics "\{xyz"} msg] $msg
 } [list 1 "font \"{xyz\" doesn't exist"]
@@ -395,7 +395,7 @@ test font-10.9 {font command: metrics: get individual metrics} failsOnUbuntu {
     font metrics $fixed -descent
     font metrics $fixed -linespace
     font metrics $fixed -fixed
-} {1}
+} 1
 
 test font-11.1 {font command: names: arguments} {
     # (objc != 2)
@@ -409,7 +409,7 @@ test font-11.3 {font command: names: loop test: one pass} {
     setup
     font create
     getnondefaultfonts
-} {font1}
+} font1
 test font-11.4 {font command: names: loop test: multiple passes} {
     setup
     font create xyz
@@ -447,7 +447,7 @@ test font-12.2 {UpdateDependantFonts procedure: pings the widgets} {
     update
     set b2 [winfo reqwidth .b.f]
     expr {$a1==$b1 && $a2==$b2}
-} {1}
+} 1
 
 test font-13.1 {CreateNamedFont: new named font} {
     # not (new == 0)
@@ -477,7 +477,7 @@ test font-13.4 {CreateNamedFont: recreate "deleted" font} {
     font delete xyz
     font create xyz -family courier
     font configure xyz -family
-} {courier}
+} courier
 
 test font-14.1 {Tk_GetFont procedure} {
 } {}
@@ -541,7 +541,7 @@ test font-15.10 {Tk_AllocFontFromObj procedure: get attribute font} {
     # (fontPtr == NULL)
     list [catch {.b.f config -font {xxx yyy zzz}} msg] $msg
 } {1 {expected integer but got "yyy"}}
-test font-15.11 {Tk_AllocFontFromObj procedure: no match} {noExceed} {
+test font-15.11 {Tk_AllocFontFromObj procedure: no match} noExceed {
     # (ParseFontNameObj() != TCL_OK)
     list [catch {font actual "\{xyz"} msg] $msg
 } [list 1 "font \"{xyz\" doesn't exist"]
@@ -608,7 +608,7 @@ test font-17.4 {Tk_FreeFont procedure: named font} {
     .b.f config -font xyz
     destroy .b.f
     expr {"xyz" in [font names]}
-} {1}
+} 1
 test font-17.5 {Tk_FreeFont procedure: named font} {
     # not (fontPtr->refCount == 0)
     setup
@@ -683,21 +683,21 @@ test font-21.1 {Tk_PostscriptFontName procedure: native} unix {
 } {AvantGarde-Book}
 test font-21.2 {Tk_PostscriptFontName procedure: native} win {
     psfontname "arial 10"
-} {Helvetica}
+} Helvetica
 test font-21.3 {Tk_PostscriptFontName procedure: native} win {
     psfontname "{times new roman} 10"
-} {Times-Roman}
+} Times-Roman
 test font-21.4 {Tk_PostscriptFontName procedure: native} win {
     psfontname "{courier new} 10"
-} {Courier}
+} Courier
 test font-21.8 {Tk_PostscriptFontName procedure: spaces} unix {
     set x [font actual {{lucida bright} 10} -family]
     if {[string match lucida*bright $x]} {
 	psfontname "{lucida bright} 10"
     } else {
-	set x {LucidaBright}
+	set x LucidaBright
     }
-} {LucidaBright}
+} LucidaBright
 test font-21.9 {Tk_PostscriptFontName procedure: spaces} {unix failsOnUbuntu} {
     psfontname "{new century schoolbook} 10"
 } {NewCenturySchlbk-Roman}
@@ -914,7 +914,7 @@ test font-27.3 {Tk_UnderlineTextLayout procedure: underline is visible} {
 test font-28.1 {Tk_PointToChar procedure: above all lines} {
     csetup "000"
     .b.c index text @-1,0
-} {0}
+} 0
 test font-28.2 {Tk_PointToChar procedure: no chars} {
     # After fixing the following bug:
     #
@@ -926,44 +926,44 @@ test font-28.2 {Tk_PointToChar procedure: no chars} {
 
     csetup ""
     .b.c index text @100,100
-} {0}
+} 0
 test font-28.3 {Tk_PointToChar procedure: loop test} {
     csetup "000\n000\n000\n000"
     .b.c index text @10000,0
-} {3}
+} 3
 test font-28.4 {Tk_PointToChar procedure: intersect line} {
     csetup "000\n000\n000"
     .b.c index text @0,$ay
-} {4}
+} 4
 test font-28.5 {Tk_PointToChar procedure: to the left of all chunks} {
     .b.c index text @-100,$ay
-} {4}
+} 4
 test font-28.6 {Tk_PointToChar procedure: past any possible chunk} {
     .b.c index text @100000,$ay
-} {7}
+} 7
 test font-28.7 {Tk_PointToChar procedure: which chunk on this line} {
     csetup "000\n000\t000\t000\n000"
     .b.c index text @[expr $ax*2],$ay
-} {6}
+} 6
 test font-28.8 {Tk_PointToChar procedure: which chunk on this line} {
     csetup "000\n000\t000\t000\n000"
     .b.c index text @[expr $ax*10],$ay
-} {10}
+} 10
 test font-28.9 {Tk_PointToChar procedure: in special chunk} {
     csetup "000\n000\t000\t000\n000"
     .b.c index text @[expr $ax*6],$ay
-} {7}
+} 7
 test font-28.10 {Tk_PointToChar procedure: past all chars in chunk} {
     csetup "000 0000000"
     .b.c itemconfig text -width [expr $ax*5]
     set x [.b.c index text @[expr $ax*5],0]
     .b.c itemconfig text -width 0
     set x
-} {3}
+} 3
 test font-28.11 {Tk_PointToChar procedure: below all chunks} {
     csetup "000 0000000"
     .b.c index text @0,1000000
-} {11}
+} 11
 
 test font-29.1 {Tk_CharBBox procedure: index < 0} {
     .b.f config -text "000" -underline -1
@@ -994,14 +994,14 @@ test font-30.1 {Tk_DistanceToTextLayout procedure: loop once} {
     event generate .b.c <Leave>
     event generate .b.c <Enter> -x 0 -y 0
     set x
-} {0}
+} 0
 test font-30.2 {Tk_DistanceToTextLayout procedure: loop multiple} {
     csetup "000\n000\n000"
     set x {}
     event generate .b.c <Leave>
     event generate .b.c <Enter> -x $ax -y $ay
     set x
-} {5}
+} 5
 test font-30.3 {Tk_DistanceToTextLayout procedure: loop to end} {
     csetup "000\n0\n000"
     set x {}
@@ -1015,7 +1015,7 @@ test font-30.4 {Tk_DistanceToTextLayout procedure: hit a special char (tab)} {
     event generate .b.c <Leave>
     event generate .b.c <Enter> -x [expr $ax*6] -y 0
     set x
-} {3}
+} 3
 test font-30.5 {Tk_DistanceToTextLayout procedure: ignore newline} {
     csetup "000\n0\n000"
     set x {}
@@ -1053,7 +1053,7 @@ test font-30.9 {Tk_DistanceToTextLayout procedure: inside line} {
     event generate .b.c <Leave>
     event generate .b.c <Enter> -x $ax -y 0
     set x
-} {0}
+} 0
 test font-30.10 {Tk_DistanceToTextLayout procedure: above line} {
     csetup "0\n000"
     set x {}
@@ -1074,7 +1074,7 @@ test font-30.12 {Tk_DistanceToTextLayout procedure: in line} {
     event generate .b.c <Leave>
     event generate .b.c <Enter> -x $ax -y $ay
     set x
-} {3}
+} 3
 .b.c itemconfig text -justify left
 test font-30.13 {Tk_DistanceToTextLayout procedure: exact hit} {
     csetup "000"
@@ -1082,7 +1082,7 @@ test font-30.13 {Tk_DistanceToTextLayout procedure: exact hit} {
     event generate .b.c <Leave>
     event generate .b.c <Enter> -x $ax -y 0
     set x
-} {1}
+} 1
 
 test font-31.1 {Tk_IntersectTextLayout procedure: loop once} {
     csetup "000\n000\n000"
@@ -1211,7 +1211,7 @@ test font-35.1 {GetAttributeInfoObj procedure: one attribute} {
     setup
     font create xyz -family xyz
     font config xyz -family
-} {xyz}
+} xyz
 
 test font-36.1 {GetAttributeInfoObj procedure: unknown attribute} {
     # (Tcl_GetIndexFromObj() != TCL_OK)
@@ -1268,10 +1268,10 @@ test font-38.5 {ParseFontNameObj procedure: begins with *} {
 test font-38.6 {ParseFontNameObj procedure: begins with *} {
     font actual *-times-xyz -family
 } $times
-test font-38.7 {ParseFontNameObj procedure: arguments} {noExceed} {
+test font-38.7 {ParseFontNameObj procedure: arguments} noExceed {
     list [catch {font actual "\{xyz"} msg] $msg
 } [list 1 "font \"{xyz\" doesn't exist"]
-test font-38.8 {ParseFontNameObj procedure: arguments} {noExceed} {
+test font-38.8 {ParseFontNameObj procedure: arguments} noExceed {
     list [catch {font actual ""} msg] $msg
 } {1 {font "" doesn't exist}}
 test font-38.9 {ParseFontNameObj procedure: arguments} {
@@ -1280,7 +1280,7 @@ test font-38.9 {ParseFontNameObj procedure: arguments} {
 test font-38.10 {ParseFontNameObj procedure: arguments} {
     list [catch {font actual {times xyz xyz}} msg] $msg
 } {1 {expected integer but got "xyz"}}
-test font-38.12 {ParseFontNameObj procedure: stylelist loop} {unixOrPc} {
+test font-38.12 {ParseFontNameObj procedure: stylelist loop} unixOrPc {
     lrange [font actual {times 12 bold italic overstrike underline}] 4 end
 } {-weight bold -slant italic -underline 1 -overstrike 1}
 test font-38.13 {ParseFontNameObj procedure: stylelist error} {
@@ -1288,7 +1288,7 @@ test font-38.13 {ParseFontNameObj procedure: stylelist error} {
 } {1 {unknown font style "xyz"}}
 test font-38.14 "ParseFontNameObj: options with hyphenated family: bug #2791352" -body {
     font actual {-family sans-serif -size 12 -weight bold -slant roman -underline 0 -overstrike 0}
-} -returnCodes ok -result [font actual {sans-serif 12 bold}]
+} -result [font actual {sans-serif 12 bold}]
 test font-38.15 "ParseFontNameObj: bug #2791352" -body {
     font actual {-invalidfont 8 bold}
 } -returnCodes error -match glob -result {bad option "-invalidfont": *}
@@ -1350,10 +1350,10 @@ set oldscale [tk scaling]
 tk scaling 0.5
 test font-44.1 {TkFontGetPixels: size < 0} failsOnUbuntu {
     font actual {times -12} -size
-} {24}
-test font-44.2 {TkFontGetPoints: size >= 0} {noExceed} {
+} 24
+test font-44.2 {TkFontGetPoints: size >= 0} noExceed {
     font actual {times 12} -size
-} {12}
+} 12
 
 tk scaling $oldscale
 
diff --git a/tests/safe.test b/tests/safe.test
index d5488dc..914adaa 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -1,5 +1,5 @@
-# This file is a Tcl script to test the Safe Tk facility. It is organized
-# in the standard fashion for Tk tests.
+# This file is a Tcl script to test the Safe Tk facility. It is organized in
+# the standard fashion for Tk tests.
 #
 # Copyright (c) 1994 The Regents of the University of California.
 # Copyright (c) 1994-1995 Sun Microsystems, Inc.
@@ -9,6 +9,7 @@
 package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
+namespace import -force tcltest::test
 
 ## NOTE: Any time tests fail here with an error like:
 
@@ -27,181 +28,200 @@ tcltest::loadTestedCommands
 # This probably means that tk wasn't installed properly.
 
 ## it indicates that something went wrong sourcing tk.tcl.
-## Ensure that any changes that occured to tk.tcl will work or
-## are properly prevented in a safe interpreter.  -- hobbs
+## Ensure that any changes that occurred to tk.tcl will work or are properly
+## prevented in a safe interpreter.  -- hobbs
 
 set saveAutoPath $::auto_path
 set auto_path [list [info library] $::tk_library]
 
-test safe-1.1 {Safe Tk loading into an interpreter} {
+test safe-1.1 {Safe Tk loading into an interpreter} -setup {
     catch {safe::interpDelete a}
+} -body {
     safe::loadTk [safe::interpCreate a]
     safe::interpDelete a
     set x {}
     set x
-} ""
-test safe-1.2 {Safe Tk loading into an interpreter} -body {
+} -result {}
+test safe-1.2 {Safe Tk loading into an interpreter} -setup {
     catch {safe::interpDelete a}
+} -body {
     safe::interpCreate a
     safe::loadTk a
-    set l [lsort [interp hidden a]]
+    lsort [interp hidden a]
+} -cleanup {
     safe::interpDelete a
-    set l
 } -match glob -result {bell cd clipboard encoding exec exit fconfigure*glob grab load menu open pwd selection send socket source*toplevel unload wm}
-test safe-1.3 {Safe Tk loading into an interpreter} -body {
+test safe-1.3 {Safe Tk loading into an interpreter} -setup {
     catch {safe::interpDelete a}
+} -body {
     safe::interpCreate a
     safe::loadTk a
-    set l [lsort [interp aliases a]]
+    lsort [interp aliases a]
+} -cleanup {
     safe::interpDelete a
-    set l
 } -match glob -result {*encoding*exit*load*source*}
 
-test safe-2.1 {Unsafe commands not available} {
+test safe-2.1 {Unsafe commands not available} -setup {
     catch {safe::interpDelete a}
+} -body {
     safe::interpCreate a
     safe::loadTk a
     set status broken
     if {[catch {interp eval a {toplevel .t}} msg]} {
 	set status ok
     }
-    safe::interpDelete a
     set status
-} ok
-test safe-2.2 {Unsafe commands not available} {
+} -cleanup {
+    safe::interpDelete a
+} -result ok
+test safe-2.2 {Unsafe commands not available} -setup {
     catch {safe::interpDelete a}
+} -body {
     safe::interpCreate a
     safe::loadTk a
     set status broken
     if {[catch {interp eval a {menu .m}} msg]} {
 	set status ok
     }
-    safe::interpDelete a
     set status
-} ok
-test safe-2.3 {Unsafe subcommands not available} {
+} -cleanup {
+    safe::interpDelete a
+} -result ok
+test safe-2.3 {Unsafe subcommands not available} -setup {
     catch {safe::interpDelete a}
+} -body {
     safe::interpCreate a
     safe::loadTk a
     set status broken
     if {[catch {interp eval a {tk appname}} msg]} {
 	set status ok
     }
-    safe::interpDelete a
     list $status $msg
-} {ok {appname not accessible in a safe interpreter}}
-test safe-2.4 {Unsafe subcommands not available} {
+} -cleanup {
+    safe::interpDelete a
+} -result {ok {appname not accessible in a safe interpreter}}
+test safe-2.4 {Unsafe subcommands not available} -setup {
     catch {safe::interpDelete a}
+} -body {
     safe::interpCreate a
     safe::loadTk a
     set status broken
     if {[catch {interp eval a {tk scaling}} msg]} {
 	set status ok
     }
-    safe::interpDelete a
     list $status $msg
-} {ok {scaling not accessible in a safe interpreter}}
+} -cleanup {
+    safe::interpDelete a
+} -result {ok {scaling not accessible in a safe interpreter}}
 
-test safe-3.1 {Unsafe commands are available hidden} {
+test safe-3.1 {Unsafe commands are available hidden} -setup {
     catch {safe::interpDelete a}
+} -body {
     safe::interpCreate a
     safe::loadTk a
     set status ok
     if {[catch {interp invokehidden a toplevel .t} msg]} {
 	set status broken
     }
-    safe::interpDelete a
     set status
-} ok
-test safe-3.2 {Unsafe commands are available hidden} {
+} -cleanup {
+    safe::interpDelete a
+} -result ok
+test safe-3.2 {Unsafe commands are available hidden} -setup {
     catch {safe::interpDelete a}
+} -body {
     safe::interpCreate a
     safe::loadTk a
     set status ok
     if {[catch {interp invokehidden a menu .m} msg]} {
 	set status broken
     }
-    safe::interpDelete a
     set status
-} ok
+} -cleanup {
+    safe::interpDelete a
+} -result ok
 
-test safe-4.1 {testing loadTk} {
-    # no error shall occur, the user will
-    # eventually see a new toplevel
+test safe-4.1 {testing loadTk} -body {
+    # no error shall occur, the user will eventually see a new toplevel
     set i [safe::loadTk [safe::interpCreate]]
     interp eval $i {button .b -text "hello world!"; pack .b}
-    # lets don't update because it might imply that the user has
-    # to position the window (if the wm does not do it automatically)
-    # and thus make the test suite not runable non interactively
+    # lets don't update because it might imply that the user has to position
+    # the window (if the wm does not do it automatically) and thus make the
+    # test suite not runable non interactively
     safe::interpDelete $i
-} {}
-
-test safe-4.2 {testing loadTk -use} {
+} -result {}
+test safe-4.2 {testing loadTk -use} -setup {
+    destroy .safeTkFrame
+} -body {
     set w .safeTkFrame
-    catch {destroy $w}
     frame $w -container 1;
-    pack .safeTkFrame
+    pack $w
     set i [safe::loadTk [safe::interpCreate] -use [winfo id $w]]
     interp eval $i {button .b -text "hello world!"; pack .b}
     safe::interpDelete $i
     destroy $w
-} {}
+} -result {}
 
-test safe-5.1 {loading Tk in safe interps without master's clearance} {
+test safe-5.1 {loading Tk in safe interps without parent's clearance} -body {
     set i [safe::interpCreate]
-    catch {interp eval $i {load {} Tk}} msg
+    interp eval $i {load {} Tk}
+} -cleanup {
     safe::interpDelete $i
-    set msg
-} {not allowed to start Tk by master's safe::TkInit}
-
-test safe-5.2 {multi-level Tk loading with clearance} {
-    # No error shall occur in that test and no window
-    # shall remain at the end.
-    set i [safe::interpCreate]
-    set j [list $i x]
-    set j [safe::interpCreate $j]
-    safe::loadTk $j
-    interp eval $j {
+} -returnCodes error -match glob -result {*not allowed*}
+test safe-5.2 {multi-level Tk loading with clearance} -setup {
+    set safeParent [safe::interpCreate]
+} -body {
+    # No error shall occur in that test and no window shall remain at the end.
+    set i [safe::interpCreate [list $safeParent x]]
+    safe::loadTk $i
+    interp eval $i {
 	button .b -text Ok -command {destroy .}
 	pack .b
 #	tkwait window . ; # for interactive testing/debugging
     }
-    safe::interpDelete $j
-    safe::interpDelete $i
-} {}
-
-test safe-6.1 {loadTk -use windowPath} {
+} -cleanup {
+    catch {safe::interpDelete $i}
+    safe::interpDelete $safeParent
+} -result {}
+
+test safe-6.1 {loadTk -use windowPath} -setup {
+    destroy .safeTkFrame
+} -body {
     set w .safeTkFrame
-    catch {destroy $w}
     frame $w -container 1;
-    pack .safeTkFrame
+    pack $w
     set i [safe::loadTk [safe::interpCreate] -use $w]
     interp eval $i {button .b -text "hello world!"; pack .b}
     safe::interpDelete $i
     destroy $w
-} {}
-
-test safe-6.2 {loadTk -use windowPath, conflicting -display} {
+} -result {}
+test safe-6.2 {loadTk -use windowPath, conflicting -display} -setup {
+    destroy .safeTkFrame
+} -body {
     set w .safeTkFrame
-    catch {destroy $w}
     frame $w -container 1;
-    pack .safeTkFrame
+    pack $w
     set i     [safe::interpCreate]
     catch {safe::loadTk $i -use $w -display :23.56} msg
+    string range $msg 0 36
+} -cleanup {
     safe::interpDelete $i
     destroy $w
-    string range $msg 0 36
-} {conflicting -display :23.56 and -use }
-
+} -result {conflicting -display :23.56 and -use }
 
-test safe-7.1 {canvas printing} {
+test safe-7.1 {canvas printing} -body {
     set i [safe::loadTk [safe::interpCreate]]
-    set r [catch {interp eval $i {canvas .c; .c postscript}}]
+    interp eval $i {canvas .c; .c postscript}
+} -cleanup {
     safe::interpDelete $i
-    set r
-} 0
-
+} -match glob -result *
+
 # cleanup
 set ::auto_path $saveAutoPath
 cleanupTests
 return
+
+# Local Variables:
+# mode: tcl
+# fill-column: 78
+# End:
diff --git a/tests/tk.test b/tests/tk.test
index 9673caa..76455d7 100644
--- a/tests/tk.test
+++ b/tests/tk.test
@@ -8,132 +8,144 @@
 package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
+namespace import -force tcltest::test
 
-test tk-1.1 {tk command: general} \
-    -body {tk} -returnCodes 1 \
-    -result {wrong # args: should be "tk option ?arg?"}
-test tk-1.2 {tk command: general} \
-    -body {tk xyz} -returnCodes 1 \
-    -result {bad option "xyz": must be appname, caret, scaling, useinputmethods, windowingsystem, or inactive}
+test tk-1.1 {tk command: general} -body {
+    tk
+} -returnCodes 1 -result {wrong # args: should be "tk option ?arg?"}
+test tk-1.2 {tk command: general} -body {
+    tk xyz
+} -returnCodes 1 -result {bad option "xyz": must be appname, caret, scaling, useinputmethods, windowingsystem, or inactive}
 
+# Value stored to restore default settings after 2.* tests
 set appname [tk appname]
-test tk-2.1 {tk command: appname} {
-    list [catch {tk appname xyz abc} msg] $msg
-} {1 {wrong # args: should be "tk appname ?newName?"}}
-test tk-2.2 {tk command: appname} {
+test tk-2.1 {tk command: appname} -body {
+    tk appname xyz abc
+} -returnCodes 1 -result {wrong # args: should be "tk appname ?newName?"}
+test tk-2.2 {tk command: appname} -body {
     tk appname foobazgarply
-} {foobazgarply}
-test tk-2.3 {tk command: appname} unix {
+} -result foobazgarply
+test tk-2.3 {tk command: appname} -constraints unix -body {
     tk appname bazfoogarply
     expr {[lsearch -exact [winfo interps] [tk appname]] >= 0}
-} {1}
-test tk-2.4 {tk command: appname} {
+} -result 1
+test tk-2.4 {tk command: appname} -body {
     tk appname $appname
-} $appname
+} -result $appname
 tk appname $appname
 
+# Value stored to restore default settings after 3.* tests
 set scaling [tk scaling]
-test tk-3.1 {tk command: scaling} {
-    list [catch {tk scaling -displayof} msg] $msg
-} {1 {value for "-displayof" missing}}
-test tk-3.2 {tk command: scaling: get current} {
+test tk-3.1 {tk command: scaling} -body {
+    tk scaling -displayof
+} -returnCodes 1 -result {value for "-displayof" missing}
+test tk-3.2 {tk command: scaling: get current} -body {
     tk scaling 1
     format %.2g [tk scaling]
-} 1
-test tk-3.3 {tk command: scaling: get current} {
+} -result 1
+test tk-3.3 {tk command: scaling: get current} -body {
     tk scaling -displayof . 1.25
     format %.3g [tk scaling]
-} 1.25
-test tk-3.4 {tk command: scaling: set new} {
-    list [catch {tk scaling xyz} msg] $msg
-} {1 {expected floating-point number but got "xyz"}}
-test tk-3.5 {tk command: scaling: set new} {
-    list [catch {tk scaling -displayof . xyz} msg] $msg
-} {1 {expected floating-point number but got "xyz"}}
-test tk-3.6 {tk command: scaling: set new} {
+} -result 1.25
+test tk-3.4 {tk command: scaling: set new} -body {
+    tk scaling xyz
+} -returnCodes 1 -result {expected floating-point number but got "xyz"}
+test tk-3.5 {tk command: scaling: set new} -body {
+    tk scaling -displayof . xyz
+} -returnCodes 1 -result {expected floating-point number but got "xyz"}
+test tk-3.6 {tk command: scaling: set new} -body {
     tk scaling 1
     format %.2g [tk scaling]
-} 1
-test tk-3.7 {tk command: scaling: set new} {
+} -result 1
+test tk-3.7 {tk command: scaling: set new} -body {
     tk scaling -displayof . 1.25
     format %.3g [tk scaling]
-} 1.25
-test tk-3.8 {tk command: scaling: negative} {
+} -result 1.25
+test tk-3.8 {tk command: scaling: negative} -body {
     tk scaling -1
     expr {[tk scaling] > 0}
-} {1}
-test tk-3.9 {tk command: scaling: too big} {
+} -result 1
+test tk-3.9 {tk command: scaling: too big} -body {
     tk scaling 1000000
     expr {[tk scaling] < 10000}
-} 1
-test tk-3.10 {tk command: scaling: widthmm} {
+} -result 1
+test tk-3.10 {tk command: scaling: widthmm} -body {
     tk scaling 1.25
-    expr {int((25.4*[winfo screenwidth .])/(72*1.25)+0.5)-[winfo screenmmwidth .]}
-} {0}
-test tk-3.11 {tk command: scaling: heightmm} {
+    expr {int((25.4*[winfo screenwidth .])/(72*1.25) + 0.5) \
+        - [winfo screenmmwidth .]}
+} -result 0
+test tk-3.11 {tk command: scaling: heightmm} -body {
     tk scaling 1.25
-    expr {int((25.4*[winfo screenheight .])/(72*1.25)+0.5)-[winfo screenmmheight .]}
-} {0}
+    expr {int((25.4*[winfo screenheight .])/(72*1.25) + 0.5) \
+        - [winfo screenmmheight .]}
+} -result 0
 tk scaling $scaling
 
+# Value stored to restore default settings after 4.* tests
 set useim [tk useinputmethods]
-test tk-4.1 {tk command: useinputmethods} {
-    list [catch {tk useinputmethods -displayof} msg] $msg
-} {1 {value for "-displayof" missing}}
-test tk-4.2 {tk command: useinputmethods: get current} {
+test tk-4.1 {tk command: useinputmethods} -body {
+    tk useinputmethods -displayof
+} -returnCodes 1 -result {value for "-displayof" missing}
+test tk-4.2 {tk command: useinputmethods: get current} -body {
+    tk useinputmethods no
+} -cleanup {
+    tk useinputmethods $useim
+} -result 0
+test tk-4.3 {tk command: useinputmethods: get current} -body {
     tk useinputmethods no
-} 0
-test tk-4.3 {tk command: useinputmethods: get current} {
     tk useinputmethods -displayof .
-} 0
-test tk-4.4 {tk command: useinputmethods: set new} {
-    list [catch {tk useinputmethods xyz} msg] $msg
-} {1 {expected boolean value but got "xyz"}}
-test tk-4.5 {tk command: useinputmethods: set new} {
-    list [catch {tk useinputmethods -displayof . xyz} msg] $msg
-} {1 {expected boolean value but got "xyz"}}
-test tk-4.6 {tk command: useinputmethods: set new} unix {
-    # This isn't really a test, but more of a check...
-    # The answer is what was given, because we may be on a Unix
-    # system that doesn't have the XIM stuff
+} -cleanup {
+    tk useinputmethods $useim
+} -result 0
+test tk-4.4 {tk command: useinputmethods: set new} -body {
+    tk useinputmethods xyz
+} -returnCodes 1 -result {expected boolean value but got "xyz"}
+test tk-4.5 {tk command: useinputmethods: set new} -body {
+    tk useinputmethods -displayof . xyz
+} -returnCodes 1 -result {expected boolean value but got "xyz"}
+test tk-4.6 {tk command: useinputmethods: set new} -constraints unix -body {
+    # This isn't really a test, but more of a check... The answer is what was
+    # given, because we may be on a Unix system that doesn't have the XIM
+    # stuff
     if {[tk useinputmethods 1] == 0} {
 	puts "this wish doesn't have XIM (X Input Methods) support"
     }
     set useim
-} $useim
-test tk-4.7 {tk command: useinputmethods: set new} win {
-    # Mac and Windows don't have X Input Methods, so this should
-    # always return 0
+} -result $useim
+test tk-4.7 {tk command: useinputmethods: set new} -constraints win -body {
+    # Mac and Windows don't have X Input Methods, so this should always return
+    # 0
     tk useinputmethods 1
-} 0
-tk useinputmethods $useim
+} -cleanup {
+    tk useinputmethods $useim
+} -result 0
 
-test tk-5.1 {tk caret} {
-    list [catch {tk caret} msg] $msg
-} {1 {wrong # args: should be "tk caret window ?-x x? ?-y y? ?-height height?"}}
-test tk-5.2 {tk caret} {
-    list [catch {tk caret bogus} msg] $msg
-} {1 {bad window path name "bogus"}}
-test tk-5.3 {tk caret} {
-    list [catch {tk caret . -foo} msg] $msg
-} {1 {bad caret option "-foo": must be -x, -y, or -height}}
-test tk-5.4 {tk caret} {
-    list [catch {tk caret . -x 0 -y} msg] $msg
-} {1 {wrong # args: should be "tk caret window ?-x x? ?-y y? ?-height height?"}}
-test tk-5.5 {tk caret} {
-    list [catch {tk caret . -x 10 -y 11 -h 12; tk caret .} msg] $msg
-} {0 {-height 12 -x 10 -y 11}}
-test tk-5.6 {tk caret} {
-    list [catch {tk caret . -x 20 -y 25 -h 30; tk caret . -hei} msg] $msg
-} {0 30}
+test tk-5.1 {tk caret} -body {
+    tk caret
+} -returnCodes 1 -result {wrong # args: should be "tk caret window ?-x x? ?-y y? ?-height height?"}
+test tk-5.2 {tk caret} -body {
+    tk caret bogus
+} -returnCodes 1 -result {bad window path name "bogus"}
+test tk-5.3 {tk caret} -body {
+    tk caret . -foo
+} -returnCodes 1 -result {bad caret option "-foo": must be -x, -y, or -height}
+test tk-5.4 {tk caret} -body {
+    tk caret . -x 0 -y
+} -returnCodes 1 -result {wrong # args: should be "tk caret window ?-x x? ?-y y? ?-height height?"}
+test tk-5.5 {tk caret} -body {
+    tk caret . -x 10 -y 11 -h 12; tk caret .
+} -result {-height 12 -x 10 -y 11}
+test tk-5.6 {tk caret} -body {
+    tk caret . -x 20 -y 25 -h 30; tk caret . -hei
+} -result 30
 
 # tk inactive
 test tk-6.1 {tk inactive} -body {
     string is integer [tk inactive]
 } -result 1
 test tk-6.2 {tk inactive reset} -body {
-    catch {tk inactive reset}
-} -result 0
+    tk inactive reset
+} -match glob -result *
 test tk-6.3 {tk inactive wrong argument} -body {
     tk inactive foo
 } -returnCodes 1 -result {bad option "foo": must be reset}
@@ -145,19 +157,25 @@ test tk-6.5 {tk inactive} -body {
     update
     after 100
     set i [tk inactive]
-    expr {$i == -1 || ( $i > 90 && $i < 200 )}
+    expr {$i < 0 || ( $i > 90 && $i < 200 )}
 } -result 1
 
-# tk inactive in safe interpreters
-safe::interpCreate foo
-safe::loadTk foo
 test tk-7.1 {tk inactive in a safe interpreter} -body {
+# tk inactive in safe interpreters
+    safe::interpCreate foo
+    safe::loadTk foo
     foo eval {tk inactive}
+} -cleanup {
+    ::safe::interpDelete foo
 } -result -1
 test tk-7.2 {tk inactive reset in a safe interpreter} -body {
+# tk inactive in safe interpreters
+    safe::interpCreate foo
+    safe::loadTk foo
     foo eval {tk inactive reset}
+} -cleanup {
+    ::safe::interpDelete foo
 } -returnCodes 1 -result {resetting the user inactivity timer is not allowed in a safe interpreter}
-::safe::interpDelete foo
 
 # cleanup
 cleanupTests
diff --git a/tests/unixWm.test b/tests/unixWm.test
index 7c427ec..e292d38 100644
--- a/tests/unixWm.test
+++ b/tests/unixWm.test
@@ -632,7 +632,7 @@ test unixWm-17.2 {Tk_WmCmd procedure, "focusmodel" option} unix {
     list [catch {wm focusmodel .t bogus} msg] $msg
 } {1 {bad argument "bogus": must be active or passive}}
 test unixWm-17.3 {Tk_WmCmd procedure, "focusmodel" option} unix {
-    set result {} 
+    set result {}
     lappend result [wm focusmodel .t]
     wm focusmodel .t active
     lappend result [wm focusmodel .t]
@@ -1328,7 +1328,7 @@ test unixWm-40.1 {Tk_SetGrid procedure, set grid dimensions before turning on gr
     destroy .t
     toplevel .t
     wm geometry .t 30x10+0+0
-    listbox .t.l -height 20 -width 20 -setgrid 1 
+    listbox .t.l -height 20 -width 20 -setgrid 1
     pack .t.l -fill both -expand 1
     update
     wm geometry .t
@@ -1337,7 +1337,7 @@ test unixWm-40.2 {Tk_SetGrid procedure, turning on grid when dimensions already
     destroy .t
     toplevel .t
     wm geometry .t 200x100+0+0
-    listbox .t.l -height 20 -width 20 
+    listbox .t.l -height 20 -width 20
     pack .t.l -fill both -expand 1
     update
     .t.l configure -setgrid 1
@@ -1750,7 +1750,7 @@ test unixWm-49.2 {Tk_GetRootCoords procedure, menubars} {unix testmenubar} {
     testmenubar window .t .t.m
     update
     list [expr [winfo rootx .t.m.f] - $x] [expr [winfo rooty .t.m.f] - $y] \
-	    [expr [winfo rootx .t.f] - $x] [expr [winfo rooty .t.f] - $y] 
+	    [expr [winfo rootx .t.f] - $x] [expr [winfo rooty .t.f] - $y]
 } {52 7 12 62}
 
 deleteWindows
diff --git a/tests/winFont.test b/tests/winFont.test
index b4e8516..de16560 100644
--- a/tests/winFont.test
+++ b/tests/winFont.test
@@ -1,10 +1,10 @@
-# This file is a Tcl script to test out the procedures in tkWinFont.c. 
+# This file is a Tcl script to test out the procedures in tkWinFont.c.
 # It is organized in the standard fashion for Tcl tests.
 #
 # Many of these tests are visually oriented and cannot be checked
 # programmatically (such as "does an underlined font appear to be
 # underlined?"); these tests attempt to exercise the code in question,
-# but there are no results that can be checked.  
+# but there are no results that can be checked.
 #
 # Copyright (c) 1996-1997 Sun Microsystems, Inc.
 # Copyright (c) 1998-1999 by Scriptics Corporation.
@@ -54,22 +54,22 @@ test winfont-1.2 {TkpGetNativeFont procedure: native} win {
 
 test winfont-2.1 {TkpGetFontFromAttributes procedure: pointsize} win {
     expr [font actual {-size -10} -size]>0
-} {1}
+} 1
 test winfont-2.2 {TkpGetFontFromAttributes procedure: pointsize} win {
     expr [font actual {-family Arial} -size]>0
-} {1}
+} 1
 test winfont-2.3 {TkpGetFontFromAttributes procedure: normal weight} win {
     font actual {-weight normal} -weight
-} {normal}
+} normal
 test winfont-2.4 {TkpGetFontFromAttributes procedure: bold weight} win {
     font actual {-weight bold} -weight
-} {bold}
+} bold
 test winfont-2.5 {TkpGetFontFromAttributes procedure: no family} win {
     catch {expr {[font actual {-size 10} -size]}}
 } 0
 test winfont-2.6 {TkpGetFontFromAttributes procedure: family} win {
     font actual {-family Arial} -family
-} {Arial}
+} Arial
 test winfont-2.7 {TkpGetFontFromAttributes procedure: Times fonts} win {
     set x {}
     lappend x [font actual {-family "Times"} -family]
@@ -122,7 +122,7 @@ test winfont-5.5 {Tk_MeasureChars procedure: include last partial char} win {
     .b.c dchars $t 0 end
     .b.c insert $t 0 "0000"
     .b.c index $t @[expr int($cx*2.5)],1
-} {2}
+} 2
 test winfont-5.6 {Tk_MeasureChars procedure: at least one char on line} win {
     .b.l config -text "000000" -wrap 1
     getsize
@@ -173,10 +173,10 @@ test winfont-7.2 {AllocFont procedure: extract info from logfont} win {
 } {-family Arial -size 10 -weight bold -slant italic -underline 1 -overstrike 1}
 test winfont-7.3 {AllocFont procedure: extract info from textmetric} win {
     font metric {arial 10 bold italic underline overstrike} -fixed
-} {0}
+} 0
 test winfont-7.4 {AllocFont procedure: extract info from textmetric} win {
     font metric systemfixed -fixed
-} {1}
+} 1
 
 # cleanup
 destroy .b
diff --git a/tests/winMenu.test b/tests/winMenu.test
index d3114bd..5b98c3b 100644
--- a/tests/winMenu.test
+++ b/tests/winMenu.test
@@ -579,7 +579,7 @@ test winMenu-22.1 {DrawMenuUnderline} win {
     .m1 add command -label foo -underline 0
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
-} {{} {}}   
+} {{} {}}
 
 test winMenu-23.1 {Don't know how to test MenuKeyBindProc} \
 	{win emptyTest} {} {}
@@ -997,7 +997,7 @@ test winMenu-32.19 {TkpComputeStandardMenuGeometry - three columns} win {
     .m1 add command -label four
     .m1 add command -label five -columnbreak 1
     .m1 add command -label six
-    list [update idletasks] [destroy .m1]    
+    list [update idletasks] [destroy .m1]
 } {{} {}}
 
 test winMenu-33.1 {TkpNotifyTopLevelCreate - no menu yet} win {
diff --git a/tests/winWm.test b/tests/winWm.test
index 838af04..d195771 100644
--- a/tests/winWm.test
+++ b/tests/winWm.test
@@ -106,7 +106,7 @@ test winWm-2.2 {TkpWmSetState} win {
     update
     lappend result [wm state .t]
     wm deiconify .t
-    update 
+    update
     lappend result [wm state .t]
     destroy .t
     set result
@@ -123,7 +123,7 @@ test winWm-2.3 {TkpWmSetState} win {
     update
     lappend result [wm state .t]
     wm state .t normal
-    update 
+    update
     lappend result [wm state .t]
     destroy .t
     set result
@@ -205,7 +205,7 @@ test winWm-5.1 {UpdateGeometryInfo: menu resizing} win {
     update
     lappend result [winfo height .t]
     destroy .t
-    
+
     set result
 } {50 50 31}
 test winWm-5.2 {UpdateGeometryInfo: menu resizing} win {
@@ -238,7 +238,7 @@ test winWm-6.2 {wm attributes} win {
     destroy .t
     toplevel .t
     wm attributes .t -disabled
-} {0}
+} 0
 test winWm-6.3 {wm attributes} win {
     # This isn't quite the correct error message yet, but it works.
     destroy .t
@@ -400,7 +400,7 @@ test winWm-9.0 "Bug #2799589 - delayed activation of destroyed window" -constrai
     global winwm90done
     set winwm90done wait
     toplevel .t
-} -body {    
+} -body {
     pack [button .t.b -text "Show" -command {winwm90proc1 .tx}]
     bind .t.b <Map> {bind %W <Map> {}; after idle {winwm90click %W}}
     after 5000 {set winwm90done timeout}
@@ -411,7 +411,7 @@ test winWm-9.0 "Bug #2799589 - delayed activation of destroyed window" -constrai
         rename winwm90$cmd {}
     }
     destroy .tx .t .sd
-} -result {ok}
+} -result ok
 
 test winWm-9.1 "delayed activation of grabbed destroyed window" -constraints win -setup {
     proc winwm91click {w} {
@@ -445,7 +445,7 @@ test winWm-9.1 "delayed activation of grabbed destroyed window" -constraints win
     global winwm91done
     set winwm91done wait
     toplevel .t
-} -body {    
+} -body {
     pack [button .t.b -text "Show" -command {winwm91proc1 .tx}]
     bind .t.b <Map> {bind %W <Map> {}; after idle {winwm91click %W}}
     after 5000 {set winwm91done timeout}
@@ -456,7 +456,7 @@ test winWm-9.1 "delayed activation of grabbed destroyed window" -constraints win
         rename winwm91$cmd {}
     }
     destroy .tx .t .sd
-} -result {ok}
+} -result ok
 
 test winWm-9.2 "check wm forget for unmapped parent (#3205464,#2967911)" -setup {
     destroy .t
-- 
cgit v0.12


From e93e116ad2aa508b450befa54af69522cc9d57ac Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 24 Sep 2020 15:03:57 +0000
Subject: Compile with gcc-10 too. Mark more test-cases as failing on Ubuntu

---
 .travis.yml                |  38 ++++------
 tests/bugs.tcl             |   2 +-
 tests/butGeom2.tcl         |   2 +-
 tests/canvPsGrph.tcl       |   6 +-
 tests/canvPsImg.tcl        |   2 +-
 tests/canvText.test        |   2 +-
 tests/imgPhoto.test        |   2 +-
 tests/option.file1         |   2 +-
 tests/scrollbar.test       |   4 +-
 tests/send.test            |   3 +-
 tests/textDisp.test        |   4 +-
 tests/tk.test              |  32 ++++-----
 tests/ttk/combobox.test    |   2 +-
 tests/ttk/image.test       |   2 +-
 tests/ttk/labelframe.test  |   8 +--
 tests/ttk/notebook.test    |   4 +-
 tests/ttk/panedwindow.test |   8 +--
 tests/ttk/progressbar.test |   2 +-
 tests/ttk/scrollbar.test   |   2 +-
 tests/ttk/treetags.test    |   2 +-
 tests/ttk/treeview.test    |  34 ++++-----
 tests/ttk/ttk.test         |  36 +++++-----
 tests/unixWm.test          |   2 +-
 tests/winWm.test           | 173 +++++++++++++++++++++++++++++----------------
 24 files changed, 205 insertions(+), 169 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0a63e50..417c652 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,8 @@
 language: c
 addons:
   apt:
+    sources:
+      - ubuntu-toolchain-r-test
     packages:
       - binutils-mingw-w64-i686
       - binutils-mingw-w64-x86-64
@@ -19,7 +21,7 @@ addons:
       - xquartz
 jobs:
   include:
-# Testing on Linux with various compilers
+# Testing on Linux GCC
     - name: "Linux/GCC/Shared"
       os: linux
       dist: focal
@@ -31,12 +33,12 @@ jobs:
       script: &x11gui
         - make binaries libraries tktest
         - make install
-        - make test-ttk >out-ttk.txt
-        - cat out-ttk.txt
-        - grep -q "Failed\t0" out-ttk.txt
         - make test-classic >out-classic.txt
         - cat out-classic.txt
         - grep -q "Failed\t0" out-classic.txt
+        - make test-ttk >out-ttk.txt
+        - cat out-ttk.txt
+        - grep -q "Failed\t0" out-ttk.txt
     - name: "Linux/GCC/Shared/no-xft"
       os: linux
       dist: focal
@@ -79,29 +81,15 @@ jobs:
       env:
         - BUILD_DIR=unix
         - CFGOPT="--enable-symbols"
-# Older versions of GCC...
-    - name: "Linux/GCC 7/Shared"
+# Newer/Older versions of GCC
+    - name: "Linux/GCC 10/Shared"
       os: linux
       dist: focal
-      compiler: gcc-7
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-7
-      env:
-        - BUILD_DIR=unix
-    - name: "Linux/GCC 6/Shared"
-      os: linux
-      dist: bionic
-      compiler: gcc-6
+      compiler: gcc-10
       addons:
         apt:
-          sources:
-            - ubuntu-toolchain-r-test
           packages:
-            - g++-6
+            - g++-10
       env:
         - BUILD_DIR=unix
     - name: "Linux/GCC 5/Shared"
@@ -110,13 +98,11 @@ jobs:
       compiler: gcc-5
       addons:
         apt:
-          sources:
-            - ubuntu-toolchain-r-test
           packages:
             - g++-5
       env:
         - BUILD_DIR=unix
-# Clang
+# Testing on Linux Clang
     - name: "Linux/Clang/Shared"
       os: linux
       dist: focal
@@ -145,7 +131,7 @@ jobs:
         - BUILD_DIR=unix
         - CFGOPT="--enable-symbols"
 # Testing on Mac, various styles
-    - name: "macOS/Clang/Xcode 11.7/Shared/XQuartz"
+    - name: "macOS/Xcode 11.7/Shared/XQuartz"
       os: osx
       osx_image: xcode11.7
       env:
diff --git a/tests/bugs.tcl b/tests/bugs.tcl
index 83d9519..55e5f84 100644
--- a/tests/bugs.tcl
+++ b/tests/bugs.tcl
@@ -1,6 +1,6 @@
 # This file is a Tcl script to test out various known bugs that will
 # cause Tk to crash.  This file ends with .tcl instead of .test to make
-# sure it isn't run when you type "source all".  We currently are not 
+# sure it isn't run when you type "source all".  We currently are not
 # shipping this file with the rest of the source release.
 #
 # Copyright (c) 1996 Sun Microsystems, Inc.
diff --git a/tests/butGeom2.tcl b/tests/butGeom2.tcl
index 96ff209..096225c 100644
--- a/tests/butGeom2.tcl
+++ b/tests/butGeom2.tcl
@@ -35,7 +35,7 @@ pack .t.anchorLabel .t.control.left.f -in .t.control.left -side top -anchor w
 foreach opt {activebackground activeforeground background disabledforeground foreground highlightbackground highlightcolor } {
     #button .t.color-$opt -text $opt -command "config -$opt \[tk_chooseColor]"
     menubutton .t.color-$opt -text $opt -menu .t.color-$opt.m -indicatoron 1 \
-        -relief raised -bd 2 
+        -relief raised -bd 2
     menu .t.color-$opt.m -tearoff 0
     .t.color-$opt.m add command -label Red -command "config -$opt red"
     .t.color-$opt.m add command -label Green -command "config -$opt green"
diff --git a/tests/canvPsGrph.tcl b/tests/canvPsGrph.tcl
index 343979f..08ccd74 100644
--- a/tests/canvPsGrph.tcl
+++ b/tests/canvPsGrph.tcl
@@ -50,13 +50,13 @@ proc mkObjs c {
 	$c create rect 380 200 420 240 -fill black
 	$c create rect 200 330 240 370 -fill black
     }
-    
+
     if {$what == "oval"} {
 	$c create oval 50 10 150 80 -fill black -stipple gray25 -outline {}
 	$c create oval 100 100 200 150 -outline {} -fill black -stipple gray50
 	$c create oval 250 100 400 300 -width .5c
     }
-    
+
     if {$what == "poly"} {
 	$c create poly 100 200 200 50 300 200 -smooth yes -stipple gray25 \
 		-outline black -width 4
@@ -68,7 +68,7 @@ proc mkObjs c {
 	$c create poly 20 200 100 220 90 100 40 250 \
 		-fill {} -outline brown -width 3
     }
-    
+
     if {$what == "line"} {
 	$c create line 20 20 120 20 -arrow both -width 5
 	$c create line 20 80 150 80 20 200 150 200 -smooth yes
diff --git a/tests/canvPsImg.tcl b/tests/canvPsImg.tcl
index c06aeaa..1f46eca 100644
--- a/tests/canvPsImg.tcl
+++ b/tests/canvPsImg.tcl
@@ -35,7 +35,7 @@ toplevel .t
 wm title .t "Postscript Tests for Canvases: Images"
 wm iconname .t "Postscript"
 
-message .t.m -text {This screen exercises the Postscript-generation abilities of Tk canvas widgets for images.  Click the buttons below to select a Visual type for the canvas and colormode for the Postscript output.  Then click "Print" to send the results to the default printer, or "Print to file" to put the Postscript output in a file called "/tmp/test.ps".  You can also click on items in the canvas to delete them.  
+message .t.m -text {This screen exercises the Postscript-generation abilities of Tk canvas widgets for images.  Click the buttons below to select a Visual type for the canvas and colormode for the Postscript output.  Then click "Print" to send the results to the default printer, or "Print to file" to put the Postscript output in a file called "/tmp/test.ps".  You can also click on items in the canvas to delete them.
 NOTE: Some Postscript printers may not be able to handle Postscript generated in color mode.} -width 6i
 pack .t.m -side top -fill both
 
diff --git a/tests/canvText.test b/tests/canvText.test
index f79e6df..77eb735 100644
--- a/tests/canvText.test
+++ b/tests/canvText.test
@@ -478,7 +478,7 @@ set font {Courier 12 italic}
 set ax [font measure $font 0]
 set ay [font metrics $font -linespace]
 
-test canvText-17.1 {TextToPostscript procedure} {
+test canvText-17.1 {TextToPostscript procedure} failsOnUbuntu {
     .c delete all
     .c config -height 300 -highlightthickness 0 -bd 0
     update
diff --git a/tests/imgPhoto.test b/tests/imgPhoto.test
index eda0c13..bd3e8ca 100644
--- a/tests/imgPhoto.test
+++ b/tests/imgPhoto.test
@@ -454,7 +454,7 @@ test imgPhoto-4.74 {ImgPhotoCmd procedure: put option error handling} -setup {
     photo1 put {{white}} -to 10 10 20 20 {{white}}
 } -cleanup {
     image delete photo1
-} -returnCodes 1 -result {wrong # args: should be "photo1 put data ?options?"}
+} -returnCodes error -result {wrong # args: should be "photo1 put data ?options?"}
 test imgPhoto-4.75 {<photo> read command: filename starting with '-'} -constraints {
     hasTeapotPhoto
 } -body {
diff --git a/tests/option.file1 b/tests/option.file1
index 32b4a18..c5a216e 100644
--- a/tests/option.file1
+++ b/tests/option.file1
@@ -13,6 +13,6 @@ ple
 *x 4:	brown
 # More comments, this time delimited by hash-marks.
 	# Comment-line with space.
-*x6:	  
+*x6:
 *x9: \ \	\\\101\n
 # comment line as last line of file.
diff --git a/tests/scrollbar.test b/tests/scrollbar.test
index 8b631fa..e69e1d2 100644
--- a/tests/scrollbar.test
+++ b/tests/scrollbar.test
@@ -565,10 +565,10 @@ test scrollbar-6.43 {ScrollbarPosition procedure} {testmetrics win} {
     .t.s identify [expr int(.4 / [.t.s delta 1 0]) + [testmetrics cxhscroll .t.s] \
 		       - 1] [expr [winfo height .t.s] / 2]
 } {slider}
-test scrollbar-6.44 {ScrollbarPosition procedure} unix {
+test scrollbar-6.44 {ScrollbarPosition procedure} {unix failsOnUbuntu} {
     .t.s identify 100 18
 } {trough2}
-test scrollbar-6.46 {ScrollbarPosition procedure} win {
+test scrollbar-6.45 {ScrollbarPosition procedure} win {
     .t.s identify 100 [expr [winfo height .t.s] - 1]
 } {trough2}
 
diff --git a/tests/send.test b/tests/send.test
index b4ed50b..16d4202 100644
--- a/tests/send.test
+++ b/tests/send.test
@@ -15,6 +15,7 @@ eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
 testConstraint xhost [llength [auto_execok xhost]]
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
 
 # Compute a script that will load Tk into a child interpreter.
 
@@ -284,7 +285,7 @@ test send-8.14 {Tk_SendCmd procedure, local interp killed by send} {secureserver
 
 catch {interp delete t_s_2}
 
-test send-8.15 {Tk_SendCmd procedure, local interp, error info} {secureserver testsend} {
+test send-8.15 {Tk_SendCmd procedure, local interp, error info} {secureserver testsend failsOnUbuntu} {
     catch {error foo}
     list [catch {send t_s_1 {if 1 {open bogus_file_name}}} msg] $msg $errorInfo $errorCode
 } {1 {couldn't open "bogus_file_name": no such file or directory} {couldn't open "bogus_file_name": no such file or directory
diff --git a/tests/textDisp.test b/tests/textDisp.test
index 8d130ae..2be64ce 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -2808,7 +2808,7 @@ test textDisp-19.16 {count -ypixels} {
       [.t count -ypixels 16.0 "16.0 displaylineend +1c"] \
       [.t count -ypixels "16.0 +1 displaylines" "16.0 +4 displaylines +3c"]
 } [list [expr {260 + 20 * $fixedDiff}] [expr {260 + 20 * $fixedDiff}] $fixedHeight [expr {2*$fixedHeight}] $fixedHeight [expr {3*$fixedHeight}]]
-test textDisp-19.17 {count -ypixels with indices in elided lines} {
+test textDisp-19.17 {count -ypixels with indices in elided lines} failsOnUbuntu {
     .t configure -wrap none
     .t delete 1.0 end
     for {set i 1} {$i < 100} {incr i} {
@@ -2835,7 +2835,7 @@ test textDisp-19.17 {count -ypixels with indices in elided lines} {
     .t yview 35.0
     lappend res [.t count -ypixels 5.0 25.0]
 } [list [expr {4 * $fixedHeight}] [expr {3 * $fixedHeight}] 0 0 0 0 0 0 [expr {5 * $fixedHeight}] [expr {- 5 * $fixedHeight}] [expr {2 * $fixedHeight}] [expr {3 * $fixedHeight}] [expr {5 * $fixedHeight}]]
-test textDisp-19.18 {count -ypixels with indices in elided lines} {
+test textDisp-19.18 {count -ypixels with indices in elided lines} failsOnUbuntu {
     .t configure -wrap none
     .t delete 1.0 end
     for {set i 1} {$i < 100} {incr i} {
diff --git a/tests/tk.test b/tests/tk.test
index 76455d7..48f3d46 100644
--- a/tests/tk.test
+++ b/tests/tk.test
@@ -12,16 +12,16 @@ namespace import -force tcltest::test
 
 test tk-1.1 {tk command: general} -body {
     tk
-} -returnCodes 1 -result {wrong # args: should be "tk option ?arg?"}
+} -returnCodes error -result {wrong # args: should be "tk option ?arg?"}
 test tk-1.2 {tk command: general} -body {
     tk xyz
-} -returnCodes 1 -result {bad option "xyz": must be appname, caret, scaling, useinputmethods, windowingsystem, or inactive}
+} -returnCodes error -result {bad option "xyz": must be appname, caret, scaling, useinputmethods, windowingsystem, or inactive}
 
 # Value stored to restore default settings after 2.* tests
 set appname [tk appname]
 test tk-2.1 {tk command: appname} -body {
     tk appname xyz abc
-} -returnCodes 1 -result {wrong # args: should be "tk appname ?newName?"}
+} -returnCodes error -result {wrong # args: should be "tk appname ?newName?"}
 test tk-2.2 {tk command: appname} -body {
     tk appname foobazgarply
 } -result foobazgarply
@@ -38,7 +38,7 @@ tk appname $appname
 set scaling [tk scaling]
 test tk-3.1 {tk command: scaling} -body {
     tk scaling -displayof
-} -returnCodes 1 -result {value for "-displayof" missing}
+} -returnCodes error -result {value for "-displayof" missing}
 test tk-3.2 {tk command: scaling: get current} -body {
     tk scaling 1
     format %.2g [tk scaling]
@@ -49,10 +49,10 @@ test tk-3.3 {tk command: scaling: get current} -body {
 } -result 1.25
 test tk-3.4 {tk command: scaling: set new} -body {
     tk scaling xyz
-} -returnCodes 1 -result {expected floating-point number but got "xyz"}
+} -returnCodes error -result {expected floating-point number but got "xyz"}
 test tk-3.5 {tk command: scaling: set new} -body {
     tk scaling -displayof . xyz
-} -returnCodes 1 -result {expected floating-point number but got "xyz"}
+} -returnCodes error -result {expected floating-point number but got "xyz"}
 test tk-3.6 {tk command: scaling: set new} -body {
     tk scaling 1
     format %.2g [tk scaling]
@@ -85,7 +85,7 @@ tk scaling $scaling
 set useim [tk useinputmethods]
 test tk-4.1 {tk command: useinputmethods} -body {
     tk useinputmethods -displayof
-} -returnCodes 1 -result {value for "-displayof" missing}
+} -returnCodes error -result {value for "-displayof" missing}
 test tk-4.2 {tk command: useinputmethods: get current} -body {
     tk useinputmethods no
 } -cleanup {
@@ -99,10 +99,10 @@ test tk-4.3 {tk command: useinputmethods: get current} -body {
 } -result 0
 test tk-4.4 {tk command: useinputmethods: set new} -body {
     tk useinputmethods xyz
-} -returnCodes 1 -result {expected boolean value but got "xyz"}
+} -returnCodes error -result {expected boolean value but got "xyz"}
 test tk-4.5 {tk command: useinputmethods: set new} -body {
     tk useinputmethods -displayof . xyz
-} -returnCodes 1 -result {expected boolean value but got "xyz"}
+} -returnCodes error -result {expected boolean value but got "xyz"}
 test tk-4.6 {tk command: useinputmethods: set new} -constraints unix -body {
     # This isn't really a test, but more of a check... The answer is what was
     # given, because we may be on a Unix system that doesn't have the XIM
@@ -122,16 +122,16 @@ test tk-4.7 {tk command: useinputmethods: set new} -constraints win -body {
 
 test tk-5.1 {tk caret} -body {
     tk caret
-} -returnCodes 1 -result {wrong # args: should be "tk caret window ?-x x? ?-y y? ?-height height?"}
+} -returnCodes error -result {wrong # args: should be "tk caret window ?-x x? ?-y y? ?-height height?"}
 test tk-5.2 {tk caret} -body {
     tk caret bogus
-} -returnCodes 1 -result {bad window path name "bogus"}
+} -returnCodes error -result {bad window path name "bogus"}
 test tk-5.3 {tk caret} -body {
     tk caret . -foo
-} -returnCodes 1 -result {bad caret option "-foo": must be -x, -y, or -height}
+} -returnCodes error -result {bad caret option "-foo": must be -x, -y, or -height}
 test tk-5.4 {tk caret} -body {
     tk caret . -x 0 -y
-} -returnCodes 1 -result {wrong # args: should be "tk caret window ?-x x? ?-y y? ?-height height?"}
+} -returnCodes error -result {wrong # args: should be "tk caret window ?-x x? ?-y y? ?-height height?"}
 test tk-5.5 {tk caret} -body {
     tk caret . -x 10 -y 11 -h 12; tk caret .
 } -result {-height 12 -x 10 -y 11}
@@ -148,10 +148,10 @@ test tk-6.2 {tk inactive reset} -body {
 } -match glob -result *
 test tk-6.3 {tk inactive wrong argument} -body {
     tk inactive foo
-} -returnCodes 1 -result {bad option "foo": must be reset}
+} -returnCodes error -result {bad option "foo": must be reset}
 test tk-6.4 {tk inactive too many arguments} -body {
     tk inactive reset foo
-} -returnCodes 1 -result {wrong # args: should be "tk inactive ?-displayof window? ?reset?"}
+} -returnCodes error -result {wrong # args: should be "tk inactive ?-displayof window? ?reset?"}
 test tk-6.5 {tk inactive} -body {
     tk inactive reset
     update
@@ -175,7 +175,7 @@ test tk-7.2 {tk inactive reset in a safe interpreter} -body {
     foo eval {tk inactive reset}
 } -cleanup {
     ::safe::interpDelete foo
-} -returnCodes 1 -result {resetting the user inactivity timer is not allowed in a safe interpreter}
+} -returnCodes error -result {resetting the user inactivity timer is not allowed in a safe interpreter}
 
 # cleanup
 cleanupTests
diff --git a/tests/ttk/combobox.test b/tests/ttk/combobox.test
index 577d449..e3e4373 100644
--- a/tests/ttk/combobox.test
+++ b/tests/ttk/combobox.test
@@ -13,7 +13,7 @@ test combobox-1.0 "Combobox tests -- setup" -body {
 
 test combobox-1.1 "Bad -values list" -body {
     .cb configure -values "bad \{list"
-} -result "unmatched open brace in list" -returnCodes 1
+} -result "unmatched open brace in list" -returnCodes error
 
 test combobox-1.end "Combobox tests -- cleanup" -body {
     destroy .cb
diff --git a/tests/ttk/image.test b/tests/ttk/image.test
index 5e48d5c..bfc71b8 100644
--- a/tests/ttk/image.test
+++ b/tests/ttk/image.test
@@ -11,7 +11,7 @@ test image-1.2 "Duplicate element" -setup {
     ttk::style element create testElement image test.element
 } -body {
     ttk::style element create testElement image test.element
-} -returnCodes 1 -result "Duplicate element testElement"
+} -returnCodes error -result "Duplicate element testElement"
 
 test image-2.0 "Deletion of displayed image (label)" -setup {
      image create photo test.image -width 10 -height 10
diff --git a/tests/ttk/labelframe.test b/tests/ttk/labelframe.test
index 649c35f..896ddb0 100644
--- a/tests/ttk/labelframe.test
+++ b/tests/ttk/labelframe.test
@@ -10,22 +10,22 @@ test labelframe-2.1 "Can't use indirect descendant as labelwidget" -body {
     ttk::frame .lf.t
     ttk::checkbutton .lf.t.cb
     .lf configure -labelwidget .lf.t.cb
-} -returnCodes 1 -result "can't *" -match glob \
+} -returnCodes error -result "can't *" -match glob \
   -cleanup { destroy .lf.t } ;
 
 test labelframe-2.2 "Can't use toplevel as labelwidget" -body {
     toplevel .lf.t
     .lf configure -labelwidget .lf.t
-} -returnCodes 1 -result "can't *" -match glob \
+} -returnCodes error -result "can't *" -match glob \
   -cleanup { destroy .lf.t } ;
 
 test labelframe-2.3 "Can't use non-windows as -labelwidget" -body {
     .lf configure -labelwidget BogusWindowName
-} -returnCodes 1 -result {bad window path name "BogusWindowName"}
+} -returnCodes error -result {bad window path name "BogusWindowName"}
 
 test labelframe-2.4 "Can't use nonexistent-windows as -labelwidget" -body {
     .lf configure -labelwidget .nosuchwindow
-} -returnCodes 1 -result {bad window path name ".nosuchwindow"}
+} -returnCodes error -result {bad window path name ".nosuchwindow"}
 
 
 ###
diff --git a/tests/ttk/notebook.test b/tests/ttk/notebook.test
index 3a2a6ff..9b75978 100644
--- a/tests/ttk/notebook.test
+++ b/tests/ttk/notebook.test
@@ -24,11 +24,11 @@ test notebook-1.3 "Cannot add toplevel" -body {
     .nb add [toplevel .nb.t]
 } -cleanup {
     destroy .t.nb
-} -returnCodes 1 -match glob -result "can't add .nb.t*"
+} -returnCodes error -match glob -result "can't add .nb.t*"
 
 test notebook-1.4 "Try to select bad tab" -body {
     .nb select @6000,6000
-} -returnCodes 1 -match glob -result "* not found"
+} -returnCodes error -match glob -result "* not found"
 
 #
 # Now add stuff:
diff --git a/tests/ttk/panedwindow.test b/tests/ttk/panedwindow.test
index c1fc6ac..90c2ac2 100644
--- a/tests/ttk/panedwindow.test
+++ b/tests/ttk/panedwindow.test
@@ -46,7 +46,7 @@ test panedwindow-1.7 "Make sure empty panedwindow still still doesn't crash" -bo
 
 test panedwindow-1.8 "Re-forget pane" -body {
     .pw forget .pw.f1
-} -returnCodes 1 -result ".pw.f1 is not managed by .pw"
+} -returnCodes error -result ".pw.f1 is not managed by .pw"
 
 test panedwindow-1.end "Cleanup" -body {
     destroy .pw
@@ -118,11 +118,11 @@ test panedwindow-3.0 "configure pane" -body {
 
 test panedwindow-3.1 "configure pane -- errors" -body {
     .pw pane 1 -weight -4
-} -returnCodes 1 -match glob -result "-weight must be nonnegative"
+} -returnCodes error -match glob -result "-weight must be nonnegative"
 
 test panedwindow-3.2 "add pane -- errors" -body {
     .pw add [ttk::label .pw.l] -weight -1
-} -returnCodes 1 -match glob -result "-weight must be nonnegative"
+} -returnCodes error -match glob -result "-weight must be nonnegative"
 
 
 test panedwindow-3.end "cleanup" -body { destroy .pw }
@@ -146,7 +146,7 @@ test panedwindow-4.1 "forget" -body {
 
 test panedwindow-4.2 "forget forgotten" -body {
     .pw forget .pw.l1
-} -returnCodes 1 -result ".pw.l1 is not managed by .pw"
+} -returnCodes error -result ".pw.l1 is not managed by .pw"
 
 # checkorder $winlist --
 #	Ensure that Y coordinates windows in $winlist are strictly increasing.
diff --git a/tests/ttk/progressbar.test b/tests/ttk/progressbar.test
index b9add86..882c604 100644
--- a/tests/ttk/progressbar.test
+++ b/tests/ttk/progressbar.test
@@ -76,7 +76,7 @@ test progressbar-2.5 "error in write trace" -body {
     trace variable PB w { error "YIPES!" ;# }
     .pb step
     set PB		;# NOTREACHED
-} -cleanup { unset PB } -returnCodes 1 -match glob -result "*YIPES!"
+} -cleanup { unset PB } -returnCodes error -match glob -result "*YIPES!"
 
 test progressbar-end "Cleanup" -body {
     destroy .pb
diff --git a/tests/ttk/scrollbar.test b/tests/ttk/scrollbar.test
index 1f8d158..362dab8 100644
--- a/tests/ttk/scrollbar.test
+++ b/tests/ttk/scrollbar.test
@@ -63,7 +63,7 @@ test scale-1.0 "Self-destruction" -body {
     ttk::scale .s -variable v
     pack .s ; update
     .s set 1 ; update
-} -returnCodes 1 -match glob -result "*"
+} -returnCodes error -match glob -result "*"
 
 tcltest::cleanupTests
 
diff --git a/tests/ttk/treetags.test b/tests/ttk/treetags.test
index f91673f..a26d91f 100644
--- a/tests/ttk/treetags.test
+++ b/tests/ttk/treetags.test
@@ -165,7 +165,7 @@ test treetags-2.3 "Virtual events delivered to focus item" -body {
 
 test treetags-2.4 "Bad events" -body {
     $tv tag bind bad <Enter> { puts "Entered!" }
-} -returnCodes 1 -result "unsupported event <Enter>*" -match glob
+} -returnCodes error -result "unsupported event <Enter>*" -match glob
 
 test treetags-3.0 "tag configure - set" -body {
     $tv tag configure tag1 -foreground blue -background red
diff --git a/tests/ttk/treeview.test b/tests/ttk/treeview.test
index d8bc65d..c8f1556 100644
--- a/tests/ttk/treeview.test
+++ b/tests/ttk/treeview.test
@@ -45,33 +45,33 @@ test treeview-1.1 "columns" -body {
 test treeview-1.2 "Bad columns" -body {
     #.tv configure -columns {illegal "list"value}
     ttk::treeview .badtv -columns {illegal "list"value}
-} -returnCodes 1 -result "list element in quotes followed by*" -match glob
+} -returnCodes error -result "list element in quotes followed by*" -match glob
 
 test treeview-1.3 "bad displaycolumns" -body {
     .tv configure -displaycolumns {a b d}
-} -returnCodes 1 -result "Invalid column index d"
+} -returnCodes error -result "Invalid column index d"
 
 test treeview-1.4 "more bad displaycolumns" -body {
     .tv configure -displaycolumns {1 2 3}
-} -returnCodes 1 -result "Column index 3 out of bounds"
+} -returnCodes error -result "Column index 3 out of bounds"
 
 test treeview-1.5 "Don't forget to check negative numbers" -body {
     .tv configure -displaycolumns {1 -2 3}
-} -returnCodes 1 -result "Column index -2 out of bounds"
+} -returnCodes error -result "Column index -2 out of bounds"
 
 # Item creation.
 #
 test treeview-2.1 "insert -- not enough args" -body {
     .tv insert
-} -returnCodes 1 -result "wrong # args: *" -match glob
+} -returnCodes error -result "wrong # args: *" -match glob
 
 test treeview-2.3 "insert -- bad integer index" -body {
     .tv insert {} badindex
-} -returnCodes 1 -result "expected integer *" -match glob
+} -returnCodes error -result "expected integer *" -match glob
 
 test treeview-2.4 "insert -- bad parent node" -body {
     .tv insert badparent end
-} -returnCodes 1 -result "Item badparent not found" -match glob
+} -returnCodes error -result "Item badparent not found" -match glob
 
 test treeview-2.5 "insert -- finaly insert a node" -body {
     .tv insert {} end -id newnode -text "New node"
@@ -83,7 +83,7 @@ test treeview-2.6 "insert -- make sure node was inserted" -body {
 
 test treeview-2.7 "insert -- prevent duplicate node names" -body {
     .tv insert {} end -id newnode
-} -returnCodes 1 -result "Item newnode already exists"
+} -returnCodes error -result "Item newnode already exists"
 
 test treeview-2.8 "insert -- new node at end" -body {
     .tv insert {} end -id lastnode
@@ -125,7 +125,7 @@ test treeview-2.13 "insert -- one more at beginning" -body {
 
 test treeview-2.14 "insert -- bad options" -body {
     .tv insert {} end -badoption foo
-} -returnCodes 1 -result {unknown option "-badoption"}
+} -returnCodes error -result {unknown option "-badoption"}
 
 test treeview-2.15 "insert -- at position 0 w/no children" -body {
     .tv insert newnode 0 -id newnode.n2 -text "Foo"
@@ -201,7 +201,7 @@ test treeview-3.11 "Can't detach root item" -body {
     .tv detach [list {}]
     update
     consistencyCheck .tv
-} -returnCodes 1 -result "Cannot detach root item"
+} -returnCodes error -result "Cannot detach root item"
 consistencyCheck .tv
 
 test treeview-3.12 "Reattach" -body {
@@ -274,7 +274,7 @@ test treeview-4.3 "opened - closed node" -body {
 
 test treeview-5.1 "item -- error checks" -body {
     .tv item newnode -text "Bad values" -values "{bad}list"
-} -returnCodes 1 -result "list element in braces followed by*" -match glob
+} -returnCodes error -result "list element in braces followed by*" -match glob
 
 test treeview-5.2 "item -- error leaves options unchanged " -body {
     .tv item newnode -text
@@ -297,11 +297,11 @@ test treeview-5.5 "set cell" -body {
 
 test treeview-5.6 "set illegal cell" -body {
     .tv set newnode #0 YYY
-} -returnCodes 1 -result "Display column #0 cannot be set"
+} -returnCodes error -result "Display column #0 cannot be set"
 
 test treeview-5.7 "set illegal cell" -body {
     .tv set newnode 3 YY	;# 3 == current #columns
-} -returnCodes 1 -result "Column index 3 out of bounds"
+} -returnCodes error -result "Column index 3 out of bounds"
 
 test treeview-5.8 "set display columns" -body {
     .tv configure -displaycolumns [list 2 1 0]
@@ -317,7 +317,7 @@ test treeview-5.9 "display columns part 2" -body {
 
 test treeview-5.10 "cannot set column -id" -body {
     .tv column #1 -id X
-} -returnCodes 1 -result "Attempt to change read-only option"
+} -returnCodes error -result "Attempt to change read-only option"
 
 test treeview-5.11 "get" -body {
     .tv set newnode #1
@@ -405,7 +405,7 @@ test treeview-7.1 "move" -body {
 
 test treeview-7.2 "illegal move" -body {
    .tv move d d2 end
-} -returnCodes 1 -result "Cannot insert d as a descendant of d2"
+} -returnCodes error -result "Cannot insert d as a descendant of d2"
 
 test treeview-7.3 "illegal move has no effect" -body {
     consistencyCheck .tv
@@ -426,7 +426,7 @@ test treeview-7.5 "replace children - precondition" -body {
 
 test treeview-7.6 "Replace children - illegal move" -body {
     .tv children newnode.n1 [list newnode.n1 newnode.n2 newnode.n3]
-} -returnCodes 1 -result "Cannot insert newnode.n1 as a descendant of newnode.n1"
+} -returnCodes error -result "Cannot insert newnode.n1 as a descendant of newnode.n1"
 
 consistencyCheck .tv
 
@@ -457,7 +457,7 @@ test treeview-8.4 "Selection - clear" -body {
 
 test treeview-8.5 "Selection - bad operation" -body {
     .tv selection badop foo
-} -returnCodes 1 -match glob -result {bad selection operation "badop": must be *}
+} -returnCodes error -match glob -result {bad selection operation "badop": must be *}
 
 ### NEED: more tests for see/yview/scrolling
 
diff --git a/tests/ttk/ttk.test b/tests/ttk/ttk.test
index f3abdef..8ad7887 100644
--- a/tests/ttk/ttk.test
+++ b/tests/ttk/ttk.test
@@ -31,7 +31,7 @@ test ttk-6.1 "Self-destructing checkbutton" -body {
     trace variable sd w [list selfdestruct .sd]
     update
     .sd invoke
-} -returnCodes 1
+} -returnCodes error
 test ttk-6.2 "Checkbutton self-destructed" -body {
     winfo exists .sd
 } -result 0
@@ -145,7 +145,7 @@ test ttk-1.2 "Check style" -body {
 
 test ttk-1.3 "Set bad style" -body {
     .t configure -style "nosuchstyle"
-} -returnCodes 1 -result {Layout nosuchstyle not found}
+} -returnCodes error -result {Layout nosuchstyle not found}
 
 test ttk-1.4 "Original style preserved" -body {
     .t cget -style
@@ -237,11 +237,11 @@ foreach wc $widgetClasses {
 # misc. error detection
 test ttk-3.0 "Bad option" -body {
     ttk::button .bad -badoption foo
-} -returnCodes 1 -result {unknown option "-badoption"} -match glob
+} -returnCodes error -result {unknown option "-badoption"} -match glob
 
 test ttk-3.1 "Make sure widget command not created" -body {
     .bad state disabled
-} -returnCodes 1 -result {invalid command name ".bad"} -match glob
+} -returnCodes error -result {invalid command name ".bad"} -match glob
 
 test ttk-3.2 "Propagate errors from variable traces" -body {
     set A 0
@@ -254,7 +254,7 @@ test ttk-3.2 "Propagate errors from variable traces" -body {
 
 test ttk-3.3 "Constructor failure with cursor" -body {
     ttk::button .b -cursor bottom_right_corner -style BadStyle
-} -returnCodes 1 -result "Layout BadStyle not found"
+} -returnCodes error -result "Layout BadStyle not found"
 
 test ttk-3.4 "SF#2009213" -body {
     ttk::style configure TScale -sliderrelief {}
@@ -390,12 +390,12 @@ test ttk-8.4 "ImageChanged" -body {
 
 test ttk-9.1 "Traces on nonexistant namespaces" -body {
     ttk::checkbutton .tcb -variable foo::bar
-} -returnCodes 1 -result "*parent namespace doesn't exist*" -match glob
+} -returnCodes error -result "*parent namespace doesn't exist*" -match glob
 
 test ttk-9.2 "Traces on nonexistant namespaces II" -body {
     ttk::checkbutton .tcb -variable X
     .tcb configure -variable foo::bar
-} -returnCodes 1 -result "*parent namespace doesn't exist*" -match glob
+} -returnCodes error -result "*parent namespace doesn't exist*" -match glob
 
 test ttk-9.3 "Restore saved options on configure error" -body {
     .tcb cget -variable
@@ -460,7 +460,7 @@ test ttk-10.3 "Check class resource" -body {
 
 test ttk-10.4 "Try to modify class resource" -body {
     .f configure -class Bar
-} -returnCodes 1 -match glob -result "*read-only option*"
+} -returnCodes error -match glob -result "*read-only option*"
 
 test ttk-10.5 "Check class resource again" -body {
     .f cget -class
@@ -537,14 +537,14 @@ test ttk-12.4 "-borderwidth frame option" -body {
 
 test ttk-13.1 "Custom styles -- bad -style option" -body {
     ttk::button .tb1 -style badstyle
-} -returnCodes 1 -result "*badstyle not found*" -match glob
+} -returnCodes error -result "*badstyle not found*" -match glob
 
 test ttk-13.4 "Custom styles -- bad -style option" -body {
     ttk::button .tb1
     .tb1 configure -style badstyle
 } -cleanup {
     destroy .tb1
-} -returnCodes 1 -result "*badstyle not found*" -match glob
+} -returnCodes error -result "*badstyle not found*" -match glob
 
 test ttk-13.5 "Custom layouts -- missing element definition" -body {
     ttk::style layout badstyle {
@@ -562,17 +562,17 @@ test ttk-13.5 "Custom layouts -- missing element definition" -body {
 
 test ttk-14.1 "-variable in nonexistant namespace" -body {
     ttk::checkbutton .tw -variable ::nsn::foo
-} -returnCodes 1 -result {can't trace *: parent namespace doesn't exist} \
+} -returnCodes error -result {can't trace *: parent namespace doesn't exist} \
   -match glob -cleanup { destroy .tw }
 
 test ttk-14.2 "-textvariable in nonexistant namespace" -body {
     ttk::label .tw -textvariable ::nsn::foo
-} -returnCodes 1 -result {can't trace *: parent namespace doesn't exist} \
+} -returnCodes error -result {can't trace *: parent namespace doesn't exist} \
   -match glob -cleanup { destroy .tw }
 
 test ttk-14.3 "-textvariable in nonexistant namespace" -body {
     ttk::entry .tw -textvariable ::nsn::foo
-} -returnCodes 1 -result {can't trace *: parent namespace doesn't exist} \
+} -returnCodes error -result {can't trace *: parent namespace doesn't exist} \
   -match glob -cleanup { destroy .tw }
 
 test ttk-15.1 {Bug 3062331} -setup {
@@ -618,27 +618,27 @@ proc wrong#varargs {varpart args} {
 
 test ttk-ensemble-0 "style element create: insufficient args" -body {
      ttk::style
-} -returnCodes 1 -result \
+} -returnCodes error -result \
     [wrong#varargs arg ttk::style option]
 
 test ttk-ensemble-1 "style element create: insufficient args" -body {
      ttk::style element
-} -returnCodes 1 -result \
+} -returnCodes error -result \
     [wrong#varargs arg ttk::style element option]
 
 test ttk-ensemble-2 "style element create: insufficient args" -body {
      ttk::style element create
-} -returnCodes 1 -result \
+} -returnCodes error -result \
     [wrong#varargs {-option value} ttk::style element create name type]
 
 test ttk-ensemble-3 "style element create: insufficient args" -body {
      ttk::style element create plain.background
-} -returnCodes 1 -result \
+} -returnCodes error -result \
     [wrong#varargs {-option value} ttk::style element create name type]
 
 test ttk-ensemble-4 "style element create: insufficient args" -body {
      ttk::style element create plain.background from
-} -returnCodes 1 -result [wrong#args theme ?element?]
+} -returnCodes error -result [wrong#args theme ?element?]
 
 test ttk-ensemble-5 "style element create: valid" -body {
      ttk::style element create plain.background from default
diff --git a/tests/unixWm.test b/tests/unixWm.test
index e292d38..cd6394d 100644
--- a/tests/unixWm.test
+++ b/tests/unixWm.test
@@ -2471,7 +2471,7 @@ test unixWm-60.5 {wm attributes - bad attribute} -constraints unix -body {
     destroy .t
     toplevel .t
     wm attributes .t -foo
-} -returnCodes 1 -match glob -result {bad attribute "-foo":*}
+} -returnCodes error -match glob -result {bad attribute "-foo":*}
 
 test unixWm-61.1 {Tk_WmCmd procedure, "iconphoto" option} unix {
     list [catch {wm iconph .} msg] $msg
diff --git a/tests/winWm.test b/tests/winWm.test
index d195771..94f18d5 100644
--- a/tests/winWm.test
+++ b/tests/winWm.test
@@ -188,8 +188,10 @@ test winWm-4.1 {ConfigureTopLevel: menu resizing} win {
 # of the clientarea when a menu wraps so I believe this test to be wrong.
 # Original result was {50 50 50} new result may depend on the default menu
 # font
-test winWm-5.1 {UpdateGeometryInfo: menu resizing} win {
+test winWm-5.1 {UpdateGeometryInfo: menu resizing} -constraints win -setup {
+    destroy .t
     set result {}
+} -body {
     toplevel .t
     frame .t.f -width 150 -height 50 -background red
     pack .t.f
@@ -204,11 +206,12 @@ test winWm-5.1 {UpdateGeometryInfo: menu resizing} win {
     .t.m add command -label "thisisreallylong"
     update
     lappend result [winfo height .t]
+} -cleanup {
     destroy .t
-
-    set result
-} {50 50 31}
-test winWm-5.2 {UpdateGeometryInfo: menu resizing} win {
+} -result {50 50 31}
+test winWm-5.2 {UpdateGeometryInfo: menu resizing} -constraints win -setup {
+    destroy .t
+} -body {
     set result {}
     toplevel .t
     frame .t.f -width 150 -height 50 -background red
@@ -227,28 +230,40 @@ test winWm-5.2 {UpdateGeometryInfo: menu resizing} win {
     lappend result [expr {$y - [winfo rooty .t]}]
     destroy .t
     set result
-} {50 50 0}
+} -cleanup {
+    destroy .t
+} -result {50 50 0}
 
-test winWm-6.1 {wm attributes} win {
+test winWm-6.1 {wm attributes} -constraints win -setup {
     destroy .t
+} -body {
     toplevel .t
     wm attributes .t
-} {-alpha 1.0 -transparentcolor {} -disabled 0 -fullscreen 0 -toolwindow 0 -topmost 0}
-test winWm-6.2 {wm attributes} win {
+} -cleanup {
+    destroy .t
+} -result {-alpha 1.0 -transparentcolor {} -disabled 0 -fullscreen 0 -toolwindow 0 -topmost 0}
+test winWm-6.2 {wm attributes} -constraints win -setup {
     destroy .t
+} -body {
     toplevel .t
     wm attributes .t -disabled
-} 0
-test winWm-6.3 {wm attributes} win {
-    # This isn't quite the correct error message yet, but it works.
+} -cleanup {
+    destroy .t
+} -result {0}
+test winWm-6.3 {wm attributes} -constraints win -setup {
     destroy .t
+} -body {
+    # This isn't quite the correct error message yet, but it works.
     toplevel .t
-    list [catch {wm attributes .t -foo} msg] $msg
-} {1 {wrong # args: should be "wm attributes window ?-alpha ?double?? ?-transparentcolor ?color?? ?-disabled ?bool?? ?-fullscreen ?bool?? ?-toolwindow ?bool?? ?-topmost ?bool??"}}
+    wm attributes .t -foo
+} -cleanup {
+    destroy .t
+} -returnCodes error -result {wrong # args: should be "wm attributes window ?-alpha ?double?? ?-transparentcolor ?color?? ?-disabled ?bool?? ?-fullscreen ?bool?? ?-toolwindow ?bool?? ?-topmost ?bool??"}
 
-test winWm-6.4 {wm attributes -alpha} win {
-    # Expect this to return all 1.0 {} on pre-2K/XP
+test winWm-6.4 {wm attributes -alpha} -constraints win -setup {
     destroy .t
+} -body {
+    # Expect this to return all 1.0 {} on pre-2K/XP
     toplevel .t
     set res [wm attributes .t -alpha]
     # we don't return on set yet
@@ -258,72 +273,94 @@ test winWm-6.4 {wm attributes -alpha} win {
     lappend res [wm attributes .t -alpha]
     lappend res [wm attributes .t -alpha 100]
     lappend res [wm attributes .t -alpha]
-    set res
-} {1.0 {} 0.5 {} 0.0 {} 1.0}
+    return $res
+} -cleanup {
+    destroy .t
+} -result {1.0 {} 0.5 {} 0.0 {} 1.0}
 
-test winWm-6.5 {wm attributes -alpha} win {
+test winWm-6.5 {wm attributes -alpha} -constraints win -setup {
     destroy .t
+} -body {
     toplevel .t
-    list [catch {wm attributes .t -alpha foo} msg] $msg
-} {1 {expected floating-point number but got "foo"}}
+    wm attributes .t -alpha foo
+} -cleanup {
+    destroy .t
+} -returnCodes error -result {expected floating-point number but got "foo"}
 
-test winWm-6.6 {wm attributes -alpha} win {
-    # This test is just to show off -alpha
+test winWm-6.6 {wm attributes -alpha} -constraints win -setup {
     destroy .t
+} -body {
+    # This test is just to show off -alpha
     toplevel .t
     wm attributes .t -alpha 0.2
     pack [label .t.l -text "Alpha Toplevel" -font "Helvetica 18 bold"]
     tk::PlaceWindow .t center
     update
     if {$::tcl_platform(osVersion) >= 5.0} {
-	for {set i 0.2} {$i < 0.99} {set i [expr {$i+0.02}]} {
-	    wm attributes .t -alpha $i
-	    update idle
-	    after 20
-	}
-	for {set i 0.99} {$i > 0.2} {set i [expr {$i-0.02}]} {
-	    wm attributes .t -alpha $i
-	    update idle
-	    after 20
-	}
+    for {set i 0.2} {$i < 0.99} {set i [expr {$i+0.02}]} {
+        wm attributes .t -alpha $i
+        update idle
+        after 20
+    }
+    for {set i 0.99} {$i > 0.2} {set i [expr {$i-0.02}]} {
+        wm attributes .t -alpha $i
+        update idle
+        after 20
     }
-} {}
+    }
+} -cleanup {
+    destroy .t
+} -result {}
 
-test winWm-6.7 {wm attributes -transparentcolor} win {
-    # Expect this to return all "" on pre-2K/XP
+test winWm-6.7 {wm attributes -transparentcolor} -constraints win -setup {
     destroy .t
-    toplevel .t
     set res {}
+} -body {
+    # Expect this to return all "" on pre-2K/XP
+    toplevel .t
     lappend res [wm attributes .t -transparentcolor]
     # we don't return on set yet
     lappend res [wm attributes .t -trans black]
     lappend res [wm attributes .t -trans]
     lappend res [wm attributes .t -trans "#FFFFFF"]
     lappend res [wm attributes .t -trans]
+} -cleanup {
     destroy .t
-    set res
-} [list {} {} black {} "#FFFFFF"]
+} -result [list {} {} black {} "#FFFFFF"]
 
-test winWm-6.8 {wm attributes -transparentcolor} win {
+test winWm-6.8 {wm attributes -transparentcolor} -constraints win -setup {
+    destroy .t
+} -body {
     destroy .t
     toplevel .t
-    list [catch {wm attributes .t -tr foo} msg] $msg
-} {1 {unknown color name "foo"}}
+    wm attributes .t -tr foo
+} -cleanup {
+    destroy .t
+} -returnCodes error -result {unknown color name "foo"}
+
 
-test winWm-7.1 {deiconify on an unmapped toplevel\
-        will raise the window and set the focus} win {
+test winWm-7.1 {deiconify on an unmapped toplevel will raise \
+        the window and set the focus} -constraints {
+    win
+} -setup {
     destroy .t
+} -body {
     toplevel .t
     lower .t
     focus -force .
     wm deiconify .t
     update
     list [wm stackorder .t isabove .] [focus]
-} {1 .t}
+} -cleanup {
+    destroy .t
+} -result {1 .t}
 
 test winWm-7.2 {deiconify on an already mapped toplevel\
-        will raise the window and set the focus} win {
+        will raise the window and set the focus} -constraints {
+    win
+} -setup {
     destroy .t
+} -body {
     toplevel .t
     lower .t
     update
@@ -331,9 +368,13 @@ test winWm-7.2 {deiconify on an already mapped toplevel\
     wm deiconify .t
     update
     list [wm stackorder .t isabove .] [focus]
-} {1 .t}
+} -cleanup {
+    destroy .t
+} -result {1 .t}
 
-test winWm-7.3 {UpdateWrapper must maintain Z order} win {
+test winWm-7.3 {UpdateWrapper must maintain Z order} -constraints win -setup {
+    destroy .t
+} -body {
     destroy .t
     toplevel .t
     lower .t
@@ -342,10 +383,13 @@ test winWm-7.3 {UpdateWrapper must maintain Z order} win {
     wm resizable .t 0 0
     update
     list $res [wm stackorder .t isbelow .]
-} {1 1}
+} -cleanup {
+    destroy .t
+} -result {1 1}
 
-test winWm-7.4 {UpdateWrapper must maintain focus} win {
+test winWm-7.4 {UpdateWrapper must maintain focus} -constraints win -setup {
     destroy .t
+} -body {
     toplevel .t
     focus -force .t
     update
@@ -353,20 +397,26 @@ test winWm-7.4 {UpdateWrapper must maintain focus} win {
     wm resizable .t 0 0
     update
     list $res [focus]
-} {.t .t}
+} -cleanup {
+    destroy .t
+} -result {.t .t}
+
 
-test winWm-8.1 {Tk_WmCmd procedure, "iconphoto" option} win {
-    list [catch {wm iconph .} msg] $msg
-} {1 {wrong # args: should be "wm iconphoto window ?-default? image1 ?image2 ...?"}}
-test winWm-8.2 {Tk_WmCmd procedure, "iconphoto" option} win {
+test winWm-8.1 {Tk_WmCmd procedure, "iconphoto" option} -constraints win -body {
+    wm iconph .
+} -returnCodes error -result {wrong # args: should be "wm iconphoto window ?-default? image1 ?image2 ...?"}}
+test winWm-8.2 {Tk_WmCmd procedure, "iconphoto" option} -constraints win -setup {
     destroy .t
+} -body {
     toplevel .t
     image create photo blank16 -width 16 -height 16
     image create photo blank32 -width 32 -height 32
     # This should just make blank icons for the window
     wm iconphoto .t blank16 blank32
     image delete blank16 blank32
-} {}
+} -cleanup {
+    destroy .t
+} -result {}
 
 test winWm-9.0 "Bug #2799589 - delayed activation of destroyed window" -constraints win -setup {
     proc winwm90click {w} {
@@ -396,7 +446,6 @@ test winWm-9.0 "Bug #2799589 - delayed activation of destroyed window" -constrai
         pack [button $w.b -text "Do dialog" -command [list winwm90proc2 $w]]
         bind $w.b <Map> {bind %W <Map> {}; after idle {winwm90click %W}}
     }
-    destroy .t
     global winwm90done
     set winwm90done wait
     toplevel .t
@@ -465,17 +514,17 @@ test winWm-9.2 "check wm forget for unmapped parent (#3205464,#2967911)" -setup
     frame .t.f -background blue -height 200 -width 200
     frame .t.f.x -background red -height 100 -width 100
 } -body {
-     pack .t.f.x
+    pack .t.f.x
     pack .t.f
-    lappend aid [after 2000 {set ::winwm92 timeout}] [after 100 {
+    lappend aid [after 5000 {set ::winwm92 timeout}] [after 500 {
         wm manage .t.f
         wm iconify .t
-        lappend aid [after 100 {
+        lappend aid [after 500 {
             wm forget .t.f
             wm deiconify .t
-            lappend aid [after 100 {
+            lappend aid [after 500 {
                 pack .t.f
-                lappend aid [after 100 {
+                lappend aid [after 500 {
 		    set ::winwm92 [expr {
 			    [winfo rooty .t.f.x] == 0 ? "failed" : "ok"}]}]
             }]
-- 
cgit v0.12


From 806e7862d404cf9f85f85ff6d4b3e74eb09317f6 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 25 Sep 2020 09:21:04 +0000
Subject: New utility function ::tk::MouseWheel

---
 library/demos/cscroll.tcl |  8 ++++----
 library/iconlist.tcl      |  6 +++---
 library/listbox.tcl       |  8 ++++----
 library/scrlbar.tcl       | 10 +++++-----
 library/tclIndex          |  1 +
 library/text.tcl          | 16 ++++------------
 library/tk.tcl            |  7 +++++++
 library/ttk/combobox.tcl  |  8 ++++++--
 library/ttk/spinbox.tcl   |  6 +++---
 library/ttk/utils.tcl     | 12 ++++++------
 10 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/library/demos/cscroll.tcl b/library/demos/cscroll.tcl
index 52a9e1a..90b1afc 100644
--- a/library/demos/cscroll.tcl
+++ b/library/demos/cscroll.tcl
@@ -60,16 +60,16 @@ if {[package vsatisfies [package provide Tk] 8.7-]} {
     bind $c <Button-2> "$c scan mark %x %y"
     bind $c <B2-Motion> "$c scan dragto %x %y"
     bind $c <MouseWheel> {
-	%W yview scroll [expr {%D/-30.0}] units
+	tk::MouseWheel %W y %D -30.0
     }
     bind $c <Option-MouseWheel> {
-	%W yview scroll [expr {%D/-3.0}] units
+	tk::MouseWheel %W y %D -3.0
     }
     bind $c <Shift-MouseWheel> {
-	%W xview scroll [expr {%D/-30.0}] units
+	tk::MouseWheel %W x %D -30.0
     }
     bind $c <Shift-Option-MouseWheel> {
-	%W xview scroll [expr {%D/-3.0}] units
+	tk::MouseWheel %W x %D -3.0
     }
 } elseif {[tk windowingsystem] eq "aqua"} {
     bind $c <Button-3> "$c scan mark %x %y"
diff --git a/library/iconlist.tcl b/library/iconlist.tcl
index f9dff2e..c052efb 100644
--- a/library/iconlist.tcl
+++ b/library/iconlist.tcl
@@ -447,7 +447,7 @@ package require Tk
 	bind $canvas <Shift-B1-Motion>	[namespace code {my ShiftMotion1 %x %y}]
 
 	bind $canvas <Shift-MouseWheel>	[namespace code {my MouseWheel %D}]
-	bind $canvas <Option-Shift-MouseWheel>	[namespace code {my MouseWheel [expr {10*%D}]}]
+	bind $canvas <Option-Shift-MouseWheel>	[namespace code {my MouseWheel %D -12}]
 
 
 	bind $canvas <<PrevLine>>	[namespace code {my UpDown -1}]
@@ -496,11 +496,11 @@ package require Tk
     # ----------------------------------------------------------------------
 
     # Event handlers
-    method MouseWheel {amount} {
+    method MouseWheel {amount {factor -120.0}} {
 	if {$noScroll || $::tk_strictMotif} {
 	    return
 	}
-	$canvas xview scroll [expr {$amount/-120.0}] units
+	$canvas xview scroll [expr {$amount/$factor}] units
     }
     method Btn1 {x y} {
 	focus $canvas
diff --git a/library/listbox.tcl b/library/listbox.tcl
index f6ece12..ffedee6 100644
--- a/library/listbox.tcl
+++ b/library/listbox.tcl
@@ -177,16 +177,16 @@ bind Listbox <B2-Motion> {
 }
 
 bind Listbox <MouseWheel> {
-    %W yview scroll [expr {%D/-30.0}] units
+    tk::MouseWheel %W y %D -30.0
 }
 bind Listbox <Option-MouseWheel> {
-    %W yview scroll [expr {%D/-3.0}] units
+    tk::MouseWheel %W y %D -3.0
 }
 bind Listbox <Shift-MouseWheel> {
-    %W xview scroll [expr {%D/-30.0}] units
+    tk::MouseWheel %W x %D -30.0
 }
 bind Listbox <Shift-Option-MouseWheel> {
-    %W xview scroll [expr {%D/-3.0}] units
+    tk::MouseWheel %W x %D -3.0
 }
 
 # ::tk::ListboxBeginSelect --
diff --git a/library/scrlbar.tcl b/library/scrlbar.tcl
index a8ea3bf..f545785 100644
--- a/library/scrlbar.tcl
+++ b/library/scrlbar.tcl
@@ -130,10 +130,10 @@ bind Scrollbar <<LineEnd>> {
 }
 
 bind Scrollbar <MouseWheel> {
-    tk::ScrollByUnits %W hv [expr {%D/-30.0}]
+    tk::ScrollByUnits %W hv %D -30.0
 }
 bind Scrollbar <Option-MouseWheel> {
-    tk::ScrollByUnits %W hv [expr {%D/-3.0}]
+    tk::ScrollByUnits %W hv %D -3.0
 }
 
 # tk::ScrollButtonDown --
@@ -306,7 +306,7 @@ proc ::tk::ScrollEndDrag {w x y} {
 #		horizontal, "v" for vertical, "hv" for both.
 # amount -	How many units to scroll:  typically 1 or -1.
 
-proc ::tk::ScrollByUnits {w orient amount} {
+proc ::tk::ScrollByUnits {w orient amount {factor 1.0}} {
     set cmd [$w cget -command]
     if {$cmd eq "" || ([string first \
 	    [string index [$w cget -orient] 0] $orient] < 0)} {
@@ -314,9 +314,9 @@ proc ::tk::ScrollByUnits {w orient amount} {
     }
     set info [$w get]
     if {[llength $info] == 2} {
-	uplevel #0 $cmd scroll $amount units
+	uplevel #0 $cmd scroll [expr {$amount/$factor}] units
     } else {
-	uplevel #0 $cmd [expr {[lindex $info 2] + $amount}]
+	uplevel #0 $cmd [expr {[lindex $info 2] + [expr {$amount/$factor}]}]
     }
 }
 
diff --git a/library/tclIndex b/library/tclIndex
index 919fa8a..06006cd 100644
--- a/library/tclIndex
+++ b/library/tclIndex
@@ -199,6 +199,7 @@ set auto_index(::tk::RestoreFocusGrab) [list source [file join $dir tk.tcl]]
 set auto_index(::tk::ScreenChanged) [list source [file join $dir tk.tcl]]
 set auto_index(::tk::EventMotifBindings) [list source [file join $dir tk.tcl]]
 set auto_index(::tk::CancelRepeat) [list source [file join $dir tk.tcl]]
+set auto_index(::tk::MouseWheel) [list source [file join $dir tk.tcl]]
 set auto_index(::tk::TabToWindow) [list source [file join $dir tk.tcl]]
 set auto_index(::tk::dialog::file::) [list source [file join $dir tkfbox.tcl]]
 set auto_index(::tk::dialog::file::Config) [list source [file join $dir tkfbox.tcl]]
diff --git a/library/text.tcl b/library/text.tcl
index 24dd6d2..f25f639 100644
--- a/library/text.tcl
+++ b/library/text.tcl
@@ -453,24 +453,16 @@ set ::tk::Priv(prevPos) {}
 #     (int)-1/3 = -1
 # The following code ensure equal +/- behaviour.
 bind Text <MouseWheel> {
-    if {%D >= 0} {
-	%W yview scroll [expr {-%D/3}] pixels
-    } else {
-	%W yview scroll [expr {(2-%D)/3}] pixels
-    }
+    tk::MouseWheel y %D -3.0 pixels
 }
 bind Text <Option-MouseWheel> {
-    %W yview scroll [expr {-3*%D}] pixels
+    tk::MouseWheel y %D -0.3 pixels
 }
 bind Text <Shift-MouseWheel> {
-    if {%D >= 0} {
-	%W xview scroll [expr {-%D/3}] pixels
-    } else {
-	%W xview scroll [expr {(2-%D)/3}] pixels
-    }
+    tk::MouseWheel x %D -3.0 pixels
 }
 bind Text <Shift-Option-MouseWheel> {
-    %W xview scroll [expr {-3*%D}] pixels
+    tk::MouseWheel x %D -0.3 pixels
 }
 
 # ::tk::TextClosestGap --
diff --git a/library/tk.tcl b/library/tk.tcl
index dfa60d4..bf00e6f 100644
--- a/library/tk.tcl
+++ b/library/tk.tcl
@@ -533,6 +533,13 @@ proc ::tk::CancelRepeat {} {
     set Priv(afterId) {}
 }
 
+## ::tk::MouseWheel $w $dir $amount $factor $units
+
+proc ::tk::MouseWheel {w dir amount factor {units units}} {
+    $w ${dir}view scroll [expr {$amount/$factor}] $units
+}
+
+
 # ::tk::TabToWindow --
 # This procedure moves the focus to the given widget.
 # It sends a <<TraverseOut>> virtual event to the previous focus window,
diff --git a/library/ttk/combobox.tcl b/library/ttk/combobox.tcl
index 0a7e519..c72d02e 100644
--- a/library/ttk/combobox.tcl
+++ b/library/ttk/combobox.tcl
@@ -182,11 +182,15 @@ proc ttk::combobox::SelectEntry {cb index} {
 
 ## Scroll -- Mousewheel binding
 #
-proc ttk::combobox::Scroll {cb dir} {
+proc ttk::combobox::Scroll {cb dir {factor 1.0}} {
     $cb instate disabled { return }
     set max [llength [$cb cget -values]]
     set current [$cb current]
-    incr current $dir
+    set d [expr {round($dir/factor)}]
+    if {$d == 0 && $dir != 0} {
+	if {$dir > 0} {set d 1} else {set d -1} 
+    }
+    incr current $d
     if {$max != 0 && $current == $current % $max} {
 	SelectEntry $cb $current
     }
diff --git a/library/ttk/spinbox.tcl b/library/ttk/spinbox.tcl
index 33936d9..19a330f 100644
--- a/library/ttk/spinbox.tcl
+++ b/library/ttk/spinbox.tcl
@@ -82,11 +82,11 @@ proc ttk::spinbox::Release {w} {
 #	Mousewheel callback.  Turn these into <<Increment>> (-1, up)
 # 	or <<Decrement> (+1, down) events.
 #
-proc ttk::spinbox::MouseWheel {w dir} {
+proc ttk::spinbox::MouseWheel {w dir {factor 1}} {
     if {[$w instate disabled]} { return }
-    if {$dir < 0} {
+    if {($dir < 0) ^ ($factor < 0)} {
 	event generate $w <<Increment>>
-    } else {
+    } elseif {$dir > 0} {
 	event generate $w <<Decrement>>
     }
 }
diff --git a/library/ttk/utils.tcl b/library/ttk/utils.tcl
index c58d39e..de7565c 100644
--- a/library/ttk/utils.tcl
+++ b/library/ttk/utils.tcl
@@ -285,8 +285,8 @@ proc ttk::copyBindings {from to} {
 #
 
 proc ttk::bindMouseWheel {bindtag callback} {
-    bind $bindtag <MouseWheel> [append callback { [expr {%D/-120.0}]}]
-    bind $bindtag <Option-MouseWheel> [append callback { [expr {%D/-12.0}]}]
+    bind $bindtag <MouseWheel> [append callback { %D -120.0}]
+    bind $bindtag <Option-MouseWheel> [append callback { %D -12.0}]
 }
 
 ## Mousewheel bindings for standard scrollable widgets.
@@ -298,12 +298,12 @@ proc ttk::bindMouseWheel {bindtag callback} {
 #
 
 bind TtkScrollable <MouseWheel> \
-	{ %W yview scroll [expr {%D/-120.0}] units }
+	{ tk::MouseWheel %W y %D -120.0 }
 bind TtkScrollable <Option-MouseWheel> \
-	{ %W yview scroll [expr {%D/-12.0}] units }
+	{ tk::MouseWheel %W y %D -12.0 }
 bind TtkScrollable <Shift-MouseWheel> \
-	{ %W xview scroll [expr {%D/-120.0}] units }
+	{ tk::MouseWheel %W x %D -120.0 }
 bind TtkScrollable <Shift-Option-MouseWheel> \
-	{ %W xview scroll [expr {%D/-12.0}] units }
+	{ tk::MouseWheel %W x %D -120.0 }
 
 #*EOF*
-- 
cgit v0.12


From e49c53fa60a2329599dc7dbd69ee4f841be994c8 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 25 Sep 2020 12:52:45 +0000
Subject: More usage of TCL_UNUSED() and implicit type-casts. Eliminate
 "register" keyword

---
 generic/tkTextBTree.c | 309 ++++++++++++++++++++++++--------------------------
 generic/tkTextDisp.c  |  28 ++---
 generic/tkTextImage.c |  82 +++++++-------
 generic/tkTextIndex.c |  38 +++----
 generic/tkTextMark.c  |  63 +++++-----
 generic/tkTextTag.c   |  48 ++++----
 generic/tkTextWind.c  |  65 +++++------
 7 files changed, 310 insertions(+), 323 deletions(-)

diff --git a/generic/tkTextBTree.c b/generic/tkTextBTree.c
index 81e31dc..fba26b9 100644
--- a/generic/tkTextBTree.c
+++ b/generic/tkTextBTree.c
@@ -140,9 +140,9 @@ int tkBTreeDebug = 0;
  * Macros that determine how much space to allocate for new segments:
  */
 
-#define CSEG_SIZE(chars) ((unsigned) (Tk_Offset(TkTextSegment, body) \
+#define CSEG_SIZE(chars) ((unsigned)(Tk_Offset(TkTextSegment, body) \
 	+ 1 + (chars)))
-#define TSEG_SIZE ((unsigned) (Tk_Offset(TkTextSegment, body) \
+#define TSEG_SIZE ((unsigned)(Tk_Offset(TkTextSegment, body) \
 	+ sizeof(TkTextToggle)))
 
 /*
@@ -261,10 +261,10 @@ TkTextBTree
 TkBTreeCreate(
     TkSharedText *sharedTextPtr)
 {
-    register BTree *treePtr;
-    register Node *rootPtr;
-    register TkTextLine *linePtr, *linePtr2;
-    register TkTextSegment *segPtr;
+    BTree *treePtr;
+    Node *rootPtr;
+    TkTextLine *linePtr, *linePtr2;
+    TkTextSegment *segPtr;
 
     /*
      * The tree will initially have two empty lines. The second line isn't
@@ -273,9 +273,9 @@ TkBTreeCreate(
      * of the tree.
      */
 
-    rootPtr = ckalloc(sizeof(Node));
-    linePtr = ckalloc(sizeof(TkTextLine));
-    linePtr2 = ckalloc(sizeof(TkTextLine));
+    rootPtr = (Node *)ckalloc(sizeof(Node));
+    linePtr = (TkTextLine *)ckalloc(sizeof(TkTextLine));
+    linePtr2 = (TkTextLine *)ckalloc(sizeof(TkTextLine));
 
     rootPtr->parentPtr = NULL;
     rootPtr->nextPtr = NULL;
@@ -296,7 +296,7 @@ TkBTreeCreate(
 
     linePtr->parentPtr = rootPtr;
     linePtr->nextPtr = linePtr2;
-    segPtr = ckalloc(CSEG_SIZE(1));
+    segPtr = (TkTextSegment *)ckalloc(CSEG_SIZE(1));
     linePtr->segPtr = segPtr;
     segPtr->typePtr = &tkTextCharType;
     segPtr->nextPtr = NULL;
@@ -306,7 +306,7 @@ TkBTreeCreate(
 
     linePtr2->parentPtr = rootPtr;
     linePtr2->nextPtr = NULL;
-    segPtr = ckalloc(CSEG_SIZE(1));
+    segPtr = (TkTextSegment *)ckalloc(CSEG_SIZE(1));
     linePtr2->segPtr = segPtr;
     segPtr->typePtr = &tkTextCharType;
     segPtr->nextPtr = NULL;
@@ -314,7 +314,7 @@ TkBTreeCreate(
     segPtr->body.chars[0] = '\n';
     segPtr->body.chars[1] = 0;
 
-    treePtr = ckalloc(sizeof(BTree));
+    treePtr = (BTree *)ckalloc(sizeof(BTree));
     treePtr->sharedTextPtr = sharedTextPtr;
     treePtr->rootPtr = rootPtr;
     treePtr->clients = 0;
@@ -366,7 +366,7 @@ TkBTreeAddClient(
     int defaultHeight)		/* Default line height for the new client, or
 				 * -1 if no pixel heights are to be kept. */
 {
-    register BTree *treePtr = (BTree *) tree;
+    BTree *treePtr = (BTree *) tree;
 
     if (treePtr == NULL) {
 	Tcl_Panic("NULL treePtr in TkBTreeAddClient");
@@ -632,9 +632,9 @@ AdjustStartEndRefs(
 	    i++;
 	}
 	treePtr->startEndCount = count;
-	treePtr->startEnd = ckrealloc(treePtr->startEnd,
+	treePtr->startEnd = (TkTextLine **)ckrealloc(treePtr->startEnd,
 		sizeof(TkTextLine *) * count);
-	treePtr->startEndRef = ckrealloc(treePtr->startEndRef,
+	treePtr->startEndRef = (TkText **)ckrealloc(treePtr->startEndRef,
 		sizeof(TkText *) * count);
     }
     if ((action & TEXT_ADD_REFS)
@@ -650,9 +650,9 @@ AdjustStartEndRefs(
 
 	count = treePtr->startEndCount;
 
-	treePtr->startEnd = ckrealloc(treePtr->startEnd,
+	treePtr->startEnd = (TkTextLine **)ckrealloc(treePtr->startEnd,
 		sizeof(TkTextLine *) * count);
-	treePtr->startEndRef = ckrealloc(treePtr->startEndRef,
+	treePtr->startEndRef = (TkText **)ckrealloc(treePtr->startEndRef,
 		sizeof(TkText *) * count);
 
 	if (textPtr->start != NULL) {
@@ -725,7 +725,7 @@ AdjustPixelClient(
 	    loopPtr = loopPtr->nextPtr;
 	}
     } else {
-	register TkTextLine *linePtr = nodePtr->children.linePtr;
+	TkTextLine *linePtr = nodePtr->children.linePtr;
 
 	while (linePtr != NULL) {
 	    if (!*counting && (linePtr == start)) {
@@ -735,7 +735,7 @@ AdjustPixelClient(
 		*counting = 0;
 	    }
 	    if (newPixelReferences != treePtr->pixelReferences) {
-		linePtr->pixels = ckrealloc(linePtr->pixels,
+		linePtr->pixels = (int *)ckrealloc(linePtr->pixels,
 			sizeof(int) * 2 * newPixelReferences);
 	    }
 
@@ -752,7 +752,7 @@ AdjustPixelClient(
 	}
     }
     if (newPixelReferences != treePtr->pixelReferences) {
-	nodePtr->numPixels = ckrealloc(nodePtr->numPixels,
+	nodePtr->numPixels = (int *)ckrealloc(nodePtr->numPixels,
 		sizeof(int) * newPixelReferences);
     }
     nodePtr->numPixels[useReference] = pixelCount;
@@ -802,7 +802,7 @@ RemovePixelClient(
 	ckfree(nodePtr->numPixels);
 	nodePtr->numPixels = NULL;
     } else {
-	nodePtr->numPixels = ckrealloc(nodePtr->numPixels,
+	nodePtr->numPixels = (int *)ckrealloc(nodePtr->numPixels,
 		sizeof(int) * (treePtr->pixelReferences - 1));
     }
     if (nodePtr->level != 0) {
@@ -812,7 +812,7 @@ RemovePixelClient(
 	    nodePtr = nodePtr->nextPtr;
 	}
     } else {
-	register TkTextLine *linePtr = nodePtr->children.linePtr;
+	TkTextLine *linePtr = nodePtr->children.linePtr;
 	while (linePtr != NULL) {
 	    if (overwriteWithLast != -1) {
 		linePtr->pixels[2*overwriteWithLast] =
@@ -823,7 +823,7 @@ RemovePixelClient(
 	    if (treePtr->pixelReferences == 1) {
 		linePtr->pixels = NULL;
 	    } else {
-		linePtr->pixels = ckrealloc(linePtr->pixels,
+		linePtr->pixels = (int *)ckrealloc(linePtr->pixels,
 			sizeof(int) * 2 * (treePtr->pixelReferences-1));
 	    }
 	    linePtr = linePtr->nextPtr;
@@ -850,7 +850,7 @@ RemovePixelClient(
 
 static void
 DestroyNode(
-    register Node *nodePtr)	/* Destroy from this node downwards. */
+    Node *nodePtr)	/* Destroy from this node downwards. */
 {
     if (nodePtr->level == 0) {
 	TkTextLine *linePtr;
@@ -868,7 +868,7 @@ DestroyNode(
 	    ckfree(linePtr);
 	}
     } else {
-	register Node *childPtr;
+	Node *childPtr;
 
 	while (nodePtr->children.nodePtr != NULL) {
 	    childPtr = nodePtr->children.nodePtr;
@@ -900,10 +900,10 @@ DestroyNode(
 
 static void
 DeleteSummaries(
-    register Summary *summaryPtr)
+    Summary *summaryPtr)
 				/* First in list of node's tag summaries. */
 {
-    register Summary *nextPtr;
+    Summary *nextPtr;
 
     while (summaryPtr != NULL) {
 	nextPtr = summaryPtr->nextPtr;
@@ -932,7 +932,7 @@ DeleteSummaries(
 int
 TkBTreeAdjustPixelHeight(
     const TkText *textPtr,	/* Client of the B-tree. */
-    register TkTextLine *linePtr,
+    TkTextLine *linePtr,
 				/* The logical line to update. */
     int newPixelHeight,		/* The line's known height in pixels. */
     int mergedLogicalLines)	/* The number of extra logical lines which
@@ -942,7 +942,7 @@ TkBTreeAdjustPixelHeight(
 				 * height associated with the given
 				 * linePtr. */
 {
-    register Node *nodePtr;
+    Node *nodePtr;
     int changeToPixelCount;	/* Counts change to total number of pixels in
 				 * file. */
     int pixelReference = textPtr->pixelReference;
@@ -1001,7 +1001,7 @@ TkBTreeAdjustPixelHeight(
 void
 TkBTreeInsertChars(
     TkTextBTree tree,		/* Tree to insert into. */
-    register TkTextIndex *indexPtr,
+    TkTextIndex *indexPtr,
 				/* Indicates where to insert text. When the
 				 * function returns, this index is no longer
 				 * valid because of changes to the segment
@@ -1009,8 +1009,8 @@ TkBTreeInsertChars(
     const char *string)		/* Pointer to bytes to insert (may contain
 				 * newlines, must be null-terminated). */
 {
-    register Node *nodePtr;
-    register TkTextSegment *prevPtr;
+    Node *nodePtr;
+    TkTextSegment *prevPtr;
 				/* The segment just before the first new
 				 * segment (NULL means new segment is at
 				 * beginning of line). */
@@ -1019,10 +1019,10 @@ TkBTreeInsertChars(
 				 * insert at beginning of line. */
     TkTextLine *linePtr;	/* Current line (new segments are added to
 				 * this line). */
-    register TkTextSegment *segPtr;
+    TkTextSegment *segPtr;
     TkTextLine *newLinePtr;
     int chunkSize;		/* # characters in current chunk. */
-    register const char *eol;	/* Pointer to character just after last one in
+    const char *eol;	/* Pointer to character just after last one in
 				 * current chunk. */
     int changeToLineCount;	/* Counts change to total number of lines in
 				 * file. */
@@ -1044,7 +1044,7 @@ TkBTreeInsertChars(
 
     changeToLineCount = 0;
     if (treePtr->pixelReferences > PIXEL_CLIENTS) {
-	changeToPixelCount = ckalloc(sizeof(int) * treePtr->pixelReferences);
+	changeToPixelCount = (int *)ckalloc(sizeof(int) * treePtr->pixelReferences);
     } else {
 	changeToPixelCount = pixels;
     }
@@ -1060,7 +1060,7 @@ TkBTreeInsertChars(
 	    }
 	}
 	chunkSize = eol-string;
-	segPtr = ckalloc(CSEG_SIZE(chunkSize));
+	segPtr = (TkTextSegment *)ckalloc(CSEG_SIZE(chunkSize));
 	segPtr->typePtr = &tkTextCharType;
 	if (curPtr == NULL) {
 	    segPtr->nextPtr = linePtr->segPtr;
@@ -1070,7 +1070,7 @@ TkBTreeInsertChars(
 	    curPtr->nextPtr = segPtr;
 	}
 	segPtr->size = chunkSize;
-	memcpy(segPtr->body.chars, string, (size_t) chunkSize);
+	memcpy(segPtr->body.chars, string, (size_t)chunkSize);
 	segPtr->body.chars[chunkSize] = 0;
 
 	if (eol[-1] != '\n') {
@@ -1082,8 +1082,8 @@ TkBTreeInsertChars(
 	 * the remainder of the old line to it.
 	 */
 
-	newLinePtr = ckalloc(sizeof(TkTextLine));
-	newLinePtr->pixels =
+	newLinePtr = (TkTextLine *)ckalloc(sizeof(TkTextLine));
+	newLinePtr->pixels = (int *)
 		ckalloc(sizeof(int) * 2 * treePtr->pixelReferences);
 
 	newLinePtr->parentPtr = linePtr->parentPtr;
@@ -1312,10 +1312,10 @@ CleanupLine(
 void
 TkBTreeDeleteIndexRange(
     TkTextBTree tree,		/* Tree to delete from. */
-    register TkTextIndex *index1Ptr,
+    TkTextIndex *index1Ptr,
 				/* Indicates first character that is to be
 				 * deleted. */
-    register TkTextIndex *index2Ptr)
+    TkTextIndex *index2Ptr)
 				/* Indicates character just after the last one
 				 * that is to be deleted. */
 {
@@ -1596,8 +1596,8 @@ TkBTreeFindLine(
     int line)			/* Index of desired line. */
 {
     BTree *treePtr = (BTree *) tree;
-    register Node *nodePtr;
-    register TkTextLine *linePtr;
+    Node *nodePtr;
+    TkTextLine *linePtr;
 
     if (treePtr == NULL) {
 	treePtr = (BTree *) textPtr->sharedTextPtr->tree;
@@ -1686,8 +1686,8 @@ TkBTreeFindPixelLine(
     int *pixelOffset)		/* Used to return offset. */
 {
     BTree *treePtr = (BTree *) tree;
-    register Node *nodePtr;
-    register TkTextLine *linePtr;
+    Node *nodePtr;
+    TkTextLine *linePtr;
     int pixelReference = textPtr->pixelReference;
 
     nodePtr = treePtr->rootPtr;
@@ -1755,10 +1755,10 @@ TkBTreeFindPixelLine(
 TkTextLine *
 TkBTreeNextLine(
     const TkText *textPtr,	/* Next line in the context of this client. */
-    register TkTextLine *linePtr)
+    TkTextLine *linePtr)
 				/* Pointer to existing line in B-tree. */
 {
-    register Node *nodePtr;
+    Node *nodePtr;
 
     if (linePtr->nextPtr != NULL) {
 	if (textPtr != NULL && (linePtr == textPtr->end)) {
@@ -1811,12 +1811,12 @@ TkBTreeNextLine(
 TkTextLine *
 TkBTreePreviousLine(
     TkText *textPtr,		/* Relative to this client of the B-tree. */
-    register TkTextLine *linePtr)
+    TkTextLine *linePtr)
 				/* Pointer to existing line in B-tree. */
 {
-    register Node *nodePtr;
-    register Node *node2Ptr;
-    register TkTextLine *prevPtr;
+    Node *nodePtr;
+    Node *node2Ptr;
+    TkTextLine *prevPtr;
 
     if (textPtr != NULL && textPtr->start == linePtr) {
 	return NULL;
@@ -1895,8 +1895,8 @@ TkBTreePixelsTo(
     const TkText *textPtr,	/* Relative to this client of the B-tree. */
     TkTextLine *linePtr)	/* Pointer to existing line in B-tree. */
 {
-    register TkTextLine *linePtr2;
-    register Node *nodePtr, *parentPtr;
+    TkTextLine *linePtr2;
+    Node *nodePtr, *parentPtr;
     int index;
     int pixelReference = textPtr->pixelReference;
 
@@ -1921,7 +1921,7 @@ TkBTreePixelsTo(
 
     for (parentPtr = nodePtr->parentPtr ; parentPtr != NULL;
 	    nodePtr = parentPtr, parentPtr = parentPtr->parentPtr) {
-	register Node *nodePtr2;
+	Node *nodePtr2;
 
 	for (nodePtr2 = parentPtr->children.nodePtr; nodePtr2 != nodePtr;
 		nodePtr2 = nodePtr2->nextPtr) {
@@ -1957,8 +1957,8 @@ TkBTreeLinesTo(
     const TkText *textPtr,	/* Relative to this client of the B-tree. */
     TkTextLine *linePtr)	/* Pointer to existing line in B-tree. */
 {
-    register TkTextLine *linePtr2;
-    register Node *nodePtr, *parentPtr, *nodePtr2;
+    TkTextLine *linePtr2;
+    Node *nodePtr, *parentPtr, *nodePtr2;
     int index;
 
     /*
@@ -2037,7 +2037,6 @@ TkBTreeLinesTo(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 void
 TkBTreeLinkSegment(
     TkTextSegment *segPtr,	/* Pointer to new segment to be added to
@@ -2046,7 +2045,7 @@ TkBTreeLinkSegment(
     TkTextIndex *indexPtr)	/* Where to add segment: it gets linked in
 				 * just before the segment indicated here. */
 {
-    register TkTextSegment *prevPtr;
+    TkTextSegment *prevPtr;
 
     prevPtr = SplitSeg(indexPtr);
     if (prevPtr == NULL) {
@@ -2080,13 +2079,12 @@ TkBTreeLinkSegment(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 void
 TkBTreeUnlinkSegment(
     TkTextSegment *segPtr,	/* Segment to be unlinked. */
     TkTextLine *linePtr)	/* Line that currently contains segment. */
 {
-    register TkTextSegment *prevPtr;
+    TkTextSegment *prevPtr;
 
     if (linePtr->segPtr == segPtr) {
 	linePtr->segPtr = segPtr->nextPtr;
@@ -2135,9 +2133,9 @@ TkBTreeUnlinkSegment(
 
 int
 TkBTreeTag(
-    register TkTextIndex *index1Ptr,
+    TkTextIndex *index1Ptr,
 				/* Indicates first character in range. */
-    register TkTextIndex *index2Ptr,
+    TkTextIndex *index2Ptr,
 				/* Indicates character just after the last one
 				 * in range. */
     TkTextTag *tagPtr,		/* Tag to add or remove. */
@@ -2157,7 +2155,7 @@ TkBTreeTag(
 
     oldState = TkBTreeCharTagged(index1Ptr, tagPtr);
     if ((add != 0) ^ oldState) {
-	segPtr = ckalloc(TSEG_SIZE);
+	segPtr = (TkTextSegment *)ckalloc(TSEG_SIZE);
 	segPtr->typePtr = (add) ? &tkTextToggleOnType : &tkTextToggleOffType;
 	prevPtr = SplitSeg(index1Ptr);
 	if (prevPtr == NULL) {
@@ -2228,7 +2226,7 @@ TkBTreeTag(
 	}
     }
     if ((add != 0) ^ oldState) {
-	segPtr = ckalloc(TSEG_SIZE);
+	segPtr = (TkTextSegment *)ckalloc(TSEG_SIZE);
 	segPtr->typePtr = (add) ? &tkTextToggleOffType : &tkTextToggleOnType;
 	prevPtr = SplitSeg(index2Ptr);
 	if (prevPtr == NULL) {
@@ -2285,14 +2283,14 @@ TkBTreeTag(
 
 static void
 ChangeNodeToggleCount(
-    register Node *nodePtr,	/* Node whose toggle count for a tag must be
+    Node *nodePtr,	/* Node whose toggle count for a tag must be
 				 * changed. */
     TkTextTag *tagPtr,		/* Information about tag. */
     int delta)			/* Amount to add to current toggle count for
 				 * tag (may be negative). */
 {
-    register Summary *summaryPtr, *prevPtr;
-    register Node *node2Ptr;
+    Summary *summaryPtr, *prevPtr;
+    Node *node2Ptr;
     int rootLevel;		/* Level of original tag root. */
 
     tagPtr->toggleCount += delta;
@@ -2372,7 +2370,7 @@ ChangeNodeToggleCount(
 
 		Node *rootNodePtr = tagPtr->tagRootPtr;
 
-		summaryPtr = ckalloc(sizeof(Summary));
+		summaryPtr = (Summary *)ckalloc(sizeof(Summary));
 		summaryPtr->tagPtr = tagPtr;
 		summaryPtr->toggleCount = tagPtr->toggleCount - delta;
 		summaryPtr->nextPtr = rootNodePtr->summaryPtr;
@@ -2381,7 +2379,7 @@ ChangeNodeToggleCount(
 		rootLevel = rootNodePtr->level;
 		tagPtr->tagRootPtr = rootNodePtr;
 	    }
-	    summaryPtr = ckalloc(sizeof(Summary));
+	    summaryPtr = (Summary *)ckalloc(sizeof(Summary));
 	    summaryPtr->tagPtr = tagPtr;
 	    summaryPtr->toggleCount = delta;
 	    summaryPtr->nextPtr = nodePtr->summaryPtr;
@@ -2471,10 +2469,10 @@ FindTagStart(
     TkTextTag *tagPtr,		/* Tag to search for. */
     TkTextIndex *indexPtr)	/* Return - index information. */
 {
-    register Node *nodePtr;
-    register TkTextLine *linePtr;
-    register TkTextSegment *segPtr;
-    register Summary *summaryPtr;
+    Node *nodePtr;
+    TkTextLine *linePtr;
+    TkTextSegment *segPtr;
+    Summary *summaryPtr;
     int offset;
 
     nodePtr = tagPtr->tagRootPtr;
@@ -2556,10 +2554,10 @@ FindTagEnd(
     TkTextTag *tagPtr,		/* Tag to search for. */
     TkTextIndex *indexPtr)	/* Return - index information. */
 {
-    register Node *nodePtr, *lastNodePtr;
-    register TkTextLine *linePtr ,*lastLinePtr;
-    register TkTextSegment *segPtr, *lastSegPtr, *last2SegPtr;
-    register Summary *summaryPtr;
+    Node *nodePtr, *lastNodePtr;
+    TkTextLine *linePtr ,*lastLinePtr;
+    TkTextSegment *segPtr, *lastSegPtr, *last2SegPtr;
+    Summary *summaryPtr;
     int lastoffset, lastoffset2, offset;
 
     nodePtr = tagPtr->tagRootPtr;
@@ -2652,7 +2650,7 @@ TkBTreeStartSearch(
 				 * position *will* be returned. */
     TkTextTag *tagPtr,		/* Tag to search for. NULL means search for
 				 * any tag. */
-    register TkTextSearch *searchPtr)
+    TkTextSearch *searchPtr)
 				/* Where to store information about search's
 				 * progress. */
 {
@@ -2748,7 +2746,7 @@ TkBTreeStartSearchBack(
 				 * position *will* be returned. */
     TkTextTag *tagPtr,		/* Tag to search for. NULL means search for
 				 * any tag. */
-    register TkTextSearch *searchPtr)
+    TkTextSearch *searchPtr)
 				/* Where to store information about search's
 				 * progress. */
 {
@@ -2849,14 +2847,14 @@ TkBTreeStartSearchBack(
 
 int
 TkBTreeNextTag(
-    register TkTextSearch *searchPtr)
+    TkTextSearch *searchPtr)
 				/* Information about search in progress; must
 				 * have been set up by call to
 				 * TkBTreeStartSearch. */
 {
-    register TkTextSegment *segPtr;
-    register Node *nodePtr;
-    register Summary *summaryPtr;
+    TkTextSegment *segPtr;
+    Node *nodePtr;
+    Summary *summaryPtr;
 
     if (searchPtr->linesLeft <= 0) {
 	goto searchOver;
@@ -3014,15 +3012,15 @@ TkBTreeNextTag(
 
 int
 TkBTreePrevTag(
-    register TkTextSearch *searchPtr)
+    TkTextSearch *searchPtr)
 				/* Information about search in progress; must
 				 * have been set up by call to
 				 * TkBTreeStartSearch. */
 {
-    register TkTextSegment *segPtr, *prevPtr;
-    register TkTextLine *linePtr, *prevLinePtr;
-    register Node *nodePtr, *node2Ptr, *prevNodePtr;
-    register Summary *summaryPtr;
+    TkTextSegment *segPtr, *prevPtr;
+    TkTextLine *linePtr, *prevLinePtr;
+    Node *nodePtr, *node2Ptr, *prevNodePtr;
+    Summary *summaryPtr;
     int byteIndex, linesSkipped;
     int pastLast;		/* Saw last marker during scan. */
 
@@ -3232,9 +3230,9 @@ TkBTreeCharTagged(
 				 * check for a tag. */
     TkTextTag *tagPtr)		/* Tag of interest. */
 {
-    register Node *nodePtr;
-    register TkTextLine *siblingLinePtr;
-    register TkTextSegment *segPtr;
+    Node *nodePtr;
+    TkTextLine *siblingLinePtr;
+    TkTextSegment *segPtr;
     TkTextSegment *toggleSegPtr;
     int toggles, index;
 
@@ -3288,8 +3286,8 @@ TkBTreeCharTagged(
     toggles = 0;
     for (nodePtr = indexPtr->linePtr->parentPtr; nodePtr->parentPtr != NULL;
 	    nodePtr = nodePtr->parentPtr) {
-	register Node *siblingPtr;
-	register Summary *summaryPtr;
+	Node *siblingPtr;
+	Summary *summaryPtr;
 
 	for (siblingPtr = nodePtr->parentPtr->children.nodePtr;
 		siblingPtr != nodePtr; siblingPtr = siblingPtr->nextPtr) {
@@ -3336,7 +3334,6 @@ TkBTreeCharTagged(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 TkTextTag **
 TkBTreeGetTags(
     const TkTextIndex *indexPtr,/* Indicates a particular position in the
@@ -3347,9 +3344,9 @@ TkBTreeGetTags(
     int *numTagsPtr)		/* Store number of tags found at this
 				 * location. */
 {
-    register Node *nodePtr;
-    register TkTextLine *siblingLinePtr;
-    register TkTextSegment *segPtr;
+    Node *nodePtr;
+    TkTextLine *siblingLinePtr;
+    TkTextSegment *segPtr;
     TkTextLine *linePtr;
     int src, dst, index;
     TagInfo tagInfo;
@@ -3357,8 +3354,8 @@ TkBTreeGetTags(
 
     tagInfo.numTags = 0;
     tagInfo.arraySize = NUM_TAG_INFOS;
-    tagInfo.tagPtrs = ckalloc(NUM_TAG_INFOS * sizeof(TkTextTag *));
-    tagInfo.counts = ckalloc(NUM_TAG_INFOS * sizeof(int));
+    tagInfo.tagPtrs = (TkTextTag **)ckalloc(NUM_TAG_INFOS * sizeof(TkTextTag *));
+    tagInfo.counts = (int *)ckalloc(NUM_TAG_INFOS * sizeof(int));
 
     /*
      * Record tag toggles within the line of indexPtr but preceding indexPtr.
@@ -3410,8 +3407,8 @@ TkBTreeGetTags(
 
     for (nodePtr = indexPtr->linePtr->parentPtr; nodePtr->parentPtr != NULL;
 	    nodePtr = nodePtr->parentPtr) {
-	register Node *siblingPtr;
-	register Summary *summaryPtr;
+	Node *siblingPtr;
+	Summary *summaryPtr;
 
 	for (siblingPtr = nodePtr->parentPtr->children.nodePtr;
 		siblingPtr != nodePtr; siblingPtr = siblingPtr->nextPtr) {
@@ -3482,7 +3479,6 @@ TkBTreeGetTags(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 TkTextIsElided(
     const TkText *textPtr,	/* Overall information about text widget. */
@@ -3492,17 +3488,17 @@ TkTextIsElided(
 				 * indexPtr's elide state will be stored and
 				 * returned. */
 {
-    register Node *nodePtr;
-    register TkTextLine *siblingLinePtr;
-    register TkTextSegment *segPtr;
-    register TkTextTag *tagPtr = NULL;
-    register int i, index;
-    register TkTextElideInfo *infoPtr;
+    Node *nodePtr;
+    TkTextLine *siblingLinePtr;
+    TkTextSegment *segPtr;
+    TkTextTag *tagPtr = NULL;
+    int i, index;
+    TkTextElideInfo *infoPtr;
     TkTextLine *linePtr;
     int elide;
 
     if (elideInfo == NULL) {
-	infoPtr = ckalloc(sizeof(TkTextElideInfo));
+	infoPtr = (TkTextElideInfo *)ckalloc(sizeof(TkTextElideInfo));
     } else {
 	infoPtr = elideInfo;
     }
@@ -3517,8 +3513,8 @@ TkTextIsElided(
      */
 
     if (LOTSA_TAGS < infoPtr->numTags) {
-	infoPtr->tagCnts = ckalloc(sizeof(int) * infoPtr->numTags);
-	infoPtr->tagPtrs = ckalloc(sizeof(TkTextTag *) * infoPtr->numTags);
+	infoPtr->tagCnts = (int *)ckalloc(sizeof(int) * infoPtr->numTags);
+	infoPtr->tagPtrs = (TkTextTag **)ckalloc(sizeof(TkTextTag *) * infoPtr->numTags);
     }
 
     for (i=0; i<infoPtr->numTags; i++) {
@@ -3591,8 +3587,8 @@ TkTextIsElided(
 
     for (nodePtr = indexPtr->linePtr->parentPtr; nodePtr->parentPtr != NULL;
 	    nodePtr = nodePtr->parentPtr) {
-	register Node *siblingPtr;
-	register Summary *summaryPtr;
+	Node *siblingPtr;
+	Summary *summaryPtr;
 
 	for (siblingPtr = nodePtr->parentPtr->children.nodePtr;
 		siblingPtr != nodePtr; siblingPtr = siblingPtr->nextPtr) {
@@ -3697,7 +3693,7 @@ IncCount(
     TagInfo *tagInfoPtr)	/* Holds cumulative information about tags;
 				 * increment count here. */
 {
-    register TkTextTag **tagPtrPtr;
+    TkTextTag **tagPtrPtr;
     int count;
 
     for (tagPtrPtr = tagInfoPtr->tagPtrs, count = tagInfoPtr->numTags;
@@ -3718,12 +3714,12 @@ IncCount(
 	int *newCounts, newSize;
 
 	newSize = 2 * tagInfoPtr->arraySize;
-	newTags = ckalloc(newSize * sizeof(TkTextTag *));
+	newTags = (TkTextTag **)ckalloc(newSize * sizeof(TkTextTag *));
 	memcpy(newTags, tagInfoPtr->tagPtrs,
 		tagInfoPtr->arraySize * sizeof(TkTextTag *));
 	ckfree(tagInfoPtr->tagPtrs);
 	tagInfoPtr->tagPtrs = newTags;
-	newCounts = ckalloc(newSize * sizeof(int));
+	newCounts = (int *)ckalloc(newSize * sizeof(int));
 	memcpy(newCounts, tagInfoPtr->counts,
 		tagInfoPtr->arraySize * sizeof(int));
 	ckfree(tagInfoPtr->counts);
@@ -3759,11 +3755,11 @@ TkBTreeCheck(
     TkTextBTree tree)		/* Tree to check. */
 {
     BTree *treePtr = (BTree *) tree;
-    register Summary *summaryPtr;
-    register Node *nodePtr;
-    register TkTextLine *linePtr;
-    register TkTextSegment *segPtr;
-    register TkTextTag *tagPtr;
+    Summary *summaryPtr;
+    Node *nodePtr;
+    TkTextLine *linePtr;
+    TkTextSegment *segPtr;
+    TkTextTag *tagPtr;
     Tcl_HashEntry *entryPtr;
     Tcl_HashSearch search;
     int count;
@@ -3774,7 +3770,7 @@ TkBTreeCheck(
 
     for (entryPtr=Tcl_FirstHashEntry(&treePtr->sharedTextPtr->tagTable,&search);
 	    entryPtr != NULL ; entryPtr = Tcl_NextHashEntry(&search)) {
-	tagPtr = Tcl_GetHashValue(entryPtr);
+	tagPtr = (TkTextTag *)Tcl_GetHashValue(entryPtr);
 	nodePtr = tagPtr->tagRootPtr;
 	if (nodePtr == NULL) {
 	    if (tagPtr->toggleCount != 0) {
@@ -3898,14 +3894,14 @@ TkBTreeCheck(
 
 static void
 CheckNodeConsistency(
-    register Node *nodePtr,	/* Node whose subtree should be checked. */
+    Node *nodePtr,	/* Node whose subtree should be checked. */
     int references)		/* Number of referring widgets which have
 				 * pixel counts. */
 {
-    register Node *childNodePtr;
-    register Summary *summaryPtr, *summaryPtr2;
-    register TkTextLine *linePtr;
-    register TkTextSegment *segPtr;
+    Node *childNodePtr;
+    Summary *summaryPtr, *summaryPtr2;
+    TkTextLine *linePtr;
+    TkTextSegment *segPtr;
     int numChildren, numLines, toggleCount, minChildren, i;
     int *numPixels;
     int pixels[PIXEL_CLIENTS];
@@ -3926,7 +3922,7 @@ CheckNodeConsistency(
     numChildren = 0;
     numLines = 0;
     if (references > PIXEL_CLIENTS) {
-	numPixels = ckalloc(sizeof(int) * references);
+	numPixels = (int *)ckalloc(sizeof(int) * references);
     } else {
 	numPixels = pixels;
     }
@@ -4087,7 +4083,7 @@ CheckNodeConsistency(
 static void
 Rebalance(
     BTree *treePtr,		/* Tree that is being rebalanced. */
-    register Node *nodePtr)	/* Node that may be out of balance. */
+    Node *nodePtr)	/* Node that may be out of balance. */
 {
     /*
      * Loop over the entire ancestral chain of the node, working up through
@@ -4095,8 +4091,8 @@ Rebalance(
      */
 
     for ( ; nodePtr != NULL; nodePtr = nodePtr->parentPtr) {
-	register Node *newPtr, *childPtr;
-	register TkTextLine *linePtr;
+	Node *newPtr, *childPtr;
+	TkTextLine *linePtr;
 	int i;
 
 	/*
@@ -4114,7 +4110,7 @@ Rebalance(
 		 */
 
 		if (nodePtr->parentPtr == NULL) {
-		    newPtr = ckalloc(sizeof(Node));
+		    newPtr = (Node *)ckalloc(sizeof(Node));
 		    newPtr->parentPtr = NULL;
 		    newPtr->nextPtr = NULL;
 		    newPtr->summaryPtr = NULL;
@@ -4122,7 +4118,7 @@ Rebalance(
 		    newPtr->children.nodePtr = nodePtr;
 		    newPtr->numChildren = 1;
 		    newPtr->numLines = nodePtr->numLines;
-		    newPtr->numPixels =
+		    newPtr->numPixels = (int *)
 			    ckalloc(sizeof(int) * treePtr->pixelReferences);
 		    for (i=0; i<treePtr->pixelReferences; i++) {
 			newPtr->numPixels[i] = nodePtr->numPixels[i];
@@ -4130,8 +4126,8 @@ Rebalance(
 		    RecomputeNodeCounts(treePtr, newPtr);
 		    treePtr->rootPtr = newPtr;
 		}
-		newPtr = ckalloc(sizeof(Node));
-		newPtr->numPixels =
+		newPtr = (Node *)ckalloc(sizeof(Node));
+		newPtr->numPixels = (int *)
 			ckalloc(sizeof(int) * treePtr->pixelReferences);
 		for (i=0; i<treePtr->pixelReferences; i++) {
 		    newPtr->numPixels[i] = 0;
@@ -4170,7 +4166,7 @@ Rebalance(
 	}
 
 	while (nodePtr->numChildren < MIN_CHILDREN) {
-	    register Node *otherPtr;
+	    Node *otherPtr;
 	    Node *halfwayNodePtr = NULL;       /* Initialization needed only */
 	    TkTextLine *halfwayLinePtr = NULL; /* to prevent cc warnings. */
 	    int totalChildren, firstChildren, i;
@@ -4234,7 +4230,7 @@ Rebalance(
 		otherPtr->children.linePtr = NULL;
 	    }
 	    if (nodePtr->level == 0) {
-		register TkTextLine *linePtr;
+		TkTextLine *linePtr;
 
 		for (linePtr = nodePtr->children.linePtr, i = 1;
 			linePtr->nextPtr != NULL;
@@ -4250,7 +4246,7 @@ Rebalance(
 		    i++;
 		}
 	    } else {
-		register Node *childPtr;
+		Node *childPtr;
 
 		for (childPtr = nodePtr->children.nodePtr, i = 1;
 			childPtr->nextPtr != NULL;
@@ -4326,14 +4322,14 @@ Rebalance(
 
 static void
 RecomputeNodeCounts(
-    register BTree *treePtr,	/* The whole B-tree. */
-    register Node *nodePtr)	/* Node whose tag summary information must be
+    BTree *treePtr,	/* The whole B-tree. */
+    Node *nodePtr)	/* Node whose tag summary information must be
 				 * recomputed. */
 {
-    register Summary *summaryPtr, *summaryPtr2;
-    register Node *childPtr;
-    register TkTextLine *linePtr;
-    register TkTextSegment *segPtr;
+    Summary *summaryPtr, *summaryPtr2;
+    Node *childPtr;
+    TkTextLine *linePtr;
+    TkTextSegment *segPtr;
     TkTextTag *tagPtr;
     int ref;
 
@@ -4377,7 +4373,7 @@ RecomputeNodeCounts(
 		for (summaryPtr = nodePtr->summaryPtr; ;
 			summaryPtr = summaryPtr->nextPtr) {
 		    if (summaryPtr == NULL) {
-			summaryPtr = ckalloc(sizeof(Summary));
+			summaryPtr = (Summary *)ckalloc(sizeof(Summary));
 			summaryPtr->tagPtr = tagPtr;
 			summaryPtr->toggleCount = 1;
 			summaryPtr->nextPtr = nodePtr->summaryPtr;
@@ -4405,7 +4401,7 @@ RecomputeNodeCounts(
 		for (summaryPtr = nodePtr->summaryPtr; ;
 			summaryPtr = summaryPtr->nextPtr) {
 		    if (summaryPtr == NULL) {
-			summaryPtr = ckalloc(sizeof(Summary));
+			summaryPtr = (Summary *)ckalloc(sizeof(Summary));
 			summaryPtr->tagPtr = summaryPtr2->tagPtr;
 			summaryPtr->toggleCount = summaryPtr2->toggleCount;
 			summaryPtr->nextPtr = nodePtr->summaryPtr;
@@ -4558,12 +4554,12 @@ CharSplitProc(
 {
     TkTextSegment *newPtr1, *newPtr2;
 
-    newPtr1 = ckalloc(CSEG_SIZE(index));
-    newPtr2 = ckalloc(CSEG_SIZE(segPtr->size - index));
+    newPtr1 = (TkTextSegment *)ckalloc(CSEG_SIZE(index));
+    newPtr2 = (TkTextSegment *)ckalloc(CSEG_SIZE(segPtr->size - index));
     newPtr1->typePtr = &tkTextCharType;
     newPtr1->nextPtr = newPtr2;
     newPtr1->size = index;
-    memcpy(newPtr1->body.chars, segPtr->body.chars, (size_t) index);
+    memcpy(newPtr1->body.chars, segPtr->body.chars, (size_t)index);
     newPtr1->body.chars[index] = 0;
     newPtr2->typePtr = &tkTextCharType;
     newPtr2->nextPtr = segPtr->nextPtr;
@@ -4592,12 +4588,11 @@ CharSplitProc(
  *--------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static TkTextSegment *
 CharCleanupProc(
     TkTextSegment *segPtr,	/* Pointer to first of two adjacent segments
 				 * to join. */
-    TkTextLine *linePtr)	/* Line containing segments (not used). */
+    TCL_UNUSED(TkTextLine *))	/* Line containing segments (not used). */
 {
     TkTextSegment *segPtr2, *newPtr;
 
@@ -4605,7 +4600,7 @@ CharCleanupProc(
     if ((segPtr2 == NULL) || (segPtr2->typePtr != &tkTextCharType)) {
 	return segPtr;
     }
-    newPtr = ckalloc(CSEG_SIZE(segPtr->size + segPtr2->size));
+    newPtr = (TkTextSegment *)ckalloc(CSEG_SIZE(segPtr->size + segPtr2->size));
     newPtr->typePtr = &tkTextCharType;
     newPtr->nextPtr = segPtr2->nextPtr;
     newPtr->size = segPtr->size + segPtr2->size;
@@ -4633,12 +4628,11 @@ CharCleanupProc(
  *--------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 CharDeleteProc(
     TkTextSegment *segPtr,	/* Segment to delete. */
-    TkTextLine *linePtr,	/* Line containing segment. */
-    int treeGone)		/* Non-zero means the entire tree is being
+    TCL_UNUSED(TkTextLine *),	/* Line containing segment. */
+    TCL_UNUSED(int))		/* Non-zero means the entire tree is being
 				 * deleted, so everything must get cleaned
 				 * up. */
 {
@@ -4663,7 +4657,6 @@ CharDeleteProc(
  *--------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static void
 CharCheckProc(
     TkTextSegment *segPtr,	/* Segment to check. */
@@ -4679,7 +4672,7 @@ CharCheckProc(
     if (segPtr->size <= 0) {
 	Tcl_Panic("CharCheckProc: segment has size <= 0");
     }
-    if (strlen(segPtr->body.chars) != (size_t) segPtr->size) {
+    if (strlen(segPtr->body.chars) != (size_t)segPtr->size) {
 	Tcl_Panic("CharCheckProc: segment has wrong size");
     }
     if (segPtr->nextPtr == NULL) {
@@ -4858,7 +4851,7 @@ ToggleCheckProc(
     TkTextSegment *segPtr,	/* Segment to check. */
     TkTextLine *linePtr)	/* Line containing segment. */
 {
-    register Summary *summaryPtr;
+    Summary *summaryPtr;
     int needSummary;
 
     if (segPtr->size != 0) {
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 0eae4a9..a02544d 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -1072,8 +1072,7 @@ FreeStyle(
     TextStyle *stylePtr)
 				/* Information about style to free. */
 {
-    stylePtr->refCount--;
-    if (stylePtr->refCount == 0) {
+    if (stylePtr->refCount-- <= 1) {
 	if (stylePtr->bgGC != NULL) {
 	    Tk_FreeGC(textPtr->display, stylePtr->bgGC);
 	}
@@ -3164,8 +3163,8 @@ GenerateWidgetViewSyncEvent(
 	} else {
 	    textPtr->dInfoPtr->flags |= OUT_OF_SYNC;
 	}
-        TkSendVirtualEvent(textPtr->tkwin, "WidgetViewSync",
-                           Tcl_NewBooleanObj(NewSyncState));
+	TkSendVirtualEvent(textPtr->tkwin, "WidgetViewSync",
+		Tcl_NewBooleanObj(NewSyncState));
     }
 }
 
@@ -8811,24 +8810,25 @@ TextGetScrollInfoObj(
 	}
 	switch ((enum viewUnits) index) {
 	case VIEW_SCROLL_PAGES:
-	    if (Tcl_GetIntFromObj(interp, objv[3], intPtr) != TCL_OK) {
-		return TKTEXT_SCROLL_ERROR;
+	    if (Tcl_GetIntFromObj(interp, objv[3], intPtr) == TCL_OK) {
+		return TKTEXT_SCROLL_PAGES;
 	    }
-	    return TKTEXT_SCROLL_PAGES;
+	    break;
 	case VIEW_SCROLL_PIXELS:
 	    if (Tk_GetPixelsFromObj(interp, textPtr->tkwin, objv[3],
-		    intPtr) != TCL_OK) {
-		return TKTEXT_SCROLL_ERROR;
+		    intPtr) == TCL_OK) {
+		return TKTEXT_SCROLL_PIXELS;
 	    }
-	    return TKTEXT_SCROLL_PIXELS;
+	    break;
 	case VIEW_SCROLL_UNITS:
-	    if (Tcl_GetIntFromObj(interp, objv[3], intPtr) != TCL_OK) {
-		return TKTEXT_SCROLL_ERROR;
+	    if (Tcl_GetIntFromObj(interp, objv[3], intPtr) == TCL_OK) {
+		return TKTEXT_SCROLL_UNITS;
 	    }
-	    return TKTEXT_SCROLL_UNITS;
+	    break;
+	default:
+	    Tcl_Panic("unexpected switch fallthrough");
 	}
     }
-    Tcl_Panic("unexpected switch fallthrough");
     return TKTEXT_SCROLL_ERROR;
 }
 
diff --git a/generic/tkTextImage.c b/generic/tkTextImage.c
index 41dd448..bc0da0a 100644
--- a/generic/tkTextImage.c
+++ b/generic/tkTextImage.c
@@ -18,7 +18,7 @@
  */
 
 #define EI_SEG_SIZE \
-	((unsigned) (Tk_Offset(TkTextSegment, body) + sizeof(TkTextEmbImage)))
+	((unsigned)(Tk_Offset(TkTextSegment, body) + sizeof(TkTextEmbImage)))
 
 /*
  * Prototypes for functions defined in this file:
@@ -117,7 +117,7 @@ static const Tk_OptionSpec optionSpecs[] = {
 
 int
 TkTextImageCmd(
-    register TkText *textPtr,	/* Information about text widget. */
+    TkText *textPtr,	/* Information about text widget. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. Someone else has already
@@ -125,7 +125,7 @@ TkTextImageCmd(
 				 * objv[1] is "image". */
 {
     int idx;
-    register TkTextSegment *eiPtr;
+    TkTextSegment *eiPtr;
     TkTextIndex index;
     static const char *const optionStrings[] = {
 	"cget", "configure", "create", "names", NULL
@@ -161,7 +161,7 @@ TkTextImageCmd(
 	    Tcl_SetErrorCode(interp, "TK", "TEXT", "NO_IMAGE", NULL);
 	    return TCL_ERROR;
 	}
-	objPtr = Tk_GetOptionValue(interp, (char *) &eiPtr->body.ei,
+	objPtr = Tk_GetOptionValue(interp, (char *)&eiPtr->body.ei,
 		eiPtr->body.ei.optionTable, objv[4], textPtr->tkwin);
 	if (objPtr == NULL) {
 	    return TCL_ERROR;
@@ -188,7 +188,7 @@ TkTextImageCmd(
 	}
 	if (objc <= 5) {
 	    Tcl_Obj *objPtr = Tk_GetOptionInfo(interp,
-		    (char *) &eiPtr->body.ei, eiPtr->body.ei.optionTable,
+		    (char *)&eiPtr->body.ei, eiPtr->body.ei.optionTable,
 		    (objc == 5) ? objv[4] : NULL, textPtr->tkwin);
 
 	    if (objPtr == NULL) {
@@ -242,7 +242,7 @@ TkTextImageCmd(
 	 * Create the new image segment and initialize it.
 	 */
 
-	eiPtr = ckalloc(EI_SEG_SIZE);
+	eiPtr = (TkTextSegment *)ckalloc(EI_SEG_SIZE);
 	eiPtr->typePtr = &tkTextEmbImageType;
 	eiPtr->size = 1;
 	eiPtr->body.ei.sharedTextPtr = textPtr->sharedTextPtr;
@@ -279,19 +279,18 @@ TkTextImageCmd(
 	Tcl_HashEntry *hPtr;
 	Tcl_Obj *resultObj;
 
-	if (objc != 3) {
-	    Tcl_WrongNumArgs(interp, 3, objv, NULL);
-	    return TCL_ERROR;
-	}
-	resultObj = Tcl_NewObj();
-	for (hPtr = Tcl_FirstHashEntry(&textPtr->sharedTextPtr->imageTable,
-		&search); hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
-	    Tcl_ListObjAppendElement(NULL, resultObj, Tcl_NewStringObj(
-		    Tcl_GetHashKey(&textPtr->sharedTextPtr->markTable, hPtr),
-		    -1));
+	if (objc == 3) {
+	    resultObj = Tcl_NewObj();
+	    for (hPtr = Tcl_FirstHashEntry(&textPtr->sharedTextPtr->imageTable,
+		    &search); hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
+		Tcl_ListObjAppendElement(NULL, resultObj, Tcl_NewStringObj(
+			Tcl_GetHashKey(&textPtr->sharedTextPtr->markTable, hPtr), -1));
+	    }
+	    Tcl_SetObjResult(interp, resultObj);
+	    return TCL_OK;
 	}
-	Tcl_SetObjResult(interp, resultObj);
-	return TCL_OK;
+	Tcl_WrongNumArgs(interp, 3, objv, NULL);
+	break;
     }
     default:
 	Tcl_Panic("unexpected switch fallthrough");
@@ -337,7 +336,7 @@ EmbImageConfigure(
     int conflict = 0;		/* True if we have a name conflict */
     size_t len;			/* length of image name */
 
-    if (Tk_SetOptions(textPtr->interp, (char *) &eiPtr->body.ei,
+    if (Tk_SetOptions(textPtr->interp, (char *)&eiPtr->body.ei,
 	    eiPtr->body.ei.optionTable,
 	    objc, objv, textPtr->tkwin, NULL, NULL) != TCL_OK) {
 	return TCL_ERROR;
@@ -389,7 +388,7 @@ EmbImageConfigure(
     len = strlen(name);
     for (hPtr = Tcl_FirstHashEntry(&textPtr->sharedTextPtr->imageTable,
 	    &search); hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
-	char *haveName =
+	char *haveName = (char *)
 		Tcl_GetHashKey(&textPtr->sharedTextPtr->imageTable, hPtr);
 
 	if (strncmp(name, haveName, len) == 0) {
@@ -419,7 +418,7 @@ EmbImageConfigure(
 	    &dummy);
     Tcl_SetHashValue(hPtr, eiPtr);
     Tcl_SetObjResult(textPtr->interp, Tcl_NewStringObj(name, -1));
-    eiPtr->body.ei.name = ckalloc(Tcl_DStringLength(&newName) + 1);
+    eiPtr->body.ei.name = (char *)ckalloc(Tcl_DStringLength(&newName) + 1);
     strcpy(eiPtr->body.ei.name, name);
     Tcl_DStringFree(&newName);
 
@@ -444,12 +443,11 @@ EmbImageConfigure(
  *--------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 EmbImageDeleteProc(
     TkTextSegment *eiPtr,	/* Segment being deleted. */
-    TkTextLine *linePtr,	/* Line containing segment. */
-    int treeGone)		/* Non-zero means the entire tree is being
+    TCL_UNUSED(TkTextLine *),	/* Line containing segment. */
+    TCL_UNUSED(int))		/* Non-zero means the entire tree is being
 				 * deleted, so everything must get cleaned
 				 * up. */
 {
@@ -527,24 +525,23 @@ EmbImageCleanupProc(
  *--------------------------------------------------------------
  */
 
-	/*ARGSUSED*/
 static int
 EmbImageLayoutProc(
     TkText *textPtr,		/* Text widget being layed out. */
-    TkTextIndex *indexPtr,	/* Identifies first character in chunk. */
+    TCL_UNUSED(TkTextIndex *),	/* Identifies first character in chunk. */
     TkTextSegment *eiPtr,	/* Segment corresponding to indexPtr. */
     int offset,			/* Offset within segPtr corresponding to
 				 * indexPtr (always 0). */
     int maxX,			/* Chunk must not occupy pixels at this
 				 * position or higher. */
-    int maxChars,		/* Chunk must not include more than this many
+    TCL_UNUSED(int),		/* Chunk must not include more than this many
 				 * characters. */
     int noCharsYet,		/* Non-zero means no characters have been
 				 * assigned to this line yet. */
-    TkWrapMode wrapMode,	/* Wrap mode to use for line:
+    TCL_UNUSED(TkWrapMode),	/* Wrap mode to use for line:
 				 * TEXT_WRAPMODE_CHAR, TEXT_WRAPMODE_NONE, or
 				 * TEXT_WRAPMODE_WORD. */
-    register TkTextDispChunk *chunkPtr)
+    TkTextDispChunk *chunkPtr)
 				/* Structure to fill in with information about
 				 * this chunk. The x field has already been
 				 * set by the caller. */
@@ -619,7 +616,7 @@ EmbImageLayoutProc(
 static void
 EmbImageCheckProc(
     TkTextSegment *eiPtr,	/* Segment to check. */
-    TkTextLine *linePtr)	/* Line containing segment. */
+    TCL_UNUSED(TkTextLine *))	/* Line containing segment. */
 {
     if (eiPtr->nextPtr == NULL) {
 	Tcl_Panic("EmbImageCheckProc: embedded image is last segment in line");
@@ -660,12 +657,12 @@ EmbImageDisplayProc(
 				 * (x-position is in the chunk itself). */
     int lineHeight,		/* Total height of line. */
     int baseline,		/* Offset of baseline from y. */
-    Display *display,		/* Display to use for drawing. */
+    TCL_UNUSED(Display *),	/* Display to use for drawing. */
     Drawable dst,		/* Pixmap or window in which to draw */
-    int screenY)		/* Y-coordinate in text window that
+    TCL_UNUSED(int))	/* Y-coordinate in text window that
 				 * corresponds to y. */
 {
-    TkTextSegment *eiPtr = chunkPtr->clientData;
+    TkTextSegment *eiPtr = (TkTextSegment *)chunkPtr->clientData;
     int lineX, imageX, imageY, width, height;
     Tk_Image image;
 
@@ -713,9 +710,9 @@ EmbImageDisplayProc(
 
 static void
 EmbImageBboxProc(
-    TkText *textPtr,
+    TCL_UNUSED(TkText *),
     TkTextDispChunk *chunkPtr,	/* Chunk containing desired char. */
-    int index,			/* Index of desired character within the
+    TCL_UNUSED(int),			/* Index of desired character within the
 				 * chunk. */
     int y,			/* Topmost pixel in area allocated for this
 				 * line. */
@@ -729,7 +726,7 @@ EmbImageBboxProc(
     int *heightPtr)		/* Gets filled in with height of image, in
 				 * pixels. */
 {
-    TkTextSegment *eiPtr = chunkPtr->clientData;
+    TkTextSegment *eiPtr = (TkTextSegment *)chunkPtr->clientData;
     Tk_Image image;
 
     image = eiPtr->body.ei.image;
@@ -794,7 +791,7 @@ TkTextImageIndex(
     if (hPtr == NULL) {
 	return 0;
     }
-    eiPtr = Tcl_GetHashValue(hPtr);
+    eiPtr = (TkTextSegment *)Tcl_GetHashValue(hPtr);
     indexPtr->tree = textPtr->sharedTextPtr->tree;
     indexPtr->linePtr = eiPtr->body.ei.linePtr;
     indexPtr->byteIndex = TkTextSegToOffset(eiPtr, indexPtr->linePtr);
@@ -821,14 +818,17 @@ TkTextImageIndex(
 static void
 EmbImageProc(
     ClientData clientData,	/* Pointer to widget record. */
-    int x, int y,		/* Upper left pixel (within image) that must
+    TCL_UNUSED(int),		/* Upper left pixel (within image) that must
 				 * be redisplayed. */
-    int width, int height,	/* Dimensions of area to redisplay (may be
+    TCL_UNUSED(int),
+    TCL_UNUSED(int),	/* Dimensions of area to redisplay (may be
 				 * <= 0). */
-    int imgWidth, int imgHeight)/* New dimensions of image. */
+    TCL_UNUSED(int),
+    TCL_UNUSED(int),/* New dimensions of image. */
+    TCL_UNUSED(int))
 
 {
-    TkTextSegment *eiPtr = clientData;
+    TkTextSegment *eiPtr = (TkTextSegment *)clientData;
     TkTextIndex index;
 
     index.tree = eiPtr->body.ei.sharedTextPtr->tree;
diff --git a/generic/tkTextIndex.c b/generic/tkTextIndex.c
index 8f30b7d..1628389 100644
--- a/generic/tkTextIndex.c
+++ b/generic/tkTextIndex.c
@@ -11,9 +11,9 @@
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
-#include "default.h"
 #include "tkInt.h"
 #include "tkText.h"
+#include "default.h"
 
 /*
  * Index to use to select last character in line (very large integer):
@@ -62,7 +62,7 @@ static void		UpdateStringOfTextIndex(Tcl_Obj *objPtr);
 #define GET_INDEXEPOCH(objPtr) \
 	(PTR2INT((objPtr)->internalRep.twoPtrValue.ptr2))
 #define SET_TEXTINDEX(objPtr, indexPtr) \
-	((objPtr)->internalRep.twoPtrValue.ptr1 = (void *) (indexPtr))
+	((objPtr)->internalRep.twoPtrValue.ptr1 = (void *)(indexPtr))
 #define SET_INDEXEPOCH(objPtr, epoch) \
 	((objPtr)->internalRep.twoPtrValue.ptr2 = INT2PTR(epoch))
 
@@ -107,7 +107,7 @@ DupTextIndexInternalRep(
     int epoch;
     TkTextIndex *dupIndexPtr, *indexPtr;
 
-    dupIndexPtr = ckalloc(sizeof(TkTextIndex));
+    dupIndexPtr = (TkTextIndex *)ckalloc(sizeof(TkTextIndex));
     indexPtr = GET_TEXTINDEX(srcPtr);
     epoch = GET_INDEXEPOCH(srcPtr);
 
@@ -139,7 +139,7 @@ UpdateStringOfTextIndex(
 
     len = TkTextPrintIndex(indexPtr->textPtr, indexPtr, buffer);
 
-    objPtr->bytes = ckalloc(len + 1);
+    objPtr->bytes = (char *)ckalloc(len + 1);
     strcpy(objPtr->bytes, buffer);
     objPtr->length = len;
 }
@@ -176,7 +176,7 @@ MakeObjIndex(
 				 * position. */
     const TkTextIndex *origPtr)	/* Pointer to index. */
 {
-    TkTextIndex *indexPtr = ckalloc(sizeof(TkTextIndex));
+    TkTextIndex *indexPtr = (TkTextIndex *)ckalloc(sizeof(TkTextIndex));
 
     indexPtr->tree = origPtr->tree;
     indexPtr->linePtr = origPtr->linePtr;
@@ -477,7 +477,7 @@ TkTextMakeCharIndex(
     int charIndex,		/* Index of desired character. */
     TkTextIndex *indexPtr)	/* Structure to fill in. */
 {
-    register TkTextSegment *segPtr;
+    TkTextSegment *segPtr;
     char *p, *start, *end;
     int index, offset;
     int ch;
@@ -816,7 +816,7 @@ GetIndex(
 	    hPtr = Tcl_FindHashEntry(&sharedPtr->tagTable, tagName);
 	    *p = '.';
 	    if (hPtr != NULL) {
-		tagPtr = Tcl_GetHashValue(hPtr);
+		tagPtr = (TkTextTag *)Tcl_GetHashValue(hPtr);
 	    }
 	}
 
@@ -832,7 +832,7 @@ GetIndex(
 	    if (tagPtr == textPtr->selTagPtr) {
 		tagName = "sel";
 	    } else if (hPtr != NULL) {
-		tagName = Tcl_GetHashKey(&sharedPtr->tagTable, hPtr);
+		tagName = (const char *)Tcl_GetHashKey(&sharedPtr->tagTable, hPtr);
 	    }
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "text doesn't contain any characters tagged with \"%s\"",
@@ -923,7 +923,7 @@ GetIndex(
     }
     if ((string[0] == 'e')
 	    && (strncmp(string, "end",
-	    (size_t) (endOfBase-Tcl_DStringValue(&copy))) == 0)) {
+	    endOfBase-Tcl_DStringValue(&copy)) == 0)) {
 	/*
 	 * Base position is end of text.
 	 */
@@ -1151,7 +1151,7 @@ ForwBack(
 				 * or "-" that starts modifier. */
     TkTextIndex *indexPtr)	/* Index to update as specified in string. */
 {
-    register const char *p, *units;
+    const char *p, *units;
     char *end;
     int count, lineIndex, modifier;
     size_t length;
@@ -1499,7 +1499,7 @@ TkTextIndexForwChars(
 	return;
     }
     if (checkElided) {
-	infoPtr = ckalloc(sizeof(TkTextElideInfo));
+	infoPtr = (TkTextElideInfo *)ckalloc(sizeof(TkTextElideInfo));
 	elide = TkTextIsElided(textPtr, srcPtr, infoPtr);
     }
 
@@ -1597,7 +1597,7 @@ TkTextIndexForwChars(
 			charCount--;
 		    }
 		} else if (type & COUNT_INDICES) {
-		    if (charCount < segPtr->size - byteOffset) {
+		    if (charCount + byteOffset < segPtr->size) {
 			dstPtr->byteIndex += charCount;
 			goto forwardCharDone;
 		    }
@@ -1767,7 +1767,7 @@ TkTextIndexCount(
     seg2Ptr = TkTextIndexToSeg(indexPtr2, &maxBytes);
 
     if (checkElided) {
-	infoPtr = ckalloc(sizeof(TkTextElideInfo));
+	infoPtr = (TkTextElideInfo *)ckalloc(sizeof(TkTextElideInfo));
 	elide = TkTextIsElided(textPtr, indexPtr1, infoPtr);
     }
 
@@ -1844,12 +1844,12 @@ TkTextIndexCount(
 
 	    if (segPtr->typePtr == &tkTextCharType) {
 		int byteLen = segPtr->size - byteOffset;
-		register unsigned char *str = (unsigned char *)
+		unsigned char *str = (unsigned char *)
 			segPtr->body.chars + byteOffset;
-		register int i;
+		int i;
 
 		if (segPtr == seg2Ptr) {
-		    if (byteLen > (maxBytes - byteOffset)) {
+		    if (byteLen + byteOffset > maxBytes) {
 			byteLen = maxBytes - byteOffset;
 		    }
 		}
@@ -1879,7 +1879,7 @@ TkTextIndexCount(
 		    int byteLen = segPtr->size - byteOffset;
 
 		    if (segPtr == seg2Ptr) {
-			if (byteLen > (maxBytes - byteOffset)) {
+			if (byteLen + byteOffset > maxBytes) {
 			    byteLen = maxBytes - byteOffset;
 			}
 		    }
@@ -2025,7 +2025,7 @@ TkTextIndexBackChars(
 	return;
     }
     if (checkElided) {
-	infoPtr = ckalloc(sizeof(TkTextElideInfo));
+	infoPtr = (TkTextElideInfo *)ckalloc(sizeof(TkTextElideInfo));
 	elide = TkTextIsElided(textPtr, srcPtr, infoPtr);
     }
 
@@ -2225,7 +2225,7 @@ StartEnd(
 {
     const char *p;
     size_t length;
-    register TkTextSegment *segPtr;
+    TkTextSegment *segPtr;
     int modifier;
 
     /*
diff --git a/generic/tkTextMark.c b/generic/tkTextMark.c
index 6a41c77..dcd7008 100644
--- a/generic/tkTextMark.c
+++ b/generic/tkTextMark.c
@@ -19,7 +19,7 @@
  * Macro that determines the size of a mark segment:
  */
 
-#define MSEG_SIZE ((unsigned) (Tk_Offset(TkTextSegment, body) \
+#define MSEG_SIZE ((unsigned)(Tk_Offset(TkTextSegment, body) \
 	+ sizeof(TkTextMark)))
 
 /*
@@ -93,7 +93,7 @@ const Tk_SegType tkTextLeftMarkType = {
 
 int
 TkTextMarkCmd(
-    register TkText *textPtr,	/* Information about text widget. */
+    TkText *textPtr,	/* Information about text widget. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. Someone else has already
@@ -147,7 +147,7 @@ TkTextMarkCmd(
 			NULL);
 		return TCL_ERROR;
 	    }
-	    markPtr = Tcl_GetHashValue(hPtr);
+	    markPtr = (TkTextSegment *)Tcl_GetHashValue(hPtr);
 	}
 	if (objc == 4) {
 	    const char *typeStr;
@@ -162,10 +162,10 @@ TkTextMarkCmd(
 	}
 	str = Tcl_GetStringFromObj(objv[4],&length);
 	c = str[0];
-	if ((c == 'l') && (strncmp(str, "left", (unsigned) length) == 0)) {
+	if ((c == 'l') && (strncmp(str, "left", length) == 0)) {
 	    newTypePtr = &tkTextLeftMarkType;
 	} else if ((c == 'r') &&
-		(strncmp(str, "right", (unsigned) length) == 0)) {
+		(strncmp(str, "right", length) == 0)) {
 	    newTypePtr = &tkTextRightMarkType;
 	} else {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
@@ -194,7 +194,7 @@ TkTextMarkCmd(
 	for (hPtr = Tcl_FirstHashEntry(&textPtr->sharedTextPtr->markTable,
 		&search); hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
 	    Tcl_ListObjAppendElement(NULL, resultObj, Tcl_NewStringObj(
-		    Tcl_GetHashKey(&textPtr->sharedTextPtr->markTable, hPtr),
+		    (const char *)Tcl_GetHashKey(&textPtr->sharedTextPtr->markTable, hPtr),
 		    -1));
 	}
 	Tcl_SetObjResult(interp, resultObj);
@@ -229,7 +229,7 @@ TkTextMarkCmd(
 	    hPtr = Tcl_FindHashEntry(&textPtr->sharedTextPtr->markTable,
 		    Tcl_GetString(objv[i]));
 	    if (hPtr != NULL) {
-		markPtr = Tcl_GetHashValue(hPtr);
+		markPtr = (TkTextSegment *)Tcl_GetHashValue(hPtr);
 
 		/*
 		 * Special case not needed with peer widgets.
@@ -290,7 +290,7 @@ TkTextSetMark(
 	widgetSpecific = 0;
 	hPtr = Tcl_CreateHashEntry(&textPtr->sharedTextPtr->markTable, name,
 		&isNew);
-	markPtr = Tcl_GetHashValue(hPtr);
+	markPtr = (TkTextSegment *)Tcl_GetHashValue(hPtr);
     }
     if (!isNew) {
 	/*
@@ -330,7 +330,7 @@ TkTextSetMark(
 	}
 	TkBTreeUnlinkSegment(markPtr, markPtr->body.mark.linePtr);
     } else {
-	markPtr = ckalloc(MSEG_SIZE);
+	markPtr = (TkTextSegment *)ckalloc(MSEG_SIZE);
 	markPtr->typePtr = &tkTextRightMarkType;
 	markPtr->size = 0;
 	markPtr->body.mark.textPtr = textPtr;
@@ -452,7 +452,7 @@ TkTextMarkNameToIndex(
 	if (hPtr == NULL) {
 	    return TCL_ERROR;
 	}
-	segPtr = Tcl_GetHashValue(hPtr);
+	segPtr = (TkTextSegment *)Tcl_GetHashValue(hPtr);
     }
     TkTextMarkSegToIndex(textPtr, segPtr, indexPtr);
 
@@ -499,12 +499,11 @@ TkTextMarkNameToIndex(
  *--------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 MarkDeleteProc(
-    TkTextSegment *segPtr,	/* Segment being deleted. */
-    TkTextLine *linePtr,	/* Line containing segment. */
-    int treeGone)		/* Non-zero means the entire tree is being
+    TCL_UNUSED(TkTextSegment *),	/* Segment being deleted. */
+    TCL_UNUSED(TkTextLine *),	/* Line containing segment. */
+    TCL_UNUSED(int))		/* Non-zero means the entire tree is being
 				 * deleted, so everything must get cleaned
 				 * up. */
 {
@@ -559,18 +558,18 @@ MarkCleanupProc(
 static int
 MarkLayoutProc(
     TkText *textPtr,		/* Text widget being layed out. */
-    TkTextIndex *indexPtr,	/* Identifies first character in chunk. */
+    TCL_UNUSED(TkTextIndex *),	/* Identifies first character in chunk. */
     TkTextSegment *segPtr,	/* Segment corresponding to indexPtr. */
-    int offset,			/* Offset within segPtr corresponding to
+    TCL_UNUSED(int),			/* Offset within segPtr corresponding to
 				 * indexPtr (always 0). */
-    int maxX,			/* Chunk must not occupy pixels at this
+    TCL_UNUSED(int),			/* Chunk must not occupy pixels at this
 				 * position or higher. */
-    int maxChars,		/* Chunk must not include more than this many
+    TCL_UNUSED(int),		/* Chunk must not include more than this many
 				 * characters. */
-    int noCharsYet,		/* Non-zero means no characters have been
+    TCL_UNUSED(int),		/* Non-zero means no characters have been
 				 * assigned to this line yet. */
-    TkWrapMode wrapMode,	/* Not used. */
-    register TkTextDispChunk *chunkPtr)
+    TCL_UNUSED(TkWrapMode),	/* Not used. */
+    TkTextDispChunk *chunkPtr)
 				/* Structure to fill in with information about
 				 * this chunk. The x field has already been
 				 * set by the caller. */
@@ -615,19 +614,18 @@ MarkLayoutProc(
  *--------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 void
 TkTextInsertDisplayProc(
     TkText *textPtr,		/* The current text widget. */
-    TkTextDispChunk *chunkPtr,	/* Chunk that is to be drawn. */
+    TCL_UNUSED(TkTextDispChunk *),	/* Chunk that is to be drawn. */
     int x,			/* X-position in dst at which to draw this
 				 * chunk (may differ from the x-position in
 				 * the chunk because of scrolling). */
     int y,			/* Y-position at which to draw this chunk in
 				 * dst (x-position is in the chunk itself). */
     int height,			/* Total height of line. */
-    int baseline,		/* Offset of baseline from y. */
-    Display *display,		/* Display to use for drawing. */
+    TCL_UNUSED(int),		/* Offset of baseline from y. */
+    TCL_UNUSED(Display *),		/* Display to use for drawing. */
     Drawable dst,		/* Pixmap or window in which to draw chunk. */
     int screenY)		/* Y-coordinate in text window that
 				 * corresponds to y. */
@@ -721,11 +719,10 @@ TkTextInsertDisplayProc(
  *--------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static void
 InsertUndisplayProc(
-    TkText *textPtr,		/* Overall information about text widget. */
-    TkTextDispChunk *chunkPtr)	/* Chunk that is about to be freed. */
+    TCL_UNUSED(TkText *),		/* Overall information about text widget. */
+    TCL_UNUSED(TkTextDispChunk *))	/* Chunk that is about to be freed. */
 {
     return;
 }
@@ -809,7 +806,7 @@ MarkFindNext(
 {
     TkTextIndex index;
     Tcl_HashEntry *hPtr;
-    register TkTextSegment *segPtr;
+    TkTextSegment *segPtr;
     int offset;
     const char *string = Tcl_GetString(obj);
 
@@ -830,7 +827,7 @@ MarkFindNext(
 	     * position.
 	     */
 
-	    segPtr = Tcl_GetHashValue(hPtr);
+	    segPtr = (TkTextSegment *)Tcl_GetHashValue(hPtr);
 	    TkTextMarkSegToIndex(textPtr, segPtr, &index);
 	    segPtr = segPtr->nextPtr;
 	} else {
@@ -900,7 +897,7 @@ MarkFindPrev(
 {
     TkTextIndex index;
     Tcl_HashEntry *hPtr;
-    register TkTextSegment *segPtr, *seg2Ptr, *prevPtr;
+    TkTextSegment *segPtr, *seg2Ptr, *prevPtr;
     int offset;
     const char *string = Tcl_GetString(obj);
 
@@ -919,7 +916,7 @@ MarkFindPrev(
 	     * position.
 	     */
 
-	    segPtr = Tcl_GetHashValue(hPtr);
+	    segPtr = (TkTextSegment *)Tcl_GetHashValue(hPtr);
 	    TkTextMarkSegToIndex(textPtr, segPtr, &index);
 	} else {
 	    /*
@@ -1012,7 +1009,7 @@ GetMarkName(
 
 	return NULL;
     } else {
-	markName = Tcl_GetHashKey(&textPtr->sharedTextPtr->markTable,
+	markName = (const char *)Tcl_GetHashKey(&textPtr->sharedTextPtr->markTable,
 		segPtr->body.mark.hPtr);
     }
     return Tcl_NewStringObj(markName, -1);
diff --git a/generic/tkTextTag.c b/generic/tkTextTag.c
index f7e4294..c15773e 100644
--- a/generic/tkTextTag.c
+++ b/generic/tkTextTag.c
@@ -12,9 +12,9 @@
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
-#include "default.h"
 #include "tkInt.h"
 #include "tkText.h"
+#include "default.h"
 
 /*
  * The 'TkWrapMode' enum in tkText.h is used to define a type for the -wrap
@@ -137,7 +137,7 @@ static void		TagBindEvent(TkText *textPtr, XEvent *eventPtr,
 
 int
 TkTextTagCmd(
-    register TkText *textPtr,	/* Information about text widget. */
+    TkText *textPtr,	/* Information about text widget. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. Someone else has already
@@ -154,7 +154,7 @@ TkTextTagCmd(
 	TAG_REMOVE
     };
     int optionIndex, i;
-    register TkTextTag *tagPtr;
+    TkTextTag *tagPtr;
     TkTextIndex index1, index2;
 
     if (objc < 3) {
@@ -343,7 +343,7 @@ TkTextTagCmd(
 	    if (tagPtr == NULL) {
 		return TCL_ERROR;
 	    }
-	    objPtr = Tk_GetOptionValue(interp, (char *) tagPtr,
+	    objPtr = Tk_GetOptionValue(interp, (char *)tagPtr,
 		    tagPtr->optionTable, objv[4], textPtr->tkwin);
 	    if (objPtr == NULL) {
 		return TCL_ERROR;
@@ -362,7 +362,7 @@ TkTextTagCmd(
 	}
 	tagPtr = TkTextCreateTag(textPtr, Tcl_GetString(objv[3]), &newTag);
 	if (objc <= 5) {
-	    Tcl_Obj *objPtr = Tk_GetOptionInfo(interp, (char *) tagPtr,
+	    Tcl_Obj *objPtr = Tk_GetOptionInfo(interp, (char *)tagPtr,
 		    tagPtr->optionTable,
 		    (objc == 5) ? objv[4] : NULL, textPtr->tkwin);
 
@@ -374,7 +374,7 @@ TkTextTagCmd(
 	} else {
 	    int result = TCL_OK;
 
-	    if (Tk_SetOptions(interp, (char *) tagPtr, tagPtr->optionTable,
+	    if (Tk_SetOptions(interp, (char *)tagPtr, tagPtr->optionTable,
 		    objc-4, objv+4, textPtr->tkwin, NULL, NULL) != TCL_OK) {
 		return TCL_ERROR;
 	    }
@@ -584,7 +584,7 @@ TkTextTagCmd(
 
 		continue;
 	    }
-	    tagPtr = Tcl_GetHashValue(hPtr);
+	    tagPtr = (TkTextTag *)Tcl_GetHashValue(hPtr);
 	    if (tagPtr == textPtr->selTagPtr) {
 		continue;
 	    }
@@ -645,12 +645,12 @@ TkTextTagCmd(
 	    Tcl_HashSearch search;
 	    Tcl_HashEntry *hPtr;
 
-	    arrayPtr = ckalloc(textPtr->sharedTextPtr->numTags
+	    arrayPtr = (TkTextTag **)ckalloc(textPtr->sharedTextPtr->numTags
 		    * sizeof(TkTextTag *));
 	    for (i=0, hPtr = Tcl_FirstHashEntry(
 		    &textPtr->sharedTextPtr->tagTable, &search);
 		    hPtr != NULL; i++, hPtr = Tcl_NextHashEntry(&search)) {
-		arrayPtr[i] = Tcl_GetHashValue(hPtr);
+		arrayPtr[i] = (TkTextTag *)Tcl_GetHashValue(hPtr);
 	    }
 
 	    /*
@@ -986,7 +986,7 @@ TkTextCreateTag(
     int *newTag)		/* If non-NULL, then return 1 if new, or 0 if
 				 * already exists. */
 {
-    register TkTextTag *tagPtr;
+    TkTextTag *tagPtr;
     Tcl_HashEntry *hPtr = NULL;
     int isNew;
     const char *name;
@@ -1009,9 +1009,9 @@ TkTextCreateTag(
 	    *newTag = isNew;
 	}
 	if (!isNew) {
-	    return Tcl_GetHashValue(hPtr);
+	    return (TkTextTag *)Tcl_GetHashValue(hPtr);
 	}
-	name = Tcl_GetHashKey(&textPtr->sharedTextPtr->tagTable, hPtr);
+	name = (const char *)Tcl_GetHashKey(&textPtr->sharedTextPtr->tagTable, hPtr);
     }
 
     /*
@@ -1019,7 +1019,7 @@ TkTextCreateTag(
      * to it to the hash table entry.
      */
 
-    tagPtr = ckalloc(sizeof(TkTextTag));
+    tagPtr = (TkTextTag *)ckalloc(sizeof(TkTextTag));
     tagPtr->name = name;
     tagPtr->textPtr = NULL;
     tagPtr->toggleCount = 0;
@@ -1118,7 +1118,7 @@ FindTag(
     hPtr = Tcl_FindHashEntry(&textPtr->sharedTextPtr->tagTable,
 	    Tcl_GetString(tagName));
     if (hPtr != NULL) {
-	return Tcl_GetHashValue(hPtr);
+	return (TkTextTag *)Tcl_GetHashValue(hPtr);
     }
     if (interp != NULL) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
@@ -1158,7 +1158,7 @@ FindTag(
 void
 TkTextDeleteTag(
     TkText *textPtr,		/* Info about overall widget. */
-    register TkTextTag *tagPtr)	/* Tag being deleted. */
+    TkTextTag *tagPtr)	/* Tag being deleted. */
 {
     TkTextIndex first, last;
 
@@ -1216,7 +1216,7 @@ TkTextDeleteTag(
 void
 TkTextFreeTag(
     TkText *textPtr,		/* Info about overall widget. */
-    register TkTextTag *tagPtr)	/* Tag being deleted. */
+    TkTextTag *tagPtr)	/* Tag being deleted. */
 {
     int i;
 
@@ -1295,7 +1295,7 @@ SortTags(
     TkTextTag **tagArrayPtr)	/* Pointer to array of pointers. */
 {
     int i, j, prio;
-    register TkTextTag **tagPtrPtr;
+    TkTextTag **tagPtrPtr;
     TkTextTag **maxPtrPtr, *tmp;
 
     if (numTags < 2) {
@@ -1379,7 +1379,7 @@ ChangeTagPriority(
     int prio)			/* New priority for tag. */
 {
     int low, high, delta;
-    register TkTextTag *tagPtr2;
+    TkTextTag *tagPtr2;
     Tcl_HashEntry *hPtr;
     Tcl_HashSearch search;
 
@@ -1412,7 +1412,7 @@ ChangeTagPriority(
     }
     for (hPtr = Tcl_FirstHashEntry(&textPtr->sharedTextPtr->tagTable, &search);
 	    hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
-	tagPtr2 = Tcl_GetHashValue(hPtr);
+	tagPtr2 = (TkTextTag *)Tcl_GetHashValue(hPtr);
 	if ((tagPtr2->priority >= low) && (tagPtr2->priority <= high)) {
 	    tagPtr2->priority += delta;
 	}
@@ -1443,7 +1443,7 @@ TkTextBindProc(
     ClientData clientData,	/* Pointer to text widget structure. */
     XEvent *eventPtr)		/* Pointer to X event that just happened. */
 {
-    TkText *textPtr = clientData;
+    TkText *textPtr = (TkText *)clientData;
     int repick = 0;
 
     textPtr->refCount++;
@@ -1529,7 +1529,7 @@ TkTextBindProc(
 
 void
 TkTextPickCurrent(
-    register TkText *textPtr,	/* Text widget in which to select current
+    TkText *textPtr,	/* Text widget in which to select current
 				 * character. */
     XEvent *eventPtr)		/* Event describing location of mouse cursor.
 				 * Must be EnterWindow, LeaveWindow,
@@ -1632,8 +1632,8 @@ TkTextPickCurrent(
     SortTags(textPtr->numCurTags, textPtr->curTagArrayPtr);
     if (numNewTags > 0) {
 	size = numNewTags * sizeof(TkTextTag *);
-	copyArrayPtr = ckalloc(size);
-	memcpy(copyArrayPtr, newArrayPtr, (size_t) size);
+	copyArrayPtr = (TkTextTag **)ckalloc(size);
+	memcpy(copyArrayPtr, newArrayPtr, size);
 	for (i = 0; i < textPtr->numCurTags; i++) {
 	    for (j = 0; j < numNewTags; j++) {
 		if (textPtr->curTagArrayPtr[i] == copyArrayPtr[j]) {
@@ -1736,7 +1736,7 @@ TagBindEvent(
      */
 
     if (numTags > NUM_BIND_TAGS) {
-	nameArrPtr = ckalloc(numTags * sizeof(const char *));
+	nameArrPtr = (const char **)ckalloc(numTags * sizeof(const char *));
     } else {
 	nameArrPtr = nameArray;
     }
diff --git a/generic/tkTextWind.c b/generic/tkTextWind.c
index a0e7089..c160083 100644
--- a/generic/tkTextWind.c
+++ b/generic/tkTextWind.c
@@ -35,7 +35,7 @@ static const Tk_GeomMgr textGeomType = {
  * Macro that determines the size of an embedded window segment:
  */
 
-#define EW_SEG_SIZE ((unsigned) (Tk_Offset(TkTextSegment, body) \
+#define EW_SEG_SIZE ((unsigned)(Tk_Offset(TkTextSegment, body) \
 	+ sizeof(TkTextEmbWindow)))
 
 /*
@@ -133,7 +133,7 @@ static const Tk_OptionSpec optionSpecs[] = {
 
 int
 TkTextWindowCmd(
-    register TkText *textPtr,	/* Information about text widget. */
+    TkText *textPtr,	/* Information about text widget. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. Someone else has already
@@ -147,7 +147,7 @@ TkTextWindowCmd(
     enum windOptions {
 	WIND_CGET, WIND_CONFIGURE, WIND_CREATE, WIND_NAMES
     };
-    register TkTextSegment *ewPtr;
+    TkTextSegment *ewPtr;
 
     if (objc < 3) {
 	Tcl_WrongNumArgs(interp, 2, objv, "option ?arg ...?");
@@ -191,7 +191,7 @@ TkTextWindowCmd(
 	    ewPtr->body.ew.tkwin = NULL;
 	}
 
-	objPtr = Tk_GetOptionValue(interp, (char *) &ewPtr->body.ew,
+	objPtr = Tk_GetOptionValue(interp, (char *)&ewPtr->body.ew,
 		ewPtr->body.ew.optionTable, objv[4], textPtr->tkwin);
 	if (objPtr == NULL) {
 	    return TCL_ERROR;
@@ -233,7 +233,7 @@ TkTextWindowCmd(
 		ewPtr->body.ew.tkwin = NULL;
 	    }
 
-	    objPtr = Tk_GetOptionInfo(interp, (char *) &ewPtr->body.ew,
+	    objPtr = Tk_GetOptionInfo(interp, (char *)&ewPtr->body.ew,
 		    ewPtr->body.ew.optionTable, (objc == 5) ? objv[4] : NULL,
 		    textPtr->tkwin);
 	    if (objPtr == NULL) {
@@ -290,7 +290,7 @@ TkTextWindowCmd(
 	 * Create the new window segment and initialize it.
 	 */
 
-	ewPtr = ckalloc(EW_SEG_SIZE);
+	ewPtr = (TkTextSegment *)ckalloc(EW_SEG_SIZE);
 	ewPtr->typePtr = &tkTextEmbWindowType;
 	ewPtr->size = 1;
 	ewPtr->body.ew.sharedTextPtr = textPtr->sharedTextPtr;
@@ -302,7 +302,7 @@ TkTextWindowCmd(
 	ewPtr->body.ew.stretch = 0;
 	ewPtr->body.ew.optionTable = Tk_CreateOptionTable(interp, optionSpecs);
 
-	client = ckalloc(sizeof(TkTextEmbWindowClient));
+	client = (TkTextEmbWindowClient *)ckalloc(sizeof(TkTextEmbWindowClient));
 	client->next = NULL;
 	client->textPtr = textPtr;
 	client->tkwin = NULL;
@@ -345,7 +345,7 @@ TkTextWindowCmd(
 	for (hPtr = Tcl_FirstHashEntry(&textPtr->sharedTextPtr->windowTable,
 		&search); hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
 	    Tcl_ListObjAppendElement(NULL, resultObj, Tcl_NewStringObj(
-		    Tcl_GetHashKey(&textPtr->sharedTextPtr->markTable, hPtr),
+		    (const char *)Tcl_GetHashKey(&textPtr->sharedTextPtr->markTable, hPtr),
 		    -1));
 	}
 	Tcl_SetObjResult(interp, resultObj);
@@ -403,7 +403,7 @@ EmbWinConfigure(
     }
 
     oldWindow = ewPtr->body.ew.tkwin;
-    if (Tk_SetOptions(textPtr->interp, (char *) &ewPtr->body.ew,
+    if (Tk_SetOptions(textPtr->interp, (char *)&ewPtr->body.ew,
 	    ewPtr->body.ew.optionTable, objc, objv, textPtr->tkwin, NULL,
 	    NULL) != TCL_OK) {
 	return TCL_ERROR;
@@ -467,7 +467,7 @@ EmbWinConfigure(
 		 * Have to make the new client.
 		 */
 
-		client = ckalloc(sizeof(TkTextEmbWindowClient));
+		client = (TkTextEmbWindowClient *)ckalloc(sizeof(TkTextEmbWindowClient));
 		client->next = ewPtr->body.ew.clients;
 		client->textPtr = textPtr;
 		client->tkwin = NULL;
@@ -526,7 +526,7 @@ EmbWinStructureProc(
     ClientData clientData,	/* Pointer to record describing window item. */
     XEvent *eventPtr)		/* Describes what just happened. */
 {
-    TkTextEmbWindowClient *client = clientData;
+    TkTextEmbWindowClient *client = (TkTextEmbWindowClient *)clientData;
     TkTextSegment *ewPtr = client->parent;
     TkTextIndex index;
     Tcl_HashEntry *hPtr;
@@ -573,13 +573,12 @@ EmbWinStructureProc(
  *--------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static void
 EmbWinRequestProc(
     ClientData clientData,	/* Pointer to record for window item. */
-    Tk_Window tkwin)		/* Window that changed its desired size. */
+    TCL_UNUSED(Tk_Window))		/* Window that changed its desired size. */
 {
-    TkTextEmbWindowClient *client = clientData;
+    TkTextEmbWindowClient *client = (TkTextEmbWindowClient *)clientData;
     TkTextSegment *ewPtr = client->parent;
     TkTextIndex index;
 
@@ -616,7 +615,7 @@ EmbWinLostContentProc(
     Tk_Window tkwin)		/* Window that was claimed away by another
 				 * geometry manager. */
 {
-    TkTextEmbWindowClient *client = clientData;
+    TkTextEmbWindowClient *client = (TkTextEmbWindowClient *)clientData;
     TkTextSegment *ewPtr = client->parent;
     TkTextIndex index;
     Tcl_HashEntry *hPtr;
@@ -736,12 +735,11 @@ TkTextWinFreeClient(
  *--------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 EmbWinDeleteProc(
     TkTextSegment *ewPtr,	/* Segment being deleted. */
-    TkTextLine *linePtr,	/* Line containing segment. */
-    int treeGone)		/* Non-zero means the entire tree is being
+    TCL_UNUSED(TkTextLine *),	/* Line containing segment. */
+    TCL_UNUSED(int))		/* Non-zero means the entire tree is being
 				 * deleted, so everything must get cleaned
 				 * up. */
 {
@@ -816,24 +814,23 @@ EmbWinCleanupProc(
  *--------------------------------------------------------------
  */
 
-	/*ARGSUSED*/
 static int
 EmbWinLayoutProc(
     TkText *textPtr,		/* Text widget being layed out. */
-    TkTextIndex *indexPtr,	/* Identifies first character in chunk. */
+    TCL_UNUSED(TkTextIndex *),	/* Identifies first character in chunk. */
     TkTextSegment *ewPtr,	/* Segment corresponding to indexPtr. */
     int offset,			/* Offset within segPtr corresponding to
 				 * indexPtr (always 0). */
     int maxX,			/* Chunk must not occupy pixels at this
 				 * position or higher. */
-    int maxChars,		/* Chunk must not include more than this many
+    TCL_UNUSED(int),	/* Chunk must not include more than this many
 				 * characters. */
     int noCharsYet,		/* Non-zero means no characters have been
 				 * assigned to this line yet. */
-    TkWrapMode wrapMode,	/* Wrap mode to use for line:
+    TCL_UNUSED(TkWrapMode),	/* Wrap mode to use for line:
 				 * TEXT_WRAPMODE_CHAR, TEXT_WRAPMODE_NONE, or
 				 * TEXT_WRAPMODE_WORD. */
-    register TkTextDispChunk *chunkPtr)
+    TkTextDispChunk *chunkPtr)
 				/* Structure to fill in with information about
 				 * this chunk. The x field has already been
 				 * set by the caller. */
@@ -959,7 +956,7 @@ EmbWinLayoutProc(
 	     * now need to add to our client list.
 	     */
 
-	    client = ckalloc(sizeof(TkTextEmbWindowClient));
+	    client = (TkTextEmbWindowClient *)ckalloc(sizeof(TkTextEmbWindowClient));
 	    client->next = ewPtr->body.ew.clients;
 	    client->textPtr = textPtr;
 	    client->tkwin = NULL;
@@ -1052,7 +1049,7 @@ EmbWinLayoutProc(
 static void
 EmbWinCheckProc(
     TkTextSegment *ewPtr,	/* Segment to check. */
-    TkTextLine *linePtr)	/* Line containing segment. */
+    TCL_UNUSED(TkTextLine *))	/* Line containing segment. */
 {
     if (ewPtr->nextPtr == NULL) {
 	Tcl_Panic("EmbWinCheckProc: embedded window is last segment in line");
@@ -1087,20 +1084,20 @@ TkTextEmbWinDisplayProc(
     int x,			/* X-position in dst at which to draw this
 				 * chunk (differs from the x-position in the
 				 * chunk because of scrolling). */
-    int y,			/* Top of rectangular bounding box for line:
+    TCL_UNUSED(int),	/* Top of rectangular bounding box for line:
 				 * tells where to draw this chunk in dst
 				 * (x-position is in the chunk itself). */
     int lineHeight,		/* Total height of line. */
     int baseline,		/* Offset of baseline from y. */
-    Display *display,		/* Display to use for drawing (unused).  */
-    Drawable dst,		/* Pixmap or window in which to draw
+    TCL_UNUSED(Display *),	/* Display to use for drawing (unused).  */
+    TCL_UNUSED(Drawable),	/* Pixmap or window in which to draw
 				 * (unused).  */
     int screenY)		/* Y-coordinate in text window that
 				 * corresponds to y. */
 {
     int lineX, windowX, windowY, width, height;
     Tk_Window tkwin;
-    TkTextSegment *ewPtr = chunkPtr->clientData;
+    TkTextSegment *ewPtr = (TkTextSegment *)chunkPtr->clientData;
     TkTextEmbWindowClient *client = EmbWinGetClient(textPtr, ewPtr);
 
     if (client == NULL) {
@@ -1180,7 +1177,7 @@ EmbWinUndisplayProc(
     TkText *textPtr,		/* Overall information about text widget. */
     TkTextDispChunk *chunkPtr)	/* Chunk that is about to be freed. */
 {
-    TkTextSegment *ewPtr = chunkPtr->clientData;
+    TkTextSegment *ewPtr = (TkTextSegment *)chunkPtr->clientData;
     TkTextEmbWindowClient *client = EmbWinGetClient(textPtr, ewPtr);
 
     if (client == NULL) {
@@ -1228,7 +1225,7 @@ static void
 EmbWinBboxProc(
     TkText *textPtr,		/* Information about text widget. */
     TkTextDispChunk *chunkPtr,	/* Chunk containing desired char. */
-    int index,			/* Index of desired character within the
+    TCL_UNUSED(int),			/* Index of desired character within the
 				 * chunk. */
     int y,			/* Topmost pixel in area allocated for this
 				 * line. */
@@ -1243,7 +1240,7 @@ EmbWinBboxProc(
 				 * pixels. */
 {
     Tk_Window tkwin;
-    TkTextSegment *ewPtr = chunkPtr->clientData;
+    TkTextSegment *ewPtr = (TkTextSegment *)chunkPtr->clientData;
     TkTextEmbWindowClient *client = EmbWinGetClient(textPtr, ewPtr);
 
     if (client == NULL) {
@@ -1305,7 +1302,7 @@ static void
 EmbWinDelayedUnmap(
     ClientData clientData)	/* Token for the window to be unmapped. */
 {
-    TkTextEmbWindowClient *client = clientData;
+    TkTextEmbWindowClient *client = (TkTextEmbWindowClient *)clientData;
 
     if (!client->displayed && (client->tkwin != NULL)) {
 	if (client->textPtr->tkwin != Tk_Parent(client->tkwin)) {
@@ -1353,7 +1350,7 @@ TkTextWindowIndex(
 	return 0;
     }
 
-    ewPtr = Tcl_GetHashValue(hPtr);
+    ewPtr = (TkTextSegment *)Tcl_GetHashValue(hPtr);
     indexPtr->tree = textPtr->sharedTextPtr->tree;
     indexPtr->linePtr = ewPtr->body.ew.linePtr;
     indexPtr->byteIndex = TkTextSegToOffset(ewPtr, indexPtr->linePtr);
-- 
cgit v0.12


From f737d94472220581f2d23121fb0f222ec811eedd Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 25 Sep 2020 15:57:54 +0000
Subject: CYGWIN != windows

---
 generic/tkPkgConfig.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/generic/tkPkgConfig.c b/generic/tkPkgConfig.c
index a3666d4..fe084bf 100644
--- a/generic/tkPkgConfig.c
+++ b/generic/tkPkgConfig.c
@@ -40,7 +40,7 @@
 
 
 #ifndef TCL_CFGVAL_ENCODING
-#define TCL_CFGVAL_ENCODING "ascii"
+#define TCL_CFGVAL_ENCODING "utf-8"
 #endif
 
 /*
@@ -84,7 +84,7 @@
 #  define CFG_PROFILED		"0"
 #endif
 
-#if defined(_WIN32) || defined(__CYGWIN__)
+#if defined(_WIN32)
 #  define CFG_FONTSYSTEM	"gdi"
 #elif defined(MAC_OSX_TK)
 #  define CFG_FONTSYSTEM	"cocoa"
-- 
cgit v0.12


From 34c8697bb8495ff8c5c31ab6783169df77394e29 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 25 Sep 2020 19:21:01 +0000
Subject: Xcode 11.7 -> 12. Mark more testcases as failsOnUbuntu

---
 .travis.yml         |  4 ++--
 tests/font.test     |  4 ++--
 tests/send.test     |  2 +-
 tests/textDisp.test | 34 +++++++++++++++++-----------------
 tests/textTag.test  |  6 +++---
 tests/textWind.test | 12 ++++++------
 tests/unixFont.test |  2 +-
 tests/winWm.test    |  2 +-
 8 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 417c652..ae1178e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -131,9 +131,9 @@ jobs:
         - BUILD_DIR=unix
         - CFGOPT="--enable-symbols"
 # Testing on Mac, various styles
-    - name: "macOS/Xcode 11.7/Shared/XQuartz"
+    - name: "macOS/Xcode 12/Shared/XQuartz"
       os: osx
-      osx_image: xcode11.7
+      osx_image: xcode12
       env:
         - BUILD_DIR=unix
         - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --disable-corefoundation --x-includes=/opt/X11/include --x-libraries=/opt/X11/lib CFLAGS=-I/usr/local/opt/tcl-tk/include"
diff --git a/tests/font.test b/tests/font.test
index fbd0a52..37e5739 100644
--- a/tests/font.test
+++ b/tests/font.test
@@ -1280,7 +1280,7 @@ test font-38.9 {ParseFontNameObj procedure: arguments} {
 test font-38.10 {ParseFontNameObj procedure: arguments} {
     list [catch {font actual {times xyz xyz}} msg] $msg
 } {1 {expected integer but got "xyz"}}
-test font-38.12 {ParseFontNameObj procedure: stylelist loop} unixOrPc {
+test font-38.12 {ParseFontNameObj procedure: stylelist loop} {unixOrPc failsOnUbuntu} {
     lrange [font actual {times 12 bold italic overstrike underline}] 4 end
 } {-weight bold -slant italic -underline 1 -overstrike 1}
 test font-38.13 {ParseFontNameObj procedure: stylelist error} {
@@ -1351,7 +1351,7 @@ tk scaling 0.5
 test font-44.1 {TkFontGetPixels: size < 0} failsOnUbuntu {
     font actual {times -12} -size
 } 24
-test font-44.2 {TkFontGetPoints: size >= 0} noExceed {
+test font-44.2 {TkFontGetPoints: size >= 0} {noExceed failsOnUbuntu} {
     font actual {times 12} -size
 } 12
 
diff --git a/tests/send.test b/tests/send.test
index 16d4202..5bd1ade 100644
--- a/tests/send.test
+++ b/tests/send.test
@@ -295,7 +295,7 @@ test send-8.15 {Tk_SendCmd procedure, local interp, error info} {secureserver te
 "if 1 {open bogus_file_name}"
     invoked from within
 "send t_s_1 {if 1 {open bogus_file_name}}"} {POSIX ENOENT {no such file or directory}}}
-test send-8.16 {Tk_SendCmd procedure, bogusCommWindow} {secureserver testsend} {
+test send-8.16 {Tk_SendCmd procedure, bogusCommWindow} {secureserver testsend failsOnUbuntu} {
     testsend prop root InterpRegistry "10234 bogus\n"
     set result [list [catch {send bogus bogus command} msg] $msg]
     winfo interps
diff --git a/tests/textDisp.test b/tests/textDisp.test
index 2be64ce..7b89111 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -257,7 +257,7 @@ test textDisp-2.5 {LayoutDLine, word wrap} {textfonts} {
     .t insert 1.0 "This isx some sample text for testing."
     list [.t bbox 1.13] [.t bbox 1.14] [.t bbox 1.19]
 } [list [list 96 5 49 $fixedHeight] [list 5 [expr {$fixedDiff + 18}] 7 $fixedHeight] [list 40 [expr {$fixedDiff + 18}] 7 $fixedHeight]]
-test textDisp-2.6 {LayoutDLine, word wrap} {
+test textDisp-2.6 {LayoutDLine, word wrap} failsOnUbuntu {
     .t configure -wrap word
     .t delete 1.0 end
     .t insert 1.0 "This isxxx some sample text for testing."
@@ -1135,7 +1135,7 @@ test textDisp-8.9 {TkTextChanged} {
     update
     list $tk_textRelayout $tk_textRedraw
 } {{2.0 8.0} {2.0 8.0}}
-test textDisp-8.10 {TkTextChanged} {
+test textDisp-8.10 {TkTextChanged} failsOnUbuntu {
     .t configure -wrap char
     .t delete 1.0 end
     .t insert 1.0 "Line 1\nLine 2 is long enough to wrap\nLine 3 is also long enough to wrap\nLine 4"
@@ -1211,7 +1211,7 @@ test textDisp-9.2 {TkTextRedrawTag} {textfonts} {
     update
     list $tk_textRelayout $tk_textRedraw
 } {{1.0 2.0 2.17} {1.0 2.0 2.17}}
-test textDisp-9.3 {TkTextRedrawTag} {
+test textDisp-9.3 {TkTextRedrawTag} failsOnUbuntu {
     .t configure -wrap char
     .t delete 1.0 end
     .t insert 1.0 "Line 1\nLine 2 is long enough to wrap around\nLine 3\nLine 4"
@@ -1222,7 +1222,7 @@ test textDisp-9.3 {TkTextRedrawTag} {
     update
     list $tk_textRelayout $tk_textRedraw
 } {{2.0 2.20} {2.0 2.20 eof}}
-test textDisp-9.4 {TkTextRedrawTag} {
+test textDisp-9.4 {TkTextRedrawTag} failsOnUbuntu {
     .t configure -wrap char
     .t delete 1.0 end
     .t insert 1.0 "Line 1\nLine 2 is long enough to wrap around\nLine 3\nLine 4"
@@ -1233,7 +1233,7 @@ test textDisp-9.4 {TkTextRedrawTag} {
     update
     list $tk_textRelayout $tk_textRedraw
 } {{2.0 2.20} {2.0 2.20 eof}}
-test textDisp-9.5 {TkTextRedrawTag} {
+test textDisp-9.5 {TkTextRedrawTag} failsOnUbuntu {
     .t configure -wrap char
     .t delete 1.0 end
     .t insert 1.0 "Line 1\nLine 2 is long enough to wrap around\nLine 3\nLine 4"
@@ -1244,7 +1244,7 @@ test textDisp-9.5 {TkTextRedrawTag} {
     update
     list $tk_textRelayout $tk_textRedraw
 } {{2.0 2.20} {2.0 2.20 eof}}
-test textDisp-9.6 {TkTextRedrawTag} {
+test textDisp-9.6 {TkTextRedrawTag} failsOnUbuntu {
     .t configure -wrap char
     .t delete 1.0 end
     .t insert 1.0 "Line 1\nLine 2 is long enough to wrap\nLine 3 is also long enough to wrap"
@@ -1255,7 +1255,7 @@ test textDisp-9.6 {TkTextRedrawTag} {
     update
     list $tk_textRelayout $tk_textRedraw
 } {{2.0 2.20 3.0 3.20} {2.0 2.20 3.0 3.20 eof}}
-test textDisp-9.7 {TkTextRedrawTag} {
+test textDisp-9.7 {TkTextRedrawTag} failsOnUbuntu {
     .t configure -wrap char
     .t delete 1.0 end
     .t insert 1.0 "Line 1\nLine 2 is long enough to wrap\nLine 3 is also long enough to wrap\nLine 4"
@@ -1813,7 +1813,7 @@ test textDisp-14.5 {TkTextXviewCmd procedure} {
 test textDisp-14.6 {TkTextXviewCmd procedure} {
     list [catch {.t xview moveto a} msg] $msg
 } {1 {expected floating-point number but got "a"}}
-test textDisp-14.7 {TkTextXviewCmd procedure} {
+test textDisp-14.7 {TkTextXviewCmd procedure} failsOnUbuntu {
     .t delete 1.0 end
     .t insert end xxxxxxxxx\n
     .t insert end "xxxxx xxxxxxxxxxx xxxx xxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxx\n"
@@ -2010,7 +2010,7 @@ test textDisp-16.9 {TkTextYviewCmd procedure, "moveto" option} {
 test textDisp-16.10 {TkTextYviewCmd procedure, "moveto" option} {
     list [catch {.t yview moveto gorp} msg] $msg
 } {1 {expected floating-point number but got "gorp"}}
-test textDisp-16.11 {TkTextYviewCmd procedure, "moveto" option} {
+test textDisp-16.11 {TkTextYviewCmd procedure, "moveto" option} failsOnUbuntu {
     .t yview moveto 0.5
     .t index @0,0
 } {103.0}
@@ -2022,21 +2022,21 @@ test textDisp-16.13 {TkTextYviewCmd procedure, "moveto" option} {
     .t yview moveto 1.1
     .t index @0,0
 } {191.0}
-test textDisp-16.14 {TkTextYviewCmd procedure, "moveto" option} {
+test textDisp-16.14 {TkTextYviewCmd procedure, "moveto" option} failsOnUbuntu {
     .t yview moveto .75
     .t index @0,0
 } {151.60}
-test textDisp-16.15 {TkTextYviewCmd procedure, "moveto" option} {
+test textDisp-16.15 {TkTextYviewCmd procedure, "moveto" option} failsOnUbuntu {
     .t yview moveto .752
     .t index @0,0
 } {151.60}
-test textDisp-16.16 {TkTextYviewCmd procedure, "moveto" option} {textfonts} {
+test textDisp-16.16 {TkTextYviewCmd procedure, "moveto" option} textfonts {
     set count [expr {5 * $bigHeight + 150 * $fixedHeight}]
     set extra [expr {0.04 * double($fixedDiff * 150) / double($count)}]
     .t yview moveto [expr {.753 - $extra}]
     .t index @0,0
 } {151.60}
-test textDisp-16.17 {TkTextYviewCmd procedure, "moveto" option} {
+test textDisp-16.17 {TkTextYviewCmd procedure, "moveto" option} failsOnUbuntu {
     .t yview moveto .755
     .t index @0,0
 } {151.80}
@@ -2200,7 +2200,7 @@ test textDisp-16.38 {TkTextYviewCmd procedure} {
 test textDisp-16.39 {TkTextYviewCmd procedure} {
     list [catch {.t yview scroll 1.3i pixels} msg] $msg
 } {0 {}}
-test textDisp-16.40 {text count -xpixels} {
+test textDisp-16.40 {text count -xpixels} failsOnUbuntu {
     set res {}
     lappend res [.t count -xpixels 1.0 1.5] \
       [.t count -xpixels 1.5 1.0] \
@@ -3864,7 +3864,7 @@ catch {destroy .t2}
 .t configure -height 1
 update
 
-test textDisp-31.1 {line embedded window height update} {
+test textDisp-31.1 {line embedded window height update} failsOnUbuntu {
     set res {}
     .t delete 1.0 end
     .t insert end "abcd\nefgh\nijkl\nmnop\nqrst\nuvwx\nyx"
@@ -3877,7 +3877,7 @@ test textDisp-31.1 {line embedded window height update} {
     set res
 } [list [expr {100 + $fixedHeight * 6}] [expr {100 + $fixedHeight * 6}] [expr {$fixedHeight * 7}]]
 
-test textDisp-31.2 {line update index shifting} {
+test textDisp-31.2 {line update index shifting} failsOnUbuntu {
     set res {}
     .t.f configure -height 100
     update
@@ -3894,7 +3894,7 @@ test textDisp-31.2 {line update index shifting} {
     set res
 } [list [expr {100 + $fixedHeight * 6}] [expr {100 + $fixedHeight * 8}] [expr {$fixedHeight * 9}] [expr {$fixedHeight * 7}] [expr {100 + $fixedHeight * 6}]]
 
-test textDisp-31.3 {line update index shifting} {
+test textDisp-31.3 {line update index shifting} failsOnUbuntu {
     # Should do exactly the same as the above, as long
     # as we are correctly tagging the correct lines for
     # recalculation.  The 'update' and 'delay' must be
diff --git a/tests/textTag.test b/tests/textTag.test
index aed0491..f7935d8 100644
--- a/tests/textTag.test
+++ b/tests/textTag.test
@@ -693,7 +693,7 @@ test textTag-16.1 {TkTextPickCurrent procedure} haveCourier12 {
     event gen .t <ButtonRelease-1> -state 0x100 -x $x3 -y $y3
     lappend x [.t index current]
 } {2.1 3.2 3.2 3.2 3.2 3.2 4.3}
-test textTag-16.2 {TkTextPickCurrent procedure} haveCourier12 {
+test textTag-16.2 {TkTextPickCurrent procedure} {haveCourier12 failsOnUbuntu} {
     event generate {} <Motion> -warp 1 -x -1 -y -1; update
     event gen .t <ButtonRelease-1> -state 0x100 -x $x1 -y $y1
     event gen .t <Motion> -x $x2 -y $y2
@@ -758,7 +758,7 @@ test textTag-16.5 {TkTextPickCurrent procedure} haveCourier12 {
     event gen .t <Motion> -x $x2 -y $y2
     .t index current
 } {3.2}
-test textTag-16.6 {TkTextPickCurrent procedure} haveCourier12 {
+test textTag-16.6 {TkTextPickCurrent procedure} {haveCourier12 failsOnUbuntu} {
     event generate {} <Motion> -warp 1 -x -1 -y -1; update
     foreach i {a b c d} {
 	.t tag remove $i 1.0 end
@@ -770,7 +770,7 @@ test textTag-16.6 {TkTextPickCurrent procedure} haveCourier12 {
     update
     .t index current
 } {3.1}
-test textTag-16.7 {TkTextPickCurrent procedure} haveCourier12 {
+test textTag-16.7 {TkTextPickCurrent procedure} {haveCourier12 failsOnUbuntu} {
     event generate {} <Motion> -warp 1 -x -1 -y -1; update
     foreach i {a b c d} {
 	.t tag remove $i 1.0 end
diff --git a/tests/textWind.test b/tests/textWind.test
index c665006..8d81647 100644
--- a/tests/textWind.test
+++ b/tests/textWind.test
@@ -552,7 +552,7 @@ test textWind-10.10 {EmbWinLayoutProc procedure, doesn't fit on line} {fonts} {
     update
     list [.t bbox .f] [.t bbox 1.13]
 } {{5 18 127 20} {132 21 7 13}}
-test textWind-10.11 {EmbWinLayoutProc procedure, doesn't fit on line} {
+test textWind-10.11 {EmbWinLayoutProc procedure, doesn't fit on line} failsOnUbuntu {
     .t configure -wrap none
     .t delete 1.0 end
     .t insert 1.0 "Some sample text"
@@ -580,7 +580,7 @@ test textWind-10.13 {EmbWinLayoutProc procedure, doesn't fit on line} {fonts} {
     list [.t bbox .f] [.t bbox 1.13]
 } {{5 18 210 65} {}}
 
-test textWind-11.1 {EmbWinDisplayProc procedure, geometry transforms} {
+test textWind-11.1 {EmbWinDisplayProc procedure, geometry transforms} failsOnUbuntu {
     .t delete 1.0 end
     .t insert 1.0 "Some sample text"
     pack forget .t
@@ -592,7 +592,7 @@ test textWind-11.1 {EmbWinDisplayProc procedure, geometry transforms} {
 } {30x20+119+55}
 place forget .t
 pack .t
-test textWind-11.2 {EmbWinDisplayProc procedure, geometry transforms} {
+test textWind-11.2 {EmbWinDisplayProc procedure, geometry transforms} failsOnUbuntu {
     .t delete 1.0 end
     .t insert 1.0 "Some sample text"
     pack forget .t
@@ -674,7 +674,7 @@ test textWind-12.1 {EmbWinUndisplayProc procedure, mapping/unmapping} {
     set x
 } {created mapped modified replaced unmapped mapped off-screen unmapped}
 
-test textWind-13.1 {EmbWinBboxProc procedure} {
+test textWind-13.1 {EmbWinBboxProc procedure} failsOnUbuntu {
     .t delete 1.0 end
     .t insert 1.0 "Some sample text"
     frame .f -width 5 -height 5 -bg $color
@@ -831,7 +831,7 @@ test textWind-16.1 {EmbWinTextStructureProc procedure} {
     winfo ismapped .f
 } 0
 pack .t
-test textWind-16.2 {EmbWinTextStructureProc procedure} {
+test textWind-16.2 {EmbWinTextStructureProc procedure} failsOnUbuntu {
     .t configure -wrap none
     .t delete 1.0 end
     .t insert 1.0 "Some sample text"
@@ -856,7 +856,7 @@ test textWind-16.3 {EmbWinTextStructureProc procedure} {
     update
 } {}
 pack .t
-test textWind-16.4 {EmbWinTextStructureProc procedure} {
+test textWind-16.4 {EmbWinTextStructureProc procedure} failsOnUbuntu {
     .t configure -wrap none
     .t delete 1.0 end
     .t insert 1.0 "Some sample text"
diff --git a/tests/unixFont.test b/tests/unixFont.test
index 8129279..f4cc3dd 100644
--- a/tests/unixFont.test
+++ b/tests/unixFont.test
@@ -116,7 +116,7 @@ test unixfont-2.8 {TkpGetFontFromAttributes: loop over returned font names} {uni
 test unixfont-2.9 {TkpGetFontFromAttributes: reject adobe courier if possible} {unix noExceed failsOnUbuntu} {
     lindex [font actual {-family courier}] 1
 } {courier}
-test unixfont-2.10 {TkpGetFontFromAttributes: scalable font found} unix {
+test unixfont-2.10 {TkpGetFontFromAttributes: scalable font found} {unix failsOnUbuntu} {
     lindex [font actual {-family courier -size 37}] 3
 } {37}
 test unixfont-2.11 {TkpGetFontFromAttributes: font cannot be loaded} unix {
diff --git a/tests/winWm.test b/tests/winWm.test
index 94f18d5..81447a9 100644
--- a/tests/winWm.test
+++ b/tests/winWm.test
@@ -404,7 +404,7 @@ test winWm-7.4 {UpdateWrapper must maintain focus} -constraints win -setup {
 
 test winWm-8.1 {Tk_WmCmd procedure, "iconphoto" option} -constraints win -body {
     wm iconph .
-} -returnCodes error -result {wrong # args: should be "wm iconphoto window ?-default? image1 ?image2 ...?"}}
+} -returnCodes error -result {wrong # args: should be "wm iconphoto window ?-default? image1 ?image2 ...?"}
 test winWm-8.2 {Tk_WmCmd procedure, "iconphoto" option} -constraints win -setup {
     destroy .t
 } -body {
-- 
cgit v0.12


From 4636816c13f9e6a6889fe871f54c0a17151e6513 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 26 Sep 2020 18:54:16 +0000
Subject: Better don't check for libnotify (yet), leave that to the new TIP

---
 unix/configure    | 49 -------------------------------------------------
 unix/configure.ac | 37 -------------------------------------
 2 files changed, 86 deletions(-)

diff --git a/unix/configure b/unix/configure
index c535fe8..13c36a9 100755
--- a/unix/configure
+++ b/unix/configure
@@ -663,9 +663,6 @@ TK_MAJOR_VERSION
 TK_VERSION
 TK_DEMO_DIR
 DEMO_DIR
-UNIX_LIBNOTIFY_OBJS
-LIBNOTIFY_LIBS
-LIBNOTIFY_CFLAGS
 UNIX_FONT_OBJS
 XFT_LIBS
 XFT_CFLAGS
@@ -781,7 +778,6 @@ enable_symbols
 enable_aqua
 with_x
 enable_xft
-enable_libnotify
 enable_xss
 enable_framework
 '
@@ -1425,7 +1421,6 @@ Optional Features:
   --enable-symbols        build with debugging symbols (default: off)
   --enable-aqua=yes|no    use Aqua windowingsystem on Mac OS X (default: no)
   --enable-xft            use freetype/fontconfig/xft (default: on)
-  --enable-libnotify      use libnotify (default: on)
   --enable-xss            use XScreenSaver for activity timer (default: on)
   --enable-framework      package shared libraries in MacOSX frameworks
                           (default: off)
@@ -7822,50 +7817,6 @@ $as_echo "#define HAVE_XFT 1" >>confdefs.h
 fi
 
 #--------------------------------------------------------------------
-#	Check for libnotify.
-#--------------------------------------------------------------------
-
-if test $tk_aqua = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use libnotify" >&5
-$as_echo_n "checking whether to use libnotify... " >&6; }
-    # Check whether --enable-libnotify was given.
-if test "${enable_libnotify+set}" = set; then :
-  enableval=$enable_libnotify; enable_libnotify=$enableval
-else
-  enable_libfnotify="default"
-fi
-
-    LIBNOTIFY_CFLAGS=""
-    LIBNOTIFY_LIBS=""
-    if test "$enable_libnotify" = "no" ; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_libnotify" >&5
-$as_echo "$enable_libnotify" >&6; }
-    else
-	found_libnotify="yes"
-		LIBNOTIFY_CFLAGS=`pkg-config --cflags libnotify 2>/dev/null` || found_libnotify="no"
-	LIBNOTIFY_LIBS=`pkg-config --libs libnotify 2>/dev/null` || found_libnotify="no"
-	if test "$found_libnotify" = "no" ; then
-	    found_libnotify=yes
-	    LIBNOTIFY_CFLAGS=`pkg-config --cflags libnotify 2>/dev/null` || found_libnotify="no"
-	    LIBNOTIFY_LIBS=`pkg-config --libs libnotify 2>/dev/null` || found_libnotify="no"
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_libnotify" >&5
-$as_echo "$found_libnotify" >&6; }
-    fi
-    if test $enable_libnotify = "yes" ; then
-	UNIX_LIBNOTIFY_OBJS=tkUnixSysNotify.o
-
-$as_echo "#define HAVE_LIBNOTIFY 1" >>confdefs.h
-
-    else
-	UNIX_LIBNOTIFY_OBJS=""
-    fi
-
-
-
-fi
-
-#--------------------------------------------------------------------
 # XXX Do this last.
 # It might modify XLIBSW which could affect other tests.
 #
diff --git a/unix/configure.ac b/unix/configure.ac
index 286e7e5..b765f13 100644
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -520,43 +520,6 @@ if test $tk_aqua = no; then
 fi
 
 #--------------------------------------------------------------------
-#	Check for libnotify.
-#--------------------------------------------------------------------
-
-if test $tk_aqua = no; then
-    AC_MSG_CHECKING([whether to use libnotify])
-    AC_ARG_ENABLE(libnotify,
-	AC_HELP_STRING([--enable-libnotify],
-	    [use libnotify (default: on)]),
-	[enable_libnotify=$enableval], [enable_libfnotify="default"])
-    LIBNOTIFY_CFLAGS=""
-    LIBNOTIFY_LIBS=""
-    if test "$enable_libnotify" = "no" ; then
-	AC_MSG_RESULT([$enable_libnotify])
-    else
-	found_libnotify="yes"
-	dnl make sure pkg-config says that libnotify is present.
-	LIBNOTIFY_CFLAGS=`pkg-config --cflags libnotify 2>/dev/null` || found_libnotify="no"
-	LIBNOTIFY_LIBS=`pkg-config --libs libnotify 2>/dev/null` || found_libnotify="no"
-	if test "$found_libnotify" = "no" ; then
-	    found_libnotify=yes
-	    LIBNOTIFY_CFLAGS=`pkg-config --cflags libnotify 2>/dev/null` || found_libnotify="no"
-	    LIBNOTIFY_LIBS=`pkg-config --libs libnotify 2>/dev/null` || found_libnotify="no"
-	fi
-	AC_MSG_RESULT([$found_libnotify])
-    fi
-    if test $enable_libnotify = "yes" ; then
-	UNIX_LIBNOTIFY_OBJS=tkUnixSysNotify.o
-	AC_DEFINE(HAVE_LIBNOTIFY, 1, [Have we turned on libnotify?])
-    else
-	UNIX_LIBNOTIFY_OBJS=""
-    fi
-    AC_SUBST(LIBNOTIFY_CFLAGS)
-    AC_SUBST(LIBNOTIFY_LIBS)
-    AC_SUBST(UNIX_LIBNOTIFY_OBJS)
-fi
-
-#--------------------------------------------------------------------
 # XXX Do this last.
 # It might modify XLIBSW which could affect other tests.
 #
-- 
cgit v0.12


From 1c25ebd3a22d5227b0b866977430ba4851d9de44 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 26 Sep 2020 19:07:37 +0000
Subject: Mark 4 more testcases as failsOnUbuntu

---
 tests/textDisp.test | 6 +++---
 tests/winWm.test    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/textDisp.test b/tests/textDisp.test
index 7b89111..520b26b 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -1193,7 +1193,7 @@ test textDisp-8.13 {TkTextChanged, used to crash, see [06c1433906]} {
     update idletasks
 } {}
 
-test textDisp-9.1 {TkTextRedrawTag} {
+test textDisp-9.1 {TkTextRedrawTag} failsOnUbuntu {
     .t configure -wrap char
     .t delete 1.0 end
     .t insert 1.0 "Line 1\nLine 2 is long enough to wrap around\nLine 3\nLine 4"
@@ -3931,7 +3931,7 @@ test textDisp-31.4 {line embedded image height update} {
     set res
 } [list [expr {100 + $fixedHeight * 6}] [expr {100 + $fixedHeight * 6}] [expr {$fixedHeight * 7}]]
 
-test textDisp-31.5 {line update index shifting} {
+test textDisp-31.5 {line update index shifting} failsOnUbuntu {
     set res {}
     textest configure -height 100
     update ; after 1000 ; update
@@ -3948,7 +3948,7 @@ test textDisp-31.5 {line update index shifting} {
     set res
 } [list [expr {100 + $fixedHeight * 6}] [expr {100 + $fixedHeight * 8}] [expr {$fixedHeight * 9}] [expr {$fixedHeight * 7}] [expr {100 + $fixedHeight * 6}]]
 
-test textDisp-31.6 {line update index shifting} {
+test textDisp-31.6 {line update index shifting} failsOnUbuntu {
     # Should do exactly the same as the above, as long
     # as we are correctly tagging the correct lines for
     # recalculation.  The 'update' and 'delay' must be
diff --git a/tests/winWm.test b/tests/winWm.test
index 81447a9..ab99b48 100644
--- a/tests/winWm.test
+++ b/tests/winWm.test
@@ -507,7 +507,7 @@ test winWm-9.1 "delayed activation of grabbed destroyed window" -constraints win
     destroy .tx .t .sd
 } -result ok
 
-test winWm-9.2 "check wm forget for unmapped parent (#3205464,#2967911)" -setup {
+test winWm-9.2 "check wm forget for unmapped parent (#3205464,#2967911)" -constraints failsOnUbuntu -setup {
     destroy .t
     toplevel .t
     set winwm92 {}
-- 
cgit v0.12


From d1e2513a1184139c90d858f109d8ea796a64675e Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 27 Sep 2020 13:15:51 +0000
Subject: \t -> real tab character

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ae1178e..517857e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,10 +35,10 @@ jobs:
         - make install
         - make test-classic >out-classic.txt
         - cat out-classic.txt
-        - grep -q "Failed\t0" out-classic.txt
+        - grep -q "Failed	0" out-classic.txt
         - make test-ttk >out-ttk.txt
         - cat out-ttk.txt
-        - grep -q "Failed\t0" out-ttk.txt
+        - grep -q "Failed	0" out-ttk.txt
     - name: "Linux/GCC/Shared/no-xft"
       os: linux
       dist: focal
-- 
cgit v0.12


From 9a2585491c7164eb5d4de469786d3c935ab3dcf0 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Sun, 27 Sep 2020 19:14:42 +0000
Subject: Cherrypick the fixes for macOS MapNotify and UnmapNotify from
 mac_styles

---
 generic/tkWindow.c           |  6 +--
 macosx/tkMacOSXPort.h        |  8 ++++
 macosx/tkMacOSXSubwindows.c  | 78 ++++++++++-------------------------
 macosx/tkMacOSXWindowEvent.c |  3 +-
 macosx/tkMacOSXWm.c          | 96 ++++++++++++++++++++++++++++++++++++++++++--
 unix/tkUnixPort.h            |  6 +++
 win/tkWinPort.h              |  6 +++
 7 files changed, 140 insertions(+), 63 deletions(-)

diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index 5e5e836..92c4018 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.c
@@ -13,7 +13,7 @@
  */
 
 #include "tkInt.h"
-
+#include "tkPort.h"
 #ifdef _WIN32
 #include "tkWinInt.h"
 #elif !defined(MAC_OSX_TK)
@@ -1648,7 +1648,7 @@ Tk_MapWindow(
     event.xmap.event = winPtr->window;
     event.xmap.window = winPtr->window;
     event.xmap.override_redirect = winPtr->atts.override_redirect;
-    Tk_HandleEvent(&event);
+    TkpHandleMapOrUnmap((Tk_Window)winPtr, &event);
 }
 
 /*
@@ -1810,7 +1810,7 @@ Tk_UnmapWindow(
 	event.xunmap.event = winPtr->window;
 	event.xunmap.window = winPtr->window;
 	event.xunmap.from_configure = False;
-	Tk_HandleEvent(&event);
+	TkpHandleMapOrUnmap((Tk_Window)winPtr, &event);
     }
 }
 
diff --git a/macosx/tkMacOSXPort.h b/macosx/tkMacOSXPort.h
index ba47566..76dd974 100644
--- a/macosx/tkMacOSXPort.h
+++ b/macosx/tkMacOSXPort.h
@@ -177,4 +177,12 @@ MODULE_SCOPE unsigned long TkMacOSXRGBPixel(unsigned long red, unsigned long gre
 					    unsigned long blue);
 #define TkpGetPixel(p) (TkMacOSXRGBPixel(p->red >> 8, p->green >> 8, p->blue >> 8))
 
+/*
+ * Used by tkWindow.c
+ */
+
+MODULE_SCOPE void TkMacOSXHandleMapOrUnmap(Tk_Window tkwin, XEvent *event);
+
+#define TkpHandleMapOrUnmap(tkwin, event)  TkMacOSXHandleMapOrUnmap(tkwin, event)
+
 #endif /* _TKMACPORT */
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index 6ac766c..e840cea 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -119,14 +119,18 @@ XDestroyWindow(
  *
  * XMapWindow --
  *
- *	Map the given X Window to the screen. See X window documentation for
- *	more details.
+ *	This X11 stub maps the given X11 Window but does not update any of
+ *      the Tk structures describing the window.  Tk applications should
+ *	never call this directly, but it is called by Tk_MapWindow and
+ *      Tk_WmMapWindow.
  *
  * Results:
- *	None.
+ *	Returns Success or BadWindow.
  *
  * Side effects:
- *	The subwindow or toplevel may appear on the screen.
+ *	The subwindow or toplevel may appear on the screen.  VisibilityNotify
+ *      events are generated.
+ *
  *
  *----------------------------------------------------------------------
  */
@@ -142,7 +146,6 @@ XMapWindow(
     MacDrawable *macWin = (MacDrawable *)window;
     TkWindow *winPtr = macWin->winPtr;
     NSWindow *win = TkMacOSXGetNSWindowForDrawable(window);
-    XEvent event;
     static Bool initialized = NO;
 
     /*
@@ -158,7 +161,6 @@ XMapWindow(
     }
 
     display->request++;
-    winPtr->flags |= TK_MAPPED;
     if (Tk_IsTopLevel(winPtr)) {
 	if (!Tk_IsEmbedded(winPtr)) {
 	    TKContentView *view = [win contentView];
@@ -193,30 +195,7 @@ XMapWindow(
 	    TkMacOSXInvalClipRgns((Tk_Window)contWinPtr);
 	    TkMacOSXInvalidateWindow(macWin, TK_PARENT_WINDOW);
 	}
-
 	TkMacOSXInvalClipRgns((Tk_Window)winPtr);
-
-	/*
-	 * We only need to send the MapNotify event for toplevel windows.
-	 */
-
-	event.xany.serial = LastKnownRequestProcessed(display);
-	event.xany.send_event = False;
-	event.xany.display = display;
-
-	event.xmap.window = window;
-	event.xmap.type = MapNotify;
-	event.xmap.event = window;
-	event.xmap.override_redirect = winPtr->atts.override_redirect;
-
-	/*
-	 * To update the mapped status of packed or placed subwindows
-	 * we handle this event immediately and then process the idle
-	 * events that it generates.
-	 */
-
-	Tk_HandleEvent(&event);
-	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {}
     } else {
 
 	/*
@@ -227,6 +206,11 @@ XMapWindow(
 	TkMacOSXInvalClipRgns((Tk_Window)winPtr->parentPtr);
     }
 
+    /*
+     * Mark the toplevel as needing to be redrawn, unless the window is being
+     * mapped while drawing is taking place.
+     */
+
     TKContentView *view = [win contentView];
     if (view != [NSView focusView]) {
 	[view addTkDirtyRect:[view bounds]];
@@ -237,6 +221,7 @@ XMapWindow(
      */
 
     if (initialized) {
+	XEvent event;
 	event.xany.send_event = False;
 	event.xany.display = display;
 	event.xvisibility.type = VisibilityNotify;
@@ -287,11 +272,13 @@ NotifyVisibility(
  *
  * XUnmapWindow --
  *
- *	Unmap the given X Window to the screen. See X window documentation for
- *	more details.
+ *	This X11 stub maps the given X11 Window but does not update any of
+ *	The Tk structures describing the window.  Tk applications should
+ *	never call this directly, but it is called by Tk_UnmapWindow and
+ *      Tk_WmUnmapWindow.
  *
  * Results:
- *	None.
+ *	Always returns Success or BadWindow.
  *
  * Side effects:
  *	The subwindow or toplevel may be removed from the screen.
@@ -308,8 +295,10 @@ XUnmapWindow(
     TkWindow *winPtr = macWin->winPtr;
     TkWindow *parentPtr = winPtr->parentPtr;
     NSWindow *win = TkMacOSXGetNSWindowForDrawable(window);
-    XEvent event;
 
+    if (!window) {
+	return BadWindow;
+    }
     display->request++;
     if (Tk_IsTopLevel(winPtr)) {
 	if (!Tk_IsEmbedded(winPtr) &&
@@ -318,28 +307,6 @@ XUnmapWindow(
 	    [win setExcludedFromWindowsMenu:YES];
 	}
 	TkMacOSXInvalClipRgns((Tk_Window)winPtr);
-
-	/*
-	 * We only need to send the UnmapNotify event for toplevel windows.
-	 */
-
-	event.xany.serial = LastKnownRequestProcessed(display);
-	event.xany.send_event = False;
-	event.xany.display = display;
-
-	event.xunmap.type = UnmapNotify;
-	event.xunmap.window = window;
-	event.xunmap.event = window;
-	event.xunmap.from_configure = false;
-
-	/*
-	 * To update the mapped status of packed or placed subwindows
-	 * we handle this event immediately and then process the idle
-	 * events that it generates.
-	 */
-
-	Tk_HandleEvent(&event);
-	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {}
     } else {
 	/*
 	 * Rebuild the visRgn clip region for the parent so it will be allowed
@@ -355,7 +322,6 @@ XUnmapWindow(
 	TkMacOSXInvalClipRgns((Tk_Window)parentPtr);
 	TkMacOSXUpdateClipRgn(parentPtr);
     }
-    winPtr->flags &= ~TK_MAPPED;
     TKContentView *view = [win contentView];
     if (view != [NSView focusView]) {
 	[view addTkDirtyRect:[view bounds]];
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index fcbd134..5a2809c 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -1086,7 +1086,7 @@ ConfigureRestrictProc(
 }
 
 /*
- * In macOS 10.14 and later his method is called when a user changes between
+ * In macOS 10.14 and later this method is called when a user changes between
  * light and dark mode or changes the accent color. The implementation
  * generates two virtual events.  The first is either <<LightAqua>> or
  * <<DarkAqua>>, depending on the view's current effective appearance.  The
@@ -1134,6 +1134,7 @@ static const char *const accentNames[] = {
     }
     if (!defaultColor) {
 	defaultColor = [NSApp macOSVersion] < 110000 ? "Blue" : "Multicolor";
+	preferences = [[NSUserDefaults standardUserDefaults] retain];
 
 	/*
 	 * AppKit calls this method when the user changes the Accent Color
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 705648d..4a3f561 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -746,6 +746,74 @@ TkWmNewWindow(
 /*
  *----------------------------------------------------------------------
  *
+ * TkMacOSXHandleMapOrUnmap --
+ *
+ *      The mechanism used by a geometry manager to propogate the information
+ *      about which of its content widgets are mapped is to call Tk_MapWindow
+ *      or Tk_UnmapNotify.  Those functions generate MapNotify or UnmapNotify
+ *      events and then handle them immediately.  Other platforms use
+ *      Tk_HandleEvent to do this.  But that does not work correctly on macOS
+ *      due to the fact that the calls to Tk_MapNotify or Tk_UnmapNotify can
+ *      occur in display procedures which are being run in the drawRect method
+ *      of a TKContentView. The events will be processed after drawRect
+ *      returns, but they need to be processed immediately in some cases.
+
+ *      This function operates as a macOS alternative to Tk_HandleEvent, for
+ *      processing MapNotify or UnmapNotify events only.  It is called by
+ *      Tk_MapWindow, Tk_UnmapWindow, TkWmMapWindow and TkWmUnmapWindow.
+ *      Rather than using Tk_HandleEvent it installs a filter which restricts
+ *      to the MapNotify or UnmapNotify events, it queues the event and then
+ *      processes window events with the filter installed.  This allows the
+ *      event to be handled immediately even from within the drawRect method.
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	Handles a MapNotify or UnMapNotify event.
+ *
+ *----------------------------------------------------------------------
+ */
+static Tk_RestrictAction
+MapUnmapRestrictProc(
+    ClientData arg,
+    XEvent *eventPtr)
+{
+    return (eventPtr->type==MapNotify || eventPtr->type==UnmapNotify ?
+	    TK_PROCESS_EVENT : TK_DEFER_EVENT);
+}
+
+MODULE_SCOPE
+void TkMacOSXHandleMapOrUnmap(
+    Tk_Window tkwin,
+    XEvent *event)
+{
+    ClientData oldArg;
+    Tk_RestrictProc *oldProc;
+    TkWindow *winPtr = (TkWindow *) tkwin;
+    const Tk_GeomMgr *geomMgrPtr = winPtr->geomMgrPtr;
+
+    /*
+     * Sadly, this approach does not work with the "text" geometry manager.
+     * The mysterious unexplained crash elicited by textDisp-5.2 occurs.  So we
+     * have to check for the "text" manager and revert to using Tk_HandleEvent
+     * in that case.  Hopefully this can be removed when the revised text
+     * widget is in place.
+     */
+
+    if (geomMgrPtr && strcmp(geomMgrPtr->name, "text") == 0) {
+	Tk_HandleEvent(event);
+	return;
+    }
+    oldProc = Tk_RestrictEvents(MapUnmapRestrictProc, NULL, &oldArg);
+    Tk_QueueWindowEvent(event, TCL_QUEUE_TAIL);
+    while (Tcl_DoOneEvent(TCL_WINDOW_EVENTS|TCL_DONT_WAIT)) {}
+    Tk_RestrictEvents(oldProc, oldArg, &oldArg);
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
  * TkWmMapWindow --
  *
  *	This procedure is invoked to map a top-level window. This module gets
@@ -772,6 +840,8 @@ TkWmMapWindow(
 				 * mapped. */
 {
     WmInfo *wmPtr = winPtr->wmInfoPtr;
+    XEvent event;
+
     if (wmPtr->flags & WM_NEVER_MAPPED) {
 	/*
 	 * Create the underlying Mac window for this Tk window.
@@ -835,10 +905,19 @@ TkWmMapWindow(
     wmPtr->flags &= ~WM_ABOUT_TO_MAP;
 
     /*
-     * Map the window.
+     * Map the window and process a MapNotify event for it.
      */
 
+    winPtr->flags |= TK_MAPPED;
     XMapWindow(winPtr->display, winPtr->window);
+    event.xany.serial = LastKnownRequestProcessed(winPtr->display);
+    event.xany.send_event = False;
+    event.xany.display = winPtr->display;
+    event.xmap.window = winPtr->window;
+    event.xmap.type = MapNotify;
+    event.xmap.event = winPtr->window;
+    event.xmap.override_redirect = winPtr->atts.override_redirect;
+    TkpHandleMapOrUnmap((Tk_Window)winPtr, &event);
 }
 
 /*
@@ -863,7 +942,18 @@ TkWmUnmapWindow(
     TkWindow *winPtr)		/* Top-level window that's about to be
 				 * unmapped. */
 {
+    XEvent event;
+
+    event.xany.serial = LastKnownRequestProcessed(winPtr->display);
+    event.xany.send_event = False;
+    event.xany.display = winPtr->display;
+    event.xunmap.type = UnmapNotify;
+    event.xunmap.window = winPtr->window;
+    event.xunmap.event = winPtr->window;
+    event.xunmap.from_configure = false;
+    winPtr->flags &= ~TK_MAPPED;
     XUnmapWindow(winPtr->display, winPtr->window);
+    TkpHandleMapOrUnmap((Tk_Window)winPtr, &event);
 }
 
 /*
@@ -6969,9 +7059,9 @@ ApplyContainerOverrideChanges(
 		    if (parentWindow && parentWindow != containerMacWin) {
 			[parentWindow removeChildWindow:macWindow];
 		    }
-
+		    [macWindow orderFront:NSApp];
 		    [containerMacWin addChildWindow:macWindow
-					 ordered:NSWindowAbove];
+					    ordered:NSWindowAbove];
 		}
 	    }
 	} else {
diff --git a/unix/tkUnixPort.h b/unix/tkUnixPort.h
index 09ff558..7c6177e 100644
--- a/unix/tkUnixPort.h
+++ b/unix/tkUnixPort.h
@@ -191,4 +191,10 @@
 	sprintf((buf), "%#08lx", (unsigned long) (w))
 #endif
 
+/*
+ * Used by tkWindow.c
+ */
+
+#define TkpHandleMapOrUnmap(tkwin, event)  Tk_HandleEvent(event)
+
 #endif /* _UNIXPORT */
diff --git a/win/tkWinPort.h b/win/tkWinPort.h
index 4311b09..337a866 100644
--- a/win/tkWinPort.h
+++ b/win/tkWinPort.h
@@ -121,6 +121,12 @@
 	| ((p)->green & 0xff00) | (((p)->blue << 8) & 0xff0000)) | 0x20000000)
 
 /*
+ * Used by tkWindow.c
+ */
+
+#define TkpHandleMapOrUnmap(tkwin, event)  Tk_HandleEvent(event)
+
+/*
  * These calls implement native bitmaps which are not currently
  * supported under Windows.  The macros eliminate the calls.
  */
-- 
cgit v0.12


From 2c5ed5a8b7862f313354be0a3a3d79e12641e118 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Mon, 28 Sep 2020 03:05:53 +0000
Subject: Fix unused variable; fix typos in test image names command.

---
 generic/tkTextImage.c | 8 ++++++--
 macosx/tkMacOSXWm.c   | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/generic/tkTextImage.c b/generic/tkTextImage.c
index 89acd75..964f60f 100644
--- a/generic/tkTextImage.c
+++ b/generic/tkTextImage.c
@@ -290,13 +290,17 @@ TkTextImageCmd(
 		    (const char *)Tcl_GetHashKey(&textPtr->sharedTextPtr->markTable, hPtr),
 		    -1));
 	}
-	Tcl_WrongNumArgs(interp, 3, objv, NULL);
+	if (resultObj == NULL) {
+	    return TCL_ERROR;
+	} else {
+	    Tcl_SetObjResult(interp, resultObj);
+	    return TCL_OK;
+	}
 	break;
     }
     default:
 	Tcl_Panic("unexpected switch fallthrough");
     }
-    return TCL_ERROR;
 }
 
 /*
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index e971319..5128631 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -776,7 +776,7 @@ TkWmNewWindow(
  */
 static Tk_RestrictAction
 MapUnmapRestrictProc(
-    ClientData arg,
+    TCL_UNUSED(void*),
     XEvent *eventPtr)
 {
     return (eventPtr->type==MapNotify || eventPtr->type==UnmapNotify ?
-- 
cgit v0.12


From 72a3f56cbfce000787333b802452ce33612b2567 Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Mon, 28 Sep 2020 08:59:35 +0000
Subject: =?UTF-8?q?nanosvg.h:=20Upstream=20commit=20[https://github.com/me?=
 =?UTF-8?q?mononen/nanosvg/commit/e7f5981b1efef8cb5db6f62915ca4e25482b1e5b?=
 =?UTF-8?q?]=20Upstream=20Comment:=20Fix=20for=20#184=20-=20make=20sure=20?=
 =?UTF-8?q?nsvg=5F=5FaddPath()=20hands=20only=20valid=20number=20of=20poin?=
 =?UTF-8?q?tts=20(1+N*3)=20-=20require=20moveTo=20path=20command=20before?=
 =?UTF-8?q?=20handling=20other=20commands=20-=20require=20(sign+)digit=20f?=
 =?UTF-8?q?or=20a=20valid=20path=20command=20coordinate=20-=20allow=20to?=
 =?UTF-8?q?=20add=20bezier=20segment=20only=20after=20there=E2=80=99s=20at?=
 =?UTF-8?q?=20leat=20one=20point=20(now=20also=20consistent=20with=20nsvg?=
 =?UTF-8?q?=5F=5FlineTo)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 generic/nanosvg.h | 55 ++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 40 insertions(+), 15 deletions(-)

diff --git a/generic/nanosvg.h b/generic/nanosvg.h
index 47a2c83..e894eec 100644
--- a/generic/nanosvg.h
+++ b/generic/nanosvg.h
@@ -45,15 +45,15 @@ extern "C" {
 // NanoSVG can return the paths in few different units. For example if you want to render an image, you may choose
 // to get the paths in pixels, or if you are feeding the data into a CNC-cutter, you may want to use millimeters.
 //
-// The units passed to NanoVG should be one of: 'px', 'pt', 'pc' 'mm', 'cm', or 'in'.
+// The units passed to NanoSVG should be one of: 'px', 'pt', 'pc' 'mm', 'cm', or 'in'.
 // DPI (dots-per-inch) controls how the unit conversion is done.
 //
 // If you don't know or care about the units stuff, "px" and 96 should get you going.
 
 
 /* Example Usage:
-	// Load
-	NSVGImage* image;
+	// Load SVG
+	NSVGimage* image;
 	image = nsvgParseFromFile("test.svg", "px", 96);
 	printf("size: %f x %f\n", image->width, image->height);
 	// Use...
@@ -255,11 +255,6 @@ static int nsvg__isdigit(char c)
 	return c >= '0' && c <= '9';
 }
 
-static int nsvg__isnum(char c)
-{
-	return strchr("0123456789+-.eE", c) != 0;
-}
-
 static NSVG_INLINE float nsvg__minf(float a, float b) { return a < b ? a : b; }
 static NSVG_INLINE float nsvg__maxf(float a, float b) { return a > b ? a : b; }
 
@@ -795,9 +790,11 @@ static void nsvg__lineTo(NSVGparser* p, float x, float y)
 
 static void nsvg__cubicBezTo(NSVGparser* p, float cpx1, float cpy1, float cpx2, float cpy2, float x, float y)
 {
-	nsvg__addPoint(p, cpx1, cpy1);
-	nsvg__addPoint(p, cpx2, cpy2);
-	nsvg__addPoint(p, x, y);
+	if (p->npts > 0) {
+		nsvg__addPoint(p, cpx1, cpy1);
+		nsvg__addPoint(p, cpx2, cpy2);
+		nsvg__addPoint(p, x, y);
+	}
 }
 
 static NSVGattrib* nsvg__getAttr(NSVGparser* p)
@@ -1099,6 +1096,10 @@ static void nsvg__addPath(NSVGparser* p, char closed)
 	if (closed)
 		nsvg__lineTo(p, p->pts[0], p->pts[1]);
 
+	// Expect 1 + N*3 points (N = number of cubic bezier segments).
+	if ((p->npts % 3) != 1)
+		return;
+
 	path = (NSVGpath*)NANOSVG_malloc(sizeof(NSVGpath));
 	if (path == NULL) goto error;
 	memset(path, 0, sizeof(NSVGpath));
@@ -1531,6 +1532,15 @@ static int nsvg__parseUnits(const char* units)
 	return NSVG_UNITS_USER;
 }
 
+static int nsvg__isCoordinate(const char* s)
+{
+	// optional sign
+	if (*s == '-' || *s == '+')
+		s++;
+	// must have at least one digit
+	return nsvg__isdigit(*s);
+}
+
 static NSVGcoordinate nsvg__parseCoordinateRaw(const char* str)
 {
 	NSVGcoordinate coord = {0, NSVG_UNITS_USER};
@@ -1973,8 +1983,11 @@ static int nsvg__getArgsPerElement(char cmd)
 		case 'a':
 		case 'A':
 			return 7;
+		case 'z':
+		case 'Z':
+			return 0;
 	}
-	return 0;
+	return -1;
 }
 
 static void nsvg__pathMoveTo(NSVGparser* p, float* cpx, float* cpy, float* args, int rel)
@@ -2284,6 +2297,7 @@ static void nsvg__parsePath(NSVGparser* p, const char** attr)
 	float args[10];
 	int nargs;
 	int rargs = 0;
+	char initPoint;
 	float cpx, cpy, cpx2, cpy2;
 	const char* tmp[4];
 	char closedFlag;
@@ -2306,13 +2320,14 @@ static void nsvg__parsePath(NSVGparser* p, const char** attr)
 		nsvg__resetPath(p);
 		cpx = 0; cpy = 0;
 		cpx2 = 0; cpy2 = 0;
+		initPoint = 0;
 		closedFlag = 0;
 		nargs = 0;
 
 		while (*s) {
 			s = nsvg__getNextPathItem(s, item);
 			if (!*item) break;
-			if (nsvg__isnum(item[0])) {
+			if (cmd != '\0' && nsvg__isCoordinate(item)) {
 				if (nargs < 10)
 					args[nargs++] = (float)nsvg__atof(item);
 				if (nargs >= rargs) {
@@ -2325,6 +2340,7 @@ static void nsvg__parsePath(NSVGparser* p, const char** attr)
 							cmd = (cmd == 'm') ? 'l' : 'L';
 							rargs = nsvg__getArgsPerElement(cmd);
 							cpx2 = cpx; cpy2 = cpy;
+							initPoint = 1;
 							break;
 						case 'l':
 						case 'L':
@@ -2374,7 +2390,6 @@ static void nsvg__parsePath(NSVGparser* p, const char** attr)
 				}
 			} else {
 				cmd = item[0];
-				rargs = nsvg__getArgsPerElement(cmd);
 				if (cmd == 'M' || cmd == 'm') {
 					// Commit path.
 					if (p->npts > 0)
@@ -2383,7 +2398,11 @@ static void nsvg__parsePath(NSVGparser* p, const char** attr)
 					nsvg__resetPath(p);
 					closedFlag = 0;
 					nargs = 0;
-				} else if (cmd == 'Z' || cmd == 'z') {
+				} else if (initPoint == 0) {
+					// Do not allow other commands until initial point has been set (moveTo called once).
+					cmd = '\0';
+				}
+				if (cmd == 'Z' || cmd == 'z') {
 					closedFlag = 1;
 					// Commit path.
 					if (p->npts > 0) {
@@ -2399,6 +2418,12 @@ static void nsvg__parsePath(NSVGparser* p, const char** attr)
 					closedFlag = 0;
 					nargs = 0;
 				}
+				rargs = nsvg__getArgsPerElement(cmd);
+				if (rargs == -1) {
+					// Command not recognized
+					cmd = '\0';
+					rargs = 0;
+				}
 			}
 		}
 		// Commit path.
-- 
cgit v0.12


From 9cf965cee19556457301ebfc56bb1e3822dc17e4 Mon Sep 17 00:00:00 2001
From: oehhar <harald.oehlmann@elmicron.de>
Date: Mon, 28 Sep 2020 09:04:16 +0000
Subject: Nanosvg Upstream commit
 [https://github.com/memononen/nanosvg/commit/ddd39e96691584fc15475c78346dff758b347767]
 Upstream comment: Fix for #185 - prevent infinite loop when gradient ID is
 left to empty string - prevent infinite loop when gradient references to self
 - lookup up to 32 references back

---
 generic/nanosvg.h | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/generic/nanosvg.h b/generic/nanosvg.h
index e894eec..3f9548b 100644
--- a/generic/nanosvg.h
+++ b/generic/nanosvg.h
@@ -864,7 +864,9 @@ static float nsvg__convertToPixels(NSVGparser* p, NSVGcoordinate c, float orig,
 static NSVGgradientData* nsvg__findGradientData(NSVGparser* p, const char* id)
 {
 	NSVGgradientData* grad = p->gradients;
-	while (grad) {
+	if (id == NULL || *id == '\0')
+		return NULL;
+	while (grad != NULL) {
 		if (strcmp(grad->id, id) == 0)
 			return grad;
 		grad = grad->next;
@@ -881,19 +883,26 @@ static NSVGgradient* nsvg__createGradient(NSVGparser* p, const char* id, const f
 	NSVGgradient* grad;
 	float ox, oy, sw, sh, sl;
 	int nstops = 0;
+	int refIter;
 
 	data = nsvg__findGradientData(p, id);
 	if (data == NULL) return NULL;
 
 	// TODO: use ref to fill in all unset values too.
 	ref = data;
+	refIter = 0;
 	while (ref != NULL) {
+		NSVGgradientData* nextRef = NULL;
 		if (stops == NULL && ref->stops != NULL) {
 			stops = ref->stops;
 			nstops = ref->nstops;
 			break;
 		}
-		ref = nsvg__findGradientData(p, ref->ref);
+		nextRef = nsvg__findGradientData(p, ref->ref);
+		if (nextRef == ref) break; // prevent infite loops on malformed data
+		ref = nextRef;
+		refIter++;
+		if (refIter > 32) break; // prevent infite loops on malformed data
 	}
 	if (stops == NULL) return NULL;
 
-- 
cgit v0.12


From 2b4bf2b80c9f3d8cf4e68341a59dab55150dc94b Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Mon, 28 Sep 2020 17:22:12 +0000
Subject: Fix the build on Windows (MSVC) (warning was: not all control paths
 return a value). Build was broken by [901c6b113a6dc630], but the comment log
 didn't tell.

---
 generic/tkTextImage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tkTextImage.c b/generic/tkTextImage.c
index 964f60f..6faacff 100644
--- a/generic/tkTextImage.c
+++ b/generic/tkTextImage.c
@@ -296,11 +296,11 @@ TkTextImageCmd(
 	    Tcl_SetObjResult(interp, resultObj);
 	    return TCL_OK;
 	}
-	break;
     }
     default:
 	Tcl_Panic("unexpected switch fallthrough");
     }
+//    return TCL_ERROR;
 }
 
 /*
-- 
cgit v0.12


From b1fd44d559b0bccfab0e74009c83fbe8d9adddcc Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Mon, 28 Sep 2020 17:22:43 +0000
Subject: Now really fix the build on Windows (MSVC) (warning was: not all
 control paths return a value). Build was broken by [901c6b113a6dc630], but
 the comment log didn't tell.

---
 generic/tkTextImage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tkTextImage.c b/generic/tkTextImage.c
index 6faacff..3657fa6 100644
--- a/generic/tkTextImage.c
+++ b/generic/tkTextImage.c
@@ -300,7 +300,7 @@ TkTextImageCmd(
     default:
 	Tcl_Panic("unexpected switch fallthrough");
     }
-//    return TCL_ERROR;
+    return TCL_ERROR;
 }
 
 /*
-- 
cgit v0.12


From a35ac4a4ae6900477fd6a77dd071ad98593ed5ff Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 29 Sep 2020 08:57:08 +0000
Subject: Unshadow some variables

---
 generic/tkBind.c   | 11 +++++------
 generic/tkConfig.c | 28 ++++++++++++++--------------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/generic/tkBind.c b/generic/tkBind.c
index 979d61e..ad59299 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -2152,7 +2152,7 @@ Tk_BindEvent(
     TkDisplay *dispPtr;
     TkDisplay *oldDispPtr;
     Event *curEvent;
-    TkWindow *winPtr = (TkWindow *) tkwin;
+    TkWindow *winPtr = (TkWindow *)tkwin;
     BindInfo *bindInfoPtr;
     Tcl_InterpState interpState;
     LookupTables *physTables;
@@ -2442,7 +2442,6 @@ Tk_BindEvent(
 		LookupTables *virtTables = &bindInfoPtr->virtualEventTable.lookupTables;
 		PatSeq *matchPtr = matchPtrArr[k];
 		PatSeq *mPtr;
-		PSList *psl[2];
 
 		/*
 		 * Note that virtual events cannot promote.
@@ -2745,11 +2744,11 @@ CompareModMasks(
 	assert(PSModMaskArr_Size(fstModMaskArr) == PSModMaskArr_Size(sndModMaskArr));
 
 	for (i = PSModMaskArr_Size(fstModMaskArr) - 1; i >= 0; --i) {
-	    unsigned fstModMask = *PSModMaskArr_Get(fstModMaskArr, i);
-	    unsigned sndModMask = *PSModMaskArr_Get(sndModMaskArr, i);
+	    unsigned fstiModMask = *PSModMaskArr_Get(fstModMaskArr, i);
+	    unsigned sndiModMask = *PSModMaskArr_Get(sndModMaskArr, i);
 
-	    if (IsSubsetOf(fstModMask, sndModMask)) { ++sndCount; }
-	    if (IsSubsetOf(sndModMask, fstModMask)) { ++fstCount; }
+	    if (IsSubsetOf(fstiModMask, sndiModMask)) { ++sndCount; }
+	    if (IsSubsetOf(sndiModMask, fstiModMask)) { ++fstCount; }
 	}
     }
 
diff --git a/generic/tkConfig.c b/generic/tkConfig.c
index 46338e2..65e28a6 100644
--- a/generic/tkConfig.c
+++ b/generic/tkConfig.c
@@ -1879,23 +1879,23 @@ GetObjectForOption(
     objPtr = NULL;
     switch (optionPtr->specPtr->type) {
     case TK_OPTION_BOOLEAN:
-	objPtr = Tcl_NewIntObj(*((int *) internalPtr));
+	objPtr = Tcl_NewIntObj(*((int *)internalPtr));
 	break;
     case TK_OPTION_INT:
-	objPtr = Tcl_NewIntObj(*((int *) internalPtr));
+	objPtr = Tcl_NewIntObj(*((int *)internalPtr));
 	break;
     case TK_OPTION_DOUBLE:
-	objPtr = Tcl_NewDoubleObj(*((double *) internalPtr));
+	objPtr = Tcl_NewDoubleObj(*((double *)internalPtr));
 	break;
     case TK_OPTION_STRING:
-	objPtr = Tcl_NewStringObj(*((char **) internalPtr), -1);
+	objPtr = Tcl_NewStringObj(*((char **)internalPtr), -1);
 	break;
     case TK_OPTION_STRING_TABLE:
 	objPtr = Tcl_NewStringObj(((char **) optionPtr->specPtr->clientData)[
 		*((int *) internalPtr)], -1);
 	break;
     case TK_OPTION_COLOR: {
-	XColor *colorPtr = *((XColor **) internalPtr);
+	XColor *colorPtr = *((XColor **)internalPtr);
 
 	if (colorPtr != NULL) {
 	    objPtr = Tcl_NewStringObj(Tk_NameOfColor(colorPtr), -1);
@@ -1903,7 +1903,7 @@ GetObjectForOption(
 	break;
     }
     case TK_OPTION_FONT: {
-	Tk_Font tkfont = *((Tk_Font *) internalPtr);
+	Tk_Font tkfont = *((Tk_Font *)internalPtr);
 
 	if (tkfont != NULL) {
 	    objPtr = Tcl_NewStringObj(Tk_NameOfFont(tkfont), -1);
@@ -1911,7 +1911,7 @@ GetObjectForOption(
 	break;
     }
     case TK_OPTION_STYLE: {
-	Tk_Style style = *((Tk_Style *) internalPtr);
+	Tk_Style style = *((Tk_Style *)internalPtr);
 
 	if (style != NULL) {
 	    objPtr = Tcl_NewStringObj(Tk_NameOfStyle(style), -1);
@@ -1919,7 +1919,7 @@ GetObjectForOption(
 	break;
     }
     case TK_OPTION_BITMAP: {
-	Pixmap pixmap = *((Pixmap *) internalPtr);
+	Pixmap pixmap = *((Pixmap *)internalPtr);
 
 	if (pixmap != None) {
 	    objPtr = Tcl_NewStringObj(
@@ -1928,7 +1928,7 @@ GetObjectForOption(
 	break;
     }
     case TK_OPTION_BORDER: {
-	Tk_3DBorder border = *((Tk_3DBorder *) internalPtr);
+	Tk_3DBorder border = *((Tk_3DBorder *)internalPtr);
 
 	if (border != NULL) {
 	    objPtr = Tcl_NewStringObj(Tk_NameOf3DBorder(border), -1);
@@ -1936,10 +1936,10 @@ GetObjectForOption(
 	break;
     }
     case TK_OPTION_RELIEF:
-	objPtr = Tcl_NewStringObj(Tk_NameOfRelief(*((int *) internalPtr)), -1);
+	objPtr = Tcl_NewStringObj(Tk_NameOfRelief(*((int *)internalPtr)), -1);
 	break;
     case TK_OPTION_CURSOR: {
-	Tk_Cursor cursor = *((Tk_Cursor *) internalPtr);
+	Tk_Cursor cursor = *((Tk_Cursor *)internalPtr);
 
 	if (cursor != NULL) {
 	    objPtr = Tcl_NewStringObj(
@@ -1949,17 +1949,17 @@ GetObjectForOption(
     }
     case TK_OPTION_JUSTIFY:
 	objPtr = Tcl_NewStringObj(Tk_NameOfJustify(
-		*((Tk_Justify *) internalPtr)), -1);
+		*((Tk_Justify *)internalPtr)), -1);
 	break;
     case TK_OPTION_ANCHOR:
 	objPtr = Tcl_NewStringObj(Tk_NameOfAnchor(
 		*((Tk_Anchor *) internalPtr)), -1);
 	break;
     case TK_OPTION_PIXELS:
-	objPtr = Tcl_NewIntObj(*((int *) internalPtr));
+	objPtr = Tcl_NewIntObj(*((int *)internalPtr));
 	break;
     case TK_OPTION_WINDOW: {
-	Tk_Window tkwin = *((Tk_Window *) internalPtr);
+	tkwin = *((Tk_Window *)internalPtr);
 
 	if (tkwin != NULL) {
 	    objPtr = Tcl_NewStringObj(Tk_PathName(tkwin), -1);
-- 
cgit v0.12


From bee15f4a247d30e3e4376247df154803efecf42c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 29 Sep 2020 08:57:53 +0000
Subject: It appears that xcode 9/10 need "update: true" for a new enough
 tcl-tk installation

---
 .travis.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 9a91920..da271b1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -180,6 +180,11 @@ jobs:
     - name: "macOS/Xcode 10/Shared"
       os: osx
       osx_image: xcode10.3
+      addons:
+        homebrew:
+          packages:
+            - tcl-tk
+          update: true
       env:
         - BUILD_DIR=unix
         - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.14"
@@ -189,6 +194,11 @@ jobs:
     - name: "macOS/Xcode 9/Shared"
       os: osx
       osx_image: xcode9.4
+      addons:
+        homebrew:
+          packages:
+            - tcl-tk
+          update: true
       env:
         - BUILD_DIR=unix
         - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.13"
-- 
cgit v0.12


From a22fd911c4fcdbc6c92423c582245a607610456c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 29 Sep 2020 10:05:00 +0000
Subject: Mark more test-cases with "failsOnUbuntu"

---
 tests/bell.test       |  2 +-
 tests/bitmap.test     |  6 ++---
 tests/border.test     | 22 ++++++++--------
 tests/clipboard.test  |  2 +-
 tests/cmds.test       |  2 +-
 tests/imgPhoto.test   |  2 +-
 tests/main.test       |  2 +-
 tests/menu.test       | 72 +++++++++++++++++++++++++--------------------------
 tests/menuDraw.test   | 12 ++++-----
 tests/menubut.test    | 18 ++++++-------
 tests/scale.test      |  2 +-
 tests/scrollbar.test  | 14 +++++-----
 tests/select.test     |  8 +++---
 tests/textDisp.test   | 12 +++++----
 tests/textWind.test   |  4 ++-
 tests/unixButton.test | 16 ++++++------
 tests/unixEmbed.test  | 24 +++++++++--------
 tests/unixFont.test   | 30 +++++++++++----------
 tests/unixWm.test     | 20 +++++++-------
 tests/visual_bb.test  | 12 ++++-----
 tests/winDialog.test  | 12 ++++-----
 tests/winFont.test    | 22 ++++++++--------
 tests/winMenu.test    |  6 ++---
 tests/winfo.test      |  6 +++--
 tests/wm.test         |  6 ++---
 25 files changed, 174 insertions(+), 160 deletions(-)

diff --git a/tests/bell.test b/tests/bell.test
index 4f7df97..bbafeac 100644
--- a/tests/bell.test
+++ b/tests/bell.test
@@ -15,7 +15,7 @@ test bell-1.1 {bell command} -body {
 } -returnCodes {error} -result {bad option "a": must be -displayof or -nice}
 
 test bell-1.2 {bell command} -body {
-    bell a b 
+    bell a b
 } -returnCodes {error} -result {bad option "a": must be -displayof or -nice}
 
 test bell-1.3 {bell command} -body {
diff --git a/tests/bitmap.test b/tests/bitmap.test
index fea675d..6996f88 100644
--- a/tests/bitmap.test
+++ b/tests/bitmap.test
@@ -15,7 +15,7 @@ test bitmap-1.1 {Tk_AllocBitmapFromObj - converting internal reps} -constraints
     testbitmap
 } -body {
     set x gray25
-    lindex $x 0             
+    lindex $x 0
     button .b -bitmap $x
     lindex $x 0
     testbitmap gray25
@@ -54,12 +54,12 @@ test bitmap-1.3 {Tk_AllocBitmapFromObj - reuse existing bitmap} -constraints {
 test bitmap-2.1 {Tk_GetBitmap procedure} -body {
     button .b1 -bitmap bad_name
 } -cleanup {
-    destroy .b1 
+    destroy .b1
 } -returnCodes error -result {bitmap "bad_name" not defined}
 test bitmap-2.2 {Tk_GetBitmap procedure} -body {
     button .b1 -bitmap @xyzzy
 } -cleanup {
-    destroy .b1 
+    destroy .b1
 } -returnCodes error -result {error reading bitmap file "xyzzy"}
 
 test bitmap-3.1 {Tk_FreeBitmapFromObj - reference counts} -constraints {
diff --git a/tests/border.test b/tests/border.test
index f610ad8..e13d52a 100644
--- a/tests/border.test
+++ b/tests/border.test
@@ -10,8 +10,8 @@ namespace import ::tcltest::*
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
-test border-1.1 {Tk_AllocBorderFromObj - converting internal reps} -constraints {  
-    testborder 
+test border-1.1 {Tk_AllocBorderFromObj - converting internal reps} -constraints {
+    testborder
 } -body {
     set x orange
     lindex $x 0
@@ -21,8 +21,8 @@ test border-1.1 {Tk_AllocBorderFromObj - converting internal reps} -constraints
 } -cleanup {
     destroy .b1
 } -result {{1 0}}
-test border-1.2 {Tk_AllocBorderFromObj - discard stale border} -constraints {  
-    testborder 
+test border-1.2 {Tk_AllocBorderFromObj - discard stale border} -constraints {
+    testborder
 } -setup {
     set result {}
 } -body {
@@ -35,8 +35,8 @@ test border-1.2 {Tk_AllocBorderFromObj - discard stale border} -constraints {
 } -cleanup {
     destroy .b1 .b2
 } -result {{} {{1 1}}}
-test border-1.3 {Tk_AllocBorderFromObj - reuse existing border} -constraints {  
-    testborder 
+test border-1.3 {Tk_AllocBorderFromObj - reuse existing border} -constraints {
+    testborder
 } -setup {
     set result {}
 } -body {
@@ -49,7 +49,7 @@ test border-1.3 {Tk_AllocBorderFromObj - reuse existing border} -constraints {
 } -cleanup {
     destroy .b1 .b2
 } -result {{{1 1}} {{2 1}}}
-test border-1.4 {Tk_AllocBorderFromObj - try other borders in list} -constraints {  
+test border-1.4 {Tk_AllocBorderFromObj - try other borders in list} -constraints {
     testborder pseudocolor8
 } -setup {
     toplevel .t -visual {pseudocolor 8} -colormap new
@@ -70,7 +70,7 @@ test border-1.4 {Tk_AllocBorderFromObj - try other borders in list} -constraints
     destroy .b1 .b2 .t
 } -result {{{1 1}} {{1 1} {1 0}} {{1 0} {2 1}}}
 
-test border-2.1 {Tk_Free3DBorder - reference counts} -constraints {  
+test border-2.1 {Tk_Free3DBorder - reference counts} -constraints {
     testborder pseudocolor8
 } -setup {
     toplevel .t -visual {pseudocolor 8} -colormap new
@@ -94,7 +94,7 @@ test border-2.1 {Tk_Free3DBorder - reference counts} -constraints {
 } -cleanup {
     destroy .b1 .b2 .t
 } -result {{{1 0} {2 1}} {{1 0} {1 1}} {{1 0}} {}}
-test border-2.2 {Tk_Free3DBorder - unlinking from list} -constraints {  
+test border-2.2 {Tk_Free3DBorder - unlinking from list} -constraints {
     testborder pseudocolor8
 } -setup {
     toplevel .t -visual {pseudocolor 8} -colormap new
@@ -127,8 +127,8 @@ test border-2.2 {Tk_Free3DBorder - unlinking from list} -constraints {
     destroy .b .t2 .t3 .t
 } -result {{{4 1} {3 0} {2 0} {1 0}} {{4 1} {2 0} {1 0}} {{4 1} {2 0}} {{2 0}} {}}
 
-test border-3.1 {FreeBorderObjProc} -constraints {  
-    testborder 
+test border-3.1 {FreeBorderObjProc} -constraints {
+    testborder
 } -setup {
     set result {}
     proc copy {s} {return [string index $s 0][string range $s 1 end]}
diff --git a/tests/clipboard.test b/tests/clipboard.test
index 9689942..81534d5 100644
--- a/tests/clipboard.test
+++ b/tests/clipboard.test
@@ -180,7 +180,7 @@ test clipboard-4.4 {ClipboardLostSel procedure} -setup {
     clipboard get
 } -cleanup {
     clipboard clear
-}  -returnCodes error -result {CLIPBOARD selection doesn't exist or form "STRING" not defined} 
+}  -returnCodes error -result {CLIPBOARD selection doesn't exist or form "STRING" not defined}
 test clipboard-4.5 {ClipboardLostSel procedure} -setup {
     clipboard clear
 } -body {
diff --git a/tests/cmds.test b/tests/cmds.test
index fa7e788..caf5afe 100644
--- a/tests/cmds.test
+++ b/tests/cmds.test
@@ -39,7 +39,7 @@ test cmds-1.5 {tkwait visibility, window gets deleted} -setup {
 } -body {
     after 100 {set x deleted; destroy .f}
     tkwait visibility .f.b
-} -returnCodes {error} -result {window ".f.b" was deleted before its visibility changed} 
+} -returnCodes {error} -result {window ".f.b" was deleted before its visibility changed}
 test cmds-1.6 {tkwait visibility, window gets deleted} -setup {
     frame .f
     button .f.b -text "Test"
diff --git a/tests/imgPhoto.test b/tests/imgPhoto.test
index 140d7fa..a890fd7 100644
--- a/tests/imgPhoto.test
+++ b/tests/imgPhoto.test
@@ -813,7 +813,7 @@ test imgPhoto-4.75 {<photo> read command: filename starting with '-'} -constrain
     file delete ./-teapotPhotoFile
 } -result {}
 test imgPhoto-4.76 {ImgPhotoCmd procedure: copy to same image} -constraints {
-    hasTeapotPhoto 
+    hasTeapotPhoto
 } -setup {
     imageCleanup
     image create photo photo1 -file $teapotPhotoFile
diff --git a/tests/main.test b/tests/main.test
index 7ab624f..deb0783 100644
--- a/tests/main.test
+++ b/tests/main.test
@@ -55,7 +55,7 @@ test main-2.2 {Tk_MainEx: -encoding option} -constraints stdio -setup {
 	removeFile script
 } -result "script {} 0\n0\n"
 
-    # Procedure to simulate interactive typing of commands, line by line, 
+    # Procedure to simulate interactive typing of commands, line by line,
 	# for test 2.3
     proc type {chan script} {
         foreach line [split $script \n] {
diff --git a/tests/menu.test b/tests/menu.test
index 6a3c6fe..7589aea 100644
--- a/tests/menu.test
+++ b/tests/menu.test
@@ -276,7 +276,7 @@ destroy .m1
 # We need to test all of the options with all of the different types of
 # menu entries. The following code sets up .m1 with 6 items. It then
 # runs through the 2.31 - 2.228 tests below
-# index 0 is tearoff, 1 command, 2 cascade, 3 separator, 4 checkbutton, 
+# index 0 is tearoff, 1 command, 2 cascade, 3 separator, 4 checkbutton,
 # 5 radiobutton
 deleteWindows
 menu .m1 -tearoff 1
@@ -771,34 +771,34 @@ test menu-2.132 {entry configuration options 5 -image bogus radiobutton} -body {
 } -returnCodes error -result {image "bogus" doesn't exist}
 
 test menu-2.133 {entry configuration options 0 -image {} tearoff} -body {
-    .m1 entryconfigure 0 -image 
+    .m1 entryconfigure 0 -image
 } -returnCodes error -result {unknown option "-image"}
 
 test menu-2.134 {entry configuration options 1 -image {} command} -setup {
     .m1 entryconfigure 1 -image {}
 } -body {
-    .m1 entryconfigure 1 -image 
+    .m1 entryconfigure 1 -image
     lindex [.m1 entryconfigure 1 -image] 4
 } -result {}
 
 test menu-2.135 {entry configuration options 2 -image {} cascade} -setup {
     .m1 entryconfigure 2 -image {}
 } -body {
-    .m1 entryconfigure 2 -image 
+    .m1 entryconfigure 2 -image
     lindex [.m1 entryconfigure 2 -image] 4
 } -result {}
 
 test menu-2.136 {entry configuration options 3 -image {} separator} -body {
-    .m1 entryconfigure 3 -image 
+    .m1 entryconfigure 3 -image
 } -returnCodes error -result {unknown option "-image"}
 
 test menu-2.137 {entry configuration options 4 -image {} checkbutton} -body {
-    .m1 entryconfigure 4 -image 
+    .m1 entryconfigure 4 -image
     lindex [.m1 entryconfigure 4 -image] 4
 } -result {}
 
 test menu-2.138 {entry configuration options 5 -image {} radiobutton} -body {
-    .m1 entryconfigure 5 -image 
+    .m1 entryconfigure 5 -image
     lindex [.m1 entryconfigure 5 -image] 4
 } -result {}
 
@@ -1052,28 +1052,28 @@ test menu-2.192 {entry configuration options 5 -selectimage bogus radiobutton} -
 } -returnCodes error -result {image "bogus" doesn't exist}
 
 test menu-2.193 {entry configuration options 0 -selectimage {} tearoff} -body {
-    .m1 entryconfigure 0 -selectimage 
+    .m1 entryconfigure 0 -selectimage
 } -returnCodes error -result {unknown option "-selectimage"}
 
 test menu-2.194 {entry configuration options 1 -selectimage {} command} -body {
-    .m1 entryconfigure 1 -selectimage 
+    .m1 entryconfigure 1 -selectimage
 } -returnCodes error -result {unknown option "-selectimage"}
 
 test menu-2.195 {entry configuration options 2 -selectimage {} cascade} -body {
-    .m1 entryconfigure 2 -selectimage 
+    .m1 entryconfigure 2 -selectimage
 } -returnCodes error -result {unknown option "-selectimage"}
 
 test menu-2.196 {entry configuration options 3 -selectimage {} separator} -body {
-    .m1 entryconfigure 3 -selectimage 
+    .m1 entryconfigure 3 -selectimage
 } -returnCodes error -result {unknown option "-selectimage"}
 
 test menu-2.197 {entry configuration options 4 -selectimage {} checkbutton} -body {
-    .m1 entryconfigure 4 -selectimage 
+    .m1 entryconfigure 4 -selectimage
     lindex [.m1 entryconfigure 4 -selectimage] 4
 } -result {}
 
 test menu-2.198 {entry configuration options 5 -selectimage {} radiobutton} -body {
-    .m1 entryconfigure 5 -selectimage 
+    .m1 entryconfigure 5 -selectimage
     lindex [.m1 entryconfigure 5 -selectimage] 4
 } -result {}
 
@@ -1225,7 +1225,7 @@ test menu-3.1 {MenuWidgetCmd procedure} -setup {
 	destroy .m1
 } -returnCodes error -result {wrong # args: should be ".m1 option ?arg ...?"}
 test menu-3.2 {MenuWidgetCmd, Tcl_Preserve and Tcl_Release} -constraints {
-	nonUnixUserInteraction 
+	nonUnixUserInteraction
 } -setup {
     destroy .m1
 } -body  {
@@ -1237,7 +1237,7 @@ test menu-3.2 {MenuWidgetCmd, Tcl_Preserve and Tcl_Release} -constraints {
 } -returnCodes ok -result {}
 test menu-3.3 {MenuWidgetCmd procedure, "activate" option} -setup {
 	destroy .m1
-} -body {    
+} -body {
     menu .m1
     .m1 add command -label "test"
     .m1 activate
@@ -1414,7 +1414,7 @@ test menu-3.26 {MenuWidgetCmd procedure, "delete" option} -setup {
 } -body {
     menu .m1
     .m1 add command -label "foo"
-    .m1 delete 1 0 
+    .m1 delete 1 0
 } -cleanup {
 	destroy .m1
 } -result {}
@@ -1627,7 +1627,7 @@ test menu-3.50 {MenuWidgetCmd procedure, "post" option} -constraints {
 	nonUnixUserInteraction
 } -setup {
 	destroy .m1
-} -body { 
+} -body {
     menu .m1
     .m1 add command -label "menu-3.53: hit Escape" -command "puts hello"
     .m1 post 40 40
@@ -1654,7 +1654,7 @@ test menu-3.53 {MenuWidgetCmd procedure, "postcascade" option} -constraints {
 	nonUnixUserInteraction
 } -setup {
 	destroy .m1 .m2
-} -body { 
+} -body {
     menu .m1
     .m1 add command -label "menu-3.56 - hit Escape"
     menu .m2
@@ -1756,10 +1756,10 @@ test menu-3.64 {MenuWidgetCmd procedure, "unpost" option} -constraints {
 	nonUnixUserInteraction
 } -setup {
 	destroy .m1
-} -body { 
+} -body {
     menu .m1
     .m1 add command -label "menu-3.68 - hit Escape"
-    .m1 post 40 40 
+    .m1 post 40 40
     .m1 unpost
 } -cleanup {
 	destroy .m1
@@ -1898,7 +1898,7 @@ test menu-4.5 {TkInvokeMenu: checkbutton array element} -setup {
 } -body {
     catch {unset foo}
     menu .m1
-    .m1 add checkbutton -label "test" -variable foo(1) -onvalue on 
+    .m1 add checkbutton -label "test" -variable foo(1) -onvalue on
     list [catch {.m1 invoke 1} msg] $msg [catch {set foo(1)} msg2] $msg2 [catch {unset foo} msg3] $msg3
 } -cleanup {
 	destroy .m1
@@ -1966,7 +1966,7 @@ test menu-4.11 {TkInvokeMenu} -setup {
 } -body {
     menu .m1
     .m1 add cascade -label "test" -menu .m1.m2
-    list [catch {.m1 invoke 1} msg] $msg 
+    list [catch {.m1 invoke 1} msg] $msg
 } -cleanup {
 	destroy .m1
 } -result {0 {}}
@@ -2123,7 +2123,7 @@ test menu-6.4 {TkDestroyMenu - reentrancy - clones} -setup {
     destroy .m1
 } -cleanup {
 	deleteWindows
-} -returnCodes ok 
+} -returnCodes ok
 test menu-6.5 {TkDestroyMenu} -setup {
     destroy .m1 .m2
 } -body {
@@ -2350,7 +2350,7 @@ test menu-8.4 {DestroyMenuEntry} -setup {
     menu .m1
     .m1 add checkbutton -variable foo
     list [.m1 delete 1] [destroy .m1]
-} -result {{} {}} 
+} -result {{} {}}
 test menu-8.5 {DestroyMenuEntry} -setup {
     destroy .m1
 } -body {
@@ -2382,7 +2382,7 @@ test menu-9.1 {ConfigureMenu} -setup {
     destroy .m1
 } -body {
     menu .m1
-    list [.m1 configure -postcommand "beep"] [.m1 cget -postcommand] 
+    list [.m1 configure -postcommand "beep"] [.m1 cget -postcommand]
 } -cleanup {
 	deleteWindows
 } -result {{} beep}
@@ -2515,7 +2515,7 @@ test menu-11.3 {ConfigureMenuEntry} -setup {
 test menu-11.4 {ConfigureMenuEntry} -setup {
 	deleteWindows
 } -body {
-    menu .m1 
+    menu .m1
     .m1 add command
     list [.m1 entryconfigure 1 -accel "S"] [.m1 entrycget 1 -accel]
 } -cleanup {
@@ -2589,13 +2589,13 @@ test menu-11.12 {ConfigureMenuEntry} -setup {
 	deleteWindows
 } -body {
     menu .m1
-    menu .m2 
+    menu .m2
     .m2 add cascade -menu .m1
-    menu .m3 
+    menu .m3
     .m3 add cascade -menu .m1
-    menu .m4 
+    menu .m4
     .m4 add cascade -menu .m1
-    menu .m5 
+    menu .m5
     .m5 add cascade
     .m5 entryconfigure 1 -label "test" -menu .m1
 } -cleanup {
@@ -2605,11 +2605,11 @@ test menu-11.13 {ConfigureMenuEntry} -setup {
 	deleteWindows
 } -body {
     menu .m1
-    menu .m2 
+    menu .m2
     .m2 add cascade -menu .m1
-    menu .m3 
+    menu .m3
     .m3 add cascade -menu .m1
-    menu .m4 
+    menu .m4
     .m4 add cascade -menu .m1
     .m3 entryconfigure 1 -label "test" -menu .m1
 } -cleanup {
@@ -3236,7 +3236,7 @@ test menu-18.4 {TkActivateMenuEntry} -setup {
 
 test menu-19.1 {TkPostCommand} -constraints nonUnixUserInteraction -setup {
 	deleteWindows
-} -body { 
+} -body {
     menu .m1 -postcommand "set menu_test menu-19.1"
     .m1 add command -label "menu-19.1 - hit Escape"
     list [.m1 post 40 40] [.m1 unpost] [set menu_test]
@@ -3245,7 +3245,7 @@ test menu-19.1 {TkPostCommand} -constraints nonUnixUserInteraction -setup {
 } -result {menu-19.1 {} menu-19.1}
 test menu-19.2 {TkPostCommand} -constraints nonUnixUserInteraction -setup {
 	deleteWindows
-} -body { 
+} -body {
     menu .m1
     .m1 add command -label "menu-19.2 - hit Escape"
     list [.m1 post 40 40] [.m1 unpost]
@@ -3766,7 +3766,7 @@ test menu-32.1 {DeleteMenuCloneEntries} -setup {
 test menu-32.2 {DeleteMenuCloneEntries} -setup {
 	deleteWindows
 } -body {
-    
+
     menu .m1
     .m1 add command -label one
     .m1 add command -label two
diff --git a/tests/menuDraw.test b/tests/menuDraw.test
index 0d7a049..9382974 100644
--- a/tests/menuDraw.test
+++ b/tests/menuDraw.test
@@ -76,7 +76,7 @@ test menuDraw-5.3 {TkMenuConfigureDrawOptions - no disabledFg} -setup {
     menu .m1 -disabledforeground ""
 } -cleanup {
     deleteWindows
-} -result {.m1}  
+} -result {.m1}
 
 
 test menuDraw-6.1 {TkMenuConfigureEntryDrawOptions - no tkfont specified} -setup {
@@ -321,7 +321,7 @@ test menuDraw-10.4 {ComputeMenuGeometry - resize not necessary} -setup {
 
 
 test menuDraw-11.1 {TkMenuSelectImageProc - entry selected; redraw not pending} -constraints {
-    testImageType 
+    testImageType
 } -setup {
     deleteWindows
     imageCleanup
@@ -338,7 +338,7 @@ test menuDraw-11.1 {TkMenuSelectImageProc - entry selected; redraw not pending}
     imageCleanup
 } -result {{} {}}
 test menuDraw-11.2 {TkMenuSelectImageProc - entry selected; redraw pending} -constraints {
-    testImageType 
+    testImageType
 } -setup {
     deleteWindows
     imageCleanup
@@ -354,7 +354,7 @@ test menuDraw-11.2 {TkMenuSelectImageProc - entry selected; redraw pending} -con
     imageCleanup
 } -result {{} {}}
 test menuDraw-11.3 {TkMenuSelectImageProc - entry not selected} -constraints {
-    testImageType 
+    testImageType
 } -setup {
     deleteWindows
     imageCleanup
@@ -451,7 +451,7 @@ test menuDraw.12.7 {DisplayMenu - three columns} -setup {
     deleteWindows
 } -result {}
 test menuDraw-12.6 {Display menu - testing for extra space and menubars} -constraints {
-    unix 
+    unix
 } -setup {
     deleteWindows
 } -body {
@@ -668,7 +668,7 @@ test menuDraw-16.6 {TkPostSubMenu} -constraints {
     menu .m2
     .m2 add command -label "Hit ESCAPE to get rid of this menu"
     set tearoff [tk::TearOffMenu .m1 40 40]
-    $tearoff postcascade 0 
+    $tearoff postcascade 0
 } -cleanup {
     deleteWindows
 } -result {}
diff --git a/tests/menubut.test b/tests/menubut.test
index 4ac5d92..d245fd0 100644
--- a/tests/menubut.test
+++ b/tests/menubut.test
@@ -394,7 +394,7 @@ test menubutton-4.1 {ConfigureMenuButton procedure} -setup {
     .mb1 configure -width 1i
 } -cleanup {
     deleteWindows
-} -returnCodes error -result {expected integer but got "1i"} 
+} -returnCodes error -result {expected integer but got "1i"}
 test menubutton-4.2 {ConfigureMenuButton procedure} -setup {
     deleteWindows
 } -body {
@@ -451,7 +451,7 @@ test menubutton-4.6 {ConfigureMenuButton procedure} -setup {
 ".mb1 configure -width abc"}
 
 test menubutton-4.7 {ConfigureMenuButton procedure} -constraints {
-    testImageType 
+    testImageType
 } -setup {
     deleteWindows
     imageCleanup
@@ -464,7 +464,7 @@ test menubutton-4.7 {ConfigureMenuButton procedure} -constraints {
     imageCleanup
 } -returnCodes error -result {bad screen distance "0.5x"}
 test menubutton-4.8 {ConfigureMenuButton procedure} -constraints {
-    testImageType 
+    testImageType
 } -setup {
     deleteWindows
     imageCleanup
@@ -499,7 +499,7 @@ test menubutton-4.10 {ConfigureMenuButton procedure - bad direction} -setup {
     deleteWindows
 } -body {
     menubutton .mb -text "Test"
-    .mb configure -direction badValue 
+    .mb configure -direction badValue
 } -cleanup {
     deleteWindows
 } -returnCodes error -result {bad direction "badValue": must be above, below, flush, left, or right}
@@ -548,7 +548,7 @@ if {[tk windowingsystem] == "aqua"} {
     set extraWidth 0
 }
 test menubutton-7.1 {ComputeMenuButtonGeometry procedure} -constraints {
-    testImageType 
+    testImageType
 } -setup {
     deleteWindows
     image create test image1
@@ -561,7 +561,7 @@ test menubutton-7.1 {ComputeMenuButtonGeometry procedure} -constraints {
     imageCleanup
 } -result [list [expr {38 + $extraWidth}] 23]
 test menubutton-7.2 {ComputeMenuButtonGeometry procedure} -constraints {
-    testImageType 
+    testImageType
 } -setup {
     deleteWindows
     image create test image1
@@ -574,7 +574,7 @@ test menubutton-7.2 {ComputeMenuButtonGeometry procedure} -constraints {
     imageCleanup
 } -result [list [expr {38 + $extraWidth}] 23]
 test menubutton-7.3 {ComputeMenuButtonGeometry procedure} -constraints {
-    testImageType 
+    testImageType
 } -setup {
     deleteWindows
     image create test image1
@@ -587,7 +587,7 @@ test menubutton-7.3 {ComputeMenuButtonGeometry procedure} -constraints {
     imageCleanup
 } -result [list [expr {38 + $extraWidth}] 23]
 test menubutton-7.4 {ComputeMenuButtonGeometry procedure} -constraints {
-    testImageType 
+    testImageType
 } -setup {
     deleteWindows
     image create test image1
@@ -601,7 +601,7 @@ test menubutton-7.4 {ComputeMenuButtonGeometry procedure} -constraints {
     imageCleanup
 } -result [list [expr {48 + $extraWidth}] 23]
 test menubutton-7.5 {ComputeMenuButtonGeometry procedure} -constraints {
-    testImageType 
+    testImageType
 } -setup {
     deleteWindows
     image create test image1
diff --git a/tests/scale.test b/tests/scale.test
index 38c3e9a..34f2cd9 100644
--- a/tests/scale.test
+++ b/tests/scale.test
@@ -324,7 +324,7 @@ test scale-2.1 {Tk_ScaleCmd procedure} -body {
     scale
 } -returnCodes error -result {wrong # args: should be "scale pathName ?-option value ...?"}
 test scale-2.2 {Tk_ScaleCmd procedure} -body {
-    scale foo 
+    scale foo
 } -returnCodes error -result {bad window path name "foo"}
 test scale-2.3 {Tk_ScaleCmd procedure} -body {
     catch {scale foo}
diff --git a/tests/scrollbar.test b/tests/scrollbar.test
index 097ab79..4963cf8 100644
--- a/tests/scrollbar.test
+++ b/tests/scrollbar.test
@@ -11,6 +11,8 @@ package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+
 proc scroll args {
     global scrollInfo
     set scrollInfo $args
@@ -270,13 +272,13 @@ test scrollbar-3.35 {ScrollbarWidgetCmd procedure, "fraction" option} {
     format {%.6g} [.s fraction 4 21]
 } [format %.6g [expr {(21.0 - ([winfo height .s] - [getTroughSize .s])/2.0) \
        /([getTroughSize .s] - 1)}]]
-test scrollbar-3.36 {ScrollbarWidgetCmd procedure, "fraction" option} x11 {
+test scrollbar-3.36 {ScrollbarWidgetCmd procedure, "fraction" option} {x11 failsOnUbuntu} {
     format {%.6g} [.s fraction 4 179]
 } {1}
 test scrollbar-3.37 {ScrollbarWidgetCmd procedure, "fraction" option} {testmetrics} {
     format {%.6g} [.s fraction 4 [expr {200 - [testmetrics cyvscroll .s]}]]
 } {1}
-test scrollbar-3.38 {ScrollbarWidgetCmd procedure, "fraction" option} x11 {
+test scrollbar-3.38 {ScrollbarWidgetCmd procedure, "fraction" option} {x11 failsOnUbuntu} {
     format {%.6g} [.s fraction 4 178]
 } {0.993711}
 test scrollbar-3.39 {ScrollbarWidgetCmd procedure, "fraction" option} {testmetrics win} {
@@ -491,7 +493,7 @@ test scrollbar-6.11.2 {ScrollbarPosition procedure} aqua {
     # macOS scrollbars have no arrows nowadays
     .s identify 8 4
 } {trough1}
-test scrollbar-6.12.1 {ScrollbarPosition procedure} x11 {
+test scrollbar-6.12.1 {ScrollbarPosition procedure} {x11 failsOnUbuntu} {
     .s identify 8 19
 } {arrow1}
 test scrollbar-6.12.2 {ScrollbarPosition procedure} aqua {
@@ -549,7 +551,7 @@ test scrollbar-6.28 {ScrollbarPosition procedure} {testmetrics win} {
     .s identify [expr {[winfo width .s] / 2}] [expr {[winfo height .s]
 						 - [testmetrics cyvscroll .s] - 1}]
 } {trough2}
-test scrollbar-6.29.1 {ScrollbarPosition procedure} x11 {
+test scrollbar-6.29.1 {ScrollbarPosition procedure} {x11 failsOnUbuntu} {
     .s identify 8 180
 } {arrow2}
 test scrollbar-6.29.2 {ScrollbarPosition procedure} aqua {
@@ -573,7 +575,7 @@ test scrollbar-6.33 {ScrollbarPosition procedure} win {
 test scrollbar-6.34 {ScrollbarPosition procedure} unix {
     .s identify 4 100
 } {trough2}
-test scrollbar-6.35 {ScrollbarPosition procedure} unix {
+test scrollbar-6.35 {ScrollbarPosition procedure} {unix failsOnUbuntu} {
     .s identify 18 100
 } {trough2}
 test scrollbar-6.37 {ScrollbarPosition procedure} win {
@@ -612,7 +614,7 @@ test scrollbar-6.43 {ScrollbarPosition procedure} {testmetrics win} {
     .t.s identify [expr {int(.4 / [.t.s delta 1 0]) + [testmetrics cxhscroll .t.s]
 		       - 1}] [expr {[winfo height .t.s] / 2}]
 } {slider}
-test scrollbar-6.44 {ScrollbarPosition procedure} unix {
+test scrollbar-6.44 {ScrollbarPosition procedure} {unix failsOnUbuntu} {
     .t.s identify 100 18
 } {trough2}
 test scrollbar-6.46 {ScrollbarPosition procedure} win {
diff --git a/tests/select.test b/tests/select.test
index f89a736..9146397 100644
--- a/tests/select.test
+++ b/tests/select.test
@@ -952,7 +952,7 @@ test select-9.5 {SelCvtToX and SelCvtFromX procedures} -setup {
 
 # most control paths have been exercised above
 test select-10.1 {ConvertSelection procedure, race with selection clear} -constraints {
-    x11 
+    x11
 } -setup {
     setup
 } -body {
@@ -1021,7 +1021,7 @@ test select-10.4 {ConvertSelection procedure} -constraints {
     lappend result $selInfo
 } -result {{selection owner didn't respond} {STRING 0 4000 STRING 4000 4000 STRING 8000 4000 STRING 12000 4000 STRING 16000 4000 STRING 0 4000 STRING 4000 4000}}
 test select-10.5 {ConvertSelection procedure, reentrancy issues} -constraints {
-    x11 
+    x11
 } -setup {
     setup
     setupbg
@@ -1036,7 +1036,7 @@ test select-10.5 {ConvertSelection procedure, reentrancy issues} -constraints {
     lappend result $selInfo
 } -result {{PRIMARY selection doesn't exist or form "STRING" not defined} {.f1 STRING 0 4000}}
 test select-10.6 {ConvertSelection procedure, reentrancy issues} -constraints {
-    x11 
+    x11
 } -setup {
     setup
     setupbg
@@ -1131,7 +1131,7 @@ test select-12.6 {DefaultSelection procedure} -body {
 } -result {{Targets value} {TARGETS.f1 0 4000} {MULTIPLE TARGETS TIMESTAMP TK_APPLICATION TK_WINDOW}}
 
 test select-13.1 {SelectionSize procedure, handler deleted} -constraints {
-    x11 
+    x11
 } -setup {
     setup
     setupbg
diff --git a/tests/textDisp.test b/tests/textDisp.test
index 94032fe..d54eb62 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -11,6 +11,8 @@ eval tcltest::configure $argv
 tcltest::loadTestedCommands
 namespace import -force tcltest::test
 
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+
 # Platform specific procedure for updating the text widget.
 
 if {[tk windowingsystem] == "aqua"} {
@@ -2928,28 +2930,28 @@ for {set i 2} {$i <= 200} {incr i} {
 .t configure -wrap word
 .t delete 50.0 51.0
 .t insert 50.0 "This is a long line, one that will wrap around twice.\n"
-test textDisp-20.1 {FindDLine} {
+test textDisp-20.1 {FindDLine} failsOnUbuntu {
     .t yview 48.0
     list [.t dlineinfo 46.0] [.t dlineinfo 47.0] [.t dlineinfo 49.0] \
 	    [.t dlineinfo 58.0]
 } [list {} {} [list 3 [expr {$fixedDiff + 16}] 49 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] {}]
-test textDisp-20.2 {FindDLine} {
+test textDisp-20.2 {FindDLine} failsOnUbuntu {
     .t yview 100.0
     .t yview -pickplace 53.0
     list [.t dlineinfo 50.0] [.t dlineinfo 50.14] [.t dlineinfo 50.21]
 } [list [list 3 [expr {-1 - $fixedDiff/2}] 140 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] [list 3 [expr {-1 - $fixedDiff/2}] 140 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] [list 3 [expr {12 + $fixedDiff/2}] 133 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]]]
-test textDisp-20.3 {FindDLine} {
+test textDisp-20.3 {FindDLine} failsOnUbuntu {
     .t yview 100.0
     .t yview 49.0
     list [.t dlineinfo 50.0] [.t dlineinfo 50.24] [.t dlineinfo 57.0]
 } [list [list 3 [expr {$fixedDiff + 16}] 140 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] [list 3 [expr {2*$fixedDiff + 29}] 133 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] {}]
-test textDisp-20.4 {FindDLine} {
+test textDisp-20.4 {FindDLine} failsOnUbuntu {
     .t yview 100.0
     .t yview 42.0
     list [.t dlineinfo 50.0] [.t dlineinfo 50.24] [.t dlineinfo 50.40]
 } [list [list 3 [expr {8*$fixedDiff + 107}] 140 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] [list 3 [expr {9*$fixedDiff + 120}] 133 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] {}]
 .t config -wrap none
-test textDisp-20.5 {FindDLine} {
+test textDisp-20.5 {FindDLine} failsOnUbuntu {
     .t yview 100.0
     .t yview 48.0
     list [.t dlineinfo 50.0] [.t dlineinfo 50.20] [.t dlineinfo 50.40]
diff --git a/tests/textWind.test b/tests/textWind.test
index 41af5e9..40bc8dd 100644
--- a/tests/textWind.test
+++ b/tests/textWind.test
@@ -11,6 +11,8 @@ namespace import ::tcltest::*
 tcltest::configure {*}$argv
 tcltest::loadTestedCommands
 
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+
 deleteWindows
 
 set fixedFont {"Courier" -12}
@@ -792,7 +794,7 @@ test textWind-10.6 {EmbWinLayoutProc procedure, error in creating window} -setup
     {{can't embed .t relative to .t}} \
     [list [expr {$padx+5*$fixedWidth}] [expr {$pady+($fixedHeight/2)}] 0 0]]
 
-test textWind-10.7 {EmbWinLayoutProc procedure, error in creating window} -setup {
+test textWind-10.7 {EmbWinLayoutProc procedure, error in creating window} -constraints failsOnUbuntu -setup {
     .t delete 1.0 end
     destroy .t2
     proc bgerror args {
diff --git a/tests/unixButton.test b/tests/unixButton.test
index 325f497..f0dcde5 100644
--- a/tests/unixButton.test
+++ b/tests/unixButton.test
@@ -16,7 +16,7 @@ imageInit
 
 # Create entries in the option database to be sure that geometry options
 # like border width have predictable values.
- 
+
 option add *Label.borderWidth 2
 option add *Label.highlightThickness 0
 option add *Label.font {Helvetica -12 bold}
@@ -70,7 +70,7 @@ test unixbutton-1.1 {TkpComputeButtonGeometry procedure} -constraints {
 	        [expr {72 + $bigIndicator}] 52 \
 	        [expr {72 + $bigIndicator}] 52]
 test unixbutton-1.2 {TkpComputeButtonGeometry procedure} -constraints {
-    unix 
+    unix
 } -setup {
     deleteWindows
 } -body {
@@ -91,7 +91,7 @@ test unixbutton-1.2 {TkpComputeButtonGeometry procedure} -constraints {
 	        [expr {27 + $smallIndicator}] 37 \
 	        [expr {27 + $smallIndicator}] 37]
 test unixbutton-1.3 {TkpComputeButtonGeometry procedure} -constraints {
-    unix 
+    unix
 } -setup {
     deleteWindows
 } -body {
@@ -192,7 +192,7 @@ test unixbutton-1.8 {TkpComputeButtonGeometry procedure} -constraints {
     deleteWindows
 } -result {62 30 56 24 58 22 62 22}
 test unixbutton-1.9 {TkpComputeButtonGeometry procedure} -constraints {
-    unix 
+    unix
 } -setup {
     deleteWindows
 } -body {
@@ -200,9 +200,9 @@ test unixbutton-1.9 {TkpComputeButtonGeometry procedure} -constraints {
     list [winfo reqwidth .b2] [winfo reqheight .b2]
 } -cleanup {
     deleteWindows
-} -result [list [expr {17 + $defaultBorder}] [expr {27 + $defaultBorder}]] 
+} -result [list [expr {17 + $defaultBorder}] [expr {27 + $defaultBorder}]]
 test unixbutton-1.10 {TkpComputeButtonGeometry procedure} -constraints {
-    unix 
+    unix
 } -setup {
     deleteWindows
 } -body {
@@ -212,7 +212,7 @@ test unixbutton-1.10 {TkpComputeButtonGeometry procedure} -constraints {
     deleteWindows
 } -result [list [expr {17 + $defaultBorder}] [expr {27 + $defaultBorder}]]
 test unixbutton-1.11 {TkpComputeButtonGeometry procedure} -constraints {
-    unix 
+    unix
 } -setup {
     deleteWindows
 } -body {
@@ -224,7 +224,7 @@ test unixbutton-1.11 {TkpComputeButtonGeometry procedure} -constraints {
 
 
 test unixbutton-2.1 {disabled coloring check, bug 669595} -constraints {
-    unix 
+    unix
 } -setup {
     deleteWindows
     catch {unset value}
diff --git a/tests/unixEmbed.test b/tests/unixEmbed.test
index cd7f15f..578075e 100644
--- a/tests/unixEmbed.test
+++ b/tests/unixEmbed.test
@@ -11,6 +11,8 @@ eval tcltest::configure $argv
 tcltest::loadTestedCommands
 namespace import -force tcltest::test
 
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+
 namespace eval ::_test_tmp {}
 
 # ------------------------------------------------------------------------------
@@ -1086,7 +1088,7 @@ test unixEmbed-7.2a {TkpRedirectKeyEvent procedure, don't forward keystroke widt
 } -result {{} {{key b}}}
 
 test unixEmbed-8.1 {TkpClaimFocus procedure} -constraints {
-    unix notAqua
+    unix notAqua failsOnUbuntu
 } -setup {
 	deleteWindows
 } -body {
@@ -1188,9 +1190,9 @@ test unixEmbed-9.1 {EmbedWindowDeleted procedure, check parentPtr} -constraints
 	deleteWindows
 } -result {{{XXX .f4 {} {}} {XXX .f3 {} {}} {XXX .f2 {} {}} {XXX .f1 {} {}}} {{XXX .f4 {} {}} {XXX .f2 {} {}} {XXX .f1 {} {}}} {{XXX .f2 {} {}} {XXX .f1 {} {}}} {{XXX .f2 {} {}}} {}}
 test unixEmbed-9.2 {EmbedWindowDeleted procedure, check embeddedPtr} -constraints {
-	unix testembed notAqua
+    unix testembed notAqua
 } -setup {
-	deleteWindows
+    deleteWindows
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
@@ -1233,9 +1235,9 @@ test unixEmbed-9.2a {EmbedWindowDeleted procedure, check embeddedPtr} -constrain
 
 
 test unixEmbed-10.1 {geometry propagation in tkUnixWm.c/UpdateGeometryInfo} -constraints {
-	unix
+    unix failsOnUbuntu
 } -setup {
-	deleteWindows
+    deleteWindows
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
@@ -1249,9 +1251,9 @@ test unixEmbed-10.1 {geometry propagation in tkUnixWm.c/UpdateGeometryInfo} -con
 	deleteWindows
 } -result {150x80+0+0}
 test unixEmbed-10.2 {geometry propagation in tkUnixWm.c/UpdateGeometryInfo} -constraints {
-	unix
+    unix failsOnUbuntu
 } -setup {
-	deleteWindows
+    deleteWindows
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
@@ -1266,9 +1268,9 @@ test unixEmbed-10.2 {geometry propagation in tkUnixWm.c/UpdateGeometryInfo} -con
 } -result {70x300+0+0}
 
 test unixEmbed-11.1 {focus -force works for embedded toplevels} -constraints {
-	unix
+    unix
 } -setup {
-	deleteWindows
+    deleteWindows
 } -body {
     toplevel .t
     pack [frame .t.f -container 1 -width 200 -height 200] -fill both
@@ -1282,9 +1284,9 @@ test unixEmbed-11.1 {focus -force works for embedded toplevels} -constraints {
     deleteWindows
 } -result .embed
 test unixEmbed-11.2 {mouse coordinates in embedded toplevels} -constraints {
-	unix pressbutton
+    unix pressbutton
 } -setup {
-	deleteWindows
+    deleteWindows
 } -body {
     toplevel .main
     set result {}
diff --git a/tests/unixFont.test b/tests/unixFont.test
index eb2a23b..9a8f864 100644
--- a/tests/unixFont.test
+++ b/tests/unixFont.test
@@ -16,6 +16,8 @@ package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+
 if {[tk windowingsystem] eq "x11"} {
     set xlsf [auto_execok xlsfonts]
 }
@@ -69,7 +71,7 @@ proc getsize {} {
 test unixfont-1.1 {TkpGetNativeFont procedure: not native} {x11 noExceed} {
     list [catch {font measure {} xyz} msg] $msg
 } {1 {font "" doesn't exist}}
-test unixfont-1.2 {TkpGetNativeFont procedure: native} x11 {
+test unixfont-1.2 {TkpGetNativeFont procedure: native} {x11 failsOnUbuntu} {
     font measure fixed 0
 } {6}
 
@@ -78,21 +80,21 @@ test unixfont-2.1 {TkpGetFontFromAttributes procedure: no family} x11 {
     set x {}
 } {}
 test unixfont-2.2 {TkpGetFontFromAttributes procedure: Times relatives} \
-	{x11 noExceed hasTimesNew} {
+	{x11 noExceed hasTimesNew failsOnUbuntu} {
     set x {}
     lappend x [lindex [font actual {-family "Times New Roman"}] 1]
     lappend x [lindex [font actual {-family "New York"}] 1]
     lappend x [lindex [font actual {-family "Times"}] 1]
 } {times times times}
 test unixfont-2.3 {TkpGetFontFromAttributes procedure: Courier relatives} \
-	{x11 noExceed hasCourierNew} {
+	{x11 noExceed hasCourierNew failsOnUbuntu} {
     set x {}
     lappend x [lindex [font actual {-family "Courier New"}] 1]
     lappend x [lindex [font actual {-family "Monaco"}] 1]
     lappend x [lindex [font actual {-family "Courier"}] 1]
 } {courier courier courier}
 test unixfont-2.4 {TkpGetFontFromAttributes procedure: Helvetica relatives} \
-	{x11 noExceed hasArial} {
+	{x11 noExceed hasArial failsOnUbuntu} {
     set x {}
     lappend x [lindex [font actual {-family "Arial"}] 1]
     lappend x [lindex [font actual {-family "Geneva"}] 1]
@@ -102,16 +104,16 @@ test unixfont-2.5 {TkpGetFontFromAttributes procedure: fallback} x11 {
     font actual {-xyz-xyz-*-*-*-*-*-*-*-*-*-*-*-*}
     set x {}
 } {}
-test unixfont-2.6 {TkpGetFontFromAttributes: fallback to fixed family} x11 {
+test unixfont-2.6 {TkpGetFontFromAttributes: fallback to fixed family} {x11 failsOnUbuntu} {
     lindex [font actual {-family fixed -size 10}] 1
 } {fixed}
 test unixfont-2.7 {TkpGetFontFromAttributes: fixed family not available!} x11 {
     # no test available
 } {}
-test unixfont-2.8 {TkpGetFontFromAttributes: loop over returned font names} x11 {
+test unixfont-2.8 {TkpGetFontFromAttributes: loop over returned font names} {x11 failsOnUbuntu} {
     lindex [font actual {-family fixed -size 31}] 1
 } {fixed}
-test unixfont-2.9 {TkpGetFontFromAttributes: reject adobe courier if possible} {x11 noExceed} {
+test unixfont-2.9 {TkpGetFontFromAttributes: reject adobe courier if possible} {x11 noExceed failsOnUbuntu} {
     lindex [font actual {-family courier}] 1
 } {courier}
 test unixfont-2.10 {TkpGetFontFromAttributes: scalable font found} x11 {
@@ -166,11 +168,11 @@ test unixfont-5.7 {Tk_MeasureChars procedure: already saw space in line} x11 {
     .b.l config -text "000000     00000"
     getsize
 } "[expr $ax*6] [expr $ay*2]"
-test unixfont-5.8 {Tk_MeasureChars procedure: internal spaces significant} x11 {
+test unixfont-5.8 {Tk_MeasureChars procedure: internal spaces significant} {x11 failsOnUbuntu} {
     .b.l config -text "00  000     00000"
     getsize
 } "[expr $ax*7] [expr $ay*2]"
-test unixfont-5.9 {Tk_MeasureChars procedure: TK_PARTIAL_OK} x11 {
+test unixfont-5.9 {Tk_MeasureChars procedure: TK_PARTIAL_OK} {x11 failsOnUbuntu} {
     .b.c dchars $t 0 end
     .b.c insert $t 0 "0000"
     .b.c index $t @[expr int($ax*2.5)],1
@@ -186,7 +188,7 @@ test unixfont-5.11 {Tk_MeasureChars: TK_AT_LEAST_ONE + not even one char fit!} x
     .b.l config -wrap $a
     set x
 } "$ax [expr $ay*6]"
-test unixfont-5.12 {Tk_MeasureChars procedure: include eol spaces} x11 {
+test unixfont-5.12 {Tk_MeasureChars procedure: include eol spaces} {x11 failsOnUbuntu} {
     .b.l config -text "000   \n000"
     getsize
 } "[expr $ax*6] [expr $ay*2]"
@@ -253,7 +255,7 @@ test unixfont-8.3 {AllocFont procedure: can't parse info from name} x11 {
     catch {unset fontArray}
     set result
 } {-family -overstrike -size -slant -underline -weight}
-test unixfont-8.4 {AllocFont procedure: classify characters} x11 {
+test unixfont-8.4 {AllocFont procedure: classify characters} {x11 failsOnUbuntu} {
     set x 0
     incr x [font measure $courier "\u4000"]   ;# 6
     incr x [font measure $courier "\002"]   ;# 4
@@ -264,7 +266,7 @@ test unixfont-8.4 {AllocFont procedure: classify characters} x11 {
 test unixfont-8.5 {AllocFont procedure: setup widths of normal chars} x11 {
     font metrics $courier -fixed
 } {1}
-test unixfont-8.6 {AllocFont procedure: setup widths of special chars} x11 {
+test unixfont-8.6 {AllocFont procedure: setup widths of special chars} {x11 failsOnUbuntu} {
     set x 0
     incr x [font measure $courier "\001"]   ;# 4
     incr x [font measure $courier "\002"]   ;# 4
@@ -292,7 +294,7 @@ test unixfont-8.11 {AllocFont procedure: XA_UNDERLINE_POSITION was 0} x11 {
     set x {}
 } {}
 
-test unixfont-9.1 {GetControlCharSubst procedure: 2 chars subst} x11 {
+test unixfont-9.1 {GetControlCharSubst procedure: 2 chars subst} {x11 failsOnUbuntu} {
     .b.c dchars $t 0 end
     .b.c insert $t 0 "0\a0"
     set x {}
@@ -301,7 +303,7 @@ test unixfont-9.1 {GetControlCharSubst procedure: 2 chars subst} x11 {
     lappend x [.b.c index $t @[expr $ax*2],0]
     lappend x [.b.c index $t @[expr $ax*3],0]
 } {0 1 1 2}
-test unixfont-9.2 {GetControlCharSubst procedure: 4 chars subst} x11 {
+test unixfont-9.2 {GetControlCharSubst procedure: 4 chars subst} {x11 failsOnUbuntu} {
     .b.c dchars $t 0 end
     .b.c insert $t 0 "0\0010"
     set x {}
diff --git a/tests/unixWm.test b/tests/unixWm.test
index 10050de..bdca89b 100644
--- a/tests/unixWm.test
+++ b/tests/unixWm.test
@@ -13,6 +13,8 @@ tcltest::loadTestedCommands
 
 namespace import -force ::tk::test:loadTkCommand
 
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+
 proc sleep ms {
     global x
     after $ms {set x 1}
@@ -287,7 +289,7 @@ test unixWm-8.3 {icon windows} unix {
     toplevel .t -width 100 -height 30
     list [catch {wm iconwindow .t b c} msg] $msg
 } {1 {wrong # args: should be "wm iconwindow window ?pathName?"}}
-test unixWm-8.4 {icon windows} unix {
+test unixWm-8.4 {icon windows} {unix failsOnUbuntu} {
     destroy .t
     destroy .icon
     toplevel .t -width 100 -height 30
@@ -632,7 +634,7 @@ test unixWm-16.2 {Tk_WmCmd procedure, "deiconify" option} unix {
     destroy .icon
     set result
 } {1 {can't deiconify .icon: it is an icon for .t}}
-test unixWm-16.3 {Tk_WmCmd procedure, "deiconify" option} unix {
+test unixWm-16.3 {Tk_WmCmd procedure, "deiconify" option} {unix failsOnUbuntu} {
     wm iconify .t
     set result {}
     lappend result [winfo ismapped .t] [wm state .t]
@@ -851,7 +853,7 @@ test unixWm-23.4 {Tk_WmCmd procedure, "iconify" option} unix {
     destroy .t2
     set result
 } {1 {can't iconify .t2: it is an icon for .t}}
-test unixWm-23.5 {Tk_WmCmd procedure, "iconify" option} unix {
+test unixWm-23.5 {Tk_WmCmd procedure, "iconify" option} {unix failsOnUbuntu} {
     destroy .t2
     toplevel .t2
     wm geom .t2 +0+0
@@ -862,7 +864,7 @@ test unixWm-23.5 {Tk_WmCmd procedure, "iconify" option} unix {
     destroy .t2
     set result
 } {0}
-test unixWm-23.6 {Tk_WmCmd procedure, "iconify" option} unix {
+test unixWm-23.6 {Tk_WmCmd procedure, "iconify" option} {unix failsOnUbuntu} {
     destroy .t2
     toplevel .t2
     wm geom .t2 -0+0
@@ -1433,7 +1435,7 @@ test unixWm-41.4 {ConfigureEvent procedure, synthesized Configure events} unix {
 # No tests for ReparentEvent or ComputeReparentGeometry; I can't figure
 # out how to exercise these procedures reliably.
 
-test unixWm-42.1 {WrapperEventProc procedure, map and unmap events} unix {
+test unixWm-42.1 {WrapperEventProc procedure, map and unmap events} {unix failsOnUbuntu} {
     destroy .t
     toplevel .t -width 400 -height 150
     wm geometry .t +0+0
@@ -1610,7 +1612,7 @@ test unixWm-45.1 {UpdateSizeHints procedure, grid information} {unix testwrapper
 	    [expr [lindex $property 7]] [expr [lindex $property 8]] \
 	    [expr [lindex $property 9]] [expr [lindex $property 10]]
 } {40 30 320 210 10 5}
-test unixWm-45.2 {UpdateSizeHints procedure} {unix testwrapper} {
+test unixWm-45.2 {UpdateSizeHints procedure} {unix testwrapper failsOnUbuntu} {
     destroy .t
     toplevel .t -width 80 -height 60
     wm minsize .t 30 40
@@ -1638,7 +1640,7 @@ test unixWm-45.3 {UpdateSizeHints procedure, grid with menu} {testmenubar testwr
 	    [expr [lindex $property 7]] [expr [lindex $property 8]] \
 	    [expr [lindex $property 9]] [expr [lindex $property 10]]
 } {60 40 53 320 233 10 5}
-test unixWm-45.4 {UpdateSizeHints procedure, not resizable with menu} {testmenubar testwrapper} {
+test unixWm-45.4 {UpdateSizeHints procedure, not resizable with menu} {testmenubar testwrapper failsOnUbuntu} {
     destroy .t
     toplevel .t -width 80 -height 60
     frame .t.menu -height 23 -width 50
@@ -1792,7 +1794,7 @@ if {[tk windowingsystem] == "aqua"} {
     # Windows are assumed to have a border (invisible in Gnome 3).
     set result_50_1 {{} {} .t {} .t2 {} .t2 {} .t}
 }
-test unixWm-50.1 {Tk_CoordsToWindow procedure, finding a toplevel, x-coords, title bar} unix {
+test unixWm-50.1 {Tk_CoordsToWindow procedure, finding a toplevel, x-coords, title bar} {unix failsOnUbuntu} {
     update
     toplevel .t -width 300 -height 400 -bg green
     wm geom .t +100+100
@@ -1957,7 +1959,7 @@ test unixWm-50.8 {Tk_CoordsToWindow procedure, more basics} unix {
 	    [winfo containing [expr $x + 350] $y] \
 	    [winfo containing [expr $x + 450] $y]
 } {.t .t.f .t.f.f .t {}}
-test unixWm-50.9 {Tk_CoordsToWindow procedure, unmapped windows} unix {
+test unixWm-50.9 {Tk_CoordsToWindow procedure, unmapped windows} {unix failsOnUbuntu} {
     destroy .t
     destroy .t2
     toplevel .t -width 200 -height 200 -bg green
diff --git a/tests/visual_bb.test b/tests/visual_bb.test
index 2b06d05..030a369 100644
--- a/tests/visual_bb.test
+++ b/tests/visual_bb.test
@@ -52,7 +52,7 @@ test 1.1 {running visual tests} -constraints userInteraction -body {
     frame .menu -relief raised -borderwidth 1
     message .msg -font {Times 18} -relief raised -width 4i \
         -borderwidth 1 -text "This application provides a collection of visual tests for the Tk toolkit.  Each menu entry invokes a test, which displays information on the screen.  You can then verify visually that the information is being displayed in the correct way.  The tests under the \"Postscript\" menu exercise the Postscript-generation capabilities of canvas widgets."
-   
+
     pack .menu -side top -fill x
     pack .msg -side bottom -expand yes -fill both
 
@@ -64,7 +64,7 @@ test 1.1 {running visual tests} -constraints userInteraction -body {
     menubutton .menu.file -text "File" -menu .menu.file.m
     menu .menu.file.m
     .menu.file.m add command -label "Quit" -command end
-   
+
     menubutton .menu.group1 -text "Group 1" -menu .menu.group1.m
     menu .menu.group1.m
     .menu.group1.m add command -label "Canvas arcs" -command {runTest arc.tcl}
@@ -76,7 +76,7 @@ test 1.1 {running visual tests} -constraints userInteraction -body {
         -command {runTest butGeom.tcl}
     .menu.group1.m add command -label "Label/button colors" \
         -command {runTest butGeom2.tcl}
-   
+
     menubutton .menu.ps -text "Canvas Postscript" -menu .menu.ps.m
     menu .menu.ps.m
     .menu.ps.m add command -label "Rectangles and other graphics" \
@@ -89,11 +89,11 @@ test 1.1 {running visual tests} -constraints userInteraction -body {
         -command {runTest canvPsImg.tcl}
     .menu.ps.m add command -label "Arcs" \
         -command {runTest canvPsArc.tcl}
-   
+
     pack .menu.file .menu.group1 .menu.ps -side left -padx 1m
-   
+
     # Set up for keyboard-based menu traversal
-   
+
     bind . <Any-FocusIn> {
     if {("%d" == "NotifyVirtual") && ("%m" == "NotifyNormal")} {
         focus .menu
diff --git a/tests/winDialog.test b/tests/winDialog.test
index 852a38a..e70ae3f 100755
--- a/tests/winDialog.test
+++ b/tests/winDialog.test
@@ -255,7 +255,7 @@ test winDialog-5.5 {GetFileName: Tcl_GetIndexFromObj() == TCL_OK} -constraints {
     set y [then {
         Click cancel
     }]
-    # Note this also tests fix for 
+    # Note this also tests fix for
     # https://core.tcl-lang.org/tk/tktview/4a0451f5291b3c9168cc560747dae9264e1d2ef6
     # $x is expected to be empty
     append x $y
@@ -441,7 +441,7 @@ test winDialog-5.9 {GetFileName: file types} -constraints {
     nt testwinevent
 } -body {
     #        case FILE_TYPES:
-    
+
     start {tk_getSaveFile -filetypes {{"foo files" .foo FOOF}} -title Foo}
     # XXX - currently disabled for vista style dialogs because the file
     # types control has no control ID and we don't have a mechanism to
@@ -504,7 +504,7 @@ test winDialog-5.12.1 {tk_getSaveFile: initial directory: ~} -constraints {
 test winDialog-5.12.2 {tk_getSaveFile: initial directory: ~user} -constraints {
     nt testwinevent
 } -body {
-    
+
     # Note: this test will fail on Tcl versions 8.6.4 and earlier due
     # to a bug in file normalize for names of the form ~xxx that
     # returns the wrong dir on Windows.  In particular (in Win8 at
@@ -731,7 +731,7 @@ test winDialog-5.17 {GetFileName: title} -constraints {
     nt testwinevent
 } -body {
 #        case FILE_TITLE:
-   
+
     start {tk_getOpenFile -title Narf}
     then {
         Click cancel
@@ -794,7 +794,7 @@ test winDialog-5.21 {GetFileName: call GetOpenFileName} -constraints {
     nt testwinevent english
 } -body {
 #        winCode = GetOpenFileName(&ofn);
-   
+
     start {tk_getOpenFile -title Open}
     then {
         set x [GetText ok]
@@ -927,7 +927,7 @@ test winDialog-9.8 {Tk_ChooseDirectoryObjCmd: initial directory: Tcl_TranslateFi
 } -body {
 #        if (Tcl_TranslateFileName(interp, string,
 #            &utfDirString) == NULL)
-   
+
     tk_chooseDirectory -initialdir ~12x/455
 } -returnCodes error -result {user "12x" doesn't exist}
 
diff --git a/tests/winFont.test b/tests/winFont.test
index 377ef41..4a394cf 100644
--- a/tests/winFont.test
+++ b/tests/winFont.test
@@ -4,7 +4,7 @@
 # Many of these tests are visually oriented and cannot be checked
 # programmatically (such as "does an underlined font appear to be
 # underlined?"); these tests attempt to exercise the code in question,
-# but there are no results that can be checked. 
+# but there are no results that can be checked.
 #
 # Copyright (c) 1996-1997 Sun Microsystems, Inc.
 # Copyright (c) 1998-1999 by Scriptics Corporation.
@@ -141,7 +141,7 @@ test winfont-5.1 {Tk_MeasureChars procedure: unbounded right margin} -constraint
     update
     set ax [winfo reqwidth .t.l]
     set ay [winfo reqheight .t.l]
-   
+
     .t.l config -wrap 0 -text "000000"
     list [expr {[winfo reqwidth .t.l] eq 6*$ax}] \
         [expr {[winfo reqheight .t.l] eq $ay}]
@@ -160,7 +160,7 @@ test winfont-5.2 {Tk_MeasureChars procedure: static width buffer exceeded} -cons
     update
     set ax [winfo reqwidth .t.l]
     set ay [winfo reqheight .t.l]
-   
+
     .t.l config -wrap 100000 -text "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     list [expr {[winfo reqwidth .t.l] eq 256*$ax}] \
         [expr {[winfo reqheight .t.l] eq $ay}]
@@ -179,7 +179,7 @@ test winfont-5.3 {Tk_MeasureChars procedure: all chars did fit} -constraints {
     update
     set ax [winfo reqwidth .t.l]
     set ay [winfo reqheight .t.l]
-   
+
     .t.l config -wrap [expr {$ax*10}] -text "00000000"
     list [expr {[winfo reqwidth .t.l] eq 8*$ax}] \
         [expr {[winfo reqheight .t.l] eq $ay}]
@@ -198,7 +198,7 @@ test winfont-5.4 {Tk_MeasureChars procedure: not all chars fit} -constraints {
     update
     set ax [winfo reqwidth .t.l]
     set ay [winfo reqheight .t.l]
-   
+
     .t.l config -wrap [expr {$ax*6}] -text "00000000"
     list [expr {[winfo reqwidth .t.l] eq 6*$ax}] \
         [expr {[winfo reqheight .t.l] eq 2*$ay}]
@@ -234,7 +234,7 @@ test winfont-5.6 {Tk_MeasureChars procedure: at least one char on line} -constra
     update
     set ax [winfo reqwidth .t.l]
     set ay [winfo reqheight .t.l]
-   
+
     .t.l config -text "000000" -wrap 1
     list [expr {[winfo reqwidth .t.l] eq $ax}] \
         [expr {[winfo reqheight .t.l] eq 6*$ay}]
@@ -253,7 +253,7 @@ test winfont-5.7 {Tk_MeasureChars procedure: whole words} -constraints {
     update
     set ax [winfo reqwidth .t.l]
     set ay [winfo reqheight .t.l]
-   
+
     .t.l config -wrap [expr {$ax*8}] -text "000000 0000"
     list [expr {[winfo reqwidth .t.l] eq 6*$ax}] \
         [expr {[winfo reqheight .t.l] eq 2*$ay}]
@@ -272,7 +272,7 @@ test winfont-5.8 {Tk_MeasureChars procedure: already saw space in line} -constra
     update
     set ax [winfo reqwidth .t.l]
     set ay [winfo reqheight .t.l]
-   
+
     .t.l config -wrap [expr {$ax*12}] -text "000000    0000000"
     list [expr {[winfo reqwidth .t.l] eq 7*$ax}] \
         [expr {[winfo reqheight .t.l] eq 2*$ay}]
@@ -291,7 +291,7 @@ test winfont-5.9 {Tk_MeasureChars procedure: internal spaces significant} -const
     update
     set ax [winfo reqwidth .t.l]
     set ay [winfo reqheight .t.l]
-   
+
     .t.l config -wrap [expr {$ax*12}] -text "000  00   00000"
     list [expr {[winfo reqwidth .t.l] eq 7*$ax}] \
         [expr {[winfo reqheight .t.l] eq 2*$ay}]
@@ -310,7 +310,7 @@ test winfont-5.10 {Tk_MeasureChars procedure: make first part of word fit} -cons
     update
     set ax [winfo reqwidth .t.l]
     set ay [winfo reqheight .t.l]
-   
+
     .t.l config -wrap [expr {$ax*12}] -text "0000000000000000"
     list [expr {[winfo reqwidth .t.l] eq 12*$ax}] \
         [expr {[winfo reqheight .t.l] eq 2*$ay}]
@@ -327,7 +327,7 @@ test winfont-5.11 {Tk_MeasureChars procedure: check for kerning} -constraints {
         -text "0" -font systemfixed
     pack .t.l
     update
-   
+
     set font [.t.l cget -font]
     .t.l config -font {{MS Sans Serif} 8} -text "W"
     set width [winfo reqwidth .t.l]
diff --git a/tests/winMenu.test b/tests/winMenu.test
index ce2069f..b77e9a9 100644
--- a/tests/winMenu.test
+++ b/tests/winMenu.test
@@ -481,7 +481,7 @@ test winMenu-11.3 {TkWinHandleMenuEvent - WM_COMMAND} -constraints {
 "error 1"
     (menu invoke)}} {} {}}
 
-   
+
 # Can't test WM_MENUCHAR
 
 test winMenu-11.4 {TkWinHandleMenuEvent - WM_MEASUREITEM} -constraints {
@@ -788,7 +788,7 @@ test winMenu-22.1 {DrawMenuUnderline} -constraints win -setup {
     .m1 add command -label foo -underline 0
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
-} -result {{} {}}  
+} -result {{} {}}
 
 
 test winMenu-23.1 {Don't know how to test MenuKeyBindProc} -constraints {
@@ -1343,7 +1343,7 @@ test winMenu-32.19 {TkpComputeStandardMenuGeometry - three columns} -constraints
     .m1 add command -label four
     .m1 add command -label five -columnbreak 1
     .m1 add command -label six
-    list [update idletasks] [destroy .m1]   
+    list [update idletasks] [destroy .m1]
 } -result {{} {}}
 
 
diff --git a/tests/winfo.test b/tests/winfo.test
index 49a92a6..51be80d 100644
--- a/tests/winfo.test
+++ b/tests/winfo.test
@@ -11,6 +11,8 @@ namespace import ::tcltest::*
 tcltest::configure {*}$argv
 tcltest::loadTestedCommands
 
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+
 # eatColors --
 # Creates a toplevel window and allocates enough colors in it to
 # use up all the slots in the colormap.
@@ -291,7 +293,7 @@ test winfo-9.2 {"winfo viewable" command} -body {
 test winfo-9.3 {"winfo viewable" command} -body {
     winfo viewable .
 } -result {1}
-test winfo-9.4 {"winfo viewable" command} -body {
+test winfo-9.4 {"winfo viewable" command} -constraints failsOnUbuntu -body {
     wm iconify .
     winfo viewable .
 } -cleanup {
@@ -320,7 +322,7 @@ test winfo-9.6 {"winfo viewable" command} -setup {
 } -cleanup {
     deleteWindows
 } -result {0 0}
-test winfo-9.7 {"winfo viewable" command} -setup {
+test winfo-9.7 {"winfo viewable" command} -constraints failsOnUbuntu -setup {
     deleteWindows
 } -body {
     frame .f1 -width 100 -height 100 -relief raised -bd 2
diff --git a/tests/wm.test b/tests/wm.test
index faf34af..1bf56da 100644
--- a/tests/wm.test
+++ b/tests/wm.test
@@ -1527,7 +1527,7 @@ test wm-stackorder-5.1 {a menu is not a toplevel} -body {
     destroy .t
 } -result {.t .}
 test wm-stackorder-5.2 {A normal toplevel can't be raised above an \
-    overrideredirect toplevel on unix} -constraints x11 -body {
+    overrideredirect toplevel on unix} -constraints {x11 failsOnUbuntu} -body {
     toplevel .t
     tkwait visibility .t
     wm overrideredirect .t 1
@@ -1726,7 +1726,7 @@ test wm-transient-3.3 {withdraw/deiconify on the toplevel
 } -result {withdrawn 0 normal 1}
 
 test wm-transient-4.1 {transient toplevel is withdrawn
-        when mapped if toplevel is iconic} -body {
+        when mapped if toplevel is iconic} -constraints failsOnUbuntu -body {
     toplevel .top
     wm iconify .top
     update
@@ -1738,7 +1738,7 @@ test wm-transient-4.1 {transient toplevel is withdrawn
     deleteWindows
 } -result {withdrawn 0}
 test wm-transient-4.2 {already mapped transient toplevel
-        is withdrawn if toplevel is iconic} -body {
+        is withdrawn if toplevel is iconic} -constraints failsOnUbuntu -body {
     toplevel .top
     raiseDelay
     wm iconify .top
-- 
cgit v0.12


From 503a19674de8e800cc0e79b6f893a68664235c89 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 29 Sep 2020 14:12:12 +0000
Subject: Use direct unicode characters in stead of escape sequences

---
 library/msgs/da.msg | 30 +++++++++++++++---------------
 library/msgs/de.msg |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/library/msgs/da.msg b/library/msgs/da.msg
index c302c79..282f919 100644
--- a/library/msgs/da.msg
+++ b/library/msgs/da.msg
@@ -3,11 +3,11 @@ namespace eval ::tk {
     ::msgcat::mcset da "&About..." "&Om..."
     ::msgcat::mcset da "All Files" "Alle filer"
     ::msgcat::mcset da "Application Error" "Programfejl"
-    ::msgcat::mcset da "&Blue" "&Bl\u00E5"
+    ::msgcat::mcset da "&Blue" "&Blå"
     ::msgcat::mcset da "Cancel" "Annuller"
     ::msgcat::mcset da "&Cancel" "&Annuller"
     ::msgcat::mcset da "Cannot change to the directory \"%1\$s\".\nPermission denied." "Kan ikke skifte til katalog \"%1\$s\".\nIngen rettigheder."
-    ::msgcat::mcset da "Choose Directory" "V\u00E6lg katalog"
+    ::msgcat::mcset da "Choose Directory" "Vælg katalog"
     ::msgcat::mcset da "Cl&ear" "&Ryd"
     ::msgcat::mcset da "&Clear Console" "&Ryd konsolen"
     ::msgcat::mcset da "Color" "Farve"
@@ -31,8 +31,8 @@ namespace eval ::tk {
     ::msgcat::mcset da "Fi&les:" "Fi&ler:"
     ::msgcat::mcset da "&Filter"
     ::msgcat::mcset da "Fil&ter:"
-    ::msgcat::mcset da "&Green" "&Gr\u00F8n"
-    ::msgcat::mcset da "&Help" "&Hj\u00E6lp"
+    ::msgcat::mcset da "&Green" "&Grøn"
+    ::msgcat::mcset da "&Help" "&Hjælp"
     ::msgcat::mcset da "Hi" "Hej"
     ::msgcat::mcset da "&Hide Console" "Skjul &konsol"
     ::msgcat::mcset da "&Ignore" "&Ignorer"
@@ -42,37 +42,37 @@ namespace eval ::tk {
     ::msgcat::mcset da "&OK" "&O.K."
     ::msgcat::mcset da "OK" "O.K."
     ::msgcat::mcset da "Ok"
-    ::msgcat::mcset da "Open" "\u00C5bn"
-    ::msgcat::mcset da "&Open" "&\u00C5bn"
-    ::msgcat::mcset da "Open Multiple Files" "\u00C5bn flere filer"
-    ::msgcat::mcset da "P&aste" "&Inds\u00E6t"
+    ::msgcat::mcset da "Open" "Åbn"
+    ::msgcat::mcset da "&Open" "&Åbn"
+    ::msgcat::mcset da "Open Multiple Files" "Åbn flere filer"
+    ::msgcat::mcset da "P&aste" "&Indsæt"
     ::msgcat::mcset da "&Quit" "&Afslut"
-    ::msgcat::mcset da "&Red" "&R\u00F8d"
+    ::msgcat::mcset da "&Red" "&Rød"
     ::msgcat::mcset da "Replace existing file?" "Erstat eksisterende fil?"
     ::msgcat::mcset da "&Retry" "&Gentag"
     ::msgcat::mcset da "&Save" "&Gem"
     ::msgcat::mcset da "Save As" "Gem som"
     ::msgcat::mcset da "Save To Log" "Gem i log"
-    ::msgcat::mcset da "Select Log File" "V\u00E6lg logfil"
-    ::msgcat::mcset da "Select a file to source" "V\u00E6lg k\u00F8rbar fil"
+    ::msgcat::mcset da "Select Log File" "Vælg logfil"
+    ::msgcat::mcset da "Select a file to source" "Vælg kørbar fil"
     ::msgcat::mcset da "&Selection:" "&Udvalg:"
     ::msgcat::mcset da "Show &Hidden Directories" "Vis &skjulte kataloger"
     ::msgcat::mcset da "Show &Hidden Files and Directories" "Vis &skjulte filer og kataloger"
     ::msgcat::mcset da "Skip Messages" "Overspring beskeder"
-    ::msgcat::mcset da "&Source..." "&K\u00F8r..."
+    ::msgcat::mcset da "&Source..." "&Kør..."
     ::msgcat::mcset da "Tcl Scripts" "Tcl-Skripter"
     ::msgcat::mcset da "Tcl for Windows" "Tcl for Windows"
     ::msgcat::mcset da "Text Files" "Tekstfiler"
     ::msgcat::mcset da "&Yes" "&Ja"
     ::msgcat::mcset da "abort" "afbryd"
-    ::msgcat::mcset da "blue" "bl\u00E5"
+    ::msgcat::mcset da "blue" "blå"
     ::msgcat::mcset da "cancel" "afbryd"
     ::msgcat::mcset da "extension"
     ::msgcat::mcset da "extensions"
-    ::msgcat::mcset da "green" "gr\u00F8n"
+    ::msgcat::mcset da "green" "grøn"
     ::msgcat::mcset da "ignore" "ignorer"
     ::msgcat::mcset da "ok"
-    ::msgcat::mcset da "red" "r\u00F8d"
+    ::msgcat::mcset da "red" "rød"
     ::msgcat::mcset da "retry" "gentag"
     ::msgcat::mcset da "yes" "ja"
 }
diff --git a/library/msgs/de.msg b/library/msgs/de.msg
index 6dee507..2cf25d2 100644
--- a/library/msgs/de.msg
+++ b/library/msgs/de.msg
@@ -52,7 +52,7 @@ namespace eval ::tk {
     ::msgcat::mcset de "Ok"
     ::msgcat::mcset de "Open" "Öffnen"
     ::msgcat::mcset de "&Open" "Ö&ffnen"
-    ::msgcat::mcset de "Open Multiple Files" "Mehrere Dateien \u00F6ffnen"
+    ::msgcat::mcset de "Open Multiple Files" "Mehrere Dateien Öffnen"
     ::msgcat::mcset de "P&aste" "E&infügen"
     ::msgcat::mcset de "&Quit" "&Beenden"
     ::msgcat::mcset de "&Red" "&Rot"
-- 
cgit v0.12


From b9c54e9e7e755df631f2b4ad860dc1ecc67279fd Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 29 Sep 2020 14:53:00 +0000
Subject: Use \x escape sequences in stead of \u when appropriate

---
 ChangeLog.2004          |  2 +-
 library/demos/widget    | 11 +++++----
 tests/bind.test         |  2 +-
 tests/text.test         |  2 +-
 tests/textIndex.test    |  8 +++---
 tests/unixSelect.test   | 66 ++++++++++++++++++++++++-------------------------
 tests/winClipboard.test |  4 +--
 tests/winDialog.test    |  4 +--
 tests/winMsgbox.test    |  4 +--
 9 files changed, 52 insertions(+), 51 deletions(-)

diff --git a/ChangeLog.2004 b/ChangeLog.2004
index b900e7b..9afaa75 100644
--- a/ChangeLog.2004
+++ b/ChangeLog.2004
@@ -3521,7 +3521,7 @@
 2003-02-13  Kevin Kenny	 <kennykb@users.sourceforge.net>
 
 	* doc/wish.n: Added language to describe the handling of the
-	end-of-file character \u001a in script files. [Bug 685505]
+	end-of-file character \x1A in script files. [Bug 685505]
 
 2003-02-10  Jim Ingham <jingham@apple.com>
 
diff --git a/library/demos/widget b/library/demos/widget
index e543846..58da12f 100644
--- a/library/demos/widget
+++ b/library/demos/widget
@@ -516,7 +516,7 @@ proc invoke index {
     .t configure -cursor [::ttk::cursor busy]
     update
     set demo [string range [lindex $tags $i] 5 end]
-    uplevel 1 [list source [file join $tk_demoDirectory $demo.tcl]]
+    uplevel 1 [list source -encoding utf-8 [file join $tk_demoDirectory $demo.tcl]]
     update
     .t configure -cursor $cursor
 
@@ -624,6 +624,7 @@ proc showCode w {
     wm title $top [mc "Demo code: %s" [file join $tk_demoDirectory $file]]
     wm iconname $top $file
     set id [open [file join $tk_demoDirectory $file]]
+    fconfigure $id -encoding utf-8 -eofchar \032
     $top.f.text delete 1.0 end
     $top.f.text insert 1.0 [read $id]
     $top.f.text mark set insert 1.0
@@ -722,10 +723,10 @@ proc PrintTextWin32 {filename} {
 proc tkAboutDialog {} {
     tk_messageBox -icon info -type ok -title [mc "About Widget Demo"] \
 	    -message [mc "Tk widget demonstration application"] -detail \
-"[mc "Copyright \u00a9 %s" {1996-1997 Sun Microsystems, Inc.}]
-[mc "Copyright \u00a9 %s" {1997-2000 Ajuba Solutions, Inc.}]
-[mc "Copyright \u00a9 %s" {2001-2009 Donal K. Fellows}]
-[mc "Copyright \u00a9 %s" {2002-2007 Daniel A. Steffen}]"
+"[mc "Copyright \xA9 %s" {1996-1997 Sun Microsystems, Inc.}]
+[mc "Copyright \xA9 %s" {1997-2000 Ajuba Solutions, Inc.}]
+[mc "Copyright \xA9 %s" {2001-2009 Donal K. Fellows}]
+[mc "Copyright \xA9 %s" {2002-2007 Daniel A. Steffen}]"
 }
 
 # Local Variables:
diff --git a/tests/bind.test b/tests/bind.test
index c96720a..152fe3e 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -2048,7 +2048,7 @@ test bind-16.35 {ExpandPercents procedure} -constraints {
     set x
 } -cleanup {
     destroy .t.f
-} -result {a A {	} {\r} {{}} {{}} { } {\$} \\\{ {{}} {{}} \u00e9}
+} -result {a A {	} {\r} {{}} {{}} { } {\$} \\\{ {{}} {{}} \xE9}
 test bind-16.36 {ExpandPercents procedure} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
diff --git a/tests/text.test b/tests/text.test
index b3e10bc..d830dc2 100644
--- a/tests/text.test
+++ b/tests/text.test
@@ -5824,7 +5824,7 @@ test text-22.217.1 {elide up to match, with UTF-8 chars before the match} -setup
 } -body {
     .t tag configure e -elide 0
     .t insert end A {} xyz e bb\n
-    .t insert end \u00c4 {} xyz e bb
+    .t insert end \xC4 {} xyz e bb
     set res {}
     lappend res [.t search bb 1.0 "1.0 lineend"]
     lappend res [.t search bb 2.0 "2.0 lineend"]
diff --git a/tests/textIndex.test b/tests/textIndex.test
index 99a70d6..656542c 100644
--- a/tests/textIndex.test
+++ b/tests/textIndex.test
@@ -871,7 +871,7 @@ test textIndex-21.9 {text index wordend} {
     text_test_word worde "x.y" end-1
 } 2
 test textIndex-21.10 {text index wordend, unicode} {
-    text_test_word wordend "xyz\u00c7de fg" 0
+    text_test_word wordend "xyz\xC7de fg" 0
 } 6
 test textIndex-21.11 {text index wordend, unicode} {
     text_test_word wordend "xyz\uc700de fg" 0
@@ -905,7 +905,7 @@ test textIndex-22.10 {text index wordstart} {
     text_test_word wordstart "one two three" end-5
 } 7
 test textIndex-22.11 {text index wordstart, unicode} {
-    text_test_word wordstart "one tw\u00c7o three" 7
+    text_test_word wordstart "one tw\xC7o three" 7
 } 4
 test textIndex-22.12 {text index wordstart, unicode} {
     text_test_word wordstart "ab\uc700\uc700 cdef ghi" 12
@@ -916,8 +916,8 @@ test textIndex-22.13 {text index wordstart, unicode} {
 test textIndex-22.14 {text index wordstart, unicode, start index at internal segment start} {
     catch {destroy .t}
     text .t
-    .t insert end "C'est du texte en fran\u00e7ais\n"
-    .t insert end "\u042D\u0442\u043E\u0020\u0442\u0435\u043A\u0441\u0442\u0020\u043D\u0430\u0020\u0440\u0443\u0441\u0441\u043A\u043E\u043C"
+    .t insert end "C'est du texte en fran\xE7ais\n"
+    .t insert end "\u042D\u0442\u043E \u0442\u0435\u043A\u0441\u0442 \u043D\u0430 \u0440\u0443\u0441\u0441\u043A\u043E\u043C"
     .t mark set insert 1.23
     set res [.t index "1.23 wordstart"]
     .t mark set insert 2.16
diff --git a/tests/unixSelect.test b/tests/unixSelect.test
index d3da806..9bb90cb 100644
--- a/tests/unixSelect.test
+++ b/tests/unixSelect.test
@@ -115,7 +115,7 @@ test unixSelect-1.1 {TkSelGetSelection procedure: simple i18n text} -constraints
 } -body {
     pack [entry .e]
     update
-    .e insert 0 \u00fcber
+    .e insert 0 \xFCber
     .e selection range 0 end
     dobg {string length [selection get]}
 } -cleanup {
@@ -131,13 +131,13 @@ test unixSelect-1.2 {TkSelGetSelection procedure: simple i18n text, iso8859-1} -
     dobg {
         pack [entry .e]
         update
-        .e insert 0 \u00fc\u0444
+        .e insert 0 \xFC\u0444
         .e selection range 0 end
     }
     selection get
 } -cleanup {
     cleanupbg
-} -result \u00fc?
+} -result \xFC?
 
 test unixSelect-1.3 {TkSelGetSelection procedure: simple i18n text, iso2022} -constraints {
     x11
@@ -148,11 +148,11 @@ test unixSelect-1.3 {TkSelGetSelection procedure: simple i18n text, iso2022} -co
     selection handle -type COMPOUND_TEXT -format COMPOUND_TEXT . \
         {handler COMPOUND_TEXT}
     selection own .
-    set selValue \u00fc\u0444
+    set selValue \xFC\u0444
     set selInfo {}
     set result [dobg {
         set x [selection get -type COMPOUND_TEXT]
-        list [string equal \u00fc\u0444 $x] [string length $x]
+        list [string equal \xFC\u0444 $x] [string length $x]
     }]
     lappend result $selInfo
 } -cleanup {
@@ -172,12 +172,12 @@ test unixSelect-1.4 {TkSelGetSelection procedure: INCR i18n text, iso2022} -cons
     selection handle -type COMPOUND_TEXT -format COMPOUND_TEXT . \
         {handler COMPOUND_TEXT}
     selection own .
-    set selValue [string repeat x 3999]\u00fc\u0444[string repeat x 3999]
+    set selValue [string repeat x 3999]\xFC\u0444[string repeat x 3999]
     set selInfo {}
     set result [dobg {
         set x [selection get -type COMPOUND_TEXT]
         list [string equal \
-            [string repeat x 3999]\u00fc\u0444[string repeat x 3999] $x] \
+            [string repeat x 3999]\xFC\u0444[string repeat x 3999] $x] \
             [string length $x]
     }]
     lappend result $selInfo
@@ -194,11 +194,11 @@ test unixSelect-1.5 {TkSelGetSelection procedure: simple i18n text, iso2022} -co
     selection handle -type COMPOUND_TEXT -format COMPOUND_TEXT . \
         {handler COMPOUND_TEXT}
     selection own .
-    set selValue \u00fc\u0444
+    set selValue \xFC\u0444
     set selInfo {}
     set result [dobg {
         set x [selection get -type COMPOUND_TEXT]
-        list [string equal \u00fc\u0444 $x] [string length $x]
+        list [string equal \xFC\u0444 $x] [string length $x]
     }]
     lappend result $selInfo
 } -cleanup {
@@ -211,7 +211,7 @@ test unixSelect-1.6 {TkSelGetSelection procedure: INCR i18n text} -constraints {
     setupbg
 } -body {
     dobg [subst -nobackslashes {entry .e; pack .e; update
-    .e insert 0 \u00fcber$longValue
+    .e insert 0 \xFCber$longValue
     .e selection range 0 end}]
     string length [selection get]
 } -cleanup {
@@ -226,13 +226,13 @@ test unixSelect-1.7 {TkSelGetSelection procedure: INCR i18n text} -constraints {
     dobg {
         pack [entry .e]
         update
-        .e insert 0 [string repeat x 3999]\u00fc
+        .e insert 0 [string repeat x 3999]\xFC
         .e selection range 0 end
     }
     selection get
 } -cleanup {
     cleanupbg
-} -result [string repeat x 3999]\u00fc
+} -result [string repeat x 3999]\xFC
 
 test unixSelect-1.8 {TkSelGetSelection procedure: INCR i18n text} -constraints {
     x11
@@ -242,13 +242,13 @@ test unixSelect-1.8 {TkSelGetSelection procedure: INCR i18n text} -constraints {
     dobg {
         pack [entry .e]
         update
-        .e insert 0 \u00fc[string repeat x 3999]
+        .e insert 0 \xFC[string repeat x 3999]
         .e selection range 0 end
     }
     selection get
 } -cleanup {
     cleanupbg
-} -result \u00fc[string repeat x 3999]
+} -result \xFC[string repeat x 3999]
 
 test unixSelect-1.9 {TkSelGetSelection procedure: INCR i18n text} -constraints {
     x11
@@ -258,13 +258,13 @@ test unixSelect-1.9 {TkSelGetSelection procedure: INCR i18n text} -constraints {
     dobg {
         pack [entry .e]
         update
-        .e insert 0 [string repeat x 3999]\u00fc[string repeat x 4000]
+        .e insert 0 [string repeat x 3999]\xFC[string repeat x 4000]
         .e selection range 0 end
     }
     selection get
 } -cleanup {
     cleanupbg
-} -result [string repeat x 3999]\u00fc[string repeat x 4000]
+} -result [string repeat x 3999]\xFC[string repeat x 4000]
 # Now some tests to make sure that the right thing is done when
 # transferring UTF8 selections, to prevent [Bug 614650] and its ilk
 # from rearing its ugly head again.
@@ -277,13 +277,13 @@ test unixSelect-1.10 {TkSelGetSelection procedure: INCR i18n text, utf-8} -const
     dobg {
         pack [entry .e]
         update
-        .e insert 0 [string repeat x 3999]\u00fc
+        .e insert 0 [string repeat x 3999]\xFC
         .e selection range 0 end
     }
     selection get -type UTF8_STRING
 } -cleanup {
     cleanupbg
-} -result [string repeat x 3999]\u00fc
+} -result [string repeat x 3999]\xFC
 
 test unixSelect-1.11 {TkSelGetSelection procedure: INCR i18n text, utf-8} -constraints {
     x11
@@ -293,13 +293,13 @@ test unixSelect-1.11 {TkSelGetSelection procedure: INCR i18n text, utf-8} -const
     dobg {
         pack [entry .e]
         update
-        .e insert 0 \u00fc[string repeat x 3999]
+        .e insert 0 \xFC[string repeat x 3999]
         .e selection range 0 end
     }
     selection get -type UTF8_STRING
 } -cleanup {
     cleanupbg
-} -result \u00fc[string repeat x 3999]
+} -result \xFC[string repeat x 3999]
 
 test unixSelect-1.12 {TkSelGetSelection procedure: INCR i18n text, utf-8} -constraints {
     x11
@@ -309,13 +309,13 @@ test unixSelect-1.12 {TkSelGetSelection procedure: INCR i18n text, utf-8} -const
     dobg {
         pack [entry .e]
         update
-        .e insert 0 [string repeat x 3999]\u00fc[string repeat x 4000]
+        .e insert 0 [string repeat x 3999]\xFC[string repeat x 4000]
         .e selection range 0 end
     }
     selection get -type UTF8_STRING
 } -cleanup {
     cleanupbg
-} -result [string repeat x 3999]\u00fc[string repeat x 4000]
+} -result [string repeat x 3999]\xFC[string repeat x 4000]
 
 test unixSelect-1.13 {TkSelGetSelection procedure: simple i18n text, utf-8} -constraints {
     x11
@@ -325,7 +325,7 @@ test unixSelect-1.13 {TkSelGetSelection procedure: simple i18n text, utf-8} -con
 } -body {
     pack [entry .e]
     update
-    .e insert 0 \u00fcber\u0444
+    .e insert 0 \xFCber\u0444
     .e selection range 0 end
     dobg {string length [selection get -type UTF8_STRING]}
 } -cleanup {
@@ -341,13 +341,13 @@ test unixSelect-1.14 {TkSelGetSelection procedure: simple i18n text, utf-8} -con
     dobg {
         pack [entry .e]
         update
-        .e insert 0 \u00fc\u0444
+        .e insert 0 \xFC\u0444
         .e selection range 0 end
     }
     selection get -type UTF8_STRING
 } -cleanup {
     cleanupbg
-} -result \u00fc\u0444
+} -result \xFC\u0444
 
 test unixSelect-1.15 {TkSelGetSelection procedure: INCR i18n text, utf-8} -constraints {
     x11
@@ -357,13 +357,13 @@ test unixSelect-1.15 {TkSelGetSelection procedure: INCR i18n text, utf-8} -const
     dobg {
         pack [entry .e]
         update
-        .e insert 0 [string repeat [string repeat \u00c4\u00e4 50]\n 21]
+        .e insert 0 [string repeat [string repeat \xC4\xE4 50]\n 21]
         .e selection range 0 end
     }
     selection get -type UTF8_STRING
 } -cleanup {
     cleanupbg
-} -result [string repeat [string repeat \u00c4\u00e4 50]\n 21]
+} -result [string repeat [string repeat \xC4\xE4 50]\n 21]
 
 test unixSelect-1.16 {TkSelGetSelection procedure: INCR i18n text, utf-8} -constraints {
     x11
@@ -373,13 +373,13 @@ test unixSelect-1.16 {TkSelGetSelection procedure: INCR i18n text, utf-8} -const
     dobg {
         pack [entry .e]
         update
-        .e insert 0 i[string repeat [string repeat \u00c4\u00e4 50]\n 21]
+        .e insert 0 i[string repeat [string repeat \xC4\xE4 50]\n 21]
         .e selection range 0 end
     }
     selection get -type UTF8_STRING
 } -cleanup {
     cleanupbg
-} -result i[string repeat [string repeat \u00c4\u00e4 50]\n 21]
+} -result i[string repeat [string repeat \xC4\xE4 50]\n 21]
 
 test unixSelect-1.17 {TkSelGetSelection procedure: INCR i18n text, utf-8} -constraints {
     x11
@@ -389,7 +389,7 @@ test unixSelect-1.17 {TkSelGetSelection procedure: INCR i18n text, utf-8} -const
     dobg {
         pack [text .t]
         update
-        .t insert 1.0 [string repeat [string repeat \u00c4\u00e4 50]\n 21]
+        .t insert 1.0 [string repeat [string repeat \xC4\xE4 50]\n 21]
         # Has to be selected in a separate stage
         .t tag add sel 1.0 21.end+1c
     }
@@ -397,7 +397,7 @@ test unixSelect-1.17 {TkSelGetSelection procedure: INCR i18n text, utf-8} -const
     selection get -type UTF8_STRING
 } -cleanup {
     cleanupbg
-} -result [string repeat [string repeat \u00c4\u00e4 50]\n 21]
+} -result [string repeat [string repeat \xC4\xE4 50]\n 21]
 
 test unixSelect-1.18 {TkSelGetSelection procedure: INCR i18n text, utf-8} -constraints {
     x11
@@ -407,7 +407,7 @@ test unixSelect-1.18 {TkSelGetSelection procedure: INCR i18n text, utf-8} -const
     dobg {
         pack [text .t]
         update
-        .t insert 1.0 i[string repeat [string repeat \u00c4\u00e4 50]\n 21]
+        .t insert 1.0 i[string repeat [string repeat \xC4\xE4 50]\n 21]
         # Has to be selected in a separate stage
         .t tag add sel 1.0 21.end+1c
     }
@@ -415,7 +415,7 @@ test unixSelect-1.18 {TkSelGetSelection procedure: INCR i18n text, utf-8} -const
     selection get -type UTF8_STRING
 } -cleanup {
     cleanupbg
-} -result i[string repeat [string repeat \u00c4\u00e4 50]\n 21]
+} -result i[string repeat [string repeat \xC4\xE4 50]\n 21]
 
 test unixSelect-1.19 {Automatic UTF8_STRING support for selection handle} -constraints {
     unix
diff --git a/tests/winClipboard.test b/tests/winClipboard.test
index 2f72966..45bf484 100644
--- a/tests/winClipboard.test
+++ b/tests/winClipboard.test
@@ -70,12 +70,12 @@ test winClipboard-1.5 {TkSelGetSelection & TkWinClipboardRender} -constraints {
     clipboard clear
 } -body {
     set map [list "\r" "\\r" "\n" "\\n"]
-    clipboard append "line 1\u00c7\nline 2"
+    clipboard append "line 1\xC7\nline 2"
     list [string map $map [selection get -selection CLIPBOARD]]\
         [string map $map [testclipboard]]
 } -cleanup {
     clipboard clear
-} -result [list "line 1\u00c7\\nline 2" "line 1\u00c7\\nline 2"]
+} -result [list "line 1\xC7\\nline 2" "line 1\xC7\\nline 2"]
 
 test winClipboard-1.6 {TkSelGetSelection & TkWinClipboardRender} -constraints {
     win testclipboard
diff --git a/tests/winDialog.test b/tests/winDialog.test
index 280d69e..abb3a8e 100755
--- a/tests/winDialog.test
+++ b/tests/winDialog.test
@@ -545,7 +545,7 @@ test winDialog-5.12.3 {tk_getSaveFile: initial directory: .} -constraints {
 test winDialog-5.12.4 {tk_getSaveFile: initial directory: unicode} -constraints {
     nt testwinevent
 } -body {
-    set dir [tcltest::makeDirectory "\u0167\u00e9\u015d\u0167"]
+    set dir [tcltest::makeDirectory "\u0167\xE9\u015d\u0167"]
     unset -nocomplain x
     start {set x [tk_getSaveFile \
                       -initialdir $dir \
@@ -631,7 +631,7 @@ test winDialog-5.12.8 {tk_getOpenFile: initial directory: .} -constraints {
 test winDialog-5.12.9 {tk_getOpenFile: initial directory: unicode} -constraints {
     nt testwinevent
 } -body {
-    set dir [tcltest::makeDirectory "\u0167\u00e9\u015d\u0167"]
+    set dir [tcltest::makeDirectory "\u0167\xE9\u015d\u0167"]
     set path [tcltest::makeFile "" testfile $dir]
     unset -nocomplain x
     start {set x [tk_getOpenFile \
diff --git a/tests/winMsgbox.test b/tests/winMsgbox.test
index 0181103..447a2f6 100644
--- a/tests/winMsgbox.test
+++ b/tests/winMsgbox.test
@@ -224,14 +224,14 @@ test winMsgbox-2.3 {tk_messageBox message (unicode)} -constraints {
 } -body {
     global windowInfo
     set title "winMsgbox-2.2 [pid]"
-    set message "\u041f\u043e\u0438\u0441\u043a\u0020\u0441\u0442\u0440\u0430\u043d\u0438\u0446"
+    set message "\u041f\u043e\u0438\u0441\u043a \u0441\u0442\u0440\u0430\u043d\u0438\u0446"
     after 100 [list GetWindowInfo $title 2]
     set r [tk_messageBox -type ok -title $title -message $message]
     array set info $windowInfo
     lappend r $info(childtext)
 } -cleanup {
     wm deiconify .
-} -result [list ok "\u041f\u043e\u0438\u0441\u043a\u0020\u0441\u0442\u0440\u0430\u043d\u0438\u0446"]
+} -result [list ok "\u041f\u043e\u0438\u0441\u043a \u0441\u0442\u0440\u0430\u043d\u0438\u0446"]
 
 test winMsgbox-2.4 {tk_messageBox message (empty)} -constraints {
     win getwindowinfo
-- 
cgit v0.12


From ce0c027625867ef8a707a520b19fe1e053774a93 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 29 Sep 2020 15:04:04 +0000
Subject: Tk demo, taking advantage of TIP #587

---
 library/demos/bind.tcl        | 12 +++++------
 library/demos/goldberg.tcl    |  8 +++----
 library/demos/knightstour.tcl |  6 +++---
 library/demos/pendulum.tcl    |  4 ++--
 library/demos/toolbar.tcl     |  2 +-
 library/demos/ttkbut.tcl      |  2 +-
 library/demos/ttkprogress.tcl |  2 +-
 library/demos/unicodeout.tcl  | 49 +++++++++++++------------------------------
 8 files changed, 33 insertions(+), 52 deletions(-)

diff --git a/library/demos/bind.tcl b/library/demos/bind.tcl
index 9146362..8b56639 100644
--- a/library/demos/bind.tcl
+++ b/library/demos/bind.tcl
@@ -67,12 +67,12 @@ foreach tag {d1 d2 d3 d4 d5 d6} {
     $w.text tag bind $tag <Leave> "$w.text tag configure $tag $normal"
 }
 # Main widget program sets variable tk_demoDirectory
-$w.text tag bind d1 <Button-1> {source [file join $tk_demoDirectory items.tcl]}
-$w.text tag bind d2 <Button-1> {source [file join $tk_demoDirectory plot.tcl]}
-$w.text tag bind d3 <Button-1> {source [file join $tk_demoDirectory ctext.tcl]}
-$w.text tag bind d4 <Button-1> {source [file join $tk_demoDirectory arrow.tcl]}
-$w.text tag bind d5 <Button-1> {source [file join $tk_demoDirectory ruler.tcl]}
-$w.text tag bind d6 <Button-1> {source [file join $tk_demoDirectory cscroll.tcl]}
+$w.text tag bind d1 <Button-1> {source -encoding utf-8 [file join $tk_demoDirectory items.tcl]}
+$w.text tag bind d2 <Button-1> {source -encoding utf-8 [file join $tk_demoDirectory plot.tcl]}
+$w.text tag bind d3 <Button-1> {source -encoding utf-8 [file join $tk_demoDirectory ctext.tcl]}
+$w.text tag bind d4 <Button-1> {source -encoding utf-8 [file join $tk_demoDirectory arrow.tcl]}
+$w.text tag bind d5 <Button-1> {source -encoding utf-8 [file join $tk_demoDirectory ruler.tcl]}
+$w.text tag bind d6 <Button-1> {source -encoding utf-8 [file join $tk_demoDirectory cscroll.tcl]}
 
 $w.text mark set insert 0.0
 $w.text configure -state disabled
diff --git a/library/demos/goldberg.tcl b/library/demos/goldberg.tcl
index 1cc52c6..14ddb0b 100644
--- a/library/demos/goldberg.tcl
+++ b/library/demos/goldberg.tcl
@@ -113,9 +113,9 @@ proc DoDisplay {w} {
     DoCtrlFrame $w
     DoDetailFrame $w
     if {[tk windowingsystem] ne "aqua"} {
-	ttk::button $w.show -text "\u00bb" -command [list ShowCtrl $w] -width 2
+	ttk::button $w.show -text "»" -command [list ShowCtrl $w] -width 2
     } else {
-	button $w.show -text "\u00bb" -command [list ShowCtrl $w] -width 2 -highlightbackground $C(bg)
+	button $w.show -text "»" -command [list ShowCtrl $w] -width 2 -highlightbackground $C(bg)
     }
     place $w.show -in $w.c -relx 1 -rely 0 -anchor ne
     update
@@ -204,10 +204,10 @@ proc DoDetailFrame {w} {
 proc ShowCtrl {w} {
     if {[winfo ismapped $w.ctrl]} {
 	pack forget $w.ctrl
-	$w.show config -text "\u00bb"
+	$w.show config -text "»"
     } else {
 	pack $w.ctrl -side right -fill both -ipady 5
-	$w.show config -text "\u00ab"
+	$w.show config -text "»"
     }
 }
 
diff --git a/library/demos/knightstour.tcl b/library/demos/knightstour.tcl
index 11b3b5c..09ceff0 100644
--- a/library/demos/knightstour.tcl
+++ b/library/demos/knightstour.tcl
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Pat Thoyts <patthoyts@users.sourceforge.net>
+# Copyright © 2008 Pat Thoyts <patthoyts@users.sourceforge.net>
 #
 #	Calculate a Knight's tour of a chessboard.
 #
@@ -205,10 +205,10 @@ proc CreateGUI {} {
     }
     if {[tk windowingsystem] ne "x11"} {
         catch {eval font create KnightFont -size -24}
-        $c create text 0 0 -font KnightFont -text "\u265e" \
+        $c create text 0 0 -font KnightFont -text "♞" \
             -anchor nw -tags knight -fill black -activefill "#600000"
     } else {
-        # On X11 we cannot reliably tell if the \u265e glyph is available
+        # On X11 we cannot reliably tell if the ♞ glyph is available
         # so just use a polygon
         set pts {
             2 25   24 25  21 19   20 8   14 0   10 0   0 13   0 16
diff --git a/library/demos/pendulum.tcl b/library/demos/pendulum.tcl
index 9833e8f..04f276b 100644
--- a/library/demos/pendulum.tcl
+++ b/library/demos/pendulum.tcl
@@ -50,8 +50,8 @@ for {set i 90} {$i>=0} {incr i -10} {
     $w.k create line 0 0 1 1 -smooth true -tags graph$i -fill grey$i
 }
 
-$w.k create text 0 0 -anchor ne -text "\u03b8" -tags label_theta
-$w.k create text 0 0 -anchor ne -text "\u03b4\u03b8" -tags label_dtheta
+$w.k create text 0 0 -anchor ne -text "θ" -tags label_theta
+$w.k create text 0 0 -anchor ne -text "δθ" -tags label_dtheta
 pack $w.k -in $w.p.l2 -fill both -expand true
 
 # Initialize some variables
diff --git a/library/demos/toolbar.tcl b/library/demos/toolbar.tcl
index cb2a495..a53e390 100644
--- a/library/demos/toolbar.tcl
+++ b/library/demos/toolbar.tcl
@@ -17,7 +17,7 @@ positionWindow $w
 
 ttk::label $w.msg -wraplength 4i -text "This is a demonstration of how to do\
 	a toolbar that is styled correctly and which can be torn off. The\
-	buttons are configured to be \u201Ctoolbar style\u201D buttons by\
+	buttons are configured to be “toolbar style” buttons by\
 	telling them that they are to use the Toolbutton style. At the left\
 	end of the toolbar is a simple marker that the cursor changes to a\
 	movement icon over; drag that away from the toolbar to tear off the\
diff --git a/library/demos/ttkbut.tcl b/library/demos/ttkbut.tcl
index ab49cf4..f6d94ac 100644
--- a/library/demos/ttkbut.tcl
+++ b/library/demos/ttkbut.tcl
@@ -17,7 +17,7 @@ wm title $w "Simple Ttk Widgets"
 wm iconname $w "ttkbut"
 positionWindow $w
 
-ttk::label $w.msg -font $font -wraplength 4i -justify left -text "Ttk is the new Tk themed widget set. This is a Ttk themed label, and below are three groups of Ttk widgets in Ttk labelframes. The first group are all buttons that set the current application theme when pressed. The second group contains three sets of checkbuttons, with a separator widget between the sets. Note that the \u201cEnabled\u201d button controls whether all the other themed widgets in this toplevel are in the disabled state. The third group has a collection of linked radiobuttons."
+ttk::label $w.msg -font $font -wraplength 4i -justify left -text "Ttk is the new Tk themed widget set. This is a Ttk themed label, and below are three groups of Ttk widgets in Ttk labelframes. The first group are all buttons that set the current application theme when pressed. The second group contains three sets of checkbuttons, with a separator widget between the sets. Note that the “Enabled” button controls whether all the other themed widgets in this toplevel are in the disabled state. The third group has a collection of linked radiobuttons."
 pack $w.msg -side top -fill x
 
 ## See Code / Dismiss
diff --git a/library/demos/ttkprogress.tcl b/library/demos/ttkprogress.tcl
index 8a72cf9..29ac508 100644
--- a/library/demos/ttkprogress.tcl
+++ b/library/demos/ttkprogress.tcl
@@ -15,7 +15,7 @@ wm title $w "Progress Bar Demonstration"
 wm iconname $w "ttkprogress"
 positionWindow $w
 
-ttk::label $w.msg -font $font -wraplength 4i -justify left -text "Below are two progress bars. The top one is a \u201Cdeterminate\u201D progress bar, which is used for showing how far through a defined task the program has got. The bottom one is an \u201Cindeterminate\u201D progress bar, which is used to show that the program is busy but does not know how long for. Both are run here in self-animated mode, which can be turned on and off using the buttons underneath."
+ttk::label $w.msg -font $font -wraplength 4i -justify left -text "Below are two progress bars. The top one is a “determinate” progress bar, which is used for showing how far through a defined task the program has got. The bottom one is an “indeterminate” progress bar, which is used to show that the program is busy but does not know how long for. Both are run here in self-animated mode, which can be turned on and off using the buttons underneath."
 pack $w.msg -side top -fill x
 
 ## See Code / Dismiss buttons
diff --git a/library/demos/unicodeout.tcl b/library/demos/unicodeout.tcl
index ca325a4..9e7180c 100644
--- a/library/demos/unicodeout.tcl
+++ b/library/demos/unicodeout.tcl
@@ -21,9 +21,7 @@ label $w.msg -font $font -wraplength 4i -anchor w -justify left \
 	non-Western character sets.  However, what you will actually see\
 	below depends largely on what character sets you have installed,\
 	and what you see for characters that are not present varies greatly\
-	between platforms as well.  The strings are written in Tcl using\
-	UNICODE characters using the \\uXXXX (or \\UXXXXXX) escape so as to\
-	do so in a portable fashion."
+	between platforms as well."
 pack $w.msg -side top
 
 ## See Code / Dismiss buttons
@@ -98,47 +96,30 @@ update
 ## Add the samples...
 if {[usePresentationFormsFor Arabic]} {
     # Using presentation forms (pre-layouted)
-    addSample $w Arabic \
-	    "\uFE94\uFEF4\uFE91\uFEAE\uFECC\uFEDF\uFE8D " \
-	    "\uFE94\uFEE4\uFEE0\uFEDC\uFEDF\uFE8D"
+    addSample $w Arabic "ﺔﻴﺑﺮﻌﻟﺍ ﺔﻤﻠﻜﻟﺍ"
 } else {
     # Using standard text characters
-    addSample $w Arabic \
-	    "\u0627\u0644\u0643\u0644\u0645\u0629 " \
-	    "\u0627\u0644\u0639\u0631\u0628\u064A\u0629"
+    addSample $w Arabic "الكلمة العربية"
 }
-addSample $w "Trad. Chinese"  "\u4E2D\u570B\u7684\u6F22\u5B57"
-addSample $w "Simpl. Chinese" "\u6C49\u8BED"
-addSample $w French "Langue fran\xE7aise"
+addSample $w "Trad. Chinese"  "中國的漢字"
+addSample $w "Simpl. Chinese" "汉语"
+addSample $w French "Langue française"
 addSample $w Greek \
-	"\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AE " \
-	"\u03B3\u03BB\u03CE\u03C3\u03C3\u03B1"
+	"Ελληνική γλώσσα"
 if {[usePresentationFormsFor Hebrew]} {
     # Visual order (pre-layouted)
-    addSample $w Hebrew \
-	    "\u05EA\u05D9\u05E8\u05D1\u05E2 \u05D1\u05EA\u05DB"
+    addSample $w Hebrew "תירבע בתכ"
 } else {
     # Standard logical order
-    addSample $w Hebrew \
-	    "\u05DB\u05EA\u05D1 \u05E2\u05D1\u05E8\u05D9\u05EA"
+    addSample $w Hebrew "כתב עברית"
 }
-addSample $w Hindi \
-    "\u0939\u093F\u0928\u094D\u0926\u0940 \u092D\u093E\u0937\u093E"
-addSample $w Icelandic "\xCDslenska"
-addSample $w Japanese \
-	"\u65E5\u672C\u8A9E\u306E\u3072\u3089\u304C\u306A, " \
-	"\u6F22\u5B57\u3068\u30AB\u30BF\u30AB\u30CA"
-addSample $w Korean "\uB300\uD55C\uBBFC\uAD6D\uC758 \uD55C\uAE00"
-addSample $w Russian \
-	"\u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A"
+addSample $w Hindi "हिन्दी भाषा"
+addSample $w Icelandic "Íslenska"
+addSample $w Japanese "日本語のひらがな, 漢字とカタカナ"
+addSample $w Korean "대한민국의 한글"
+addSample $w Russian "Русский язык"
 if {([tk windowingsystem] ne "x11") || (![catch {tk::pkgconfig get fontsystem} fs] && ($fs eq "xft"))} {
-    if {[package vsatisfies [package provide Tcl] 8.7-]} {
-	addSample $w Emoji \
-		"\U1F600\U1F4A9\U1F44D\U1F1F3\U1F1F1"
-    } else {
-	addSample $w Emoji \
-		"\uD83D\uDE00\uD83D\uDCA9\uD83D\uDC4D\uD83C\uDDF3\uD83C\uDDF1"
-    }
+    addSample $w Emoji "😀💩👍🇳🇱"
 }
 
 ## We're done processing, so change things back to normal running...
-- 
cgit v0.12


From 272678ee37956bea49401b322ec32afd4fcc4753 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 29 Sep 2020 15:07:27 +0000
Subject: little tweak

---
 library/demos/unicodeout.tcl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/library/demos/unicodeout.tcl b/library/demos/unicodeout.tcl
index 9e7180c..1ecc064 100644
--- a/library/demos/unicodeout.tcl
+++ b/library/demos/unicodeout.tcl
@@ -104,8 +104,7 @@ if {[usePresentationFormsFor Arabic]} {
 addSample $w "Trad. Chinese"  "中國的漢字"
 addSample $w "Simpl. Chinese" "汉语"
 addSample $w French "Langue française"
-addSample $w Greek \
-	"Ελληνική γλώσσα"
+addSample $w Greek "Ελληνική γλώσσα"
 if {[usePresentationFormsFor Hebrew]} {
     # Visual order (pre-layouted)
     addSample $w Hebrew "תירבע בתכ"
-- 
cgit v0.12


From 381d1e050c4e92292956bbcd87b46a7631a4b568 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Tue, 29 Sep 2020 21:15:34 +0000
Subject: Fix [0008d6a6b3]: Mouse pointer position reported in non-existing
 window

---
 generic/tkCmds.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/generic/tkCmds.c b/generic/tkCmds.c
index 193c3d6..f782144 100644
--- a/generic/tkCmds.c
+++ b/generic/tkCmds.c
@@ -1623,7 +1623,12 @@ Tk_WinfoObjCmd(
 	}
 	tkwin = Tk_CoordsToWindow(x, y, tkwin);
 	if (tkwin != NULL) {
-	    Tcl_SetObjResult(interp, Tcl_NewStringObj(Tk_PathName(tkwin),-1));
+            string = Tk_PathName(tkwin);
+            winPtr = (TkWindow *) Tk_NameToWindow(interp, string, tkwin);
+            Tcl_ResetResult(interp);
+            if (winPtr && !(winPtr->flags & TK_ALREADY_DEAD)) {
+                Tcl_SetObjResult(interp, Tcl_NewStringObj(string, -1));
+            }
 	}
 	break;
     case WIN_INTERPS:
-- 
cgit v0.12


From e883cc84772de84b5cbb175808ecad82d5112a04 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 30 Sep 2020 09:45:02 +0000
Subject: Fix safe-1.2 testcase when running Tcl version < 8.6.7 (That's when
 tcl:encoding:dirs became hidden)

---
 tests/safe.test | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/safe.test b/tests/safe.test
index 5a2cd26..3a3b029 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -35,7 +35,10 @@ namespace import -force tcltest::test
 
 set hidden_cmds [list bell cd clipboard encoding exec exit \
 	fconfigure glob grab load menu open pwd selection \
-	socket source tcl:encoding:dirs toplevel unload wm]
+	socket source toplevel unload wm]
+if {[package vsatisfies [package provide Tcl] 8.6.7-]} {
+    lappend hidden_cmds tcl:encoding:dirs 
+}
 if {[package vsatisfies [package provide Tcl] 8.7-]} {
     lappend hidden_cmds file tcl:encoding:system tcl:file:tempdir
     foreach cmd {
-- 
cgit v0.12


From 2cfcf649ca494a8a1a8b733fa9fbe9b033d7dfdd Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 30 Sep 2020 10:30:45 +0000
Subject: Mark 10 testcases with failsOnUbuntuNoXft. They fail on Ubuntu if Tk
 is compiled with --disable-xft

---
 tests/entry.test       |   5 +-
 tests/font.test        | 433 +++++++++++++++++++++++++------------------------
 tests/fontchooser.test |   5 +-
 tests/spinbox.test     |   5 +-
 tests/textTag.test     |   7 +-
 tests/unixFont.test    |   3 +-
 6 files changed, 236 insertions(+), 222 deletions(-)

diff --git a/tests/entry.test b/tests/entry.test
index 0146dbf..f1d61b2 100644
--- a/tests/entry.test
+++ b/tests/entry.test
@@ -11,6 +11,9 @@ namespace import ::tcltest::*
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || ([catch {tk::pkgconfig get fontsystem} fs] || ($fs ne "xft"))}]
+
 # For xscrollcommand
 set scrollInfo {}
 proc scroll args {
@@ -2311,7 +2314,7 @@ test entry-8.17 {DeleteChars procedure} -setup {
 } -cleanup {
     destroy .e
 } -result 4
-test entry-8.18 {DeleteChars procedure} -setup {
+test entry-8.18 {DeleteChars procedure} -constraints failsOnUbuntuNoXft -setup {
     entry .e -width 0 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
diff --git a/tests/font.test b/tests/font.test
index 352139a..0f4c8de 100644
--- a/tests/font.test
+++ b/tests/font.test
@@ -15,6 +15,7 @@ tcltest::loadTestedCommands
 testConstraint fullutf [expr {[format %c 0x010000] != "\uFFFD"}]
 
 testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || ([catch {tk::pkgconfig get fontsystem} fs] || ($fs ne "xft"))}]
 
 set defaultfontlist [font names]
 
@@ -62,9 +63,9 @@ test font-1.1 {TkFontPkgInit} -setup {
 } -body {
     interp create foo
     foo eval {
-		load {} Tk
-		wm geometry . +0+0
-		update
+	load {} Tk
+	wm geometry . +0+0
+	update
     }
     interp delete foo
 } -result {}
@@ -78,25 +79,25 @@ test font-2.1 {TkFontPkgFree} -setup {
 
     # Makes sure that named font was visible only to child interp.
     foo eval {
-		load {} Tk
-		wm geometry . +0+0
-		button .b -font {times 16} -text "hi"
-		pack .b
-		font create wiggles -family courier -underline 1
-		update
+	load {} Tk
+	wm geometry . +0+0
+	button .b -font {times 16} -text "hi"
+	pack .b
+	font create wiggles -family courier -underline 1
+	update
     }
     lappend x [catch {font configure wiggles} msg; set msg]
 
     # Tests cancelling the idle handler for TheWorldHasChanged,
     # because app goes away before idle serviced.
     foo eval {
-		.b config -font wiggles
-		font config wiggles -size 24
-		destroy .
+	.b config -font wiggles
+	font config wiggles -size 24
+	destroy .
     }
     lappend x [foo eval {catch {font families} msg; set msg}]
 } -cleanup {
-        interp delete foo
+    interp delete foo
 } -result {{named font "wiggles" doesn't exist} {can't invoke "font" command: application has been destroyed}}
 
 
@@ -195,7 +196,7 @@ test font-5.4 {font command: configure: get all options} -setup {
     font create xyz -family xyz
     lindex [font configure xyz] 1
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result xyz
 test font-5.5 {font command: configure: get one option} -setup {
     clearnondefaultfonts
@@ -203,9 +204,9 @@ test font-5.5 {font command: configure: get one option} -setup {
     # (objc == 4) so objPtr = objv[3]
     font create xyz -family xyz
     font configure xyz -family
-	getnondefaultfonts
+    getnondefaultfonts
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result xyz
 test font-5.6 {font command: configure: update existing font} -setup {
     catch {font delete xyz}
@@ -216,7 +217,7 @@ test font-5.6 {font command: configure: update existing font} -setup {
     update
     font configure xyz -family
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result xyz
 test font-5.7 {font command: configure: bad option} -setup {
     catch {font delete xyz}
@@ -224,7 +225,7 @@ test font-5.7 {font command: configure: bad option} -setup {
     font create xyz
     font configure xyz -style
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -returnCodes error -result {bad option "-style": must be -family, -size, -weight, -slant, -underline, or -overstrike}
 
 
@@ -244,7 +245,7 @@ test font-6.2 {font command: create: name specified} -setup {
     font create xyz
     getnondefaultfonts
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result {xyz}
 test font-6.3 {font command: create: name not really specified} -setup {
     clearnondefaultfonts
@@ -286,7 +287,7 @@ test font-6.7 {font command: create: already exists} -setup {
     font create xyz
     font create xyz
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -returnCodes error -result {named font "xyz" already exists}
 
 test font-7.1 {font command: delete: arguments} -body {
@@ -295,7 +296,7 @@ test font-7.1 {font command: delete: arguments} -body {
 } -returnCodes error -result {wrong # args: should be "font delete fontname ?fontname ...?"}
 test font-7.2 {font command: delete: loop test} -setup {
     clearnondefaultfonts
-	set x {}
+    set x {}
 } -body {
     # for (i = 2; i < objc; i++)
     font create a -underline 1
@@ -311,7 +312,7 @@ test font-7.2 {font command: delete: loop test} -setup {
 } -result {{a b c d e} d}
 test font-7.3 {font command: delete: loop test} -setup {
     clearnondefaultfonts
-	set x {}
+    set x {}
 } -body {
     # (namedHashPtr == NULL) in middle of loop
     font create a -underline 1
@@ -344,7 +345,7 @@ test font-7.5 {font command: delete: mark for later deletion} -setup {
     font actual xyz
     font configure xyz
 } -cleanup {
-	destroy .t.f
+    destroy .t.f
 } -returnCodes error -result {named font "xyz" doesn't exist}
 test font-7.6 {font command: delete: mark for later deletion} -setup {
     destroy .t.f
@@ -358,7 +359,7 @@ test font-7.6 {font command: delete: mark for later deletion} -setup {
     font delete xyz
     font actual xyz
     catch {font configure xyz}
-	.t.f cget -font
+    .t.f cget -font
 } -cleanup {
 	destroy .t.f
 } -result xyz
@@ -516,7 +517,7 @@ test font-12.1 {UpdateDependantFonts procedure: no users} -setup {
     font create xyz
     font configure xyz -family times
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result {}
 test font-12.2 {UpdateDependantFonts procedure: pings the widgets} -setup {
     destroy .t.f
@@ -535,21 +536,21 @@ test font-12.2 {UpdateDependantFonts procedure: pings the widgets} -setup {
     set b2 [winfo reqwidth .t.f]
     expr {$a1==$b1 && $a2==$b2}
 } -cleanup {
-	destroy .t.f
+    destroy .t.f
     font delete xyz
 } -result {1}
 
 
 test font-13.1 {CreateNamedFont: new named font} -setup {
     catch {font delete xyz}
-	set x {}
+    set x {}
 } -body {
     # not (new == 0)
     lappend x [getnondefaultfonts]
     font create xyz
     lappend x [getnondefaultfonts]
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result {{} xyz}
 test font-13.2 {CreateNamedFont: named font already exists} -setup {
     catch {font delete xyz}
@@ -558,7 +559,7 @@ test font-13.2 {CreateNamedFont: named font already exists} -setup {
     font create xyz
     font create xyz
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -returnCodes error -result {named font "xyz" already exists}
 test font-13.3 {CreateNamedFont: named font already exists} -setup {
     catch {font delete xyz}
@@ -567,7 +568,7 @@ test font-13.3 {CreateNamedFont: named font already exists} -setup {
     font create xyz
     font create xyz
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -returnCodes error -result {named font "xyz" already exists}
 test font-13.4 {CreateNamedFont: recreate "deleted" font} -setup {
     destroy .t.f
@@ -582,8 +583,8 @@ test font-13.4 {CreateNamedFont: recreate "deleted" font} -setup {
     font create xyz -family courier
     font configure xyz -family
 } -cleanup {
-	font delete xyz
-	destroy .t.f
+    font delete xyz
+    destroy .t.f
 } -result {courier}
 
 
@@ -592,7 +593,7 @@ test font-14.1 {Tk_GetFont procedure} -body {
 
 
 test font-15.1 {Tk_AllocFontFromObj - converting internal reps} -constraints {
-	testfont
+    testfont
 } -setup {
     destroy .b1 .b2
 } -body {
@@ -605,7 +606,7 @@ test font-15.1 {Tk_AllocFontFromObj - converting internal reps} -constraints {
     destroy .b1 .b2
 } -result {{1 0}}
 test font-15.2 {Tk_AllocFontFromObj - discard stale font} -constraints {
-	testfont
+    testfont
 } -setup {
     destroy .b1 .b2
     set result {}
@@ -620,7 +621,7 @@ test font-15.2 {Tk_AllocFontFromObj - discard stale font} -constraints {
     destroy .b2
 } -result {{} {{1 1}}}
 test font-15.3 {Tk_AllocFontFromObj - reuse existing font} -constraints {
-	testfont
+    testfont
 } -setup {
     destroy .b1 .b2
     set result {}
@@ -643,7 +644,7 @@ test font-15.4 {Tk_AllocFontFromObj procedure: bump ref count} -setup {
     .t.f config -font {-family fixed}
     lindex [font actual {-family fixed}] 0
 } -cleanup {
-	destroy .t.f
+    destroy .t.f
 } -result {-family}
 test font-15.5 {Tk_AllocFontFromObj procedure: get named font} -setup {
     destroy .t.f
@@ -655,7 +656,7 @@ test font-15.5 {Tk_AllocFontFromObj procedure: get named font} -setup {
     font create xyz
     .t.f config -font xyz
 } -cleanup {
-	destroy .t.f
+    destroy .t.f
     font delete xyz
 } -result {}
 test font-15.6 {Tk_AllocFontFromObj procedure: not a named font} -setup {
@@ -666,7 +667,7 @@ test font-15.6 {Tk_AllocFontFromObj procedure: not a named font} -setup {
     # not (namedHashPtr != NULL)
     .t.f config -font {times 20}
 } -cleanup {
-	destroy .t.f
+    destroy .t.f
 } -result {-family} -result {}
 test font-15.7 {Tk_AllocFontFromObj procedure: get native font} -constraints {
 	unix
@@ -710,7 +711,7 @@ test font-15.11 {Tk_AllocFontFromObj procedure: get attribute font} -body {
     lindex [font actual {plan 9}] 0
 } -result {-family}
 test font-15.12 {Tk_AllocFontFromObj procedure: setup tab width} -setup {
-	destroy .l
+    destroy .l
 } -body {
     # Tk_MeasureChars(fontPtr, "0", ...)
     label .l -bd 0 -padx 0  -highlightthickness 0 -font $fixed -text "a\tb"
@@ -719,7 +720,7 @@ test font-15.12 {Tk_AllocFontFromObj procedure: setup tab width} -setup {
 	set res2 [expr [font measure $fixed "0"]*9]
 	expr {$res1 eq $res2}
 } -cleanup {
-	destroy .l
+    destroy .l
 } -result 1
 test font-15.13 {Tk_AllocFontFromObj procedure: underline position} -setup {
     destroy .t.f
@@ -730,7 +731,7 @@ test font-15.13 {Tk_AllocFontFromObj procedure: underline position} -setup {
     .t.f config -text "underline" -font "times -8 underline"
     update
 } -cleanup {
-	destroy .t.f
+    destroy .t.f
 } -result {}
 
 
@@ -742,7 +743,7 @@ test font-16.1 {Tk_NameOfFont procedure} -setup {
     .t.f config -font -family\ fixed
     .t.f cget -font
 } -cleanup {
-	destroy .t.f
+    destroy .t.f
 } -result {-family fixed}
 
 
@@ -1450,20 +1451,20 @@ test font-21.66 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
 
 
 test font-22.1 {Tk_TextWidth procedure} -setup {
-	destroy .t.l
+    destroy .t.l
 } -body {
-	label .t.l -padx 0 -pady 0 -bd 0 -highlightthickness 0 -justify left \
-		-text "0" -font "Courier -12"
-	pack .t.l
-	set ax [winfo reqwidth .t.l]
+    label .t.l -padx 0 -pady 0 -bd 0 -highlightthickness 0 -justify left \
+	    -text "0" -font "Courier -12"
+    pack .t.l
+    set ax [winfo reqwidth .t.l]
     expr {[font measure [.t.l cget -font] "000"] eq $ax*3}
 } -cleanup {
-	destroy .t.l
+    destroy .t.l
 } -result 1
 
 
 test font-23.1 {Tk_UnderlineChars procedure} -setup {
-	destroy .t.t
+    destroy .t.t
 } -body {
     text .t.t
     .t.t insert 1.0 abc\tdefg
@@ -1471,7 +1472,7 @@ test font-23.1 {Tk_UnderlineChars procedure} -setup {
     .t.t tag add sel 1.0 end
     update
 } -cleanup {
-	destroy .t.t
+    destroy .t.t
 } -result {}
 
 
@@ -1488,27 +1489,27 @@ test font-24.1 {Tk_ComputeTextLayout: empty string} -body {
 } -result {}
 test font-24.2 {Tk_ComputeTextLayout: simple string} -body {
     .t.l config -text "000"
-	update
-	list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 3}]}] \
-		[expr {[winfo reqheight .t.l] eq $ay}]
+    update
+    list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 3}]}] \
+	    [expr {[winfo reqheight .t.l] eq $ay}]
 } -result {1 1}
 test font-24.3 {Tk_ComputeTextLayout: find special chars} -body {
     .t.l config -text "000\n000"
-	update
-	list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 3}]}] \
-		[expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
+    update
+    list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 3}]}] \
+	    [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
 } -result {1 1}
 test font-24.4 {Tk_ComputeTextLayout: calls Tk_MeasureChars} -body {
     .t.l config -text "000\n000"
-	update
-	list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 3}]}] \
-		[expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
+    update
+    list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 3}]}] \
+	    [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
 } -result {1 1}
 test font-24.5 {Tk_ComputeTextLayout: break line} -body {
     .t.l config -text "000\t00000" -wrap [expr 9 * $ax]
-	update
-	list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 8}]}] \
-		[expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
+    update
+    list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 8}]}] \
+	    [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
 } -cleanup {
     .t.l config -wrap 0
 } -result {1 1}
@@ -1517,26 +1518,26 @@ test font-24.6 {Tk_ComputeTextLayout: normal ended on special char} -body {
 } -result {}
 test font-24.7 {Tk_ComputeTextLayout: special char was \n} -body {
     .t.l config -text "000\n0000"
-	update
-	list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 4}]}] \
-		[expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
+    update
+    list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 4}]}] \
+	    [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
 } -result {1 1}
 test font-24.8 {Tk_ComputeTextLayout: special char was \t} -body {
     .t.l config -text "000\t00"
-	update
-	list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 10}]}] \
-		[expr {[winfo reqheight .t.l] eq $ay}]
+    update
+    list [expr {[winfo reqwidth .t.l] eq [expr {$ax * 10}]}] \
+	    [expr {[winfo reqheight .t.l] eq $ay}]
 } -result {1 1}
 test font-24.9 {Tk_ComputeTextLayout: tab didn't cause break} -body {
     set x {}
     .t.l config -text "000\t000"
-	update
+    update
     lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 11}]}]
-	lappend x [expr {[winfo reqheight .t.l] eq $ay}]
+    lappend x [expr {[winfo reqheight .t.l] eq $ay}]
     .t.l config -text "000\t000" -wrap [expr 100 * $ax]
-	update
+    update
     lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 11}]}]
-	lappend x [expr {[winfo reqheight .t.l] eq $ay}]
+    lappend x [expr {[winfo reqheight .t.l] eq $ay}]
     return $x
 } -cleanup {
     .t.l config -wrap 0
@@ -1544,13 +1545,13 @@ test font-24.9 {Tk_ComputeTextLayout: tab didn't cause break} -body {
 test font-24.10 {Tk_ComputeTextLayout: tab caused break} -body {
     set x {}
     .t.l config -text "000\t"
-	update
+    update
     lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 8}]}]
-	lappend x [expr {[winfo reqheight .t.l] eq $ay}]
+    lappend x [expr {[winfo reqheight .t.l] eq $ay}]
     .t.l config -text "000\t00" -wrap [expr $ax * 6]
-	update
-	lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 8}]}]
-	lappend x [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
+    update
+    lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 8}]}]
+    lappend x [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
     return $x
 } -cleanup {
     .t.l config -wrap 0
@@ -1558,13 +1559,13 @@ test font-24.10 {Tk_ComputeTextLayout: tab caused break} -body {
 test font-24.11 {Tk_ComputeTextLayout: absorb spaces at eol} -body {
     set x {}
     .t.l config -text "000            000" -wrap [expr {$ax * 5}]
-	update
-	lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 3}]}]
-	lappend x [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
+    update
+    lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 3}]}]
+    lappend x [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
     .t.l config -text "000            "
-	update
-	lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 3}]}]
-	lappend x [expr {[winfo reqheight .t.l] eq $ay}]
+    update
+    lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 3}]}]
+    lappend x [expr {[winfo reqheight .t.l] eq $ay}]
     return $x
 } -cleanup {
     .t.l config -wrap 0
@@ -1572,44 +1573,44 @@ test font-24.11 {Tk_ComputeTextLayout: absorb spaces at eol} -body {
 test font-24.12 {Tk_ComputeTextLayout: append non-printing spaces to chunk} -body {
     set x {}
     .t.l config -text "000            0000" -wrap [expr {$ax * 5}]
-	update
-	lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 4}]}]
-	lappend x [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
+    update
+    lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 4}]}]
+    lappend x [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
     .t.l config -text "000\t00            0000" -wrap [expr {$ax * 12}]
-	update
-	lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 10}]}]
-	lappend x [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
+    update
+    lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 10}]}]
+    lappend x [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
     return $x
 } -cleanup {
     .t.l config -wrap 0
 } -result {1 1 1 1}
 test font-24.13 {Tk_ComputeTextLayout: many lines -> realloc line array} -body {
     .t.l config -text "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
-	update
-	list [expr {[winfo reqwidth .t.l] eq 1}] \
-		[expr {[winfo reqheight .t.l] eq [expr {$ay * 129}]}]
+    update
+    list [expr {[winfo reqwidth .t.l] eq 1}] \
+	    [expr {[winfo reqheight .t.l] eq [expr {$ay * 129}]}]
 } -result {1 1}
 test font-24.14 {Tk_ComputeTextLayout: text ended with \n} -body {
     set x {}
-	.t.l config -text "0000"
-	update
-	lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 4}]}]
-	lappend x [expr {[winfo reqheight .t.l] eq $ay}]
-	.t.l config -text "0000\n"
-	update
-	lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 4}]}]
-	lappend x [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
-    return $x
+    .t.l config -text "0000"
+    update
+    lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 4}]}]
+    lappend x [expr {[winfo reqheight .t.l] eq $ay}]
+    .t.l config -text "0000\n"
+    update
+    lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 4}]}]
+    lappend x [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
+    set x
 } -result {1 1 1 1}
 destroy .t.l
 
 test font-24.15 {Tk_ComputeTextLayout: justification} -setup {
     set x {}
-	destroy .t.c
-	canvas .t.c -closeenough 0
-	.t.c create text 0 0 -tags text -anchor nw -just left -font "Courier -12"
-	pack .t.c
-	update
+    destroy .t.c
+    canvas .t.c -closeenough 0
+    .t.c create text 0 0 -tags text -anchor nw -just left -font "Courier -12"
+    pack .t.c
+    update
 } -body {
     csetup "000\n00000"
     .t.c itemconfig text -just left
@@ -1621,7 +1622,7 @@ test font-24.15 {Tk_ComputeTextLayout: justification} -setup {
     .t.c itemconfig text -just left
     return $x
 } -cleanup {
-	destroy .t.c
+    destroy .t.c
 } -result {2 1 0}
 
 
@@ -1633,7 +1634,7 @@ test font-25.1 {Tk_FreeTextLayout procedure} -setup {
     .t.f config -text foo
     .t.f config -text boo
 } -cleanup {
-	destroy .t.f
+    destroy .t.f
 } -result {}
 
 
@@ -1650,7 +1651,7 @@ test font-26.1 {Tk_DrawTextLayout procedure: auto-detect last char} -setup {
 } -body {
     .t.f config -text foo
 } -cleanup {
-	destroy .t.f
+    destroy .t.f
 } -result {}
 test font-26.2 {Tk_DrawTextLayout procedure: multiple chunks} -body {
     csetup "000\t00\n000"
@@ -1795,110 +1796,110 @@ pack .t.c
 update
 test font-30.1 {Tk_DistanceToTextLayout procedure: loop once} -body {
     csetup "000\n000\n000"
-	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
+    .t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
     set x {}
     event generate .t.c <Leave>
     event generate .t.c <Enter> -x 0 -y 0
     return $x
 } -cleanup {
-	bind all <Enter> {}
+    bind all <Enter> {}
 } -result {0}
 test font-30.2 {Tk_DistanceToTextLayout procedure: loop multiple} -body {
     csetup "000\n000\n000"
-	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
+    .t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
     set x {}
     event generate .t.c <Leave>
     event generate .t.c <Enter> -x $ax -y $ay
     return $x
 } -cleanup {
-	bind all <Enter> {}
+    bind all <Enter> {}
 } -result {5}
 test font-30.3 {Tk_DistanceToTextLayout procedure: loop to end} -body {
     csetup "000\n0\n000"
-	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
+    .t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
     set x {}
     event generate .t.c <Leave>
     event generate .t.c <Enter> -x [expr $ax*2] -y $ay
     return $x
 } -cleanup {
-	bind all <Enter> {}
+    bind all <Enter> {}
 } -result {}
 test font-30.4 {Tk_DistanceToTextLayout procedure: hit a special char (tab)} -body {
     csetup "000\t000\n000"
-	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
+    .t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
     set x {}
     event generate .t.c <Leave>
     event generate .t.c <Enter> -x [expr $ax*6] -y 0
     return $x
 } -cleanup {
-	bind all <Enter> {}
+    bind all <Enter> {}
 } -result {3}
 test font-30.5 {Tk_DistanceToTextLayout procedure: ignore newline} -body {
     csetup "000\n0\n000"
-	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
+    .t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
     set x {}
     event generate .t.c <Leave>
     event generate .t.c <Enter> -x [expr $ax*2] -y $ay
     return $x
 } -cleanup {
-	bind all <Enter> {}
+    bind all <Enter> {}
 } -result {}
 test font-30.6 {Tk_DistanceToTextLayout procedure: ignore spaces at eol} -body {
     csetup "000\n000      000000000"
     .t.c itemconfig text -width [expr $ax*10]
-	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
+    .t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
     set x {}
     event generate .t.c <Leave>
     event generate .t.c <Enter> -x [expr $ax*5] -y $ay
     .t.c itemconfig text -width 0
     return $x
 } -cleanup {
-	bind all <Enter> {}
+    bind all <Enter> {}
 } -result {}
 .t.c itemconfig text -justify center
 test font-30.7 {Tk_DistanceToTextLayout procedure: on left side} -body {
     csetup "0\n000"
-	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
+    .t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
     set x {}
     event generate .t.c <Leave>
     event generate .t.c <Enter> -x 0 -y 0
     return $x
 } -cleanup {
-	bind all <Enter> {}
+    bind all <Enter> {}
 } -result {}
 test font-30.8 {Tk_DistanceToTextLayout procedure: on right side} -body {
     csetup "0\n000"
-	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
+    .t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
     set x {}
     event generate .t.c <Leave>
     event generate .t.c <Enter> -x [expr $ax*2] -y 0
     return $x
 } -cleanup {
-	bind all <Enter> {}
+    bind all <Enter> {}
 } -result {}
 test font-30.9 {Tk_DistanceToTextLayout procedure: inside line} -body {
     csetup "0\n000"
-	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
+    .t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
     set x {}
     event generate .t.c <Leave>
     event generate .t.c <Enter> -x $ax -y 0
     return $x
 } -cleanup {
-	bind all <Enter> {}
+    bind all <Enter> {}
 } -result {0}
 test font-30.10 {Tk_DistanceToTextLayout procedure: above line} -body {
     csetup "0\n000"
-	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
+    .t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
     set x {}
     event generate .t.c <Leave>
     event generate .t.c <Enter> -x 0 -y 0
     return $x
 } -cleanup {
-	bind all <Enter> {}
+    bind all <Enter> {}
 } -result {}
 test font-30.11 {Tk_DistanceToTextLayout procedure: below line} -body {
     csetup "000\n0"
-	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
+    .t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
     set x {}
     event generate .t.c <Leave>
     event generate .t.c <Enter> -x 0 -y $ay
@@ -1908,7 +1909,7 @@ test font-30.11 {Tk_DistanceToTextLayout procedure: below line} -body {
 } -result {}
 test font-30.12 {Tk_DistanceToTextLayout procedure: in line} -body {
     csetup "0\n000"
-	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
+    .t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
     set x {}
     event generate .t.c <Leave>
     event generate .t.c <Enter> -x $ax -y $ay
@@ -1919,13 +1920,13 @@ test font-30.12 {Tk_DistanceToTextLayout procedure: in line} -body {
 .t.c itemconfig text -justify left
 test font-30.13 {Tk_DistanceToTextLayout procedure: exact hit} -body {
     csetup "000"
-	.t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
+    .t.c bind all <Enter> {lappend x [.t.c index current @%x,%y]}
     set x {}
     event generate .t.c <Leave>
     event generate .t.c <Enter> -x $ax -y 0
     return $x
 } -cleanup {
-	bind all <Enter> {}
+    bind all <Enter> {}
 } -result {1}
 destroy .t.c
 
@@ -1977,11 +1978,11 @@ destroy .t.c
 
 
 test font-32.1 {Tk_TextLayoutToPostscript: ensure buffer doesn't overflow} -setup {
-	destroy .t.c
-	canvas .t.c -closeenough 0
-	.t.c create text 0 0 -tags text -anchor nw -just left -font "Courier -12"
-	pack .t.c
-	update
+    destroy .t.c
+    canvas .t.c -closeenough 0
+    .t.c create text 0 0 -tags text -anchor nw -just left -font "Courier -12"
+    pack .t.c
+    update
 } -body {
     # If there were a whole bunch of returns or tabs in a row, then the
     # temporary buffer could overflow and write on the stack.
@@ -1994,7 +1995,7 @@ test font-32.1 {Tk_TextLayoutToPostscript: ensure buffer doesn't overflow} -setu
     set i [string first "(qwerty" $x]
     string range $x $i [expr {$i + 278}]
 } -cleanup {
-	destroy .t.c
+    destroy .t.c
 } -result {(qwertyuiopasdfghjklzxcvbnm1234qwertyuiopasdfghjklzxcvbnm)]
 [(qwertyuiopasdfghjklzxcvbnm1234qwertyuiopasdfghjklzxcvbnm)]
 [()]
@@ -2052,85 +2053,85 @@ test font-34.2 {ConfigAttributesObj procedure: arguments} -setup {
 
 test font-34.3 {ConfigAttributesObj procedure: family} -setup {
     catch {font delete xyz}
-	set x {}
+    set x {}
 } -body {
-	font create xyz -family xyz
-	lappend x [font config xyz -family]
-	font config xyz -family times
-	lappend x [font config xyz -family]
+    font create xyz -family xyz
+    lappend x [font config xyz -family]
+    font config xyz -family times
+    lappend x [font config xyz -family]
 } -cleanup {
 	font delete xyz
 } -result {xyz times}
 test font-34.4 {ConfigAttributesObj procedure: size} -setup {
     catch {font delete xyz}
-	set x {}
+    set x {}
 } -body {
-	font create xyz -size 20
-	lappend x [font config xyz -size]
-	font config xyz -size 40
-	lappend x [font config xyz -size]
+    font create xyz -size 20
+    lappend x [font config xyz -size]
+    font config xyz -size 40
+    lappend x [font config xyz -size]
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result {20 40}
 test font-34.5 {ConfigAttributesObj procedure: weight} -setup {
     catch {font delete xyz}
-	set x {}
+    set x {}
 } -body {
-	font create xyz -weight normal
-	lappend x [font config xyz -weight]
-	font config xyz -weight bold
-	lappend x [font config xyz -weight]
+    font create xyz -weight normal
+    lappend x [font config xyz -weight]
+    font config xyz -weight bold
+    lappend x [font config xyz -weight]
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result {normal bold}
 test font-34.6 {ConfigAttributesObj procedure: slant} -setup {
     catch {font delete xyz}
-	set x {}
+    set x {}
 } -body {
-	font create xyz -slant roman
-	lappend x [font config xyz -slant]
-	font config xyz -slant italic
-	lappend x [font config xyz -slant]
+    font create xyz -slant roman
+    lappend x [font config xyz -slant]
+    font config xyz -slant italic
+    lappend x [font config xyz -slant]
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result {roman italic}
 test font-34.7 {ConfigAttributesObj procedure: underline} -setup {
     catch {font delete xyz}
-	set x {}
+    set x {}
 } -body {
-	font create xyz -underline 0
-	lappend x [font config xyz -underline]
-	font config xyz -underline 1
-	lappend x [font config xyz -underline]
+    font create xyz -underline 0
+    lappend x [font config xyz -underline]
+    font config xyz -underline 1
+    lappend x [font config xyz -underline]
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result {0 1}
 test font-34.8 {ConfigAttributesObj procedure: overstrike} -setup {
     catch {font delete xyz}
-	set x {}
+    set x {}
 } -body {
-	font create xyz -overstrike 0
-	lappend x [font config xyz -overstrike]
-	font config xyz -overstrike 1
-	lappend x [font config xyz -overstrike]
+    font create xyz -overstrike 0
+    lappend x [font config xyz -overstrike]
+    font config xyz -overstrike 1
+    lappend x [font config xyz -overstrike]
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result {0 1}
 
 test font-34.9 {ConfigAttributesObj procedure: size} -body {
-	font create xyz -size xyz
+    font create xyz -size xyz
 } -returnCodes error -result {expected integer but got "xyz"}
 test font-34.10 {ConfigAttributesObj procedure: weight} -body {
-	font create xyz -weight xyz
+    font create xyz -weight xyz
 } -returnCodes error -result {bad -weight value "xyz": must be normal, or bold}
 test font-34.11 {ConfigAttributesObj procedure: slant} -body {
-	font create xyz -slant xyz
+    font create xyz -slant xyz
 } -returnCodes error -result {bad -slant value "xyz": must be roman, or italic}
 test font-34.12 {ConfigAttributesObj procedure: underline} -body {
-	font create xyz -underline xyz
+    font create xyz -underline xyz
 } -returnCodes error -result {expected boolean value but got "xyz"}
 test font-34.13 {ConfigAttributesObj procedure: overstrike} -body {
-	font create xyz -overstrike xyz
+    font create xyz -overstrike xyz
 } -returnCodes error -result {expected boolean value but got "xyz"}
 
 
@@ -2141,7 +2142,7 @@ test font-35.1 {GetAttributeInfoObj procedure: one attribute} -setup {
     font create xyz -family xyz
     font config xyz -family
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result {xyz}
 
 
@@ -2152,7 +2153,7 @@ test font-36.1 {GetAttributeInfoObj procedure: unknown attribute} -setup {
     font create xyz
     font config xyz -xyz
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -returnCodes {
     error
 } -result {bad option "-xyz": must be -family, -size, -weight, -slant, -underline, or -overstrike}
@@ -2165,60 +2166,60 @@ test font-37.1 {GetAttributeInfoObj procedure: all attributes} -setup {
     font create xyz -family xyz
     font config xyz
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result {-family xyz -size 0 -weight normal -slant roman -underline 0 -overstrike 0}
 test font-37.2 {GetAttributeInfo procedure: family} -setup {
     catch {font delete xyz}
 } -body {
-	font create xyz -family xyz
-	font config xyz -family
+    font create xyz -family xyz
+    font config xyz -family
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result {xyz}
 test font-37.3 {GetAttributeInfo procedure: size} -setup {
     catch {font delete xyz}
-	set x {}
+    set x {}
 } -body {
-	font create xyz -size 20
-	font config xyz -size
+    font create xyz -size 20
+    font config xyz -size
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result {20}
 test font-37.4 {GetAttributeInfo procedure: weight} -setup {
     catch {font delete xyz}
-	set x {}
+    set x {}
 } -body {
-	font create xyz -weight normal
-	font config xyz -weight
+    font create xyz -weight normal
+    font config xyz -weight
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result {normal}
 test font-37.5 {GetAttributeInfo procedure: slant} -setup {
     catch {font delete xyz}
-	set x {}
+    set x {}
 } -body {
-	font create xyz -slant italic
-	font config xyz -slant
+    font create xyz -slant italic
+    font config xyz -slant
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result {italic}
 test font-37.6 {GetAttributeInfo procedure: underline} -setup {
     catch {font delete xyz}
-	set x {}
+    set x {}
 } -body {
-	font create xyz -underline yes
-	font config xyz -underline
+    font create xyz -underline yes
+    font config xyz -underline
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result {1}
 test font-37.7 {GetAttributeInfo procedure: overstrike} -setup {
     catch {font delete xyz}
-	set x {}
+    set x {}
 } -body {
-	font create xyz -overstrike no
-	font config xyz -overstrike
+    font create xyz -overstrike no
+    font config xyz -overstrike
 } -cleanup {
-	font delete xyz
+    font delete xyz
 } -result {0}
 
 
@@ -2257,7 +2258,7 @@ test font-38.10 {ParseFontNameObj procedure: arguments} -body {
     font actual {times xyz xyz}
 } -returnCodes error -result {expected integer but got "xyz"}
 test font-38.11 {ParseFontNameObj procedure: stylelist loop} -constraints {
-	unixOrWin
+	unixOrWin failsOnUbuntuNoXft
 } -body {
     lrange [font actual {times 12 bold italic overstrike underline}] 4 end
 } -result {-weight bold -slant italic -underline 1 -overstrike 1}
@@ -2339,21 +2340,21 @@ test font-43.1 {FieldSpecified procedure: specified vs. non-specified} -body {
 } -result [font actual {times 0} -family]
 
 
-test font-44.1 {TkFontGetPixels: size < 0} -setup {
-	set oldscale [tk scaling]
+test font-44.1 {TkFontGetPixels: size < 0} -constraints failsOnUbuntuNoXft -setup {
+    set oldscale [tk scaling]
 } -body {
-	tk scaling 0.5
+    tk scaling 0.5
     font actual {times -12} -size
 } -cleanup {
-	tk scaling $oldscale
+    tk scaling $oldscale
 } -result {24}
-test font-44.2 {TkFontGetPoints: size >= 0} -constraints noExceed -setup {
-	set oldscale [tk scaling]
+test font-44.2 {TkFontGetPoints: size >= 0} -constraints {noExceed failsOnUbuntuNoXft} -setup {
+    set oldscale [tk scaling]
 } -body {
-	tk scaling 0.5
+    tk scaling 0.5
     font actual {times 12} -size
 } -cleanup {
-	tk scaling $oldscale
+    tk scaling $oldscale
 } -result {12}
 
 
@@ -2375,12 +2376,12 @@ test font-45.3 {TkFontGetAliasList: match} -constraints {noExceed} -body {
 
 
 test font-46.1 {font actual, with character, no option, no --} -body {
-	font actual {times 10} a
+    font actual {times 10} a
 } -match glob -result [list -family [font actual {times 10} -family] -size *\
 		 -slant roman -underline 0 -overstrike 0]
 
 test font-46.2 {font actual, with character introduced by --} -body {
-	font actual {times 10} -- -
+    font actual {times 10} -- -
 } -match glob -result [list -family [font actual {times 10} -family] -size *\
 		 -slant roman -underline 0 -overstrike 0]
 
diff --git a/tests/fontchooser.test b/tests/fontchooser.test
index 3fbc01f..0efe619 100644
--- a/tests/fontchooser.test
+++ b/tests/fontchooser.test
@@ -6,6 +6,9 @@ package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || ([catch {tk::pkgconfig get fontsystem} fs] || ($fs ne "xft"))}]
+
 # the following helper functions are related to the functions used
 # in winDialog.test where they are used to send messages to the win32
 # dialog (hence the wierdness).
@@ -179,7 +182,7 @@ test fontchooser-4.3 {fontchooser -font} -constraints scriptImpl -body {
     expr {$::testfont ne {}}
 } -result {1}
 
-test fontchooser-4.4 {fontchooser -font} -constraints scriptImpl -body {
+test fontchooser-4.4 {fontchooser -font} -constraints {scriptImpl failsOnUbuntuNoXft} -body {
     start {
         tk::fontchooser::Configure -command ApplyFont -font {times 14 bold}
         tk::fontchooser::Show
diff --git a/tests/spinbox.test b/tests/spinbox.test
index 8d19a7e..4cc1238 100644
--- a/tests/spinbox.test
+++ b/tests/spinbox.test
@@ -11,6 +11,9 @@ namespace import ::tcltest::*
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || ([catch {tk::pkgconfig get fontsystem} fs] || ($fs ne "xft"))}]
+
 # For xscrollcommand
 set scrollInfo {}
 proc scroll args {
@@ -2603,7 +2606,7 @@ test spinbox-8.17 {DeleteChars procedure} -setup {
 } -cleanup {
     destroy .e
 } -result 4
-test spinbox-8.18 {DeleteChars procedure} -setup {
+test spinbox-8.18 {DeleteChars procedure} -constraints failsOnUbuntuNoXft -setup {
     spinbox .e -width 0 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
diff --git a/tests/textTag.test b/tests/textTag.test
index ba7be87..6a7fc86 100644
--- a/tests/textTag.test
+++ b/tests/textTag.test
@@ -11,6 +11,9 @@ namespace import ::tcltest::*
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || ([catch {tk::pkgconfig get fontsystem} fs] || ($fs ne "xft"))}]
+
 destroy .t
 text .t -width 20 -height 10
 testConstraint haveCourier12 [expr {[catch {
@@ -1695,7 +1698,7 @@ test textTag-16.5 {TkTextPickCurrent procedure} -constraints {
 } -result {3.2}
 
 test textTag-16.6 {TkTextPickCurrent procedure} -constraints {
-    haveCourier12
+    haveCourier12 failsOnUbuntuNoXft
 } -setup {
     foreach i {big a b c d} {
         .t tag remove $i 1.0 end
@@ -1715,7 +1718,7 @@ test textTag-16.6 {TkTextPickCurrent procedure} -constraints {
 } -result {3.1}
 
 test textTag-16.7 {TkTextPickCurrent procedure} -constraints {
-    haveCourier12
+    haveCourier12 failsOnUbuntuNoXft
 } -setup {
     foreach i {big a b c d} {
         .t tag remove $i 1.0 end
diff --git a/tests/unixFont.test b/tests/unixFont.test
index 9a8f864..973d4d9 100644
--- a/tests/unixFont.test
+++ b/tests/unixFont.test
@@ -17,6 +17,7 @@ eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
 testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || ([catch {tk::pkgconfig get fontsystem} fs] || ($fs ne "xft"))}]
 
 if {[tk windowingsystem] eq "x11"} {
     set xlsf [auto_execok xlsfonts]
@@ -116,7 +117,7 @@ test unixfont-2.8 {TkpGetFontFromAttributes: loop over returned font names} {x11
 test unixfont-2.9 {TkpGetFontFromAttributes: reject adobe courier if possible} {x11 noExceed failsOnUbuntu} {
     lindex [font actual {-family courier}] 1
 } {courier}
-test unixfont-2.10 {TkpGetFontFromAttributes: scalable font found} x11 {
+test unixfont-2.10 {TkpGetFontFromAttributes: scalable font found} {x11 failsOnUbuntuNoXft} {
     lindex [font actual {-family courier -size 37}] 3
 } {37}
 test unixfont-2.11 {TkpGetFontFromAttributes: font cannot be loaded} x11 {
-- 
cgit v0.12


From af62bb859761fb78877f2b623732d200a2c07c5f Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 30 Sep 2020 21:24:50 +0000
Subject: Fix [59cba33c6d]: win: theme detection in TkWinGetPlatformTheme()
 likely broken

---
 win/tkWinX.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/win/tkWinX.c b/win/tkWinX.c
index 8616369..df8c004 100644
--- a/win/tkWinX.c
+++ b/win/tkWinX.c
@@ -358,12 +358,12 @@ TkWinGetPlatformTheme(void)
 	 * TK_THEME_WIN_CLASSIC could be set even when running under XP if the
 	 * windows classic theme was selected.
 	 */
-	if (os.dwMajorVersion == 5 && os.dwMinorVersion == 1) {
+	if (os.dwMajorVersion == 5 && os.dwMinorVersion >= 1) {
 	    HKEY hKey;
 	    LPCWSTR szSubKey = L"Control Panel\\Appearance";
 	    LPCWSTR szCurrent = L"Current";
 	    DWORD dwSize = 200;
-	    char pBuffer[200];
+	    WCHAR pBuffer[200];
 
 	    memset(pBuffer, 0, dwSize);
 	    if (RegOpenKeyExW(HKEY_CURRENT_USER, szSubKey, 0L,
@@ -372,7 +372,7 @@ TkWinGetPlatformTheme(void)
 	    } else {
 		RegQueryValueExW(hKey, szCurrent, NULL, NULL, (LPBYTE) pBuffer, &dwSize);
 		RegCloseKey(hKey);
-		if (strcmp(pBuffer, "Windows Standard") == 0) {
+		if (wcscmp(pBuffer, L"Windows Standard") == 0) {
 		    tkWinTheme = TK_THEME_WIN_CLASSIC;
 		} else {
 		    tkWinTheme = TK_THEME_WIN_XP;
-- 
cgit v0.12


From 32fd820c915bae23b016062081b921b3feec4ca8 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 30 Sep 2020 22:07:41 +0000
Subject: If Tk is compiled with -DTK_NO_DEPRECATED, disable some testcases
 which fail because of that

---
 generic/tkPkgConfig.c |  3 +++
 tests/bind.test       |  5 ++++-
 tests/pkgconfig.test  |  4 +++-
 tests/scrollbar.test  | 17 +++++++++--------
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/generic/tkPkgConfig.c b/generic/tkPkgConfig.c
index fe084bf..ed8fb0b 100644
--- a/generic/tkPkgConfig.c
+++ b/generic/tkPkgConfig.c
@@ -100,6 +100,9 @@ static const Tcl_Config cfg[] = {
     {"profiled",		CFG_PROFILED},
     {"64bit",			CFG_64},
     {"optimized",		CFG_OPTIMIZED},
+#ifdef TK_NO_DEPRECATED
+    {"nodeprecated",	"1"},
+#endif
     {"mem_debug",		CFG_MEMDEBUG},
     {"fontsystem",		CFG_FONTSYSTEM},
 
diff --git a/tests/bind.test b/tests/bind.test
index 152fe3e..29f8873 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -13,6 +13,9 @@ eval tcltest::configure $argv
 tcltest::loadTestedCommands
 tk useinputmethods 0
 
+testConstraint nodeprecated [expr {"nodeprecated" ni [tk::pkgconfig list]}]
+
+
 toplevel .t -width 100 -height 50
 wm geom .t +0+0
 update idletasks
@@ -6017,7 +6020,7 @@ test bind-28.9 {keysym names, Eth -> ETH} -body {
 } -cleanup {
     destroy .t.f
 } -result {<Key-ETH>}
-test bind-28.10 {keysym names, Ooblique -> Oslash} -body {
+test bind-28.10 {keysym names, Ooblique -> Oslash} -constraints nodeprecated -body {
     frame .t.f -class Test -width 150 -height 100
     bind .t.f <Ooblique> foo
     bind .t.f
diff --git a/tests/pkgconfig.test b/tests/pkgconfig.test
index e080b91..f07ca0f 100644
--- a/tests/pkgconfig.test
+++ b/tests/pkgconfig.test
@@ -18,7 +18,9 @@ namespace import ::tcltest::*
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
-test pkgconfig-1.1 {query keys} nonwin {
+testConstraint nodeprecated [expr {"nodeprecated" ni [tk::pkgconfig list]}]
+
+test pkgconfig-1.1 {query keys} nodeprecated {
     lsort [::tk::pkgconfig list]
 } [list \
     64bit bindir,install bindir,runtime debug demodir,install demodir,runtime \
diff --git a/tests/scrollbar.test b/tests/scrollbar.test
index 20ac275..86e742e 100644
--- a/tests/scrollbar.test
+++ b/tests/scrollbar.test
@@ -12,6 +12,7 @@ eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
 testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+testConstraint nodeprecated [expr {"nodeprecated" ni [tk::pkgconfig list]}]
 
 proc scroll args {
     global scrollInfo
@@ -316,7 +317,7 @@ destroy .t
 test scrollbar-3.43 {ScrollbarWidgetCmd procedure, "get" option} {
     list [catch {.s get a} msg] $msg
 } {1 {wrong # args: should be ".s get"}}
-test scrollbar-3.44 {ScrollbarWidgetCmd procedure, "get" option} {
+test scrollbar-3.44 {ScrollbarWidgetCmd procedure, "get" option} nodeprecated {
     .s set 100 10 13 14
     .s get
 } {100 10 13 14}
@@ -401,27 +402,27 @@ test scrollbar-3.63 {ScrollbarWidgetCmd procedure, "set" option} {
     }
     set result
 } {0.4 0.4}
-test scrollbar-3.64 {ScrollbarWidgetCmd procedure, "set" option} {
+test scrollbar-3.64 {ScrollbarWidgetCmd procedure, "set" option} nodeprecated {
     list [catch {.s set abc def ghi jkl} msg] $msg
 } {1 {expected integer but got "abc"}}
-test scrollbar-3.65 {ScrollbarWidgetCmd procedure, "set" option} {
+test scrollbar-3.65 {ScrollbarWidgetCmd procedure, "set" option} nodeprecated {
     list [catch {.s set 1 def ghi jkl} msg] $msg
 } {1 {expected integer but got "def"}}
-test scrollbar-3.66 {ScrollbarWidgetCmd procedure, "set" option} {
+test scrollbar-3.66 {ScrollbarWidgetCmd procedure, "set" option} nodeprecated {
     list [catch {.s set 1 2 ghi jkl} msg] $msg
 } {1 {expected integer but got "ghi"}}
-test scrollbar-3.67 {ScrollbarWidgetCmd procedure, "set" option} {
+test scrollbar-3.67 {ScrollbarWidgetCmd procedure, "set" option} nodeprecated {
     list [catch {.s set 1 2 3 jkl} msg] $msg
 } {1 {expected integer but got "jkl"}}
-test scrollbar-3.68 {ScrollbarWidgetCmd procedure, "set" option} {
+test scrollbar-3.68 {ScrollbarWidgetCmd procedure, "set" option} nodeprecated {
     .s set -10 50 20 30
     .s get
 } {0 50 0 0}
-test scrollbar-3.69 {ScrollbarWidgetCmd procedure, "set" option} {
+test scrollbar-3.69 {ScrollbarWidgetCmd procedure, "set" option} nodeprecated {
     .s set 100 -10 20 30
     .s get
 } {100 0 20 30}
-test scrollbar-3.70 {ScrollbarWidgetCmd procedure, "set" option} {
+test scrollbar-3.70 {ScrollbarWidgetCmd procedure, "set" option} nodeprecated {
     .s set 100 50 30 20
     .s get
 } {100 50 30 30}
-- 
cgit v0.12


From 279143927533f7cdd980e4d1d239303cbc9e8a5a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 1 Oct 2020 08:55:52 +0000
Subject: Expression for contraint failsOnUbuntuNoXft was reverse  ....

---
 tests/entry.test       | 2 +-
 tests/font.test        | 2 +-
 tests/fontchooser.test | 2 +-
 tests/spinbox.test     | 2 +-
 tests/textTag.test     | 4 ++--
 tests/unixFont.test    | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/entry.test b/tests/entry.test
index f1d61b2..4463b9b 100644
--- a/tests/entry.test
+++ b/tests/entry.test
@@ -12,7 +12,7 @@ eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
 testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
-testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || ([catch {tk::pkgconfig get fontsystem} fs] || ($fs ne "xft"))}]
+testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || (![catch {tk::pkgconfig get fontsystem} fs] && ($fs eq "xft"))}]
 
 # For xscrollcommand
 set scrollInfo {}
diff --git a/tests/font.test b/tests/font.test
index 0f4c8de..89780ba 100644
--- a/tests/font.test
+++ b/tests/font.test
@@ -15,7 +15,7 @@ tcltest::loadTestedCommands
 testConstraint fullutf [expr {[format %c 0x010000] != "\uFFFD"}]
 
 testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
-testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || ([catch {tk::pkgconfig get fontsystem} fs] || ($fs ne "xft"))}]
+testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || (![catch {tk::pkgconfig get fontsystem} fs] && ($fs eq "xft"))}]
 
 set defaultfontlist [font names]
 
diff --git a/tests/fontchooser.test b/tests/fontchooser.test
index 0efe619..3ec7309 100644
--- a/tests/fontchooser.test
+++ b/tests/fontchooser.test
@@ -7,7 +7,7 @@ eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
 testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
-testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || ([catch {tk::pkgconfig get fontsystem} fs] || ($fs ne "xft"))}]
+testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || (![catch {tk::pkgconfig get fontsystem} fs] && ($fs eq "xft"))}]
 
 # the following helper functions are related to the functions used
 # in winDialog.test where they are used to send messages to the win32
diff --git a/tests/spinbox.test b/tests/spinbox.test
index 4cc1238..28d90d7 100644
--- a/tests/spinbox.test
+++ b/tests/spinbox.test
@@ -12,7 +12,7 @@ eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
 testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
-testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || ([catch {tk::pkgconfig get fontsystem} fs] || ($fs ne "xft"))}]
+testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || (![catch {tk::pkgconfig get fontsystem} fs] && ($fs eq "xft"))}]
 
 # For xscrollcommand
 set scrollInfo {}
diff --git a/tests/textTag.test b/tests/textTag.test
index 6a7fc86..038150f 100644
--- a/tests/textTag.test
+++ b/tests/textTag.test
@@ -12,7 +12,7 @@ eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
 testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
-testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || ([catch {tk::pkgconfig get fontsystem} fs] || ($fs ne "xft"))}]
+testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || (![catch {tk::pkgconfig get fontsystem} fs] && ($fs eq "xft"))}]
 
 destroy .t
 text .t -width 20 -height 10
@@ -1602,7 +1602,7 @@ test textTag-16.1 {TkTextPickCurrent procedure} -constraints {
 } -result {2.1 3.2 3.2 3.2 3.2 3.2 4.3}
 
 test textTag-16.2 {TkTextPickCurrent procedure} -constraints {
-    haveCourier12
+    haveCourier12 failsOnUbuntuNoXft
 } -setup {
     .t tag delete {*}[.t tag names]
     wm geometry . +200+200 ; update
diff --git a/tests/unixFont.test b/tests/unixFont.test
index 973d4d9..86fb5bf 100644
--- a/tests/unixFont.test
+++ b/tests/unixFont.test
@@ -17,7 +17,7 @@ eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
 testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
-testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || ([catch {tk::pkgconfig get fontsystem} fs] || ($fs ne "xft"))}]
+testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || (![catch {tk::pkgconfig get fontsystem} fs] && ($fs eq "xft"))}]
 
 if {[tk windowingsystem] eq "x11"} {
     set xlsf [auto_execok xlsfonts]
-- 
cgit v0.12


From 231368f73de8a15b94a1cd60793e52c8d6f6d052 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 1 Oct 2020 09:05:38 +0000
Subject: Duplicate testconstraint failsOnUbuntu

---
 tests/textDisp.test | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/textDisp.test b/tests/textDisp.test
index d54eb62..39d50d0 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -103,8 +103,6 @@ wm positionfrom . user
 wm deiconify .
 updateText
 
-testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
-
 # Some window managers (like olwm under SunOS 4.1.3) misbehave in a way
 # that tends to march windows off the top and left of the screen.  If
 # this happens, some tests will fail because parts of the window will
-- 
cgit v0.12


From fecbf2b8553ba43518eba229753b0efc12aabd28 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 1 Oct 2020 14:49:14 +0000
Subject: Fix some gcc warnings (when using -Wshadow, deprecated
 XKeycodeToKeysym(), XScreenSaverQueryInfo weak symbol on MacOS)

---
 generic/tkFont.c      | 16 ++++++++--------
 generic/tkMenu.c      |  4 +---
 generic/tkOldConfig.c |  2 --
 generic/tkPlace.c     | 22 +++++++++++-----------
 generic/tkUtil.c      |  2 +-
 unix/tkUnix.c         |  2 +-
 unix/tkUnixKey.c      |  7 +++++++
 7 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/generic/tkFont.c b/generic/tkFont.c
index 3aed702..3e4044f 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.c
@@ -740,7 +740,7 @@ Tk_FontObjCmd(
     }
     case FONT_METRICS: {
 	Tk_Font tkfont;
-	int skip, index, i;
+	int skip, i;
 	const TkFontMetrics *fmPtr;
 	static const char *const switches[] = {
 	    "-ascent", "-descent", "-linespace", "-fixed", NULL
@@ -1973,7 +1973,7 @@ Tk_ComputeTextLayout(
     int *heightPtr)		/* Filled with height of string. */
 {
     TkFont *fontPtr = (TkFont *) tkfont;
-    const char *start, *end, *special;
+    const char *start, *endp, *special;
     int n, y, bytesThisChunk, maxChunks, curLine, layoutHeight;
     int baseline, height, curX, newX, maxWidth, *lineLengths;
     TextLayout *layoutPtr;
@@ -2021,12 +2021,12 @@ Tk_ComputeTextLayout(
 
     curX = 0;
 
-    end = TkUtfAtIndex(string, numChars);
+    endp = TkUtfAtIndex(string, numChars);
     special = string;
 
     flags &= TK_IGNORE_TABS | TK_IGNORE_NEWLINES;
     flags |= TK_WHOLE_WORDS | TK_AT_LEAST_ONE;
-    for (start = string; start < end; ) {
+    for (start = string; start < endp; ) {
 	if (start >= special) {
 	    /*
 	     * Find the next special character in the string.
@@ -2037,7 +2037,7 @@ Tk_ComputeTextLayout(
 	     * whitespace set.
 	     */
 
-	    for (special = start; special < end; special++) {
+	    for (special = start; special < endp; special++) {
 		if (!(flags & TK_IGNORE_NEWLINES)) {
 		    if ((*special == '\n') || (*special == '\r')) {
 			break;
@@ -2071,7 +2071,7 @@ Tk_ComputeTextLayout(
 	    }
 	}
 
-	if ((start == special) && (special < end)) {
+	if ((start == special) && (special < endp)) {
 	    /*
 	     * Handle the special character.
 	     *
@@ -2088,7 +2088,7 @@ Tk_ComputeTextLayout(
 		start++;
 		curX = newX;
 		flags &= ~TK_AT_LEAST_ONE;
-		if ((start < end) &&
+		if ((start < endp) &&
 			((wrapLength <= 0) || (newX <= wrapLength))) {
 		    /*
 		     * More chars can still fit on this line.
@@ -2110,7 +2110,7 @@ Tk_ComputeTextLayout(
 	 * Consume all extra spaces at end of line.
 	 */
 
-	while ((start < end) && isspace(UCHAR(*start))) { /* INTL: ISO space */
+	while ((start < endp) && isspace(UCHAR(*start))) { /* INTL: ISO space */
 	    if (!(flags & TK_IGNORE_NEWLINES)) {
 		if ((*start == '\n') || (*start == '\r')) {
 		    break;
diff --git a/generic/tkMenu.c b/generic/tkMenu.c
index 638139a..1cd7a16 100644
--- a/generic/tkMenu.c
+++ b/generic/tkMenu.c
@@ -1623,7 +1623,6 @@ ConfigureMenu(
 	    }
 	} else if ((menuListPtr->numEntries > 0)
 		&& (menuListPtr->entries[0]->type == TEAROFF_ENTRY)) {
-	    int i;
 
 	    Tcl_EventuallyFree(menuListPtr->entries[0], (Tcl_FreeProc *) DestroyMenuEntry);
 
@@ -1819,7 +1818,6 @@ PostProcessEntry(
     if ((mePtr->type == CHECK_BUTTON_ENTRY)
 	    || (mePtr->type == RADIO_BUTTON_ENTRY)) {
 	Tcl_Obj *valuePtr;
-	const char *name;
 
 	if (mePtr->namePtr == NULL) {
 	    if (mePtr->labelPtr == NULL) {
@@ -2732,7 +2730,7 @@ CloneMenu(
 	    && (menuPtr->numEntries == menuRefPtr->menuPtr->numEntries)) {
 	TkMenu *newMenuPtr = menuRefPtr->menuPtr;
 	Tcl_Obj *newObjv[3];
-	int i, numElements;
+	int numElements;
 
 	/*
 	 * Now put this newly created menu into the parent menu's instance
diff --git a/generic/tkOldConfig.c b/generic/tkOldConfig.c
index d01da95..7bb02b4 100644
--- a/generic/tkOldConfig.c
+++ b/generic/tkOldConfig.c
@@ -863,8 +863,6 @@ FormatConfigValue(
 	result = buffer;
 	break;
     case TK_CONFIG_WINDOW: {
-	Tk_Window tkwin;
-
 	tkwin = *((Tk_Window *) ptr);
 	if (tkwin != NULL) {
 	    result = Tk_PathName(tkwin);
diff --git a/generic/tkPlace.c b/generic/tkPlace.c
index 4cff85f..47ceee2 100644
--- a/generic/tkPlace.c
+++ b/generic/tkPlace.c
@@ -666,10 +666,10 @@ ConfigureContent(
 	goto scheduleLayout;
     } else if (mask & IN_MASK) {
 	/* -in changed */
-	Tk_Window tkwin;
+	Tk_Window win;
 	Tk_Window ancestor;
 
-	tkwin = contentPtr->inTkwin;
+	win = contentPtr->inTkwin;
 
 	/*
 	 * Make sure that the new container is either the logical parent of the
@@ -677,19 +677,19 @@ ConfigureContent(
 	 * aren't the same.
 	 */
 
-	for (ancestor = tkwin; ; ancestor = Tk_Parent(ancestor)) {
+	for (ancestor = win; ; ancestor = Tk_Parent(ancestor)) {
 	    if (ancestor == Tk_Parent(contentPtr->tkwin)) {
 		break;
 	    }
 	    if (Tk_TopWinHierarchy(ancestor)) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 			"can't place %s relative to %s",
-			Tk_PathName(contentPtr->tkwin), Tk_PathName(tkwin)));
+			Tk_PathName(contentPtr->tkwin), Tk_PathName(win)));
 		Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "HIERARCHY", NULL);
 		goto error;
 	    }
 	}
-	if (contentPtr->tkwin == tkwin) {
+	if (contentPtr->tkwin == win) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "can't place %s relative to itself",
 		    Tk_PathName(contentPtr->tkwin)));
@@ -701,22 +701,22 @@ ConfigureContent(
 	 * Check for management loops.
 	 */
 
-	for (container = (TkWindow *)tkwin; container != NULL;
+	for (container = (TkWindow *)win; container != NULL;
 	     container = (TkWindow *)TkGetContainer(container)) {
 	    if (container == (TkWindow *)contentPtr->tkwin) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "can't put %s inside %s, would cause management loop",
-	            Tk_PathName(contentPtr->tkwin), Tk_PathName(tkwin)));
+	            Tk_PathName(contentPtr->tkwin), Tk_PathName(win)));
 		Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "LOOP", NULL);
 		goto error;
 	    }
 	}
-	if (tkwin != Tk_Parent(contentPtr->tkwin)) {
-	    ((TkWindow *)contentPtr->tkwin)->maintainerPtr = (TkWindow *)tkwin;
+	if (win != Tk_Parent(contentPtr->tkwin)) {
+	    ((TkWindow *)contentPtr->tkwin)->maintainerPtr = (TkWindow *)win;
 	}
 
 	if ((contentPtr->containerPtr != NULL)
-		&& (contentPtr->containerPtr->tkwin == tkwin)) {
+		&& (contentPtr->containerPtr->tkwin == win)) {
 	    /*
 	     * Re-using same old container. Nothing to do.
 	     */
@@ -729,7 +729,7 @@ ConfigureContent(
 	    Tk_UnmaintainGeometry(contentPtr->tkwin, contentPtr->containerPtr->tkwin);
 	}
 	UnlinkContent(contentPtr);
-	containerWin = tkwin;
+	containerWin = win;
     }
 
     /*
diff --git a/generic/tkUtil.c b/generic/tkUtil.c
index 17ba443..00ac7be 100644
--- a/generic/tkUtil.c
+++ b/generic/tkUtil.c
@@ -1133,7 +1133,7 @@ TkMakeEnsemble(
 
     dictObj = Tcl_NewObj();
     for (i = 0; map[i].name != NULL ; ++i) {
-	Tcl_Obj *nameObj, *fqdnObj;
+	Tcl_Obj *fqdnObj;
 
 	nameObj = Tcl_NewStringObj(map[i].name, -1);
 	fqdnObj = Tcl_NewStringObj(Tcl_DStringValue(&ds),
diff --git a/unix/tkUnix.c b/unix/tkUnix.c
index c6fff82..2de6e98 100644
--- a/unix/tkUnix.c
+++ b/unix/tkUnix.c
@@ -16,7 +16,7 @@
 #   include <X11/extensions/scrnsaver.h>
 #   ifdef __APPLE__
 /* Support for weak-linked libXss. */
-#	define HaveXSSLibrary()	(XScreenSaverQueryInfo != NULL)
+#	define HaveXSSLibrary()	(&XScreenSaverQueryInfo != NULL)
 #   else
 /* Other platforms always link libXss. */
 #	define HaveXSSLibrary()	(1)
diff --git a/unix/tkUnixKey.c b/unix/tkUnixKey.c
index 4e150f7..d55fde0 100644
--- a/unix/tkUnixKey.c
+++ b/unix/tkUnixKey.c
@@ -12,6 +12,13 @@
 
 #include "tkInt.h"
 
+#ifdef __GNUC__
+/*
+ * We know that XKeycodeToKeysym is deprecated, nothing we can do about it.
+ */
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 /*
 ** Bug [3607830]: Before using Xkb, it must be initialized.  TkpOpenDisplay
 **                does this and sets the USE_XKB flag if xkb is supported.
-- 
cgit v0.12


From c398d6bf2cc0c663cf503457d334bb99bee735f7 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Thu, 1 Oct 2020 19:49:17 +0000
Subject: Another possible fix (but this does not match the documentation for
 <Destroy> in bind.n).

---
 generic/tkCmds.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/generic/tkCmds.c b/generic/tkCmds.c
index f782144..b8b1d3e 100644
--- a/generic/tkCmds.c
+++ b/generic/tkCmds.c
@@ -1623,12 +1623,7 @@ Tk_WinfoObjCmd(
 	}
 	tkwin = Tk_CoordsToWindow(x, y, tkwin);
 	if (tkwin != NULL) {
-            string = Tk_PathName(tkwin);
-            winPtr = (TkWindow *) Tk_NameToWindow(interp, string, tkwin);
-            Tcl_ResetResult(interp);
-            if (winPtr && !(winPtr->flags & TK_ALREADY_DEAD)) {
-                Tcl_SetObjResult(interp, Tcl_NewStringObj(string, -1));
-            }
+	    Tcl_SetObjResult(interp, Tcl_NewStringObj(Tk_PathName(tkwin),-1));
 	}
 	break;
     case WIN_INTERPS:
@@ -1694,10 +1689,7 @@ Tk_WinfoObjCmd(
 	winPtr = (TkWindow *) Tk_NameToWindow(interp, string, tkwin);
 	Tcl_ResetResult(interp);
 
-	alive = 1;
-	if ((winPtr == NULL) || (winPtr->flags & TK_ALREADY_DEAD)) {
-	    alive = 0;
-	}
+        alive = (winPtr != NULL);
 	Tcl_SetObjResult(interp, Tcl_NewBooleanObj(alive));
 	break;
     }
-- 
cgit v0.12


From 30699869c5cf8459e81c4bcedbe819d6887a02cb Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 2 Oct 2020 15:07:23 +0000
Subject: Fix more warnings, related to -Wshadow, now in MacOSX code

---
 macosx/tkMacOSXColor.c    |  10 +-
 macosx/tkMacOSXCursor.c   | 268 +++++++++++++++++++-------------------
 macosx/tkMacOSXDialog.c   |  10 +-
 macosx/tkMacOSXFont.c     |  59 ++++-----
 macosx/tkMacOSXKeyboard.c |   3 +-
 macosx/tkMacOSXMenu.c     |  84 ++++++------
 macosx/tkMacOSXPrivate.h  |   8 +-
 macosx/ttkMacOSXTheme.c   | 324 +++++++++++++++++++++++-----------------------
 8 files changed, 391 insertions(+), 375 deletions(-)

diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c
index 208fc8b..5f549b1 100644
--- a/macosx/tkMacOSXColor.c
+++ b/macosx/tkMacOSXColor.c
@@ -31,7 +31,7 @@ static NSAppearance *lightAqua = nil;
 static NSAppearance *darkAqua = nil;
 #endif
 static NSColorSpace* sRGB = NULL;
-static CGFloat windowBackground[4] =
+static const CGFloat WINDOWBACKGROUND[4] =
     {236.0 / 255, 236.0 / 255, 236.0 / 255, 1.0};
 
 void initColorTable()
@@ -92,9 +92,9 @@ void initColorTable()
     for (key in [systemColorList allKeys]) {
 	int length = [key lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
 	char *name;
-	entry = ckalloc(sizeof(SystemColorDatum));
+	entry = (SystemColorDatum *)ckalloc(sizeof(SystemColorDatum));
 	bzero(entry, sizeof(SystemColorDatum));
-	name = ckalloc(length + 1);
+	name = (char *)ckalloc(length + 1);
 	strcpy(name, key.UTF8String);
 	name[0] = toupper(name[0]);
         if (!strcmp(name, "WindowBackgroundColor")) {
@@ -124,7 +124,7 @@ void initColorTable()
      */
 
     numSystemColors = index;
-    systemColorIndex = ckalloc(numSystemColors * sizeof(SystemColorDatum*));
+    systemColorIndex = (SystemColorDatum **)ckalloc(numSystemColors * sizeof(SystemColorDatum *));
     for (hPtr = Tcl_FirstHashEntry(&systemColors, &search); hPtr != NULL;
 	 hPtr = Tcl_NextHashEntry(&search)) {
 	entry = (SystemColorDatum *) Tcl_GetHashValue(hPtr);
@@ -297,7 +297,7 @@ GetRGBA(
 
 	if ([NSApp macOSVersion] < 101400) {
 	    for (int i = 0; i < 3; i++) {
-		rgba[i] = windowBackground[i];
+		rgba[i] = WINDOWBACKGROUND[i];
 	    }
 	} else {
 	    bgColor = [[NSColor windowBackgroundColor] colorUsingColorSpace:sRGB];
diff --git a/macosx/tkMacOSXCursor.c b/macosx/tkMacOSXCursor.c
index 894a44d..4b2de7f 100644
--- a/macosx/tkMacOSXCursor.c
+++ b/macosx/tkMacOSXCursor.c
@@ -54,131 +54,131 @@ struct CursorName {
 #define MacXCursorData(n)	((id)tkMacOSXXCursors[TK_MAC_XCURSOR_##n])
 
 static const struct CursorName cursorNames[] = {
-    {"none",			NONE,	    nil},
-    {"arrow",			SELECTOR,    @"arrowCursor"},
-    {"top_left_arrow",		SELECTOR,    @"arrowCursor"},
-    {"left_ptr",		SELECTOR,    @"arrowCursor"},
-    {"copyarrow",		SELECTOR,    @"dragCopyCursor", @"_copyDragCursor"},
-    {"aliasarrow",		SELECTOR,    @"dragLinkCursor", @"_linkDragCursor"},
-    {"contextualmenuarrow",	SELECTOR,    @"contextualMenuCursor"},
-    {"movearrow",		SELECTOR,    @"_moveCursor"},
-    {"ibeam",			SELECTOR,    @"IBeamCursor"},
-    {"text",			SELECTOR,    @"IBeamCursor"},
-    {"xterm",			SELECTOR,    @"IBeamCursor"},
-    {"cross",			SELECTOR,    @"crosshairCursor"},
-    {"crosshair",		SELECTOR,    @"crosshairCursor"},
-    {"cross-hair",		SELECTOR,    @"crosshairCursor"},
-    {"tcross",			SELECTOR,    @"crosshairCursor"},
-    {"hand",			SELECTOR,    @"openHandCursor"},
-    {"openhand",		SELECTOR,    @"openHandCursor"},
-    {"closedhand",		SELECTOR,    @"closedHandCursor"},
-    {"fist",			SELECTOR,    @"closedHandCursor"},
-    {"pointinghand",		SELECTOR,    @"pointingHandCursor"},
-    {"resize",			SELECTOR,    @"arrowCursor"},
-    {"resizeleft",		SELECTOR,    @"resizeLeftCursor"},
-    {"resizeright",		SELECTOR,    @"resizeRightCursor"},
-    {"resizeleftright",		SELECTOR,    @"resizeLeftRightCursor"},
-    {"resizeup",		SELECTOR,    @"resizeUpCursor"},
-    {"resizedown",		SELECTOR,    @"resizeDownCursor"},
-    {"resizeupdown",		SELECTOR,    @"resizeUpDownCursor"},
-    {"resizebottomleft",	SELECTOR,    @"_bottomLeftResizeCursor"},
-    {"resizetopleft",		SELECTOR,    @"_topLeftResizeCursor"},
-    {"resizebottomright",	SELECTOR,    @"_bottomRightResizeCursor"},
-    {"resizetopright",		SELECTOR,    @"_topRightResizeCursor"},
-    {"notallowed",		SELECTOR,    @"operationNotAllowedCursor"},
-    {"poof",			SELECTOR,    @"disappearingItemCursor"},
-    {"wait",			SELECTOR,    @"busyButClickableCursor"},
-    {"spinning",		SELECTOR,    @"busyButClickableCursor"},
-    {"countinguphand",		SELECTOR,    @"busyButClickableCursor"},
-    {"countingdownhand",	SELECTOR,    @"busyButClickableCursor"},
-    {"countingupanddownhand",	SELECTOR,    @"busyButClickableCursor"},
+    {"none",			NONE,	    nil, nil, {0, 0}},
+    {"arrow",			SELECTOR,    @"arrowCursor", nil, {0, 0}},
+    {"top_left_arrow",		SELECTOR,    @"arrowCursor", nil, {0, 0}},
+    {"left_ptr",		SELECTOR,    @"arrowCursor", nil, {0, 0}},
+    {"copyarrow",		SELECTOR,    @"dragCopyCursor", @"_copyDragCursor", {0, 0}},
+    {"aliasarrow",		SELECTOR,    @"dragLinkCursor", @"_linkDragCursor", {0, 0}},
+    {"contextualmenuarrow",	SELECTOR,    @"contextualMenuCursor", nil, {0, 0}},
+    {"movearrow",		SELECTOR,    @"_moveCursor", nil, {0, 0}},
+    {"ibeam",			SELECTOR,    @"IBeamCursor", nil, {0, 0}},
+    {"text",			SELECTOR,    @"IBeamCursor", nil, {0, 0}},
+    {"xterm",			SELECTOR,    @"IBeamCursor", nil, {0, 0}},
+    {"cross",			SELECTOR,    @"crosshairCursor", nil, {0, 0}},
+    {"crosshair",		SELECTOR,    @"crosshairCursor", nil, {0, 0}},
+    {"cross-hair",		SELECTOR,    @"crosshairCursor", nil, {0, 0}},
+    {"tcross",			SELECTOR,    @"crosshairCursor", nil, {0, 0}},
+    {"hand",			SELECTOR,    @"openHandCursor", nil, {0, 0}},
+    {"openhand",		SELECTOR,    @"openHandCursor", nil, {0, 0}},
+    {"closedhand",		SELECTOR,    @"closedHandCursor", nil, {0, 0}},
+    {"fist",			SELECTOR,    @"closedHandCursor", nil, {0, 0}},
+    {"pointinghand",		SELECTOR,    @"pointingHandCursor", nil, {0, 0}},
+    {"resize",			SELECTOR,    @"arrowCursor", nil, {0, 0}},
+    {"resizeleft",		SELECTOR,    @"resizeLeftCursor", nil, {0, 0}},
+    {"resizeright",		SELECTOR,    @"resizeRightCursor", nil, {0, 0}},
+    {"resizeleftright",		SELECTOR,    @"resizeLeftRightCursor", nil, {0, 0}},
+    {"resizeup",		SELECTOR,    @"resizeUpCursor", nil, {0, 0}},
+    {"resizedown",		SELECTOR,    @"resizeDownCursor", nil, {0, 0}},
+    {"resizeupdown",		SELECTOR,    @"resizeUpDownCursor", nil, {0, 0}},
+    {"resizebottomleft",	SELECTOR,    @"_bottomLeftResizeCursor", nil, {0, 0}},
+    {"resizetopleft",		SELECTOR,    @"_topLeftResizeCursor", nil, {0, 0}},
+    {"resizebottomright",	SELECTOR,    @"_bottomRightResizeCursor", nil, {0, 0}},
+    {"resizetopright",		SELECTOR,    @"_topRightResizeCursor", nil, {0, 0}},
+    {"notallowed",		SELECTOR,    @"operationNotAllowedCursor", nil, {0, 0}},
+    {"poof",			SELECTOR,    @"disappearingItemCursor", nil, {0, 0}},
+    {"wait",			SELECTOR,    @"busyButClickableCursor", nil, {0, 0}},
+    {"spinning",		SELECTOR,    @"busyButClickableCursor", nil, {0, 0}},
+    {"countinguphand",		SELECTOR,    @"busyButClickableCursor", nil, {0, 0}},
+    {"countingdownhand",	SELECTOR,    @"busyButClickableCursor", nil, {0, 0}},
+    {"countingupanddownhand",	SELECTOR,    @"busyButClickableCursor", nil, {0, 0}},
     {"help",			IMAGENAMED,  @"NSHelpCursor", nil, {8, 8}},
-//  {"hand",			IMAGEBITMAP, MacCursorData(hand)},
-    {"bucket",			IMAGEBITMAP, MacCursorData(bucket)},
-    {"cancel",			IMAGEBITMAP, MacCursorData(cancel)},
-//  {"resize",			IMAGEBITMAP, MacCursorData(resize)},
-    {"eyedrop",			IMAGEBITMAP, MacCursorData(eyedrop)},
-    {"eyedrop-full",		IMAGEBITMAP, MacCursorData(eyedrop_full)},
-    {"zoom-in",			IMAGEBITMAP, MacCursorData(zoom_in)},
-    {"zoom-out",		IMAGEBITMAP, MacCursorData(zoom_out)},
-    {"X_cursor",		IMAGEBITMAP, MacXCursorData(X_cursor)},
-//  {"arrow",			IMAGEBITMAP, MacXCursorData(arrow)},
-    {"based_arrow_down",	IMAGEBITMAP, MacXCursorData(based_arrow_down)},
-    {"based_arrow_up",		IMAGEBITMAP, MacXCursorData(based_arrow_up)},
-    {"boat",			IMAGEBITMAP, MacXCursorData(boat)},
-    {"bogosity",		IMAGEBITMAP, MacXCursorData(bogosity)},
-    {"bottom_left_corner",	IMAGEBITMAP, MacXCursorData(bottom_left_corner)},
-    {"bottom_right_corner",	IMAGEBITMAP, MacXCursorData(bottom_right_corner)},
-    {"bottom_side",		IMAGEBITMAP, MacXCursorData(bottom_side)},
-    {"bottom_tee",		IMAGEBITMAP, MacXCursorData(bottom_tee)},
-    {"box_spiral",		IMAGEBITMAP, MacXCursorData(box_spiral)},
-    {"center_ptr",		IMAGEBITMAP, MacXCursorData(center_ptr)},
-    {"circle",			IMAGEBITMAP, MacXCursorData(circle)},
-    {"clock",			IMAGEBITMAP, MacXCursorData(clock)},
-    {"coffee_mug",		IMAGEBITMAP, MacXCursorData(coffee_mug)},
-//  {"cross",			IMAGEBITMAP, MacXCursorData(cross)},
-    {"cross_reverse",		IMAGEBITMAP, MacXCursorData(cross_reverse)},
-//  {"crosshair",		IMAGEBITMAP, MacXCursorData(crosshair)},
-    {"diamond_cross",		IMAGEBITMAP, MacXCursorData(diamond_cross)},
-    {"dot",			IMAGEBITMAP, MacXCursorData(dot)},
-    {"dotbox",			IMAGEBITMAP, MacXCursorData(dotbox)},
-    {"double_arrow",		IMAGEBITMAP, MacXCursorData(double_arrow)},
-    {"draft_large",		IMAGEBITMAP, MacXCursorData(draft_large)},
-    {"draft_small",		IMAGEBITMAP, MacXCursorData(draft_small)},
-    {"draped_box",		IMAGEBITMAP, MacXCursorData(draped_box)},
-    {"exchange",		IMAGEBITMAP, MacXCursorData(exchange)},
-    {"fleur",			IMAGEBITMAP, MacXCursorData(fleur)},
-    {"gobbler",			IMAGEBITMAP, MacXCursorData(gobbler)},
-    {"gumby",			IMAGEBITMAP, MacXCursorData(gumby)},
-    {"hand1",			IMAGEBITMAP, MacXCursorData(hand1)},
-    {"hand2",			IMAGEBITMAP, MacXCursorData(hand2)},
-    {"heart",			IMAGEBITMAP, MacXCursorData(heart)},
-    {"icon",			IMAGEBITMAP, MacXCursorData(icon)},
-    {"iron_cross",		IMAGEBITMAP, MacXCursorData(iron_cross)},
-//  {"left_ptr",		IMAGEBITMAP, MacXCursorData(left_ptr)},
-    {"left_side",		IMAGEBITMAP, MacXCursorData(left_side)},
-    {"left_tee",		IMAGEBITMAP, MacXCursorData(left_tee)},
-    {"leftbutton",		IMAGEBITMAP, MacXCursorData(leftbutton)},
-    {"ll_angle",		IMAGEBITMAP, MacXCursorData(ll_angle)},
-    {"lr_angle",		IMAGEBITMAP, MacXCursorData(lr_angle)},
-    {"man",			IMAGEBITMAP, MacXCursorData(man)},
-    {"middlebutton",		IMAGEBITMAP, MacXCursorData(middlebutton)},
-    {"mouse",			IMAGEBITMAP, MacXCursorData(mouse)},
-    {"pencil",			IMAGEBITMAP, MacXCursorData(pencil)},
-    {"pirate",			IMAGEBITMAP, MacXCursorData(pirate)},
-    {"plus",			IMAGEBITMAP, MacXCursorData(plus)},
-    {"question_arrow",		IMAGEBITMAP, MacXCursorData(question_arrow)},
-    {"right_ptr",		IMAGEBITMAP, MacXCursorData(right_ptr)},
-    {"right_side",		IMAGEBITMAP, MacXCursorData(right_side)},
-    {"right_tee",		IMAGEBITMAP, MacXCursorData(right_tee)},
-    {"rightbutton",		IMAGEBITMAP, MacXCursorData(rightbutton)},
-    {"rtl_logo",		IMAGEBITMAP, MacXCursorData(rtl_logo)},
-    {"sailboat",		IMAGEBITMAP, MacXCursorData(sailboat)},
-    {"sb_down_arrow",		IMAGEBITMAP, MacXCursorData(sb_down_arrow)},
-    {"sb_h_double_arrow",	IMAGEBITMAP, MacXCursorData(sb_h_double_arrow)},
-    {"sb_left_arrow",		IMAGEBITMAP, MacXCursorData(sb_left_arrow)},
-    {"sb_right_arrow",		IMAGEBITMAP, MacXCursorData(sb_right_arrow)},
-    {"sb_up_arrow",		IMAGEBITMAP, MacXCursorData(sb_up_arrow)},
-    {"sb_v_double_arrow",	IMAGEBITMAP, MacXCursorData(sb_v_double_arrow)},
-    {"shuttle",			IMAGEBITMAP, MacXCursorData(shuttle)},
-    {"sizing",			IMAGEBITMAP, MacXCursorData(sizing)},
-    {"spider",			IMAGEBITMAP, MacXCursorData(spider)},
-    {"spraycan",		IMAGEBITMAP, MacXCursorData(spraycan)},
-    {"star",			IMAGEBITMAP, MacXCursorData(star)},
-    {"target",			IMAGEBITMAP, MacXCursorData(target)},
-//  {"tcross",			IMAGEBITMAP, MacXCursorData(tcross)},
-//  {"top_left_arrow",		IMAGEBITMAP, MacXCursorData(top_left_arrow)},
-    {"top_left_corner",		IMAGEBITMAP, MacXCursorData(top_left_corner)},
-    {"top_right_corner",	IMAGEBITMAP, MacXCursorData(top_right_corner)},
-    {"top_side",		IMAGEBITMAP, MacXCursorData(top_side)},
-    {"top_tee",			IMAGEBITMAP, MacXCursorData(top_tee)},
-    {"trek",			IMAGEBITMAP, MacXCursorData(trek)},
-    {"ul_angle",		IMAGEBITMAP, MacXCursorData(ul_angle)},
-    {"umbrella",		IMAGEBITMAP, MacXCursorData(umbrella)},
-    {"ur_angle",		IMAGEBITMAP, MacXCursorData(ur_angle)},
-    {"watch",			IMAGEBITMAP, MacXCursorData(watch)},
-//  {"xterm",			IMAGEBITMAP, MacXCursorData(xterm)},
-    {NULL}
+//  {"hand",			IMAGEBITMAP, MacCursorData(hand), nil, {0, 0}},
+    {"bucket",			IMAGEBITMAP, MacCursorData(bucket), nil, {0, 0}},
+    {"cancel",			IMAGEBITMAP, MacCursorData(cancel), nil, {0, 0}},
+//  {"resize",			IMAGEBITMAP, MacCursorData(resize), nil, {0, 0}},
+    {"eyedrop",			IMAGEBITMAP, MacCursorData(eyedrop), nil, {0, 0}},
+    {"eyedrop-full",		IMAGEBITMAP, MacCursorData(eyedrop_full), nil, {0, 0}},
+    {"zoom-in",			IMAGEBITMAP, MacCursorData(zoom_in), nil, {0, 0}},
+    {"zoom-out",		IMAGEBITMAP, MacCursorData(zoom_out), nil, {0, 0}},
+    {"X_cursor",		IMAGEBITMAP, MacXCursorData(X_cursor), nil, {0, 0}},
+//  {"arrow",			IMAGEBITMAP, MacXCursorData(arrow), nil, {0, 0}},
+    {"based_arrow_down",	IMAGEBITMAP, MacXCursorData(based_arrow_down), nil, {0, 0}},
+    {"based_arrow_up",		IMAGEBITMAP, MacXCursorData(based_arrow_up), nil, {0, 0}},
+    {"boat",			IMAGEBITMAP, MacXCursorData(boat), nil, {0, 0}},
+    {"bogosity",		IMAGEBITMAP, MacXCursorData(bogosity), nil, {0, 0}},
+    {"bottom_left_corner",	IMAGEBITMAP, MacXCursorData(bottom_left_corner), nil, {0, 0}},
+    {"bottom_right_corner",	IMAGEBITMAP, MacXCursorData(bottom_right_corner), nil, {0, 0}},
+    {"bottom_side",		IMAGEBITMAP, MacXCursorData(bottom_side), nil, {0, 0}},
+    {"bottom_tee",		IMAGEBITMAP, MacXCursorData(bottom_tee), nil, {0, 0}},
+    {"box_spiral",		IMAGEBITMAP, MacXCursorData(box_spiral), nil, {0, 0}},
+    {"center_ptr",		IMAGEBITMAP, MacXCursorData(center_ptr), nil, {0, 0}},
+    {"circle",			IMAGEBITMAP, MacXCursorData(circle), nil, {0, 0}},
+    {"clock",			IMAGEBITMAP, MacXCursorData(clock), nil, {0, 0}},
+    {"coffee_mug",		IMAGEBITMAP, MacXCursorData(coffee_mug), nil, {0, 0}},
+//  {"cross",			IMAGEBITMAP, MacXCursorData(cross), nil, {0, 0}},
+    {"cross_reverse",		IMAGEBITMAP, MacXCursorData(cross_reverse), nil, {0, 0}},
+//  {"crosshair",		IMAGEBITMAP, MacXCursorData(crosshair), nil, {0, 0}},
+    {"diamond_cross",		IMAGEBITMAP, MacXCursorData(diamond_cross), nil, {0, 0}},
+    {"dot",			IMAGEBITMAP, MacXCursorData(dot), nil, {0, 0}},
+    {"dotbox",			IMAGEBITMAP, MacXCursorData(dotbox), nil, {0, 0}},
+    {"double_arrow",		IMAGEBITMAP, MacXCursorData(double_arrow), nil, {0, 0}},
+    {"draft_large",		IMAGEBITMAP, MacXCursorData(draft_large), nil, {0, 0}},
+    {"draft_small",		IMAGEBITMAP, MacXCursorData(draft_small), nil, {0, 0}},
+    {"draped_box",		IMAGEBITMAP, MacXCursorData(draped_box), nil, {0, 0}},
+    {"exchange",		IMAGEBITMAP, MacXCursorData(exchange), nil, {0, 0}},
+    {"fleur",			IMAGEBITMAP, MacXCursorData(fleur), nil, {0, 0}},
+    {"gobbler",			IMAGEBITMAP, MacXCursorData(gobbler), nil, {0, 0}},
+    {"gumby",			IMAGEBITMAP, MacXCursorData(gumby), nil, {0, 0}},
+    {"hand1",			IMAGEBITMAP, MacXCursorData(hand1), nil, {0, 0}},
+    {"hand2",			IMAGEBITMAP, MacXCursorData(hand2), nil, {0, 0}},
+    {"heart",			IMAGEBITMAP, MacXCursorData(heart), nil, {0, 0}},
+    {"icon",			IMAGEBITMAP, MacXCursorData(icon), nil, {0, 0}},
+    {"iron_cross",		IMAGEBITMAP, MacXCursorData(iron_cross), nil, {0, 0}},
+//  {"left_ptr",		IMAGEBITMAP, MacXCursorData(left_ptr), nil, {0, 0}},
+    {"left_side",		IMAGEBITMAP, MacXCursorData(left_side), nil, {0, 0}},
+    {"left_tee",		IMAGEBITMAP, MacXCursorData(left_tee), nil, {0, 0}},
+    {"leftbutton",		IMAGEBITMAP, MacXCursorData(leftbutton), nil, {0, 0}},
+    {"ll_angle",		IMAGEBITMAP, MacXCursorData(ll_angle), nil, {0, 0}},
+    {"lr_angle",		IMAGEBITMAP, MacXCursorData(lr_angle), nil, {0, 0}},
+    {"man",			IMAGEBITMAP, MacXCursorData(man), nil, {0, 0}},
+    {"middlebutton",		IMAGEBITMAP, MacXCursorData(middlebutton), nil, {0, 0}},
+    {"mouse",			IMAGEBITMAP, MacXCursorData(mouse), nil, {0, 0}},
+    {"pencil",			IMAGEBITMAP, MacXCursorData(pencil), nil, {0, 0}},
+    {"pirate",			IMAGEBITMAP, MacXCursorData(pirate), nil, {0, 0}},
+    {"plus",			IMAGEBITMAP, MacXCursorData(plus), nil, {0, 0}},
+    {"question_arrow",		IMAGEBITMAP, MacXCursorData(question_arrow), nil, {0, 0}},
+    {"right_ptr",		IMAGEBITMAP, MacXCursorData(right_ptr), nil, {0, 0}},
+    {"right_side",		IMAGEBITMAP, MacXCursorData(right_side), nil, {0, 0}},
+    {"right_tee",		IMAGEBITMAP, MacXCursorData(right_tee), nil, {0, 0}},
+    {"rightbutton",		IMAGEBITMAP, MacXCursorData(rightbutton), nil, {0, 0}},
+    {"rtl_logo",		IMAGEBITMAP, MacXCursorData(rtl_logo), nil, {0, 0}},
+    {"sailboat",		IMAGEBITMAP, MacXCursorData(sailboat), nil, {0, 0}},
+    {"sb_down_arrow",		IMAGEBITMAP, MacXCursorData(sb_down_arrow), nil, {0, 0}},
+    {"sb_h_double_arrow",	IMAGEBITMAP, MacXCursorData(sb_h_double_arrow), nil, {0, 0}},
+    {"sb_left_arrow",		IMAGEBITMAP, MacXCursorData(sb_left_arrow), nil, {0, 0}},
+    {"sb_right_arrow",		IMAGEBITMAP, MacXCursorData(sb_right_arrow), nil, {0, 0}},
+    {"sb_up_arrow",		IMAGEBITMAP, MacXCursorData(sb_up_arrow), nil, {0, 0}},
+    {"sb_v_double_arrow",	IMAGEBITMAP, MacXCursorData(sb_v_double_arrow), nil, {0, 0}},
+    {"shuttle",			IMAGEBITMAP, MacXCursorData(shuttle), nil, {0, 0}},
+    {"sizing",			IMAGEBITMAP, MacXCursorData(sizing), nil, {0, 0}},
+    {"spider",			IMAGEBITMAP, MacXCursorData(spider), nil, {0, 0}},
+    {"spraycan",		IMAGEBITMAP, MacXCursorData(spraycan), nil, {0, 0}},
+    {"star",			IMAGEBITMAP, MacXCursorData(star), nil, {0, 0}},
+    {"target",			IMAGEBITMAP, MacXCursorData(target), nil, {0, 0}},
+//  {"tcross",			IMAGEBITMAP, MacXCursorData(tcross), nil, {0, 0}},
+//  {"top_left_arrow",		IMAGEBITMAP, MacXCursorData(top_left_arrow), nil, {0, 0}},
+    {"top_left_corner",		IMAGEBITMAP, MacXCursorData(top_left_corner), nil, {0, 0}},
+    {"top_right_corner",	IMAGEBITMAP, MacXCursorData(top_right_corner), nil, {0, 0}},
+    {"top_side",		IMAGEBITMAP, MacXCursorData(top_side), nil, {0, 0}},
+    {"top_tee",			IMAGEBITMAP, MacXCursorData(top_tee), nil, {0, 0}},
+    {"trek",			IMAGEBITMAP, MacXCursorData(trek), nil, {0, 0}},
+    {"ul_angle",		IMAGEBITMAP, MacXCursorData(ul_angle), nil, {0, 0}},
+    {"umbrella",		IMAGEBITMAP, MacXCursorData(umbrella), nil, {0, 0}},
+    {"ur_angle",		IMAGEBITMAP, MacXCursorData(ur_angle), nil, {0, 0}},
+    {"watch",			IMAGEBITMAP, MacXCursorData(watch), nil, {0, 0}},
+//  {"xterm",			IMAGEBITMAP, MacXCursorData(xterm), nil, {0, 0}},
+    {NULL, 0, nil, nil, {0, 0}}
 };
 
 /*
@@ -375,7 +375,7 @@ FindCursorByName(
 TkCursor *
 TkGetCursorByName(
     Tcl_Interp *interp,		/* Interpreter to use for error reporting. */
-    Tk_Window tkwin,		/* Window in which cursor will be used. */
+    TCL_UNUSED(Tk_Window),		/* Window in which cursor will be used. */
     Tk_Uid string)		/* Description of cursor. See manual entry
 				 * for details on legal syntax. */
 {
@@ -390,7 +390,7 @@ TkGetCursorByName(
 
     if (Tcl_SplitList(interp, string, &argc, &argv) == TCL_OK) {
 	if (argc) {
-	    macCursorPtr = ckalloc(sizeof(TkMacOSXCursor));
+	    macCursorPtr = (TkMacOSXCursor *)ckalloc(sizeof(TkMacOSXCursor));
 	    macCursorPtr->info.cursor = (Tk_Cursor) macCursorPtr;
 	    macCursorPtr->macCursor = nil;
 	    macCursorPtr->type = 0;
@@ -429,13 +429,15 @@ TkGetCursorByName(
 
 TkCursor *
 TkCreateCursorFromData(
-    Tk_Window tkwin,		/* Window in which cursor will be used. */
-    const char *source,		/* Bitmap data for cursor shape. */
-    const char *mask,		/* Bitmap data for cursor mask. */
-    int width, int height,	/* Dimensions of cursor. */
-    int xHot, int yHot,		/* Location of hot-spot in cursor. */
-    XColor fgColor,		/* Foreground color for cursor. */
-    XColor bgColor)		/* Background color for cursor. */
+    TCL_UNUSED(Tk_Window),		/* Window in which cursor will be used. */
+    TCL_UNUSED(const char *),		/* Bitmap data for cursor shape. */
+    TCL_UNUSED(const char *),		/* Bitmap data for cursor mask. */
+    TCL_UNUSED(int),	/* Dimensions of cursor. */
+    TCL_UNUSED(int),
+    TCL_UNUSED(int),		/* Location of hot-spot in cursor. */
+    TCL_UNUSED(int),
+    TCL_UNUSED(XColor),		/* Foreground color for cursor. */
+    TCL_UNUSED(XColor))		/* Background color for cursor. */
 {
     return NULL;
 }
diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c
index c2b1b15..42cb4a5 100644
--- a/macosx/tkMacOSXDialog.c
+++ b/macosx/tkMacOSXDialog.c
@@ -870,15 +870,15 @@ Tk_GetOpenFileObjCmd(
 		selectedFilterIndex = filterInfo.fileTypeIndex;  // The preselection from the typevariable
 		selectedFilter = [filterInfo.fileTypeNames objectAtIndex:selectedFilterIndex];
 	    } else {
-		NSUInteger i;
+		NSUInteger j;
 
-		for (i = 0; i < [filterInfo.fileTypeNames count]; i++) {
-		    if (filterCompatible(extension, i)) {
-			selectedFilterIndex = i;
+		for (j = 0; j < [filterInfo.fileTypeNames count]; j++) {
+		    if (filterCompatible(extension, j)) {
+			selectedFilterIndex = j;
 			break;
 		    }
 		}
-		if (i == selectedFilterIndex) {
+		if (j == selectedFilterIndex) {
 		    selectedFilter = [filterInfo.fileTypeNames objectAtIndex:selectedFilterIndex];
 		} else {
 		    selectedFilter = @"";
diff --git a/macosx/tkMacOSXFont.c b/macosx/tkMacOSXFont.c
index f7b87dc..34dc8c2 100644
--- a/macosx/tkMacOSXFont.c
+++ b/macosx/tkMacOSXFont.c
@@ -56,25 +56,25 @@ struct SystemFontMapEntry {
 #define ThemeFont(n, ...) { kTheme##n##Font, "system" #n "Font", ##__VA_ARGS__ }
 static const struct SystemFontMapEntry systemFontMap[] = {
     ThemeFont(System, 			"TkDefaultFont", "TkIconFont"),
-    ThemeFont(EmphasizedSystem,		"TkCaptionFont"),
+    ThemeFont(EmphasizedSystem,		"TkCaptionFont", NULL),
     ThemeFont(SmallSystem,		"TkHeadingFont", "TkTooltipFont"),
-    ThemeFont(SmallEmphasizedSystem),
-    ThemeFont(Application,		"TkTextFont"),
-    ThemeFont(Label,			"TkSmallCaptionFont"),
-    ThemeFont(Views),
-    ThemeFont(MenuTitle),
-    ThemeFont(MenuItem,			"TkMenuFont"),
-    ThemeFont(MenuItemMark),
-    ThemeFont(MenuItemCmdKey),
-    ThemeFont(WindowTitle),
-    ThemeFont(PushButton),
-    ThemeFont(UtilityWindowTitle),
-    ThemeFont(AlertHeader),
-    ThemeFont(Toolbar),
-    ThemeFont(MiniSystem),
-    { kThemeSystemFontDetail,		"systemDetailSystemFont" },
-    { kThemeSystemFontDetailEmphasized,	"systemDetailEmphasizedSystemFont" },
-    { -1, NULL }
+    ThemeFont(SmallEmphasizedSystem, NULL, NULL),
+    ThemeFont(Application,		"TkTextFont", NULL),
+    ThemeFont(Label,			"TkSmallCaptionFont", NULL),
+    ThemeFont(Views, NULL, NULL),
+    ThemeFont(MenuTitle, NULL, NULL),
+    ThemeFont(MenuItem,			"TkMenuFont", NULL),
+    ThemeFont(MenuItemMark, NULL, NULL),
+    ThemeFont(MenuItemCmdKey, NULL, NULL),
+    ThemeFont(WindowTitle, NULL, NULL),
+    ThemeFont(PushButton, NULL, NULL),
+    ThemeFont(UtilityWindowTitle, NULL, NULL),
+    ThemeFont(AlertHeader, NULL, NULL),
+    ThemeFont(Toolbar, NULL, NULL),
+    ThemeFont(MiniSystem, NULL, NULL),
+    { kThemeSystemFontDetail,		"systemDetailSystemFont", NULL, NULL },
+    { kThemeSystemFontDetailEmphasized,	"systemDetailEmphasizedSystemFont", NULL, NULL },
+    { -1, NULL, NULL, NULL }
 };
 #undef ThemeFont
 
@@ -162,7 +162,7 @@ static int		CreateNamedSystemFont(Tcl_Interp *interp,
 	 * our string's unicode characters.
 	 */
 	char *p;
-	unsigned int index;
+	NSUInteger index;
 
 	Tcl_DStringInit(&_ds);
 	Tcl_DStringSetLength(&_ds, 3 * [_string length]);
@@ -550,7 +550,7 @@ TkpFontPkgInit(
 
 TkFont *
 TkpGetNativeFont(
-    Tk_Window tkwin,		/* For display where font will be used. */
+    TCL_UNUSED(Tk_Window),		/* For display where font will be used. */
     const char *name)		/* Platform-specific font name. */
 {
     MacFont *fontPtr = NULL;
@@ -569,7 +569,7 @@ TkpGetNativeFont(
     ctFont = CTFontCreateUIFontForLanguage(
 	    HIThemeGetUIFontType(themeFontId), 0, NULL);
     if (ctFont) {
-	fontPtr = ckalloc(sizeof(MacFont));
+	fontPtr = (MacFont *)ckalloc(sizeof(MacFont));
 	InitFont((NSFont*) ctFont, NULL, fontPtr);
     }
 
@@ -637,7 +637,7 @@ TkpGetFontFromAttributes(
 	Tcl_Panic("Could not determine NSFont from TkFontAttributes");
     }
     if (tkFontPtr == NULL) {
-	fontPtr = ckalloc(sizeof(MacFont));
+	fontPtr = (MacFont *)ckalloc(sizeof(MacFont));
     } else {
 	fontPtr = (MacFont *) tkFontPtr;
 	TkpDeleteFont(tkFontPtr);
@@ -699,7 +699,7 @@ TkpDeleteFont(
 void
 TkpGetFontFamilies(
     Tcl_Interp *interp,		/* Interp to hold result. */
-    Tk_Window tkwin)		/* For display to query. */
+    TCL_UNUSED(Tk_Window))		/* For display to query. */
 {
     Tcl_Obj *resultPtr = Tcl_NewListObj(0, NULL);
     NSArray *list = [[NSFontManager sharedFontManager] availableFontFamilies];
@@ -772,7 +772,7 @@ TkpGetSubFonts(
 
 void
 TkpGetFontAttrsForChar(
-    Tk_Window tkwin,		/* Window on the font's display */
+    TCL_UNUSED(Tk_Window),		/* Window on the font's display */
     Tk_Font tkfont,		/* Font to query */
     int c,         		/* Character of interest */
     TkFontAttributes* faPtr)	/* Output: Font attributes */
@@ -1162,7 +1162,7 @@ TkpDrawCharsInContext(
 
 void
 TkpDrawAngledCharsInContext(
-    Display *display,		/* Display on which to draw. */
+    TCL_UNUSED(Display *),		/* Display on which to draw. */
     Drawable drawable,		/* Window or pixmap in which to draw. */
     GC gc,			/* Graphics context for drawing characters. */
     Tk_Font tkfont,		/* Font in which characters will be drawn; must
@@ -1206,6 +1206,7 @@ TkpDrawAngledCharsInContext(
     if (!string) {
 	return;
     }
+
     context = drawingContext.context;
     fg = TkMacOSXCreateCGColor(gc, gc->foreground);
     attributes = [fontPtr->nsAttributes mutableCopy];
@@ -1325,8 +1326,8 @@ TkMacOSXNSFontAttributesForFont(
 
 int
 TkMacOSXIsCharacterMissing(
-    Tk_Font tkfont,		/* The font we are looking in. */
-    unsigned int searchChar)	/* The character we are looking for. */
+    TCL_UNUSED(Tk_Font),		/* The font we are looking in. */
+    TCL_UNUSED(unsigned int))	/* The character we are looking for. */
 {
     return 0;
 }
@@ -1365,8 +1366,8 @@ TkMacOSXFontDescriptionForNSFontAndNSFontAttributes(
 		NSStrikethroughStyleAttributeName];
 
 	objv[i++] = Tcl_NewStringObj(familyName, -1);
-	objv[i++] = Tcl_NewIntObj([nsFont pointSize]);
-#define S(s)    Tcl_NewStringObj(STRINGIFY(s),(int)(sizeof(STRINGIFY(s))-1))
+	objv[i++] = Tcl_NewWideIntObj([nsFont pointSize]);
+#define S(s)    Tcl_NewStringObj(STRINGIFY(s), (sizeof(STRINGIFY(s))-1))
 	objv[i++] = (traits & NSBoldFontMask)	? S(bold)   : S(normal);
 	objv[i++] = (traits & NSItalicFontMask)	? S(italic) : S(roman);
 	if ([underline respondsToSelector:@selector(intValue)] &&
diff --git a/macosx/tkMacOSXKeyboard.c b/macosx/tkMacOSXKeyboard.c
index 378c30e..b9bf3be 100644
--- a/macosx/tkMacOSXKeyboard.c
+++ b/macosx/tkMacOSXKeyboard.c
@@ -151,6 +151,7 @@ static int	KeyDataToUnicode(UniChar *uniChars, int maxChars,
 @implementation TKApplication(TKKeyboard)
 - (void) keyboardChanged: (NSNotification *) notification
 {
+    (void)notification;
 #ifdef TK_MAC_DEBUG_NOTIFICATIONS
     TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification);
 #else
@@ -662,7 +663,7 @@ XKeysymToKeycode(
 	macKC.x.keychar = (unsigned int) data;
 	hPtr = Tcl_FindHashEntry(&unichar2xvirtual, INT2PTR(macKC.x.keychar));
 	if (hPtr != NULL) {
-	    unsigned long data = (unsigned long) Tcl_GetHashValue(hPtr);
+	    data = (unsigned long) Tcl_GetHashValue(hPtr);
 	    macKC.x.xvirtual = (unsigned int) data;
 	}
     }
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c
index 8005517..3d5a996 100644
--- a/macosx/tkMacOSXMenu.c
+++ b/macosx/tkMacOSXMenu.c
@@ -36,19 +36,19 @@
 #define SPECIALMENU(n, f) {.name = "." #n, .len = sl(#n) + 1, \
 	.flag = ENTRY_##f##_MENU }
 static const struct {
-    const char *name; const size_t len; const int flag;
+    const char *name; size_t len; int flag;
 } specialMenus[] = {
     SPECIALMENU(help,	HELP),
     SPECIALMENU(apple,	APPLE),
     SPECIALMENU(window,	WINDOWS),
-    {NULL}
+    {NULL, 0, 0}
 };
 #undef SPECIALMENU
 
 #define MODIFIER(n, f) {.name = #n, .len = sl(#n), .mask = f }
 static const struct {
-    const char *name; const size_t len; const NSUInteger mask;
-} modifiers[] = {
+    const char *name; size_t len; NSUInteger mask;
+} allModifiers[] = {
     MODIFIER(Control,	NSControlKeyMask),
     MODIFIER(Ctrl,	NSControlKeyMask),
     MODIFIER(Option,	NSAlternateKeyMask),
@@ -58,13 +58,13 @@ static const struct {
     MODIFIER(Command,	NSCommandKeyMask),
     MODIFIER(Cmd,	NSCommandKeyMask),
     MODIFIER(Meta,	NSCommandKeyMask),
-    {NULL}
+    {NULL, 0, 0}
 };
 #undef MODIFIER
 
 #define ACCEL(n, c) {.name = #n, .len = sl(#n), .ch = c }
 static const struct {
-    const char *name; const size_t len; const UniChar ch;
+    const char *name; size_t len; UniChar ch;
 } specialAccelerators[] = {
     ACCEL(PageUp,	NSPageUpFunctionKey),
     ACCEL(PageDown,	NSPageDownFunctionKey),
@@ -86,7 +86,7 @@ static const struct {
     ACCEL(Help,		NSHelpFunctionKey),
     ACCEL(Power,	0x233d),
     ACCEL(Eject,	0xf804),
-    {NULL}
+    {NULL, 0, 0}
 };
 #undef ACCEL
 #undef sl
@@ -348,6 +348,8 @@ TKBackgroundLoop *backgroundLoop = nil;
 - (BOOL) menuHasKeyEquivalent: (NSMenu *) menu forEvent: (NSEvent *) event
 	target: (id *) target action: (SEL *) action
 {
+    (void)menu;
+
     /*
      * Use lowercaseString when comparing keyEquivalents since the notion of
      * a shifted upper case letter does not make much sense.
@@ -404,6 +406,8 @@ TKBackgroundLoop *backgroundLoop = nil;
 
 - (void) menuWillOpen: (NSMenu *) menu
 {
+    (void)menu;
+
     if (_tkMenu) {
 	//RecursivelyClearActiveMenu(_tkMenu);
 	GenerateMenuSelectEvent((TKMenu *)[self supermenu],
@@ -413,6 +417,8 @@ TKBackgroundLoop *backgroundLoop = nil;
 
 - (void) menuDidClose: (NSMenu *) menu
 {
+    (void)menu;
+
     if (_tkMenu) {
 	RecursivelyClearActiveMenu(_tkMenu);
     }
@@ -420,6 +426,8 @@ TKBackgroundLoop *backgroundLoop = nil;
 
 - (void) menu: (NSMenu *) menu willHighlightItem: (NSMenuItem *) item
 {
+    (void)menu;
+
     if (_tkMenu) {
 	GenerateMenuSelectEvent(self, item);
     }
@@ -428,6 +436,7 @@ TKBackgroundLoop *backgroundLoop = nil;
 - (void) menuNeedsUpdate: (NSMenu *) menu
 {
     TkMenu *menuPtr = (TkMenu *) _tkMenu;
+    (void)menu;
 
     if (menuPtr) {
 	Tcl_Interp *interp = menuPtr->interp;
@@ -453,6 +462,7 @@ TKBackgroundLoop *backgroundLoop = nil;
 
 - (void) menuBeginTracking: (NSNotification *) notification
 {
+    (void)notification;
 #ifdef TK_MAC_DEBUG_NOTIFICATIONS
     TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification);
 #endif
@@ -468,6 +478,7 @@ TKBackgroundLoop *backgroundLoop = nil;
 
 - (void) menuEndTracking: (NSNotification *) notification
 {
+    (void)notification;
 #ifdef TK_MAC_DEBUG_NOTIFICATIONS
     TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification);
 #endif
@@ -701,7 +712,6 @@ TkpConfigureMenuEntry(
 	image = TkMacOSXGetNSImageFromBitmap(mePtr->menuPtr->display, bitmap,
 		gc, imageWidth, imageHeight);
 	if (gc->foreground == defaultFg) {
-	    // Use a semantic foreground color by default
 	    [image setTemplate:YES];
 	}
     }
@@ -857,7 +867,7 @@ TkpDestroyMenuEntry(
 
 int
 TkpPostMenu(
-    Tcl_Interp *interp,		/* The interpreter this menu lives in */
+    TCL_UNUSED(Tcl_Interp *),		/* The interpreter this menu lives in */
     TkMenu *menuPtr,		/* The menu we are posting */
     int x, int y,		/* The screen coordinates where the top left
 				 * corner of the menu, or of the specified
@@ -954,7 +964,7 @@ TkpPostMenu(
 
 int
 TkpPostTearoffMenu(
-    Tcl_Interp *interp,		/* The interpreter this menu lives in */
+    TCL_UNUSED(Tcl_Interp *),	/* The interpreter this menu lives in */
     TkMenu *menuPtr,		/* The menu we are posting */
     int x, int y, int index)	/* The screen coordinates where the top left
 				 * corner of the menu, or of the specified
@@ -1217,18 +1227,18 @@ ParseAccelerator(
     *maskPtr = 0;
     while (1) {
 	i = 0;
-	while (modifiers[i].name) {
-	    int l = modifiers[i].len;
+	while (allModifiers[i].name) {
+	    int l = allModifiers[i].len;
 
-	    if (!strncasecmp(accel, modifiers[i].name, l) &&
+	    if (!strncasecmp(accel, allModifiers[i].name, l) &&
 		    (accel[l] == '-' || accel[l] == '+')) {
-		*maskPtr |= modifiers[i].mask;
+		*maskPtr |= allModifiers[i].mask;
 		accel += l+1;
 		break;
 	    }
 	    i++;
 	}
-	if (!modifiers[i].name || !*accel) {
+	if (!allModifiers[i].name || !*accel) {
 	    break;
 	}
     }
@@ -1452,14 +1462,14 @@ TkpComputeStandardMenuGeometry(
 		}
 	    } else {
 		NSUInteger modifMask = [menuItem keyEquivalentModifierMask];
-		int i = 0;
+		int j = 0;
 
-		while (modifiers[i].name) {
-		    if (modifMask & modifiers[i].mask) {
-			modifMask &= ~modifiers[i].mask;
+		while (allModifiers[j].name) {
+		    if (modifMask & allModifiers[j].mask) {
+			modifMask &= ~allModifiers[j].mask;
 			modifierWidth += modifierCharWidth;
 		    }
-		    i++;
+		    j++;
 		}
 		accelWidth = [[menuItem keyEquivalent] sizeWithAttributes:
 			TkMacOSXNSFontAttributesForFont(tkfont)].width;
@@ -1763,8 +1773,8 @@ TkpMenuThreadInit(void)
 
 void
 TkpMenuNotifyToplevelCreate(
-    Tcl_Interp *interp,		/* The interp the menu lives in. */
-    const char *menuName)	/* The name of the menu to reconfigure. */
+    TCL_UNUSED(Tcl_Interp *),	/* The interp the menu lives in. */
+    TCL_UNUSED(const char *))	/* The name of the menu to reconfigure. */
 {
     /*
      * Nothing to do.
@@ -1792,8 +1802,8 @@ TkpMenuNotifyToplevelCreate(
 
 void
 TkpInitializeMenuBindings(
-    Tcl_Interp *interp,		/* The interpreter to set. */
-    Tk_BindingTable bindingTable)
+    TCL_UNUSED(Tcl_Interp *),		/* The interpreter to set. */
+    TCL_UNUSED(Tk_BindingTable))
 				/* The table to add to. */
 {
     /*
@@ -1846,17 +1856,17 @@ TkpComputeMenubarGeometry(
 
 void
 TkpDrawMenuEntry(
-    TkMenuEntry *mePtr,		/* The entry to draw */
-    Drawable d,			/* What to draw into */
-    Tk_Font tkfont,		/* Precalculated font for menu */
-    const Tk_FontMetrics *menuMetricsPtr,
+    TCL_UNUSED(TkMenuEntry *),		/* The entry to draw */
+    TCL_UNUSED(Drawable),			/* What to draw into */
+    TCL_UNUSED(Tk_Font),		/* Precalculated font for menu */
+    TCL_UNUSED(const Tk_FontMetrics *),
 				/* Precalculated metrics for menu */
-    int x,			/* X-coordinate of topleft of entry */
-    int y,			/* Y-coordinate of topleft of entry */
-    int width,			/* Width of the entry rectangle */
-    int height,			/* Height of the current rectangle */
-    int strictMotif,		/* Boolean flag */
-    int drawArrow)		/* Whether or not to draw the cascade arrow
+    TCL_UNUSED(int),			/* X-coordinate of topleft of entry */
+    TCL_UNUSED(int),			/* Y-coordinate of topleft of entry */
+    TCL_UNUSED(int),			/* Width of the entry rectangle */
+    TCL_UNUSED(int),			/* Height of the current rectangle */
+    TCL_UNUSED(int),		/* Boolean flag */
+    TCL_UNUSED(int))		/* Whether or not to draw the cascade arrow
 				 * for cascade items. */
 {
 }
@@ -1905,7 +1915,7 @@ TkMacOSXPreprocessMenu(void)
 
 int
 TkMacOSXUseMenuID(
-    short macID)		/* The id to take out of the table */
+    TCL_UNUSED(short))		/* The id to take out of the table */
 {
     return TCL_OK;
 }
@@ -1928,8 +1938,8 @@ TkMacOSXUseMenuID(
 
 int
 TkMacOSXDispatchMenuEvent(
-    int menuID,			/* The menu id of the menu we are invoking */
-    int index)			/* The one-based index of the item that was
+    TCL_UNUSED(int),			/* The menu id of the menu we are invoking */
+    TCL_UNUSED(int))			/* The one-based index of the item that was
 				 * selected. */
 {
     return TCL_ERROR;
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h
index 8cb3e15..4c07557 100644
--- a/macosx/tkMacOSXPrivate.h
+++ b/macosx/tkMacOSXPrivate.h
@@ -103,11 +103,11 @@
  * debug message in case of failure.
  */
 #define ChkErr(f, ...) ({ \
-	OSStatus err = f(__VA_ARGS__); \
-	if (err != noErr) { \
-	    TkMacOSXDbgOSErr(f, err); \
+	OSStatus err_ = f(__VA_ARGS__); \
+	if (err_ != noErr) { \
+	    TkMacOSXDbgOSErr(f, err_); \
 	} \
-	err;})
+	err_;})
 
 #else /* TK_MAC_DEBUG */
 #define TKLog(f, ...)
diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c
index 87ec507..1e7797d 100644
--- a/macosx/ttkMacOSXTheme.c
+++ b/macosx/ttkMacOSXTheme.c
@@ -169,7 +169,7 @@ static inline CGRect BoxToRect(
  */
 
 static Ttk_StateTable ThemeStateTable[] = {
-    {kThemeStateActive, TTK_STATE_ALTERNATE | TTK_STATE_BACKGROUND},
+    {kThemeStateActive, TTK_STATE_ALTERNATE | TTK_STATE_BACKGROUND, 0},
     {kThemeStateUnavailable, TTK_STATE_DISABLED, 0},
     {kThemeStatePressed, TTK_STATE_PRESSED, 0},
     {kThemeStateInactive, TTK_STATE_BACKGROUND, 0},
@@ -232,11 +232,11 @@ static CGRect NormalizeButtonBounds(
  * support Dark Mode anyway.
  */
 
-static CGFloat windowBackground[4] = {
+static const CGFloat WINDOWBACKGROUND[4] = {
     235.0 / 255, 235.0 / 255, 235.0 / 255, 1.0
 };
-static CGFloat whiteRGBA[4] = {1.0, 1.0, 1.0, 1.0};
-static CGFloat blackRGBA[4] = {0.0, 0.0, 0.0, 1.0};
+static const CGFloat WHITERGBA[4] = {1.0, 1.0, 1.0, 1.0};
+static const CGFloat BLACKRGBA[4] = {0.0, 0.0, 0.0, 1.0};
 
 /*----------------------------------------------------------------------
  * GetBackgroundColor --
@@ -276,7 +276,7 @@ static void GetBackgroundColor(
 	    [windowColor getComponents: rgba];
 	} else {
 	    for (int i = 0; i < 4; i++) {
-		rgba[i] = windowBackground[i];
+		rgba[i] = WINDOWBACKGROUND[i];
 	    }
 	}
     }
@@ -314,7 +314,7 @@ static void DrawDownArrow(
     CGRect bounds,
     CGFloat inset,
     CGFloat size,
-    CGFloat *rgba)
+    const CGFloat *rgba)
 {
     CGFloat x, y;
 
@@ -336,7 +336,7 @@ static void DrawUpArrow(
     CGRect bounds,
     CGFloat inset,
     CGFloat size,
-    CGFloat *rgba)
+    const CGFloat *rgba)
 {
     CGFloat x, y;
 
@@ -406,7 +406,7 @@ static void DrawUpDownArrows(
     CGRect bounds,
     CGFloat inset,
     CGFloat size,
-    CGFloat *rgba)
+    const CGFloat *rgba)
 {
     CGFloat x, y;
 
@@ -633,9 +633,9 @@ static void DrawListHeader(
 	arrowBounds.origin.x = bounds.origin.x + bounds.size.width - 16;
 	arrowBounds.size.width = 16;
 	if (state & TTK_STATE_ALTERNATE) {
-	    DrawUpArrow(context, arrowBounds, 3, 8, blackRGBA);
+	    DrawUpArrow(context, arrowBounds, 3, 8, BLACKRGBA);
 	} else if (state & TTK_STATE_SELECTED) {
-	    DrawDownArrow(context, arrowBounds, 3, 8, blackRGBA);
+	    DrawDownArrow(context, arrowBounds, 3, 8, BLACKRGBA);
 	}
     }
 }
@@ -757,9 +757,9 @@ static void DrawDarkButton(
 		darkSelectedGradient, 2);
 	}
 	if (kind == kThemePopupButton) {
-	    DrawUpDownArrows(context, arrowBounds, 3, 7, whiteRGBA);
+	    DrawUpDownArrows(context, arrowBounds, 3, 7, WHITERGBA);
 	} else {
-	    DrawDownArrow(context, arrowBounds, 4, 8, whiteRGBA);
+	    DrawDownArrow(context, arrowBounds, 4, 8, WHITERGBA);
 	}
     }
 
@@ -818,7 +818,7 @@ static void DrawDarkIncDecButton(
 	    darkSelectedGradient, 2);
 	CGContextRestoreGState(context);
     }
-    DrawUpDownArrows(context, bounds, 3, 5, whiteRGBA);
+    DrawUpDownArrows(context, bounds, 3, 5, WHITERGBA);
     HighlightButtonBorder(context, bounds);
 }
 
@@ -1245,9 +1245,9 @@ static void DrawDarkListHeader(
 	arrowBounds.origin.x = bounds.origin.x + bounds.size.width - 16;
 	arrowBounds.size.width = 16;
 	if (state & TTK_STATE_ALTERNATE) {
-	    DrawUpArrow(context, arrowBounds, 3, 8, whiteRGBA);
+	    DrawUpArrow(context, arrowBounds, 3, 8, WHITERGBA);
 	} else if (state & TTK_STATE_SELECTED) {
-	    DrawDownArrow(context, arrowBounds, 3, 8, whiteRGBA);
+	    DrawDownArrow(context, arrowBounds, 3, 8, WHITERGBA);
 	}
     }
 }
@@ -1277,7 +1277,7 @@ static ThemeButtonParams
     ListHeaderParams =
 {kThemeListHeaderButton, kThemeMetricListHeaderHeight};
 static Ttk_StateTable ButtonValueTable[] = {
-    {kThemeButtonOff, TTK_STATE_ALTERNATE | TTK_STATE_BACKGROUND},
+    {kThemeButtonOff, TTK_STATE_ALTERNATE | TTK_STATE_BACKGROUND, 0},
     {kThemeButtonMixed, TTK_STATE_ALTERNATE, 0},
     {kThemeButtonOn, TTK_STATE_SELECTED, 0},
     {kThemeButtonOff, 0, 0}
@@ -1306,7 +1306,7 @@ static Ttk_StateTable ButtonAdornmentTable[] = {
 static inline HIThemeButtonDrawInfo computeButtonDrawInfo(
     ThemeButtonParams *params,
     Ttk_State state,
-    Tk_Window tkwin)
+    TCL_UNUSED(Tk_Window))
 {
 
     /*
@@ -1342,13 +1342,13 @@ static inline HIThemeButtonDrawInfo computeButtonDrawInfo(
 
 static void ButtonElementMinSize(
     void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
+    TCL_UNUSED(void *),
+    TCL_UNUSED(Tk_Window),
     int *minWidth,
     int *minHeight,
-    Ttk_Padding *paddingPtr)
+    TCL_UNUSED(Ttk_Padding *))
 {
-    ThemeButtonParams *params = clientData;
+    ThemeButtonParams *params = (ThemeButtonParams *)clientData;
 
     if (params->heightMetric != NoThemeMetric) {
 	ChkErr(GetThemeMetric, params->heightMetric, minHeight);
@@ -1420,7 +1420,7 @@ static void ButtonElementSize(
 
 static void ButtonElementDraw(
     void *clientData,
-    void *elementRecord,
+    TCL_UNUSED(void *),
     Tk_Window tkwin,
     Drawable d,
     Ttk_Box b,
@@ -1510,25 +1510,25 @@ static Ttk_ElementSpec ButtonElementSpec = {
 
 /* Tab position logic, c.f. ttkNotebook.c TabState() */
 static Ttk_StateTable TabStyleTable[] = {
-    {kThemeTabFrontInactive, TTK_STATE_SELECTED | TTK_STATE_BACKGROUND},
-    {kThemeTabNonFrontInactive, TTK_STATE_BACKGROUND},
-    {kThemeTabFrontUnavailable, TTK_STATE_DISABLED | TTK_STATE_SELECTED},
-    {kThemeTabNonFrontUnavailable, TTK_STATE_DISABLED},
-    {kThemeTabFront, TTK_STATE_SELECTED},
-    {kThemeTabNonFrontPressed, TTK_STATE_PRESSED},
-    {kThemeTabNonFront, 0}
+    {kThemeTabFrontInactive, TTK_STATE_SELECTED | TTK_STATE_BACKGROUND, 0},
+    {kThemeTabNonFrontInactive, TTK_STATE_BACKGROUND, 0},
+    {kThemeTabFrontUnavailable, TTK_STATE_DISABLED | TTK_STATE_SELECTED, 0},
+    {kThemeTabNonFrontUnavailable, TTK_STATE_DISABLED, 0},
+    {kThemeTabFront, TTK_STATE_SELECTED, 0},
+    {kThemeTabNonFrontPressed, TTK_STATE_PRESSED, 0},
+    {kThemeTabNonFront, 0, 0}
 };
 static Ttk_StateTable TabAdornmentTable[] = {
-    {kHIThemeTabAdornmentNone, TTK_STATE_FIRST_TAB | TTK_STATE_LAST_TAB},
-    {kHIThemeTabAdornmentTrailingSeparator, TTK_STATE_FIRST_TAB},
-    {kHIThemeTabAdornmentNone, TTK_STATE_LAST_TAB},
-    {kHIThemeTabAdornmentTrailingSeparator, 0},
+    {kHIThemeTabAdornmentNone, TTK_STATE_FIRST_TAB | TTK_STATE_LAST_TAB, 0},
+    {kHIThemeTabAdornmentTrailingSeparator, TTK_STATE_FIRST_TAB, 0},
+    {kHIThemeTabAdornmentNone, TTK_STATE_LAST_TAB, 0},
+    {kHIThemeTabAdornmentTrailingSeparator, 0, 0},
 };
 static Ttk_StateTable TabPositionTable[] = {
-    {kHIThemeTabPositionOnly, TTK_STATE_FIRST_TAB | TTK_STATE_LAST_TAB},
-    {kHIThemeTabPositionFirst, TTK_STATE_FIRST_TAB},
-    {kHIThemeTabPositionLast, TTK_STATE_LAST_TAB},
-    {kHIThemeTabPositionMiddle, 0},
+    {kHIThemeTabPositionOnly, TTK_STATE_FIRST_TAB | TTK_STATE_LAST_TAB, 0},
+    {kHIThemeTabPositionFirst, TTK_STATE_FIRST_TAB, 0},
+    {kHIThemeTabPositionLast, TTK_STATE_LAST_TAB, 0},
+    {kHIThemeTabPositionMiddle, 0, 0},
 };
 
 /*
@@ -1572,10 +1572,10 @@ static Ttk_StateTable TabPositionTable[] = {
  */
 
 static void TabElementSize(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
-    int *minWidth,
+    TCL_UNUSED(void *),
+    TCL_UNUSED(void *),
+    TCL_UNUSED(Tk_Window),
+    TCL_UNUSED(int *),
     int *minHeight,
     Ttk_Padding *paddingPtr)
 {
@@ -1585,8 +1585,8 @@ static void TabElementSize(
 }
 
 static void TabElementDraw(
-    void *clientData,
-    void *elementRecord,
+    TCL_UNUSED(void *),
+    TCL_UNUSED(void *),
     Tk_Window tkwin,
     Drawable d,
     Ttk_Box b,
@@ -1626,19 +1626,19 @@ static Ttk_ElementSpec TabElementSpec = {
  */
 
 static void PaneElementSize(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
-    int *minWidth,
-    int *minHeight,
+    TCL_UNUSED(void *),
+    TCL_UNUSED(void *),
+    TCL_UNUSED(Tk_Window),
+    TCL_UNUSED(int *),
+    TCL_UNUSED(int *),
     Ttk_Padding *paddingPtr)
 {
     *paddingPtr = Ttk_MakePadding(9, 5, 9, 9);
 }
 
 static void PaneElementDraw(
-    void *clientData,
-    void *elementRecord,
+    TCL_UNUSED(void *),
+    TCL_UNUSED(void *),
     Tk_Window tkwin,
     Drawable d,
     Ttk_Box b,
@@ -1687,19 +1687,19 @@ static Ttk_ElementSpec PaneElementSpec = {
  */
 
 static void GroupElementSize(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
-    int *minWidth,
-    int *minHeight,
+    TCL_UNUSED(void *),
+    TCL_UNUSED(void *),
+    TCL_UNUSED(Tk_Window),
+    TCL_UNUSED(int *),
+    TCL_UNUSED(int *),
     Ttk_Padding *paddingPtr)
 {
     *paddingPtr = Ttk_UniformPadding(4);
 }
 
 static void GroupElementDraw(
-    void *clientData,
-    void *elementRecord,
+    TCL_UNUSED(void *),
+    TCL_UNUSED(void *),
     Tk_Window tkwin,
     Drawable d,
     Ttk_Box b,
@@ -1748,22 +1748,22 @@ static Ttk_ElementOptionSpec EntryElementOptions[] = {
      Tk_Offset(EntryElement, backgroundObj), ENTRY_DEFAULT_BACKGROUND},
     {"-fieldbackground", TK_OPTION_BORDER,
      Tk_Offset(EntryElement, fieldbackgroundObj), ENTRY_DEFAULT_BACKGROUND},
-    {0}
+    {NULL, TK_OPTION_BOOLEAN, 0, NULL}
 };
 
 static void EntryElementSize(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
-    int *minWidth,
-    int *minHeight,
+    TCL_UNUSED(void *),
+    TCL_UNUSED(void *),
+    TCL_UNUSED(Tk_Window),
+    TCL_UNUSED(int *),
+    TCL_UNUSED(int *),
     Ttk_Padding *paddingPtr)
 {
     *paddingPtr = Ttk_MakePadding(7, 5, 7, 6);
 }
 
 static void EntryElementDraw(
-    void *clientData,
+    TCL_UNUSED(void *),
     void *elementRecord,
     Tk_Window tkwin,
     Drawable d,
@@ -1875,9 +1875,9 @@ static Ttk_ElementSpec EntryElementSpec = {
 static Ttk_Padding ComboboxPadding = {4, 2, 20, 2};
 
 static void ComboboxElementSize(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
+    TCL_UNUSED(void *),
+    TCL_UNUSED(void *),
+    TCL_UNUSED(Tk_Window),
     int *minWidth,
     int *minHeight,
     Ttk_Padding *paddingPtr)
@@ -1888,8 +1888,8 @@ static void ComboboxElementSize(
 }
 
 static void ComboboxElementDraw(
-    void *clientData,
-    void *elementRecord,
+    TCL_UNUSED(void *),
+    TCL_UNUSED(void *),
     Tk_Window tkwin,
     Drawable d,
     Ttk_Box b,
@@ -1953,12 +1953,12 @@ static Ttk_ElementSpec ComboboxElementSpec = {
 static Ttk_Padding SpinbuttonMargins = {0, 0, 2, 0};
 
 static void SpinButtonUpElementSize(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
+    TCL_UNUSED(void *),
+    TCL_UNUSED(void *),
+    TCL_UNUSED(Tk_Window),
     int *minWidth,
     int *minHeight,
-    Ttk_Padding *paddingPtr)
+    TCL_UNUSED(Ttk_Padding *))
 {
     SInt32 s;
 
@@ -1969,8 +1969,8 @@ static void SpinButtonUpElementSize(
 }
 
 static void SpinButtonUpElementDraw(
-    void *clientData,
-    void *elementRecord,
+    TCL_UNUSED(void *),
+    TCL_UNUSED(void *),
     Tk_Window tkwin,
     Drawable d,
     Ttk_Box b,
@@ -2010,12 +2010,12 @@ static Ttk_ElementSpec SpinButtonUpElementSpec = {
     SpinButtonUpElementDraw
 };
 static void SpinButtonDownElementSize(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
+    TCL_UNUSED(void *),
+    TCL_UNUSED(void *),
+    TCL_UNUSED(Tk_Window),
     int *minWidth,
     int *minHeight,
-    Ttk_Padding *paddingPtr)
+    TCL_UNUSED(Ttk_Padding *))
 {
     SInt32 s;
 
@@ -2026,8 +2026,8 @@ static void SpinButtonDownElementSize(
 }
 
 static void SpinButtonDownElementDraw(
-    void *clientData,
-    void *elementRecord,
+    TCL_UNUSED(void *),
+    TCL_UNUSED(void *),
     Tk_Window tkwin,
     Drawable d,
     Ttk_Box b,
@@ -2104,21 +2104,21 @@ typedef struct {
 } TrackElement;
 
 static Ttk_ElementOptionSpec TrackElementOptions[] = {
-    {"-from", TK_OPTION_DOUBLE, Tk_Offset(TrackElement, fromObj)},
-    {"-to", TK_OPTION_DOUBLE, Tk_Offset(TrackElement, toObj)},
-    {"-value", TK_OPTION_DOUBLE, Tk_Offset(TrackElement, valueObj)},
-    {"-orient", TK_OPTION_STRING, Tk_Offset(TrackElement, orientObj)},
-    {0, 0, 0}
+    {"-from", TK_OPTION_DOUBLE, Tk_Offset(TrackElement, fromObj), NULL},
+    {"-to", TK_OPTION_DOUBLE, Tk_Offset(TrackElement, toObj), NULL},
+    {"-value", TK_OPTION_DOUBLE, Tk_Offset(TrackElement, valueObj), NULL},
+    {"-orient", TK_OPTION_STRING, Tk_Offset(TrackElement, orientObj), NULL},
+    {NULL, TK_OPTION_BOOLEAN, 0, NULL}
 };
 static void TrackElementSize(
     void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
+    TCL_UNUSED(void *),
+    TCL_UNUSED(Tk_Window),
     int *minWidth,
     int *minHeight,
-    Ttk_Padding *paddingPtr)
+    TCL_UNUSED(Ttk_Padding *))
 {
-    TrackElementData *data = clientData;
+    TrackElementData *data = (TrackElementData *)clientData;
     SInt32 size = 24;   /* reasonable default ... */
 
     ChkErr(GetThemeMetric, data->thicknessMetric, &size);
@@ -2137,6 +2137,7 @@ static void TrackElementDraw(
     TrackElement *elem = elementRecord;
     int orientation = TTK_ORIENT_HORIZONTAL;
     double from = 0, to = 100, value = 0, factor;
+    CGRect bounds;
 
     Ttk_GetOrientFromObj(NULL, elem->orientObj, &orientation);
     Tcl_GetDoubleFromObj(NULL, elem->fromObj, &from);
@@ -2149,7 +2150,7 @@ static void TrackElementDraw(
      * bounds variable avoids UBSan (-fsanitize=alignment) complaints.
      */
 
-    CGRect bounds = BoxToRect(d, b);
+    bounds = BoxToRect(d, b);
     HIThemeTrackDrawInfo info = {
 	.version = 0,
 	.kind = data->kind,
@@ -2175,7 +2176,7 @@ static void TrackElementDraw(
     }
     BEGIN_DRAWING(d)
     if (TkMacOSXInDarkMode(tkwin)) {
-	CGRect bounds = BoxToRect(d, b);
+	bounds = BoxToRect(d, b);
 	NSColorSpace *deviceRGB = [NSColorSpace deviceRGBColorSpace];
 	NSColor *trackColor = [NSColor colorWithColorSpace: deviceRGB
 	    components: darkTrack
@@ -2209,12 +2210,12 @@ static Ttk_ElementSpec TrackElementSpec = {
  */
 
 static void SliderElementSize(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
+    TCL_UNUSED(void *),
+    TCL_UNUSED(void *),
+    TCL_UNUSED(Tk_Window),
     int *minWidth,
     int *minHeight,
-    Ttk_Padding *paddingPtr)
+    TCL_UNUSED(Ttk_Padding *))
 {
     *minWidth = *minHeight = 24;
 }
@@ -2254,15 +2255,15 @@ static Ttk_ElementOptionSpec PbarElementOptions[] = {
      Tk_Offset(PbarElement, phaseObj), "0"},
     {"-mode", TK_OPTION_STRING,
      Tk_Offset(PbarElement, modeObj), "determinate"},
-    {0, 0, 0, 0}
+    {NULL, TK_OPTION_BOOLEAN, 0, NULL}
 };
 static void PbarElementSize(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
+    TCL_UNUSED(void *),
+    TCL_UNUSED(void *),
+    TCL_UNUSED(Tk_Window),
     int *minWidth,
     int *minHeight,
-    Ttk_Padding *paddingPtr)
+    TCL_UNUSED(Ttk_Padding *))
 {
     SInt32 size = 24;           /* @@@ Check HIG for correct default */
 
@@ -2271,7 +2272,7 @@ static void PbarElementSize(
 }
 
 static void PbarElementDraw(
-    void *clientData,
+    TCL_UNUSED(void *),
     void *elementRecord,
     Tk_Window tkwin,
     Drawable d,
@@ -2281,6 +2282,7 @@ static void PbarElementDraw(
     PbarElement *pbar = elementRecord;
     int orientation = TTK_ORIENT_HORIZONTAL, phase = 0;
     double value = 0, maximum = 100, factor;
+    CGRect bounds;
 
     Ttk_GetOrientFromObj(NULL, pbar->orientObj, &orientation);
     Tcl_GetDoubleFromObj(NULL, pbar->valueObj, &value);
@@ -2293,7 +2295,7 @@ static void PbarElementDraw(
      * bounds variable avoids UBSan (-fsanitize=alignment) complaints.
      */
 
-    CGRect bounds = BoxToRect(d, b);
+    bounds = BoxToRect(d, b);
     HIThemeTrackDrawInfo info = {
 	.version = 0,
 	.kind =
@@ -2313,7 +2315,7 @@ static void PbarElementDraw(
 
     BEGIN_DRAWING(d)
     if (TkMacOSXInDarkMode(tkwin)) {
-	CGRect bounds = BoxToRect(d, b);
+	bounds = BoxToRect(d, b);
 	NSColorSpace *deviceRGB = [NSColorSpace deviceRGBColorSpace];
 	NSColor *trackColor = [NSColor colorWithColorSpace: deviceRGB
 	    components: darkTrack
@@ -2349,12 +2351,12 @@ typedef struct
 static Ttk_ElementOptionSpec ScrollbarElementOptions[] = {
     {"-orient", TK_OPTION_STRING,
      Tk_Offset(ScrollbarElement, orientObj), "horizontal"},
-    {0, 0, 0, 0}
+    {NULL, TK_OPTION_BOOLEAN, 0, NULL}
 };
 static void TroughElementSize(
-    void *clientData,
+    TCL_UNUSED(void *),
     void *elementRecord,
-    Tk_Window tkwin,
+    TCL_UNUSED(Tk_Window),
     int *minWidth,
     int *minHeight,
     Ttk_Padding *paddingPtr)
@@ -2393,12 +2395,12 @@ static CGFloat darkActiveThumb[4] = {
     158.0 / 255, 158.0 / 255, 159.0 / 255, 1.0
 };
 static void TroughElementDraw(
-    void *clientData,
+    TCL_UNUSED(void *),
     void *elementRecord,
     Tk_Window tkwin,
     Drawable d,
     Ttk_Box b,
-    Ttk_State state)
+    TCL_UNUSED(Ttk_State))
 {
     ScrollbarElement *scrollbar = elementRecord;
     int orientation = TTK_ORIENT_HORIZONTAL;
@@ -2435,12 +2437,12 @@ static Ttk_ElementSpec TroughElementSpec = {
     TroughElementDraw
 };
 static void ThumbElementSize(
-    void *clientData,
+    TCL_UNUSED(void *),
     void *elementRecord,
-    Tk_Window tkwin,
+    TCL_UNUSED(Tk_Window),
     int *minWidth,
     int *minHeight,
-    Ttk_Padding *paddingPtr)
+    TCL_UNUSED(Ttk_Padding *))
 {
     ScrollbarElement *scrollbar = elementRecord;
     int orientation = TTK_ORIENT_HORIZONTAL;
@@ -2456,7 +2458,7 @@ static void ThumbElementSize(
 }
 
 static void ThumbElementDraw(
-    void *clientData,
+    TCL_UNUSED(void *),
     void *elementRecord,
     Tk_Window tkwin,
     Drawable d,
@@ -2571,12 +2573,12 @@ static Ttk_ElementSpec ThumbElementSpec = {
     ThumbElementDraw
 };
 static void ArrowElementSize(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
+    TCL_UNUSED(void *),
+    TCL_UNUSED(void *),
+    TCL_UNUSED(Tk_Window),
     int *minWidth,
     int *minHeight,
-    Ttk_Padding *paddingPtr)
+    TCL_UNUSED(Ttk_Padding *))
 {
     if ([NSApp macOSVersion] < 100800) {
 	*minHeight = *minWidth = 14;
@@ -2602,19 +2604,19 @@ static Ttk_ElementSpec ArrowElementSpec = {
  */
 
 static void SeparatorElementSize(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
+    TCL_UNUSED(void *),
+    TCL_UNUSED(void *),
+    TCL_UNUSED(Tk_Window),
     int *minWidth,
     int *minHeight,
-    Ttk_Padding *paddingPtr)
+    TCL_UNUSED(Ttk_Padding *))
 {
     *minWidth = *minHeight = 1;
 }
 
 static void SeparatorElementDraw(
-    void *clientData,
-    void *elementRecord,
+    TCL_UNUSED(void *),
+    TCL_UNUSED(void *),
     Tk_Window tkwin,
     Drawable d,
     Ttk_Box b,
@@ -2654,12 +2656,12 @@ static const ThemeGrowDirection sizegripGrowDirection
     = kThemeGrowRight | kThemeGrowDown;
 
 static void SizegripElementSize(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
+    TCL_UNUSED(void *),
+    TCL_UNUSED(void *),
+    TCL_UNUSED(Tk_Window),
     int *minWidth,
     int *minHeight,
-    Ttk_Padding *paddingPtr)
+    TCL_UNUSED(Ttk_Padding *))
 {
     HIThemeGrowBoxDrawInfo info = {
 	.version = 0,
@@ -2676,9 +2678,9 @@ static void SizegripElementSize(
 }
 
 static void SizegripElementDraw(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
+    TCL_UNUSED(void *),
+    TCL_UNUSED(void *),
+    TCL_UNUSED(Tk_Window),
     Drawable d,
     Ttk_Box b,
     unsigned int state)
@@ -2753,8 +2755,8 @@ static Ttk_ElementSpec SizegripElementSpec = {
  */
 
 static void FillElementDraw(
-    void *clientData,
-    void *elementRecord,
+    TCL_UNUSED(void *),
+    TCL_UNUSED(void *),
     Tk_Window tkwin,
     Drawable d,
     Ttk_Box b,
@@ -2791,7 +2793,7 @@ static void BackgroundElementDraw(
     void *elementRecord,
     Tk_Window tkwin,
     Drawable d,
-    Ttk_Box b,
+    TCL_UNUSED(Ttk_Box),
     unsigned int state)
 {
     FillElementDraw(clientData, elementRecord, tkwin, d, Ttk_WinBox(tkwin),
@@ -2828,12 +2830,12 @@ static Ttk_ElementSpec BackgroundElementSpec = {
  */
 
 static void ToolbarBackgroundElementDraw(
-    void *clientData,
-    void *elementRecord,
+    TCL_UNUSED(void *),
+    TCL_UNUSED(void *),
     Tk_Window tkwin,
     Drawable d,
-    Ttk_Box b,
-    Ttk_State state)
+    TCL_UNUSED(Ttk_Box),
+    TCL_UNUSED(Ttk_State))
 {
     ThemeBrush brush = kThemeBrushToolbarBackground;
     CGRect bounds = BoxToRect(d, Ttk_WinBox(tkwin));
@@ -2867,16 +2869,16 @@ typedef struct {
 static Ttk_ElementOptionSpec FieldElementOptions[] = {
     {"-fieldbackground", TK_OPTION_BORDER,
      Tk_Offset(FieldElement, backgroundObj), "white"},
-    {NULL, 0, 0, NULL}
+    {NULL, TK_OPTION_BOOLEAN, 0, NULL}
 };
 
 static void FieldElementDraw(
-    void *clientData,
+    TCL_UNUSED(void *),
     void *elementRecord,
     Tk_Window tkwin,
     Drawable d,
     Ttk_Box b,
-    Ttk_State state)
+    TCL_UNUSED(Ttk_State))
 {
     FieldElement *e = elementRecord;
     Tk_3DBorder backgroundPtr =
@@ -2904,28 +2906,28 @@ static Ttk_ElementSpec FieldElementSpec = {
  */
 
 static Ttk_StateTable TreeHeaderValueTable[] = {
-    {kThemeButtonOn, TTK_STATE_ALTERNATE},
-    {kThemeButtonOn, TTK_STATE_SELECTED},
-    {kThemeButtonOff, 0}
+    {kThemeButtonOn, TTK_STATE_ALTERNATE, 0},
+    {kThemeButtonOn, TTK_STATE_SELECTED, 0},
+    {kThemeButtonOff, 0, 0}
 };
 
 static Ttk_StateTable TreeHeaderAdornmentTable[] = {
     {kThemeAdornmentHeaderButtonSortUp,
-     TTK_STATE_ALTERNATE | TTK_TREEVIEW_STATE_SORTARROW},
+     TTK_STATE_ALTERNATE | TTK_TREEVIEW_STATE_SORTARROW, 0},
     {kThemeAdornmentDefault,
-     TTK_STATE_SELECTED | TTK_TREEVIEW_STATE_SORTARROW},
-    {kThemeAdornmentHeaderButtonNoSortArrow, TTK_STATE_ALTERNATE},
-    {kThemeAdornmentHeaderButtonNoSortArrow, TTK_STATE_SELECTED},
-    {kThemeAdornmentFocus, TTK_STATE_FOCUS},
-    {kThemeAdornmentNone, 0}
+     TTK_STATE_SELECTED | TTK_TREEVIEW_STATE_SORTARROW, 0},
+    {kThemeAdornmentHeaderButtonNoSortArrow, TTK_STATE_ALTERNATE, 0},
+    {kThemeAdornmentHeaderButtonNoSortArrow, TTK_STATE_SELECTED, 0},
+    {kThemeAdornmentFocus, TTK_STATE_FOCUS, 0},
+    {kThemeAdornmentNone, 0, 0}
 };
 
 static void TreeAreaElementSize (
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
-    int *minWidth,
-    int *minHeight,
+    TCL_UNUSED(void *),
+    TCL_UNUSED(void *),
+    TCL_UNUSED(Tk_Window),
+    TCL_UNUSED(int *),
+    TCL_UNUSED(int *),
     Ttk_Padding *paddingPtr)
 {
 
@@ -2964,7 +2966,7 @@ static void TreeHeaderElementSize(
 
 static void TreeHeaderElementDraw(
     void *clientData,
-    void *elementRecord,
+    TCL_UNUSED(void *),
     Tk_Window tkwin,
     Drawable d,
     Ttk_Box b,
@@ -3020,12 +3022,12 @@ static Ttk_StateTable DisclosureValueTable[] = {
     {kThemeDisclosureRight, 0, 0},
 };
 static void DisclosureElementSize(
-    void *clientData,
-    void *elementRecord,
-    Tk_Window tkwin,
+    TCL_UNUSED(void *),
+    TCL_UNUSED(void *),
+    TCL_UNUSED(Tk_Window),
     int *minWidth,
     int *minHeight,
-    Ttk_Padding *paddingPtr)
+    TCL_UNUSED(Ttk_Padding *))
 {
     SInt32 s;
 
@@ -3036,8 +3038,8 @@ static void DisclosureElementSize(
 }
 
 static void DisclosureElementDraw(
-    void *clientData,
-    void *elementRecord,
+    TCL_UNUSED(void *),
+    TCL_UNUSED(void *),
     Tk_Window tkwin,
     Drawable d,
     Ttk_Box b,
-- 
cgit v0.12


From 40174136d5d646395c582fb62ee167c984c101a1 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Fri, 2 Oct 2020 19:49:57 +0000
Subject: Backout code changes, improve documentation.

---
 doc/bind.n       | 3 ++-
 generic/tkCmds.c | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/bind.n b/doc/bind.n
index 87940e8..db89eae 100644
--- a/doc/bind.n
+++ b/doc/bind.n
@@ -283,7 +283,8 @@ it is destroyed.
 When the \fBDestroy\fR event is delivered
 to a widget, it is in a
 .QW half-dead
-state: the widget still exists, but most operations on it will fail.
+state: the widget still exists, but most operations on it will behave
+in an undefined manner, and/or return arbitrary results.
 .RE
 .IP "\fBFocusIn\fR, \fBFocusOut\fR" 5
 The \fBFocusIn\fR and \fBFocusOut\fR events are generated
diff --git a/generic/tkCmds.c b/generic/tkCmds.c
index b8b1d3e..193c3d6 100644
--- a/generic/tkCmds.c
+++ b/generic/tkCmds.c
@@ -1689,7 +1689,10 @@ Tk_WinfoObjCmd(
 	winPtr = (TkWindow *) Tk_NameToWindow(interp, string, tkwin);
 	Tcl_ResetResult(interp);
 
-        alive = (winPtr != NULL);
+	alive = 1;
+	if ((winPtr == NULL) || (winPtr->flags & TK_ALREADY_DEAD)) {
+	    alive = 0;
+	}
 	Tcl_SetObjResult(interp, Tcl_NewBooleanObj(alive));
 	break;
     }
-- 
cgit v0.12


From 4aac16b3acabf0ecbe29c13ca92830022105f23e Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 4 Oct 2020 19:31:08 +0000
Subject: Remove duplicate line introduced in [c1f5badf]. That line had already
 been added in [07ff4144] when dealing with geometry management loops.

---
 generic/tkGeometry.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/generic/tkGeometry.c b/generic/tkGeometry.c
index 5ecac0e..013347b 100644
--- a/generic/tkGeometry.c
+++ b/generic/tkGeometry.c
@@ -426,7 +426,6 @@ Tk_MaintainGeometry(
 
     ((TkWindow *)window)->maintainerPtr = (TkWindow *)container;
 
-    ((TkWindow *)window)->maintainerPtr = (TkWindow *)container;
     if (container == Tk_Parent(window)) {
 	/*
 	 * If the window is a direct descendant of the container, don't bother
@@ -574,7 +573,6 @@ Tk_UnmaintainGeometry(
 
     ((TkWindow *)window)->maintainerPtr = NULL;
 
-    ((TkWindow *)window)->maintainerPtr = NULL;
     if (container == Tk_Parent(window)) {
 	/*
 	 * If the window is a direct descendant of the container,
-- 
cgit v0.12


From 91500fc2feafa36fe71ce1453075b73386d16e34 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 5 Oct 2020 07:40:06 +0000
Subject: Let Travis builds fail when X11 tests on Ubuntu fail

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index da271b1..f52dc1b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,6 +35,7 @@ jobs:
         - make install
         - make test-classic >out-classic.txt
         - cat out-classic.txt
+        - grep -q "Failed	0" out-classic.txt
         - make test-ttk >out-ttk.txt
         - cat out-ttk.txt
         - grep -q "Failed	0" out-ttk.txt
-- 
cgit v0.12


From 121af720bc29f65b64fcdcf520cb2d00368eb258 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 5 Oct 2020 07:56:33 +0000
Subject: Fix many warnings related to the -Wshadow gcc compiler flag

---
 generic/tkCanvArc.c       |  46 ++++++++++-----------
 generic/tkCanvLine.c      |  61 ++++++++++++---------------
 generic/tkCanvPoly.c      |  29 +++++++------
 generic/tkCanvText.c      |  30 +++++++-------
 generic/tkCanvas.c        |  75 +++++++++++++++------------------
 generic/tkGrid.c          |  33 +++++++--------
 generic/tkImage.c         |   2 -
 generic/tkImgPPM.c        |  23 +++++------
 generic/tkImgPhoto.c      |  59 +++++++++++++-------------
 generic/tkPanedWindow.c   |  85 +++++++++++++++++++-------------------
 generic/tkScrollbar.c     |  16 +++----
 generic/tkTest.c          | 103 +++++++++++++++++++---------------------------
 generic/tkText.c          |   8 ++--
 generic/tkTextBTree.c     |  12 ++----
 generic/tkTextWind.c      |   2 -
 generic/ttk/ttkNotebook.c |  10 ++---
 unix/tkUnixButton.c       |  14 +++----
 unix/tkUnixMenu.c         |  75 ++++++++++++++++-----------------
 unix/tkUnixMenubu.c       |   8 ++--
 unix/tkUnixSelect.c       |  58 +++++++++++++-------------
 20 files changed, 346 insertions(+), 403 deletions(-)

diff --git a/generic/tkCanvArc.c b/generic/tkCanvArc.c
index c93b95a..ccfe116 100644
--- a/generic/tkCanvArc.c
+++ b/generic/tkCanvArc.c
@@ -352,8 +352,8 @@ ArcCoords(
 	objs[2] = Tcl_NewDoubleObj(arcPtr->bbox[2]);
 	objs[3] = Tcl_NewDoubleObj(arcPtr->bbox[3]);
 	Tcl_SetObjResult(interp, Tcl_NewListObj(4, objs));
-    } else if ((objc == 1)||(objc == 4)) {
-	if (objc==1) {
+    } else if ((objc == 1) || (objc == 4)) {
+	if (objc == 1) {
 	    if (Tcl_ListObjGetElements(interp, objv[0], &objc,
 		    (Tcl_Obj ***) &objv) != TCL_OK) {
 		return TCL_ERROR;
@@ -510,7 +510,7 @@ ConfigureArc(
 	if (arcPtr->disabledFillStipple!=None) {
 	    stipple = arcPtr->disabledFillStipple;
 	}
-      }
+    }
 
     if (arcPtr->style == ARC_STYLE) {
 	newGC = NULL;
@@ -576,11 +576,11 @@ ConfigureArc(
 
 static void
 DeleteArc(
-    Tk_Canvas canvas,		/* Info about overall canvas. */
+    TCL_UNUSED(Tk_Canvas),		/* Info about overall canvas. */
     Tk_Item *itemPtr,		/* Item that is being deleted. */
     Display *display)		/* Display containing window for canvas. */
 {
-    ArcItem *arcPtr = (ArcItem *) itemPtr;
+    ArcItem *arcPtr = (ArcItem *)itemPtr;
 
     Tk_DeleteOutline(display, &(arcPtr->outline));
     if (arcPtr->numOutlinePoints != 0) {
@@ -626,7 +626,6 @@ DeleteArc(
  *--------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static void
 ComputeArcBbox(
     Tk_Canvas canvas,		/* Canvas that contains item. */
@@ -663,13 +662,13 @@ ComputeArcBbox(
      */
 
     if (arcPtr->bbox[1] > arcPtr->bbox[3]) {
-	double tmp = arcPtr->bbox[3];
+	tmp = arcPtr->bbox[3];
 
 	arcPtr->bbox[3] = arcPtr->bbox[1];
 	arcPtr->bbox[1] = tmp;
     }
     if (arcPtr->bbox[0] > arcPtr->bbox[2]) {
-	double tmp = arcPtr->bbox[2];
+	tmp = arcPtr->bbox[2];
 
 	arcPtr->bbox[2] = arcPtr->bbox[0];
 	arcPtr->bbox[0] = tmp;
@@ -678,7 +677,7 @@ ComputeArcBbox(
     ComputeArcOutline(canvas,arcPtr);
 
     /*
-     * To compute the bounding box, start with the the bbox formed by the two
+     * To compute the bounding box, start with the bbox formed by the two
      * endpoints of the arc. Then add in the center of the arc's oval (if
      * relevant) and the 3-o'clock, 6-o'clock, 9-o'clock, and 12-o'clock
      * positions, if they are relevant.
@@ -769,8 +768,10 @@ DisplayArc(
     Tk_Item *itemPtr,		/* Item to be displayed. */
     Display *display,		/* Display on which to draw item. */
     Drawable drawable,		/* Pixmap or window in which to draw item. */
-    int x, int y,		/* Describes region of canvas that must be */
-    int width, int height)	/* redisplayed (not used). */
+    TCL_UNUSED(int),		/* Describes region of canvas that must be */
+    TCL_UNUSED(int),	/* redisplayed (not used). */
+    TCL_UNUSED(int),
+    TCL_UNUSED(int))
 {
     ArcItem *arcPtr = (ArcItem *) itemPtr;
     short x1, y1, x2, y2;
@@ -942,7 +943,6 @@ DisplayArc(
  *--------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static double
 ArcToPoint(
     Tk_Canvas canvas,		/* Canvas containing item. */
@@ -1107,7 +1107,6 @@ ArcToPoint(
  *--------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 ArcToArea(
     Tk_Canvas canvas,		/* Canvas containing item. */
@@ -1447,7 +1446,7 @@ ComputeArcOutline(
      */
 
     if (arcPtr->numOutlinePoints == 0) {
-	arcPtr->outlinePtr = ckalloc(26 * sizeof(double));
+	arcPtr->outlinePtr = (double *)ckalloc(26 * sizeof(double));
 	arcPtr->numOutlinePoints = 22;
     }
     outlinePtr = arcPtr->outlinePtr;
@@ -1461,7 +1460,7 @@ ComputeArcOutline(
      * curved arc segment, which are marked with X's in the figure below:
      *
      *
-     *				  * * *
+     *			          * * *
      *			      *          *
      *			   *      * *      *
      *			 *    *         *    *
@@ -1814,7 +1813,7 @@ ArcToPostscript(
     Tcl_Interp *interp,		/* Leave Postscript or error message here. */
     Tk_Canvas canvas,		/* Information about overall canvas. */
     Tk_Item *itemPtr,		/* Item for which Postscript is wanted. */
-    int prepass)		/* 1 means this is a prepass to collect font
+    TCL_UNUSED(int))		/* 1 means this is a prepass to collect font
 				 * information; 0 means final Postscript is
 				 * being created. */
 {
@@ -2028,17 +2027,16 @@ ArcToPostscript(
 
 static int
 StyleParseProc(
-    ClientData clientData,	/* some flags.*/
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Used for reporting errors. */
-    Tk_Window tkwin,		/* Window containing canvas widget. */
+    TCL_UNUSED(Tk_Window),		/* Window containing canvas widget. */
     const char *value,		/* Value of option. */
     char *widgRec,		/* Pointer to record for item. */
     int offset)			/* Offset into item. */
 {
     int c;
     size_t length;
-
-    register Style *stylePtr = (Style *) (widgRec + offset);
+    Style *stylePtr = (Style *) (widgRec + offset);
 
     if (value == NULL || *value == 0) {
 	*stylePtr = PIESLICE_STYLE;
@@ -2092,15 +2090,15 @@ StyleParseProc(
 
 static const char *
 StylePrintProc(
-    ClientData clientData,	/* Ignored. */
-    Tk_Window tkwin,		/* Ignored. */
+    TCL_UNUSED(void *),	/* Ignored. */
+    TCL_UNUSED(Tk_Window),		/* Ignored. */
     char *widgRec,		/* Pointer to record for item. */
     int offset,			/* Offset into item. */
-    Tcl_FreeProc **freeProcPtr)	/* Pointer to variable to fill in with
+    TCL_UNUSED(Tcl_FreeProc **))	/* Pointer to variable to fill in with
 				 * information about how to reclaim storage
 				 * for return string. */
 {
-    register Style *stylePtr = (Style *) (widgRec + offset);
+    Style *stylePtr = (Style *) (widgRec + offset);
 
     if (*stylePtr == ARC_STYLE) {
 	return "arc";
diff --git a/generic/tkCanvLine.c b/generic/tkCanvLine.c
index 7e74942..ba7753e 100644
--- a/generic/tkCanvLine.c
+++ b/generic/tkCanvLine.c
@@ -406,7 +406,7 @@ LineCoords(
 
     numPoints = objc/2;
     if (linePtr->numPoints != numPoints) {
-	coordPtr = ckalloc(sizeof(double) * objc);
+	coordPtr = (double *)ckalloc(sizeof(double) * objc);
 	if (linePtr->coordPtr != NULL) {
 	    ckfree(linePtr->coordPtr);
 	}
@@ -602,7 +602,7 @@ ConfigureLine(
 
 static void
 DeleteLine(
-    Tk_Canvas canvas,		/* Info about overall canvas widget. */
+    TCL_UNUSED(Tk_Canvas),		/* Info about overall canvas widget. */
     Tk_Item *itemPtr,		/* Item that is being deleted. */
     Display *display)		/* Display containing window for canvas. */
 {
@@ -706,7 +706,7 @@ ComputeLineBbox(
 
     tsoffset = &linePtr->outline.tsoffset;
     if (tsoffset->flags & TK_OFFSET_INDEX) {
-	double *coordPtr = linePtr->coordPtr
+	coordPtr = linePtr->coordPtr
 		+ (tsoffset->flags & ~TK_OFFSET_INDEX);
 
 	if (tsoffset->flags <= 0) {
@@ -830,9 +830,10 @@ DisplayLine(
     Tk_Item *itemPtr,		/* Item to be displayed. */
     Display *display,		/* Display on which to draw item. */
     Drawable drawable,		/* Pixmap or window in which to draw item. */
-    int x, int y, int width, int height)
-				/* Describes region of canvas that must be
-				 * redisplayed (not used). */
+    TCL_UNUSED(int),		/* Describes region of canvas that must be */
+    TCL_UNUSED(int),      /* redisplayed (not used). */
+    TCL_UNUSED(int),
+    TCL_UNUSED(int))	 
 {
     LineItem *linePtr = (LineItem *) itemPtr;
     XPoint staticPoints[MAX_STATIC_POINTS*3];
@@ -875,7 +876,7 @@ DisplayLine(
     if (numPoints <= MAX_STATIC_POINTS) {
 	pointPtr = staticPoints;
     } else {
-	pointPtr = ckalloc(numPoints * 3 * sizeof(XPoint));
+	pointPtr = (XPoint *)ckalloc(numPoints * 3 * sizeof(XPoint));
     }
 
     if ((linePtr->smooth) && (linePtr->numPoints > 2)) {
@@ -984,7 +985,7 @@ LineInsert(
 	linePtr->coordPtr[length-2] = linePtr->lastArrowPtr[0];
 	linePtr->coordPtr[length-1] = linePtr->lastArrowPtr[1];
     }
-    newCoordPtr = ckalloc(sizeof(double) * (length + objc));
+    newCoordPtr = (double *)ckalloc(sizeof(double) * (length + objc));
     for (i=0; i<beforeThis; i++) {
 	newCoordPtr[i] = linePtr->coordPtr[i];
     }
@@ -1319,7 +1320,6 @@ LineDeleteCoords(
  *--------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static double
 LineToPoint(
     Tk_Canvas canvas,		/* Canvas containing item. */
@@ -1365,7 +1365,7 @@ LineToPoint(
 	if (numPoints <= MAX_STATIC_POINTS) {
 	    linePoints = staticSpace;
 	} else {
-	    linePoints = ckalloc(2 * numPoints * sizeof(double));
+	    linePoints = (double *)ckalloc(2 * numPoints * sizeof(double));
 	}
 	numPoints = linePtr->smooth->coordProc(canvas, linePtr->coordPtr,
 		linePtr->numPoints, linePtr->splineSteps, NULL, linePoints);
@@ -1547,7 +1547,6 @@ LineToPoint(
  *--------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 LineToArea(
     Tk_Canvas canvas,		/* Canvas containing item. */
@@ -1600,7 +1599,7 @@ LineToArea(
 	if (numPoints <= MAX_STATIC_POINTS) {
 	    linePoints = staticSpace;
 	} else {
-	    linePoints = ckalloc(2 * numPoints * sizeof(double));
+	    linePoints = (double *)ckalloc(2 * numPoints * sizeof(double));
 	}
 	numPoints = linePtr->smooth->coordProc(canvas, linePtr->coordPtr,
 		linePtr->numPoints, linePtr->splineSteps, NULL, linePoints);
@@ -1695,8 +1694,6 @@ ScaleLine(
 	linePtr->firstArrowPtr = NULL;
     }
     if (linePtr->lastArrowPtr != NULL) {
-	int i;
-
 	i = 2*(linePtr->numPoints-1);
 	linePtr->coordPtr[i] = linePtr->lastArrowPtr[0];
 	linePtr->coordPtr[i+1] = linePtr->lastArrowPtr[1];
@@ -1873,12 +1870,11 @@ TranslateLine(
  *--------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 ParseArrowShape(
-    ClientData clientData,	/* Not used. */
+    TCL_UNUSED(void *),	/* Not used. */
     Tcl_Interp *interp,		/* Used for error reporting. */
-    Tk_Window tkwin,		/* Not used. */
+    TCL_UNUSED(Tk_Window),		/* Not used. */
     const char *value,		/* Textual specification of arrow shape. */
     char *recordPtr,		/* Pointer to item record in which to store
 				 * arrow information. */
@@ -1942,14 +1938,13 @@ ParseArrowShape(
  *--------------------------------------------------------------
  */
 
-    /* ARGSUSED */
 static const char *
 PrintArrowShape(
-    ClientData clientData,	/* Not used. */
-    Tk_Window tkwin,		/* Window associated with linePtr's widget. */
+    TCL_UNUSED(void *),	/* Not used. */
+    TCL_UNUSED(Tk_Window),		/* Window associated with linePtr's widget. */
     char *recordPtr,		/* Pointer to item record containing current
 				 * shape information. */
-    int offset,			/* Offset of arrow information in record. */
+    TCL_UNUSED(int),			/* Offset of arrow information in record. */
     Tcl_FreeProc **freeProcPtr)	/* Store address of function to call to free
 				 * string here. */
 {
@@ -1982,17 +1977,16 @@ PrintArrowShape(
 
 static int
 ArrowParseProc(
-    ClientData clientData,	/* some flags.*/
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Used for reporting errors. */
-    Tk_Window tkwin,		/* Window containing canvas widget. */
+    TCL_UNUSED(Tk_Window),		/* Window containing canvas widget. */
     const char *value,		/* Value of option. */
     char *widgRec,		/* Pointer to record for item. */
     int offset)			/* Offset into item. */
 {
     int c;
     size_t length;
-
-    register Arrows *arrowPtr = (Arrows *) (widgRec + offset);
+    Arrows *arrowPtr = (Arrows *) (widgRec + offset);
 
     if (value == NULL || *value == 0) {
 	*arrowPtr = ARROWS_NONE;
@@ -2050,15 +2044,15 @@ ArrowParseProc(
 
 static const char *
 ArrowPrintProc(
-    ClientData clientData,	/* Ignored. */
-    Tk_Window tkwin,		/* Window containing canvas widget. */
+    TCL_UNUSED(void *),	/* Ignored. */
+    TCL_UNUSED(Tk_Window),		/* Window containing canvas widget. */
     char *widgRec,		/* Pointer to record for item. */
     int offset,			/* Offset into item. */
-    Tcl_FreeProc **freeProcPtr)	/* Pointer to variable to fill in with
+    TCL_UNUSED(Tcl_FreeProc **))	/* Pointer to variable to fill in with
 				 * information about how to reclaim storage
 				 * for return string. */
 {
-    register Arrows *arrowPtr = (Arrows *) (widgRec + offset);
+    Arrows *arrowPtr = (Arrows *) (widgRec + offset);
 
     switch (*arrowPtr) {
     case ARROWS_FIRST:
@@ -2092,7 +2086,6 @@ ArrowPrintProc(
  *--------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 ConfigureArrows(
     Tk_Canvas canvas,		/* Canvas in which arrows will be displayed
@@ -2153,7 +2146,7 @@ ConfigureArrows(
     if (linePtr->arrow != ARROWS_LAST) {
 	poly = linePtr->firstArrowPtr;
 	if (poly == NULL) {
-	    poly = ckalloc(2 * PTS_IN_ARROW * sizeof(double));
+	    poly = (double *)ckalloc(2 * PTS_IN_ARROW * sizeof(double));
 	    poly[0] = poly[10] = linePtr->coordPtr[0];
 	    poly[1] = poly[11] = linePtr->coordPtr[1];
 	    linePtr->firstArrowPtr = poly;
@@ -2197,7 +2190,7 @@ ConfigureArrows(
 	coordPtr = linePtr->coordPtr + 2*(linePtr->numPoints-2);
 	poly = linePtr->lastArrowPtr;
 	if (poly == NULL) {
-	    poly = ckalloc(2 * PTS_IN_ARROW * sizeof(double));
+	    poly = (double *)ckalloc(2 * PTS_IN_ARROW * sizeof(double));
 	    poly[0] = poly[10] = coordPtr[2];
 	    poly[1] = poly[11] = coordPtr[3];
 	    linePtr->lastArrowPtr = poly;
@@ -2254,7 +2247,7 @@ LineToPostscript(
     Tcl_Interp *interp,		/* Leave Postscript or error message here. */
     Tk_Canvas canvas,		/* Information about overall canvas. */
     Tk_Item *itemPtr,		/* Item for which Postscript is wanted. */
-    int prepass)		/* 1 means this is a prepass to collect font
+    TCL_UNUSED(int))		/* 1 means this is a prepass to collect font
 				 * information; 0 means final Postscript is
 				 * being created. */
 {
@@ -2366,7 +2359,7 @@ LineToPostscript(
 		linePtr->numPoints, linePtr->splineSteps, NULL, NULL);
 	pointPtr = staticPoints;
 	if (numPoints > MAX_STATIC_POINTS) {
-	    pointPtr = ckalloc(numPoints * 2 * sizeof(double));
+	    pointPtr = (double *)ckalloc(numPoints * 2 * sizeof(double));
 	}
 	numPoints = linePtr->smooth->coordProc(canvas, linePtr->coordPtr,
 		linePtr->numPoints, linePtr->splineSteps, NULL, pointPtr);
diff --git a/generic/tkCanvPoly.c b/generic/tkCanvPoly.c
index a537846..513613d 100644
--- a/generic/tkCanvPoly.c
+++ b/generic/tkCanvPoly.c
@@ -376,7 +376,7 @@ PolygonCoords(
 	 * another point to close the polygon.
 	 */
 
-	polyPtr->coordPtr = ckalloc(sizeof(double) * (objc+2));
+	polyPtr->coordPtr = (double *)ckalloc(sizeof(double) * (objc+2));
 	polyPtr->pointsAllocated = numPoints+1;
     }
     for (i = objc-1; i >= 0; i--) {
@@ -564,7 +564,7 @@ ConfigurePolygon(
 
 static void
 DeletePolygon(
-    Tk_Canvas canvas,		/* Info about overall canvas widget. */
+    TCL_UNUSED(Tk_Canvas),		/* Info about overall canvas widget. */
     Tk_Item *itemPtr,		/* Item that is being deleted. */
     Display *display)		/* Display containing window for canvas. */
 {
@@ -825,7 +825,7 @@ TkFillPolygon(
     if (numPoints <= MAX_STATIC_POINTS) {
 	pointPtr = staticPoints;
     } else {
-	pointPtr = ckalloc(numPoints * sizeof(XPoint));
+	pointPtr = (XPoint *)ckalloc(numPoints * sizeof(XPoint));
     }
 
     for (i=0, pPtr=pointPtr ; i<numPoints; i+=1, coordPtr+=2, pPtr++) {
@@ -874,9 +874,10 @@ DisplayPolygon(
     Tk_Item *itemPtr,		/* Item to be displayed. */
     Display *display,		/* Display on which to draw item. */
     Drawable drawable,		/* Pixmap or window in which to draw item. */
-    int x, int y, int width, int height)
-				/* Describes region of canvas that must be
-				 * redisplayed (not used). */
+    TCL_UNUSED(int),	/* Describes region of canvas that must be */
+    TCL_UNUSED(int),	/* redisplayed (not used). */
+    TCL_UNUSED(int),
+    TCL_UNUSED(int))
 {
     PolygonItem *polyPtr = (PolygonItem *) itemPtr;
     Tk_State state = itemPtr->state;
@@ -971,7 +972,7 @@ DisplayPolygon(
 	if (numPoints <= MAX_STATIC_POINTS) {
 	    pointPtr = staticPoints;
 	} else {
-	    pointPtr = ckalloc(numPoints * sizeof(XPoint));
+	    pointPtr = (XPoint *)ckalloc(numPoints * sizeof(XPoint));
 	}
 	numPoints = polyPtr->smooth->coordProc(canvas, polyPtr->coordPtr,
 		polyPtr->numPoints, polyPtr->splineSteps, pointPtr, NULL);
@@ -998,7 +999,7 @@ DisplayPolygon(
  *
  * PolygonInsert --
  *
- *	Insert coords into a polugon item at a given index.
+ *	Insert coords into a polygon item at a given index.
  *
  * Results:
  *	None.
@@ -1038,7 +1039,7 @@ PolygonInsert(
     while (beforeThis < 0) {
 	beforeThis += length;
     }
-    newCoordPtr = ckalloc(sizeof(double) * (length + 2 + objc));
+    newCoordPtr = (double *)ckalloc(sizeof(double) * (length + 2 + objc));
     for (i=0; i<beforeThis; i++) {
 	newCoordPtr[i] = polyPtr->coordPtr[i];
     }
@@ -1240,7 +1241,6 @@ PolygonDeleteCoords(
  *--------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static double
 PolygonToPoint(
     Tk_Canvas canvas,		/* Canvas containing item. */
@@ -1288,7 +1288,7 @@ PolygonToPoint(
 	if (numPoints <= MAX_STATIC_POINTS) {
 	    polyPoints = staticSpace;
 	} else {
-	    polyPoints = ckalloc(2 * numPoints * sizeof(double));
+	    polyPoints = (double *)ckalloc(2 * numPoints * sizeof(double));
 	}
 	numPoints = polyPtr->smooth->coordProc(canvas, polyPtr->coordPtr,
 		polyPtr->numPoints, polyPtr->splineSteps, NULL, polyPoints);
@@ -1430,7 +1430,6 @@ PolygonToPoint(
  *--------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 PolygonToArea(
     Tk_Canvas canvas,		/* Canvas containing item. */
@@ -1497,7 +1496,7 @@ PolygonToArea(
 	if (numPoints <= MAX_STATIC_POINTS) {
 	    polyPoints = staticSpace;
 	} else {
-	    polyPoints = ckalloc(2 * numPoints * sizeof(double));
+	    polyPoints = (double *)ckalloc(2 * numPoints * sizeof(double));
 	}
 	numPoints = polyPtr->smooth->coordProc(canvas, polyPtr->coordPtr,
 		polyPtr->numPoints, polyPtr->splineSteps, NULL, polyPoints);
@@ -1667,7 +1666,7 @@ ScalePolygon(
 static int
 GetPolygonIndex(
     Tcl_Interp *interp,		/* Used for error reporting. */
-    Tk_Canvas canvas,		/* Canvas containing item. */
+    TCL_UNUSED(Tk_Canvas),		/* Canvas containing item. */
     Tk_Item *itemPtr,		/* Item for which the index is being
 				 * specified. */
     Tcl_Obj *obj,		/* Specification of a particular coord in
@@ -1797,7 +1796,7 @@ PolygonToPostscript(
     Tcl_Interp *interp,		/* Leave Postscript or error message here. */
     Tk_Canvas canvas,		/* Information about overall canvas. */
     Tk_Item *itemPtr,		/* Item for which Postscript is wanted. */
-    int prepass)		/* 1 means this is a prepass to collect font
+    TCL_UNUSED(int))	/* 1 means this is a prepass to collect font
 				 * information; 0 means final Postscript is
 				 * being created. */
 {
diff --git a/generic/tkCanvText.c b/generic/tkCanvText.c
index 9a27efc..0945857 100644
--- a/generic/tkCanvText.c
+++ b/generic/tkCanvText.c
@@ -1031,8 +1031,8 @@ TextInsert(
 	return;
     }
 
-    newStr = ckalloc(textPtr->numBytes + byteCount + 1);
-    memcpy(newStr, text, (size_t) byteIndex);
+    newStr = (char *)ckalloc(textPtr->numBytes + byteCount + 1);
+    memcpy(newStr, text, byteIndex);
     strcpy(newStr + byteIndex, string);
     strcpy(newStr + byteIndex + byteCount, text + byteIndex);
 
@@ -1112,8 +1112,8 @@ TextDeleteChars(
     byteCount = TkUtfAtIndex(text + byteIndex, charsRemoved)
 	- (text + byteIndex);
 
-    newStr = ckalloc(textPtr->numBytes + 1 - byteCount);
-    memcpy(newStr, text, (size_t) byteIndex);
+    newStr = (char *)ckalloc(textPtr->numBytes + 1 - byteCount);
+    memcpy(newStr, text, byteIndex);
     strcpy(newStr + byteIndex, text + byteIndex + byteCount);
 
     ckfree(text);
@@ -1267,7 +1267,6 @@ TextToArea(
  *--------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static void
 ScaleText(
     Tk_Canvas canvas,		/* Canvas containing rectangle. */
@@ -1338,7 +1337,7 @@ TranslateText(
 static int
 GetTextIndex(
     Tcl_Interp *interp,		/* Used for error reporting. */
-    Tk_Canvas canvas,		/* Canvas containing item. */
+    TCL_UNUSED(Tk_Canvas),		/* Canvas containing item. */
     Tk_Item *itemPtr,		/* Item for which the index is being
 				 * specified. */
     Tcl_Obj *obj,		/* Specification of a particular character in
@@ -1354,13 +1353,13 @@ GetTextIndex(
 
     c = string[0];
 
-    if ((c == 'e') && (strncmp(string, "end", (unsigned) length) == 0)) {
+    if ((c == 'e') && (strncmp(string, "end", length) == 0)) {
 	*indexPtr = textPtr->numChars;
     } else if ((c == 'i')
-	    && (strncmp(string, "insert", (unsigned) length) == 0)) {
+	    && (strncmp(string, "insert", length) == 0)) {
 	*indexPtr = textPtr->insertPos;
     } else if ((c == 's') && (length >= 5)
-	    && (strncmp(string, "sel.first", (unsigned) length) == 0)) {
+	    && (strncmp(string, "sel.first", length) == 0)) {
 	if (textInfoPtr->selItemPtr != itemPtr) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "selection isn't in item", -1));
@@ -1369,7 +1368,7 @@ GetTextIndex(
 	}
 	*indexPtr = textInfoPtr->selectFirst;
     } else if ((c == 's') && (length >= 5)
-	    && (strncmp(string, "sel.last", (unsigned) length) == 0)) {
+	    && (strncmp(string, "sel.last", length) == 0)) {
 	if (textInfoPtr->selItemPtr != itemPtr) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "selection isn't in item", -1));
@@ -1379,7 +1378,7 @@ GetTextIndex(
 	*indexPtr = textInfoPtr->selectLast;
     } else if (c == '@') {
 	int x, y;
-	double tmp, c = textPtr->cosine, s = textPtr->sine;
+	double tmp, cs = textPtr->cosine, s = textPtr->sine;
 	char *end;
 	const char *p;
 
@@ -1398,7 +1397,7 @@ GetTextIndex(
 	x -= (int) textPtr->drawOrigin[0];
 	y -= (int) textPtr->drawOrigin[1];
 	*indexPtr = Tk_PointToChar(textPtr->textLayout,
-		(int) (x*c - y*s), (int) (y*c + x*s));
+		(int) (x*cs - y*s), (int) (y*cs + x*s));
     } else if (Tcl_GetIntFromObj(NULL, obj, indexPtr) == TCL_OK) {
 	if (*indexPtr < 0) {
 	    *indexPtr = 0;
@@ -1435,10 +1434,9 @@ GetTextIndex(
  *--------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static void
 SetTextCursor(
-    Tk_Canvas canvas,		/* Record describing canvas widget. */
+    TCL_UNUSED(Tk_Canvas),		/* Record describing canvas widget. */
     Tk_Item *itemPtr,		/* Text item in which cursor position is to be
 				 * set. */
     int index)			/* Character index of character just before
@@ -1477,7 +1475,7 @@ SetTextCursor(
 
 static int
 GetSelText(
-    Tk_Canvas canvas,		/* Canvas containing selection. */
+    TCL_UNUSED(Tk_Canvas),		/* Canvas containing selection. */
     Tk_Item *itemPtr,		/* Text item containing selection. */
     int offset,			/* Byte offset within selection of first
 				 * character to be returned. */
@@ -1608,7 +1606,7 @@ TextToPostscript(
 		Tcl_GetString(Tcl_GetObjResult(interp)));
     }
 
-    x = 0;  y = 0;  justify = NULL;	/* lint. */
+    x = 0;  y = 0;  justify = NULL;
     switch (textPtr->anchor) {
     case TK_ANCHOR_NW:	   x = 0; y = 0; break;
     case TK_ANCHOR_N:	   x = 1; y = 0; break;
diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c
index c63520b..2ce5e50 100644
--- a/generic/tkCanvas.c
+++ b/generic/tkCanvas.c
@@ -517,7 +517,7 @@ ItemDisplay(
 	    canvasPtr->display, pixmap, screenX1, screenY1, width, height);
 }
 
-static inline int
+static int
 ItemIndex(
     TkCanvas *canvasPtr,
     Tk_Item *itemPtr,
@@ -638,7 +638,7 @@ Tk_CanvasObjCmd(
     int argc,			/* Number of arguments. */
     Tcl_Obj *const argv[])	/* Argument objects. */
 {
-    Tk_Window tkwin = clientData;
+    Tk_Window tkwin = (Tk_Window)clientData;
     TkCanvas *canvasPtr;
     Tk_Window newWin;
 
@@ -662,7 +662,7 @@ Tk_CanvasObjCmd(
      * pointers).
      */
 
-    canvasPtr = ckalloc(sizeof(TkCanvas));
+    canvasPtr = (TkCanvas *)ckalloc(sizeof(TkCanvas));
     canvasPtr->tkwin = newWin;
     canvasPtr->display = Tk_Display(newWin);
     canvasPtr->interp = interp;
@@ -788,7 +788,7 @@ CanvasWidgetCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    TkCanvas *canvasPtr = clientData;
+    TkCanvas *canvasPtr = (TkCanvas *)clientData;
     int c, result;
     Tk_Item *itemPtr = NULL;	/* Initialization needed only to prevent
 				 * compiler warning. */
@@ -835,7 +835,7 @@ CanvasWidgetCmd(
     Tcl_Preserve(canvasPtr);
 
     result = TCL_OK;
-    switch ((enum options) index) {
+    switch ((enum options)index) {
     case CANV_ADDTAG:
 	if (objc < 4) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "tag searchCommand ?arg ...?");
@@ -897,7 +897,7 @@ CanvasWidgetCmd(
 	break;
     }
     case CANV_BIND: {
-	ClientData object;
+	void *object;
 
 	if ((objc < 3) || (objc > 5)) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "tagOrId ?sequence? ?command?");
@@ -948,9 +948,9 @@ CanvasWidgetCmd(
 	    Tcl_HashEntry *entryPtr;
 
 	    entryPtr = Tcl_FindHashEntry(&canvasPtr->idTable,
-		    (char *) INT2PTR(searchPtr->id));
+		    INT2PTR(searchPtr->id));
 	    if (entryPtr != NULL) {
-		itemPtr = Tcl_GetHashValue(entryPtr);
+		itemPtr = (Tk_Item *)Tcl_GetHashValue(entryPtr);
 		object = itemPtr;
 	    }
 
@@ -1185,7 +1185,6 @@ CanvasWidgetCmd(
 	tmpObj = Tcl_NewListObj(2, objv+4);
 
 	FOR_EVERY_CANVAS_ITEM_MATCHING(objv[2], &searchPtr, goto doneImove) {
-	    int index;
 	    int x1, x2, y1, y2;
 	    int dontRedraw1, dontRedraw2;
 
@@ -1238,7 +1237,6 @@ CanvasWidgetCmd(
     case CANV_CREATE: {
 	Tk_ItemType *typePtr;
 	Tk_ItemType *matchPtr = NULL;
-	Tk_Item *itemPtr;
 	int isNew = 0;
 	Tcl_HashEntry *entryPtr;
 	const char *arg;
@@ -1297,9 +1295,8 @@ CanvasWidgetCmd(
 	}
 
 	typePtr = matchPtr;
-	itemPtr = ckalloc(typePtr->itemSize);
-	itemPtr->id = canvasPtr->nextId;
-	canvasPtr->nextId++;
+	itemPtr = (Tk_Item *)ckalloc(typePtr->itemSize);
+	itemPtr->id = canvasPtr->nextId++;
 	itemPtr->tagPtr = itemPtr->staticTagSpace;
 	itemPtr->tagSpace = TK_TAG_SPACE;
 	itemPtr->numTags = 0;
@@ -1315,7 +1312,7 @@ CanvasWidgetCmd(
 
 	itemPtr->nextPtr = NULL;
 	entryPtr = Tcl_CreateHashEntry(&canvasPtr->idTable,
-		(char *) INT2PTR(itemPtr->id), &isNew);
+		INT2PTR(itemPtr->id), &isNew);
 	Tcl_SetHashValue(entryPtr, itemPtr);
 	itemPtr->prevPtr = canvasPtr->lastItemPtr;
 	canvasPtr->hotPtr = itemPtr;
@@ -1394,7 +1391,7 @@ CanvasWidgetCmd(
 		    ckfree(itemPtr->tagPtr);
 		}
 		entryPtr = Tcl_FindHashEntry(&canvasPtr->idTable,
-			(char *) INT2PTR(itemPtr->id));
+			INT2PTR(itemPtr->id));
 		Tcl_DeleteHashEntry(entryPtr);
 		if (itemPtr->nextPtr != NULL) {
 		    itemPtr->nextPtr->prevPtr = itemPtr->prevPtr;
@@ -1531,7 +1528,6 @@ CanvasWidgetCmd(
 	}
 	break;
     case CANV_ICURSOR: {
-	int index;
 
 	if (objc != 4) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "tagOrId index");
@@ -1556,7 +1552,6 @@ CanvasWidgetCmd(
 	break;
     }
     case CANV_INDEX: {
-	int index;
 
 	if (objc != 4) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "tagOrId string");
@@ -1656,7 +1651,6 @@ CanvasWidgetCmd(
 	}
 	break;
     case CANV_LOWER: {
-	Tk_Item *itemPtr;
 
 	if ((objc != 3) && (objc != 4)) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "tagOrId ?belowThis?");
@@ -1941,7 +1935,7 @@ CanvasWidgetCmd(
 	break;
     }
     case CANV_SELECT: {
-	int index, optionindex;
+	int optionindex;
 	static const char *const optionStrings[] = {
 	    "adjust", "clear", "from", "item", "to", NULL
 	};
@@ -2413,7 +2407,7 @@ static void
 CanvasWorldChanged(
     ClientData instanceData)	/* Information about widget. */
 {
-    TkCanvas *canvasPtr = instanceData;
+    TkCanvas *canvasPtr = (TkCanvas *)instanceData;
     Tk_Item *itemPtr;
 
     itemPtr = canvasPtr->firstItemPtr;
@@ -2451,7 +2445,7 @@ static void
 DisplayCanvas(
     ClientData clientData)	/* Information about widget. */
 {
-    TkCanvas *canvasPtr = clientData;
+    TkCanvas *canvasPtr = (TkCanvas *)clientData;
     Tk_Window tkwin = canvasPtr->tkwin;
     Tk_Item *itemPtr;
     Pixmap pixmap;
@@ -2705,7 +2699,7 @@ CanvasEventProc(
     ClientData clientData,	/* Information about window. */
     XEvent *eventPtr)		/* Information about event. */
 {
-    TkCanvas *canvasPtr = clientData;
+    TkCanvas *canvasPtr = (TkCanvas *)clientData;
 
     if (eventPtr->type == Expose) {
 	int x, y;
@@ -2795,7 +2789,7 @@ static void
 CanvasCmdDeletedProc(
     ClientData clientData)	/* Pointer to widget record for widget. */
 {
-    TkCanvas *canvasPtr = clientData;
+    TkCanvas *canvasPtr = (TkCanvas *)clientData;
     Tk_Window tkwin = canvasPtr->tkwin;
 
     /*
@@ -3287,7 +3281,7 @@ NextItem(
 static SearchUids *
 GetStaticUids(void)
 {
-    SearchUids *searchUids =
+    SearchUids *searchUids = (SearchUids *)
 	    Tcl_GetThreadData(&dataKey, sizeof(SearchUids));
 
     if (searchUids->allUid == NULL) {
@@ -3326,7 +3320,7 @@ TagSearchExprInit(
     TagSearchExpr *expr = *exprPtrPtr;
 
     if (expr == NULL) {
-	expr = ckalloc(sizeof(TagSearchExpr));
+	expr = (TagSearchExpr *)ckalloc(sizeof(TagSearchExpr));
 	expr->allocated = 0;
 	expr->uids = NULL;
 	expr->next = NULL;
@@ -3407,7 +3401,7 @@ TagSearchScan(
 	 * Allocate primary search struct on first call.
 	 */
 
-	*searchPtrPtr = searchPtr = ckalloc(sizeof(TagSearch));
+	*searchPtrPtr = searchPtr = (TagSearch *)ckalloc(sizeof(TagSearch));
 	searchPtr->expr = NULL;
 
 	/*
@@ -3415,7 +3409,7 @@ TagSearchScan(
 	 */
 
 	searchPtr->rewritebufferAllocated = 100;
-	searchPtr->rewritebuffer = ckalloc(searchPtr->rewritebufferAllocated);
+	searchPtr->rewritebuffer = (char *)ckalloc(searchPtr->rewritebufferAllocated);
     }
     TagSearchExprInit(&searchPtr->expr);
 
@@ -3432,7 +3426,7 @@ TagSearchScan(
     if ((unsigned) searchPtr->stringLength >=
 	    searchPtr->rewritebufferAllocated) {
 	searchPtr->rewritebufferAllocated = searchPtr->stringLength + 100;
-	searchPtr->rewritebuffer =
+	searchPtr->rewritebuffer = (char *)
 		ckrealloc(searchPtr->rewritebuffer,
 		searchPtr->rewritebufferAllocated);
     }
@@ -3615,10 +3609,10 @@ TagSearchScanExpr(
 	if (expr->index >= expr->allocated-1) {
 	    expr->allocated += 15;
 	    if (expr->uids) {
-		expr->uids = ckrealloc(expr->uids,
+		expr->uids = (Tk_Uid *)ckrealloc(expr->uids,
 			expr->allocated * sizeof(Tk_Uid));
 	    } else {
-		expr->uids = ckalloc(expr->allocated * sizeof(Tk_Uid));
+		expr->uids = (Tk_Uid *)ckalloc(expr->allocated * sizeof(Tk_Uid));
 	    }
 	}
 
@@ -4028,9 +4022,9 @@ TagSearchFirst(
 	if ((itemPtr == NULL) || (itemPtr->id != searchPtr->id)
 		|| (lastPtr == NULL) || (lastPtr->nextPtr != itemPtr)) {
 	    entryPtr = Tcl_FindHashEntry(&searchPtr->canvasPtr->idTable,
-		    (char *) INT2PTR(searchPtr->id));
+		    INT2PTR(searchPtr->id));
 	    if (entryPtr != NULL) {
-		itemPtr = Tcl_GetHashValue(entryPtr);
+		itemPtr = (Tk_Item *)Tcl_GetHashValue(entryPtr);
 		lastPtr = itemPtr->prevPtr;
 	    } else {
 		lastPtr = itemPtr = NULL;
@@ -4249,7 +4243,7 @@ DoItem(
 	Tk_Uid *newTagPtr;
 
 	itemPtr->tagSpace += 5;
-	newTagPtr = ckalloc(itemPtr->tagSpace * sizeof(Tk_Uid));
+	newTagPtr = (Tk_Uid *)ckalloc(itemPtr->tagSpace * sizeof(Tk_Uid));
 	memcpy((void *) newTagPtr, itemPtr->tagPtr,
 		itemPtr->numTags * sizeof(Tk_Uid));
 	if (itemPtr->tagPtr != itemPtr->staticTagSpace) {
@@ -5123,8 +5117,8 @@ CanvasDoEvent(
 				 * processed. */
 {
 #define NUM_STATIC 3
-    ClientData staticObjects[NUM_STATIC];
-    ClientData *objectPtr;
+    void *staticObjects[NUM_STATIC];
+    void **objectPtr;
     int numObjects, i;
     Tk_Item *itemPtr;
 #ifndef USE_OLD_TAG_SEARCH
@@ -5250,7 +5244,7 @@ static void
 CanvasBlinkProc(
     ClientData clientData)	/* Pointer to record describing entry. */
 {
-    TkCanvas *canvasPtr = clientData;
+    TkCanvas *canvasPtr = (TkCanvas *)clientData;
 
     if (!canvasPtr->textInfo.gotFocus || (canvasPtr->insertOffTime == 0)) {
 	return;
@@ -5406,7 +5400,7 @@ CanvasFetchSelection(
 				 * not including terminating NULL
 				 * character. */
 {
-    TkCanvas *canvasPtr = clientData;
+    TkCanvas *canvasPtr = (TkCanvas *)clientData;
 
     return ItemSelection(canvasPtr, canvasPtr->textInfo.selItemPtr, offset,
 	    buffer, maxBytes);
@@ -5434,7 +5428,7 @@ static void
 CanvasLostSelection(
     ClientData clientData)	/* Information about entry widget. */
 {
-    TkCanvas *canvasPtr = clientData;
+    TkCanvas *canvasPtr = (TkCanvas *)clientData;
 
     EventuallyRedrawItem(canvasPtr, canvasPtr->textInfo.selItemPtr);
     canvasPtr->textInfo.selItemPtr = NULL;
@@ -5763,19 +5757,18 @@ CanvasSetOrigin(
  *----------------------------------------------------------------------
  */
 
-/* ARGSUSED */
 static const char **
 TkGetStringsFromObjs(
     int objc,
     Tcl_Obj *const objv[])
 {
-    register int i;
+    int i;
     const char **argv;
 
     if (objc <= 0) {
 	return NULL;
     }
-    argv = ckalloc((objc+1) * sizeof(char *));
+    argv = (const char **)ckalloc((objc+1) * sizeof(char *));
     for (i = 0; i < objc; i++) {
 	argv[i] = Tcl_GetString(objv[i]);
     }
diff --git a/generic/tkGrid.c b/generic/tkGrid.c
index c222417..785bc7f 100644
--- a/generic/tkGrid.c
+++ b/generic/tkGrid.c
@@ -339,7 +339,7 @@ Tk_GridObjCmd(
     static const char *const optionStrings[] = {
 	"anchor", "bbox", "columnconfigure", "configure",
 	"content", "forget", "info", "location", "propagate",
-	"remove", "rowconfigure", "size",	"slaves", NULL
+	"remove", "rowconfigure", "size", "slaves", NULL
     };
     enum options {
 	GRID_ANCHOR, GRID_BBOX, GRID_COLUMNCONFIGURE, GRID_CONFIGURE,
@@ -384,8 +384,8 @@ Tk_GridObjCmd(
 	return GridPropagateCommand(tkwin, interp, objc, objv);
     case GRID_SIZE:
 	return GridSizeCommand(tkwin, interp, objc, objv);
-    case GRID_CONTENT:
     case GRID_SLAVES:
+    case GRID_CONTENT:
 	return GridContentCommand(tkwin, interp, objc, objv);
 
     /*
@@ -1236,7 +1236,7 @@ GridRowColumnConfigureCommand(
 
     if (slotPtr != NULL) {
 	if (slotType == ROW) {
-	    int last = containerPtr->containerDataPtr->rowMax - 1;
+	    last = containerPtr->containerDataPtr->rowMax - 1;
 
 	    while ((last >= 0) && (slotPtr[last].weight == 0)
 		    && (slotPtr[last].pad == 0) && (slotPtr[last].minSize == 0)
@@ -1245,7 +1245,7 @@ GridRowColumnConfigureCommand(
 	    }
 	    containerPtr->containerDataPtr->rowMax = last+1;
 	} else {
-	    int last = containerPtr->containerDataPtr->columnMax - 1;
+	    last = containerPtr->containerDataPtr->columnMax - 1;
 
 	    while ((last >= 0) && (slotPtr[last].weight == 0)
 		    && (slotPtr[last].pad == 0) && (slotPtr[last].minSize == 0)
@@ -1733,10 +1733,9 @@ ArrangeGrid(
     containerPtr->flags &= ~REQUESTED_RELAYOUT;
 
     /*
-     * If the container has no content anymore, then don't do anything at all:
-     * just leave the container's size as-is. Otherwise there is no way to
-     * "relinquish" control over the container so another geometry manager can
-     * take over.
+     * If the container has no content anymore, then don't change the container size.
+     * Otherwise there is no way to "relinquish" control over the container
+     * so another geometry manager can take over.
      */
 
     if (containerPtr->contentPtr == NULL) {
@@ -1820,7 +1819,6 @@ ArrangeGrid(
     for (contentPtr = containerPtr->contentPtr; contentPtr != NULL && !abort;
 	    contentPtr = contentPtr->nextPtr) {
 	int x, y;			/* Top left coordinate */
-	int width, height;		/* Slot or content size */
 	int col = contentPtr->column;
 	int row = contentPtr->row;
 
@@ -1931,7 +1929,7 @@ ResolveConstraints(
     int uniformGroups;		/* Number of currently used uniform groups. */
     int uniformGroupsAlloced;	/* Size of allocated space for uniform
 				 * groups. */
-    int weight, minSize;
+    int minSize;
     int prevGrow, accWeight, grow;
 
     /*
@@ -2060,6 +2058,7 @@ ResolveConstraints(
 
     for (slot = 0; slot < gridCount; slot++) {
 	if (layoutPtr[slot].uniform != NULL) {
+		int weight;
 	    for (start = 0; start < uniformGroups; start++) {
 		if (uniformGroupPtr[start].group == layoutPtr[slot].uniform) {
 		    break;
@@ -2112,7 +2111,7 @@ ResolveConstraints(
 		for (start = 0; start < uniformGroups; start++) {
 		    if (uniformGroupPtr[start].group ==
 			    layoutPtr[slot].uniform) {
-			weight = layoutPtr[slot].weight;
+			int weight = layoutPtr[slot].weight;
 			weight = weight > 0 ? weight : 1;
 			layoutPtr[slot].minSize =
 				uniformGroupPtr[start].minSize * weight;
@@ -2702,7 +2701,7 @@ InitContainerData(
     Gridder *containerPtr)
 {
     if (containerPtr->containerDataPtr == NULL) {
-	GridContainer *gridPtr = containerPtr->containerDataPtr =
+	GridContainer *gridPtr = containerPtr->containerDataPtr = (GridContainer *)
 		ckalloc(sizeof(GridContainer));
 	size_t size = sizeof(SlotInfo) * TYPICAL_SIZE;
 
@@ -2989,7 +2988,7 @@ ConfigureContent(
 		 * If the stored container does not exist, just ignore it.
 		 */
 
-		struct Gridder *contentPtr = GetGrid(content);
+		contentPtr = GetGrid(content);
 		if (contentPtr->in != NULL) {
 		    if (TkGetWindowFromObj(interp, content, contentPtr->in, &parent)
 			    == TCL_OK) {
@@ -3129,7 +3128,7 @@ ConfigureContent(
 
 	for (defaultColumnSpan = 1; j + defaultColumnSpan < numWindows;
 		defaultColumnSpan++) {
-	    const char *string = Tcl_GetString(objv[j + defaultColumnSpan]);
+	    string = Tcl_GetString(objv[j + defaultColumnSpan]);
 
 	    if (*string != REL_HORIZ) {
 		break;
@@ -3431,9 +3430,9 @@ ConfigureContent(
 	int lastRow, lastColumn;	/* Implied end of table. */
 
 	string = Tcl_GetString(objv[j]);
-    	firstChar = string[0];
+	firstChar = string[0];
 
-    	if (firstChar == '.') {
+	if (firstChar == '.') {
 	    lastWindow = string;
 	    numSkip = 0;
 	}
@@ -3456,7 +3455,7 @@ ConfigureContent(
 	 */
 
 	for (width = 1; width + j < numWindows; width++) {
-	    const char *string = Tcl_GetString(objv[j+width]);
+	    string = Tcl_GetString(objv[j+width]);
 
 	    if (*string != REL_VERT) {
 		break;
diff --git a/generic/tkImage.c b/generic/tkImage.c
index 763c65b..d42ed7d 100644
--- a/generic/tkImage.c
+++ b/generic/tkImage.c
@@ -361,8 +361,6 @@ Tk_ImageObjCmd(
 	objc -= firstOption;
 	args = (Tcl_Obj **) objv;
 	if (oldimage) {
-	    int i;
-
 	    args = (Tcl_Obj **)ckalloc((objc+1) * sizeof(Tcl_Obj *));
 	    for (i = 0; i < objc; i++) {
 		args[i] = (Tcl_Obj *) Tcl_GetString(objv[i]);
diff --git a/generic/tkImgPPM.c b/generic/tkImgPPM.c
index 89d4387..fed1ca7 100644
--- a/generic/tkImgPPM.c
+++ b/generic/tkImgPPM.c
@@ -94,13 +94,13 @@ static int		ReadPPMStringHeader(Tcl_Obj *dataObj, int *widthPtr,
 static int
 FileMatchPPM(
     Tcl_Channel chan,		/* The image file, open for reading. */
-    const char *fileName,	/* The name of the image file. */
-    Tcl_Obj *format,		/* User-specified format string, or NULL. */
+    TCL_UNUSED(const char *),	/* The name of the image file. */
+    TCL_UNUSED(Tcl_Obj *),		/* User-specified format string, or NULL. */
     int *widthPtr, int *heightPtr,
 				/* The dimensions of the image are returned
 				 * here if the file is a valid raw PPM
 				 * file. */
-    Tcl_Interp *interp)		/* unused */
+    TCL_UNUSED(Tcl_Interp *))		/* unused */
 {
     int dummy;
 
@@ -131,7 +131,7 @@ FileReadPPM(
     Tcl_Interp *interp,		/* Interpreter to use for reporting errors. */
     Tcl_Channel chan,		/* The image file, open for reading. */
     const char *fileName,	/* The name of the image file. */
-    Tcl_Obj *format,		/* User-specified format string, or NULL. */
+    TCL_UNUSED(Tcl_Obj *),		/* User-specified format string, or NULL. */
     Tk_PhotoHandle imageHandle,	/* The photo image to write into. */
     int destX, int destY,	/* Coordinates of top-left pixel in photo
 				 * image to be written to. */
@@ -211,7 +211,7 @@ FileReadPPM(
 	nLines = 1;
     }
     nBytes = nLines * block.pitch;
-    pixelPtr = ckalloc(nBytes);
+    pixelPtr = (unsigned char *)ckalloc(nBytes);
     block.pixelPtr = pixelPtr + srcX * block.pixelSize;
 
     for (h = height; h > 0; h -= nLines) {
@@ -281,7 +281,7 @@ static int
 FileWritePPM(
     Tcl_Interp *interp,
     const char *fileName,
-    Tcl_Obj *format,
+    TCL_UNUSED(Tcl_Obj *),
     Tk_PhotoImageBlock *blockPtr)
 {
     Tcl_Channel chan;
@@ -368,7 +368,7 @@ FileWritePPM(
 static int
 StringWritePPM(
     Tcl_Interp *interp,
-    Tcl_Obj *format,
+    TCL_UNUSED(Tcl_Obj *),
     Tk_PhotoImageBlock *blockPtr)
 {
     int w, h, size, greenOffset, blueOffset;
@@ -444,12 +444,12 @@ StringWritePPM(
 static int
 StringMatchPPM(
     Tcl_Obj *dataObj,		/* The image data. */
-    Tcl_Obj *format,		/* User-specified format string, or NULL. */
+    TCL_UNUSED(Tcl_Obj *),		/* User-specified format string, or NULL. */
     int *widthPtr, int *heightPtr,
 				/* The dimensions of the image are returned
 				 * here if the file is a valid raw PPM
 				 * file. */
-    Tcl_Interp *interp)		/* unused */
+    TCL_UNUSED(Tcl_Interp *))		/* unused */
 {
     int dummy;
 
@@ -479,7 +479,7 @@ static int
 StringReadPPM(
     Tcl_Interp *interp,		/* Interpreter to use for reporting errors. */
     Tcl_Obj *dataObj,		/* The image data. */
-    Tcl_Obj *format,		/* User-specified format string, or NULL. */
+    TCL_UNUSED(Tcl_Obj *),		/* User-specified format string, or NULL. */
     Tk_PhotoHandle imageHandle,	/* The photo image to write into. */
     int destX, int destY,	/* Coordinates of top-left pixel in photo
 				 * image to be written to. */
@@ -578,7 +578,7 @@ StringReadPPM(
 	nLines = 1;
     }
     nBytes = nLines * block.pitch;
-    pixelPtr = ckalloc(nBytes);
+    pixelPtr = (unsigned char *)ckalloc(nBytes);
     block.pixelPtr = pixelPtr + srcX * block.pixelSize;
 
     for (h = height; h > 0; h -= nLines) {
@@ -600,7 +600,6 @@ StringReadPPM(
 		*p = (((int) *dataBuffer) * 255)/maxIntensity;
 	    }
 	} else {
-	    unsigned char *p;
 	    unsigned int value;
 
 	    for (p = pixelPtr,count=nBytes; count > 1; count-=2, p += 2) {
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c
index afbf7b0..8f5295f 100644
--- a/generic/tkImgPhoto.c
+++ b/generic/tkImgPhoto.c
@@ -216,10 +216,10 @@ static const char *	GetExtension(const char *path);
 
 static void
 PhotoFormatThreadExitProc(
-    ClientData clientData)	/* not used */
+    TCL_UNUSED(void *))	/* not used */
 {
     Tk_PhotoImageFormat *freePtr;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     while (tsdPtr->oldFormatList != NULL) {
@@ -262,14 +262,14 @@ Tk_CreateOldPhotoImageFormat(
 				 * by caller. */
 {
     Tk_PhotoImageFormat *copyPtr;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     if (!tsdPtr->initialized) {
 	tsdPtr->initialized = 1;
 	Tcl_CreateThreadExitHandler(PhotoFormatThreadExitProc, NULL);
     }
-    copyPtr = ckalloc(sizeof(Tk_PhotoImageFormat));
+    copyPtr = (Tk_PhotoImageFormat *)ckalloc(sizeof(Tk_PhotoImageFormat));
     *copyPtr = *formatPtr;
     copyPtr->nextPtr = tsdPtr->oldFormatList;
     tsdPtr->oldFormatList = copyPtr;
@@ -283,21 +283,21 @@ Tk_CreatePhotoImageFormat(
 				 * by caller. */
 {
     Tk_PhotoImageFormat *copyPtr;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     if (!tsdPtr->initialized) {
 	tsdPtr->initialized = 1;
 	Tcl_CreateThreadExitHandler(PhotoFormatThreadExitProc, NULL);
     }
-    copyPtr = ckalloc(sizeof(Tk_PhotoImageFormat));
+    copyPtr = (Tk_PhotoImageFormat *)ckalloc(sizeof(Tk_PhotoImageFormat));
     *copyPtr = *formatPtr;
     if (isupper((unsigned char) *formatPtr->name)) {
 	copyPtr->nextPtr = tsdPtr->oldFormatList;
 	tsdPtr->oldFormatList = copyPtr;
     } else {
 	/* for compatibility with aMSN: make a copy of formatPtr->name */
-	char *name = ckalloc(strlen(formatPtr->name) + 1);
+	char *name = (char *)ckalloc(strlen(formatPtr->name) + 1);
 	strcpy(name, formatPtr->name);
 	copyPtr->name = name;
 	copyPtr->nextPtr = tsdPtr->formatList;
@@ -330,7 +330,7 @@ ImgPhotoCreate(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[],	/* Argument objects for options (doesn't
 				 * include image name or type). */
-    const Tk_ImageType *typePtr,/* Pointer to our type record (not used). */
+    TCL_UNUSED(const Tk_ImageType *),/* 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
@@ -342,7 +342,7 @@ ImgPhotoCreate(
      * Allocate and initialize the photo image model record.
      */
 
-    modelPtr = ckalloc(sizeof(PhotoModel));
+    modelPtr = (PhotoModel *)ckalloc(sizeof(PhotoModel));
     memset(modelPtr, 0, sizeof(PhotoModel));
     modelPtr->tkMaster = model;
     modelPtr->interp = interp;
@@ -413,7 +413,7 @@ ImgPhotoCmd(
     int imageWidth, imageHeight, matched, oldformat = 0;
     Tcl_Channel chan;
     Tk_PhotoHandle srcHandle;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     if (objc < 2) {
@@ -818,7 +818,7 @@ ImgPhotoCmd(
 	}
 
 	/*
-	 * Extract the value of the desired pixel and format it as a string.
+	 * Extract the value of the desired pixel and format it as a list.
 	 */
 
 	pixelPtr = modelPtr->pix32 + (y * modelPtr->width + x) * 4;
@@ -1797,7 +1797,7 @@ ImgPhotoConfigureModel(
     Tk_PhotoImageFormat *imageFormat;
     const char **args;
 
-    args = ckalloc((objc + 1) * sizeof(char *));
+    args = (const char **)ckalloc((objc + 1) * sizeof(char *));
     for (i = 0, j = 0; i < objc; i++,j++) {
 	args[j] = Tcl_GetString(objv[i]);
 	length = objv[i]->length;
@@ -2138,7 +2138,7 @@ ImgPhotoDelete(
     ClientData modelData)	/* Pointer to PhotoModel structure for image.
 				 * Must not have any more instances. */
 {
-    PhotoModel *modelPtr = modelData;
+    PhotoModel *modelPtr = (PhotoModel *)modelData;
     PhotoInstance *instancePtr;
 
     while ((instancePtr = modelPtr->instancePtr) != NULL) {
@@ -2190,7 +2190,7 @@ ImgPhotoCmdDeletedProc(
     ClientData clientData)	/* Pointer to PhotoModel structure for
 				 * image. */
 {
-    PhotoModel *modelPtr = clientData;
+    PhotoModel *modelPtr = (PhotoModel *)clientData;
 
     modelPtr->imageCmd = NULL;
     if (modelPtr->tkMaster != NULL) {
@@ -2263,7 +2263,7 @@ ImgPhotoSetSize(
 	if (newPixSize == 0) {
 	    newPix32 = NULL;
 	} else {
-	    newPix32 = attemptckalloc(newPixSize);
+	    newPix32 = (unsigned char *)attemptckalloc(newPixSize);
 	    if (newPix32 == NULL) {
 		return TCL_ERROR;
 	    }
@@ -2426,7 +2426,7 @@ MatchFileFormat(
 {
     int matched = 0, useoldformat = 0;
     Tk_PhotoImageFormat *formatPtr;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
     const char *formatString = NULL;
 
@@ -2566,7 +2566,7 @@ MatchStringFormat(
 {
     int matched = 0, useoldformat = 0;
     Tk_PhotoImageFormat *formatPtr;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
     const char *formatString = NULL;
 
@@ -2724,7 +2724,7 @@ Tk_PhotoPutBlock(
     int compRule)		/* Compositing rule to use when processing
 				 * transparent pixels. */
 {
-    register PhotoModel *modelPtr = (PhotoModel *) handle;
+    PhotoModel *modelPtr = (PhotoModel *) handle;
     Tk_PhotoImageBlock sourceBlock;
     unsigned char *memToFree;
     int xEnd, yEnd, greenOffset, blueOffset, alphaOffset;
@@ -2786,7 +2786,7 @@ Tk_PhotoPutBlock(
 	unsigned int cpyLen = (sourceBlock.height - 1) * sourceBlock.pitch +
 		sourceBlock.width * sourceBlock.pixelSize;
 
-	sourceBlock.pixelPtr = attemptckalloc(cpyLen);
+	sourceBlock.pixelPtr = (unsigned char *)attemptckalloc(cpyLen);
 	if (sourceBlock.pixelPtr == NULL) {
 	    if (interp != NULL) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
@@ -3077,10 +3077,10 @@ Tk_PhotoPutBlock(
 	 */
 
 	if (!(modelPtr->flags & COMPLEX_ALPHA)) {
-	    register int x1;
+	    int x1;
 
 	    for (x1=x ; x1<x+width ; x1++) {
-		register unsigned char newAlpha;
+		unsigned char newAlpha;
 
 		destLinePtr = modelPtr->pix32 + (y*modelPtr->width + x1)*4;
 		newAlpha = destLinePtr[3];
@@ -3162,8 +3162,8 @@ Tk_PhotoPutZoomedBlock(
     int compRule)		/* Compositing rule to use when processing
 				 * transparent pixels. */
 {
-    register PhotoModel *modelPtr = (PhotoModel *) handle;
-    register Tk_PhotoImageBlock sourceBlock;
+    PhotoModel *modelPtr = (PhotoModel *) handle;
+    Tk_PhotoImageBlock sourceBlock;
     unsigned char *memToFree;
     int xEnd, yEnd, greenOffset, blueOffset, alphaOffset;
     int wLeft, hLeft, wCopy, hCopy, blockWid, blockHt;
@@ -3232,7 +3232,7 @@ Tk_PhotoPutZoomedBlock(
 	unsigned int cpyLen = (sourceBlock.height - 1) * sourceBlock.pitch +
 		sourceBlock.width * sourceBlock.pixelSize;
 
-	sourceBlock.pixelPtr = attemptckalloc(cpyLen);
+	sourceBlock.pixelPtr = (unsigned char *)attemptckalloc(cpyLen);
 	if (sourceBlock.pixelPtr == NULL) {
 	    if (interp != NULL) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
@@ -3837,7 +3837,7 @@ ImgGetPhoto(
     blueOffset = blockPtr->offset[2] - blockPtr->offset[0];
     if (((optPtr->options & OPT_BACKGROUND) && alphaOffset) ||
 	    ((optPtr->options & OPT_GRAYSCALE) && (greenOffset||blueOffset))) {
-	int newPixelSize,x,y;
+	int newPixelSize;
 	unsigned char *srcPtr, *destPtr;
 	char *data;
 
@@ -3850,7 +3850,7 @@ ImgGetPhoto(
 	if (blockPtr->height > (int)((UINT_MAX/newPixelSize)/blockPtr->width)) {
 	    return NULL;
 	}
-	data = attemptckalloc(newPixelSize*blockPtr->width*blockPtr->height);
+	data = (char *)attemptckalloc(newPixelSize*blockPtr->width*blockPtr->height);
 	if (data == NULL) {
 	    return NULL;
 	}
@@ -4058,7 +4058,7 @@ Tk_PhotoGetImage(
 /*
  *--------------------------------------------------------------
  *
- * TkPostscriptPhoto --
+ * ImgPostscriptPhoto --
  *
  *	This function is called to output the contents of a photo image in
  *	Postscript by calling the Tk_PostscriptPhoto function.
@@ -4076,11 +4076,11 @@ static int
 ImgPhotoPostscript(
     ClientData clientData,	/* Handle for the photo image. */
     Tcl_Interp *interp,		/* Interpreter. */
-    Tk_Window tkwin,		/* (unused) */
+    TCL_UNUSED(Tk_Window),		/* (unused) */
     Tk_PostscriptInfo psInfo,	/* Postscript info. */
     int x, int y,		/* First pixel to output. */
     int width, int height,	/* Width and height of area. */
-    int prepass)		/* (unused) */
+    TCL_UNUSED(int))		/* (unused) */
 {
     Tk_PhotoImageBlock block;
 
@@ -4195,5 +4195,6 @@ Tk_PhotoSetSize_Panic(
  * mode: c
  * c-basic-offset: 4
  * fill-column: 78
+ * tab-width: 8
  * End:
  */
diff --git a/generic/tkPanedWindow.c b/generic/tkPanedWindow.c
index fec9448..06a42d4 100644
--- a/generic/tkPanedWindow.c
+++ b/generic/tkPanedWindow.c
@@ -13,8 +13,8 @@
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
-#include "default.h"
 #include "tkInt.h"
+#include "default.h"
 
 /*
  * Flag values for "sticky"ness. The 16 combinations subsume the packer's
@@ -383,7 +383,7 @@ static const Tk_OptionSpec paneOptionSpecs[] = {
 
 int
 Tk_PanedWindowObjCmd(
-    ClientData clientData,	/* NULL. */
+    TCL_UNUSED(ClientData),	/* NULL. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj * const objv[])	/* Argument objects. */
@@ -437,7 +437,7 @@ Tk_PanedWindowObjCmd(
      * Allocate and initialize the widget record.
      */
 
-    pwPtr = ckalloc(sizeof(PanedWindow));
+    pwPtr = (PanedWindow *)ckalloc(sizeof(PanedWindow));
     memset((void *)pwPtr, 0, (sizeof(PanedWindow)));
     pwPtr->tkwin = tkwin;
     pwPtr->display = Tk_Display(tkwin);
@@ -535,7 +535,7 @@ PanedWindowWidgetObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj * const objv[])	/* Argument objects. */
 {
-    PanedWindow *pwPtr = clientData;
+    PanedWindow *pwPtr = (PanedWindow *)clientData;
     int result = TCL_OK;
     static const char *const optionStrings[] = {
 	"add", "cget", "configure", "forget", "identify", "panecget",
@@ -604,7 +604,6 @@ PanedWindowWidgetObjCmd(
 	break;
 
     case PW_FORGET: {
-	int i;
 
 	if (objc < 3) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "widget ?widget ...?");
@@ -903,7 +902,7 @@ ConfigurePanes(
      * structures may already have existed, some may be new.
      */
 
-    inserts = ckalloc(sizeof(Pane *) * (firstOptionArg - 2));
+    inserts = (Pane **)ckalloc(sizeof(Pane *) * (firstOptionArg - 2));
     insertIndex = 0;
 
     /*
@@ -970,7 +969,7 @@ ConfigurePanes(
 	 * out with their "natural" dimensions.
 	 */
 
-	panePtr = ckalloc(sizeof(Pane));
+	panePtr = (Pane *)ckalloc(sizeof(Pane));
 	memset(panePtr, 0, sizeof(Pane));
 	Tk_InitOptions(interp, (char *)panePtr, pwPtr->paneOpts,
 		pwPtr->tkwin);
@@ -1010,8 +1009,8 @@ ConfigurePanes(
      */
 
     i = sizeof(Pane *) * (pwPtr->numPanes + numNewPanes);
-    newPanes = ckalloc(i);
-    memset(newPanes, 0, (size_t) i);
+    newPanes = (Pane **)ckalloc(i);
+    memset(newPanes, 0, i);
     if (index == -1) {
 	/*
 	 * If none of the existing panes have to be moved, just copy the old
@@ -1249,7 +1248,7 @@ ConfigurePanedWindow(
     Tk_SavedOptions savedOptions;
     int typemask = 0;
 
-    if (Tk_SetOptions(interp, (char *) pwPtr, pwPtr->optionTable, objc, objv,
+    if (Tk_SetOptions(interp, (char *)pwPtr, pwPtr->optionTable, objc, objv,
 	    pwPtr->tkwin, &savedOptions, &typemask) != TCL_OK) {
 	Tk_RestoreSavedOptions(&savedOptions);
 	return TCL_ERROR;
@@ -1295,7 +1294,7 @@ PanedWindowWorldChanged(
 {
     XGCValues gcValues;
     GC newGC;
-    PanedWindow *pwPtr = instanceData;
+    PanedWindow *pwPtr = (PanedWindow *)instanceData;
 
     /*
      * Allocated a graphics context for drawing the paned window widget
@@ -1352,7 +1351,7 @@ PanedWindowEventProc(
     ClientData clientData,	/* Information about window. */
     XEvent *eventPtr)		/* Information about event. */
 {
-    PanedWindow *pwPtr = clientData;
+    PanedWindow *pwPtr = (PanedWindow *)clientData;
     int i;
 
     if (eventPtr->type == Expose) {
@@ -1405,7 +1404,7 @@ static void
 PanedWindowCmdDeletedProc(
     ClientData clientData)	/* Pointer to widget record for widget. */
 {
-    PanedWindow *pwPtr = clientData;
+    PanedWindow *pwPtr = (PanedWindow *)clientData;
 
     /*
      * This function could be invoked either because the window was destroyed
@@ -1442,7 +1441,7 @@ static void
 DisplayPanedWindow(
     ClientData clientData)	/* Information about window. */
 {
-    PanedWindow *pwPtr = clientData;
+    PanedWindow *pwPtr = (PanedWindow *)clientData;
     Pane *panePtr;
     Pixmap pixmap;
     Tk_Window tkwin = pwPtr->tkwin;
@@ -1484,10 +1483,10 @@ DisplayPanedWindow(
      */
 
     if (horizontal) {
-	sashHeight = Tk_Height(tkwin) - (2 * Tk_InternalBorderWidth(tkwin));
+	sashHeight = Tk_Height(tkwin) - (2 * Tk_InternalBorderLeft(tkwin));
 	sashWidth = pwPtr->sashWidth;
     } else {
-	sashWidth = Tk_Width(tkwin) - (2 * Tk_InternalBorderWidth(tkwin));
+	sashWidth = Tk_Width(tkwin) - (2 * Tk_InternalBorderLeft(tkwin));
 	sashHeight = pwPtr->sashWidth;
     }
 
@@ -1627,10 +1626,10 @@ static void
 PanedWindowReqProc(
     ClientData clientData,	/* Paned window's information about window
 				 * that got new preferred geometry. */
-    Tk_Window tkwin)		/* Other Tk-related information about the
+    TCL_UNUSED(Tk_Window))		/* Other Tk-related information about the
 				 * window. */
 {
-    Pane *panePtr = clientData;
+    Pane *panePtr = (Pane *)clientData;
     PanedWindow *pwPtr = (PanedWindow *) panePtr->containerPtr;
 
     if (Tk_IsMapped(pwPtr->tkwin)) {
@@ -1673,9 +1672,9 @@ static void
 PanedWindowLostPaneProc(
     ClientData clientData,	/* Grid structure for the pane that was
 				 * stolen away. */
-    Tk_Window tkwin)		/* Tk's handle for the pane. */
+    TCL_UNUSED(Tk_Window))		/* Tk's handle for the pane. */
 {
-    register Pane *panePtr = clientData;
+    Pane *panePtr = (Pane *)clientData;
     PanedWindow *pwPtr = (PanedWindow *) panePtr->containerPtr;
 
     if (pwPtr->tkwin != Tk_Parent(panePtr->tkwin)) {
@@ -1714,8 +1713,8 @@ ArrangePanes(
     ClientData clientData)	/* Structure describing parent whose panes
 				 * are to be re-layed out. */
 {
-    register PanedWindow *pwPtr = clientData;
-    register Pane *panePtr;
+    PanedWindow *pwPtr = (PanedWindow *)clientData;
+    Pane *panePtr;
     int i, newPaneWidth, newPaneHeight, paneX, paneY;
     int paneWidth, paneHeight, paneSize, paneMinSize;
     int doubleBw;
@@ -1754,7 +1753,7 @@ ArrangePanes(
      */
 
     paneDynSize = paneDynMinSize = 0;
-    internalBW = Tk_InternalBorderWidth(pwPtr->tkwin);
+    internalBW = Tk_InternalBorderLeft(pwPtr->tkwin);
     pwHeight = Tk_Height(pwPtr->tkwin) - (2 * internalBW);
     pwWidth = Tk_Width(pwPtr->tkwin) - (2 * internalBW);
     x = y = internalBW;
@@ -2014,9 +2013,9 @@ ArrangePanes(
 
 static void
 Unlink(
-    register Pane *panePtr)		/* Window to unlink. */
+    Pane *panePtr)		/* Window to unlink. */
 {
-    register PanedWindow *containerPtr;
+    PanedWindow *containerPtr;
     int i, j;
 
     containerPtr = panePtr->containerPtr;
@@ -2160,7 +2159,7 @@ PaneStructureProc(
     ClientData clientData,	/* Pointer to record describing window item. */
     XEvent *eventPtr)		/* Describes what just happened. */
 {
-    Pane *panePtr = clientData;
+    Pane *panePtr = (Pane *)clientData;
     PanedWindow *pwPtr = panePtr->containerPtr;
 
     if (eventPtr->type == DestroyNotify) {
@@ -2200,7 +2199,7 @@ ComputeGeometry(
 
     pwPtr->flags |= REQUESTED_RELAYOUT;
 
-    x = y = internalBw = Tk_InternalBorderWidth(pwPtr->tkwin);
+    x = y = internalBw = Tk_InternalBorderLeft(pwPtr->tkwin);
     reqWidth = reqHeight = 0;
 
     /*
@@ -2370,7 +2369,7 @@ ComputeGeometry(
 static void
 DestroyOptionTables(
     ClientData clientData,	/* Pointer to the OptionTables struct */
-    Tcl_Interp *interp)		/* Pointer to the calling interp */
+    TCL_UNUSED(Tcl_Interp *))		/* Pointer to the calling interp */
 {
     ckfree(clientData);
 }
@@ -2394,8 +2393,8 @@ DestroyOptionTables(
 
 static Tcl_Obj *
 GetSticky(
-    ClientData clientData,
-    Tk_Window tkwin,
+    TCL_UNUSED(void *),
+    TCL_UNUSED(Tk_Window),
     char *recordPtr,		/* Pointer to widget record. */
     int internalOffset)		/* Offset within *recordPtr containing the
 				 * sticky value. */
@@ -2442,9 +2441,9 @@ GetSticky(
 
 static int
 SetSticky(
-    ClientData clientData,
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,		/* Current interp; may be used for errors. */
-    Tk_Window tkwin,		/* Window for which option is being set. */
+    TCL_UNUSED(Tk_Window),	/* Window for which option is being set. */
     Tcl_Obj **value,		/* Pointer to the pointer to the value object.
 				 * We use a pointer to the pointer because we
 				 * may need to return a value (NULL). */
@@ -2521,8 +2520,8 @@ SetSticky(
 
 static void
 RestoreSticky(
-    ClientData clientData,
-    Tk_Window tkwin,
+    TCL_UNUSED(void *),
+    TCL_UNUSED(Tk_Window),
     char *internalPtr,		/* Pointer to storage for value. */
     char *oldInternalPtr)	/* Pointer to old value. */
 {
@@ -2754,7 +2753,7 @@ ProxyWindowEventProc(
     ClientData clientData,	/* Information about window. */
     XEvent *eventPtr)		/* Information about event. */
 {
-    PanedWindow *pwPtr = clientData;
+    PanedWindow *pwPtr = (PanedWindow *)clientData;
 
     if (eventPtr->type == Expose) {
 	if (pwPtr->proxywin != NULL &&!(pwPtr->flags & PROXY_REDRAW_PENDING)) {
@@ -2786,7 +2785,7 @@ static void
 DisplayProxyWindow(
     ClientData clientData)	/* Information about window. */
 {
-    PanedWindow *pwPtr = clientData;
+    PanedWindow *pwPtr = (PanedWindow *)clientData;
     Pixmap pixmap;
     Tk_Window tkwin = pwPtr->proxywin;
     pwPtr->flags &= ~PROXY_REDRAW_PENDING;
@@ -2906,7 +2905,7 @@ PanedWindowProxyCommand(
 	    return TCL_ERROR;
 	}
 
-        internalBW = Tk_InternalBorderWidth(pwPtr->tkwin);
+        internalBW = Tk_InternalBorderLeft(pwPtr->tkwin);
 	if (pwPtr->orient == ORIENT_HORIZONTAL) {
 	    if (x < 0) {
 		x = 0;
@@ -2915,10 +2914,10 @@ PanedWindowProxyCommand(
             if (x > pwWidth) {
                 x = pwWidth;
             }
-            y = Tk_InternalBorderWidth(pwPtr->tkwin);
+            y = Tk_InternalBorderLeft(pwPtr->tkwin);
 	    sashWidth = pwPtr->sashWidth;
 	    sashHeight = Tk_Height(pwPtr->tkwin) -
-		    (2 * Tk_InternalBorderWidth(pwPtr->tkwin));
+		    (2 * Tk_InternalBorderLeft(pwPtr->tkwin));
 	} else {
 	    if (y < 0) {
 		y = 0;
@@ -2927,10 +2926,10 @@ PanedWindowProxyCommand(
             if (y > pwHeight) {
                 y = pwHeight;
             }
-	    x = Tk_InternalBorderWidth(pwPtr->tkwin);
+	    x = Tk_InternalBorderLeft(pwPtr->tkwin);
 	    sashHeight = pwPtr->sashWidth;
 	    sashWidth = Tk_Width(pwPtr->tkwin) -
-		    (2 * Tk_InternalBorderWidth(pwPtr->tkwin));
+		    (2 * Tk_InternalBorderLeft(pwPtr->tkwin));
 	}
 
 	if (sashWidth < 1) {
@@ -3066,7 +3065,7 @@ PanedWindowIdentifyCoords(
 	} else {
 	    sashHeight = Tk_ReqHeight(pwPtr->tkwin);
 	}
-	sashHeight -= 2 * Tk_InternalBorderWidth(pwPtr->tkwin);
+	sashHeight -= 2 * Tk_InternalBorderLeft(pwPtr->tkwin);
 	if (pwPtr->showHandle && pwPtr->handleSize > pwPtr->sashWidth) {
 	    sashWidth = pwPtr->handleSize;
 	    lpad = (pwPtr->handleSize - pwPtr->sashWidth) / 2;
@@ -3094,7 +3093,7 @@ PanedWindowIdentifyCoords(
 	} else {
 	    sashWidth = Tk_ReqWidth(pwPtr->tkwin);
 	}
-	sashWidth -= 2 * Tk_InternalBorderWidth(pwPtr->tkwin);
+	sashWidth -= 2 * Tk_InternalBorderLeft(pwPtr->tkwin);
 	lpad = rpad = 0;
     }
 
diff --git a/generic/tkScrollbar.c b/generic/tkScrollbar.c
index 9a85532..8c80846 100644
--- a/generic/tkScrollbar.c
+++ b/generic/tkScrollbar.c
@@ -127,8 +127,8 @@ Tk_ScrollbarObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])		/* Argument strings. */
 {
-    Tk_Window tkwin = clientData;
-    register TkScrollbar *scrollPtr;
+    Tk_Window tkwin = (Tk_Window)clientData;
+    TkScrollbar *scrollPtr;
     Tk_Window newWin;
 
     if (objc < 2) {
@@ -223,7 +223,7 @@ ScrollbarWidgetObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])		/* Argument strings. */
 {
-    register TkScrollbar *scrollPtr = clientData;
+    TkScrollbar *scrollPtr = (TkScrollbar *)clientData;
     int result = TCL_OK;
     int length, cmdIndex;
     static const char *const commandNames[] = {
@@ -308,7 +308,7 @@ ScrollbarWidgetObjCmd(
 	break;
     }
     case COMMAND_DELTA: {
-	int xDelta, yDelta, pixels, length;
+	int xDelta, yDelta, pixels;
 	double fraction;
 
 	if (objc != 4) {
@@ -337,7 +337,7 @@ ScrollbarWidgetObjCmd(
 	break;
     }
     case COMMAND_FRACTION: {
-	int x, y, pos, length;
+	int x, y, pos;
 	double fraction;
 
 	if (objc != 4) {
@@ -521,7 +521,7 @@ ScrollbarWidgetObjCmd(
 static int
 ConfigureScrollbar(
     Tcl_Interp *interp,		/* Used for error reporting. */
-    register TkScrollbar *scrollPtr,
+    TkScrollbar *scrollPtr,
 				/* Information about widget; may or may not
 				 * already have values for some fields. */
     int objc,			/* Number of valid entries in argv. */
@@ -584,7 +584,7 @@ TkScrollbarEventProc(
     ClientData clientData,	/* Information about window. */
     XEvent *eventPtr)		/* Information about event. */
 {
-    TkScrollbar *scrollPtr = clientData;
+    TkScrollbar *scrollPtr = (TkScrollbar *)clientData;
 
     if ((eventPtr->type == Expose) && (eventPtr->xexpose.count == 0)) {
 	TkScrollbarEventuallyRedraw(scrollPtr);
@@ -649,7 +649,7 @@ static void
 ScrollbarCmdDeletedProc(
     ClientData clientData)	/* Pointer to widget record for widget. */
 {
-    TkScrollbar *scrollPtr = clientData;
+    TkScrollbar *scrollPtr = (TkScrollbar *)clientData;
     Tk_Window tkwin = scrollPtr->tkwin;
 
     /*
diff --git a/generic/tkTest.c b/generic/tkTest.c
index 3c17407..1fa821c 100644
--- a/generic/tkTest.c
+++ b/generic/tkTest.c
@@ -244,7 +244,7 @@ Tktest_Init(
      */
 
     if (Tcl_PkgProvideEx(interp, "Tktest", TK_PATCH_LEVEL, NULL) == TCL_ERROR) {
-        return TCL_ERROR;
+	return TCL_ERROR;
     }
 
     Tcl_CreateObjCommand(interp, "square", SquareObjCmd, NULL, NULL);
@@ -324,10 +324,9 @@ Tktest_Init(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TestbitmapObjCmd(
-    ClientData clientData,	/* Main window for application. */
+    TCL_UNUSED(void *),	/* Main window for application. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -359,10 +358,9 @@ TestbitmapObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TestborderObjCmd(
-    ClientData clientData,	/* Main window for application. */
+    TCL_UNUSED(ClientData),	/* Main window for application. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -394,10 +392,9 @@ TestborderObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TestcolorObjCmd(
-    ClientData clientData,	/* Main window for application. */
+    TCL_UNUSED(void *),	/* Main window for application. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -428,10 +425,9 @@ TestcolorObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TestcursorObjCmd(
-    ClientData clientData,	/* Main window for application. */
+    TCL_UNUSED(void *),	/* Main window for application. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
@@ -457,19 +453,18 @@ TestcursorObjCmd(
  *	A standard Tcl result.
  *
  * Side effects:
- *	All the intepreters created by previous calls to "testnewapp" get
+ *	All the interpreters created by previous calls to "testnewapp" get
  *	deleted.
  *
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TestdeleteappsObjCmd(
-    ClientData clientData,	/* Main window for application. */
-    Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,			/* Number of arguments. */
-    Tcl_Obj *const objv[])		/* Argument strings. */
+    TCL_UNUSED(void *),	/* Main window for application. */
+    TCL_UNUSED(Tcl_Interp *),		/* Current interpreter. */
+    TCL_UNUSED(int),			/* Number of arguments. */
+    TCL_UNUSED(Tcl_Obj *const *))		/* Argument strings. */
 {
     NewApp *nextPtr;
 
@@ -500,7 +495,6 @@ TestdeleteappsObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TestobjconfigObjCmd(
     ClientData clientData,	/* Main window for application. */
@@ -639,7 +633,6 @@ TestobjconfigObjCmd(
 	    {TK_OPTION_END, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0}
 	};
 	Tk_OptionTable optionTable;
-	Tk_Window tkwin;
 
 	optionTable = Tk_CreateOptionTable(interp, typesSpecs);
 	tables[index] = optionTable;
@@ -650,7 +643,7 @@ TestobjconfigObjCmd(
 	}
 	Tk_SetClass(tkwin, "Test");
 
-	recordPtr = ckalloc(sizeof(TypesRecord));
+	recordPtr = (TypesRecord *)ckalloc(sizeof(TypesRecord));
 	recordPtr->header.interp = interp;
 	recordPtr->header.optionTable = optionTable;
 	recordPtr->header.tkwin = tkwin;
@@ -695,7 +688,6 @@ TestobjconfigObjCmd(
 
     case CHAIN1: {
 	ExtensionWidgetRecord *recordPtr;
-	Tk_Window tkwin;
 	Tk_OptionTable optionTable;
 
 	tkwin = Tk_CreateWindowFromPath(interp, (Tk_Window) clientData,
@@ -707,7 +699,7 @@ TestobjconfigObjCmd(
 	optionTable = Tk_CreateOptionTable(interp, baseSpecs);
 	tables[index] = optionTable;
 
-	recordPtr = ckalloc(sizeof(ExtensionWidgetRecord));
+	recordPtr = (ExtensionWidgetRecord *)ckalloc(sizeof(ExtensionWidgetRecord));
 	recordPtr->header.interp = interp;
 	recordPtr->header.optionTable = optionTable;
 	recordPtr->header.tkwin = tkwin;
@@ -748,7 +740,6 @@ TestobjconfigObjCmd(
 	    {TK_OPTION_END, NULL, NULL, NULL, NULL, 0, -1, 0,
 		(ClientData) baseSpecs, 0}
 	};
-	Tk_Window tkwin;
 	Tk_OptionTable optionTable;
 
 	tkwin = Tk_CreateWindowFromPath(interp, (Tk_Window) clientData,
@@ -760,7 +751,7 @@ TestobjconfigObjCmd(
 	optionTable = Tk_CreateOptionTable(interp, extensionSpecs);
 	tables[index] = optionTable;
 
-	recordPtr = ckalloc(sizeof(ExtensionWidgetRecord));
+	recordPtr = (ExtensionWidgetRecord *)ckalloc(sizeof(ExtensionWidgetRecord));
 	recordPtr->header.interp = interp;
 	recordPtr->header.optionTable = optionTable;
 	recordPtr->header.tkwin = tkwin;
@@ -917,7 +908,6 @@ TestobjconfigObjCmd(
 	    {TK_OPTION_END, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0}
 	};
 	Tk_OptionTable optionTable;
-	Tk_Window tkwin;
 
 	optionTable = Tk_CreateOptionTable(interp, internalSpecs);
 	tables[index] = optionTable;
@@ -1072,7 +1062,7 @@ TestobjconfigObjCmd(
 		Tk_Offset(ContentRecord, windowPtr), -1, TK_CONFIG_NULL_OK, NULL, 0},
 	    {TK_OPTION_END, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, 0}
 	};
-	Tk_Window tkwin = Tk_CreateWindowFromPath(interp,
+	tkwin = Tk_CreateWindowFromPath(interp,
 		(Tk_Window) clientData, Tcl_GetString(objv[2]), NULL);
 
 	if (tkwin == NULL) {
@@ -1080,7 +1070,7 @@ TestobjconfigObjCmd(
 	}
 	Tk_SetClass(tkwin, "Test");
 
-	recordPtr = ckalloc(sizeof(ContentRecord));
+	recordPtr = (ContentRecord *)ckalloc(sizeof(ContentRecord));
 	recordPtr->header.interp = interp;
 	recordPtr->header.optionTable = Tk_CreateOptionTable(interp,
 		contentSpecs);
@@ -1133,7 +1123,6 @@ TestobjconfigObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TrivialConfigObjCmd(
     ClientData clientData,	/* Main window for application. */
@@ -1245,7 +1234,7 @@ static void
 TrivialCmdDeletedProc(
     ClientData clientData)	/* Pointer to widget record for widget. */
 {
-    TrivialCommandHeader *headerPtr = (TrivialCommandHeader *) clientData;
+    TrivialCommandHeader *headerPtr = (TrivialCommandHeader *)clientData;
     Tk_Window tkwin = headerPtr->tkwin;
 
     if (tkwin != NULL) {
@@ -1257,8 +1246,8 @@ TrivialCmdDeletedProc(
 	 * here.
 	 */
 
-	Tk_FreeConfigOptions((char *) clientData,
-		headerPtr->optionTable, (Tk_Window) NULL);
+	Tk_FreeConfigOptions((char *)clientData,
+		headerPtr->optionTable, NULL);
 	Tcl_EventuallyFree(clientData, TCL_DYNAMIC);
     }
 }
@@ -1284,11 +1273,11 @@ TrivialEventProc(
     ClientData clientData,	/* Information about window. */
     XEvent *eventPtr)		/* Information about event. */
 {
-    TrivialCommandHeader *headerPtr = (TrivialCommandHeader *) clientData;
+    TrivialCommandHeader *headerPtr = (TrivialCommandHeader *)clientData;
 
     if (eventPtr->type == DestroyNotify) {
 	if (headerPtr->tkwin != NULL) {
-	    Tk_FreeConfigOptions((char *) clientData,
+	    Tk_FreeConfigOptions((char *)clientData,
 		    headerPtr->optionTable, headerPtr->tkwin);
 	    headerPtr->optionTable = NULL;
 	    headerPtr->tkwin = NULL;
@@ -1316,7 +1305,6 @@ TrivialEventProc(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TestfontObjCmd(
     ClientData clientData,	/* Main window for application. */
@@ -1330,7 +1318,7 @@ TestfontObjCmd(
     Tk_Window tkwin;
     Tk_Font tkfont;
 
-    tkwin = (Tk_Window) clientData;
+    tkwin = (Tk_Window)clientData;
 
     if (objc < 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "option fontName");
@@ -1376,7 +1364,6 @@ TestfontObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 ImageCreate(
     Tcl_Interp *interp,		/* Interpreter for application containing
@@ -1385,7 +1372,7 @@ ImageCreate(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[],	/* Argument strings for options (doesn't
 				 * include image name or type). */
-    const Tk_ImageType *typePtr,	/* Pointer to our type record (not used). */
+    TCL_UNUSED(const Tk_ImageType *),	/* 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
@@ -1410,14 +1397,14 @@ ImageCreate(
 	varName = Tcl_GetString(objv[i+1]);
     }
 
-    timPtr = ckalloc(sizeof(TImageModel));
+    timPtr = (TImageModel *)ckalloc(sizeof(TImageModel));
     timPtr->model = model;
     timPtr->interp = interp;
     timPtr->width = 30;
     timPtr->height = 15;
-    timPtr->imageName = ckalloc(strlen(name) + 1);
+    timPtr->imageName = (char *)ckalloc(strlen(name) + 1);
     strcpy(timPtr->imageName, name);
-    timPtr->varName = ckalloc(strlen(varName) + 1);
+    timPtr->varName = (char *)ckalloc(strlen(varName) + 1);
     strcpy(timPtr->varName, varName);
     Tcl_CreateObjCommand(interp, name, ImageObjCmd, timPtr, NULL);
     *clientDataPtr = timPtr;
@@ -1442,7 +1429,6 @@ ImageCreate(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 ImageObjCmd(
     ClientData clientData,	/* Main window for application. */
@@ -1450,7 +1436,7 @@ ImageObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])		/* Argument strings. */
 {
-    TImageModel *timPtr = (TImageModel *) clientData;
+    TImageModel *timPtr = (TImageModel *)clientData;
     int x, y, width, height;
 
     if (objc < 2) {
@@ -1505,7 +1491,7 @@ ImageGet(
 				 * used. */
     ClientData clientData)	/* Pointer to TImageModel for image. */
 {
-    TImageModel *timPtr = (TImageModel *) clientData;
+    TImageModel *timPtr = (TImageModel *)clientData;
     TImageInstance *instPtr;
     char buffer[100];
     XGCValues gcValues;
@@ -1514,7 +1500,7 @@ ImageGet(
     Tcl_SetVar2(timPtr->interp, timPtr->varName, NULL, buffer,
 	    TCL_GLOBAL_ONLY|TCL_APPEND_VALUE|TCL_LIST_ELEMENT);
 
-    instPtr = ckalloc(sizeof(TImageInstance));
+    instPtr = (TImageInstance *)ckalloc(sizeof(TImageInstance));
     instPtr->modelPtr = timPtr;
     instPtr->fg = Tk_GetColor(timPtr->interp, tkwin, "#ff0000");
     gcValues.foreground = instPtr->fg->pixel;
@@ -1553,7 +1539,7 @@ ImageDisplay(
 				/* Coordinates in drawable corresponding to
 				 * imageX and imageY. */
 {
-    TImageInstance *instPtr = (TImageInstance *) clientData;
+    TImageInstance *instPtr = (TImageInstance *)clientData;
 
     /*
      * The purpose of the test image type is to track the calls to an image
@@ -1637,7 +1623,7 @@ ImageFree(
     ClientData clientData,	/* Pointer to TImageInstance for instance. */
     Display *display)		/* Display where image was to be drawn. */
 {
-    TImageInstance *instPtr = (TImageInstance *) clientData;
+    TImageInstance *instPtr = (TImageInstance *)clientData;
     char buffer[200];
 
     sprintf(buffer, "%s free", instPtr->modelPtr->imageName);
@@ -1671,7 +1657,7 @@ ImageDelete(
 				 * this function is called, no more instances
 				 * exist. */
 {
-    TImageModel *timPtr = (TImageModel *) clientData;
+    TImageModel *timPtr = (TImageModel *)clientData;
     char buffer[100];
 
     sprintf(buffer, "%s delete", timPtr->imageName);
@@ -1702,7 +1688,6 @@ ImageDelete(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TestmakeexistObjCmd(
     ClientData clientData,	/* Main window for application. */
@@ -1710,7 +1695,7 @@ TestmakeexistObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])		/* Argument strings. */
 {
-    Tk_Window mainWin = (Tk_Window) clientData;
+    Tk_Window mainWin = (Tk_Window)clientData;
     int i;
     Tk_Window tkwin;
 
@@ -1743,7 +1728,6 @@ TestmakeexistObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 #if !(defined(_WIN32) || defined(MAC_OSX_TK) || defined(__CYGWIN__))
 static int
 TestmenubarObjCmd(
@@ -1753,7 +1737,7 @@ TestmenubarObjCmd(
     Tcl_Obj *const objv[])		/* Argument strings. */
 {
 #ifdef __UNIX__
-    Tk_Window mainWin = (Tk_Window) clientData;
+    Tk_Window mainWin = (Tk_Window)clientData;
     Tk_Window tkwin, menubar;
 
     if (objc < 2) {
@@ -1813,7 +1797,7 @@ TestmenubarObjCmd(
 #if defined(_WIN32)
 static int
 TestmetricsObjCmd(
-    ClientData clientData,	/* Main window for application. */
+    TCL_UNUSED(void *),	/* Main window for application. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])		/* Argument strings. */
@@ -1858,7 +1842,6 @@ TestmetricsObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TestpropObjCmd(
     ClientData clientData,	/* Main window for application. */
@@ -1866,7 +1849,7 @@ TestpropObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])		/* Argument strings. */
 {
-    Tk_Window mainWin = (Tk_Window) clientData;
+    Tk_Window mainWin = (Tk_Window)clientData;
     int result, actualFormat;
     unsigned long bytesAfter, length, value;
     Atom actualType, propName;
@@ -1937,7 +1920,6 @@ TestpropObjCmd(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static int
 TestwrapperObjCmd(
     ClientData clientData,	/* Main window for application. */
@@ -1953,7 +1935,7 @@ TestwrapperObjCmd(
 	return TCL_ERROR;
     }
 
-    tkwin = (Tk_Window) clientData;
+    tkwin = (Tk_Window)clientData;
     winPtr = (TkWindow *) Tk_NameToWindow(interp, Tcl_GetString(objv[1]), tkwin);
     if (winPtr == NULL) {
 	return TCL_ERROR;
@@ -1990,17 +1972,16 @@ TestwrapperObjCmd(
  *		CustomOptionSet		Sets option value to new setting.
  *		CustomOptionGet		Creates a new Tcl_Obj.
  *		CustomOptionRestore	Resets option value to original value.
- *		CustomOptionFree	Free storage for internal rep of
- *					option.
+ *		CustomOptionFree	Free storage for internal rep of option.
  *
  *----------------------------------------------------------------------
  */
 
 static int
 CustomOptionSet(
-    ClientData clientData,
+    TCL_UNUSED(void *),
     Tcl_Interp *interp,
-    Tk_Window tkwin,
+    TCL_UNUSED(Tk_Window),
     Tcl_Obj **value,
     char *recordPtr,
     int internalOffset,
@@ -2045,7 +2026,7 @@ CustomOptionSet(
     if (internalPtr != NULL) {
 	if (*value != NULL) {
 	    string = Tcl_GetString(*value);
-	    newStr = ckalloc((*value)->length + 1);
+	    newStr = (char *)ckalloc((*value)->length + 1);
 	    strcpy(newStr, string);
 	} else {
 	    newStr = NULL;
@@ -2059,8 +2040,8 @@ CustomOptionSet(
 
 static Tcl_Obj *
 CustomOptionGet(
-    ClientData clientData,
-    Tk_Window tkwin,
+    TCL_UNUSED(void *),
+    TCL_UNUSED(Tk_Window),
     char *recordPtr,
     int internalOffset)
 {
diff --git a/generic/tkText.c b/generic/tkText.c
index 5996688..c41fc67 100644
--- a/generic/tkText.c
+++ b/generic/tkText.c
@@ -701,7 +701,7 @@ TextWidgetObjCmd(
 {
     TkText *textPtr = (TkText *)clientData;
     int result = TCL_OK;
-    int index;
+    int idx;
 
     static const char *const optionStrings[] = {
 	"bbox", "cget", "compare", "configure", "count", "debug", "delete",
@@ -724,12 +724,12 @@ TextWidgetObjCmd(
     }
 
     if (Tcl_GetIndexFromObjStruct(interp, objv[1], optionStrings,
-	    sizeof(char *), "option", 0, &index) != TCL_OK) {
+	    sizeof(char *), "option", 0, &idx) != TCL_OK) {
 	return TCL_ERROR;
     }
     textPtr->refCount++;
 
-    switch ((enum options) index) {
+    switch ((enum options) idx) {
     case TEXT_BBOX: {
 	int x, y, width, height;
 	const TkTextIndex *indexPtr;
@@ -3124,7 +3124,7 @@ DeleteIndexRange(
     line2 = TkBTreeLinesTo(textPtr, index2.linePtr);
     if (line2 == TkBTreeNumLines(sharedTextPtr->tree, textPtr)) {
 	TkTextTag **arrayPtr;
-	int arraySize, i;
+	int arraySize;
 	TkTextIndex oldIndex2;
 
 	oldIndex2 = index2;
diff --git a/generic/tkTextBTree.c b/generic/tkTextBTree.c
index fba26b9..7832992 100644
--- a/generic/tkTextBTree.c
+++ b/generic/tkTextBTree.c
@@ -1070,7 +1070,7 @@ TkBTreeInsertChars(
 	    curPtr->nextPtr = segPtr;
 	}
 	segPtr->size = chunkSize;
-	memcpy(segPtr->body.chars, string, (size_t)chunkSize);
+	memcpy(segPtr->body.chars, string, chunkSize);
 	segPtr->body.chars[chunkSize] = 0;
 
 	if (eol[-1] != '\n') {
@@ -4169,7 +4169,7 @@ Rebalance(
 	    Node *otherPtr;
 	    Node *halfwayNodePtr = NULL;       /* Initialization needed only */
 	    TkTextLine *halfwayLinePtr = NULL; /* to prevent cc warnings. */
-	    int totalChildren, firstChildren, i;
+	    int totalChildren, firstChildren;
 
 	    /*
 	     * Too few children for this node. If this is the root then, it's
@@ -4230,8 +4230,6 @@ Rebalance(
 		otherPtr->children.linePtr = NULL;
 	    }
 	    if (nodePtr->level == 0) {
-		TkTextLine *linePtr;
-
 		for (linePtr = nodePtr->children.linePtr, i = 1;
 			linePtr->nextPtr != NULL;
 			linePtr = linePtr->nextPtr, i++) {
@@ -4246,8 +4244,6 @@ Rebalance(
 		    i++;
 		}
 	    } else {
-		Node *childPtr;
-
 		for (childPtr = nodePtr->children.nodePtr, i = 1;
 			childPtr->nextPtr != NULL;
 			childPtr = childPtr->nextPtr, i++) {
@@ -4559,7 +4555,7 @@ CharSplitProc(
     newPtr1->typePtr = &tkTextCharType;
     newPtr1->nextPtr = newPtr2;
     newPtr1->size = index;
-    memcpy(newPtr1->body.chars, segPtr->body.chars, (size_t)index);
+    memcpy(newPtr1->body.chars, segPtr->body.chars, index);
     newPtr1->body.chars[index] = 0;
     newPtr2->typePtr = &tkTextCharType;
     newPtr2->nextPtr = segPtr->nextPtr;
@@ -4660,7 +4656,7 @@ CharDeleteProc(
 static void
 CharCheckProc(
     TkTextSegment *segPtr,	/* Segment to check. */
-    TkTextLine *linePtr)	/* Line containing segment. */
+    TCL_UNUSED(TkTextLine *))	/* Line containing segment. */
 {
     /*
      * Make sure that the segment contains the number of characters indicated
diff --git a/generic/tkTextWind.c b/generic/tkTextWind.c
index c160083..c9f34e4 100644
--- a/generic/tkTextWind.c
+++ b/generic/tkTextWind.c
@@ -160,7 +160,6 @@ TkTextWindowCmd(
     switch ((enum windOptions) optionIndex) {
     case WIND_CGET: {
 	TkTextIndex index;
-	TkTextSegment *ewPtr;
 	Tcl_Obj *objPtr;
 	TkTextEmbWindowClient *client;
 
@@ -201,7 +200,6 @@ TkTextWindowCmd(
     }
     case WIND_CONFIGURE: {
 	TkTextIndex index;
-	TkTextSegment *ewPtr;
 
 	if (objc < 4) {
 	    Tcl_WrongNumArgs(interp, 3, objv, "index ?-option value ...?");
diff --git a/generic/ttk/ttkNotebook.c b/generic/ttk/ttkNotebook.c
index bd7c7ba..83075bc 100644
--- a/generic/ttk/ttkNotebook.c
+++ b/generic/ttk/ttkNotebook.c
@@ -2,10 +2,10 @@
  * Copyright (c) 2004, Joe English
  */
 
+#include "tkInt.h"
 #include <string.h>
 #include <ctype.h>
 #include <stdio.h>
-#include "tkInt.h"
 
 #include "ttkTheme.h"
 #include "ttkWidget.h"
@@ -294,7 +294,7 @@ static void ActivateTab(Notebook *nb, int index)
 static Ttk_State TabState(Notebook *nb, int index)
 {
     Ttk_State state = nb->core.state;
-    Tab *tab = (Tab *)Ttk_ContentData(nb->notebook.mgr, index);
+    Tab *itab = (Tab *)Ttk_ContentData(nb->notebook.mgr, index);
     int i = 0;
 
     if (index == nb->notebook.currentIndex) {
@@ -326,7 +326,7 @@ static Ttk_State TabState(Notebook *nb, int index)
 	}
 	break;
     }
-    if (tab->state == TAB_STATE_DISABLED) {
+    if (itab->state == TAB_STATE_DISABLED) {
 	state |= TTK_STATE_DISABLED;
     }
 
@@ -968,8 +968,8 @@ static int NotebookInsertCommand(
     /* Move existing content window:
      */
     if (ConfigureTab(interp, nb,
-	     (Tab *)Ttk_ContentData(nb->notebook.mgr,srcIndex),
-		 Ttk_ContentWindow(nb->notebook.mgr,srcIndex),
+	     (Tab *)Ttk_ContentData(nb->notebook.mgr, srcIndex),
+		 Ttk_ContentWindow(nb->notebook.mgr, srcIndex),
 	     objc-4,objv+4) != TCL_OK)
     {
 	return TCL_ERROR;
diff --git a/unix/tkUnixButton.c b/unix/tkUnixButton.c
index 6a99124..8d293f6 100644
--- a/unix/tkUnixButton.c
+++ b/unix/tkUnixButton.c
@@ -173,7 +173,7 @@ TkpDrawCheckIndicator(
      * Sanity check.
      */
 
-    if (tkwin == NULL || display == None || d == None || bgBorder == NULL
+    if (tkwin == NULL || display == NULL || d == None || bgBorder == NULL
 	    || indicatorColor == NULL) {
 	return;
     }
@@ -326,11 +326,9 @@ TkpDrawCheckIndicator(
 
 TkButton *
 TkpCreateButton(
-    Tk_Window tkwin)
+    TCL_UNUSED(Tk_Window))
 {
-    UnixButton *butPtr = ckalloc(sizeof(UnixButton));
-
-    return (TkButton *) butPtr;
+    return (TkButton *)ckalloc(sizeof(UnixButton));
 }
 
 /*
@@ -396,7 +394,7 @@ void
 TkpDisplayButton(
     ClientData clientData)	/* Information about widget. */
 {
-    register TkButton *butPtr = (TkButton *) clientData;
+    TkButton *butPtr = (TkButton *)clientData;
     GC gc;
     Tk_3DBorder border;
     Pixmap pixmap;
@@ -807,8 +805,6 @@ TkpDisplayButton(
 		butPtr->borderWidth, relief);
     }
     if (butPtr->highlightWidth > 0) {
-	GC gc;
-
 	if (butPtr->flags & GOT_FOCUS) {
 	    gc = Tk_GCForColor(butPtr->highlightColorPtr, pixmap);
 	} else {
@@ -860,7 +856,7 @@ TkpDisplayButton(
 
 void
 TkpComputeButtonGeometry(
-    register TkButton *butPtr)	/* Button whose geometry may have changed. */
+    TkButton *butPtr)	/* Button whose geometry may have changed. */
 {
     int width, height, avgWidth, txtWidth, txtHeight;
     int haveImage = 0, haveText = 0;
diff --git a/unix/tkUnixMenu.c b/unix/tkUnixMenu.c
index fc8b4f2..4ef5af2 100644
--- a/unix/tkUnixMenu.c
+++ b/unix/tkUnixMenu.c
@@ -145,7 +145,7 @@ TkpNewMenu(
 
 void
 TkpDestroyMenu(
-    TkMenu *menuPtr)
+    TCL_UNUSED(TkMenu *))
 {
     /*
      * Nothing to do.
@@ -171,7 +171,7 @@ TkpDestroyMenu(
 
 void
 TkpDestroyMenuEntry(
-    TkMenuEntry *mEntryPtr)
+    TCL_UNUSED(TkMenuEntry *))
 {
     /*
      * Nothing to do.
@@ -199,7 +199,7 @@ TkpDestroyMenuEntry(
 
 int
 TkpConfigureMenuEntry(
-    register TkMenuEntry *mePtr)/* Information about menu entry; may or may
+    TkMenuEntry *mePtr)/* Information about menu entry; may or may
 				 * not already have values for some fields. */
 {
     /*
@@ -239,7 +239,7 @@ TkpConfigureMenuEntry(
 
 int
 TkpMenuNewEntry(
-    TkMenuEntry *mePtr)
+    TCL_UNUSED(TkMenuEntry *))
 {
     return TCL_OK;
 }
@@ -292,9 +292,9 @@ TkpSetWindowMenuBar(
 
 void
 TkpSetMainMenubar(
-    Tcl_Interp *interp,
-    Tk_Window tkwin,
-    const char *menuName)
+    TCL_UNUSED(Tcl_Interp *),
+    TCL_UNUSED(Tk_Window),
+    TCL_UNUSED(const char *))
 {
     /*
      * Nothing to do.
@@ -323,8 +323,8 @@ static void
 GetMenuIndicatorGeometry(
     TkMenu *menuPtr,		/* The menu we are drawing. */
     TkMenuEntry *mePtr,		/* The entry we are interested in. */
-    Tk_Font tkfont,		/* The precalculated font */
-    const Tk_FontMetrics *fmPtr,/* The precalculated metrics */
+    TCL_UNUSED(Tk_Font),		/* The precalculated font */
+    TCL_UNUSED(const Tk_FontMetrics *),/* The precalculated metrics */
     int *widthPtr,		/* The resulting width */
     int *heightPtr)		/* The resulting height */
 {
@@ -445,7 +445,6 @@ DrawMenuEntryBackground(
 	} else {
 	    relief = TK_RELIEF_RAISED;
 	}
-
 	Tk_GetPixelsFromObj(NULL, menuPtr->tkwin,
 		menuPtr->activeBorderWidthPtr, &activeBorderWidth);
 	Tk_Fill3DRectangle(menuPtr->tkwin, d, bgBorder, x, y, width, height,
@@ -524,7 +523,7 @@ DrawMenuEntryAccelerator(
 	if (menuPtr->menuType == MENUBAR) {
 	    left += 5;
 	}
-    	Tk_DrawChars(menuPtr->display, d, gc, tkfont, accel,
+	Tk_DrawChars(menuPtr->display, d, gc, tkfont, accel,
 		mePtr->accelLength, left,
 		(y + (height + fmPtr->ascent - fmPtr->descent) / 2));
     }
@@ -554,11 +553,11 @@ DrawMenuEntryIndicator(
     Tk_3DBorder border,		/* The background color */
     XColor *indicatorColor,	/* The color to draw indicators with */
     XColor *disableColor,	/* The color use use when disabled */
-    Tk_Font tkfont,		/* The font to draw with */
-    const Tk_FontMetrics *fmPtr,/* The font metrics of the font */
+    TCL_UNUSED(Tk_Font),		/* The font to draw with */
+    TCL_UNUSED(const Tk_FontMetrics *),/* The font metrics of the font */
     int x,			/* The left of the entry rect */
     int y,			/* The top of the entry rect */
-    int width,			/* Width of menu entry */
+    TCL_UNUSED(int),			/* Width of menu entry */
     int height)			/* Height of menu entry */
 {
     /*
@@ -623,11 +622,11 @@ DrawMenuEntryIndicator(
 static void
 DrawMenuSeparator(
     TkMenu *menuPtr,		/* The menu we are drawing */
-    TkMenuEntry *mePtr,		/* The entry we are drawing */
+    TCL_UNUSED(TkMenuEntry *),		/* The entry we are drawing */
     Drawable d,			/* The drawable we are using */
-    GC gc,			/* The gc to draw into */
-    Tk_Font tkfont,		/* The font to draw with */
-    const Tk_FontMetrics *fmPtr,/* The font metrics from the font */
+    TCL_UNUSED(GC),			/* The gc to draw into */
+    TCL_UNUSED(Tk_Font),		/* The font to draw with */
+    TCL_UNUSED(const Tk_FontMetrics *),/* The font metrics from the font */
     int x, int y,
     int width, int height)
 {
@@ -790,7 +789,7 @@ DrawMenuEntryLabel(
 		    imageHeight, d, leftEdge + imageXOffset,
 		    (int) (y + (mePtr->height-imageHeight)/2 + imageYOffset));
     	}
-    } else if (mePtr->bitmapPtr != None) {
+    } else if (mePtr->bitmapPtr != NULL) {
 	Pixmap bitmap = Tk_GetBitmapFromObj(menuPtr->tkwin, mePtr->bitmapPtr);
 
 	XCopyPlane(menuPtr->display, bitmap, d,	gc, 0, 0,
@@ -818,7 +817,7 @@ DrawMenuEntryLabel(
 	    XFillRectangle(menuPtr->display, d, menuPtr->disabledGC, x, y,
 		    (unsigned) width, (unsigned) height);
 	} else if ((mePtr->image != NULL)
-		&& (menuPtr->disabledImageGC != None)) {
+		&& (menuPtr->disabledImageGC != NULL)) {
 	    XFillRectangle(menuPtr->display, d, menuPtr->disabledImageGC,
 		    leftEdge + imageXOffset,
 		    (int) (y + (mePtr->height - imageHeight)/2 + imageYOffset),
@@ -852,7 +851,7 @@ DrawMenuUnderline(
     Tk_Font tkfont,		/* The precalculated font */
     const Tk_FontMetrics *fmPtr,/* The precalculated font metrics */
     int x, int y,
-    int width, int height)
+    TCL_UNUSED(int), int height)
 {
     if ((mePtr->underline >= 0) && (mePtr->labelPtr != NULL)) {
 	int len;
@@ -931,7 +930,7 @@ TkpPostMenu(
 
 int
 TkpPostTearoffMenu(
-    Tcl_Interp *interp,		/* The interpreter of the menu */
+    TCL_UNUSED(Tcl_Interp *),		/* The interpreter of the menu */
     TkMenu *menuPtr,		/* The menu we are posting */
     int x, int y, int index)	/* The root X,Y coordinates where the
 				 * specified entry will be posted */
@@ -1021,9 +1020,9 @@ TkpPostTearoffMenu(
 
 static void
 GetMenuSeparatorGeometry(
-    TkMenu *menuPtr,		/* The menu we are measuring */
-    TkMenuEntry *mePtr,		/* The entry we are measuring */
-    Tk_Font tkfont,		/* The precalculated font */
+    TCL_UNUSED(TkMenu *),		/* The menu we are measuring */
+    TCL_UNUSED(TkMenuEntry *),		/* The entry we are measuring */
+    TCL_UNUSED(Tk_Font),		/* The precalculated font */
     const Tk_FontMetrics *fmPtr,/* The precalcualted font metrics */
     int *widthPtr,		/* The resulting width */
     int *heightPtr)		/* The resulting height */
@@ -1051,7 +1050,7 @@ GetMenuSeparatorGeometry(
 static void
 GetTearoffEntryGeometry(
     TkMenu *menuPtr,		/* The menu we are drawing */
-    TkMenuEntry *mePtr,		/* The entry we are measuring */
+    TCL_UNUSED(TkMenuEntry *),		/* The entry we are measuring */
     Tk_Font tkfont,		/* The precalculated font */
     const Tk_FontMetrics *fmPtr,/* The precalculated font metrics */
     int *widthPtr,		/* The resulting width */
@@ -1092,15 +1091,13 @@ TkpComputeMenubarGeometry(
     Tk_FontMetrics menuMetrics, entryMetrics, *fmPtr;
     int width, height, i, j, x, y, currentRowHeight, maxWidth;
     int maxWindowWidth, lastRowBreak, lastEntry;
-    int borderWidth, activeBorderWidth, helpMenuIndex = -1;
+    int activeBorderWidth, helpMenuIndex = -1;
     TkMenuEntry *mePtr;
 
     if (menuPtr->tkwin == NULL) {
 	return;
     }
 
-    Tk_GetPixelsFromObj(NULL, menuPtr->tkwin, menuPtr->borderWidthPtr,
-	    &borderWidth);
     Tk_GetPixelsFromObj(NULL, menuPtr->tkwin, menuPtr->activeBorderWidthPtr,
 	    &activeBorderWidth);
     maxWidth = 0;
@@ -1122,7 +1119,7 @@ TkpComputeMenubarGeometry(
 	/*
 	 * On the Mac especially, getting font metrics can be quite slow, so
 	 * we want to do it intelligently. We are going to precalculate them
-	 * and pass them down to all of the measureing and drawing routines.
+	 * and pass them down to all of the measuring and drawing routines.
 	 * We will measure the font metrics of the menu once, and if an entry
 	 * has a font set, we will measure it as we come to it, and then we
 	 * decide which set to give the geometry routines.
@@ -1269,11 +1266,11 @@ TkpComputeMenubarGeometry(
 static void
 DrawTearoffEntry(
     TkMenu *menuPtr,		/* The menu we are drawing */
-    TkMenuEntry *mePtr,		/* The entry we are drawing */
+    TCL_UNUSED(TkMenuEntry *),		/* The entry we are drawing */
     Drawable d,			/* The drawable we are drawing into */
-    GC gc,			/* The gc we are drawing with */
-    Tk_Font tkfont,		/* The font we are drawing with */
-    const Tk_FontMetrics *fmPtr,/* The metrics we are drawing with */
+    TCL_UNUSED(GC),			/* The gc we are drawing with */
+    TCL_UNUSED(Tk_Font),		/* The font we are drawing with */
+    TCL_UNUSED(const Tk_FontMetrics *),/* The metrics we are drawing with */
     int x, int y,
     int width, int height)
 {
@@ -1324,8 +1321,8 @@ DrawTearoffEntry(
 
 void
 TkpInitializeMenuBindings(
-    Tcl_Interp *interp,		/* The interpreter to set. */
-    Tk_BindingTable bindingTable)
+    TCL_UNUSED(Tcl_Interp *),		/* The interpreter to set. */
+    TCL_UNUSED(Tk_BindingTable))
 				/* The table to add to. */
 {
     /*
@@ -1376,7 +1373,7 @@ SetHelpMenu(
 		&& (cascadeEntryPtr->menuPtr->masterMenuPtr->tkwin != NULL)
 		&& (menuPtr->masterMenuPtr->tkwin != NULL)) {
 	    TkMenu *masterMenuPtr = cascadeEntryPtr->menuPtr->masterMenuPtr;
-	    char *helpMenuName = ckalloc(strlen(Tk_PathName(
+	    char *helpMenuName = (char *)ckalloc(strlen(Tk_PathName(
 		    masterMenuPtr->tkwin)) + strlen(".help") + 1);
 
 	    strcpy(helpMenuName, Tk_PathName(masterMenuPtr->tkwin));
@@ -1852,8 +1849,8 @@ TkpComputeStandardMenuGeometry(
 
 void
 TkpMenuNotifyToplevelCreate(
-    Tcl_Interp *interp,		/* The interp the menu lives in. */
-    const char *menuName)	/* The name of the menu to reconfigure. */
+    TCL_UNUSED(Tcl_Interp *),		/* The interp the menu lives in. */
+    TCL_UNUSED(const char *))	/* The name of the menu to reconfigure. */
 {
     /*
      * Nothing to do.
diff --git a/unix/tkUnixMenubu.c b/unix/tkUnixMenubu.c
index 2c6b99b..6677e83 100644
--- a/unix/tkUnixMenubu.c
+++ b/unix/tkUnixMenubu.c
@@ -25,16 +25,16 @@
  *	Returns a newly allocated TkMenuButton structure.
  *
  * Side effects:
- *	Registers an event handler for the widget.
+ *	None
  *
  *----------------------------------------------------------------------
  */
 
 TkMenuButton *
 TkpCreateMenuButton(
-    Tk_Window tkwin)
+    TCL_UNUSED(Tk_Window))
 {
-    return ckalloc(sizeof(TkMenuButton));
+    return (TkMenuButton *)ckalloc(sizeof(TkMenuButton));
 }
 
 /*
@@ -280,8 +280,6 @@ TkpDisplayMenuButton(
 		mbPtr->borderWidth, mbPtr->relief);
     }
     if (mbPtr->highlightWidth != 0) {
-	GC gc;
-
 	if (mbPtr->flags & GOT_FOCUS) {
 	    gc = Tk_GCForColor(mbPtr->highlightColorPtr, pixmap);
 	} else {
diff --git a/unix/tkUnixSelect.c b/unix/tkUnixSelect.c
index 4819183..527bc4c 100644
--- a/unix/tkUnixSelect.c
+++ b/unix/tkUnixSelect.c
@@ -240,17 +240,17 @@ TkSelGetSelection(
 
 void
 TkSelPropProc(
-    register XEvent *eventPtr)	/* X PropertyChange event. */
+    XEvent *eventPtr)	/* X PropertyChange event. */
 {
-    register IncrInfo *incrPtr;
-    register TkSelHandler *selPtr;
+    IncrInfo *incrPtr;
+    TkSelHandler *selPtr;
     int length, numItems;
     unsigned long i;
     Atom target, formatType;
     long buffer[TK_SEL_WORDS_AT_ONCE];
     TkDisplay *dispPtr = TkGetDisplay(eventPtr->xany.display);
     Tk_ErrorHandler errorHandler;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     /*
@@ -356,7 +356,7 @@ TkSelPropProc(
 	    ((char *) buffer)[numItems] = 0;
 
 	    errorHandler = Tk_CreateErrorHandler(eventPtr->xproperty.display,
-		    -1, -1, -1, (int (*)()) NULL, NULL);
+		    -1, -1, -1, NULL, NULL);
 
 	    /*
 	     * Encode the data using the proper format for each type.
@@ -449,7 +449,7 @@ TkSelPropProc(
 		if (srcLen > 3) {
 		    Tcl_Panic("selection conversion left too many bytes unconverted");
 		}
-		memcpy(incrPtr->converts[i].buffer, src, (size_t) srcLen+1);
+		memcpy(incrPtr->converts[i].buffer, src, srcLen + 1);
 		Tcl_DStringFree(&ds);
 	    } else {
 		/*
@@ -519,10 +519,10 @@ TkSelPropProc(
 void
 TkSelEventProc(
     Tk_Window tkwin,		/* Window for which event was targeted. */
-    register XEvent *eventPtr)	/* X event: either SelectionClear,
+    XEvent *eventPtr)	/* X event: either SelectionClear,
 				 * SelectionRequest, or SelectionNotify. */
 {
-    register TkWindow *winPtr = (TkWindow *) tkwin;
+    TkWindow *winPtr = (TkWindow *) tkwin;
     TkDisplay *dispPtr = winPtr->dispPtr;
     Tcl_Interp *interp;
 
@@ -540,12 +540,11 @@ TkSelEventProc(
      */
 
     if (eventPtr->type == SelectionNotify) {
-	register TkSelRetrievalInfo *retrPtr;
+	TkSelRetrievalInfo *retrPtr;
 	char *propInfo, **propInfoPtr = &propInfo;
 	Atom type;
 	int format, result;
 	unsigned long numItems, bytesAfter;
-	Tcl_DString ds;
 
 	for (retrPtr = pendingRetrievals; ; retrPtr = retrPtr->nextPtr) {
 	    if (retrPtr == NULL) {
@@ -591,6 +590,7 @@ TkSelEventProc(
 	if ((type == XA_STRING) || (type == dispPtr->textAtom)
 		|| (type == dispPtr->compoundTextAtom)) {
 	    Tcl_Encoding encoding;
+		Tcl_DString ds;
 
 	    if (format != 8) {
 		Tcl_SetObjResult(retrPtr->interp, Tcl_ObjPrintf(
@@ -649,7 +649,7 @@ TkSelEventProc(
 	    }
 
 	    if (propInfo[numItems] != '\0') {
-		propData = ckalloc(numItems + 1);
+		propData = (char *)ckalloc(numItems + 1);
 		strcpy(propData, propInfo);
 		propData[numItems] = '\0';
 	    }
@@ -742,7 +742,7 @@ static void
 SelTimeoutProc(
     ClientData clientData)	/* Information about retrieval in progress. */
 {
-    register TkSelRetrievalInfo *retrPtr = clientData;
+    TkSelRetrievalInfo *retrPtr = (TkSelRetrievalInfo *)clientData;
 
     /*
      * Make sure that the retrieval is still in progress. Then see how long
@@ -766,7 +766,7 @@ SelTimeoutProc(
 	retrPtr->result = TCL_ERROR;
     } else {
 	retrPtr->timeout = Tcl_CreateTimerHandler(1000, SelTimeoutProc,
-		(ClientData) retrPtr);
+		retrPtr);
     }
 }
 
@@ -796,7 +796,7 @@ ConvertSelection(
 				 * request; may not be selection's current
 				 * owner, be we set it to the current
 				 * owner. */
-    register XSelectionRequestEvent *eventPtr)
+    XSelectionRequestEvent *eventPtr)
 				/* Event describing request. */
 {
 	union {
@@ -813,11 +813,11 @@ ConvertSelection(
     Tk_ErrorHandler errorHandler;
     TkSelectionInfo *infoPtr;
     TkSelInProgress ip;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
-    errorHandler = Tk_CreateErrorHandler(eventPtr->display, -1, -1,-1,
-	    (int (*)()) NULL, NULL);
+    errorHandler = Tk_CreateErrorHandler(eventPtr->display, -1, -1,
+	    -1, NULL, NULL);
 
     /*
      * Initialize the reply event.
@@ -893,12 +893,12 @@ ConvertSelection(
      * below).
      */
 
-    incr.converts = ckalloc(incr.numConversions * sizeof(ConvertInfo));
+    incr.converts = (ConvertInfo *)ckalloc(incr.numConversions * sizeof(ConvertInfo));
     incr.numIncrs = 0;
     for (i = 0; i < incr.numConversions; i++) {
 	Atom target, property, type;
 	long buffer[TK_SEL_WORDS_AT_ONCE];
-	register TkSelHandler *selPtr;
+	TkSelHandler *selPtr;
 	int numItems, format;
 	char *propPtr;
 
@@ -919,7 +919,7 @@ ConvertSelection(
 	    /*
 	     * Nobody seems to know about this kind of request. If it's of a
 	     * sort that we can handle without any help, do it. Otherwise mark
-	     * the request as an errror.
+	     * the request as an error.
 	     */
 
 	    numItems = TkSelDefaultSelection(infoPtr, target, (char *) buffer,
@@ -1064,7 +1064,7 @@ ConvertSelection(
 	}
 	Tcl_DeleteTimerHandler(incr.timeout);
 	errorHandler = Tk_CreateErrorHandler(winPtr->display,
-		-1, -1, -1, (int (*)()) NULL, NULL);
+		-1, -1, -1, NULL, NULL);
 	XSelectInput(reply.xsel.display, reply.xsel.requestor, 0L);
 	Tk_DeleteErrorHandler(errorHandler);
 	if (tsdPtr->pendingIncrs == &incr) {
@@ -1124,9 +1124,9 @@ ConvertSelection(
 static void
 SelRcvIncrProc(
     ClientData clientData,	/* Information about retrieval. */
-    register XEvent *eventPtr)	/* X PropertyChange event. */
+    XEvent *eventPtr)	/* X PropertyChange event. */
 {
-    register TkSelRetrievalInfo *retrPtr = clientData;
+    TkSelRetrievalInfo *retrPtr = (TkSelRetrievalInfo *)clientData;
     char *propInfo, **propInfoPtr = &propInfo;
     Atom type;
     int format, result;
@@ -1374,7 +1374,7 @@ IncrTimeoutProc(
 				 * retrieval for which we are selection
 				 * owner. */
 {
-    register IncrInfo *incrPtr = clientData;
+    IncrInfo *incrPtr = (IncrInfo *)clientData;
 
     incrPtr->idleTime++;
     if (incrPtr->idleTime >= 5) {
@@ -1435,7 +1435,7 @@ SelCvtToX(
     if (Tcl_SplitList(NULL, string, &numFields, &field) != TCL_OK) {
 	return NULL;
     }
-    propPtr = ckalloc(numFields * sizeof(long));
+    propPtr = (long *)ckalloc(numFields * sizeof(long));
 
     /*
      * Convert the fields one-by-one.
@@ -1487,7 +1487,7 @@ SelCvtToX(
 
 static void
 SelCvtFromX32(
-    register long *propPtr,	/* Property value from X. */
+    long *propPtr,	/* Property value from X. */
     int numValues,		/* Number of 32-bit values in property. */
     Atom type,			/* Type of property Should not be XA_STRING
 				 * (if so, don't bother calling this function
@@ -1520,12 +1520,12 @@ SelCvtFromX32(
 
 static void
 SelCvtFromX8(
-    register char *propPtr,	/* Property value from X. */
+    char *propPtr,	/* Property value from X. */
     int numValues,		/* Number of 8-bit values in property. */
-    Atom type,			/* Type of property Should not be XA_STRING
+    TCL_UNUSED(Atom),			/* Type of property Should not be XA_STRING
 				 * (if so, don't bother calling this function
 				 * at all). */
-    Tk_Window tkwin,		/* Window to use for atom conversion. */
+    TCL_UNUSED(Tk_Window),		/* Window to use for atom conversion. */
     Tcl_DString *dsPtr)		/* Where to store the converted string. */
 {
     /*
-- 
cgit v0.12


From 5e7c6982ce66c388008bd5a81fac55fbf5b900da Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 5 Oct 2020 11:09:07 +0000
Subject: Fix build problem on UNIX (due to the introduction of TCL_UNUSED
 macro)

---
 generic/tkTest.c    |  1 -
 unix/tkUnixMenu.c   | 36 ------------------------------------
 unix/tkUnixSelect.c |  3 ---
 3 files changed, 40 deletions(-)

diff --git a/generic/tkTest.c b/generic/tkTest.c
index 125a9c2..2622c9c 100644
--- a/generic/tkTest.c
+++ b/generic/tkTest.c
@@ -1387,7 +1387,6 @@ ImageCreate(
     TImageModel *timPtr;
     const char *varName;
     int i;
-    (void)typePtr;
 
     varName = "log";
     for (i = 0; i < objc; i += 2) {
diff --git a/unix/tkUnixMenu.c b/unix/tkUnixMenu.c
index e4899f2..a36effa 100644
--- a/unix/tkUnixMenu.c
+++ b/unix/tkUnixMenu.c
@@ -146,8 +146,6 @@ void
 TkpDestroyMenu(
     TCL_UNUSED(TkMenu *))
 {
-    (void)menuPtr;
-
     /*
      * Nothing to do.
      */
@@ -174,8 +172,6 @@ void
 TkpDestroyMenuEntry(
     TCL_UNUSED(TkMenuEntry *))
 {
-    (void)mEntryPtr;
-
     /*
      * Nothing to do.
      */
@@ -244,8 +240,6 @@ int
 TkpMenuNewEntry(
     TCL_UNUSED(TkMenuEntry *))
 {
-    (void)mePtr;
-
     return TCL_OK;
 }
 
@@ -301,10 +295,6 @@ TkpSetMainMenubar(
     TCL_UNUSED(Tk_Window),
     TCL_UNUSED(const char *))
 {
-    (void)interp;
-    (void)tkwin;
-    (void)menuName;
-
     /*
      * Nothing to do.
      */
@@ -338,8 +328,6 @@ GetMenuIndicatorGeometry(
     int *heightPtr)		/* The resulting height */
 {
     int borderWidth;
-    (void)tkfont;
-    (void)fmPtr;
 
     if ((mePtr->type == CHECK_BUTTON_ENTRY)
 	    || (mePtr->type == RADIO_BUTTON_ENTRY)) {
@@ -571,10 +559,6 @@ DrawMenuEntryIndicator(
     TCL_UNUSED(int),			/* Width of menu entry */
     int height)			/* Height of menu entry */
 {
-    (void)tkfont;
-    (void)fmPtr;
-    (void)width;
-
     /*
      * Draw check-button indicator.
      */
@@ -647,11 +631,6 @@ DrawMenuSeparator(
 {
     XPoint points[2];
     Tk_3DBorder border;
-    (void)mePtr;
-    (void)gc;
-    (void)tkfont;
-    (void)fmPtr;
-
     if (menuPtr->menuType == MENUBAR) {
 	return;
     }
@@ -872,8 +851,6 @@ DrawMenuUnderline(
     int x, int y,
     TCL_UNUSED(int), int height)
 {
-    (void)width;
-
     if ((mePtr->underline >= 0) && (mePtr->labelPtr != NULL)) {
 	int len;
 
@@ -1048,10 +1025,6 @@ GetMenuSeparatorGeometry(
     int *widthPtr,		/* The resulting width */
     int *heightPtr)		/* The resulting height */
 {
-    (void)menuPtr;
-    (void)mePtr;
-    (void)tkfont;
-
     *widthPtr = 0;
     *heightPtr = fmPtr->linespace;
 }
@@ -1081,8 +1054,6 @@ GetTearoffEntryGeometry(
     int *widthPtr,		/* The resulting width */
     int *heightPtr)		/* The resulting height */
 {
-    (void)mePtr;
-
     if (menuPtr->menuType != MAIN_MENU) {
 	*heightPtr = 0;
 	*widthPtr = 0;
@@ -1304,10 +1275,6 @@ DrawTearoffEntry(
     XPoint points[2];
     int segmentWidth, maxX;
     Tk_3DBorder border;
-    (void)mePtr;
-    (void)gc;
-    (void)tkfont;
-    (void)fmPtr;
 
     if (menuPtr->menuType != MAIN_MENU) {
 	return;
@@ -1356,9 +1323,6 @@ TkpInitializeMenuBindings(
     TCL_UNUSED(Tk_BindingTable))
 				/* The table to add to. */
 {
-    (void)interp;
-    (void)bindingTable;
-
     /*
      * Nothing to do.
      */
diff --git a/unix/tkUnixSelect.c b/unix/tkUnixSelect.c
index 858c246..527bc4c 100644
--- a/unix/tkUnixSelect.c
+++ b/unix/tkUnixSelect.c
@@ -1528,9 +1528,6 @@ SelCvtFromX8(
     TCL_UNUSED(Tk_Window),		/* Window to use for atom conversion. */
     Tcl_DString *dsPtr)		/* Where to store the converted string. */
 {
-    (void)type;
-    (void)tkwin;
-
     /*
      * Convert each long in the property to a string value, which is a
      * hexadecimal string. We build the list in a Tcl_DString because this is
-- 
cgit v0.12


From caa253fcf5871c9886ed214cfc4d68c5ab45d8f2 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 6 Oct 2020 06:01:14 +0000
Subject: More elimination of the "register" keyword, and more explicit
 typecasts

---
 generic/tk3d.c       |  29 ++++---
 generic/tkCanvLine.c |   6 +-
 tests/text.test      |   8 +-
 unix/tkUnixCursor.c  |   2 +-
 unix/tkUnixFont.c    |   2 +-
 unix/tkUnixMenubu.c  |   4 +-
 unix/tkUnixScale.c   |  16 ++--
 unix/tkUnixScrlbr.c  |  20 ++---
 unix/tkUnixSend.c    |  57 +++++++------
 unix/tkUnixWm.c      | 223 +++++++++++++++++++++++++--------------------------
 10 files changed, 180 insertions(+), 187 deletions(-)

diff --git a/generic/tk3d.c b/generic/tk3d.c
index 987bace..f1cc8f1 100644
--- a/generic/tk3d.c
+++ b/generic/tk3d.c
@@ -90,7 +90,7 @@ Tk_Alloc3DBorderFromObj(
     if (objPtr->typePtr != &tkBorderObjType) {
 	InitBorderObj(objPtr);
     }
-    borderPtr = objPtr->internalRep.twoPtrValue.ptr1;
+    borderPtr = (TkBorder *)objPtr->internalRep.twoPtrValue.ptr1;
 
     /*
      * If the object currently points to a TkBorder, see if it's the one we
@@ -127,7 +127,7 @@ Tk_Alloc3DBorderFromObj(
      */
 
     if (borderPtr != NULL) {
-	TkBorder *firstBorderPtr = Tcl_GetHashValue(borderPtr->hashPtr);
+	TkBorder *firstBorderPtr = (TkBorder *)Tcl_GetHashValue(borderPtr->hashPtr);
 
 	FreeBorderObj(objPtr);
 	for (borderPtr = firstBorderPtr ; borderPtr != NULL;
@@ -200,7 +200,7 @@ Tk_Get3DBorder(
 
     hashPtr = Tcl_CreateHashEntry(&dispPtr->borderTable, colorName, &isNew);
     if (!isNew) {
-	existingBorderPtr = Tcl_GetHashValue(hashPtr);
+	existingBorderPtr = (TkBorder *)Tcl_GetHashValue(hashPtr);
 	for (borderPtr = existingBorderPtr; borderPtr != NULL;
 		borderPtr = borderPtr->nextPtr) {
 	    if ((Tk_Screen(tkwin) == borderPtr->screen)
@@ -420,12 +420,11 @@ Tk_Free3DBorder(
     Display *display = DisplayOfScreen(borderPtr->screen);
     TkBorder *prevPtr;
 
-    borderPtr->resourceRefCount--;
-    if (borderPtr->resourceRefCount > 0) {
+    if (borderPtr->resourceRefCount-- > 1) {
 	return;
     }
 
-    prevPtr = Tcl_GetHashValue(borderPtr->hashPtr);
+    prevPtr = (TkBorder *)Tcl_GetHashValue(borderPtr->hashPtr);
     TkpFreeBorder(borderPtr);
     if (borderPtr->bgColorPtr != NULL) {
 	Tk_FreeColor(borderPtr->bgColorPtr);
@@ -527,7 +526,7 @@ static void
 FreeBorderObj(
     Tcl_Obj *objPtr)		/* The object we are releasing. */
 {
-    TkBorder *borderPtr = objPtr->internalRep.twoPtrValue.ptr1;
+    TkBorder *borderPtr = (TkBorder *)objPtr->internalRep.twoPtrValue.ptr1;
 
     if (borderPtr != NULL) {
 	borderPtr->objRefCount--;
@@ -562,7 +561,7 @@ DupBorderObjProc(
     Tcl_Obj *srcObjPtr,		/* The object we are copying from. */
     Tcl_Obj *dupObjPtr)		/* The object we are copying to. */
 {
-    TkBorder *borderPtr = srcObjPtr->internalRep.twoPtrValue.ptr1;
+    TkBorder *borderPtr = (TkBorder *)srcObjPtr->internalRep.twoPtrValue.ptr1;
 
     dupObjPtr->typePtr = srcObjPtr->typePtr;
     dupObjPtr->internalRep.twoPtrValue.ptr1 = borderPtr;
@@ -594,7 +593,7 @@ Tk_SetBackgroundFromBorder(
     Tk_Window tkwin,		/* Window whose background is to be set. */
     Tk_3DBorder border)		/* Token for border. */
 {
-    register TkBorder *borderPtr = (TkBorder *) border;
+    TkBorder *borderPtr = (TkBorder *) border;
 
     Tk_SetWindowBackground(tkwin, borderPtr->bgColorPtr->pixel);
 }
@@ -759,7 +758,7 @@ Tk_Draw3DPolygon(
 {
     XPoint poly[4], b1, b2, newB1, newB2;
     XPoint perp, c, shift1, shift2;	/* Used for handling parallel lines. */
-    register XPoint *p1Ptr, *p2Ptr;
+    XPoint *p1Ptr, *p2Ptr;
     TkBorder *borderPtr = (TkBorder *) border;
     GC gc;
     int i, lightOnLeft, dx, dy, parallel, pointsSeen;
@@ -956,7 +955,7 @@ Tk_Fill3DRectangle(
     int relief)			/* Indicates 3D effect: TK_RELIEF_FLAT,
 				 * TK_RELIEF_RAISED, or TK_RELIEF_SUNKEN. */
 {
-    register TkBorder *borderPtr = (TkBorder *) border;
+    TkBorder *borderPtr = (TkBorder *) border;
     int doubleBorder;
 
     /*
@@ -1027,7 +1026,7 @@ Tk_Fill3DPolygon(
 				 * TK_RELIEF_FLAT, TK_RELIEF_RAISED, or
 				 * TK_RELIEF_SUNKEN. */
 {
-    register TkBorder *borderPtr = (TkBorder *) border;
+    TkBorder *borderPtr = (TkBorder *) border;
 
     XFillPolygon(Tk_Display(tkwin), drawable, borderPtr->bgGC,
 	    pointPtr, numPoints, Complex, CoordModeOrigin);
@@ -1253,7 +1252,7 @@ Tk_Get3DBorderFromObj(
      * cached in the internal representation of the Tcl_Obj. Check it out...
      */
 
-    borderPtr = objPtr->internalRep.twoPtrValue.ptr1;
+    borderPtr = (TkBorder *)objPtr->internalRep.twoPtrValue.ptr1;
     if ((borderPtr != NULL)
 	    && (borderPtr->resourceRefCount > 0)
 	    && (Tk_Screen(tkwin) == borderPtr->screen)
@@ -1281,7 +1280,7 @@ Tk_Get3DBorderFromObj(
     if (hashPtr == NULL) {
 	goto error;
     }
-    for (borderPtr = Tcl_GetHashValue(hashPtr); borderPtr != NULL;
+    for (borderPtr = (TkBorder *)Tcl_GetHashValue(hashPtr); borderPtr != NULL;
 	    borderPtr = borderPtr->nextPtr) {
 	if ((Tk_Screen(tkwin) == borderPtr->screen)
 		&& (Tk_Colormap(tkwin) == borderPtr->colormap)) {
@@ -1371,7 +1370,7 @@ TkDebugBorder(
     resultPtr = Tcl_NewObj();
     hashPtr = Tcl_FindHashEntry(&dispPtr->borderTable, name);
     if (hashPtr != NULL) {
-	TkBorder *borderPtr = Tcl_GetHashValue(hashPtr);
+	TkBorder *borderPtr = (TkBorder *)Tcl_GetHashValue(hashPtr);
 
 	if (borderPtr == NULL) {
 	    Tcl_Panic("TkDebugBorder found empty hash table entry");
diff --git a/generic/tkCanvLine.c b/generic/tkCanvLine.c
index ba7753e..ba4cda1 100644
--- a/generic/tkCanvLine.c
+++ b/generic/tkCanvLine.c
@@ -831,9 +831,9 @@ DisplayLine(
     Display *display,		/* Display on which to draw item. */
     Drawable drawable,		/* Pixmap or window in which to draw item. */
     TCL_UNUSED(int),		/* Describes region of canvas that must be */
-    TCL_UNUSED(int),      /* redisplayed (not used). */
+    TCL_UNUSED(int),		/* redisplayed (not used). */
     TCL_UNUSED(int),
-    TCL_UNUSED(int))	 
+    TCL_UNUSED(int))
 {
     LineItem *linePtr = (LineItem *) itemPtr;
     XPoint staticPoints[MAX_STATIC_POINTS*3];
@@ -1949,7 +1949,7 @@ PrintArrowShape(
 				 * string here. */
 {
     LineItem *linePtr = (LineItem *) recordPtr;
-    char *buffer = ckalloc(120);
+    char *buffer = (char *)ckalloc(120);
 
     sprintf(buffer, "%.5g %.5g %.5g", linePtr->arrowShapeA,
 	    linePtr->arrowShapeB, linePtr->arrowShapeC);
diff --git a/tests/text.test b/tests/text.test
index 2dbc78b..6bd0ae4 100644
--- a/tests/text.test
+++ b/tests/text.test
@@ -5066,11 +5066,11 @@ test text-22.132 {TextSearchCmd, multiline regexp matching} -body {
 
 void
 Tcl_SetObjLength(objPtr, length)
-    register Tcl_Obj *objPtr;	/* Pointer to object.  This object must
-                                * not currently be shared. */
-    register int length;	/* Number of bytes desired for string
+    Tcl_Obj *objPtr;		/* Pointer to object.  This object must
+				 * not currently be shared. */
+    int length;			/* Number of bytes desired for string
 				 * representation of object, not including
-                            * terminating null byte. */
+				 * terminating null byte. */
 \{
     char *new;
 }
diff --git a/unix/tkUnixCursor.c b/unix/tkUnixCursor.c
index 8afb92d..4c58adf 100644
--- a/unix/tkUnixCursor.c
+++ b/unix/tkUnixCursor.c
@@ -245,7 +245,7 @@ TkGetCursorByName(
     if ((argv[0][0] != '@') && !inTkTable) {
 	XColor fg, bg;
 	unsigned int maskIndex;
-	register const struct CursorName *namePtr;
+	const struct CursorName *namePtr;
 	TkDisplay *dispPtr;
 
 	/*
diff --git a/unix/tkUnixFont.c b/unix/tkUnixFont.c
index d524bfd..234b282 100644
--- a/unix/tkUnixFont.c
+++ b/unix/tkUnixFont.c
@@ -2636,7 +2636,7 @@ CanUseFallback(
 	memcpy(newPtr, fontPtr->subFontArray,
 		fontPtr->numSubFonts * sizeof(SubFont));
 	if (fixSubFontPtrPtr != NULL) {
-	    register SubFont *fixSubFontPtr = *fixSubFontPtrPtr;
+	    SubFont *fixSubFontPtr = *fixSubFontPtrPtr;
 
 	    if (fixSubFontPtr != &fontPtr->controlSubFont) {
 		*fixSubFontPtrPtr =
diff --git a/unix/tkUnixMenubu.c b/unix/tkUnixMenubu.c
index 6677e83..b212aea 100644
--- a/unix/tkUnixMenubu.c
+++ b/unix/tkUnixMenubu.c
@@ -58,14 +58,14 @@ void
 TkpDisplayMenuButton(
     ClientData clientData)	/* Information about widget. */
 {
-    register TkMenuButton *mbPtr = (TkMenuButton *) clientData;
+    TkMenuButton *mbPtr = (TkMenuButton *)clientData;
     GC gc;
     Tk_3DBorder border;
     Pixmap pixmap;
     int x = 0;			/* Initialization needed only to stop compiler
 				 * warning. */
     int y = 0;
-    register Tk_Window tkwin = mbPtr->tkwin;
+    Tk_Window tkwin = mbPtr->tkwin;
     int fullWidth, fullHeight;
     int textXOffset, textYOffset;
     int imageWidth, imageHeight;
diff --git a/unix/tkUnixScale.c b/unix/tkUnixScale.c
index 9c6e4f3..a603432 100644
--- a/unix/tkUnixScale.c
+++ b/unix/tkUnixScale.c
@@ -50,9 +50,9 @@ static void		DisplayVerticalValue(TkScale *scalePtr,
 
 TkScale *
 TkpCreateScale(
-    Tk_Window tkwin)
+    TCL_UNUSED(Tk_Window))
 {
-    return ckalloc(sizeof(TkScale));
+    return (TkScale *)ckalloc(sizeof(TkScale));
 }
 
 /*
@@ -256,7 +256,7 @@ DisplayVerticalScale(
 
 static void
 DisplayVerticalValue(
-    register TkScale *scalePtr,	/* Information about widget in which to
+    TkScale *scalePtr,	/* Information about widget in which to
 				 * display value. */
     Drawable drawable,		/* Pixmap or window in which to draw the
 				 * value. */
@@ -267,7 +267,7 @@ DisplayVerticalValue(
 				 * specified in pixels. */
     const char *format)		/* Format string to use for the value */
 {
-    register Tk_Window tkwin = scalePtr->tkwin;
+    Tk_Window tkwin = scalePtr->tkwin;
     int y, width, length;
     char valueString[TCL_DOUBLE_SPACE];
     Tk_FontMetrics fm;
@@ -325,7 +325,7 @@ DisplayHorizontalScale(
 				 * to reflect the part of the window that was
 				 * redrawn. */
 {
-    register Tk_Window tkwin = scalePtr->tkwin;
+    Tk_Window tkwin = scalePtr->tkwin;
     int x, y, width, height, shadowWidth;
     double tickInterval = scalePtr->tickInterval;
     Tk_3DBorder sliderBorder;
@@ -479,7 +479,7 @@ DisplayHorizontalScale(
 
 static void
 DisplayHorizontalValue(
-    register TkScale *scalePtr,	/* Information about widget in which to
+    TkScale *scalePtr,	/* Information about widget in which to
 				 * display value. */
     Drawable drawable,		/* Pixmap or window in which to draw the
 				 * value. */
@@ -490,7 +490,7 @@ DisplayHorizontalValue(
 				 * in pixels. */
     const char *format)		/* Format string to use for the value */
 {
-    register Tk_Window tkwin = scalePtr->tkwin;
+    Tk_Window tkwin = scalePtr->tkwin;
     int x, y, length, width;
     char valueString[TCL_DOUBLE_SPACE];
     Tk_FontMetrics fm;
@@ -546,7 +546,7 @@ void
 TkpDisplayScale(
     ClientData clientData)	/* Widget record for scale. */
 {
-    TkScale *scalePtr = (TkScale *) clientData;
+    TkScale *scalePtr = (TkScale *)clientData;
     Tk_Window tkwin = scalePtr->tkwin;
     Tcl_Interp *interp = scalePtr->interp;
     Pixmap pixmap;
diff --git a/unix/tkUnixScrlbr.c b/unix/tkUnixScrlbr.c
index 9b75431..69843db 100644
--- a/unix/tkUnixScrlbr.c
+++ b/unix/tkUnixScrlbr.c
@@ -63,7 +63,7 @@ TkScrollbar *
 TkpCreateScrollbar(
     Tk_Window tkwin)
 {
-    UnixScrollbar *scrollPtr = ckalloc(sizeof(UnixScrollbar));
+    UnixScrollbar *scrollPtr = (UnixScrollbar *)ckalloc(sizeof(UnixScrollbar));
 
     scrollPtr->troughGC = NULL;
     scrollPtr->copyGC = NULL;
@@ -97,8 +97,8 @@ void
 TkpDisplayScrollbar(
     ClientData clientData)	/* Information about window. */
 {
-    register TkScrollbar *scrollPtr = (TkScrollbar *) clientData;
-    register Tk_Window tkwin = scrollPtr->tkwin;
+    TkScrollbar *scrollPtr = (TkScrollbar *)clientData;
+    Tk_Window tkwin = scrollPtr->tkwin;
     XPoint points[7];
     Tk_3DBorder border;
     int relief, width, elementBorderWidth;
@@ -277,7 +277,7 @@ TkpDisplayScrollbar(
 
 extern void
 TkpComputeScrollbarGeometry(
-    register TkScrollbar *scrollPtr)
+    TkScrollbar *scrollPtr)
 				/* Scrollbar whose geometry may have
 				 * changed. */
 {
@@ -394,22 +394,22 @@ TkpDestroyScrollbar(
 
 void
 TkpConfigureScrollbar(
-    register TkScrollbar *scrollPtr)
+    TkScrollbar *scrollPtr)
 				/* Information about widget; may or may not
 				 * already have values for some fields. */
 {
     XGCValues gcValues;
-    GC new;
+    GC newGC;
     UnixScrollbar *unixScrollPtr = (UnixScrollbar *) scrollPtr;
 
     Tk_SetBackgroundFromBorder(scrollPtr->tkwin, scrollPtr->bgBorder);
 
     gcValues.foreground = scrollPtr->troughColorPtr->pixel;
-    new = Tk_GetGC(scrollPtr->tkwin, GCForeground, &gcValues);
+    newGC = Tk_GetGC(scrollPtr->tkwin, GCForeground, &gcValues);
     if (unixScrollPtr->troughGC != NULL) {
 	Tk_FreeGC(scrollPtr->display, unixScrollPtr->troughGC);
     }
-    unixScrollPtr->troughGC = new;
+    unixScrollPtr->troughGC = newGC;
     if (unixScrollPtr->copyGC == NULL) {
 	gcValues.graphics_exposures = False;
 	unixScrollPtr->copyGC = Tk_GetGC(scrollPtr->tkwin,
@@ -437,12 +437,12 @@ TkpConfigureScrollbar(
 
 int
 TkpScrollbarPosition(
-    register TkScrollbar *scrollPtr,
+    TkScrollbar *scrollPtr,
 				/* Scrollbar widget record. */
     int x, int y)		/* Coordinates within scrollPtr's window. */
 {
     int length, width, tmp;
-    register const int inset = scrollPtr->inset;
+    const int inset = scrollPtr->inset;
 
     if (scrollPtr->vertical) {
 	length = Tk_Height(scrollPtr->tkwin);
diff --git a/unix/tkUnixSend.c b/unix/tkUnixSend.c
index 1ee4bba..03d124f 100644
--- a/unix/tkUnixSend.c
+++ b/unix/tkUnixSend.c
@@ -269,7 +269,7 @@ RegOpen(
 
     handler = Tk_CreateErrorHandler(dispPtr->display, -1, -1, -1, NULL, NULL);
 
-    regPtr = ckalloc(sizeof(NameRegistry));
+    regPtr = (NameRegistry *)ckalloc(sizeof(NameRegistry));
     regPtr->dispPtr = dispPtr;
     regPtr->locked = 0;
     regPtr->modified = 0;
@@ -479,7 +479,7 @@ RegAddName(
     sprintf(id, "%x ", (unsigned) commWindow);
     idLength = strlen(id);
     newBytes = idLength + strlen(name) + 1;
-    newProp = ckalloc(regPtr->propLength + newBytes);
+    newProp = (char *)ckalloc(regPtr->propLength + newBytes);
     strcpy(newProp, id);
     strcpy(newProp+idLength, name);
     if (regPtr->property != NULL) {
@@ -808,7 +808,7 @@ Tk_SetAppName(
     const char *actualName;
     Tcl_DString dString;
     int offset, i;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     interp = winPtr->mainPtr->interp;
@@ -830,7 +830,7 @@ Tk_SetAppName(
 	     * the "send" command to the interpreter.
 	     */
 
-	    riPtr = ckalloc(sizeof(RegisteredInterp));
+	    riPtr = (RegisteredInterp *)ckalloc(sizeof(RegisteredInterp));
 	    riPtr->interp = interp;
 	    riPtr->dispPtr = winPtr->dispPtr;
 	    riPtr->nextPtr = tsdPtr->interpListPtr;
@@ -914,7 +914,7 @@ Tk_SetAppName(
 
     RegAddName(regPtr, actualName, Tk_WindowId(dispPtr->commTkwin));
     RegClose(regPtr);
-    riPtr->name = ckalloc(strlen(actualName) + 1);
+    riPtr->name = (char *)ckalloc(strlen(actualName) + 1);
     strcpy(riPtr->name, actualName);
     if (actualName != name) {
 	Tcl_DStringFree(&dString);
@@ -943,7 +943,7 @@ Tk_SetAppName(
 
 int
 Tk_SendObjCmd(
-    ClientData clientData,	/* Information about sender (only dispPtr
+    TCL_UNUSED(void *),	/* Information about sender (only dispPtr
 				 * field is used). */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
@@ -958,7 +958,7 @@ Tk_SendObjCmd(
     TkWindow *winPtr;
     Window commWindow;
     PendingCommand pending;
-    register RegisteredInterp *riPtr;
+    RegisteredInterp *riPtr;
     const char *destName;
     int result, index, async, i, firstArg;
     Tk_RestrictProc *prevProc;
@@ -967,7 +967,7 @@ Tk_SendObjCmd(
     Tcl_Time timeout;
     NameRegistry *regPtr;
     Tcl_DString request;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
     Tcl_Interp *localInterp;	/* Used when the interpreter to send the
 				 * command to is within the same process. */
@@ -1175,7 +1175,7 @@ Tk_SendObjCmd(
 		    msg = "target application died";
 		}
 		pending.code = TCL_ERROR;
-		pending.result = ckalloc(strlen(msg) + 1);
+		pending.result = (char *)ckalloc(strlen(msg) + 1);
 		strcpy(pending.result, msg);
 		pending.gotResponse = 1;
 	    } else {
@@ -1356,7 +1356,7 @@ TkSendCleanup(
 
 static int
 SendInit(
-    Tcl_Interp *interp,		/* Interpreter to use for error reporting (no
+    TCL_UNUSED(Tcl_Interp *),	/* Interpreter to use for error reporting (no
 				 * errors are ever returned, but the
 				 * interpreter is needed anyway). */
     TkDisplay *dispPtr)		/* Display to initialize. */
@@ -1419,14 +1419,14 @@ SendEventProc(
     ClientData clientData,	/* Display information. */
     XEvent *eventPtr)		/* Information about event. */
 {
-    TkDisplay *dispPtr = clientData;
+    TkDisplay *dispPtr = (TkDisplay *)clientData;
     char *propInfo, **propInfoPtr = &propInfo;
     const char *p;
     int result, actualFormat;
     unsigned long numItems, bytesAfter;
     Atom actualType;
     Tcl_Interp *remoteInterp;	/* Interp in which to execute the command. */
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     if ((eventPtr->xproperty.atom != dispPtr->commProperty)
@@ -1698,16 +1698,16 @@ SendEventProc(
 		}
 		pcPtr->code = code;
 		if (resultString != NULL) {
-		    pcPtr->result = ckalloc(strlen(resultString) + 1);
+		    pcPtr->result = (char *)ckalloc(strlen(resultString) + 1);
 		    strcpy(pcPtr->result, resultString);
 		}
 		if (code == TCL_ERROR) {
 		    if (errorInfo != NULL) {
-			pcPtr->errorInfo = ckalloc(strlen(errorInfo) + 1);
+			pcPtr->errorInfo = (char *)ckalloc(strlen(errorInfo) + 1);
 			strcpy(pcPtr->errorInfo, errorInfo);
 		    }
 		    if (errorCode != NULL) {
-			pcPtr->errorCode = ckalloc(strlen(errorCode) + 1);
+			pcPtr->errorCode = (char *)ckalloc(strlen(errorCode) + 1);
 			strcpy(pcPtr->errorCode, errorCode);
 		    }
 		}
@@ -1774,15 +1774,14 @@ AppendPropCarefully(
  * operation above.
  */
 
-	/* ARGSUSED */
 static int
 AppendErrorProc(
     ClientData clientData,	/* Command to mark complete, or NULL. */
-    XErrorEvent *errorPtr)	/* Information about error. */
+    TCL_UNUSED(XErrorEvent *))	/* Information about error. */
 {
-    PendingCommand *pendingPtr = clientData;
-    register PendingCommand *pcPtr;
-    ThreadSpecificData *tsdPtr =
+    PendingCommand *pendingPtr = (PendingCommand *)clientData;
+    PendingCommand *pcPtr;
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     if (pendingPtr == NULL) {
@@ -1796,7 +1795,7 @@ AppendErrorProc(
     for (pcPtr = tsdPtr->pendingCommands; pcPtr != NULL;
 	    pcPtr = pcPtr->nextPtr) {
 	if ((pcPtr == pendingPtr) && (pcPtr->result == NULL)) {
-	    pcPtr->result = ckalloc(strlen(pcPtr->target) + 50);
+	    pcPtr->result = (char *)ckalloc(strlen(pcPtr->target) + 50);
 	    sprintf(pcPtr->result, "no application named \"%s\"",
 		    pcPtr->target);
 	    pcPtr->code = TCL_ERROR;
@@ -1829,10 +1828,10 @@ DeleteProc(
     ClientData clientData)	/* Info about registration, passed as
 				 * ClientData. */
 {
-    RegisteredInterp *riPtr = clientData;
-    register RegisteredInterp *riPtr2;
+    RegisteredInterp *riPtr = (RegisteredInterp *)clientData;
+    RegisteredInterp *riPtr2;
     NameRegistry *regPtr;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     regPtr = RegOpen(riPtr->interp, riPtr->dispPtr, 1);
@@ -1874,11 +1873,10 @@ DeleteProc(
  *----------------------------------------------------------------------
  */
 
-    /* ARGSUSED */
 static Tk_RestrictAction
 SendRestrictProc(
-    ClientData clientData,		/* Not used. */
-    register XEvent *eventPtr)		/* Event that just arrived. */
+    TCL_UNUSED(void *),		/* Not used. */
+    XEvent *eventPtr)		/* Event that just arrived. */
 {
     TkDisplay *dispPtr;
 
@@ -1921,7 +1919,7 @@ UpdateCommWindow(
 {
     Tcl_DString names;
     RegisteredInterp *riPtr;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     Tcl_DStringInit(&names);
@@ -1954,7 +1952,6 @@ UpdateCommWindow(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 TkpTestsendCmd(
     ClientData clientData,	/* Main window for application. */
@@ -1968,7 +1965,7 @@ TkpTestsendCmd(
     static const char *const testsendOptions[] = {
 	"bogus",   "prop",   "serial",  NULL
     };
-    TkWindow *winPtr = clientData;
+    TkWindow *winPtr = (TkWindow *)clientData;
     Tk_ErrorHandler handler;
     int index;
 
diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c
index f1d1fe0..83b36e3 100644
--- a/unix/tkUnixWm.c
+++ b/unix/tkUnixWm.c
@@ -36,7 +36,7 @@ typedef struct ProtocolHandler {
 } ProtocolHandler;
 
 #define HANDLER_SIZE(cmdLength) \
-    ((unsigned) ((Tk_Offset(ProtocolHandler, command) + 1) + cmdLength))
+    ((unsigned)((Tk_Offset(ProtocolHandler, command) + 1) + cmdLength))
 
 /*
  * Data for [wm attributes] command:
@@ -564,10 +564,10 @@ void
 TkWmNewWindow(
     TkWindow *winPtr)		/* Newly-created top-level window. */
 {
-    register WmInfo *wmPtr;
+    WmInfo *wmPtr;
     TkDisplay *dispPtr = winPtr->dispPtr;
 
-    wmPtr = ckalloc(sizeof(WmInfo));
+    wmPtr = (WmInfo *)ckalloc(sizeof(WmInfo));
     memset(wmPtr, 0, sizeof(WmInfo));
     wmPtr->winPtr = winPtr;
     wmPtr->reparent = None;
@@ -659,7 +659,7 @@ TkWmMapWindow(
     TkWindow *winPtr)		/* Top-level window that's about to be
 				 * mapped. */
 {
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
     XTextProperty textProp;
 
     if (wmPtr->flags & WM_NEVER_MAPPED) {
@@ -827,7 +827,7 @@ void
 TkWmDeadWindow(
     TkWindow *winPtr)		/* Top-level window that's being deleted. */
 {
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
     WmInfo *wmPtr2;
 
     if (wmPtr == NULL) {
@@ -836,7 +836,7 @@ TkWmDeadWindow(
     if ((WmInfo *) winPtr->dispPtr->firstWmPtr == wmPtr) {
 	winPtr->dispPtr->firstWmPtr = wmPtr->nextPtr;
     } else {
-	register WmInfo *prevPtr;
+	WmInfo *prevPtr;
 
 	for (prevPtr = (WmInfo *) winPtr->dispPtr->firstWmPtr; ;
 		prevPtr = prevPtr->nextPtr) {
@@ -1005,7 +1005,6 @@ TkWmSetClass(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 int
 Tk_WmObjCmd(
     ClientData clientData,	/* Main window associated with interpreter. */
@@ -1013,7 +1012,7 @@ Tk_WmObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tk_Window tkwin = clientData;
+    Tk_Window tkwin = (Tk_Window)clientData;
     static const char *const optionStrings[] = {
 	"aspect", "attributes", "client", "colormapwindows",
 	"command", "deiconify", "focusmodel", "forget",
@@ -1182,13 +1181,13 @@ Tk_WmObjCmd(
 
 static int
 WmAspectCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),	/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
     int numer1, denom1, numer2, denom2;
 
     if ((objc != 3) && (objc != 7)) {
@@ -1315,7 +1314,7 @@ WmSetAttribute(
 	SetNetWmState(winPtr, "_NET_WM_STATE_FULLSCREEN",
 		wmPtr->reqState.fullscreen);
 	break;
-    case _WMATT_LAST_ATTRIBUTE:	/* NOTREACHED */
+    case _WMATT_LAST_ATTRIBUTE:
 	return TCL_ERROR;
     }
     return TCL_OK;
@@ -1352,10 +1351,9 @@ WmGetAttribute(
 	return Tcl_NewBooleanObj(wmPtr->attributes.fullscreen);
     case WMATT_TYPE:
 	return GetNetWmType(winPtr);
-    case _WMATT_LAST_ATTRIBUTE:	/*NOTREACHED*/
+    case _WMATT_LAST_ATTRIBUTE:
 	break;
     }
-    /*NOTREACHED*/
     return NULL;
 }
 
@@ -1385,7 +1383,7 @@ WmGetAttribute(
 
 static int
 WmAttributesCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),	/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
@@ -1449,13 +1447,13 @@ WmAttributesCmd(
 
 static int
 WmClientCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),		/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
     const char *argv3;
     int length;
 
@@ -1486,7 +1484,7 @@ WmClientCmd(
     if (wmPtr->clientMachine != NULL) {
 	ckfree(wmPtr->clientMachine);
     }
-    wmPtr->clientMachine = ckalloc(length + 1);
+    wmPtr->clientMachine = (char *)ckalloc(length + 1);
     strcpy(wmPtr->clientMachine, argv3);
     if (!(wmPtr->flags & WM_NEVER_MAPPED)) {
 	XTextProperty textProp;
@@ -1541,7 +1539,7 @@ WmColormapwindowsCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
     Window *cmapList;
     TkWindow *winPtr2;
     int count, i, windowObjc, gotToplevel;
@@ -1584,7 +1582,7 @@ WmColormapwindowsCmd(
 	    != TCL_OK) {
 	return TCL_ERROR;
     }
-    cmapList = ckalloc((windowObjc+1) * sizeof(Window));
+    cmapList = (Window *)ckalloc((windowObjc+1) * sizeof(Window));
     gotToplevel = 0;
     for (i = 0; i < windowObjc; i++) {
 	Tk_Window mapWin;
@@ -1636,13 +1634,13 @@ WmColormapwindowsCmd(
 
 static int
 WmCommandCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),	/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
     const char *argv3;
     int cmdArgc;
     const char **cmdArgv;
@@ -1705,13 +1703,13 @@ WmCommandCmd(
 
 static int
 WmDeiconifyCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),	/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
 
     if (objc != 3) {
 	Tcl_WrongNumArgs(interp, 2, objv, "window");
@@ -1755,13 +1753,13 @@ WmDeiconifyCmd(
 
 static int
 WmFocusmodelCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),	/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
     static const char *const optionStrings[] = {
 	"active", "passive", NULL };
     enum options {
@@ -1810,13 +1808,13 @@ WmFocusmodelCmd(
 
 static int
 WmForgetCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),		/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel or Frame to work with */
-    Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,			/* Number of arguments. */
-    Tcl_Obj *const objv[])	/* Argument objects. */
+    TCL_UNUSED(Tcl_Interp *),		/* Current interpreter. */
+    TCL_UNUSED(int),			/* Number of arguments. */
+    TCL_UNUSED(Tcl_Obj *const *))	/* Argument objects. */
 {
-    register Tk_Window frameWin = (Tk_Window) winPtr;
+    Tk_Window frameWin = (Tk_Window) winPtr;
 
     if (Tk_IsTopLevel(frameWin)) {
 	TkFocusJoin(winPtr);
@@ -1863,13 +1861,13 @@ WmForgetCmd(
 
 static int
 WmFrameCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),	/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
     Window window;
     char buf[TCL_INTEGER_SPACE];
 
@@ -1905,13 +1903,13 @@ WmFrameCmd(
 
 static int
 WmGeometryCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),	/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
     char xSign, ySign;
     int width, height;
     const char *argv3;
@@ -1965,13 +1963,13 @@ WmGeometryCmd(
 
 static int
 WmGridCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),	/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
     int reqWidth, reqHeight, widthInc, heightInc;
 
     if ((objc != 3) && (objc != 7)) {
@@ -2070,7 +2068,7 @@ WmGroupCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
     Tk_Window tkwin2;
     WmInfo *wmPtr2;
     const char *argv3;
@@ -2114,7 +2112,7 @@ WmGroupCmd(
 	}
 	wmPtr->hints.window_group = Tk_WindowId(wmPtr2->wrapperPtr);
 	wmPtr->hints.flags |= WindowGroupHint;
-	wmPtr->leaderName = ckalloc(length + 1);
+	wmPtr->leaderName = (char *)ckalloc(length + 1);
 	strcpy(wmPtr->leaderName, argv3);
     }
     UpdateHints(winPtr);
@@ -2140,13 +2138,13 @@ WmGroupCmd(
 
 static int
 WmIconbitmapCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),	/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
     Pixmap pixmap;
     const char *argv3;
 
@@ -2200,13 +2198,13 @@ WmIconbitmapCmd(
 
 static int
 WmIconifyCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),	/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
 
     if (objc != 3) {
 	Tcl_WrongNumArgs(interp, 2, objv, "window");
@@ -2275,7 +2273,7 @@ WmIconmaskCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
     Pixmap pixmap;
     const char *argv3;
 
@@ -2328,13 +2326,13 @@ WmIconmaskCmd(
 
 static int
 WmIconnameCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),	/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
     const char *argv3;
     int length;
 
@@ -2380,13 +2378,13 @@ WmIconnameCmd(
 
 static int
 WmIconphotoCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),		/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
     Tk_PhotoHandle photo;
     Tk_PhotoImageBlock block;
     int i, size = 0, width, height, index = 0, x, y, isDefault = 0;
@@ -2437,7 +2435,7 @@ WmIconphotoCmd(
      * defines CARD32 arrays to use. [Bug 2902814]
      */
 
-    iconPropertyData = attemptckalloc(sizeof(unsigned long) * size);
+    iconPropertyData = (unsigned long *)attemptckalloc(sizeof(unsigned long) * size);
     if (iconPropertyData == NULL) {
 	return TCL_ERROR;
     }
@@ -2479,9 +2477,9 @@ WmIconphotoCmd(
 	iconPropertyData[index++] = (unsigned long) height;
 	for (y = 0; y < height; y++) {
 	    for (x = 0; x < width; x++) {
-		register unsigned char *pixelPtr =
+		unsigned char *pixelPtr =
 			block.pixelPtr + x*block.pixelSize + y*block.pitch;
-		register unsigned long R, G, B, A;
+		unsigned long R, G, B, A;
 
 		R = pixelPtr[block.offset[0]];
 		G = pixelPtr[block.offset[1]];
@@ -2530,13 +2528,13 @@ WmIconphotoCmd(
 
 static int
 WmIconpositionCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),	/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
     int x, y;
 
     if ((objc != 3) && (objc != 5)) {
@@ -2593,7 +2591,7 @@ WmIconwindowCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
     Tk_Window tkwin2;
     WmInfo *wmPtr2;
     XSetWindowAttributes atts;
@@ -2707,14 +2705,14 @@ WmIconwindowCmd(
 
 static int
 WmManageCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),		/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel or Frame to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
-    int objc,			/* Number of arguments. */
-    Tcl_Obj *const objv[])	/* Argument objects. */
+    TCL_UNUSED(int),			/* Number of arguments. */
+    TCL_UNUSED(Tcl_Obj *const *))	/* Argument objects. */
 {
-    register Tk_Window frameWin = (Tk_Window) winPtr;
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    Tk_Window frameWin = (Tk_Window) winPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
 
     if (!Tk_IsTopLevel(frameWin)) {
 	if (!Tk_IsManageable(frameWin)) {
@@ -2769,13 +2767,13 @@ WmManageCmd(
 
 static int
 WmMaxsizeCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),	/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
     int width, height;
 
     if ((objc != 3) && (objc != 5)) {
@@ -2828,13 +2826,13 @@ WmMaxsizeCmd(
 
 static int
 WmMinsizeCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),	/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
     int width, height;
 
     if ((objc != 3) && (objc != 5)) {
@@ -2879,7 +2877,7 @@ WmMinsizeCmd(
 
 static int
 WmOverrideredirectCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),	/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
@@ -2937,13 +2935,13 @@ WmOverrideredirectCmd(
 
 static int
 WmPositionfromCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),	/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
     static const char *const optionStrings[] = {
 	"program", "user", NULL };
     enum options {
@@ -3004,14 +3002,14 @@ WmPositionfromCmd(
 
 static int
 WmProtocolCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),		/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
-    register ProtocolHandler *protPtr, *prevPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
+    ProtocolHandler *protPtr, *prevPtr;
     Atom protocol;
     const char *cmd;
     int cmdLength;
@@ -3082,7 +3080,7 @@ WmProtocolCmd(
     }
     cmd = Tcl_GetStringFromObj(objv[4], &cmdLength);
     if (cmdLength > 0) {
-	protPtr = ckalloc(HANDLER_SIZE(cmdLength));
+	protPtr = (ProtocolHandler *)ckalloc(HANDLER_SIZE(cmdLength));
 	protPtr->protocol = protocol;
 	protPtr->nextPtr = wmPtr->protPtr;
 	wmPtr->protPtr = protPtr;
@@ -3114,13 +3112,13 @@ WmProtocolCmd(
 
 static int
 WmResizableCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),	/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
     int width, height;
 
     if ((objc != 3) && (objc != 5)) {
@@ -3173,13 +3171,13 @@ WmResizableCmd(
 
 static int
 WmSizefromCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),	/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
     static const char *const optionStrings[] = {
 	"program", "user", NULL };
     enum options {
@@ -3365,13 +3363,13 @@ WmStackorderCmd(
 
 static int
 WmStateCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),	/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
     static const char *const optionStrings[] = {
 	"normal", "iconic", "withdrawn", NULL };
     enum options {
@@ -3471,13 +3469,13 @@ WmStateCmd(
 
 static int
 WmTitleCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),		/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
     const char *argv3;
     int length;
 
@@ -3496,7 +3494,7 @@ WmTitleCmd(
 	    ckfree(wmPtr->title);
 	}
 	argv3 = Tcl_GetStringFromObj(objv[3], &length);
-	wmPtr->title = ckalloc(length + 1);
+	wmPtr->title = (char *)ckalloc(length + 1);
 	strcpy(wmPtr->title, argv3);
 
 	if (!(wmPtr->flags & WM_NEVER_MAPPED)) {
@@ -3531,7 +3529,7 @@ WmTransientCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
     TkWindow *containerPtr = wmPtr->containerPtr, *w;
     WmInfo *wmPtr2;
 
@@ -3674,13 +3672,13 @@ WmTransientCmd(
 
 static int
 WmWithdrawCmd(
-    Tk_Window tkwin,		/* Main window of the application. */
+    TCL_UNUSED(Tk_Window),		/* Main window of the application. */
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
 
     if (objc != 3) {
 	Tcl_WrongNumArgs(interp, 2, objv, "window");
@@ -3729,7 +3727,7 @@ WmWaitMapProc(
     ClientData clientData,	/* Pointer to window. */
     XEvent *eventPtr)		/* Information about event. */
 {
-    TkWindow *winPtr = clientData;
+    TkWindow *winPtr = (TkWindow *)clientData;
     TkWindow *containerPtr = winPtr->wmInfoPtr->containerPtr;
 
     if (containerPtr == NULL) {
@@ -3780,7 +3778,7 @@ Tk_SetGrid(
 				 * of one grid unit. */
 {
     TkWindow *winPtr = (TkWindow *) tkwin;
-    register WmInfo *wmPtr;
+    WmInfo *wmPtr;
 
     /*
      * Ensure widthInc and heightInc are greater than 0
@@ -3885,7 +3883,7 @@ Tk_UnsetGrid(
 				 * controlling gridding. */
 {
     TkWindow *winPtr = (TkWindow *) tkwin;
-    register WmInfo *wmPtr;
+    WmInfo *wmPtr;
 
     /*
      * Find the top-level window for tkwin, plus the window manager
@@ -4418,7 +4416,7 @@ WrapperEventProc(
     ClientData clientData,	/* Information about toplevel window. */
     XEvent *eventPtr)		/* Event that just happened. */
 {
-    WmInfo *wmPtr = clientData;
+    WmInfo *wmPtr = (WmInfo *)clientData;
     XEvent mapEvent;
     TkDisplay *dispPtr = wmPtr->winPtr->dispPtr;
 
@@ -4498,10 +4496,9 @@ WrapperEventProc(
  *----------------------------------------------------------------------
  */
 
-	/* ARGSUSED */
 static void
 TopLevelReqProc(
-    ClientData dummy,		/* Not used. */
+    TCL_UNUSED(void *),		/* Not used. */
     Tk_Window tkwin)		/* Information about window. */
 {
     TkWindow *winPtr = (TkWindow *) tkwin;
@@ -4568,8 +4565,8 @@ static void
 UpdateGeometryInfo(
     ClientData clientData)	/* Pointer to the window's record. */
 {
-    register TkWindow *winPtr = clientData;
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    TkWindow *winPtr = (TkWindow *)clientData;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
     int x, y, width, height, min, max;
     unsigned long serial;
 
@@ -4830,7 +4827,7 @@ UpdateSizeHints(
     int newWidth,
     int newHeight)
 {
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
     XSizeHints *hintsPtr;
     int maxWidth, maxHeight;
 
@@ -5307,7 +5304,7 @@ WaitRestrictProc(
     ClientData clientData,	/* Pointer to WaitRestrictInfo structure. */
     XEvent *eventPtr)		/* Event that is about to be handled. */
 {
-    WaitRestrictInfo *infoPtr = clientData;
+    WaitRestrictInfo *infoPtr = (WaitRestrictInfo *)clientData;
 
     if (eventPtr->type == ReparentNotify) {
 	return TK_PROCESS_EVENT;
@@ -5463,7 +5460,7 @@ SetNetWmType(
     }
 
     if (objc > 0) {
-	atoms = ckalloc(sizeof(Atom) * objc);
+	atoms = (Atom *)ckalloc(sizeof(Atom) * objc);
     }
 
     for (n = 0; n < objc; ++n) {
@@ -5576,10 +5573,10 @@ ParseGeometry(
     TkWindow *winPtr)		/* Pointer to top-level window whose geometry
 				 * is to be changed. */
 {
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
     int x, y, width, height, flags;
     char *end;
-    register const char *p = string;
+    const char *p = string;
 
     /*
      * The leading "=" is optional.
@@ -5712,7 +5709,7 @@ Tk_GetRootCoords(
     int *yPtr)			/* Where to store y-displacement of (0,0). */
 {
     int x, y;
-    register TkWindow *winPtr = (TkWindow *) tkwin;
+    TkWindow *winPtr = (TkWindow *) tkwin;
 
     /*
      * Search back through this window's parents all the way to a top-level
@@ -6179,7 +6176,7 @@ Tk_MoveToplevelWindow(
     int x, int y)		/* New location for window (within parent). */
 {
     TkWindow *winPtr = (TkWindow *) tkwin;
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
 
     if (!(winPtr->flags & TK_TOP_LEVEL)) {
 	Tcl_Panic("Tk_MoveToplevelWindow called with non-toplevel window");
@@ -6227,9 +6224,9 @@ Tk_MoveToplevelWindow(
 
 static void
 UpdateWmProtocols(
-    register WmInfo *wmPtr)	/* Information about top-level window. */
+    WmInfo *wmPtr)	/* Information about top-level window. */
 {
-    register ProtocolHandler *protPtr;
+    ProtocolHandler *protPtr;
     Atom deleteWindowAtom, pingAtom;
     int count;
     Atom *arrayPtr, *atomPtr;
@@ -6246,7 +6243,7 @@ UpdateWmProtocols(
 	    protPtr = protPtr->nextPtr, count++) {
 	/* Empty loop body; we're just counting the handlers. */
     }
-    arrayPtr = ckalloc(count * sizeof(Atom));
+    arrayPtr = (Atom *)ckalloc(count * sizeof(Atom));
     deleteWindowAtom = Tk_InternAtom((Tk_Window) wmPtr->winPtr,
 	    "WM_DELETE_WINDOW");
     pingAtom = Tk_InternAtom((Tk_Window) wmPtr->winPtr, "_NET_WM_PING");
@@ -6288,7 +6285,7 @@ TkWmProtocolEventProc(
     XEvent *eventPtr)		/* X event. */
 {
     WmInfo *wmPtr;
-    register ProtocolHandler *protPtr;
+    ProtocolHandler *protPtr;
     Atom protocol;
     int result;
     const char *protocolName;
@@ -6437,7 +6434,7 @@ TkWmStackorderToplevel(
     Tcl_InitHashTable(&table, TCL_ONE_WORD_KEYS);
     TkWmStackorderToplevelWrapperMap(parentPtr, parentPtr->display, &table);
 
-    window_ptr = windows = ckalloc((table.numEntries+1) * sizeof(TkWindow *));
+    window_ptr = windows = (TkWindow **)ckalloc((table.numEntries+1) * sizeof(TkWindow *));
     if (windows == NULL) {
 	return NULL;
     }
@@ -6453,7 +6450,7 @@ TkWmStackorderToplevel(
 	goto done;
     case 1:
 	hPtr = Tcl_FirstHashEntry(&table, &search);
-	windows[0] = Tcl_GetHashValue(hPtr);
+	windows[0] = (TkWindow *)Tcl_GetHashValue(hPtr);
 	windows[1] = NULL;
 	goto done;
     }
@@ -6469,9 +6466,9 @@ TkWmStackorderToplevel(
 	windows = NULL;
     } else {
 	for (i = 0; i < numChildren; i++) {
-	    hPtr = Tcl_FindHashEntry(&table, (char *) children[i]);
+	    hPtr = Tcl_FindHashEntry(&table, (char *)children[i]);
 	    if (hPtr != NULL) {
-		childWinPtr = Tcl_GetHashValue(hPtr);
+		childWinPtr = (TkWindow *)Tcl_GetHashValue(hPtr);
 		*window_ptr++ = childWinPtr;
 	    }
 	}
@@ -6644,7 +6641,7 @@ TkWmAddToColormapWindows(
      * add the toplevel itself as the last element of the list.
      */
 
-    newPtr = ckalloc((count+2) * sizeof(Window));
+    newPtr = (Window *)ckalloc((count+2) * sizeof(Window));
     for (i = 0; i < count; i++) {
 	newPtr[i] = oldPtr[i];
     }
@@ -6879,7 +6876,7 @@ GetMaxSize(
 static void
 TkSetTransientFor(Tk_Window tkwin, Tk_Window parent)
 {
-    if (parent == None) {
+    if (parent == NULL) {
 	parent = Tk_Parent(tkwin);
 	while (!Tk_IsTopLevel(parent))
 	    parent = Tk_Parent(parent);
@@ -6997,7 +6994,7 @@ CreateWrapper(
     TkWindow *winPtr, *wrapperPtr;
     Window parent;
     Tcl_HashEntry *hPtr;
-    int new;
+    int isNew;
 
     winPtr = wmPtr->winPtr;
     if (winPtr->window == None) {
@@ -7041,7 +7038,7 @@ CreateWrapper(
 	    InputOutput, wrapperPtr->visual,
 	    wrapperPtr->dirtyAtts|CWOverrideRedirect, &wrapperPtr->atts);
     hPtr = Tcl_CreateHashEntry(&wrapperPtr->dispPtr->winTable,
-	    (char *) wrapperPtr->window, &new);
+	    (char *) wrapperPtr->window, &isNew);
     Tcl_SetHashValue(hPtr, wrapperPtr);
     wrapperPtr->mainPtr = winPtr->mainPtr;
     wrapperPtr->mainPtr->refCount++;
@@ -7260,7 +7257,7 @@ MenubarReqProc(
 				 * for tkwin's toplevel. */
     Tk_Window tkwin)		/* Handle for menubar window. */
 {
-    WmInfo *wmPtr = clientData;
+    WmInfo *wmPtr = (WmInfo *)clientData;
 
     wmPtr->menuHeight = Tk_ReqHeight(tkwin);
     if (wmPtr->menuHeight <= 0) {
@@ -7295,7 +7292,7 @@ TkWindow *
 TkpGetWrapperWindow(
     TkWindow *winPtr)		/* A toplevel window pointer. */
 {
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
 
     if ((winPtr == NULL) || (wmPtr == NULL)) {
 	return NULL;
@@ -7325,7 +7322,7 @@ static void
 UpdateCommand(
     TkWindow *winPtr)
 {
-    register WmInfo *wmPtr = winPtr->wmInfoPtr;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
     Tcl_DString cmds, ds;
     int i, *offsets;
     char **cmdArgv;
@@ -7342,8 +7339,8 @@ UpdateCommand(
      * entire DString is done.
      */
 
-    cmdArgv = ckalloc(sizeof(char *) * wmPtr->cmdArgc);
-    offsets = ckalloc(sizeof(int) * wmPtr->cmdArgc);
+    cmdArgv = (char **)ckalloc(sizeof(char *) * wmPtr->cmdArgc);
+    offsets = (int *)ckalloc(sizeof(int) * wmPtr->cmdArgc);
     Tcl_DStringInit(&cmds);
     for (i = 0; i < wmPtr->cmdArgc; i++) {
 	Tcl_UtfToExternalDString(NULL, wmPtr->cmdArgv[i], -1, &ds);
-- 
cgit v0.12


From 22140449e59b9070e741eb4108f372bb602c4537 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 6 Oct 2020 07:28:25 +0000
Subject: When adding the -Werror option to CFLAGS, the HAVE_PW_GECOS detection
 doesn't work any more. Here's the fix.

---
 unix/configure    | 2 +-
 unix/configure.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/unix/configure b/unix/configure
index fe229ad..7e1f291 100755
--- a/unix/configure
+++ b/unix/configure
@@ -8805,7 +8805,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
-struct passwd pwd; pwd.pw_gecos;
+struct passwd pwd; (void)pwd.pw_gecos;
   ;
   return 0;
 }
diff --git a/unix/configure.in b/unix/configure.in
index fdffbcc..8242c7b 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -244,7 +244,7 @@ AC_CHECK_TYPE([uintptr_t], [
 
 AC_CACHE_CHECK([pw_gecos in struct pwd], tcl_cv_pwd_pw_gecos, [
     AC_TRY_COMPILE([#include <pwd.h>],
-	    [struct passwd pwd; pwd.pw_gecos;],
+	    [struct passwd pwd; (void)pwd.pw_gecos;],
 	    tcl_cv_pwd_pw_gecos=yes, tcl_cv_pwd_pw_gecos=no)])
 if test $tcl_cv_pwd_pw_gecos = yes; then
     AC_DEFINE(HAVE_PW_GECOS, 1, [Does struct password have a pw_gecos field?])
-- 
cgit v0.12


From 8cd2f2d9e3a312c5f4e2ba6a5f812f3317b5c2e5 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 6 Oct 2020 09:41:55 +0000
Subject: Mark winWm-9.2 testcase with failsOnUbuntu constraint

---
 tests/winWm.test | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/tests/winWm.test b/tests/winWm.test
index 705e355..baf8e3d 100644
--- a/tests/winWm.test
+++ b/tests/winWm.test
@@ -14,6 +14,7 @@ namespace import ::tcltest::*
 tcltest::configure {*}$argv
 tcltest::loadTestedCommands
 
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
 
 test winWm-1.1 {TkWmMapWindow} -constraints win -setup {
     destroy .t
@@ -485,7 +486,7 @@ test winWm-9.0 "Bug #2799589 - delayed activation of destroyed window" -constrai
         rename winwm90$cmd {}
     }
     destroy .tx .t .sd
-} -result {ok}
+} -result ok
 
 test winWm-9.1 "delayed activation of grabbed destroyed window" -constraints win -setup {
     proc winwm91click {w} {
@@ -530,9 +531,9 @@ test winWm-9.1 "delayed activation of grabbed destroyed window" -constraints win
         rename winwm91$cmd {}
     }
     destroy .tx .t .sd
-} -result {ok}
+} -result ok
 
-test winWm-9.2 "check wm forget for unmapped parent (#3205464,#2967911)" -setup {
+test winWm-9.2 "check wm forget for unmapped parent (#3205464,#2967911)" -constraints failsOnUbuntu -setup {
     destroy .t
     toplevel .t
     set winwm92 {}
@@ -541,15 +542,15 @@ test winWm-9.2 "check wm forget for unmapped parent (#3205464,#2967911)" -setup
 } -body {
     pack .t.f.x
     pack .t.f
-    lappend aid [after 2000 {set ::winwm92 timeout}] [after 100 {
+    lappend aid [after 5000 {set ::winwm92 timeout}] [after 500 {
         wm manage .t.f
         wm iconify .t
-        lappend aid [after 100 {
+        lappend aid [after 500 {
             wm forget .t.f
             wm deiconify .t
-            lappend aid [after 100 {
+            lappend aid [after 500 {
                 pack .t.f
-                lappend aid [after 100 {
+                lappend aid [after 500 {
 		    set ::winwm92 [expr {
 			    [winfo rooty .t.f.x] == 0 ? "failed" : "ok"}]}]
             }]
-- 
cgit v0.12


From 57b26d33d3737f509c2a4392d4843dea5d97bc3b Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 6 Oct 2020 13:39:28 +0000
Subject: Sync unix/tcl.m4 with Tcl 8.6

---
 unix/tcl.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 25a01ac..51ac8d9 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -2339,7 +2339,7 @@ AC_DEFUN([SC_TIME_HANDLER], [
     fi
 
     AC_CACHE_CHECK([tm_gmtoff in struct tm], tcl_cv_member_tm_gmtoff, [
-	AC_TRY_COMPILE([#include <time.h>], [struct tm tm; tm.tm_gmtoff;],
+	AC_TRY_COMPILE([#include <time.h>], [struct tm tm; (void)tm.tm_gmtoff;],
 	    tcl_cv_member_tm_gmtoff=yes, tcl_cv_member_tm_gmtoff=no)])
     if test $tcl_cv_member_tm_gmtoff = yes ; then
 	AC_DEFINE(HAVE_TM_GMTOFF, 1, [Should we use the tm_gmtoff field of struct tm?])
-- 
cgit v0.12


From 9cd6dc52673b12cb03279a1252c65a7e93f496e1 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Tue, 6 Oct 2020 14:24:54 +0000
Subject: Fix [175a6e4bb6]: Aqua tiled fullscreen windows cannot be resized.

---
 macosx/tkMacOSXSubwindows.c | 16 ++++++++++------
 macosx/tkMacOSXWm.c         |  7 +++----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index e840cea..f4edfe0 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -360,12 +360,16 @@ XResizeWindow(
 	NSWindow *w = macWin->winPtr->wmInfoPtr->window;
 
 	if (w) {
-	    NSRect r = [w contentRectForFrameRect:[w frame]];
-
-	    r.origin.y += r.size.height - height;
-	    r.size.width = width;
-	    r.size.height = height;
-	    [w setFrame:[w frameRectForContentRect:r] display:YES];
+	    if ([w styleMask] & NSFullScreenWindowMask) {
+		[w tkLayoutChanged];
+	    } else {
+		NSRect r = [w contentRectForFrameRect:[w frame]];
+
+		r.origin.y += r.size.height - height;
+		r.size.width = width;
+		r.size.height = height;
+		[w setFrame:[w frameRectForContentRect:r] display:YES];
+	    }
 	}
     } else {
 	MoveResizeWindow(macWin);
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 4a3f561..85cfa30 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -6865,7 +6865,7 @@ ApplyWindowAttributeFlagChanges(
 	     * after 10.10.
 	     */
 
-#if !(MAC_OS_X_VERSION_MAX_ALLOWED < 101000)
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101100
 	    if (!(macWindow.styleMask & NSUtilityWindowMask)) {
 		/*
 		 * Exclude overrideredirect, transient, and "help"-styled
@@ -6887,11 +6887,10 @@ ApplyWindowAttributeFlagChanges(
 		     * window. To work around this we make the max size equal
 		     * to the screen size.  (For 10.11 and up, only)
 		     */
-		    if ([NSApp macOSVersion] > 101000) {
-#if !(MAC_OS_X_VERSION_MAX_ALLOWED > 101000)
+
+		    if (@available(macOS 10.11, *)) {
 			NSSize screenSize = [[macWindow screen] frame].size;
 			[macWindow setMaxFullScreenContentSize:screenSize];
-#endif
 		    }
 		}
 	    }
-- 
cgit v0.12


From ab0f9c15a66718c8d5d9fb310cdea32a8bfcf72f Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Wed, 7 Oct 2020 06:13:57 +0000
Subject: Words matter.

---
 doc/bind.n | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/bind.n b/doc/bind.n
index db89eae..6ba115c 100644
--- a/doc/bind.n
+++ b/doc/bind.n
@@ -283,8 +283,8 @@ it is destroyed.
 When the \fBDestroy\fR event is delivered
 to a widget, it is in a
 .QW half-dead
-state: the widget still exists, but most operations on it will behave
-in an undefined manner, and/or return arbitrary results.
+state: the widget still exists, but operations that involve it
+may return invalid results, or return an error.
 .RE
 .IP "\fBFocusIn\fR, \fBFocusOut\fR" 5
 The \fBFocusIn\fR and \fBFocusOut\fR events are generated
-- 
cgit v0.12


From 526bccf8bf38fe66da8e6e951cca4435c30869d9 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 7 Oct 2020 11:52:25 +0000
Subject: Disable two test-cases for Tcl < 8.6.7 (they fail because of bug
 [25842c161f])

---
 tests/imgPhoto.test | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/tests/imgPhoto.test b/tests/imgPhoto.test
index c4b4755..46daaa2 100644
--- a/tests/imgPhoto.test
+++ b/tests/imgPhoto.test
@@ -129,7 +129,9 @@ testConstraint hasTeapotPhoto [file exists $teapotPhotoFile]
 # let's see if we have the semi-transparent one as well
 set transpTeapotPhotoFile [file join [file dirname [info script]] teapotTransparent.png]
 testConstraint hasTranspTeapotPhoto [file exists $transpTeapotPhotoFile]
-
+testConstraint needsTcl867 [package vsatisfies [package provide Tcl] 8.6.7-]
+
+
 test imgPhoto-1.1 {options for photo images} -body {
     image create photo photo1 -width 79 -height 83
     list [photo1 cget -width] [photo1 cget -height] \
@@ -264,8 +266,9 @@ test imgPhoto-3.4 {ImgPhotoConfigureModel: -data <ppm>} -constraints {
 } -cleanup {
     imageCleanup
 } -result {20 20}
+# This testcase fails with Tcl < 8.6.7, due to [25842c]
 test imgPhoto-3.5 {ImgPhotoConfigureModel: -data <png>} -constraints {
-    hasTeapotPhoto
+    hasTeapotPhoto needsTcl867
 } -setup {
     image create photo photo1 -file $teapotPhotoFile
     image create photo photo2
@@ -1332,10 +1335,10 @@ test imgPhoto-4.117 {ImgPhotoCmd data: list colorformat} -setup {
 } -body {
     photo1 data -format {default -colorformat list}
 } -result {{{255 0 0 170} {0 128 0 255}} {{0 0 255 204} {255 255 255 221}}}
+# This testcase fails with Tcl < 8.6.7, due to [25842c]
 test imgPhoto-4.118 {ImgPhotoCmd data: using data for new image
     results in same image as orignial } -constraints {
-        hasTeapotPhoto
-        hasTranspTeapotPhoto
+        hasTeapotPhoto hasTranspTeapotPhoto needsTcl867 
 } -setup {
     image create photo teapot -file $teapotPhotoFile
     teapot copy teapot -from 50 60 70 80 -shrink
-- 
cgit v0.12


From 5450612a4d1bd4e6f796f76f12f3d216dfc935ba Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 7 Oct 2020 15:10:06 +0000
Subject: More warnings -Wshadow with C++ compiler. Simplify <KeyPress> ->
 <Key>

---
 ChangeLog               |  4 ++--
 changes                 |  6 +++---
 generic/tkCanvas.c      |  4 ++--
 generic/tkImgPNG.c      |  4 ++--
 generic/tkImgSVGnano.c  |  6 +++---
 generic/tkTest.c        | 14 +++++++-------
 macosx/tkMacOSXScrlbr.c |  2 +-
 tests/bind.test         | 20 ++++++++++----------
 tests/imgPhoto.test     |  2 +-
 win/tkWinMenu.c         |  4 ++--
 10 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f01946a..4fbb0eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -714,7 +714,7 @@ a better first place to look now.
 2011-10-27  Kevin B. Kenny  <kennykb@acm.org>
 
 	* generic/tkInt.h:	[Bug 3410609]: Change the event mechanism
-	* unix/tkUnixEvent.c:	for <KeyPress> events to use the keysym
+	* unix/tkUnixEvent.c:	for <Key> events to use the keysym
 	* unix/tkUnixKey.c:	returned by XLookupString in preference to
 	the one that appears in the raw X event at any level. This change
 	allows binding to ISO_Level3_Shift-ed characters, composed characters,
@@ -5213,7 +5213,7 @@ a better first place to look now.
 
 2008-01-29  Joe English  <jenglish@users.sourceforge.net>
 
-	* library/treeview.tcl: Fix bug in Shift-ButtonPress-1 binding (error
+	* library/treeview.tcl: Fix bug in Shift-Button-1 binding (error
 	if no current focus item; reported on c.l.t.)
 
 2008-01-29  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
diff --git a/changes b/changes
index 61aff06..b83c642 100644
--- a/changes
+++ b/changes
@@ -333,7 +333,7 @@ same menu.
 4/12/92 (bug fix) Fixed core dump that occurred in tkError.c when
 removing the first error record from the error list.
 
-4/15/92 (bug fix) Fixed bug in tkBind.c that prevented <KeyPress-1>
+4/15/92 (bug fix) Fixed bug in tkBind.c that prevented <Key-1>
 event specifications from being processed correctly:  the "1" was
 treated as a button name rather than a keysym.
 
@@ -3998,7 +3998,7 @@ into account the "-displayof" option.  This problem also existed for the
 command to the Mac.  Also fixed "resource write" when the resource
 was specified by id and already existed. (JI)
 
-9/16/97 (bug fix) Added null bindings to <Command-KeyPress> for the
+9/16/97 (bug fix) Added null bindings to <Command-Key> for the
 text and entry widget on the Macintosh.  This prevents unbound command
 key sequences from having the character echoed to the widget. Also
 fixed Cut & Copy bindings.  (JI) (RJ)
@@ -7527,7 +7527,7 @@ in this changeset (new minor version) rather than bug fixes:
 
 2018-01-07 (bug)[fa8de7] Crash [ttk::checkbutton .x -variable {}] (werner)
 
-2018-01-16 (bug)[382712] Crash in [event generate . <KeyPress>] (werner)
+2018-01-16 (bug)[382712] Crash in [event generate . <Key>] (werner)
 
 2018-01-19 (bug)[657c38] Crash in menu destroy with checkbutton entry (werner)
 
diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c
index 3bdfd00..3dd1403 100644
--- a/generic/tkCanvas.c
+++ b/generic/tkCanvas.c
@@ -852,7 +852,7 @@ CanvasWidgetCmd(
 	"scan",		"select",	"type",		"xview",
 	"yview",	NULL
     };
-    enum options {
+    enum canvasOptionStringsEnum {
 	CANV_ADDTAG,	CANV_BBOX,	CANV_BIND,	CANV_CANVASX,
 	CANV_CANVASY,	CANV_CGET,	CANV_CONFIGURE,	CANV_COORDS,
 	CANV_CREATE,	CANV_DCHARS,	CANV_DELETE,	CANV_DTAG,
@@ -876,7 +876,7 @@ CanvasWidgetCmd(
     Tcl_Preserve(canvasPtr);
 
     result = TCL_OK;
-    switch ((enum options)idx) {
+    switch ((enum canvasOptionStringsEnum)idx) {
     case CANV_ADDTAG:
 	if (objc < 4) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "tag searchCommand ?arg ...?");
diff --git a/generic/tkImgPNG.c b/generic/tkImgPNG.c
index 0e0e59c..c8b2125 100644
--- a/generic/tkImgPNG.c
+++ b/generic/tkImgPNG.c
@@ -2295,7 +2295,7 @@ ParseFormat(
     static const char *const fmtOptions[] = {
 	"-alpha", NULL
     };
-    enum fmtOptions {
+    enum fmtOptionsEnum {
 	OPT_ALPHA
     };
 
@@ -2332,7 +2332,7 @@ ParseFormat(
 	objc--;
 	objv++;
 
-	switch ((enum fmtOptions) optIndex) {
+	switch ((enum fmtOptionsEnum) optIndex) {
 	case OPT_ALPHA:
 	    if (Tcl_GetDoubleFromObj(interp, objv[0],
 		    &pngPtr->alpha) == TCL_ERROR) {
diff --git a/generic/tkImgSVGnano.c b/generic/tkImgSVGnano.c
index c18b181..4cdb648 100644
--- a/generic/tkImgSVGnano.c
+++ b/generic/tkImgSVGnano.c
@@ -336,7 +336,7 @@ ParseSVGWithOptions(
     static const char *const fmtOptions[] = {
         "-dpi", "-scale", "-scaletoheight", "-scaletowidth", NULL
     };
-    enum fmtOptions {
+    enum fmtOptionsEnum {
 	OPT_DPI, OPT_SCALE, OPT_SCALE_TO_HEIGHT, OPT_SCALE_TO_WIDTH
     };
 
@@ -394,7 +394,7 @@ ParseSVGWithOptions(
 	/*
 	 * check that only one scale option is given
 	 */
-	switch ((enum fmtOptions) optIndex) {
+	switch ((enum fmtOptionsEnum)optIndex) {
 	case OPT_SCALE:
 	case OPT_SCALE_TO_HEIGHT:
 	case OPT_SCALE_TO_WIDTH:
@@ -414,7 +414,7 @@ ParseSVGWithOptions(
 	/*
 	 * Decode parameters
 	 */
-	switch ((enum fmtOptions) optIndex) {
+	switch ((enum fmtOptionsEnum) optIndex) {
 	case OPT_DPI:
 	    if (Tcl_GetDoubleFromObj(interp, objv[0], &dpi) == TCL_ERROR) {
 	        goto error;
diff --git a/generic/tkTest.c b/generic/tkTest.c
index 2622c9c..4347600 100644
--- a/generic/tkTest.c
+++ b/generic/tkTest.c
@@ -538,7 +538,7 @@ TestobjconfigObjCmd(
      * "chain2" subcommand:
      */
 
-    typedef struct ExtensionWidgetRecord {
+    typedef struct {
 	TrivialCommandHeader header;
 	Tcl_Obj *base1ObjPtr;
 	Tcl_Obj *base2ObjPtr;
@@ -566,7 +566,7 @@ TestobjconfigObjCmd(
 
     switch (index) {
     case ALL_TYPES: {
-	typedef struct TypesRecord {
+	typedef struct {
 	    TrivialCommandHeader header;
 	    Tcl_Obj *booleanPtr;
 	    Tcl_Obj *integerPtr;
@@ -784,7 +784,7 @@ TestobjconfigObjCmd(
     }
 
     case CONFIG_ERROR: {
-	typedef struct ErrorWidgetRecord {
+	typedef struct {
 	    Tcl_Obj *intPtr;
 	} ErrorWidgetRecord;
 	ErrorWidgetRecord widgetRecord;
@@ -838,7 +838,7 @@ TestobjconfigObjCmd(
 	 * objects.
 	 */
 
-	typedef struct InternalRecord {
+	typedef struct {
 	    TrivialCommandHeader header;
 	    int boolean;
 	    int integer;
@@ -969,7 +969,7 @@ TestobjconfigObjCmd(
     }
 
     case NEW: {
-	typedef struct FiveRecord {
+	typedef struct {
 	    TrivialCommandHeader header;
 	    Tcl_Obj *one;
 	    Tcl_Obj *two;
@@ -1028,7 +1028,7 @@ TestobjconfigObjCmd(
 	break;
     }
     case NOT_ENOUGH_PARAMS: {
-	typedef struct NotEnoughRecord {
+	typedef struct {
 	    Tcl_Obj *fooObjPtr;
 	} NotEnoughRecord;
 	NotEnoughRecord record;
@@ -1058,7 +1058,7 @@ TestobjconfigObjCmd(
     }
 
     case TWO_WINDOWS: {
-	typedef struct ContentRecord {
+	typedef struct {
 	    TrivialCommandHeader header;
 	    Tcl_Obj *windowPtr;
 	} ContentRecord;
diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c
index 8483cbb..3149b15 100644
--- a/macosx/tkMacOSXScrlbr.c
+++ b/macosx/tkMacOSXScrlbr.c
@@ -662,7 +662,7 @@ UpdateControlValues(
  *
  * ScrollbarEvent --
  *
- *	This procedure is invoked in response to <ButtonPress>,
+ *	This procedure is invoked in response to <Button>,
  *      <ButtonRelease>, <EnterNotify>, and <LeaveNotify> events.  The
  *      Scrollbar appearance is modified for each event.
  *
diff --git a/tests/bind.test b/tests/bind.test
index 29f8873..2685946 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -5544,13 +5544,13 @@ test bind-26.6 {event names: ButtonPress} -setup {
     focus -force .t.f
     update
 } -body {
-    bind .t.f <ButtonPress> "set x {event ButtonPress}"
+    bind .t.f <Button> "set x {event Button}"
     set x xyzzy
-    event generate .t.f <ButtonPress>
+    event generate .t.f <Button>
     list $x [bind .t.f]
 } -cleanup {
     destroy .t.f
-} -result {{event ButtonPress} <Button>}
+} -result {{event Button} <Button>}
 
 test bind-26.7 {event names: ButtonRelease} -setup {
     frame .t.f -class Test -width 150 -height 100
@@ -5642,9 +5642,9 @@ test bind-26.13 {event names: KeyPress} -setup {
     focus -force .t.f
     update
 } -body {
-    bind .t.f <KeyPress> "set x {event KeyPress}"
+    bind .t.f <Key> "set x {event KeyPress}"
     set x xyzzy
-    event generate .t.f <KeyPress>
+    event generate .t.f <Key>
     list $x [bind .t.f]
 } -cleanup {
     destroy .t.f
@@ -6767,7 +6767,7 @@ test bind-33.19 {simulate use of the keyboard to trigger a pattern sequence with
     set x {}
 } -body {
     bind .t.f <Escape><Control-c> { lappend x "Esc_Control-c" }
-    bind .t.f <Escape><KeyPress><KeyPress><Control-c> { lappend x "Esc_Key(2)_Control-c" }
+    bind .t.f <Escape><Key><Key><Control-c> { lappend x "Esc_Key(2)_Control-c" }
     event generate .t.f <Escape>
     event generate .t.f <Alt_L>
     event generate .t.f <Control_L>
@@ -6886,7 +6886,7 @@ proc testKey {window event type mods} {
     global keyInfo numericKeysym
     set keyInfo {}
     set numericKeysym {}
-    bind $window <KeyPress> {
+    bind $window <Key> {
 	set keyInfo [format "%K,0x%%X,0x%%X,%A" %N %k]
 	set numericKeysym %N
     }
@@ -6960,8 +6960,8 @@ test bind-35.1 {Key events agree for entry widgets} -constraints {aqua} -setup {
 
 test bind-35.2 {Can bind to function keys} -constraints {aqua} -body {
     global keyInfo numericKeysym
-    bind . <KeyPress> {}
-    bind . <KeyPress> {
+    bind . <Key> {}
+    bind . <Key> {
 	lappend keyInfo %K
 	set numericKeysym %N
     }
@@ -6979,7 +6979,7 @@ test bind-35.3 {Events agree for modifier keys} -constraints {aqua} -setup {
 } -body {
     global keyInfo numericalKeysym
     set result {}
-    bind . <KeyPress> {
+    bind . <Key> {
     	set keyInfo [format "%K,0x%%X,0x%%X,%A" %N %k]
     	set numericalKeysym [format "0x%x" %N]
     }
diff --git a/tests/imgPhoto.test b/tests/imgPhoto.test
index 46daaa2..2e7ca4c 100644
--- a/tests/imgPhoto.test
+++ b/tests/imgPhoto.test
@@ -1338,7 +1338,7 @@ test imgPhoto-4.117 {ImgPhotoCmd data: list colorformat} -setup {
 # This testcase fails with Tcl < 8.6.7, due to [25842c]
 test imgPhoto-4.118 {ImgPhotoCmd data: using data for new image
     results in same image as orignial } -constraints {
-        hasTeapotPhoto hasTranspTeapotPhoto needsTcl867 
+        hasTeapotPhoto hasTranspTeapotPhoto needsTcl867
 } -setup {
     image create photo teapot -file $teapotPhotoFile
     teapot copy teapot -from 50 60 70 80 -shrink
diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c
index e03c50f..40a7b97 100644
--- a/win/tkWinMenu.c
+++ b/win/tkWinMenu.c
@@ -2329,13 +2329,13 @@ TkpInitializeMenuBindings(
 	    "<KeyRelease-Alt_R>", "tk::WinMenuKey %W %N", 0);
 
     (void) Tk_CreateBinding(interp, bindingTable, (ClientData) uid,
-	    "<Alt-KeyPress>", "tk::WinMenuKey %W %N", 0);
+	    "<Alt-Key>", "tk::WinMenuKey %W %N", 0);
 
     (void) Tk_CreateBinding(interp, bindingTable, (ClientData) uid,
 	    "<Alt-KeyRelease>", "tk::WinMenuKey %W %N", 0);
 
     (void) Tk_CreateBinding(interp, bindingTable, (ClientData) uid,
-	    "<KeyPress-F10>", "tk::WinMenuKey %W %N", 0);
+	    "<Key-F10>", "tk::WinMenuKey %W %N", 0);
 
     (void) Tk_CreateBinding(interp, bindingTable, (ClientData) uid,
 	    "<KeyRelease-F10>", "tk::WinMenuKey %W %N", 0);
-- 
cgit v0.12

-- 
cgit v0.12


From f1d0cc318c6049e7a1be191267286e13efcb29dc Mon Sep 17 00:00:00 2001
From: bll <brad.lanam.comp@gmail.com>
Date: Wed, 7 Oct 2020 15:19:49 +0000
Subject: Add missing -insertcolor, -insertwidth styling options.

---
 doc/ttk_combobox.n | 2 ++
 doc/ttk_entry.n    | 2 ++
 doc/ttk_spinbox.n  | 4 ++++
 3 files changed, 8 insertions(+)

diff --git a/doc/ttk_combobox.n b/doc/ttk_combobox.n
index 9d0bcc6..37b91aa 100644
--- a/doc/ttk_combobox.n
+++ b/doc/ttk_combobox.n
@@ -142,6 +142,8 @@ are:
 .RS
 Can only be changed when using non-native and non-graphical themes.
 .RE
+\fB\-insertcolor\fP \fIcolor\fP
+.br
 \fB\-insertwidth\fP \fIamount\fP
 .br
 \fB\-lightcolor\fP \fIcolor\fP
diff --git a/doc/ttk_entry.n b/doc/ttk_entry.n
index 4eb67cc..da183f7 100644
--- a/doc/ttk_entry.n
+++ b/doc/ttk_entry.n
@@ -448,6 +448,8 @@ Some themes use a graphical background and their field background colors cannot
 .RE
 \fB\-foreground\fP \fIcolor\fP
 .br
+\fB\-insertcolor\fP \fIcolor\fP
+.br
 \fB\-insertwidth\fP \fIamount\fP
 .br
 \fB\-lightcolor\fP \fIcolor\fP
diff --git a/doc/ttk_spinbox.n b/doc/ttk_spinbox.n
index 9ae9881..d7b7657 100644
--- a/doc/ttk_spinbox.n
+++ b/doc/ttk_spinbox.n
@@ -107,6 +107,10 @@ value is specified for \fB\-fieldbackground\fP. Otherwise it is ignored.
 .br
 \fB\-foreground\fP \fIcolor\fP
 .br
+\fB\-insertcolor\fP \fIcolor\fP
+.br
+\fB\-insertwidth\fP \fIamount\fP
+.br
 \fB\-lightcolor\fP \fIcolor\fP
 .br
 \fB\-padding\fP \fIpadding\fP
-- 
cgit v0.12


From 6f7e7fc3f5a526eb084d266c4fc931a388e23f06 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Wed, 7 Oct 2020 20:43:07 +0000
Subject: Fix [1fa8c3ed8d]: Aqua crash when a window is resized in a display
 procedure.

---
 macosx/tkMacOSXSubwindows.c  | 4 ++--
 macosx/tkMacOSXWindowEvent.c | 9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index 15081cb..280c041 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -369,7 +369,7 @@ XResizeWindow(
 		r.origin.y += r.size.height - height;
 		r.size.width = width;
 		r.size.height = height;
-		[w setFrame:[w frameRectForContentRect:r] display:YES];
+		[w setFrame:[w frameRectForContentRect:r] display:NO];
 	    }
 	}
     } else {
@@ -426,7 +426,7 @@ XMoveResizeWindow(
 		    X + XOff, TkMacOSXZeroScreenHeight() - Y - YOff - Height,
 	    	    Width, Height);
 
-	    [w setFrame:[w frameRectForContentRect:r] display:YES];
+	    [w setFrame:[w frameRectForContentRect:r] display:NO];
 	}
     } else {
 	MoveResizeWindow(macWin);
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 5a2809c..ae5190f 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -970,6 +970,14 @@ ConfigureRestrictProc(
     TkWindow *winPtr = TkMacOSXGetTkWindow(w);
     Tk_Window tkwin = (Tk_Window)winPtr;
 
+    /*
+     * See ticket [1fa8c3ed8d].  This may not be needed for macOSX 11.
+     */
+
+    if(![NSApp isDrawing]) {
+	return;
+    }
+
     if (![self inLiveResize] &&
 	[w respondsToSelector: @selector (tkLayoutChanged)]) {
 	[(TKWindow *)w tkLayoutChanged];
@@ -1017,7 +1025,6 @@ ConfigureRestrictProc(
 	  */
 
 	[self generateExposeEvents: [self bounds]];
-	[w displayIfNeeded];
 
 	/*
 	 * Finally, unlock the main autoreleasePool.
-- 
cgit v0.12


From 131eca1c29268703370bf339f09c63b0c756f306 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 8 Oct 2020 13:54:16 +0000
Subject: Make everything compile warning-free using -Wundef

---
 generic/nanosvg.h           | 10 +++++-----
 generic/ttk/ttkImage.c      | 10 +++++-----
 macosx/Tk-Common.xcconfig   |  2 +-
 macosx/tkMacOSXMouseEvent.c |  2 +-
 macosx/tkMacOSXNotify.c     |  2 +-
 unix/configure              |  2 +-
 unix/tcl.m4                 |  2 +-
 win/configure               |  2 +-
 win/tcl.m4                  |  2 +-
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/generic/nanosvg.h b/generic/nanosvg.h
index 768dd20..d762f5a 100644
--- a/generic/nanosvg.h
+++ b/generic/nanosvg.h
@@ -86,7 +86,7 @@ extern "C" {
 #endif
 
 // float emulation for MS VC6++ compiler
-#if (_MSC_VER == 1200)
+#if defined(_MSC_VER) && (_MSC_VER == 1200)
 #define tanf(a) (float)tan(a)
 #define cosf(a) (float)cos(a)
 #define sinf(a) (float)sin(a)
@@ -99,7 +99,7 @@ extern "C" {
 #define floorf(a) (float)floor(a)
 #endif
 // float emulation for MS VC8++ compiler
-#if (_MSC_VER == 1400)
+#if defined(_MSC_VER) && (_MSC_VER == 1400)
 #define fabsf(a) (float)fabs(a)
 #endif
 
@@ -1157,7 +1157,7 @@ static double nsvg__atof(const char* s)
 	char* cur = (char*)s;
 	char* end = NULL;
 	double res = 0.0, sign = 1.0;
-#if (_MSC_VER == 1200)
+#if defined(_MSC_VER) && (_MSC_VER == 1200)
 	__int64 intPart = 0, fracPart = 0;
 #else
 	long long intPart = 0, fracPart = 0;
@@ -1175,7 +1175,7 @@ static double nsvg__atof(const char* s)
 	// Parse integer part
 	if (nsvg__isdigit(*cur)) {
 		// Parse digit sequence
-#if (_MSC_VER == 1200)
+#if defined(_MSC_VER) && (_MSC_VER == 1200)
 		intPart = strtol(cur, &end, 10);
 #else
 		intPart = strtoll(cur, &end, 10);
@@ -1192,7 +1192,7 @@ static double nsvg__atof(const char* s)
 		cur++; // Skip '.'
 		if (nsvg__isdigit(*cur)) {
 			// Parse digit sequence
-#if (_MSC_VER == 1200)
+#if defined(_MSC_VER) && (_MSC_VER == 1200)
 			fracPart = strtol(cur, &end, 10);
 #else
 			fracPart = strtoll(cur, &end, 10);
diff --git a/generic/ttk/ttkImage.c b/generic/ttk/ttkImage.c
index e6ad27d..d745b74 100644
--- a/generic/ttk/ttkImage.c
+++ b/generic/ttk/ttkImage.c
@@ -263,7 +263,7 @@ typedef struct {		/* ClientData for image elements */
     Ttk_Padding border;		/* Fixed border region */
     Ttk_Padding padding;	/* Internal padding */
 
-#if TILE_07_COMPAT
+#ifdef TILE_07_COMPAT
     Ttk_ResourceCache cache;	/* Resource cache for images */
     Ttk_StateMap imageMap;	/* State-based lookup table for images */
 #endif
@@ -273,7 +273,7 @@ static void FreeImageData(void *clientData)
 {
     ImageData *imageData = (ImageData *)clientData;
     if (imageData->imageSpec)	{ TtkFreeImageSpec(imageData->imageSpec); }
-#if TILE_07_COMPAT
+#ifdef TILE_07_COMPAT
     if (imageData->imageMap)	{ Tcl_DecrRefCount(imageData->imageMap); }
 #endif
     ckfree(clientData);
@@ -311,7 +311,7 @@ static void ImageElementDraw(
     Ttk_Box src, dst;
     (void)elementRecord;
 
-#if TILE_07_COMPAT
+#ifdef TILE_07_COMPAT
     if (imageData->imageMap) {
 	Tcl_Obj *imageObj = Ttk_StateMapLookup(NULL,imageData->imageMap,state);
 	if (imageObj) {
@@ -383,7 +383,7 @@ Ttk_CreateImageElement(
     imageData->minWidth = imageData->minHeight = -1;
     imageData->sticky = TTK_FILL_BOTH;
     imageData->border = imageData->padding = Ttk_UniformPadding(0);
-#if TILE_07_COMPAT
+#ifdef TILE_07_COMPAT
     imageData->cache = Ttk_GetResourceCache(interp);
     imageData->imageMap = 0;
 #endif
@@ -398,7 +398,7 @@ Ttk_CreateImageElement(
 	    goto error;
 	}
 
-#if TILE_07_COMPAT
+#ifdef TILE_07_COMPAT
 	if (!strcmp("-map", Tcl_GetString(objv[i]))) {
 	    imageData->imageMap = objv[i+1];
 	    Tcl_IncrRefCount(imageData->imageMap);
diff --git a/macosx/Tk-Common.xcconfig b/macosx/Tk-Common.xcconfig
index 0ece048..72ef08a 100644
--- a/macosx/Tk-Common.xcconfig
+++ b/macosx/Tk-Common.xcconfig
@@ -23,7 +23,7 @@ GCC_NO_COMMON_BLOCKS = YES
 GCC_DYNAMIC_NO_PIC = YES
 GCC_VERSION = 4.2
 GCC = gcc-$(GCC_VERSION)
-WARNING_CFLAGS = -Wall -Wextra -Wshadow -Wwrite-strings -Wpointer-arith -Winit-self -Wcast-align -Wdisabled-optimization -Winline $(WARNING_CFLAGS)
+WARNING_CFLAGS = -Wall -Wextra -Wshadow -Wundef -Wwrite-strings -Wpointer-arith -Winit-self -Wcast-align -Wdisabled-optimization -Winline $(WARNING_CFLAGS)
 REZ_RESOURCE_MAP_READ_ONLY = YES
 APPLICATION_INSTALL_PATH = /Applications/Utilities
 BINDIR = $(PREFIX)/bin
diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index d55ca5a..359f164 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -618,7 +618,7 @@ GenerateButtonEvent(
     int dummy;
     TkDisplay *dispPtr;
 
-#if UNUSED
+#ifdef UNUSED
 
     /*
      * ButtonDown events will always occur in the front window. ButtonUp
diff --git a/macosx/tkMacOSXNotify.c b/macosx/tkMacOSXNotify.c
index 3247ade..e169a7d 100644
--- a/macosx/tkMacOSXNotify.c
+++ b/macosx/tkMacOSXNotify.c
@@ -156,7 +156,7 @@ void DebugPrintQueue(void)
      * this block should be removed.
      */
 
-# if MAC_OSX_VERSION_MAX_ALLOWED >= 101500
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101500
     if ([theEvent type] == NSAppKitDefined) {
 	static Bool aWindowIsMoving = NO;
 	switch([theEvent subtype]) {
diff --git a/unix/configure b/unix/configure
index 37a3f64..40bc9db 100755
--- a/unix/configure
+++ b/unix/configure
@@ -4239,7 +4239,7 @@ fi
     if test "$GCC" = yes; then :
 
 	CFLAGS_OPTIMIZE=-O2
-	CFLAGS_WARNING="-Wall -Wextra -Wshadow -Wwrite-strings -Wpointer-arith"
+	CFLAGS_WARNING="-Wall -Wextra -Wshadow -Wundef -Wwrite-strings -Wpointer-arith"
 	case "${CC}" in
 	    *++|*++-*)
 		;;
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 2cad8fd..8ee17e1 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -966,7 +966,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
     CFLAGS_DEBUG=-g
     AS_IF([test "$GCC" = yes], [
 	CFLAGS_OPTIMIZE=-O2
-	CFLAGS_WARNING="-Wall -Wextra -Wshadow -Wwrite-strings -Wpointer-arith"
+	CFLAGS_WARNING="-Wall -Wextra -Wshadow -Wundef -Wwrite-strings -Wpointer-arith"
 	case "${CC}" in
 	    *++|*++-*)
 		;;
diff --git a/win/configure b/win/configure
index c5e4825..f75d08c 100755
--- a/win/configure
+++ b/win/configure
@@ -4256,7 +4256,7 @@ $as_echo "using shared flags" >&6; }
 
 	CFLAGS_DEBUG=-g
 	CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer"
-	CFLAGS_WARNING="-Wall -Wextra -Wshadow -Wwrite-strings -Wpointer-arith"
+	CFLAGS_WARNING="-Wall -Wextra -Wshadow -Wundef -Wwrite-strings -Wpointer-arith"
 	LDFLAGS_DEBUG=
 	LDFLAGS_OPTIMIZE=
 
diff --git a/win/tcl.m4 b/win/tcl.m4
index 989ea76..a8aab6b 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -673,7 +673,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 
 	CFLAGS_DEBUG=-g
 	CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer"
-	CFLAGS_WARNING="-Wall -Wextra -Wshadow -Wwrite-strings -Wpointer-arith"
+	CFLAGS_WARNING="-Wall -Wextra -Wshadow -Wundef -Wwrite-strings -Wpointer-arith"
 	LDFLAGS_DEBUG=
 	LDFLAGS_OPTIMIZE=
 
-- 
cgit v0.12


From c336694fdeda262cf81195e421a91ea40b1101a6 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 8 Oct 2020 13:56:24 +0000
Subject: typo

---
 macosx/tkMacOSXNotify.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/macosx/tkMacOSXNotify.c b/macosx/tkMacOSXNotify.c
index 5163e21..b32c635 100644
--- a/macosx/tkMacOSXNotify.c
+++ b/macosx/tkMacOSXNotify.c
@@ -156,7 +156,7 @@ void DebugPrintQueue(void)
      * this block should be removed.
      */
 
-# if MAC_OSX_VERSION_MAX_ALLOWED >= 101500
+# if MAC_OS_X_VERSION_MAX_ALLOWED >= 101500
     if ([theEvent type] == NSAppKitDefined) {
 	static Bool aWindowIsMoving = NO;
 	switch([theEvent subtype]) {
-- 
cgit v0.12


From 611539b46b3f35feff024c8e9c22b8bf93a025d8 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 8 Oct 2020 14:31:23 +0000
Subject: Fix more warnings related to -Wundef.

---
 generic/tkFont.c     |  4 ++--
 generic/tkTextDisp.c | 50 +++++++++++++++++++++++++-------------------------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/generic/tkFont.c b/generic/tkFont.c
index 79c8d54..2788b2e 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.c
@@ -2332,7 +2332,7 @@ Tk_DrawTextLayout(
 		numDisplayChars = lastChar;
 	    }
 	    lastByte = Tcl_UtfAtIndex(chunkPtr->start, numDisplayChars);
-#if TK_DRAW_IN_CONTEXT
+#ifdef TK_DRAW_IN_CONTEXT
 	    TkpDrawCharsInContext(display, drawable, gc, layoutPtr->tkfont,
 		    chunkPtr->start, chunkPtr->numBytes,
 		    firstByte - chunkPtr->start, lastByte - firstByte,
@@ -2402,7 +2402,7 @@ TkDrawAngledTextLayout(
 		numDisplayChars = lastChar;
 	    }
 	    lastByte = Tcl_UtfAtIndex(chunkPtr->start, numDisplayChars);
-#if TK_DRAW_IN_CONTEXT
+#ifdef TK_DRAW_IN_CONTEXT
 	    dx = cosA * (chunkPtr->x) + sinA * (chunkPtr->y);
 	    dy = -sinA * (chunkPtr->x) + cosA * (chunkPtr->y);
 	    if (angle == 0.0) {
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index b1c5e17..6e96127 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -440,7 +440,7 @@ typedef struct TextDInfo {
  * points to one of the following structures:
  */
 
-#if !TK_LAYOUT_WITH_BASE_CHUNKS
+#if !defined(TK_LAYOUT_WITH_BASE_CHUNKS)
 
 typedef struct CharInfo {
     int numBytes;		/* Number of bytes to display. */
@@ -552,7 +552,7 @@ static void		CharDisplayProc(TkText *textPtr,
 static int		CharMeasureProc(TkTextDispChunk *chunkPtr, int x);
 static void		CharUndisplayProc(TkText *textPtr,
 			    TkTextDispChunk *chunkPtr);
-#if TK_LAYOUT_WITH_BASE_CHUNKS
+#ifdef TK_LAYOUT_WITH_BASE_CHUNKS
 static void		FinalizeBaseChunk(TkTextDispChunk *additionalChunkPtr);
 static void		FreeBaseChunk(TkTextDispChunk *baseChunkPtr);
 static int		IsSameFGStyle(TextStyle *style1, TextStyle *style2);
@@ -1508,7 +1508,7 @@ LayoutDLine(
 		}
 	    }
 
-#if TK_LAYOUT_WITH_BASE_CHUNKS
+#ifdef TK_LAYOUT_WITH_BASE_CHUNKS
 	    if (baseCharChunkPtr != NULL) {
 		int expectedX =
 			((BaseCharInfo *) baseCharChunkPtr->clientData)->width
@@ -1650,7 +1650,7 @@ LayoutDLine(
 
 	chunkPtr = NULL;
     }
-#if TK_LAYOUT_WITH_BASE_CHUNKS
+#ifdef TK_LAYOUT_WITH_BASE_CHUNKS
     FinalizeBaseChunk(NULL);
 #endif /* TK_LAYOUT_WITH_BASE_CHUNKS */
     if (noCharsYet) {
@@ -1709,7 +1709,7 @@ LayoutDLine(
 	    segPtr->typePtr->layoutProc(textPtr, &breakIndex, segPtr,
 		    byteOffset, maxX, breakByteOffset, 0, wrapMode,
 		    breakChunkPtr);
-#if TK_LAYOUT_WITH_BASE_CHUNKS
+#ifdef TK_LAYOUT_WITH_BASE_CHUNKS
 	    FinalizeBaseChunk(NULL);
 #endif /* TK_LAYOUT_WITH_BASE_CHUNKS */
 	}
@@ -7628,7 +7628,7 @@ TkTextCharLayoutProc(
     char *p;
     TkTextSegment *nextPtr;
     Tk_FontMetrics fm;
-#if TK_LAYOUT_WITH_BASE_CHUNKS
+#ifdef TK_LAYOUT_WITH_BASE_CHUNKS
     const char *line;
     int lineOffset;
     BaseCharInfo *bciPtr;
@@ -7653,7 +7653,7 @@ TkTextCharLayoutProc(
     p = segPtr->body.chars + byteOffset;
     tkfont = chunkPtr->stylePtr->sValuePtr->tkfont;
 
-#if TK_LAYOUT_WITH_BASE_CHUNKS
+#ifdef TK_LAYOUT_WITH_BASE_CHUNKS
     if (baseCharChunkPtr == NULL) {
 	baseCharChunkPtr = chunkPtr;
 	bciPtr = ckalloc(sizeof(BaseCharInfo));
@@ -7690,7 +7690,7 @@ TkTextCharLayoutProc(
 	    int ch;
 	    int chLen = TkUtfToUniChar(p, &ch);
 
-#if TK_LAYOUT_WITH_BASE_CHUNKS
+#ifdef TK_LAYOUT_WITH_BASE_CHUNKS
 	    bytesThatFit = CharChunkMeasureChars(chunkPtr, line,
 		    lineOffset+chLen, lineOffset, -1, chunkPtr->x, -1, 0,
 		    &nextX);
@@ -7734,7 +7734,7 @@ TkTextCharLayoutProc(
 	    bytesThatFit++;
 	}
 	if (bytesThatFit == 0) {
-#if TK_LAYOUT_WITH_BASE_CHUNKS
+#ifdef TK_LAYOUT_WITH_BASE_CHUNKS
 	    chunkPtr->clientData = NULL;
 	    if (chunkPtr == baseCharChunkPtr) {
 		baseCharChunkPtr = NULL;
@@ -7767,7 +7767,7 @@ TkTextCharLayoutProc(
     chunkPtr->width = nextX - chunkPtr->x;
     chunkPtr->breakIndex = -1;
 
-#if !TK_LAYOUT_WITH_BASE_CHUNKS
+#if !defined(TK_LAYOUT_WITH_BASE_CHUNKS)
     ciPtr = (CharInfo *)ckalloc(offsetof(CharInfo, chars) + 1 + bytesThatFit);
     chunkPtr->clientData = ciPtr;
     memcpy(ciPtr->chars, p, bytesThatFit);
@@ -7778,7 +7778,7 @@ TkTextCharLayoutProc(
 	ciPtr->numBytes--;
     }
 
-#if TK_LAYOUT_WITH_BASE_CHUNKS
+#ifdef TK_LAYOUT_WITH_BASE_CHUNKS
     /*
      * Final update for the current base chunk data.
      */
@@ -7883,7 +7883,7 @@ CharChunkMeasureChars(
     Tk_Font tkfont = chunkPtr->stylePtr->sValuePtr->tkfont;
     CharInfo *ciPtr = (CharInfo *)chunkPtr->clientData;
 
-#if !TK_LAYOUT_WITH_BASE_CHUNKS
+#if !defined(TK_LAYOUT_WITH_BASE_CHUNKS)
     if (chars == NULL) {
 	chars = ciPtr->chars;
 	charsLen = ciPtr->numBytes;
@@ -7975,7 +7975,7 @@ CharDisplayProc(
     TextStyle *stylePtr;
     StyleValues *sValuePtr;
     int numBytes, offsetBytes, offsetX;
-#if TK_DRAW_IN_CONTEXT
+#ifdef TK_DRAW_IN_CONTEXT
     BaseCharInfo *bciPtr;
 #endif /* TK_DRAW_IN_CONTEXT */
 
@@ -7987,12 +7987,12 @@ CharDisplayProc(
 	return;
     }
 
-#if TK_DRAW_IN_CONTEXT
+#ifdef TK_DRAW_IN_CONTEXT
     bciPtr = ciPtr->baseChunkPtr->clientData;
     numBytes = Tcl_DStringLength(&bciPtr->baseChars);
     string = Tcl_DStringValue(&bciPtr->baseChars);
 
-#elif TK_LAYOUT_WITH_BASE_CHUNKS
+#elif defined(TK_LAYOUT_WITH_BASE_CHUNKS)
     if (ciPtr->baseChunkPtr != chunkPtr) {
 	/*
 	 * Without context drawing only base chunks display their foreground.
@@ -8033,7 +8033,7 @@ CharDisplayProc(
 
     if (!sValuePtr->elide && (numBytes > offsetBytes)
 	    && (stylePtr->fgGC != NULL)) {
-#if TK_DRAW_IN_CONTEXT
+#ifdef TK_DRAW_IN_CONTEXT
 	int start = ciPtr->baseOffset + offsetBytes;
 	int len = ciPtr->numBytes - offsetBytes;
 	int xDisplacement = x - chunkPtr->x;
@@ -8124,7 +8124,7 @@ CharUndisplayProc(
     CharInfo *ciPtr = (CharInfo *)chunkPtr->clientData;
 
     if (ciPtr) {
-#if TK_LAYOUT_WITH_BASE_CHUNKS
+#ifdef TK_LAYOUT_WITH_BASE_CHUNKS
 	if (chunkPtr == ciPtr->baseChunkPtr) {
 	    /*
 	     * Basechunks are undisplayed first, when DLines are freed or
@@ -8706,7 +8706,7 @@ MeasureChars(
 	if ((maxX >= 0) && (curX >= maxX)) {
 	    break;
 	}
-#if TK_DRAW_IN_CONTEXT
+#ifdef TK_DRAW_IN_CONTEXT
 	start += TkpMeasureCharsInContext(tkfont, source, maxBytes,
 		start - source, special - start,
 		maxX >= 0 ? maxX - curX : -1, flags, &width);
@@ -8836,7 +8836,7 @@ TextGetScrollInfoObj(
     return TKTEXT_SCROLL_ERROR;
 }
 
-#if TK_LAYOUT_WITH_BASE_CHUNKS
+#ifdef TK_LAYOUT_WITH_BASE_CHUNKS
 /*
  *----------------------------------------------------------------------
  *
@@ -8867,7 +8867,7 @@ FinalizeBaseChunk(
     const char *baseChars;
     TkTextDispChunk *chunkPtr;
     CharInfo *ciPtr;
-#if TK_DRAW_IN_CONTEXT
+#ifdef TK_DRAW_IN_CONTEXT
     int widthAdjust = 0;
     int newwidth;
 #endif /* TK_DRAW_IN_CONTEXT */
@@ -8881,7 +8881,7 @@ FinalizeBaseChunk(
 
     for (chunkPtr = baseCharChunkPtr; chunkPtr != NULL;
 	    chunkPtr = chunkPtr->nextPtr) {
-#if TK_DRAW_IN_CONTEXT
+#ifdef TK_DRAW_IN_CONTEXT
 	chunkPtr->x += widthAdjust;
 #endif /* TK_DRAW_IN_CONTEXT */
 
@@ -8894,7 +8894,7 @@ FinalizeBaseChunk(
 	}
 	ciPtr->chars = baseChars + ciPtr->baseOffset;
 
-#if TK_DRAW_IN_CONTEXT
+#ifdef TK_DRAW_IN_CONTEXT
 	newwidth = 0;
 	CharChunkMeasureChars(chunkPtr, NULL, 0, 0, -1, 0, -1, 0, &newwidth);
 	if (newwidth < chunkPtr->width) {
@@ -8908,7 +8908,7 @@ FinalizeBaseChunk(
 	ciPtr = addChunkPtr->clientData;
 	ciPtr->chars = baseChars + ciPtr->baseOffset;
 
-#if TK_DRAW_IN_CONTEXT
+#ifdef TK_DRAW_IN_CONTEXT
 	addChunkPtr->x += widthAdjust;
 	CharChunkMeasureChars(addChunkPtr, NULL, 0, 0, -1, 0, -1, 0,
 		&addChunkPtr->width);
@@ -9006,7 +9006,7 @@ IsSameFGStyle(
 	return 1;
     }
 
-#if !TK_DRAW_IN_CONTEXT
+#if !defined(TK_DRAW_IN_CONTEXT)
     if (
 #ifdef MAC_OSX_TK
 	    !TkMacOSXCompareColors(style1->fgGC->foreground,
@@ -9022,7 +9022,7 @@ IsSameFGStyle(
     sv1 = style1->sValuePtr;
     sv2 = style2->sValuePtr;
 
-#if TK_DRAW_IN_CONTEXT
+#ifdef TK_DRAW_IN_CONTEXT
     return sv1->tkfont == sv2->tkfont && sv1->offset == sv2->offset;
 #else
     return sv1->tkfont == sv2->tkfont
-- 
cgit v0.12


From 10bca5a542048ae2e11701980f2997e26ce28433 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 8 Oct 2020 15:22:22 +0000
Subject: Mark all test-cases failing on XQuarz with constraint "failsOnXQuarz"

---
 tests/canvText.test  |  3 ++-
 tests/clipboard.test |  4 +++-
 tests/entry.test     |  3 ++-
 tests/focus.test     |  9 +++++----
 tests/pack.test      |  5 +++--
 tests/place.test     |  5 +++--
 tests/scrollbar.test | 13 +++++++------
 tests/textDisp.test  | 29 +++++++++++++++--------------
 tests/unixEmbed.test |  9 +++++----
 tests/unixFont.test  |  9 +++++----
 tests/unixWm.test    | 13 +++++++------
 tests/winfo.test     |  3 ++-
 tests/wm.test        |  9 +++++----
 13 files changed, 64 insertions(+), 50 deletions(-)

diff --git a/tests/canvText.test b/tests/canvText.test
index 5ac088d..c0b9075 100644
--- a/tests/canvText.test
+++ b/tests/canvText.test
@@ -12,6 +12,7 @@ eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
 testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" || [tk windowingsystem] ne "x11" }]
 
 # Canvas used in 1.* - 17.* tests
 canvas .c -width 400 -height 300 -bd 2 -relief sunken
@@ -942,7 +943,7 @@ test canvText-19.1 {patch 1006286, leading space caused wrap under Win32} -setup
     destroy .c
 } -result {{Yeah } Yeah- 4 4}
 
-test canvText-20.1 {angled text bounding box} -constraints failsOnUbuntu -setup {
+test canvText-20.1 {angled text bounding box} -constraints {failsOnUbuntu failsOnXQuarz} -setup {
     destroy .c
     canvas .c
     proc transpose {bbox} {
diff --git a/tests/clipboard.test b/tests/clipboard.test
index 81534d5..7c1a506 100644
--- a/tests/clipboard.test
+++ b/tests/clipboard.test
@@ -21,6 +21,8 @@ namespace import ::tcltest::*
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
+testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" || [tk windowingsystem] ne "x11" }]
+
 # set up a very large buffer to test INCR retrievals
 set longValue ""
 foreach i {a b c d e f g j h i j k l m o p q r s t u v w x y z} {
@@ -233,7 +235,7 @@ test clipboard-6.1 {Tk_ClipboardAppend procedure} -setup {
 } -cleanup {
     clipboard clear
 }  -returnCodes ok -result {first chunk second chunk}
-test clipboard-6.2 {Tk_ClipboardAppend procedure} -constraints x11 -setup {
+test clipboard-6.2 {Tk_ClipboardAppend procedure} -constraints {x11 failsOnXQuarz} -setup {
     clipboard clear
 } -body {
     setupbg
diff --git a/tests/entry.test b/tests/entry.test
index 4463b9b..a557e91 100644
--- a/tests/entry.test
+++ b/tests/entry.test
@@ -13,6 +13,7 @@ tcltest::loadTestedCommands
 
 testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
 testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || (![catch {tk::pkgconfig get fontsystem} fs] && ($fs eq "xft"))}]
+testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" || [tk windowingsystem] ne "x11" }]
 
 # For xscrollcommand
 set scrollInfo {}
@@ -1687,7 +1688,7 @@ test entry-5.7 {ConfigureEntry procedure} -setup {
 
 
 test entry-5.8 {ConfigureEntry procedure} -constraints {
-    fonts
+    fonts failsOnXQuarz
 } -setup {
     entry .e -borderwidth 2 -highlightthickness 2
     pack .e
diff --git a/tests/focus.test b/tests/focus.test
index 2760255..3bdf778 100644
--- a/tests/focus.test
+++ b/tests/focus.test
@@ -12,6 +12,7 @@ tcltest::loadTestedCommands
 namespace import -force tcltest::test
 
 testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" || [tk windowingsystem] ne "x11" }]
 
 proc focusSetup {} {
     destroy .t
@@ -310,7 +311,7 @@ in .t.b1 NotifyNonlinear
 } .t.b1}
 
 test focus-2.6 {TkFocusFilterEvent procedure, FocusIn events} -constraints {
-    unix  testwrapper failsOnUbuntu
+    unix  testwrapper failsOnUbuntu failsOnXQuarz
 } -body {
     focus .t.b1
     focus .
@@ -322,7 +323,7 @@ test focus-2.6 {TkFocusFilterEvent procedure, FocusIn events} -constraints {
     list $x $focusInfo
 } -result {.t.b1 {press .t.b1 x}}
 test focus-2.7 {TkFocusFilterEvent procedure, FocusOut events} -constraints {
-    unix  testwrapper failsOnUbuntu
+    unix  testwrapper failsOnUbuntu failsOnXQuarz
 } -body {
     set result {}
     foreach detail {NotifyAncestor NotifyInferior NotifyNonlinear
@@ -343,7 +344,7 @@ test focus-2.8 {TkFocusFilterEvent procedure, FocusOut events} -constraints {
     focus
 } -result {.t.b1}
 test focus-2.9 {TkFocusFilterEvent procedure, FocusOut events} -constraints {
-    unix  testwrapper failsOnUbuntu
+    unix  testwrapper failsOnUbuntu failsOnXQuarz
 } -body {
     focus .t.b1
     event gen [testwrapper .] <FocusOut> -detail NotifyAncestor
@@ -601,7 +602,7 @@ cleanupbg
 
 # Test 5.1 fails (before and after update)
 test focus-5.1 {ChangeXFocus procedure, don't take focus unless have it} -constraints {
-    unix testwrapper secureserver failsOnUbuntu
+    unix testwrapper secureserver failsOnUbuntu failsOnXQuarz
 } -body {
     setupbg
     focusSetup
diff --git a/tests/pack.test b/tests/pack.test
index 9fd8035..1f40083 100644
--- a/tests/pack.test
+++ b/tests/pack.test
@@ -12,6 +12,7 @@ tcltest::loadTestedCommands
 namespace import -force tcltest::test
 
 testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" || [tk windowingsystem] ne "x11" }]
 
 # Create some test windows.
 
@@ -1560,7 +1561,7 @@ if {[tk windowingsystem] == "win32"} {
 }
 
 test pack-18.1 {unmap content when container unmapped} -constraints {
-    tempNotPc failsOnUbuntu
+    tempNotPc failsOnUbuntu failsOnXQuarz
 } -setup {
     eval destroy [winfo child .pack]
 } -body {
@@ -1591,7 +1592,7 @@ test pack-18.1 {unmap content when container unmapped} -constraints {
     lappend result [winfo ismapped .pack.a]
 } -result {1 0 200 75 0 1}
 
-test pack-18.2 {unmap content when container unmapped} -constraints failsOnUbuntu -setup {
+test pack-18.2 {unmap content when container unmapped} -constraints {failsOnUbuntu failsOnXQuarz} -setup {
     eval destroy [winfo child .pack]
 } -body {
 
diff --git a/tests/place.test b/tests/place.test
index 840ffca..9408b72 100644
--- a/tests/place.test
+++ b/tests/place.test
@@ -14,6 +14,7 @@ tcltest::loadTestedCommands
 testConstraint memory [llength [info commands memory]]
 
 testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" || [tk windowingsystem] ne "x11" }]
 
 # XXX - This test file is woefully incomplete.  At present, only a
 # few of the features are tested.
@@ -269,7 +270,7 @@ if {[tk windowingsystem] == "win32"} {
     }
 }
 
-test place-8.1 {PlaceStructureProc, mapping and unmapping content} -constraints failsOnUbuntu -setup {
+test place-8.1 {PlaceStructureProc, mapping and unmapping content} -constraints {failsOnUbuntu failsOnXQuarz} -setup {
     place forget .t.f2
     place forget .t.f
 } -body {
@@ -285,7 +286,7 @@ test place-8.1 {PlaceStructureProc, mapping and unmapping content} -constraints
     placeUpdate
     lappend result [winfo ismapped .t.f2]
 } -result {1 0 40 30 0 1}
-test place-8.2 {PlaceStructureProc, mapping and unmapping content} -constraints failsOnUbuntu -setup {
+test place-8.2 {PlaceStructureProc, mapping and unmapping content} -constraints {failsOnUbuntu failsOnXQuarz} -setup {
     place forget .t.f2
     place forget .t.f
     update idletasks
diff --git a/tests/scrollbar.test b/tests/scrollbar.test
index 4963cf8..62d15c8 100644
--- a/tests/scrollbar.test
+++ b/tests/scrollbar.test
@@ -12,6 +12,7 @@ eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
 testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" || [tk windowingsystem] ne "x11" }]
 
 proc scroll args {
     global scrollInfo
@@ -272,13 +273,13 @@ test scrollbar-3.35 {ScrollbarWidgetCmd procedure, "fraction" option} {
     format {%.6g} [.s fraction 4 21]
 } [format %.6g [expr {(21.0 - ([winfo height .s] - [getTroughSize .s])/2.0) \
        /([getTroughSize .s] - 1)}]]
-test scrollbar-3.36 {ScrollbarWidgetCmd procedure, "fraction" option} {x11 failsOnUbuntu} {
+test scrollbar-3.36 {ScrollbarWidgetCmd procedure, "fraction" option} {x11 failsOnUbuntu failsOnXQuarz} {
     format {%.6g} [.s fraction 4 179]
 } {1}
 test scrollbar-3.37 {ScrollbarWidgetCmd procedure, "fraction" option} {testmetrics} {
     format {%.6g} [.s fraction 4 [expr {200 - [testmetrics cyvscroll .s]}]]
 } {1}
-test scrollbar-3.38 {ScrollbarWidgetCmd procedure, "fraction" option} {x11 failsOnUbuntu} {
+test scrollbar-3.38 {ScrollbarWidgetCmd procedure, "fraction" option} {x11 failsOnUbuntu failsOnXQuarz} {
     format {%.6g} [.s fraction 4 178]
 } {0.993711}
 test scrollbar-3.39 {ScrollbarWidgetCmd procedure, "fraction" option} {testmetrics win} {
@@ -493,7 +494,7 @@ test scrollbar-6.11.2 {ScrollbarPosition procedure} aqua {
     # macOS scrollbars have no arrows nowadays
     .s identify 8 4
 } {trough1}
-test scrollbar-6.12.1 {ScrollbarPosition procedure} {x11 failsOnUbuntu} {
+test scrollbar-6.12.1 {ScrollbarPosition procedure} {x11 failsOnUbuntu failsOnXQuarz} {
     .s identify 8 19
 } {arrow1}
 test scrollbar-6.12.2 {ScrollbarPosition procedure} aqua {
@@ -551,7 +552,7 @@ test scrollbar-6.28 {ScrollbarPosition procedure} {testmetrics win} {
     .s identify [expr {[winfo width .s] / 2}] [expr {[winfo height .s]
 						 - [testmetrics cyvscroll .s] - 1}]
 } {trough2}
-test scrollbar-6.29.1 {ScrollbarPosition procedure} {x11 failsOnUbuntu} {
+test scrollbar-6.29.1 {ScrollbarPosition procedure} {x11 failsOnUbuntu failsOnXQuarz} {
     .s identify 8 180
 } {arrow2}
 test scrollbar-6.29.2 {ScrollbarPosition procedure} aqua {
@@ -575,7 +576,7 @@ test scrollbar-6.33 {ScrollbarPosition procedure} win {
 test scrollbar-6.34 {ScrollbarPosition procedure} unix {
     .s identify 4 100
 } {trough2}
-test scrollbar-6.35 {ScrollbarPosition procedure} {unix failsOnUbuntu} {
+test scrollbar-6.35 {ScrollbarPosition procedure} {unix failsOnUbuntu failsOnXQuarz} {
     .s identify 18 100
 } {trough2}
 test scrollbar-6.37 {ScrollbarPosition procedure} win {
@@ -614,7 +615,7 @@ test scrollbar-6.43 {ScrollbarPosition procedure} {testmetrics win} {
     .t.s identify [expr {int(.4 / [.t.s delta 1 0]) + [testmetrics cxhscroll .t.s]
 		       - 1}] [expr {[winfo height .t.s] / 2}]
 } {slider}
-test scrollbar-6.44 {ScrollbarPosition procedure} {unix failsOnUbuntu} {
+test scrollbar-6.44 {ScrollbarPosition procedure} {unix failsOnUbuntu failsOnXQuarz} {
     .t.s identify 100 18
 } {trough2}
 test scrollbar-6.46 {ScrollbarPosition procedure} win {
diff --git a/tests/textDisp.test b/tests/textDisp.test
index 39d50d0..f64dd88 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -12,6 +12,7 @@ tcltest::loadTestedCommands
 namespace import -force tcltest::test
 
 testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" || [tk windowingsystem] ne "x11" }]
 
 # Platform specific procedure for updating the text widget.
 
@@ -665,7 +666,7 @@ test textDisp-4.7 {UpdateDisplayInfo, filling in extra vertical space} {
     updateText
     set x
 } {8.0 {16.0 17.0 15.0 14.0 13.0 12.0 11.0 10.0 9.0 8.0} {8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0}}
-test textDisp-4.8 {UpdateDisplayInfo, filling in extra vertical space} {
+test textDisp-4.8 {UpdateDisplayInfo, filling in extra vertical space} failsOnXQuarz {
     .t delete 1.0 end
     .t insert end "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17"
     .t yview 16.0
@@ -728,7 +729,7 @@ test textDisp-4.13 {UpdateDisplayInfo, special handling for top/bottom lines} {
     updateText
     list $tk_textRelayout $tk_textRedraw
 } {{11.0 12.0 13.0} {4.0 10.0 11.0 12.0 13.0}}
-test textDisp-4.14 {UpdateDisplayInfo, special handling for top/bottom lines} {
+test textDisp-4.14 {UpdateDisplayInfo, special handling for top/bottom lines} failsOnXQuarz {
     .t tag remove x 1.0 end
     .t yview 1.0
     updateText
@@ -861,7 +862,7 @@ test textDisp-5.2 {DisplayDLine, line resizes during display} {
 } [list 30 30]
 
 .t configure -wrap char
-test textDisp-6.1 {scrolling in DisplayText, scroll up} {
+test textDisp-6.1 {scrolling in DisplayText, scroll up} failsOnXQuarz {
     .t delete 1.0 end
     .t insert 1.0 "Line 1"
     foreach i {2 3 4 5 6 7 8 9 10 11 12 13 14 15} {
@@ -1149,7 +1150,7 @@ test textDisp-8.6 {TkTextChanged} {
     updateText
     list $tk_textRelayout $tk_textRedraw
 } {{1.0 1.20 1.40} {1.0 1.20 1.40}}
-test textDisp-8.7 {TkTextChanged} {
+test textDisp-8.7 {TkTextChanged} failsOnXQuarz {
     .t delete 1.0 end
     .t insert 1.0 "Line 1 is so long that it wraps around, two times"
     foreach i {2 3 4 5 6 7 8 9 10 11 12 13 14 15} {
@@ -1171,7 +1172,7 @@ test textDisp-8.8 {TkTextChanged} {
     updateText
     list $tk_textRelayout $tk_textRedraw
 } {2.0 2.0}
-test textDisp-8.9 {TkTextChanged} {
+test textDisp-8.9 {TkTextChanged} failsOnXQuarz {
     .t delete 1.0 end
     .t insert 1.0 "Line 1 is so long that it wraps around, two times"
     foreach i {2 3 4 5 6 7 8 9 10 11 12 13 14 15} {
@@ -1282,7 +1283,7 @@ test textDisp-9.4 {TkTextRedrawTag} failsOnUbuntu {
     updateText
     list $tk_textRelayout $tk_textRedraw
 } {{2.0 2.20} {2.0 2.20 eof}}
-test textDisp-9.5 {TkTextRedrawTag} failsOnUbuntu {
+test textDisp-9.5 {TkTextRedrawTag} {failsOnUbuntu failsOnXQuarz} {
     .t configure -wrap char
     .t delete 1.0 end
     .t insert 1.0 "Line 1\nLine 2 is long enough to wrap around\nLine 3\nLine 4"
@@ -1444,7 +1445,7 @@ test textDisp-11.1 {TkTextSetYView} {
     updateText
     .t index @0,0
 } {30.0}
-test textDisp-11.2 {TkTextSetYView} {
+test textDisp-11.2 {TkTextSetYView} failsOnXQuarz {
     .t yview 30.0
     updateText
     .t yview 32.0
@@ -1458,7 +1459,7 @@ test textDisp-11.3 {TkTextSetYView} {
     updateText
     list [.t index @0,0] $tk_textRedraw
 } {28.0 {28.0 29.0}}
-test textDisp-11.4 {TkTextSetYView} {
+test textDisp-11.4 {TkTextSetYView} failsOnXQuarz {
     .t yview 30.0
     updateText
     .t yview 31.4
@@ -1489,7 +1490,7 @@ test textDisp-11.7 {TkTextSetYView} {
     updateText
     list [.t index @0,0] $tk_textRedraw
 } {21.0 {21.0 22.0 23.0 24.0 25.0 26.0 27.0 28.0 29.0}}
-test textDisp-11.8 {TkTextSetYView} {
+test textDisp-11.8 {TkTextSetYView} failsOnXQuarz {
     .t yview 30.0
     updateText
     set tk_textRedraw {}
@@ -1497,7 +1498,7 @@ test textDisp-11.8 {TkTextSetYView} {
     updateText
     list [.t index @0,0] $tk_textRedraw
 } {32.0 {40.0 41.0}}
-test textDisp-11.9 {TkTextSetYView} {
+test textDisp-11.9 {TkTextSetYView} failsOnXQuarz {
     .t yview 30.0
     updateText
     set tk_textRedraw {}
@@ -1521,7 +1522,7 @@ test textDisp-11.11 {TkTextSetYView} {
     updateText
     list [.t index @0,0] $tk_textRedraw
 } {191.0 {191.0 192.0 193.0 194.0 195.0 196.0}}
-test textDisp-11.12 {TkTextSetYView, wrapped line is off-screen} {
+test textDisp-11.12 {TkTextSetYView, wrapped line is off-screen} failsOnXQuarz {
     .t insert 10.0 "Long line with enough text to wrap\n"
     .t yview 1.0
     updateText
@@ -2863,7 +2864,7 @@ test textDisp-19.16 {count -ypixels} {
       [.t count -ypixels 16.0 "16.0 displaylineend +1c"] \
       [.t count -ypixels "16.0 +1 displaylines" "16.0 +4 displaylines +3c"]
 } [list [expr {260 + 20 * $fixedDiff}] [expr {260 + 20 * $fixedDiff}] $fixedHeight [expr {2*$fixedHeight}] $fixedHeight [expr {3*$fixedHeight}]]
-test textDisp-19.17 {count -ypixels with indices in elided lines} failsOnUbuntu {
+test textDisp-19.17 {count -ypixels with indices in elided lines} {failsOnUbuntu failsOnXQuarz} {
     .t configure -wrap none
     .t delete 1.0 end
     for {set i 1} {$i < 100} {incr i} {
@@ -2890,7 +2891,7 @@ test textDisp-19.17 {count -ypixels with indices in elided lines} failsOnUbuntu
     .t yview 35.0
     lappend res [.t count -ypixels 5.0 25.0]
 } [list [expr {4 * $fixedHeight}] [expr {3 * $fixedHeight}] 0 0 0 0 0 0 [expr {5 * $fixedHeight}] [expr {- 5 * $fixedHeight}] [expr {2 * $fixedHeight}] [expr {3 * $fixedHeight}] [expr {5 * $fixedHeight}]]
-test textDisp-19.18 {count -ypixels with indices in elided lines} failsOnUbuntu {
+test textDisp-19.18 {count -ypixels with indices in elided lines} {failsOnUbuntu failsOnXQuarz} {
     .t configure -wrap none
     .t delete 1.0 end
     for {set i 1} {$i < 100} {incr i} {
@@ -3407,7 +3408,7 @@ test textDisp-24.24 {TkTextCharLayoutProc, justification and tabs} {textfonts} {
     .t tag add x 1.0 end
     list [.t bbox 1.0] [.t bbox 1.10]
 } [list [list 45 3 7 $fixedHeight] [list 94 3 7 $fixedHeight]]
-test textDisp-24.25 {TkTextCharLayoutProc, justification and tabs} -constraints {textfonts} -setup {
+test textDisp-24.25 {TkTextCharLayoutProc, justification and tabs} -constraints {textfonts failsOnXQuarz} -setup {
     text .tt -tabs {40 right} -wrap none -font $fixedFont
     pack .tt
 } -body {
diff --git a/tests/unixEmbed.test b/tests/unixEmbed.test
index 578075e..f859150 100644
--- a/tests/unixEmbed.test
+++ b/tests/unixEmbed.test
@@ -12,6 +12,7 @@ tcltest::loadTestedCommands
 namespace import -force tcltest::test
 
 testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" || [tk windowingsystem] ne "x11" }]
 
 namespace eval ::_test_tmp {}
 
@@ -990,7 +991,7 @@ test unixEmbed-7.1 {TkpRedirectKeyEvent procedure, forward keystroke} -constrain
 # TkpRedirectKeyEvent is not implemented in win or aqua.  If someone
 # implements it they should change the constraints for this test.
 test unixEmbed-7.1a {TkpRedirectKeyEvent procedure, forward keystroke} -constraints {
-    unix notAqua
+    unix notAqua failsOnXQuarz
 } -setup {
     deleteWindows
     catch {interp delete child}
@@ -1088,7 +1089,7 @@ test unixEmbed-7.2a {TkpRedirectKeyEvent procedure, don't forward keystroke widt
 } -result {{} {{key b}}}
 
 test unixEmbed-8.1 {TkpClaimFocus procedure} -constraints {
-    unix notAqua failsOnUbuntu
+    unix notAqua failsOnUbuntu failsOnXQuarz
 } -setup {
 	deleteWindows
 } -body {
@@ -1235,7 +1236,7 @@ test unixEmbed-9.2a {EmbedWindowDeleted procedure, check embeddedPtr} -constrain
 
 
 test unixEmbed-10.1 {geometry propagation in tkUnixWm.c/UpdateGeometryInfo} -constraints {
-    unix failsOnUbuntu
+    unix failsOnUbuntu failsOnXQuarz
 } -setup {
     deleteWindows
 } -body {
@@ -1251,7 +1252,7 @@ test unixEmbed-10.1 {geometry propagation in tkUnixWm.c/UpdateGeometryInfo} -con
 	deleteWindows
 } -result {150x80+0+0}
 test unixEmbed-10.2 {geometry propagation in tkUnixWm.c/UpdateGeometryInfo} -constraints {
-    unix failsOnUbuntu
+    unix failsOnUbuntu failsOnXQuarz
 } -setup {
     deleteWindows
 } -body {
diff --git a/tests/unixFont.test b/tests/unixFont.test
index 86fb5bf..ee9eb02 100644
--- a/tests/unixFont.test
+++ b/tests/unixFont.test
@@ -18,6 +18,7 @@ tcltest::loadTestedCommands
 
 testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
 testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || (![catch {tk::pkgconfig get fontsystem} fs] && ($fs eq "xft"))}]
+testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" || [tk windowingsystem] ne "x11" }]
 
 if {[tk windowingsystem] eq "x11"} {
     set xlsf [auto_execok xlsfonts]
@@ -256,7 +257,7 @@ test unixfont-8.3 {AllocFont procedure: can't parse info from name} x11 {
     catch {unset fontArray}
     set result
 } {-family -overstrike -size -slant -underline -weight}
-test unixfont-8.4 {AllocFont procedure: classify characters} {x11 failsOnUbuntu} {
+test unixfont-8.4 {AllocFont procedure: classify characters} {x11 failsOnUbuntu failsOnXQuarz} {
     set x 0
     incr x [font measure $courier "\u4000"]   ;# 6
     incr x [font measure $courier "\002"]   ;# 4
@@ -267,7 +268,7 @@ test unixfont-8.4 {AllocFont procedure: classify characters} {x11 failsOnUbuntu}
 test unixfont-8.5 {AllocFont procedure: setup widths of normal chars} x11 {
     font metrics $courier -fixed
 } {1}
-test unixfont-8.6 {AllocFont procedure: setup widths of special chars} {x11 failsOnUbuntu} {
+test unixfont-8.6 {AllocFont procedure: setup widths of special chars} {x11 failsOnUbuntu failsOnXQuarz} {
     set x 0
     incr x [font measure $courier "\001"]   ;# 4
     incr x [font measure $courier "\002"]   ;# 4
@@ -295,7 +296,7 @@ test unixfont-8.11 {AllocFont procedure: XA_UNDERLINE_POSITION was 0} x11 {
     set x {}
 } {}
 
-test unixfont-9.1 {GetControlCharSubst procedure: 2 chars subst} {x11 failsOnUbuntu} {
+test unixfont-9.1 {GetControlCharSubst procedure: 2 chars subst} {x11 failsOnUbuntu failsOnXQuarz} {
     .b.c dchars $t 0 end
     .b.c insert $t 0 "0\a0"
     set x {}
@@ -304,7 +305,7 @@ test unixfont-9.1 {GetControlCharSubst procedure: 2 chars subst} {x11 failsOnUbu
     lappend x [.b.c index $t @[expr $ax*2],0]
     lappend x [.b.c index $t @[expr $ax*3],0]
 } {0 1 1 2}
-test unixfont-9.2 {GetControlCharSubst procedure: 4 chars subst} {x11 failsOnUbuntu} {
+test unixfont-9.2 {GetControlCharSubst procedure: 4 chars subst} {x11 failsOnUbuntu failsOnXQuarz} {
     .b.c dchars $t 0 end
     .b.c insert $t 0 "0\0010"
     set x {}
diff --git a/tests/unixWm.test b/tests/unixWm.test
index bdca89b..47b65fd 100644
--- a/tests/unixWm.test
+++ b/tests/unixWm.test
@@ -14,6 +14,7 @@ tcltest::loadTestedCommands
 namespace import -force ::tk::test:loadTkCommand
 
 testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" || [tk windowingsystem] ne "x11" }]
 
 proc sleep ms {
     global x
@@ -1552,7 +1553,7 @@ test unixWm-44.6 {UpdateGeometryInfo procedure, negative height} unix {
 } {100 1}
 destroy .t
 toplevel .t -width 80 -height 60
-test unixWm-44.7 {UpdateGeometryInfo procedure, computing position} unix {
+test unixWm-44.7 {UpdateGeometryInfo procedure, computing position} {unix failsOnXQuarz} {
     tkwait visibility .t
     wm overrideredirect .t 1
     update
@@ -1562,7 +1563,7 @@ test unixWm-44.7 {UpdateGeometryInfo procedure, computing position} unix {
 } [list 5 [expr [winfo screenheight .t] - 70]]
 destroy .t
 toplevel .t -width 80 -height 60
-test unixWm-44.8 {UpdateGeometryInfo procedure, computing position} unix {
+test unixWm-44.8 {UpdateGeometryInfo procedure, computing position} {unix failsOnXQuarz} {
     tkwait visibility .t
     wm overrideredirect .t 1
     update
@@ -1612,7 +1613,7 @@ test unixWm-45.1 {UpdateSizeHints procedure, grid information} {unix testwrapper
 	    [expr [lindex $property 7]] [expr [lindex $property 8]] \
 	    [expr [lindex $property 9]] [expr [lindex $property 10]]
 } {40 30 320 210 10 5}
-test unixWm-45.2 {UpdateSizeHints procedure} {unix testwrapper failsOnUbuntu} {
+test unixWm-45.2 {UpdateSizeHints procedure} {unix testwrapper failsOnUbuntu failsOnXQuarz} {
     destroy .t
     toplevel .t -width 80 -height 60
     wm minsize .t 30 40
@@ -1640,7 +1641,7 @@ test unixWm-45.3 {UpdateSizeHints procedure, grid with menu} {testmenubar testwr
 	    [expr [lindex $property 7]] [expr [lindex $property 8]] \
 	    [expr [lindex $property 9]] [expr [lindex $property 10]]
 } {60 40 53 320 233 10 5}
-test unixWm-45.4 {UpdateSizeHints procedure, not resizable with menu} {testmenubar testwrapper failsOnUbuntu} {
+test unixWm-45.4 {UpdateSizeHints procedure, not resizable with menu} {testmenubar testwrapper failsOnUbuntu failsOnXQuarz} {
     destroy .t
     toplevel .t -width 80 -height 60
     frame .t.menu -height 23 -width 50
@@ -1794,7 +1795,7 @@ if {[tk windowingsystem] == "aqua"} {
     # Windows are assumed to have a border (invisible in Gnome 3).
     set result_50_1 {{} {} .t {} .t2 {} .t2 {} .t}
 }
-test unixWm-50.1 {Tk_CoordsToWindow procedure, finding a toplevel, x-coords, title bar} {unix failsOnUbuntu} {
+test unixWm-50.1 {Tk_CoordsToWindow procedure, finding a toplevel, x-coords, title bar} {unix failsOnUbuntu failsOnXQuarz} {
     update
     toplevel .t -width 300 -height 400 -bg green
     wm geom .t +100+100
@@ -2051,7 +2052,7 @@ test unixWm-51.6 {TkWmRestackToplevel procedure, window to be stacked isn't mapp
     wm geometry .t2 +0+0
     winfo containing 100 100
 } {.t}
-test unixWm-51.7 {TkWmRestackToplevel procedure, other window isn't mapped} unix {
+test unixWm-51.7 {TkWmRestackToplevel procedure, other window isn't mapped} {unix failsOnXQuarz} {
     foreach w {.t .t2 .t3} {
 	destroy $w
 	update
diff --git a/tests/winfo.test b/tests/winfo.test
index 51be80d..b50c70a 100644
--- a/tests/winfo.test
+++ b/tests/winfo.test
@@ -12,6 +12,7 @@ tcltest::configure {*}$argv
 tcltest::loadTestedCommands
 
 testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" || [tk windowingsystem] ne "x11" }]
 
 # eatColors --
 # Creates a toplevel window and allocates enough colors in it to
@@ -322,7 +323,7 @@ test winfo-9.6 {"winfo viewable" command} -setup {
 } -cleanup {
     deleteWindows
 } -result {0 0}
-test winfo-9.7 {"winfo viewable" command} -constraints failsOnUbuntu -setup {
+test winfo-9.7 {"winfo viewable" command} -constraints {failsOnUbuntu failsOnXQuarz} -setup {
     deleteWindows
 } -body {
     frame .f1 -width 100 -height 100 -relief raised -bd 2
diff --git a/tests/wm.test b/tests/wm.test
index 1bf56da..08c7943 100644
--- a/tests/wm.test
+++ b/tests/wm.test
@@ -28,6 +28,7 @@ proc stdWindow {} {
 }
 
 testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
+testConstraint failsOnXQuarz [expr {$tcl_platform(os) ne "Darwin" || [tk windowingsystem] ne "x11" }]
 
 # [raise] and [lower] may return before the window manager has completed the
 # operation. The raiseDelay procedure idles for a while to give the operation
@@ -1527,7 +1528,7 @@ test wm-stackorder-5.1 {a menu is not a toplevel} -body {
     destroy .t
 } -result {.t .}
 test wm-stackorder-5.2 {A normal toplevel can't be raised above an \
-    overrideredirect toplevel on unix} -constraints {x11 failsOnUbuntu} -body {
+    overrideredirect toplevel on unix} -constraints {x11 failsOnUbuntu failsOnXQuarz} -body {
     toplevel .t
     tkwait visibility .t
     wm overrideredirect .t 1
@@ -1551,7 +1552,7 @@ test wm-stackorder-5.2.1 {A normal toplevel can be raised above an \
     destroy .t
 } -result 1
 test wm-stackorder-5.3 {An overrideredirect window\
-        can be explicitly lowered} -body {
+        can be explicitly lowered} -constraints failsOnXQuarz -body {
     toplevel .t
     tkwait visibility .t
     wm overrideredirect .t 1
@@ -1726,7 +1727,7 @@ test wm-transient-3.3 {withdraw/deiconify on the toplevel
 } -result {withdrawn 0 normal 1}
 
 test wm-transient-4.1 {transient toplevel is withdrawn
-        when mapped if toplevel is iconic} -constraints failsOnUbuntu -body {
+        when mapped if toplevel is iconic} -constraints {failsOnUbuntu failsOnXQuarz} -body {
     toplevel .top
     wm iconify .top
     update
@@ -1928,7 +1929,7 @@ test wm-transient-7.5 {Reassign transient, destroy transient} -body {
     deleteWindows
 }
 
-test wm-transient-8.1 {transient to withdrawn window, Bug 1163496} -constraints failsOnUbuntu -setup {
+test wm-transient-8.1 {transient to withdrawn window, Bug 1163496} -constraints {failsOnUbuntu failsOnXQuarz} -setup {
     deleteWindows
     set result {}
 } -body {
-- 
cgit v0.12


From b65c340a10683ce423ea0d8c63b1c2af9065757f Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 8 Oct 2020 16:55:40 +0000
Subject: A few NULL <-> None mistakes, more usage of TCL_UNUSED and implicit
 type-casts

---
 unix/tkUnixFont.c  | 83 ++++++++++++++++++++++++++----------------------------
 unix/tkUnixRFont.c | 20 ++++++-------
 2 files changed, 50 insertions(+), 53 deletions(-)

diff --git a/unix/tkUnixFont.c b/unix/tkUnixFont.c
index 234b282..bd83a5e 100644
--- a/unix/tkUnixFont.c
+++ b/unix/tkUnixFont.c
@@ -17,8 +17,8 @@
  * The preferred font encodings.
  */
 
-static const char *const encodingList[] = {
-    "iso8859-1", "jis0208", "jis0212", NULL
+static const char encodingList[][10] = {
+    "iso8859-1", "jis0208", "jis0212"
 };
 
 /*
@@ -193,7 +193,7 @@ static const EncodingAlias encodingAliases[] = {
  * Functions used only in this file.
  */
 
-static void		FontPkgCleanup(ClientData clientData);
+static void		FontPkgCleanup(void *clientData);
 static FontFamily *	AllocFontFamily(Display *display,
 			    XFontStruct *fontStructPtr, int base);
 static SubFont *	CanUseFallback(UnixFont *fontPtr,
@@ -203,7 +203,7 @@ static SubFont *	CanUseFallbackWithAliases(UnixFont *fontPtr,
 			    const char *fallbackName, int ch,
 			    Tcl_DString *nameTriedPtr,
 			    SubFont **fixSubFontPtrPtr);
-static int		ControlUtfProc(ClientData clientData, const char *src,
+static int		ControlUtfProc(void *clientData, const char *src,
 			    int srcLen, int flags, Tcl_EncodingState*statePtr,
 			    char *dst, int dstLen, int *srcReadPtr,
 			    int *dstWrotePtr, int *dstCharsPtr);
@@ -238,11 +238,11 @@ static unsigned		RankAttributes(FontAttributes *wantPtr,
 static void		ReleaseFont(UnixFont *fontPtr);
 static void		ReleaseSubFont(Display *display, SubFont *subFontPtr);
 static int		SeenName(const char *name, Tcl_DString *dsPtr);
-static int		Ucs2beToUtfProc(ClientData clientData, const char*src,
+static int		Ucs2beToUtfProc(void *clientData, const char*src,
 			    int srcLen, int flags, Tcl_EncodingState*statePtr,
 			    char *dst, int dstLen, int *srcReadPtr,
 			    int *dstWrotePtr, int *dstCharsPtr);
-static int		UtfToUcs2beProc(ClientData clientData, const char*src,
+static int		UtfToUcs2beProc(void *clientData, const char*src,
 			    int srcLen, int flags, Tcl_EncodingState*statePtr,
 			    char *dst, int dstLen, int *srcReadPtr,
 			    int *dstWrotePtr, int *dstCharsPtr);
@@ -267,9 +267,9 @@ static int		UtfToUcs2beProc(ClientData clientData, const char*src,
 
 static void
 FontPkgCleanup(
-    ClientData clientData)
+    TCL_UNUSED(void *))
 {
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     if (tsdPtr->controlFamily.encoding != NULL) {
@@ -306,9 +306,9 @@ FontPkgCleanup(
 
 void
 TkpFontPkgInit(
-    TkMainInfo *mainPtr)	/* The application being created. */
+    TCL_UNUSED(TkMainInfo *))	/* The application being created. */
 {
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
     SubFont dummy;
     int i;
@@ -362,11 +362,11 @@ TkpFontPkgInit(
 
 static int
 ControlUtfProc(
-    ClientData clientData,	/* Not used. */
+    TCL_UNUSED(void *),	/* Not used. */
     const char *src,		/* Source string in UTF-8. */
     int srcLen,			/* Source string length in bytes. */
-    int flags,			/* Conversion control flags. */
-    Tcl_EncodingState *statePtr,/* Place for conversion routine to store state
+    TCL_UNUSED(int),			/* Conversion control flags. */
+    TCL_UNUSED(Tcl_EncodingState *),/* Place for conversion routine to store state
 				 * information used during a piecewise
 				 * conversion. Contents of statePtr are
 				 * initialized and/or reset by conversion
@@ -390,8 +390,8 @@ ControlUtfProc(
     const char *srcStart, *srcEnd;
     char *dstStart, *dstEnd;
     int ch, result;
-    static char hexChars[] = "0123456789abcdef";
-    static char mapChars[] = {
+    static const char hexChars[] = "0123456789abcdef";
+    static const char mapChars[] = {
 	0, 0, 0, 0, 0, 0, 0,
 	'a', 'b', 't', 'n', 'v', 'f', 'r'
     };
@@ -460,11 +460,11 @@ ControlUtfProc(
 
 static int
 Ucs2beToUtfProc(
-    ClientData clientData,	/* Not used. */
+    TCL_UNUSED(void *),		/* Not used. */
     const char *src,		/* Source string in Unicode. */
     int srcLen,			/* Source string length in bytes. */
     int flags,			/* Conversion control flags. */
-    Tcl_EncodingState *statePtr,/* Place for conversion routine to store state
+    TCL_UNUSED(Tcl_EncodingState *),/* Place for conversion routine to store state
 				 * information used during a piecewise
 				 * conversion. Contents of statePtr are
 				 * initialized and/or reset by conversion
@@ -556,12 +556,12 @@ Ucs2beToUtfProc(
 
 static int
 UtfToUcs2beProc(
-    ClientData clientData,	/* TableEncodingData that specifies
+    TCL_UNUSED(void *),	/* TableEncodingData that specifies
 				 * encoding. */
     const char *src,		/* Source string in UTF-8. */
     int srcLen,			/* Source string length in bytes. */
     int flags,			/* Conversion control flags. */
-    Tcl_EncodingState *statePtr,/* Place for conversion routine to store state
+    TCL_UNUSED(Tcl_EncodingState *),/* Place for conversion routine to store state
 				 * information used during a piecewise
 				 * conversion. Contents of statePtr are
 				 * initialized and/or reset by conversion
@@ -705,7 +705,7 @@ TkpGetNativeFont(
 
 	if (name[0] == '-') {
 	    if (name[1] != '*') {
-		char *dash;
+		const char *dash;
 
 		dash = strchr(name + 1, '-');
 		if ((dash == NULL) || (isspace(UCHAR(dash[-1])))) {
@@ -720,7 +720,7 @@ TkpGetNativeFont(
 	}
 	fontStructPtr = CreateClosestFont(tkwin, &fa.fa, &fa.xa);
     }
-    fontPtr = ckalloc(sizeof(UnixFont));
+    fontPtr = (UnixFont *)ckalloc(sizeof(UnixFont));
     InitFont(tkwin, fontStructPtr, fontPtr);
 
     return (TkFont *) fontPtr;
@@ -776,7 +776,7 @@ TkpGetFontFromAttributes(
 
     fontPtr = (UnixFont *) tkFontPtr;
     if (fontPtr == NULL) {
-	fontPtr = ckalloc(sizeof(UnixFont));
+	fontPtr = (UnixFont *)ckalloc(sizeof(UnixFont));
     } else {
 	ReleaseFont(fontPtr);
     }
@@ -839,7 +839,7 @@ TkpGetFontFamilies(
     Tcl_Interp *interp,		/* Interp to hold result. */
     Tk_Window tkwin)		/* For display to query. */
 {
-    int i, new, numNames;
+    int i, isNew, numNames;
     char *family, **nameList;
     Tcl_HashTable familyTable;
     Tcl_HashEntry *hPtr;
@@ -868,14 +868,14 @@ TkpGetFontFamilies(
 	    continue;			/* See comment above. */
 	}
 	*familyEnd = '\0';
-	Tcl_CreateHashEntry(&familyTable, family, &new);
+	Tcl_CreateHashEntry(&familyTable, family, &isNew);
     }
     XFreeFontNames(nameList);
 
     hPtr = Tcl_FirstHashEntry(&familyTable, &search);
     resultPtr = Tcl_NewObj();
     while (hPtr != NULL) {
-	strPtr = Tcl_NewStringObj(Tcl_GetHashKey(&familyTable, hPtr), -1);
+	strPtr = Tcl_NewStringObj((const char *)Tcl_GetHashKey(&familyTable, hPtr), -1);
 	Tcl_ListObjAppendElement(NULL, resultPtr, strPtr);
 	hPtr = Tcl_NextHashEntry(&search);
     }
@@ -1203,7 +1203,7 @@ TkpMeasureCharsInContext(
     Tk_Font tkfont,		/* Font in which characters will be drawn. */
     const char *source,		/* UTF-8 string to be displayed. Need not be
 				 * '\0' terminated. */
-    int numBytes,		/* Maximum number of bytes to consider from
+    TCL_UNUSED(int),		/* Maximum number of bytes to consider from
 				 * source string in all. */
     int rangeStart,		/* Index of first byte to measure. */
     int rangeLength,		/* Length of range to measure in bytes. */
@@ -1225,7 +1225,6 @@ TkpMeasureCharsInContext(
     int *lengthPtr)		/* Filled with x-location just after the
 				 * terminating character. */
 {
-    (void) numBytes; /*unused*/
     return Tk_MeasureChars(tkfont, source + rangeStart, rangeLength,
 	    maxLength, flags, lengthPtr);
 }
@@ -1400,7 +1399,7 @@ TkpDrawCharsInContext(
 				 * is passed to this function. If they are not
 				 * stripped out, they will be displayed as
 				 * regular printing characters. */
-    int numBytes,		/* Number of bytes in string. */
+    TCL_UNUSED(int),		/* Number of bytes in string. */
     int rangeStart,		/* Index of first byte to draw. */
     int rangeLength,		/* Length of range to draw in bytes. */
     int x, int y)		/* Coordinates at which to place origin of the
@@ -1409,8 +1408,6 @@ TkpDrawCharsInContext(
 {
     int widthUntilStart;
 
-    (void) numBytes; /*unused*/
-
     Tk_MeasureChars(tkfont, source, rangeStart, -1, 0, &widthUntilStart);
     Tk_DrawChars(display, drawable, gc, tkfont, source + rangeStart,
 	    rangeLength, x+widthUntilStart, y);
@@ -1610,7 +1607,7 @@ InitFont(
     UnixFont *fontPtr)		/* Filled with information constructed from
 				 * the above arguments. */
 {
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
     unsigned long value;
     int minHi, maxHi, minLo, maxLo, fixed, width, limit, i, n;
@@ -1716,7 +1713,7 @@ InitFont(
 	 * 1/3 the width of a capital I.
 	 */
 
-	fontPtr->barHeight = fontPtr->widths['I'] / 3;
+	fontPtr->barHeight = fontPtr->widths[(unsigned char)'I'] / 3;
 	if (fontPtr->barHeight == 0) {
 	    fontPtr->barHeight = 1;
 	}
@@ -1857,13 +1854,13 @@ AllocFontFamily(
     Display *display,		/* Display in which font will be used. */
     XFontStruct *fontStructPtr,	/* Screen font whose FontFamily is to be
 				 * returned. */
-    int base)			/* Non-zero if this font family is to be used
+    TCL_UNUSED(int))			/* Non-zero if this font family is to be used
 				 * in the base font of a font object. */
 {
     FontFamily *familyPtr;
     FontAttributes fa;
     Tcl_Encoding encoding;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     GetFontAttributes(display, fontStructPtr, &fa);
@@ -1882,7 +1879,7 @@ AllocFontFamily(
 	}
     }
 
-    familyPtr = ckalloc(sizeof(FontFamily));
+    familyPtr = (FontFamily *)ckalloc(sizeof(FontFamily));
     memset(familyPtr, 0, sizeof(FontFamily));
     familyPtr->nextPtr = tsdPtr->fontFamilyList;
     tsdPtr->fontFamilyList = familyPtr;
@@ -1939,7 +1936,7 @@ FreeFontFamily(
     FontFamily *familyPtr)	/* The FontFamily to delete. */
 {
     FontFamily **familyPtrPtr;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
     int i;
 
@@ -2252,10 +2249,10 @@ FontMapLoadPage(
     Tcl_Encoding encoding;
     XFontStruct *fontStructPtr;
     XCharStruct *widths;
-    ThreadSpecificData *tsdPtr =
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
-    subFontPtr->fontMap[row] = ckalloc(FONTMAP_BITSPERPAGE / 8);
+    subFontPtr->fontMap[row] = (char *)ckalloc(FONTMAP_BITSPERPAGE / 8);
     memset(subFontPtr->fontMap[row], 0, FONTMAP_BITSPERPAGE / 8);
 
     if (subFontPtr->familyPtr == &tsdPtr->controlFamily) {
@@ -2493,7 +2490,7 @@ CanUseFallback(
     numEncodings = 0;
     Tcl_DStringInit(&dsEncodings);
 
-    charset = NULL;	/* lint, since numNames must be > 0 to get here. */
+    charset = NULL;	/* numNames must be > 0 to get here. */
 
   retry:
     bestIdx[0] = -1;
@@ -2587,7 +2584,7 @@ CanUseFallback(
 	     * make a copy.
 	     */
 
-	    nameList = ckalloc(numNames * sizeof(char *));
+	    nameList = (char **)ckalloc(numNames * sizeof(char *));
 	    memcpy(nameList, nameListOrig, numNames * sizeof(char *));
 	}
 	nameList[nameIdx] = NULL;
@@ -2632,7 +2629,7 @@ CanUseFallback(
     if (fontPtr->numSubFonts >= SUBFONT_SPACE) {
 	SubFont *newPtr;
 
-	newPtr = ckalloc(sizeof(SubFont) * (fontPtr->numSubFonts + 1));
+	newPtr = (SubFont *)ckalloc(sizeof(SubFont) * (fontPtr->numSubFonts + 1));
 	memcpy(newPtr, fontPtr->subFontArray,
 		fontPtr->numSubFonts * sizeof(SubFont));
 	if (fixSubFontPtrPtr != NULL) {
@@ -2722,7 +2719,7 @@ RankAttributes(
 	penalty += diff;
     }
     if (gotPtr->xa.charset != wantPtr->xa.charset) {
-	int i;
+	size_t i;
 	const char *gotAlias, *wantAlias;
 
 	penalty += 65000;
@@ -2730,7 +2727,7 @@ RankAttributes(
 	wantAlias = GetEncodingAlias(wantPtr->xa.charset);
 	if (strcmp(gotAlias, wantAlias) != 0) {
 	    penalty += 30000;
-	    for (i = 0; encodingList[i] != NULL; i++) {
+	    for (i = 0; i < sizeof(encodingList)/sizeof(encodingList[0]); i++) {
 		if (strcmp(gotAlias, encodingList[i]) == 0) {
 		    penalty -= 30000;
 		    break;
diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c
index cac6f8e..f57eaa5 100644
--- a/unix/tkUnixRFont.c
+++ b/unix/tkUnixRFont.c
@@ -262,9 +262,9 @@ FinishedWithFont(
 static int
 InitFontErrorProc(
     ClientData clientData,
-    XErrorEvent *errorPtr)
+    TCL_UNUSED(XErrorEvent *))
 {
-    int *errorFlagPtr = (int *) clientData;
+    int *errorFlagPtr = (int *)clientData;
 
     if (errorFlagPtr != NULL) {
 	*errorFlagPtr = 1;
@@ -286,7 +286,7 @@ InitFont(
     Tk_ErrorHandler handler;
 
     if (!fontPtr) {
-	fontPtr = ckalloc(sizeof(UnixFtFont));
+	fontPtr = (UnixFtFont *)ckalloc(sizeof(UnixFtFont));
     }
 
     FcConfigSubstitute(0, pattern, FcMatchPattern);
@@ -304,7 +304,7 @@ InitFont(
 
     fontPtr->fontset = set;
     fontPtr->pattern = pattern;
-    fontPtr->faces = ckalloc(set->nfont * sizeof(UnixFtFace));
+    fontPtr->faces = (UnixFtFace *)ckalloc(set->nfont * sizeof(UnixFtFace));
     fontPtr->nfaces = set->nfont;
 
     /*
@@ -666,7 +666,7 @@ TkpGetSubFonts(
 
 void
 TkpGetFontAttrsForChar(
-    Tk_Window tkwin,		/* Window on the font's display */
+    TCL_UNUSED(Tk_Window),		/* Window on the font's display */
     Tk_Font tkfont,		/* Font to query */
     int c,			/* Character of interest */
     TkFontAttributes *faPtr)	/* Output: Font attributes */
@@ -945,7 +945,7 @@ Tk_DrawChars(
     }
     XGetGCValues(display, gc, GCForeground, &values);
     xftcolor = LookUpColor(display, fontPtr, values.foreground);
-    if (tsdPtr->clipRegion != None) {
+    if (tsdPtr->clipRegion != NULL) {
 	XftDrawSetClip(fontPtr->ftDraw, tsdPtr->clipRegion);
     }
     nspec = 0;
@@ -995,7 +995,7 @@ Tk_DrawChars(
     }
 
   doUnderlineStrikeout:
-    if (tsdPtr->clipRegion != None) {
+    if (tsdPtr->clipRegion != NULL) {
 	XftDrawSetClip(fontPtr->ftDraw, NULL);
     }
     if (fontPtr->font.fa.underline != 0) {
@@ -1087,7 +1087,7 @@ TkDrawAngledChars(
 
     nglyph = 0;
     currentFtFont = NULL;
-    originX = originY = 0;		/* lint */
+    originX = originY = 0;
 
     while (numBytes > 0) {
 	XftFont *ftFont;
@@ -1189,7 +1189,7 @@ TkDrawAngledChars(
     }
     XGetGCValues(display, gc, GCForeground, &values);
     xftcolor = LookUpColor(display, fontPtr, values.foreground);
-    if (tsdPtr->clipRegion != None) {
+    if (tsdPtr->clipRegion != NULL) {
 	XftDrawSetClip(fontPtr->ftDraw, tsdPtr->clipRegion);
     }
     nspec = 0;
@@ -1241,7 +1241,7 @@ TkDrawAngledChars(
 #endif /* XFT_HAS_FIXED_ROTATED_PLACEMENT */
 
   doUnderlineStrikeout:
-    if (tsdPtr->clipRegion != None) {
+    if (tsdPtr->clipRegion != NULL) {
 	XftDrawSetClip(fontPtr->ftDraw, NULL);
     }
     if (fontPtr->font.fa.underline || fontPtr->font.fa.overstrike) {
-- 
cgit v0.12


From 5bdd278d66f4ea89994c76013f0e52f7662f1cc4 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 8 Oct 2020 19:24:28 +0000
Subject: Some more -Wundef warnings

---
 unix/tkUnixRFont.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c
index e10d320..41ba938 100644
--- a/unix/tkUnixRFont.c
+++ b/unix/tkUnixRFont.c
@@ -208,7 +208,7 @@ GetTkFontAttributes(
 	slant = XFT_SLANT_ROMAN;
     }
 
-#if DEBUG_FONTSEL
+#ifdef DEBUG_FONTSEL
     printf("family %s size %d weight %d slant %d\n",
 	    family, (int)size, weight, slant);
 #endif /* DEBUG_FONTSEL */
@@ -453,7 +453,7 @@ TkpGetNativeFont(
 {
     UnixFtFont *fontPtr;
     FcPattern *pattern;
-#if DEBUG_FONTSEL
+#ifdef DEBUG_FONTSEL
     printf("TkpGetNativeFont %s\n", name);
 #endif /* DEBUG_FONTSEL */
 
@@ -491,7 +491,7 @@ TkpGetFontFromAttributes(
     int weight, slant;
     UnixFtFont *fontPtr;
 
-#if DEBUG_FONTSEL
+#ifdef DEBUG_FONTSEL
     printf("TkpGetFontFromAttributes %s-%d %d %d\n", faPtr->family,
 	    faPtr->size, faPtr->weight, faPtr->slant);
 #endif /* DEBUG_FONTSEL */
@@ -718,7 +718,7 @@ Tk_MeasureChars(
     int clen, curX, newX, curByte, newByte, sawNonSpace;
     int termByte = 0, termX = 0, errorFlag = 0;
     Tk_ErrorHandler handler;
-#if DEBUG_FONTSEL
+#ifdef DEBUG_FONTSEL
     char string[256];
     int len = 0;
 #endif /* DEBUG_FONTSEL */
@@ -755,7 +755,7 @@ Tk_MeasureChars(
 	    sawNonSpace = 1;
 	}
 
-#if DEBUG_FONTSEL
+#ifdef DEBUG_FONTSEL
 	string[len++] = (char) c;
 #endif /* DEBUG_FONTSEL */
 	ftFont = GetFont(fontPtr, c, 0.0);
@@ -795,7 +795,7 @@ Tk_MeasureChars(
 	curByte = newByte;
     }
     Tk_DeleteErrorHandler(handler);
-#if DEBUG_FONTSEL
+#ifdef DEBUG_FONTSEL
     string[len] = '\0';
     printf("MeasureChars %s length %d bytes %d\n", string, curX, curByte);
 #endif /* DEBUG_FONTSEL */
@@ -935,7 +935,7 @@ Tk_DrawChars(
             Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     if (fontPtr->ftDraw == 0) {
-#if DEBUG_FONTSEL
+#ifdef DEBUG_FONTSEL
 	printf("Switch to drawable 0x%x\n", drawable);
 #endif /* DEBUG_FONTSEL */
 	fontPtr->ftDraw = XftDrawCreate(display, drawable,
@@ -1070,7 +1070,7 @@ TkDrawAngledChars(
     int originX, originY;
 
     if (fontPtr->ftDraw == 0) {
-#if DEBUG_FONTSEL
+#ifdef DEBUG_FONTSEL
 	printf("Switch to drawable 0x%x\n", drawable);
 #endif /* DEBUG_FONTSEL */
 	fontPtr->ftDraw = XftDrawCreate(display, drawable,
@@ -1179,7 +1179,7 @@ TkDrawAngledChars(
     double sinA = sin(angle * PI/180.0), cosA = cos(angle * PI/180.0);
 
     if (fontPtr->ftDraw == 0) {
-#if DEBUG_FONTSEL
+#ifdef DEBUG_FONTSEL
 	printf("Switch to drawable 0x%x\n", drawable);
 #endif /* DEBUG_FONTSEL */
 	fontPtr->ftDraw = XftDrawCreate(display, drawable,
-- 
cgit v0.12


From d94cc61395e9d006139a4f1bada7200c0d1a08fe Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 9 Oct 2020 08:07:44 +0000
Subject: select-10.4 sometimes fails on Ubuntu too. Remove constraint from
 image-6.2, and relax it for additional possible image types

---
 tests/image.test  | 6 ++----
 tests/select.test | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/tests/image.test b/tests/image.test
index cac304f..1f0aad2 100644
--- a/tests/image.test
+++ b/tests/image.test
@@ -311,11 +311,9 @@ test image-5.7 {Tk_ImageCmd procedure, "type" option} -constraints {
 test image-6.1 {Tk_ImageCmd procedure, "types" option} -body {
     image types x
 } -returnCodes error -result {wrong # args: should be "image types"}
-test image-6.2 {Tk_ImageCmd procedure, "types" option} -constraints {
-    testImageType
-} -body {
+test image-6.2 {Tk_ImageCmd procedure, "types" option} -body {
     lsort [image types]
-} -result {bitmap oldtest photo test}
+} -match glob -result {bitmap*photo test}
 
 
 test image-7.1 {Tk_ImageCmd procedure, "width" option} -body {
diff --git a/tests/select.test b/tests/select.test
index 9146397..1f17673 100644
--- a/tests/select.test
+++ b/tests/select.test
@@ -1006,7 +1006,7 @@ test select-10.3 {ConvertSelection procedure} -constraints x11 -setup {
 # testing timers
 # This one hangs in Exceed
 test select-10.4 {ConvertSelection procedure} -constraints {
-    x11 noExceed
+    x11 noExceed failsOnUbuntu
 } -setup {
     setup
     setupbg
-- 
cgit v0.12


From 84a65733cee47ca4c146903065b3f42331beb39e Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 9 Oct 2020 09:45:15 +0000
Subject: More select-* testcases which sometimes fail on Travis' Ubuntu
 environment

---
 tests/safe.test   | 2 +-
 tests/select.test | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/safe.test b/tests/safe.test
index 3a3b029..31cb1b7 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -37,7 +37,7 @@ set hidden_cmds [list bell cd clipboard encoding exec exit \
 	fconfigure glob grab load menu open pwd selection \
 	socket source toplevel unload wm]
 if {[package vsatisfies [package provide Tcl] 8.6.7-]} {
-    lappend hidden_cmds tcl:encoding:dirs 
+    lappend hidden_cmds tcl:encoding:dirs
 }
 if {[package vsatisfies [package provide Tcl] 8.7-]} {
     lappend hidden_cmds file tcl:encoding:system tcl:file:tempdir
diff --git a/tests/select.test b/tests/select.test
index 1f17673..c412fc0 100644
--- a/tests/select.test
+++ b/tests/select.test
@@ -23,6 +23,7 @@ if {![catch {selection get -selection CLIPBOARD_MANAGER -type TARGETS}]} {
         testConstraint cliboardManagerPresent 1
     }
 }
+testConstraint failsOnUbuntu [expr {![info exists ::env(TRAVIS_OS_NAME)] || ![string match linux $::env(TRAVIS_OS_NAME)]}]
 
 global longValue selValue selInfo
 
@@ -908,7 +909,7 @@ test select-9.2 {SelCvtToX and SelCvtFromX procedures} -setup {
 test select-9.3 {SelCvtToX and SelCvtFromX procedures} -setup {
     setup
     setupbg
-} -constraints x11 -body {
+} -constraints {x11 failsOnUbuntu} -body {
     set selValue "   "
     set selInfo ""
     selection handle -selection PRIMARY -format INTEGER -type TEST \
@@ -921,7 +922,7 @@ test select-9.3 {SelCvtToX and SelCvtFromX procedures} -setup {
 test select-9.4 {SelCvtToX and SelCvtFromX procedures} -setup {
     setup
     setupbg
-} -constraints x11 -body {
+} -constraints {x11 failsOnUbuntu} -body {
     set selValue "16 foobar 32"
     set selInfo ""
     selection handle -selection PRIMARY -format INTEGER -type TEST \
@@ -1036,7 +1037,7 @@ test select-10.5 {ConvertSelection procedure, reentrancy issues} -constraints {
     lappend result $selInfo
 } -result {{PRIMARY selection doesn't exist or form "STRING" not defined} {.f1 STRING 0 4000}}
 test select-10.6 {ConvertSelection procedure, reentrancy issues} -constraints {
-    x11
+    x11 failsOnUbuntu
 } -setup {
     setup
     setupbg
-- 
cgit v0.12


From a4a25a7ea07ed1aa869f025b16ba5905a11465ca Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 9 Oct 2020 13:53:37 +0000
Subject: A few more -Wundef warnings, and a 'const' addition

---
 win/ttkWinXPTheme.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/win/ttkWinXPTheme.c b/win/ttkWinXPTheme.c
index 22b371c..361ee8a 100644
--- a/win/ttkWinXPTheme.c
+++ b/win/ttkWinXPTheme.c
@@ -15,14 +15,14 @@
  *  	shellcc/platform/commctls/userex/refentry.asp >
  */
 
+#define WINVER 0x0501	/* Requires Windows XP APIs */
+
+#include <tkWinInt.h>
 #ifndef HAVE_UXTHEME_H
 /* Stub for platforms that lack the XP theme API headers: */
-#include <tkWinInt.h>
 int TtkXPTheme_Init(Tcl_Interp *interp, HWND hwnd) { return TCL_OK; }
 #else
 
-#define WINVER 0x0501	/* Requires Windows XP APIs */
-
 #include <windows.h>
 #include <uxtheme.h>
 #if defined(HAVE_VSSYM32_H) || _MSC_VER > 1500
@@ -31,8 +31,6 @@ int TtkXPTheme_Init(Tcl_Interp *interp, HWND hwnd) { return TCL_OK; }
 #   include <tmschema.h>
 #endif
 
-#include <tkWinInt.h>
-
 #include "ttk/ttkTheme.h"
 
 typedef HTHEME  (STDAPICALLTYPE OpenThemeDataProc)(HWND hwnd,
@@ -397,7 +395,7 @@ typedef struct
     /*
      * Static data, initialized when element is registered:
      */
-    ElementInfo	*info;
+    const ElementInfo	*info;
     XPThemeProcs *procs;	/* Pointer to theme procedure table */
 
     /*
@@ -413,7 +411,7 @@ typedef struct
 } ElementData;
 
 static ElementData *
-NewElementData(XPThemeProcs *procs, ElementInfo *info)
+NewElementData(XPThemeProcs *procs, const ElementInfo *info)
 {
     ElementData *elementData = (ElementData *)ckalloc(sizeof(ElementData));
 
@@ -799,7 +797,7 @@ static Ttk_ElementSpec TreeIndicatorElementSpec =
     TreeIndicatorElementDraw
 };
 
-#if BROKEN_TEXT_ELEMENT
+#ifdef BROKEN_TEXT_ELEMENT
 
 /*
  *----------------------------------------------------------------------
@@ -1050,12 +1048,10 @@ static ElementInfo ElementInfoTable[] = {
     { "Spinbox.downarrow", &SpinboxArrowElementSpec, L"SPIN",
 	SPNP_DOWN, spinbutton_statemap, NOPAD,
 	PAD_MARGINS | ((SM_CXVSCROLL << 8) | SM_CYVSCROLL) },
-
-#if BROKEN_TEXT_ELEMENT
+#ifdef BROKEN_TEXT_ELEMENT
     { "Labelframe.text", &TextElementSpec, L"BUTTON",
     	BP_GROUPBOX, groupbox_statemap, NOPAD,0 },
 #endif
-
     { 0,0,0,0,0,NOPAD,0 }
 };
 #undef PAD
@@ -1288,7 +1284,7 @@ MODULE_SCOPE int TtkXPTheme_Init(Tcl_Interp *interp, HWND hwnd)
     XPThemeProcs *procs;
     HINSTANCE hlibrary;
     Ttk_Theme themePtr, parentPtr, vistaPtr;
-    ElementInfo *infoPtr;
+    const ElementInfo *infoPtr;
 
     procs = LoadXPThemeProcs(&hlibrary);
     if (!procs)
-- 
cgit v0.12


From f32cb454d68308c1ad941d43f3eaca29db6ada49 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Sun, 11 Oct 2020 15:10:15 +0000
Subject: Fix [27fb5991be]: toplevel is not restored correctly after exiting
 fullscreen.

---
 macosx/tkMacOSXWindowEvent.c | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index ae5190f..ca7f526 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -970,14 +970,6 @@ ConfigureRestrictProc(
     TkWindow *winPtr = TkMacOSXGetTkWindow(w);
     Tk_Window tkwin = (Tk_Window)winPtr;
 
-    /*
-     * See ticket [1fa8c3ed8d].  This may not be needed for macOSX 11.
-     */
-
-    if(![NSApp isDrawing]) {
-	return;
-    }
-
     if (![self inLiveResize] &&
 	[w respondsToSelector: @selector (tkLayoutChanged)]) {
 	[(TKWindow *)w tkLayoutChanged];
@@ -1021,11 +1013,15 @@ ConfigureRestrictProc(
 	TkMacOSXUpdateClipRgn(winPtr);
 
 	 /*
-	  * Generate and process expose events to redraw the window.
+	  * Generate and process expose events to redraw the window.  To avoid
+	  * crashes, only do this if we are being called from drawRect.  See
+	  * ticket [1fa8c3ed8d].
 	  */
 
-	[self generateExposeEvents: [self bounds]];
-
+	if([NSApp isDrawing] || [self inLiveResize]) {
+	    [self generateExposeEvents: [self bounds]];
+	}
+	
 	/*
 	 * Finally, unlock the main autoreleasePool.
 	 */
-- 
cgit v0.12


From 9a1a8cdddc762590ba680992219159244f63d945 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 11 Oct 2020 16:40:39 +0000
Subject: 3 more select-* testcases which sometimes fail on Travis' Ubuntu
 environment Eliminate the use of TCL_CFGVAL_ENCODING, it isn't actually
 needed. Run all test-cases with system encoding set to "utf-8", so we get
 consistant behavior with or without TIP #587

---
 tests/all.tcl      | 3 ++-
 tests/select.test  | 6 +++---
 tests/ttk/all.tcl  | 3 ++-
 unix/tkUnixRFont.c | 6 +-----
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/tests/all.tcl b/tests/all.tcl
index 3b6b75f..46721a2 100644
--- a/tests/all.tcl
+++ b/tests/all.tcl
@@ -4,7 +4,7 @@
 # tests.  Execute it by invoking "source all.tcl" when running tktest
 # in this directory.
 #
-# Copyright (c) 1998-1999 by Scriptics Corporation.
+# Copyright © 1998-1999 by Scriptics Corporation.
 #
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -17,4 +17,5 @@ tcltest::configure -loadfile \
     [file join [tcltest::testsDirectory] constraints.tcl]
 tcltest::configure -singleproc 1
 set ErrorOnFailures [info exists env(ERROR_ON_FAILURES)]
+encoding system utf-8
 if {[tcltest::runAllTests] && $ErrorOnFailures} {exit 1}
diff --git a/tests/select.test b/tests/select.test
index c412fc0..31d6494 100644
--- a/tests/select.test
+++ b/tests/select.test
@@ -896,7 +896,7 @@ test select-9.1 {SelCvtToX and SelCvtFromX procedures} -setup {
 test select-9.2 {SelCvtToX and SelCvtFromX procedures} -setup {
     setup
     setupbg
-} -constraints x11 -body {
+} -constraints {x11 failsOnUbuntu} -body {
     set selValue "1024 0xffff  2048 -2  "
     set selInfo ""
     selection handle -selection PRIMARY -format INTEGER -type TEST \
@@ -1022,7 +1022,7 @@ test select-10.4 {ConvertSelection procedure} -constraints {
     lappend result $selInfo
 } -result {{selection owner didn't respond} {STRING 0 4000 STRING 4000 4000 STRING 8000 4000 STRING 12000 4000 STRING 16000 4000 STRING 0 4000 STRING 4000 4000}}
 test select-10.5 {ConvertSelection procedure, reentrancy issues} -constraints {
-    x11
+    x11 failsOnUbuntu
 } -setup {
     setup
     setupbg
@@ -1060,7 +1060,7 @@ test select-10.6 {ConvertSelection procedure, reentrancy issues} -constraints {
 ##############################################################################
 
 # testing reentrancy
-test select-11.1 {TkSelPropProc procedure} -constraints x11 -setup {
+test select-11.1 {TkSelPropProc procedure} -constraints {x11 failsOnUbuntu} -setup {
     setup
     setupbg
 } -body {
diff --git a/tests/ttk/all.tcl b/tests/ttk/all.tcl
index a75172f..8a75ba7 100644
--- a/tests/ttk/all.tcl
+++ b/tests/ttk/all.tcl
@@ -4,7 +4,7 @@
 # tests.  Execute it by invoking "source all.tcl" when running tktest
 # in this directory.
 #
-# Copyright (c) 2007 by the Tk developers.
+# Copyright © 2007 by the Tk developers.
 #
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -17,4 +17,5 @@ tcltest::configure -loadfile \
     [file join [file dirname [tcltest::testsDirectory]] constraints.tcl]
 tcltest::configure -singleproc 1
 set ErrorOnFailures [info exists env(ERROR_ON_FAILURES)]
+encoding system utf-8
 if {[tcltest::runAllTests] && $ErrorOnFailures} {exit 1}
diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c
index f57eaa5..340b5a9 100644
--- a/unix/tkUnixRFont.c
+++ b/unix/tkUnixRFont.c
@@ -61,10 +61,6 @@ static Tcl_ThreadDataKey dataKey;
  * 	the TIP 59 configuration database.
  */
 
-#ifndef TCL_CFGVAL_ENCODING
-#define TCL_CFGVAL_ENCODING "ascii"
-#endif
-
 static int utf8ToUcs4(const char *source, FcChar32 *c, int numBytes)
 {
     if (numBytes >= 6) {
@@ -82,7 +78,7 @@ TkpFontPkgInit(
 	{ 0,0 }
     };
 
-    Tcl_RegisterConfig(mainPtr->interp, "tk", cfg, TCL_CFGVAL_ENCODING);
+    Tcl_RegisterConfig(mainPtr->interp, "tk", cfg, "utf-8");
 }
 
 static XftFont *
-- 
cgit v0.12


From ad0d8ceeb439f7151ce2378527b87cf81e17d1bd Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 13 Oct 2020 13:05:57 +0000
Subject: Protect ttk::spinbox::Spin against empty lsearch result. Discovered
 when running against Tcl's "empty-not-found" branch. Some formatting

---
 library/ttk/spinbox.tcl | 43 ++++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/library/ttk/spinbox.tcl b/library/ttk/spinbox.tcl
index 33936d9..8aba5e1 100644
--- a/library/ttk/spinbox.tcl
+++ b/library/ttk/spinbox.tcl
@@ -32,7 +32,7 @@ proc ttk::spinbox::Motion {w x y} {
     variable State
     ttk::saveCursor $w State(userConfCursor) [ttk::cursor text]
     if {   [$w identify $x $y] eq "textarea"
-        && [$w instate {!readonly !disabled}]
+	&& [$w instate {!readonly !disabled}]
     } {
 	ttk::setCursor $w text
     } else {
@@ -46,16 +46,16 @@ proc ttk::spinbox::Press {w x y} {
     if {[$w instate disabled]} { return }
     focus $w
     switch -glob -- [$w identify $x $y] {
-        *textarea	{ ttk::entry::Press $w $x }
+	*textarea	{ ttk::entry::Press $w $x }
 	*rightarrow	-
-        *uparrow 	{ ttk::Repeatedly event generate $w <<Increment>> }
+	*uparrow 	{ ttk::Repeatedly event generate $w <<Increment>> }
 	*leftarrow	-
-        *downarrow	{ ttk::Repeatedly event generate $w <<Decrement>> }
+	*downarrow	{ ttk::Repeatedly event generate $w <<Decrement>> }
 	*spinbutton {
 	    if {$y * 2 >= [winfo height $w]} {
-	    	set event <<Decrement>>
+		set event <<Decrement>>
 	    } else {
-	    	set event <<Increment>>
+		set event <<Increment>>
 	    }
 	    ttk::Repeatedly event generate $w $event
 	}
@@ -69,7 +69,7 @@ proc ttk::spinbox::DoubleClick {w x y} {
     if {[$w instate disabled]} { return }
 
     switch -glob -- [$w identify $x $y] {
-        *textarea	{ SelectAll $w }
+	*textarea	{ SelectAll $w }
 	*		{ Press $w $x $y }
     }
 }
@@ -140,25 +140,26 @@ proc ttk::spinbox::Spin {w dir} {
     if {[$w instate disabled]} { return }
 
     if {![info exists State($w,values.length)]} {
-      set State($w,values.index) -1
-      set State($w,values.last) {}
+	set State($w,values.index) -1
+	set State($w,values.last) {}
     }
     set State($w,values) [$w cget -values]
     set State($w,values.length) [llength $State($w,values)]
 
     if {$State($w,values.length) > 0} {
-        set value [$w get]
-        set current $State($w,values.index)
-        if {$value ne $State($w,values.last)} {
-            set current [lsearch -exact $State($w,values) $value]
-        }
-        set State($w,values.index) [Adjust $w [expr {$current + $dir}] 0 \
-                [expr {$State($w,values.length) - 1}]]
-        set State($w,values.last) [lindex $State($w,values) $State($w,values.index)]
-        $w set $State($w,values.last)
+	set value [$w get]
+	set current $State($w,values.index)
+	if {$value ne $State($w,values.last)} {
+	    set current [lsearch -exact $State($w,values) $value]
+	    if {$current < 0} {set current -1}
+	}
+	set State($w,values.index) [Adjust $w [expr {$current + $dir}] 0 \
+		[expr {$State($w,values.length) - 1}]]
+	set State($w,values.last) [lindex $State($w,values) $State($w,values.index)]
+	$w set $State($w,values.last)
     } else {
-        if {[catch {
-    	    set v [expr {[scan [$w get] %f] + $dir * [$w cget -increment]}]
+	if {[catch {
+	    set v [expr {[scan [$w get] %f] + $dir * [$w cget -increment]}]
 	}]} {
 	    set v [$w cget -from]
 	}
@@ -176,7 +177,7 @@ proc ttk::spinbox::FormatValue {w val} {
     if {$fmt eq ""} {
 	# Try to guess a suitable -format based on -increment.
 	set delta [expr {abs([$w cget -increment])}]
-        if {0 < $delta && $delta < 1} {
+	if {0 < $delta && $delta < 1} {
 	    # NB: This guesses wrong if -increment has more than 1
 	    # significant digit itself, e.g., -increment 0.25
 	    set nsd [expr {int(ceil(-log10($delta)))}]
-- 
cgit v0.12


From 0ce2a3994f63c21742fc4f937f58852e167e996a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 15 Oct 2020 14:51:07 +0000
Subject: Sync rules.vc with Tcl

---
 win/rules.vc | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/win/rules.vc b/win/rules.vc
index 6dca6d9..f3e5439 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -415,9 +415,6 @@ _INSTALLDIR=$(_INSTALLDIR)\lib
 # NATIVE_ARCH - set to IX86 or AMD64 for the host machine
 # MACHINE - same as $(ARCH) - legacy
 # _VC_MANIFEST_EMBED_{DLL,EXE} - commands for embedding a manifest if needed
-# CFG_ENCODING - set to an character encoding.
-#   TBD - this is passed to compiler as TCL_CFGVAL_ENCODING but can't
-#   see where it is used
 
 cc32		= $(CC)   # built-in default.
 link32		= link
@@ -503,10 +500,6 @@ _VC_MANIFEST_EMBED_EXE=if exist $@.manifest mt -nologo -manifest $@.manifest -ou
 _VC_MANIFEST_EMBED_DLL=if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;2
 !endif
 
-!ifndef CFG_ENCODING
-CFG_ENCODING	= \"cp1252\"
-!endif
-
 ################################################################
 # 4. Build the nmakehlp program
 # This is a helper app we need to overcome nmake's limiting
@@ -1043,7 +1036,7 @@ BUILDDIRTOP =$(BUILDDIRTOP)_$(MACHINE)
 BUILDDIRTOP =$(BUILDDIRTOP)_VC$(VCVER)
 !endif
 
-!if !$(DEBUG) || $(DEBUG) && $(UNCHECKED)
+!if !$(DEBUG) || $(TCL_VERSION) > 86 || $(DEBUG) && $(UNCHECKED)
 SUFX	    = $(SUFX:g=)
 !endif
 
@@ -1292,7 +1285,7 @@ INCLUDE_INSTALL_DIR	= $(_INSTALLDIR)\..\include
 # baselibs - minimum Windows libraries required. Parent makefile can
 #    define PRJ_LIBS before including rules.rc if additional libs are needed
 
-OPTDEFINES	= /DTCL_CFGVAL_ENCODING=$(CFG_ENCODING) /DSTDC_HEADERS
+OPTDEFINES	= /DSTDC_HEADERS
 !if $(VCVERSION) >= 1600
 OPTDEFINES	= $(OPTDEFINES) /DHAVE_STDINT_H=1
 !else
-- 
cgit v0.12


From ba6beed687edac8e849dc8fcd7eb32aeae1939ce Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Thu, 15 Oct 2020 17:48:14 +0000
Subject: Simpler, better fix of [c2483bfe4b]: unwanted fontchooser can appear.
  Uses Tcl_SetExitProc.

---
 macosx/tkMacOSXHLEvents.c |  5 ++++
 macosx/tkMacOSXInit.c     | 64 +++++++++++++++++++++++++++++++++++++++++++++++
 macosx/tkMacOSXPrivate.h  |  1 +
 3 files changed, 70 insertions(+)

diff --git a/macosx/tkMacOSXHLEvents.c b/macosx/tkMacOSXHLEvents.c
index 258740b..615653d 100644
--- a/macosx/tkMacOSXHLEvents.c
+++ b/macosx/tkMacOSXHLEvents.c
@@ -68,6 +68,11 @@ static const char *scriptTextProc = "::tk::mac::DoScriptText";
     [self handleQuitApplicationEvent:Nil withReplyEvent:Nil];
 }
 
+- (void) superTerminate: (id) sender
+{
+    [super terminate:nil];
+}
+
 - (void) preferences: (id) sender
 {
     [self handleShowPreferencesEvent:Nil withReplyEvent:Nil];
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index bda5f46..cfaf631 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -270,6 +270,55 @@ static int		TkMacOSXGetAppPathCmd(ClientData cd, Tcl_Interp *ip,
  *----------------------------------------------------------------------
  */
 
+/*
+ * Helper function which closes the shared NSFontPanel and NSColorPanel.
+ */
+
+static void closePanels(
+    void)
+{
+    if ([NSFontPanel sharedFontPanelExists]) {
+	[[NSFontPanel sharedFontPanel] orderOut:nil];
+    }
+    if ([NSColorPanel sharedColorPanelExists]) {
+        [[NSColorPanel sharedColorPanel] orderOut:nil];
+    }
+}
+
+/*
+ * This custom exit procedure is called by Tcl_Exit in place of the exit
+ * function from the C runtime.  It calls the terminate method of the
+ * NSApplication class (superTerminate for a TKApplication).  The purpose of
+ * doing this is to ensure that the NSFontPanel and the NSColorPanel are closed
+ * before the process exits, and that the application state is recorded
+ * correctly for all termination scenarios.  If this is called a second time
+ * (as can happen) call the C runtime exit function.
+ */
+
+TCL_NORETURN void TkMacOSXExitProc(
+    ClientData clientdata)
+{
+    static bool calledBefore = NO;
+    if (!calledBefore) {
+	calledBefore = YES;
+	closePanels();
+	Tcl_Finalize();
+	[(TKApplication *)NSApp superTerminate:nil]; /* Should not return. */
+    }
+    exit((int)clientdata);
+}
+
+/*
+ * This SIGINT handler is installed when Wish is run in a shell to make sure
+ * that normal finalization occurs when SIGINT is received (i.e. when ^C is
+ * pressed in the shell).  It calls Tcl_Exit instead of the C runtime exit
+ * function called by the default handler.
+ */
+
+static void sigintHandler(int signal) {
+    Tcl_Exit(1);
+}
+
 int
 TkpInit(
     Tcl_Interp *interp)
@@ -439,6 +488,21 @@ TkpInit(
 		break;
 	    }
 	}
+
+	/*
+	 * Install our custom exit proc, which terminates the NSApplication.
+	 */
+
+	Tcl_SetExitProc(TkMacOSXExitProc);
+
+	/*
+	 * When Wish is run from a terminal, install a sigint handler to make
+	 * sure that normal cleanup takes place if the app is killed with ^C.
+	 */
+
+	if (isatty(0)) {
+	    signal(SIGINT, sigintHandler);
+	}
     }
 
     /*
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h
index 4c07557..9617712 100644
--- a/macosx/tkMacOSXPrivate.h
+++ b/macosx/tkMacOSXPrivate.h
@@ -381,6 +381,7 @@ VISIBILITY_HIDDEN
 @end
 @interface TKApplication(TKHLEvents)
 - (void) terminate: (id) sender;
+- (void) superTerminate: (id) sender;
 - (void) preferences: (id) sender;
 - (void) handleQuitApplicationEvent:   (NSAppleEventDescriptor *)event
 		     withReplyEvent:   (NSAppleEventDescriptor *)replyEvent;
-- 
cgit v0.12


From 2a312582921609ee854c5af4e608e2e3065371c8 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Thu, 15 Oct 2020 18:08:31 +0000
Subject: Even simpler - remove out of place calls to Tcl_Finalize

---
 macosx/tkMacOSXInit.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index cfaf631..e1d586c 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -291,21 +291,15 @@ static void closePanels(
  * NSApplication class (superTerminate for a TKApplication).  The purpose of
  * doing this is to ensure that the NSFontPanel and the NSColorPanel are closed
  * before the process exits, and that the application state is recorded
- * correctly for all termination scenarios.  If this is called a second time
- * (as can happen) call the C runtime exit function.
+ * correctly for all termination scenarios.
  */
 
 TCL_NORETURN void TkMacOSXExitProc(
     ClientData clientdata)
 {
-    static bool calledBefore = NO;
-    if (!calledBefore) {
-	calledBefore = YES;
-	closePanels();
-	Tcl_Finalize();
-	[(TKApplication *)NSApp superTerminate:nil]; /* Should not return. */
-    }
-    exit((int)clientdata);
+    closePanels();
+    [(TKApplication *)NSApp superTerminate:nil]; /* Does not return. */
+    exit((int)clientdata); /* Convince the compiler that we don't return. */
 }
 
 /*
-- 
cgit v0.12


From 6379b15d7f1ac05c4943c92f28ad7cc2486facc5 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Thu, 15 Oct 2020 18:37:42 +0000
Subject: Use Tcl_Exit when handling SIGHUP and SIGTERM too.

---
 macosx/tkMacOSXInit.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index e1d586c..950a50f 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -303,13 +303,15 @@ TCL_NORETURN void TkMacOSXExitProc(
 }
 
 /*
- * This SIGINT handler is installed when Wish is run in a shell to make sure
- * that normal finalization occurs when SIGINT is received (i.e. when ^C is
- * pressed in the shell).  It calls Tcl_Exit instead of the C runtime exit
- * function called by the default handler.
+ * This signal handler is installed for the SIGINT, SIGHUP and SIGTERM signals
+ * so that normal finalization occurs when a Tk app is killed by one of these
+ * signals (e.g when ^C is pressed while running Wish in the shell).  It calls
+ * Tcl_Exit instead of the C runtime exit function called by the default handler.
+ * This is consistent with the Tcl_Exit manual page, which says that Tcl_Exit
+ * should always be called instead of exit.
  */
 
-static void sigintHandler(int signal) {
+static void TkMacOSXSignalHandler(int signal) {
     Tcl_Exit(1);
 }
 
@@ -490,13 +492,14 @@ TkpInit(
 	Tcl_SetExitProc(TkMacOSXExitProc);
 
 	/*
-	 * When Wish is run from a terminal, install a sigint handler to make
-	 * sure that normal cleanup takes place if the app is killed with ^C.
+	 * Install a signal handler for SIGINT, SIGHUP and SIGTERM which uses
+	 * Tcl_Exit instead of exit so that normal cleanup takes place if a TK
+	 * application is killed with one of these signals.
 	 */
 
-	if (isatty(0)) {
-	    signal(SIGINT, sigintHandler);
-	}
+	signal(SIGINT, TkMacOSXSignalHandler);
+	signal(SIGHUP, TkMacOSXSignalHandler);
+	signal(SIGTERM, TkMacOSXSignalHandler);
     }
 
     /*
-- 
cgit v0.12


From 5783d04a34a4c680ea7db932c5db2c4aa8691a2e Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Fri, 16 Oct 2020 13:11:57 +0000
Subject: Do not call Tcl_SetExitProc when the Tk process is part of an exec
 pipeline.

---
 macosx/tkMacOSXInit.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index 950a50f..73d2b82 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -308,7 +308,8 @@ TCL_NORETURN void TkMacOSXExitProc(
  * signals (e.g when ^C is pressed while running Wish in the shell).  It calls
  * Tcl_Exit instead of the C runtime exit function called by the default handler.
  * This is consistent with the Tcl_Exit manual page, which says that Tcl_Exit
- * should always be called instead of exit.
+ * should always be called instead of exit.  When Tk is killed by a signal we
+ * return exit status 1.
  */
 
 static void TkMacOSXSignalHandler(int signal) {
@@ -329,6 +330,7 @@ TkpInit(
     if (!initialized) {
 	struct stat st;
 	Bool shouldOpenConsole = NO;
+	Bool isLaunched = NO;
         Bool stdinIsNullish = (!isatty(0) &&
 	    (fstat(0, &st) || (S_ISCHR(st.st_mode) && st.st_blocks == 0)));
 
@@ -343,6 +345,7 @@ TkpInit(
 	initialized = 1;
 
 #ifdef TK_FRAMEWORK
+
 	/*
 	 * When Tk is in a framework, force tcl_findLibrary to look in the
 	 * framework scripts directory.
@@ -449,6 +452,7 @@ TkpInit(
 	    FILE *null = fopen("/dev/null", "w");
 	    dup2(fileno(null), STDOUT_FILENO);
 	    dup2(fileno(null), STDERR_FILENO);
+	    isLaunched = YES;
 	}
 
 	/*
@@ -486,10 +490,15 @@ TkpInit(
 	}
 
 	/*
-	 * Install our custom exit proc, which terminates the NSApplication.
+	 * Install our custom exit proc, which terminates the process by
+	 * calling [NSApplication terminate].  This does not work correctly if
+	 * we are part of an exec pipeline, so only use it if this process
+	 * was launched by the launcher or if both stdin and stdout are tttys.
 	 */
 
-	Tcl_SetExitProc(TkMacOSXExitProc);
+	if (isLaunched || (isatty(0) && isatty(1))) {
+	    Tcl_SetExitProc(TkMacOSXExitProc);
+	}
 
 	/*
 	 * Install a signal handler for SIGINT, SIGHUP and SIGTERM which uses
-- 
cgit v0.12


From ff9955565a1fcf3cec963f198a2f48e61e7fc402 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 16 Oct 2020 16:40:55 +0000
Subject: Another select-* testcase which sometimes fails

---
 tests/select.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/select.test b/tests/select.test
index 31d6494..6bd2c9d 100644
--- a/tests/select.test
+++ b/tests/select.test
@@ -1132,7 +1132,7 @@ test select-12.6 {DefaultSelection procedure} -body {
 } -result {{Targets value} {TARGETS.f1 0 4000} {MULTIPLE TARGETS TIMESTAMP TK_APPLICATION TK_WINDOW}}
 
 test select-13.1 {SelectionSize procedure, handler deleted} -constraints {
-    x11
+    x11 failsOnUbuntu
 } -setup {
     setup
     setupbg
-- 
cgit v0.12


From c85b5609e7aad61ee31d389f004694f3be62db35 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Fri, 16 Oct 2020 20:45:29 +0000
Subject: Allow opting out of using the custom Tcl_ExitProc by defining
 USE_SYSTEM_EXIT

---
 macosx/tkMacOSXInit.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index 73d2b82..e895cc0 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -492,14 +492,19 @@ TkpInit(
 	/*
 	 * Install our custom exit proc, which terminates the process by
 	 * calling [NSApplication terminate].  This does not work correctly if
-	 * we are part of an exec pipeline, so only use it if this process
-	 * was launched by the launcher or if both stdin and stdout are tttys.
+	 * the process is part of an exec pipeline, so it is only used if the
+	 * process was launched by the launcher or if both stdin and stdout are
+	 * ttys.
 	 */
 
+# if !defined(USE_SYSTEM_EXIT)
+
 	if (isLaunched || (isatty(0) && isatty(1))) {
 	    Tcl_SetExitProc(TkMacOSXExitProc);
 	}
 
+# endif
+
 	/*
 	 * Install a signal handler for SIGINT, SIGHUP and SIGTERM which uses
 	 * Tcl_Exit instead of exit so that normal cleanup takes place if a TK
-- 
cgit v0.12


From bf3d9667d064c7fc220c59d38964f335a01b0a26 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Fri, 16 Oct 2020 21:52:16 +0000
Subject: Use TCL_UNUSED in the signal handler

---
 macosx/tkMacOSXInit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index e895cc0..ded25fc 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -312,7 +312,7 @@ TCL_NORETURN void TkMacOSXExitProc(
  * return exit status 1.
  */
 
-static void TkMacOSXSignalHandler(int signal) {
+static void TkMacOSXSignalHandler(TCL_UNUSED(int)) {
     Tcl_Exit(1);
 }
 
-- 
cgit v0.12


From 2a92717a443e8caee17f51dae951666b9191d803 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Sat, 17 Oct 2020 17:31:40 +0000
Subject: Small adjustment to  d69b5cec: make sure Tcl_Finalize *always* gets
 called.

---
 macosx/tkMacOSXInit.c | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index e895cc0..c7ee971 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -298,7 +298,20 @@ TCL_NORETURN void TkMacOSXExitProc(
     ClientData clientdata)
 {
     closePanels();
-    [(TKApplication *)NSApp superTerminate:nil]; /* Does not return. */
+
+    /*
+     * Make sure we don't get called again.  This can happen, e.g. with
+     * fossil diff -tk.
+     */
+    
+    Tcl_SetExitProc(NULL);
+
+    /*
+     * Tcl_Exit does not call Tcl_Finalize if there is an exit proc installed.
+     */
+    
+    Tcl_Finalize();
+    [(TKApplication *)NSApp superTerminate:nil]; /* Should not return. */
     exit((int)clientdata); /* Convince the compiler that we don't return. */
 }
 
@@ -430,6 +443,7 @@ TkpInit(
 		Tcl_SetVar2(interp, "tcl_interactive", NULL, "1",
 			    TCL_GLOBAL_ONLY);
 	    }
+	    isLaunched = YES;
 	    shouldOpenConsole = YES;
 	}
 	if (shouldOpenConsole) {
@@ -494,13 +508,16 @@ TkpInit(
 	 * calling [NSApplication terminate].  This does not work correctly if
 	 * the process is part of an exec pipeline, so it is only used if the
 	 * process was launched by the launcher or if both stdin and stdout are
-	 * ttys.
+	 * ttys.  If an exit proc was already installed we leave it in place.
 	 */
 
 # if !defined(USE_SYSTEM_EXIT)
 
 	if (isLaunched || (isatty(0) && isatty(1))) {
-	    Tcl_SetExitProc(TkMacOSXExitProc);
+	    Tcl_ExitProc *prevExitProc = Tcl_SetExitProc(TkMacOSXExitProc);
+	    if (prevExitProc) {
+		Tcl_SetExitProc(prevExitProc);
+	    }
 	}
 
 # endif
-- 
cgit v0.12


From b8204820666fbfae9d5ea23deb3e1281ed131164 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Sat, 17 Oct 2020 18:07:39 +0000
Subject: Add cast to fix annoying compiler warning.

---
 macosx/tkMacOSXInit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index c7ee971..0e7dfe4 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -516,7 +516,7 @@ TkpInit(
 	if (isLaunched || (isatty(0) && isatty(1))) {
 	    Tcl_ExitProc *prevExitProc = Tcl_SetExitProc(TkMacOSXExitProc);
 	    if (prevExitProc) {
-		Tcl_SetExitProc(prevExitProc);
+		Tcl_SetExitProc((TCL_NORETURN Tcl_ExitProc *)prevExitProc);
 	    }
 	}
 
-- 
cgit v0.12


From ee57c6cb6fe12b3fb2cceb7d3112f03c66f36c3f Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 19 Oct 2020 12:41:45 +0000
Subject: Update to latest 'install-sh'

---
 unix/install-sh | 412 +++++++++++++++++++++++++++-----------------------------
 1 file changed, 201 insertions(+), 211 deletions(-)

diff --git a/unix/install-sh b/unix/install-sh
index 7c34c3f..21b733a 100755
--- a/unix/install-sh
+++ b/unix/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2011-04-20.01; # UTC
+scriptversion=2020-07-26.22; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,25 +35,21 @@ scriptversion=2011-04-20.01; # UTC
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
+# 'make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
 # from scratch.
 
+tab='	'
 nl='
 '
-IFS=" ""	$nl"
+IFS=" $tab$nl"
 
-# set DOITPROG to echo to test this script
+# Set DOITPROG to "echo" to test this script.
 
-# Don't use :- since 4.3BSD and earlier shells don't like it.
 doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
+doit_exec=${doit:-exec}
 
 # Put in absolute file names if you don't have them in your path;
 # or use environment vars.
@@ -68,22 +64,15 @@ mvprog=${MVPROG-mv}
 rmprog=${RMPROG-rm}
 stripprog=${STRIPPROG-strip}
 
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
 posix_mkdir=
 
 # Desired mode of installed file.
 mode=0755
 
+# Create dirs (including intermediate dirs) using mode 755.
+# This is like GNU 'install' as of coreutils 8.32 (2020).
+mkdir_umask=22
+
 chgrpcmd=
 chmodcmd=$chmodprog
 chowncmd=
@@ -97,7 +86,7 @@ dir_arg=
 dst_arg=
 
 copy_on_change=false
-no_target_directory=
+is_target_a_directory=possibly
 
 usage="\
 Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
@@ -120,7 +109,7 @@ Options:
   -m MODE       $chmodprog installed files to MODE.
   -o USER       $chownprog installed files to USER.
   -s            $stripprog installed files.
-  -S            $stripprog installed files.
+  -S OPTION     $stripprog installed files using OPTION.
   -t DIRECTORY  install into DIRECTORY.
   -T            report an error if DSTFILE is a directory.
 
@@ -138,45 +127,60 @@ while test $# -ne 0; do
     -d) dir_arg=true;;
 
     -g) chgrpcmd="$chgrpprog $2"
-	shift;;
+        shift;;
 
     --help) echo "$usage"; exit $?;;
 
     -m) mode=$2
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
+        case $mode in
+          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
+            echo "$0: invalid mode: $mode" >&2
+            exit 1;;
+        esac
+        shift;;
 
     -o) chowncmd="$chownprog $2"
-	shift;;
+        shift;;
 
     -s) stripcmd=$stripprog;;
 
     -S) stripcmd="$stripprog $2"
-	shift;;
+        shift;;
 
-    -t) dst_arg=$2
-	shift;;
+    -t)
+        is_target_a_directory=always
+        dst_arg=$2
+        # Protect names problematic for 'test' and other utilities.
+        case $dst_arg in
+          -* | [=\(\)!]) dst_arg=./$dst_arg;;
+        esac
+        shift;;
 
-    -T) no_target_directory=true;;
+    -T) is_target_a_directory=never;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
-    --)	shift
-	break;;
+    --) shift
+        break;;
 
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
+    -*) echo "$0: invalid option: $1" >&2
+        exit 1;;
 
     *)  break;;
   esac
   shift
 done
 
+# We allow the use of options -d and -T together, by making -d
+# take the precedence; this is for compatibility with GNU install.
+
+if test -n "$dir_arg"; then
+  if test -n "$dst_arg"; then
+    echo "$0: target directory not allowed when installing a directory." >&2
+    exit 1
+  fi
+fi
+
 if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
   # When -d is used, all remaining arguments are directories to create.
   # When -t is used, the destination is already specified.
@@ -190,6 +194,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
     fi
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for 'test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 
@@ -198,12 +206,21 @@ if test $# -eq 0; then
     echo "$0: no input file specified." >&2
     exit 1
   fi
-  # It's OK to call `install-sh -d' without argument.
+  # It's OK to call 'install-sh -d' without argument.
   # This can happen when creating conditional directories.
   exit 0
 fi
 
 if test -z "$dir_arg"; then
+  if test $# -gt 1 || test "$is_target_a_directory" = always; then
+    if test ! -d "$dst_arg"; then
+      echo "$0: $dst_arg: Is not a directory." >&2
+      exit 1
+    fi
+  fi
+fi
+
+if test -z "$dir_arg"; then
   do_exit='(exit $ret); exit $ret'
   trap "ret=129; $do_exit" 1
   trap "ret=130; $do_exit" 2
@@ -219,16 +236,16 @@ if test -z "$dir_arg"; then
 
     *[0-7])
       if test -z "$stripcmd"; then
-	u_plus_rw=
+        u_plus_rw=
       else
-	u_plus_rw='% 200'
+        u_plus_rw='% 200'
       fi
       cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
     *)
       if test -z "$stripcmd"; then
-	u_plus_rw=
+        u_plus_rw=
       else
-	u_plus_rw=,u+rw
+        u_plus_rw=,u+rw
       fi
       cp_umask=$mode$u_plus_rw;;
   esac
@@ -236,9 +253,9 @@ fi
 
 for src
 do
-  # Protect names starting with `-'.
+  # Protect names problematic for 'test' and other utilities.
   case $src in
-    -*) src=./$src;;
+    -* | [=\(\)!]) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -260,185 +277,150 @@ do
       echo "$0: no destination specified." >&2
       exit 1
     fi
-
     dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
 
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
+    # If destination is a directory, append the input filename.
     if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dst_arg: Is a directory" >&2
-	exit 1
+      if test "$is_target_a_directory" = never; then
+        echo "$0: $dst_arg: Is a directory" >&2
+        exit 1
       fi
       dstdir=$dst
-      dst=$dstdir/`basename "$src"`
+      dstbase=`basename "$src"`
+      case $dst in
+	*/) dst=$dst$dstbase;;
+	*)  dst=$dst/$dstbase;;
+      esac
       dstdir_status=0
     else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X\(//\)[^/]' \| \
-	     X"$dst" : 'X\(//\)$' \| \
-	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)[^/].*/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\).*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
+      dstdir=`dirname "$dst"`
       test -d "$dstdir"
       dstdir_status=$?
     fi
   fi
 
+  case $dstdir in
+    */) dstdirslash=$dstdir;;
+    *)  dstdirslash=$dstdir/;;
+  esac
+
   obsolete_mkdir_used=false
 
   if test $dstdir_status != 0; then
     case $posix_mkdir in
       '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *[2367][2367]) mkdir_umask=$umask;;
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-	  *[0-7])
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
-
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
+        # With -d, create the new directory with the user-specified mode.
+        # Otherwise, rely on $mkdir_umask.
+        if test -n "$dir_arg"; then
+          mkdir_mode=-m$mode
+        else
+          mkdir_mode=
+        fi
+
+        posix_mkdir=false
+	# The $RANDOM variable is not portable (e.g., dash).  Use it
+	# here however when possible just to lower collision chance.
+	tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+
+	trap '
+	  ret=$?
+	  rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null
+	  exit $ret
+	' 0
+
+	# Because "mkdir -p" follows existing symlinks and we likely work
+	# directly in world-writeable /tmp, make sure that the '$tmpdir'
+	# directory is successfully created first before we actually test
+	# 'mkdir -p'.
+	if (umask $mkdir_umask &&
+	    $mkdirprog $mkdir_mode "$tmpdir" &&
+	    exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
+	then
+	  if test -z "$dir_arg" || {
+	       # Check for POSIX incompatibilities with -m.
+	       # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+	       # other-writable bit of parent directory when it shouldn't.
+	       # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+	       test_tmpdir="$tmpdir/a"
+	       ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
+	       case $ls_ld_tmpdir in
+		 d????-?r-*) different_mode=700;;
+		 d????-?--*) different_mode=755;;
+		 *) false;;
+	       esac &&
+	       $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+		 ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
+		 test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+	       }
+	     }
+	  then posix_mkdir=:
+	  fi
+	  rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
 	else
-	  mkdir_mode=
+	  # Remove any dirs left behind by ancient mkdir implementations.
+	  rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
 	fi
-
-	posix_mkdir=false
-	case $umask in
-	  *[123567][0-7][0-7])
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-	    ;;
-	  *)
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-	    then
-	      if test -z "$dir_arg" || {
-		   # Check for POSIX incompatibilities with -m.
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-		   case $ls_ld_tmpdir in
-		     d????-?r-*) different_mode=700;;
-		     d????-?--*) different_mode=755;;
-		     *) false;;
-		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-		   }
-		 }
-	      then posix_mkdir=:
-	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
-	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-	    fi
-	    trap '' 0;;
-	esac;;
+	trap '' 0;;
     esac
 
     if
       $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+        umask $mkdir_umask &&
+        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
       )
     then :
     else
 
-      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # mkdir does not conform to POSIX,
       # or it failed possibly due to a race condition.  Create the
       # directory the slow way, step by step, checking for races as we go.
 
       case $dstdir in
-	/*) prefix='/';;
-	-*) prefix='./';;
-	*)  prefix='';;
+        /*) prefix='/';;
+        [-=\(\)!]*) prefix='./';;
+        *)  prefix='';;
       esac
 
-      eval "$initialize_posix_glob"
-
       oIFS=$IFS
       IFS=/
-      $posix_glob set -f
+      set -f
       set fnord $dstdir
       shift
-      $posix_glob set +f
+      set +f
       IFS=$oIFS
 
       prefixes=
 
       for d
       do
-	test -z "$d" && continue
-
-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
+        test X"$d" = X && continue
+
+        prefix=$prefix$d
+        if test -d "$prefix"; then
+          prefixes=
+        else
+          if $posix_mkdir; then
+            (umask $mkdir_umask &&
+             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+            # Don't fail if two instances are running concurrently.
+            test -d "$prefix" || exit 1
+          else
+            case $prefix in
+              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+              *) qprefix=$prefix;;
+            esac
+            prefixes="$prefixes '$qprefix'"
+          fi
+        fi
+        prefix=$prefix/
       done
 
       if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
+        # Don't fail if two instances are running concurrently.
+        (umask $mkdir_umask &&
+         eval "\$doit_exec \$mkdirprog $prefixes") ||
+          test -d "$dstdir" || exit 1
+        obsolete_mkdir_used=true
       fi
     fi
   fi
@@ -451,14 +433,25 @@ do
   else
 
     # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
+    dsttmp=${dstdirslash}_inst.$$_
+    rmtmp=${dstdirslash}_rm.$$_
 
     # Trap to clean up those temp files at exit.
     trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
 
     # Copy the file name to the temp name.
-    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+    (umask $cp_umask &&
+     { test -z "$stripcmd" || {
+	 # Create $dsttmp read-write so that cp doesn't create it read-only,
+	 # which would cause strip to fail.
+	 if test -z "$doit"; then
+	   : >"$dsttmp" # No need to fork-exec 'touch'.
+	 else
+	   $doit touch "$dsttmp"
+	 fi
+       }
+     } &&
+     $doit_exec $cpprog "$src" "$dsttmp") &&
 
     # and set any options; do chmod last to preserve setuid bits.
     #
@@ -473,15 +466,12 @@ do
 
     # If -C, don't bother to copy if it wouldn't change the file.
     if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
+       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
+       set -f &&
        set X $old && old=:$2:$4:$5:$6 &&
        set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
+       set +f &&
        test "$old" = "$new" &&
        $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
     then
@@ -494,24 +484,24 @@ do
       # to itself, or perhaps because mv is so ancient that it does not
       # support -f.
       {
-	# Now remove or move aside any old file at destination location.
-	# We try this two ways since rm can't unlink itself on some
-	# systems and the destination file might be busy for other
-	# reasons.  In this case, the final cleanup might fail but the new
-	# file should still install successfully.
-	{
-	  test ! -f "$dst" ||
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-	  } ||
-	  { echo "$0: cannot unlink or rename $dst" >&2
-	    (exit 1); exit 1
-	  }
-	} &&
-
-	# Now rename the file to the real destination.
-	$doit $mvcmd "$dsttmp" "$dst"
+        # Now remove or move aside any old file at destination location.
+        # We try this two ways since rm can't unlink itself on some
+        # systems and the destination file might be busy for other
+        # reasons.  In this case, the final cleanup might fail but the new
+        # file should still install successfully.
+        {
+          test ! -f "$dst" ||
+          $doit $rmcmd -f "$dst" 2>/dev/null ||
+          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+          } ||
+          { echo "$0: cannot unlink or rename $dst" >&2
+            (exit 1); exit 1
+          }
+        } &&
+
+        # Now rename the file to the real destination.
+        $doit $mvcmd "$dsttmp" "$dst"
       }
     fi || exit 1
 
@@ -520,9 +510,9 @@ do
 done
 
 # Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
-# End:
+# End:
\ No newline at end of file
-- 
cgit v0.12


From 0b7c717e2ae38744c93c132854c2913a6ef76f5e Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Mon, 19 Oct 2020 19:27:04 +0000
Subject: Add a make variable to GNUmakefile for building the Tk.framework for
 use as a subframework

---
 macosx/GNUmakefile | 19 ++++++++++++++++---
 macosx/README      | 14 ++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/macosx/GNUmakefile b/macosx/GNUmakefile
index 3b4dd1a..2c9ea6f 100644
--- a/macosx/GNUmakefile
+++ b/macosx/GNUmakefile
@@ -211,8 +211,14 @@ install-${PROJECT}: build-${PROJECT}
 ifeq (${EMBEDDED_BUILD}_${INSTALL_ROOT},1_)
 	@echo "Cannot install-embedded with empty INSTALL_ROOT !" && false
 endif
+ifeq (${SUBFRAMEWORK}_${DYLIB_INSTALL_DIR},1_)
+	@echo "Cannot install-subframework with empty DYLIB_INSTALL_DIR !" && false
+endif
 ifeq (${EMBEDDED_BUILD},1)
-	@rm -rf "${INSTALL_ROOT}/${LIBDIR}/Tk.framework"
+	@rm -rf "${INSTALL_ROOT}${LIBDIR}/Tk.framework"
+endif
+ifeq (${SUBFRAMEWORK},1)
+	@rm -rf "${INSTALL_ROOT}/Frameworks/Tk.framework"
 endif
 	${DO_MAKE}
 ifeq (${EMBEDDED_BUILD}_${TK_X11},1_)
@@ -239,7 +245,8 @@ ifeq (${BUILD_STYLE}_${EMBEDDED_BUILD},Development_)
 	ln -f "${PRODUCT_NAME}" "${PRODUCT_NAME}_debug"
 endif
 ifeq (${TK_X11},)
-ifeq (${EMBEDDED_BUILD},)
+ifeq (${SUBFRAMEWORK},)
+ifeq (${EMBEDDED_BUILD},1)
 # install Wish.app link in APPLICATION_INSTALL_PATH and setup 'Wish Shell' compatibility links
 	@cd "${TOP_DIR}" && if [ -n "${APP_DIR}" ]; then mkdir -p "./${APP_DIR}" && rm -rf "./${APP_DIR}/Wish.app" && \
 	ln -fsh "./$$(echo "${APP_DIR}" | sed -e 's#/[^/][^/]*#/..#g')/${FMWK_DIR}/${PRODUCT_NAME}.framework/Resources/Wish.app" "./${APP_DIR}" && \
@@ -270,10 +277,16 @@ else
 	} && \
 	fix_install_id Frameworks/Tcl.framework/Tcl Tcl && fix_install_id Frameworks/Tk.framework/Tk Tk && \
 	fix_install_name MacOS/Wish Tcl && fix_install_name MacOS/Wish Tk
-ifeq (${INSTALL_BUILD},1)
+ifeq (${INSTALL_BUILD},)
 	@cd "${TOP_DIR}" && rm -rf "./${FMWK_DIR}"/T{cl,k}.framework && rmdir -p "./${FMWK_DIR}" 2>&- || true
 endif
 endif
+else
+# Clean up the destination directory
+	@rm -rf ${INSTALL_ROOT}/Frameworks
+	@mv "${INSTALL_ROOT}/Library/Frameworks" "${INSTALL_ROOT}"
+	@rm -rf ${INSTALL_ROOT}/Library
+endif
 endif
 
 clean-${PROJECT}: %-${PROJECT}:
diff --git a/macosx/README b/macosx/README
index 0a02999..e0316f0 100644
--- a/macosx/README
+++ b/macosx/README
@@ -455,6 +455,20 @@ make overrides to the tk/macosx GNUmakefile, e.g.
 	    TCL_FRAMEWORK_DIR=$HOME/Library/Frameworks TCLSH_DIR=$HOME/usr/bin
 The Makefile variables TCL_FRAMEWORK_DIR and TCLSH_DIR were added with Tk 8.4.3.
 
+- To build a Tcl.framework and Tk.framework for use as subframeworks in another
+framework, use the install-embedded target and set SUBFRAMEWORK=1.  Set the
+DYLIB_INSTALL_DIR variable to the path which should be the install_name path of
+the shared library and set the DESTDIR variable to the pathname of a staging
+directory where the frameworks will be written.  For example, running the commands:
+	cd Tcl_src
+	make -C macosx install-embedded SUBFRAMEWORK=1 DESTDIR=/tmp/tcltk \
+	DYLIB_INSTALL_DIR=/Library/Frameworks/Python.framework/Versions/3.9/Frameworks/Tcl
+	cd ../Tk_src
+	make -C macosx install-embedded SUBFRAMEWORK=1 DESTDIR=/tmp/tcltk \
+	DYLIB_INSTALL_DIR=/Library/Frameworks/Python.framework/Versions/3.9/Frameworks/Tk
+will produce a Tcl.framework and a Tk.framework usable as subframeworks of the
+Python.framework.  The frameworks will be found in /tmp/tcl/Library/Frameworks/
+
 5. Details regarding the macOS port of Tk.
 -------------------------------------------
 
-- 
cgit v0.12


From 61ae443d9fcf2d03327ec43fe5a0320125c2592f Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Mon, 19 Oct 2020 19:42:05 +0000
Subject: typo

---
 macosx/README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/macosx/README b/macosx/README
index e0316f0..3b38299 100644
--- a/macosx/README
+++ b/macosx/README
@@ -467,7 +467,7 @@ directory where the frameworks will be written.  For example, running the comman
 	make -C macosx install-embedded SUBFRAMEWORK=1 DESTDIR=/tmp/tcltk \
 	DYLIB_INSTALL_DIR=/Library/Frameworks/Python.framework/Versions/3.9/Frameworks/Tk
 will produce a Tcl.framework and a Tk.framework usable as subframeworks of the
-Python.framework.  The frameworks will be found in /tmp/tcl/Library/Frameworks/
+Python.framework.  The frameworks will be found in /tmp/tcltk/Frameworks/
 
 5. Details regarding the macOS port of Tk.
 -------------------------------------------
-- 
cgit v0.12


From 479ffca988d6556e568f4fb393a2ced2e93ad8ad Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Mon, 19 Oct 2020 20:28:40 +0000
Subject: Fix the build by removing calls to deprecated Tcl_SetExitProc.  This
 means that [c2483bfe4b] is not fixed for 8.7.

---
 macosx/tkMacOSXInit.c | 64 ---------------------------------------------------
 1 file changed, 64 deletions(-)

diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index 7299e93..d49422b 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -271,51 +271,6 @@ static int		TkMacOSXGetAppPathCmd(ClientData cd, Tcl_Interp *ip,
  */
 
 /*
- * Helper function which closes the shared NSFontPanel and NSColorPanel.
- */
-
-static void closePanels(
-    void)
-{
-    if ([NSFontPanel sharedFontPanelExists]) {
-	[[NSFontPanel sharedFontPanel] orderOut:nil];
-    }
-    if ([NSColorPanel sharedColorPanelExists]) {
-        [[NSColorPanel sharedColorPanel] orderOut:nil];
-    }
-}
-
-/*
- * This custom exit procedure is called by Tcl_Exit in place of the exit
- * function from the C runtime.  It calls the terminate method of the
- * NSApplication class (superTerminate for a TKApplication).  The purpose of
- * doing this is to ensure that the NSFontPanel and the NSColorPanel are closed
- * before the process exits, and that the application state is recorded
- * correctly for all termination scenarios.
- */
-
-TCL_NORETURN void TkMacOSXExitProc(
-    ClientData clientdata)
-{
-    closePanels();
-
-    /*
-     * Make sure we don't get called again.  This can happen, e.g. with
-     * fossil diff -tk.
-     */
-    
-    Tcl_SetExitProc(NULL);
-
-    /*
-     * Tcl_Exit does not call Tcl_Finalize if there is an exit proc installed.
-     */
-    
-    Tcl_Finalize();
-    [(TKApplication *)NSApp superTerminate:nil]; /* Should not return. */
-    exit((int)clientdata); /* Convince the compiler that we don't return. */
-}
-
-/*
  * This signal handler is installed for the SIGINT, SIGHUP and SIGTERM signals
  * so that normal finalization occurs when a Tk app is killed by one of these
  * signals (e.g when ^C is pressed while running Wish in the shell).  It calls
@@ -504,25 +459,6 @@ TkpInit(
 	}
 
 	/*
-	 * Install our custom exit proc, which terminates the process by
-	 * calling [NSApplication terminate].  This does not work correctly if
-	 * the process is part of an exec pipeline, so it is only used if the
-	 * process was launched by the launcher or if both stdin and stdout are
-	 * ttys.  If an exit proc was already installed we leave it in place.
-	 */
-
-# if !defined(USE_SYSTEM_EXIT)
-
-	if (isLaunched || (isatty(0) && isatty(1))) {
-	    Tcl_ExitProc *prevExitProc = Tcl_SetExitProc(TkMacOSXExitProc);
-	    if (prevExitProc) {
-		Tcl_SetExitProc((TCL_NORETURN Tcl_ExitProc *)prevExitProc);
-	    }
-	}
-
-# endif
-
-	/*
 	 * Install a signal handler for SIGINT, SIGHUP and SIGTERM which uses
 	 * Tcl_Exit instead of exit so that normal cleanup takes place if a TK
 	 * application is killed with one of these signals.
-- 
cgit v0.12


From 688d1318a11f09dd8b0300bf67ac783abe1b85d4 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Tue, 20 Oct 2020 04:32:25 +0000
Subject: Fix ifeq test which accidentally got reversed in GNUmakefile

---
 macosx/GNUmakefile | 24 ++++++++++++------------
 macosx/README      | 10 +++++++++-
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/macosx/GNUmakefile b/macosx/GNUmakefile
index 2c9ea6f..f9410cc 100644
--- a/macosx/GNUmakefile
+++ b/macosx/GNUmakefile
@@ -212,10 +212,10 @@ ifeq (${EMBEDDED_BUILD}_${INSTALL_ROOT},1_)
 	@echo "Cannot install-embedded with empty INSTALL_ROOT !" && false
 endif
 ifeq (${SUBFRAMEWORK}_${DYLIB_INSTALL_DIR},1_)
-	@echo "Cannot install-subframework with empty DYLIB_INSTALL_DIR !" && false
+	@echo "Cannot install subframework with empty DYLIB_INSTALL_DIR !" && false
 endif
 ifeq (${EMBEDDED_BUILD},1)
-	@rm -rf "${INSTALL_ROOT}${LIBDIR}/Tk.framework"
+	@rm -rf "${INSTALL_ROOT}/${LIBDIR}/Tk.framework"
 endif
 ifeq (${SUBFRAMEWORK},1)
 	@rm -rf "${INSTALL_ROOT}/Frameworks/Tk.framework"
@@ -234,8 +234,8 @@ ifeq (${EMBEDDED_BUILD},1)
 else
 # install wish symbolic link
 	@ln -fs ${WISH} "${INSTALL_ROOT}${BINDIR}/${wish}"
-endif
-endif
+endif # embedded
+endif # install
 ifeq (${BUILD_STYLE}_${EMBEDDED_BUILD},Development_)
 # keep copy of debug library around, so that
 # Deployment build can be installed on top
@@ -243,10 +243,10 @@ ifeq (${BUILD_STYLE}_${EMBEDDED_BUILD},Development_)
 # the debug library
 	@cd "${INSTALL_ROOT}${LIBDIR}/${PRODUCT_NAME}.framework/Versions/${VERSION}" && \
 	ln -f "${PRODUCT_NAME}" "${PRODUCT_NAME}_debug"
-endif
+endif # Development, not embedded
 ifeq (${TK_X11},)
 ifeq (${SUBFRAMEWORK},)
-ifeq (${EMBEDDED_BUILD},1)
+ifeq (${EMBEDDED_BUILD},)
 # install Wish.app link in APPLICATION_INSTALL_PATH and setup 'Wish Shell' compatibility links
 	@cd "${TOP_DIR}" && if [ -n "${APP_DIR}" ]; then mkdir -p "./${APP_DIR}" && rm -rf "./${APP_DIR}/Wish.app" && \
 	ln -fsh "./$$(echo "${APP_DIR}" | sed -e 's#/[^/][^/]*#/..#g')/${FMWK_DIR}/${PRODUCT_NAME}.framework/Resources/Wish.app" "./${APP_DIR}" && \
@@ -277,17 +277,17 @@ else
 	} && \
 	fix_install_id Frameworks/Tcl.framework/Tcl Tcl && fix_install_id Frameworks/Tk.framework/Tk Tk && \
 	fix_install_name MacOS/Wish Tcl && fix_install_name MacOS/Wish Tk
-ifeq (${INSTALL_BUILD},)
+ifeq (${INSTALL_BUILD},1)
 	@cd "${TOP_DIR}" && rm -rf "./${FMWK_DIR}"/T{cl,k}.framework && rmdir -p "./${FMWK_DIR}" 2>&- || true
-endif
-endif
+endif # install
+endif # embedded
 else
-# Clean up the destination directory
+# Clean up the destination directory if this is a subframework
 	@rm -rf ${INSTALL_ROOT}/Frameworks
 	@mv "${INSTALL_ROOT}/Library/Frameworks" "${INSTALL_ROOT}"
 	@rm -rf ${INSTALL_ROOT}/Library
-endif
-endif
+endif # not subframework
+endif # not X11
 
 clean-${PROJECT}: %-${PROJECT}:
 	${DO_MAKE}
diff --git a/macosx/README b/macosx/README
index 3b38299..0cc7715 100644
--- a/macosx/README
+++ b/macosx/README
@@ -459,13 +459,21 @@ The Makefile variables TCL_FRAMEWORK_DIR and TCLSH_DIR were added with Tk 8.4.3.
 framework, use the install-embedded target and set SUBFRAMEWORK=1.  Set the
 DYLIB_INSTALL_DIR variable to the path which should be the install_name path of
 the shared library and set the DESTDIR variable to the pathname of a staging
-directory where the frameworks will be written.  For example, running the commands:
+directory where the frameworks will be written. Since the install_name is written
+at compile time, this build requires starting with an empty build directory.
+Also, the build will leave frameworks in the build directory that cannot be
+installed in the standard /Library/Frameworks directory.  To avoid surprises,
+delete the build directory after the frameworks are built. 
+For example, running the commands:
+	rm -rf build
 	cd Tcl_src
 	make -C macosx install-embedded SUBFRAMEWORK=1 DESTDIR=/tmp/tcltk \
 	DYLIB_INSTALL_DIR=/Library/Frameworks/Python.framework/Versions/3.9/Frameworks/Tcl
 	cd ../Tk_src
 	make -C macosx install-embedded SUBFRAMEWORK=1 DESTDIR=/tmp/tcltk \
 	DYLIB_INSTALL_DIR=/Library/Frameworks/Python.framework/Versions/3.9/Frameworks/Tk
+	cd ..
+	rm -rf build
 will produce a Tcl.framework and a Tk.framework usable as subframeworks of the
 Python.framework.  The frameworks will be found in /tmp/tcltk/Frameworks/
 
-- 
cgit v0.12


From 6453a55538a3e3af1fbf3ae0b905988967a2200a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 20 Oct 2020 10:10:34 +0000
Subject: Proposed fix for [c2483bfe4b]: tk fontchooser on macOS can
 automatically open on startup, can lead to crashes. Which also works for Tcl
 8.7 and 9.0

---
 generic/tkPlatDecls.h |  5 +++++
 macosx/tkMacOSXInit.c | 45 +++++++++++++++++++++++++++------------------
 unix/tkAppInit.c      |  8 ++++++++
 3 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h
index bad633f..2fea41e 100644
--- a/generic/tkPlatDecls.h
+++ b/generic/tkPlatDecls.h
@@ -193,6 +193,11 @@ extern const TkPlatStubs *tkPlatStubsPtr;
 
 /* !END!: Do not edit above this line. */
 
+#if !defined(USE_SYSTEM_EXIT) && defined(MAC_OSX_TK)
+EXTERN int TkMacOSXIsLaunched(void);
+EXTERN TCL_NORETURN void TkMacOSXExitProc(void *);
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index 0e7dfe4..1323333 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -294,26 +294,33 @@ static void closePanels(
  * correctly for all termination scenarios.
  */
 
+#if !defined(USE_SYSTEM_EXIT)
+static Bool doCleanupFromExit = NO;
+
+int TkMacOSXIsLaunched(void) {
+    return doCleanupFromExit == YES;
+}
+
 TCL_NORETURN void TkMacOSXExitProc(
-    ClientData clientdata)
+    void *clientdata)
 {
-    closePanels();
-
-    /*
-     * Make sure we don't get called again.  This can happen, e.g. with
-     * fossil diff -tk.
-     */
-    
-    Tcl_SetExitProc(NULL);
+    Bool doCleanup = doCleanupFromExit;
+    if (doCleanupFromExit) {
+	doCleanupFromExit = NO; /* prevent possible recursive call. */
+	closePanels();
+    }
 
     /*
      * Tcl_Exit does not call Tcl_Finalize if there is an exit proc installed.
      */
     
     Tcl_Finalize();
-    [(TKApplication *)NSApp superTerminate:nil]; /* Should not return. */
+    if (doCleanup == YES) {
+	[(TKApplication *)NSApp superTerminate:nil]; /* Should not return. */
+    }
     exit((int)clientdata); /* Convince the compiler that we don't return. */
 }
+#endif
 
 /*
  * This signal handler is installed for the SIGINT, SIGHUP and SIGTERM signals
@@ -326,6 +333,8 @@ TCL_NORETURN void TkMacOSXExitProc(
  */
 
 static void TkMacOSXSignalHandler(int signal) {
+    (void)signal;
+
     Tcl_Exit(1);
 }
 
@@ -343,7 +352,6 @@ TkpInit(
     if (!initialized) {
 	struct stat st;
 	Bool shouldOpenConsole = NO;
-	Bool isLaunched = NO;
         Bool stdinIsNullish = (!isatty(0) &&
 	    (fstat(0, &st) || (S_ISCHR(st.st_mode) && st.st_blocks == 0)));
 
@@ -443,7 +451,9 @@ TkpInit(
 		Tcl_SetVar2(interp, "tcl_interactive", NULL, "1",
 			    TCL_GLOBAL_ONLY);
 	    }
-	    isLaunched = YES;
+#if !defined(USE_SYSTEM_EXIT)
+	    doCleanupFromExit = YES;
+#endif
 	    shouldOpenConsole = YES;
 	}
 	if (shouldOpenConsole) {
@@ -466,7 +476,9 @@ TkpInit(
 	    FILE *null = fopen("/dev/null", "w");
 	    dup2(fileno(null), STDOUT_FILENO);
 	    dup2(fileno(null), STDERR_FILENO);
-	    isLaunched = YES;
+#if !defined(USE_SYSTEM_EXIT)
+	    doCleanupFromExit = YES;
+#endif
 	}
 
 	/*
@@ -513,11 +525,8 @@ TkpInit(
 
 # if !defined(USE_SYSTEM_EXIT)
 
-	if (isLaunched || (isatty(0) && isatty(1))) {
-	    Tcl_ExitProc *prevExitProc = Tcl_SetExitProc(TkMacOSXExitProc);
-	    if (prevExitProc) {
-		Tcl_SetExitProc((TCL_NORETURN Tcl_ExitProc *)prevExitProc);
-	    }
+	if ((isatty(0) && isatty(1))) {
+	    doCleanupFromExit = YES;
 	}
 
 # endif
diff --git a/unix/tkAppInit.c b/unix/tkAppInit.c
index 13bcdde..aa9315c 100644
--- a/unix/tkAppInit.c
+++ b/unix/tkAppInit.c
@@ -15,6 +15,9 @@
 #undef BUILD_tk
 #undef STATIC_BUILD
 #include "tk.h"
+#if !defined(USE_SYSTEM_EXIT) && defined(MAC_OSX_TK)
+#   include "tkMacOSX.h"
+#endif
 
 #ifdef TK_TEST
 extern Tcl_PackageInitProc Tktest_Init;
@@ -110,6 +113,11 @@ Tcl_AppInit(
 	return TCL_ERROR;
     }
     Tcl_StaticPackage(interp, "Tk", Tk_Init, Tk_SafeInit);
+#if !defined(USE_SYSTEM_EXIT) && defined(MAC_OSX_TK)
+    if (TkMacOSXIsLaunched()) {
+	Tcl_SetExitProc(TkMacOSXExitProc);
+    }
+#endif
 
 #ifdef TK_TEST
     if (Tktest_Init(interp) == TCL_ERROR) {
-- 
cgit v0.12


From 4c940e28df4d5740b0ab2904ed4c673e5678ddf0 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Tue, 20 Oct 2020 17:41:43 +0000
Subject: Avoid platform-specific conditional compilation where possible.

---
 generic/tkPlatDecls.h |  5 -----
 macosx/tkMacOSXInit.c | 19 +++++++++++--------
 macosx/tkMacOSXPort.h |  8 ++++++++
 unix/tkAppInit.c      | 12 ++++++------
 4 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h
index 2fea41e..bad633f 100644
--- a/generic/tkPlatDecls.h
+++ b/generic/tkPlatDecls.h
@@ -193,11 +193,6 @@ extern const TkPlatStubs *tkPlatStubsPtr;
 
 /* !END!: Do not edit above this line. */
 
-#if !defined(USE_SYSTEM_EXIT) && defined(MAC_OSX_TK)
-EXTERN int TkMacOSXIsLaunched(void);
-EXTERN TCL_NORETURN void TkMacOSXExitProc(void *);
-#endif
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index 1323333..5103a84 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -113,6 +113,7 @@ static int		TkMacOSXGetAppPathCmd(ClientData cd, Tcl_Interp *ip,
     /*
      * Initialize event processing.
      */
+
     TkMacOSXInitAppleEvents(_eventInterp);
 
     /*
@@ -294,14 +295,14 @@ static void closePanels(
  * correctly for all termination scenarios.
  */
 
-#if !defined(USE_SYSTEM_EXIT)
+#if defined(USE_CUSTOM_EXIT_PROC)
 static Bool doCleanupFromExit = NO;
 
-int TkMacOSXIsLaunched(void) {
+int TkpWantsExitProc(void) {
     return doCleanupFromExit == YES;
 }
 
-TCL_NORETURN void TkMacOSXExitProc(
+TCL_NORETURN void TkpExitProc(
     void *clientdata)
 {
     Bool doCleanup = doCleanupFromExit;
@@ -318,7 +319,7 @@ TCL_NORETURN void TkMacOSXExitProc(
     if (doCleanup == YES) {
 	[(TKApplication *)NSApp superTerminate:nil]; /* Should not return. */
     }
-    exit((int)clientdata); /* Convince the compiler that we don't return. */
+    exit((long)clientdata); /* Convince the compiler that we don't return. */
 }
 #endif
 
@@ -451,9 +452,11 @@ TkpInit(
 		Tcl_SetVar2(interp, "tcl_interactive", NULL, "1",
 			    TCL_GLOBAL_ONLY);
 	    }
-#if !defined(USE_SYSTEM_EXIT)
+
+#if defined(USE_CUSTOM_EXIT_PROC)
 	    doCleanupFromExit = YES;
 #endif
+
 	    shouldOpenConsole = YES;
 	}
 	if (shouldOpenConsole) {
@@ -476,7 +479,7 @@ TkpInit(
 	    FILE *null = fopen("/dev/null", "w");
 	    dup2(fileno(null), STDOUT_FILENO);
 	    dup2(fileno(null), STDERR_FILENO);
-#if !defined(USE_SYSTEM_EXIT)
+#if defined(USE_CUSTOM_EXIT_PROC)
 	    doCleanupFromExit = YES;
 #endif
 	}
@@ -520,10 +523,10 @@ TkpInit(
 	 * calling [NSApplication terminate].  This does not work correctly if
 	 * the process is part of an exec pipeline, so it is only used if the
 	 * process was launched by the launcher or if both stdin and stdout are
-	 * ttys.  If an exit proc was already installed we leave it in place.
+	 * ttys.
 	 */
 
-# if !defined(USE_SYSTEM_EXIT)
+# if defined(USE_CUSTOM_EXIT_PROC)
 
 	if ((isatty(0) && isatty(1))) {
 	    doCleanupFromExit = YES;
diff --git a/macosx/tkMacOSXPort.h b/macosx/tkMacOSXPort.h
index 76dd974..461204e 100644
--- a/macosx/tkMacOSXPort.h
+++ b/macosx/tkMacOSXPort.h
@@ -185,4 +185,12 @@ MODULE_SCOPE void TkMacOSXHandleMapOrUnmap(Tk_Window tkwin, XEvent *event);
 
 #define TkpHandleMapOrUnmap(tkwin, event)  TkMacOSXHandleMapOrUnmap(tkwin, event)
 
+/*
+ * Used by tkAppInit
+ */
+
+#define USE_CUSTOM_EXIT_PROC
+EXTERN int TkpWantsExitProc(void);
+EXTERN TCL_NORETURN void TkpExitProc(void *);
+
 #endif /* _TKMACPORT */
diff --git a/unix/tkAppInit.c b/unix/tkAppInit.c
index aa9315c..ecd9dfe 100644
--- a/unix/tkAppInit.c
+++ b/unix/tkAppInit.c
@@ -15,9 +15,7 @@
 #undef BUILD_tk
 #undef STATIC_BUILD
 #include "tk.h"
-#if !defined(USE_SYSTEM_EXIT) && defined(MAC_OSX_TK)
-#   include "tkMacOSX.h"
-#endif
+#include "tkPort.h"
 
 #ifdef TK_TEST
 extern Tcl_PackageInitProc Tktest_Init;
@@ -113,9 +111,11 @@ Tcl_AppInit(
 	return TCL_ERROR;
     }
     Tcl_StaticPackage(interp, "Tk", Tk_Init, Tk_SafeInit);
-#if !defined(USE_SYSTEM_EXIT) && defined(MAC_OSX_TK)
-    if (TkMacOSXIsLaunched()) {
-	Tcl_SetExitProc(TkMacOSXExitProc);
+
+#if defined(USE_CUSTOM_EXIT_PROC)
+    if (TkpWantsExitProc()) {
+	/* The cast below avoids warnings from old gcc compilers. */
+	Tcl_SetExitProc((void *)TkpExitProc);
     }
 #endif
 
-- 
cgit v0.12


From 9c472e72196238d8550cab9eeeb10bf9ed74be31 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Tue, 20 Oct 2020 20:15:00 +0000
Subject: Make Tcl_Finalize run when a launched app is terminated with
 command-Q

---
 macosx/tkMacOSXHLEvents.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/macosx/tkMacOSXHLEvents.c b/macosx/tkMacOSXHLEvents.c
index 615653d..5055f38 100644
--- a/macosx/tkMacOSXHLEvents.c
+++ b/macosx/tkMacOSXHLEvents.c
@@ -570,13 +570,18 @@ TkMacOSXDoHLEvent(
 static int
 ReallyKillMe(
     Tcl_Event *eventPtr,
-    int flags)
+    TCL_UNUSED(int))
 {
     Tcl_Interp *interp = ((KillEvent *) eventPtr)->interp;
     int quit = Tcl_FindCommand(interp, "::tk::mac::Quit", NULL, 0)!=NULL;
-    int code = Tcl_EvalEx(interp, quit ? "::tk::mac::Quit" : "exit", -1, TCL_EVAL_GLOBAL);
 
+    if (!quit) {
+	Tcl_Exit(0);
+    }
+
+    int code = Tcl_EvalEx(interp, "::tk::mac::Quit", -1, TCL_EVAL_GLOBAL);
     if (code != TCL_OK) {
+
 	/*
 	 * Should be never reached...
 	 */
-- 
cgit v0.12


From 0757ec2df6ba5375e6c6eb57612ffe4dbba9335f Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Tue, 20 Oct 2020 20:42:29 +0000
Subject: Cherrypick changes to comments.

---
 macosx/tkMacOSXInit.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index 5103a84..9479a00 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -293,6 +293,13 @@ static void closePanels(
  * doing this is to ensure that the NSFontPanel and the NSColorPanel are closed
  * before the process exits, and that the application state is recorded
  * correctly for all termination scenarios.
+ *
+ * TkpWantsExitProc tells Tcl_AppInit whether to install our custom exit proc,
+ * which terminates the process by calling [NSApplication terminate].  This
+ * does not work correctly if the process is part of an exec pipeline, so it is
+ * only done if the process was launched by the launcher or if both stdin and
+ * stdout are ttys.  To disable using the custom exit proc altogether, undefine
+ * USE_CUSTOM_EXIT_PROC.
  */
 
 #if defined(USE_CUSTOM_EXIT_PROC)
@@ -518,14 +525,6 @@ TkpInit(
 	    }
 	}
 
-	/*
-	 * Install our custom exit proc, which terminates the process by
-	 * calling [NSApplication terminate].  This does not work correctly if
-	 * the process is part of an exec pipeline, so it is only used if the
-	 * process was launched by the launcher or if both stdin and stdout are
-	 * ttys.
-	 */
-
 # if defined(USE_CUSTOM_EXIT_PROC)
 
 	if ((isatty(0) && isatty(1))) {
-- 
cgit v0.12


From 06bdf94419612cb578502cf30fa89ef013ecebc2 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 20 Oct 2020 22:36:13 +0000
Subject: One TCL_UNUSED and some eol-spacing

---
 macosx/README                | 2 +-
 macosx/tkMacOSXInit.c        | 5 ++---
 macosx/tkMacOSXWindowEvent.c | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/macosx/README b/macosx/README
index 0cc7715..83a3c63 100644
--- a/macosx/README
+++ b/macosx/README
@@ -463,7 +463,7 @@ directory where the frameworks will be written. Since the install_name is writte
 at compile time, this build requires starting with an empty build directory.
 Also, the build will leave frameworks in the build directory that cannot be
 installed in the standard /Library/Frameworks directory.  To avoid surprises,
-delete the build directory after the frameworks are built. 
+delete the build directory after the frameworks are built.
 For example, running the commands:
 	rm -rf build
 	cd Tcl_src
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index 9479a00..06ff367 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -321,7 +321,7 @@ TCL_NORETURN void TkpExitProc(
     /*
      * Tcl_Exit does not call Tcl_Finalize if there is an exit proc installed.
      */
-    
+
     Tcl_Finalize();
     if (doCleanup == YES) {
 	[(TKApplication *)NSApp superTerminate:nil]; /* Should not return. */
@@ -340,8 +340,7 @@ TCL_NORETURN void TkpExitProc(
  * return exit status 1.
  */
 
-static void TkMacOSXSignalHandler(int signal) {
-    (void)signal;
+static void TkMacOSXSignalHandler(TCL_UNUSED(int)) {
 
     Tcl_Exit(1);
 }
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index ca7f526..0075fb8 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -1021,7 +1021,7 @@ ConfigureRestrictProc(
 	if([NSApp isDrawing] || [self inLiveResize]) {
 	    [self generateExposeEvents: [self bounds]];
 	}
-	
+
 	/*
 	 * Finally, unlock the main autoreleasePool.
 	 */
-- 
cgit v0.12


From 6b7a70d3adc1fa78b3cfee9baa8e1f25d27eef8b Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 21 Oct 2020 15:58:38 +0000
Subject: Adapt some demo's to TIP #474 (runtime switchable, depending on Tk
 version) ,

---
 library/demos/cscroll.tcl  | 28 ++++++++++++++++++----------
 library/demos/ctext.tcl    |  2 +-
 library/demos/floor.tcl    |  2 +-
 library/demos/goldberg.tcl | 12 ++++++------
 library/demos/items.tcl    |  2 +-
 5 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/library/demos/cscroll.tcl b/library/demos/cscroll.tcl
index f64ca5d..d210c7d 100644
--- a/library/demos/cscroll.tcl
+++ b/library/demos/cscroll.tcl
@@ -56,29 +56,29 @@ for {set i 0} {$i < 20} {incr i} {
 $c bind all <Enter> "scrollEnter $c"
 $c bind all <Leave> "scrollLeave $c"
 $c bind all <Button-1> "scrollButton $c"
-if {[tk windowingsystem] eq "aqua"} {
+if {([tk windowingsystem] eq "aqua") && ![package vsatisfies [package provide Tk] 8.7-]} {
     bind $c <Button-3> "$c scan mark %x %y"
     bind $c <B3-Motion> "$c scan dragto %x %y"
     bind $c <MouseWheel> {
-	%W yview scroll [expr {-(%D)}] units
+	%W yview scroll [expr {-%D}] units
     }
     bind $c <Option-MouseWheel> {
-	%W yview scroll [expr {-10 * (%D)}] units
+	%W yview scroll [expr {-10*%D}] units
     }
     bind $c <Shift-MouseWheel> {
-	%W xview scroll [expr {-(%D)}] units
+	%W xview scroll [expr {-%D}] units
     }
     bind $c <Shift-Option-MouseWheel> {
-	%W xview scroll [expr {-10 * (%D)}] units
+	%W xview scroll [expr {-10*%D}] units
     }
 } else {
     bind $c <Button-2> "$c scan mark %x %y"
     bind $c <B2-Motion> "$c scan dragto %x %y"
     # We must make sure that positive and negative movements are rounded
     # equally to integers, avoiding the problem that
-    #     (int)1/30 = 0,
+    #     (int)1/-30 = -1,
     # but
-    #     (int)-1/30 = -1
+    #     (int)-1/-30 = 0
     # The following code ensure equal +/- behaviour.
     bind $c <MouseWheel> {
 	if {%D >= 0} {
@@ -88,7 +88,11 @@ if {[tk windowingsystem] eq "aqua"} {
 	}
     }
     bind $c <Option-MouseWheel> {
-	%W yview scroll [expr {%D/-3}] units
+	if {%D >= 0} {
+	    %W yview scroll [expr {%D/-3}] units
+	} else {
+	    %W yview scroll [expr {(%D-2)/-3}] units
+	}
     }
     bind $c <Shift-MouseWheel> {
 	if {%D >= 0} {
@@ -98,11 +102,15 @@ if {[tk windowingsystem] eq "aqua"} {
 	}
     }
     bind $c <Shift-Option-MouseWheel> {
-	%W xview scroll [expr {%D/-3}] units
+	if {%D >= 0} {
+	    %W xview scroll [expr {%D/-3}] units
+	} else {
+	    %W xview scroll [expr {(%D-2)/-3}] units
+	}
     }
 }
 
-if {[tk windowingsystem] eq "x11"} {
+if {[tk windowingsystem] eq "x11" && ![package vsatisfies [package provide Tk] 8.7-]} {
     # Support for mousewheels on Linux/Unix commonly comes through mapping
     # the wheel to the extended buttons.  If you have a mousewheel, find
     # Linux configuration info at:
diff --git a/library/demos/ctext.tcl b/library/demos/ctext.tcl
index 5acc82f..d3fec33 100644
--- a/library/demos/ctext.tcl
+++ b/library/demos/ctext.tcl
@@ -50,7 +50,7 @@ $c bind text <Return> "textInsert $c \\n"
 $c bind text <Control-h> "textBs $c"
 $c bind text <BackSpace> "textBs $c"
 $c bind text <Delete> "textDel $c"
-if {[tk windowingsystem] eq "aqua"} {
+if {[tk windowingsystem] eq "aqua" && ![package vsatisfies [package provide Tk] 8.7-]} {
     $c bind text <Button-3> "textPaste $c @%x,%y"
 } else {
     $c bind text <Button-2> "textPaste $c @%x,%y"
diff --git a/library/demos/floor.tcl b/library/demos/floor.tcl
index 37e1b95..eb2ea7f 100644
--- a/library/demos/floor.tcl
+++ b/library/demos/floor.tcl
@@ -1359,7 +1359,7 @@ $c bind floor2 <Button-1> "floorDisplay $c 2"
 $c bind floor3 <Button-1> "floorDisplay $c 3"
 $c bind room <Enter> "newRoom $c"
 $c bind room <Leave> {set currentRoom ""}
-if {[tk windowingsystem] eq "aqua"} {
+if {[tk windowingsystem] eq "aqua" && ![package vsatisfies [package provide Tk] 8.7-]} {
     bind $c <Button-3> "$c scan mark %x %y"
     bind $c <B3-Motion> "$c scan dragto %x %y"
 } else {
diff --git a/library/demos/goldberg.tcl b/library/demos/goldberg.tcl
index 284b5c2..1cc52c6 100644
--- a/library/demos/goldberg.tcl
+++ b/library/demos/goldberg.tcl
@@ -105,7 +105,7 @@ proc DoDisplay {w} {
     $w.c yview moveto .05
     pack $w.c -in $w.screen -side top -fill both -expand 1
 
-    bind $w.c <3> [list $w.pause invoke]
+    bind $w.c <Button-3> [list $w.pause invoke]
     bind $w.c <Destroy> {
 	after cancel $animationCallbacks(goldberg)
 	unset animationCallbacks(goldberg)
@@ -162,7 +162,7 @@ proc DoCtrlFrame {w} {
     grid $w.speed -in $w.ctrl -row 99 -sticky ew -pady {0 5}
     pack $w.speed.scale -fill both -expand 1
     grid $w.about -in $w.ctrl -row 100 -sticky ew
-    bind $w.reset <3> {set S(mode) -1}		;# Debugging
+    bind $w.reset <Button-3> {set S(mode) -1}		;# Debugging
 
     ## See Code / Dismiss buttons hack!
     set btns [addSeeDismiss $w.ctrl.buttons $w]
@@ -342,7 +342,7 @@ proc Draw0 {w} {
     set xy {719 119 763 119}
     $w.c create line $xy -tag I0 -fill $color -width 5 -arrow last \
 	    -arrowshape {18 18 5}
-    $w.c bind I0 <1> Start
+    $w.c bind I0 <Button-1> Start
 }
 proc Move0 {w {step {}}} {
     set step [GetStep 0 $step]
@@ -372,7 +372,7 @@ proc Draw1 {w} {
 
     set xy [box 812 122 9]
     $w.c create oval $xy -tag I1 -fill $color2 -outline {}
-    $w.c bind I1 <1> Start
+    $w.c bind I1 <Button-1> Start
 }
 proc Move1 {w {step {}}} {
     set step [GetStep 1 $step]
@@ -1620,7 +1620,7 @@ proc Move26 {w {step {}}} {
 	$w.c delete I24 I26
 	$w.c create text 430 755 -anchor s -tag I26 \
 		-text "click to continue" -font {{Times Roman} 24 bold}
-	bind $w.c <1> [list Reset $w]
+	bind $w.c <Button-1> [list Reset $w]
 	return 4
     }
 
@@ -1675,7 +1675,7 @@ proc RotateC {x y Ox Oy beta} {
 proc Reset {w} {
     global S
     DrawAll $w
-    bind $w.c <1> {}
+    bind $w.c <Button-1> {}
     set S(mode) $::MSTART
     set S(active) 0
 }
diff --git a/library/demos/items.tcl b/library/demos/items.tcl
index 545877c..1297046 100644
--- a/library/demos/items.tcl
+++ b/library/demos/items.tcl
@@ -173,7 +173,7 @@ $c create text 28.5c 17.4c -text Scale: -anchor s
 
 $c bind item <Enter> "itemEnter $c"
 $c bind item <Leave> "itemLeave $c"
-if {[tk windowingsystem] eq "aqua"} {
+if {[tk windowingsystem] eq "aqua" && ![package vsatisfies [package provide Tk] 8.7-]} {
     bind $c <Button-2> "itemMark $c %x %y"
     bind $c <B2-Motion> "itemStroke $c %x %y"
     bind $c <Button-3> "$c scan mark %x %y"
-- 
cgit v0.12


From ea46afa849cd4996b2897694cdb3b3b0150c5518 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Wed, 21 Oct 2020 18:26:50 +0000
Subject: cherrypick the changes to GNUmakefile, accidentally committed to the
 rc branch first. Fix a typo.

---
 macosx/GNUmakefile | 20 ++++++++++++++------
 macosx/README      | 22 +++++++---------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/macosx/GNUmakefile b/macosx/GNUmakefile
index f9410cc..c2e1b77 100644
--- a/macosx/GNUmakefile
+++ b/macosx/GNUmakefile
@@ -44,6 +44,18 @@ INSTALL_MANPAGES	?=
 # set to non-empty value to build TkX11 instead of TkAqua:
 TK_X11			?=
 
+# Checks and overrides for subframework builds
+ifeq (${SUBFRAMEWORK}_${TK_X11},1_)
+ifeq (${DYLIB_INSTALL_DIR},)
+	@echo "Cannot install subframework with empty DYLIB_INSTALL_DIR !" && false
+endif
+ifeq (${DESTDIR},)
+	@echo "Cannot install subframework with empty DESTDIR !" && false
+endif
+override BUILD_DIR = ${DESTDIR}/build
+override INSTALL_PATH = /Frameworks
+endif
+
 #-------------------------------------------------------------------------------------------------------
 # meta targets
 
@@ -278,14 +290,10 @@ else
 	fix_install_id Frameworks/Tcl.framework/Tcl Tcl && fix_install_id Frameworks/Tk.framework/Tk Tk && \
 	fix_install_name MacOS/Wish Tcl && fix_install_name MacOS/Wish Tk
 ifeq (${INSTALL_BUILD},1)
+	echo removing frameworks
 	@cd "${TOP_DIR}" && rm -rf "./${FMWK_DIR}"/T{cl,k}.framework && rmdir -p "./${FMWK_DIR}" 2>&- || true
-endif # install
+endif # install not subframework
 endif # embedded
-else
-# Clean up the destination directory if this is a subframework
-	@rm -rf ${INSTALL_ROOT}/Frameworks
-	@mv "${INSTALL_ROOT}/Library/Frameworks" "${INSTALL_ROOT}"
-	@rm -rf ${INSTALL_ROOT}/Library
 endif # not subframework
 endif # not X11
 
diff --git a/macosx/README b/macosx/README
index 83a3c63..834dea4 100644
--- a/macosx/README
+++ b/macosx/README
@@ -459,23 +459,15 @@ The Makefile variables TCL_FRAMEWORK_DIR and TCLSH_DIR were added with Tk 8.4.3.
 framework, use the install-embedded target and set SUBFRAMEWORK=1.  Set the
 DYLIB_INSTALL_DIR variable to the path which should be the install_name path of
 the shared library and set the DESTDIR variable to the pathname of a staging
-directory where the frameworks will be written. Since the install_name is written
-at compile time, this build requires starting with an empty build directory.
-Also, the build will leave frameworks in the build directory that cannot be
-installed in the standard /Library/Frameworks directory.  To avoid surprises,
-delete the build directory after the frameworks are built.
+directory where the frameworks will be written.  The Tcl framework must be
+built first.
 For example, running the commands:
-	rm -rf build
-	cd Tcl_src
+	make -C ../tcl8.6/macosx install-embedded SUBFRAMEWORK=1 DESTDIR=/tmp/tcltk \
+	DYLIB_INSTALL_DIR=/Library/Frameworks/Some.framework/Versions/X.Y/Frameworks/Tcl.framework
 	make -C macosx install-embedded SUBFRAMEWORK=1 DESTDIR=/tmp/tcltk \
-	DYLIB_INSTALL_DIR=/Library/Frameworks/Python.framework/Versions/3.9/Frameworks/Tcl
-	cd ../Tk_src
-	make -C macosx install-embedded SUBFRAMEWORK=1 DESTDIR=/tmp/tcltk \
-	DYLIB_INSTALL_DIR=/Library/Frameworks/Python.framework/Versions/3.9/Frameworks/Tk
-	cd ..
-	rm -rf build
-will produce a Tcl.framework and a Tk.framework usable as subframeworks of the
-Python.framework.  The frameworks will be found in /tmp/tcltk/Frameworks/
+	DYLIB_INSTALL_DIR=/Library/Frameworks/Some.framework/Versions/X.Y/Frameworks/Tk.framework
+will produce a Tcl.framework and a Tk.framework usable as subframeworks of
+Some.framework.  The frameworks will be found in /tmp/tcltk/Frameworks/
 
 5. Details regarding the macOS port of Tk.
 -------------------------------------------
-- 
cgit v0.12


From 57eaec1ea3999782e496cbc34ca0e1df6615b82f Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 22 Oct 2020 08:41:11 +0000
Subject: Assume utf-8 encoding for demo's (although they actually are still
 ASCII)

---
 library/demos/tree.tcl |  1 +
 library/demos/widget   | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/library/demos/tree.tcl b/library/demos/tree.tcl
index 8decdf2..1cc70f8 100644
--- a/library/demos/tree.tcl
+++ b/library/demos/tree.tcl
@@ -39,6 +39,7 @@ proc populateTree {tree node} {
     set path [$tree set $node fullpath]
     $tree delete [$tree children $node]
     foreach f [lsort -dictionary [glob -nocomplain -dir $path *]] {
+	set f [file normalize $f]
 	set type [file type $f]
 	set id [$tree insert $node end -text [file tail $f] \
 		-values [list $f $type]]
diff --git a/library/demos/widget b/library/demos/widget
index e543846..58da12f 100644
--- a/library/demos/widget
+++ b/library/demos/widget
@@ -516,7 +516,7 @@ proc invoke index {
     .t configure -cursor [::ttk::cursor busy]
     update
     set demo [string range [lindex $tags $i] 5 end]
-    uplevel 1 [list source [file join $tk_demoDirectory $demo.tcl]]
+    uplevel 1 [list source -encoding utf-8 [file join $tk_demoDirectory $demo.tcl]]
     update
     .t configure -cursor $cursor
 
@@ -624,6 +624,7 @@ proc showCode w {
     wm title $top [mc "Demo code: %s" [file join $tk_demoDirectory $file]]
     wm iconname $top $file
     set id [open [file join $tk_demoDirectory $file]]
+    fconfigure $id -encoding utf-8 -eofchar \032
     $top.f.text delete 1.0 end
     $top.f.text insert 1.0 [read $id]
     $top.f.text mark set insert 1.0
@@ -722,10 +723,10 @@ proc PrintTextWin32 {filename} {
 proc tkAboutDialog {} {
     tk_messageBox -icon info -type ok -title [mc "About Widget Demo"] \
 	    -message [mc "Tk widget demonstration application"] -detail \
-"[mc "Copyright \u00a9 %s" {1996-1997 Sun Microsystems, Inc.}]
-[mc "Copyright \u00a9 %s" {1997-2000 Ajuba Solutions, Inc.}]
-[mc "Copyright \u00a9 %s" {2001-2009 Donal K. Fellows}]
-[mc "Copyright \u00a9 %s" {2002-2007 Daniel A. Steffen}]"
+"[mc "Copyright \xA9 %s" {1996-1997 Sun Microsystems, Inc.}]
+[mc "Copyright \xA9 %s" {1997-2000 Ajuba Solutions, Inc.}]
+[mc "Copyright \xA9 %s" {2001-2009 Donal K. Fellows}]
+[mc "Copyright \xA9 %s" {2002-2007 Daniel A. Steffen}]"
 }
 
 # Local Variables:
-- 
cgit v0.12


From 299096a5bc3efceb79c93c0f948d80f74565c858 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 22 Oct 2020 11:10:47 +0000
Subject: Always use "source -encoding utf-8" in the demos just to be sure.

---
 library/demos/bind.tcl |  12 ++---
 library/demos/tclIndex | 118 ++++++++++++++++++++++++-------------------------
 2 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/library/demos/bind.tcl b/library/demos/bind.tcl
index 9146362..8b56639 100644
--- a/library/demos/bind.tcl
+++ b/library/demos/bind.tcl
@@ -67,12 +67,12 @@ foreach tag {d1 d2 d3 d4 d5 d6} {
     $w.text tag bind $tag <Leave> "$w.text tag configure $tag $normal"
 }
 # Main widget program sets variable tk_demoDirectory
-$w.text tag bind d1 <Button-1> {source [file join $tk_demoDirectory items.tcl]}
-$w.text tag bind d2 <Button-1> {source [file join $tk_demoDirectory plot.tcl]}
-$w.text tag bind d3 <Button-1> {source [file join $tk_demoDirectory ctext.tcl]}
-$w.text tag bind d4 <Button-1> {source [file join $tk_demoDirectory arrow.tcl]}
-$w.text tag bind d5 <Button-1> {source [file join $tk_demoDirectory ruler.tcl]}
-$w.text tag bind d6 <Button-1> {source [file join $tk_demoDirectory cscroll.tcl]}
+$w.text tag bind d1 <Button-1> {source -encoding utf-8 [file join $tk_demoDirectory items.tcl]}
+$w.text tag bind d2 <Button-1> {source -encoding utf-8 [file join $tk_demoDirectory plot.tcl]}
+$w.text tag bind d3 <Button-1> {source -encoding utf-8 [file join $tk_demoDirectory ctext.tcl]}
+$w.text tag bind d4 <Button-1> {source -encoding utf-8 [file join $tk_demoDirectory arrow.tcl]}
+$w.text tag bind d5 <Button-1> {source -encoding utf-8 [file join $tk_demoDirectory ruler.tcl]}
+$w.text tag bind d6 <Button-1> {source -encoding utf-8 [file join $tk_demoDirectory cscroll.tcl]}
 
 $w.text mark set insert 0.0
 $w.text configure -state disabled
diff --git a/library/demos/tclIndex b/library/demos/tclIndex
index 86a72e2..cdb2f2c 100644
--- a/library/demos/tclIndex
+++ b/library/demos/tclIndex
@@ -6,62 +6,62 @@
 # element name is the name of a command and the value is
 # a script that loads the command.
 
-set auto_index(arrowSetup) [list source [file join $dir arrow.tcl]]
-set auto_index(arrowMove1) [list source [file join $dir arrow.tcl]]
-set auto_index(arrowMove2) [list source [file join $dir arrow.tcl]]
-set auto_index(arrowMove3) [list source [file join $dir arrow.tcl]]
-set auto_index(textLoadFile) [list source [file join $dir search.tcl]]
-set auto_index(textSearch) [list source [file join $dir search.tcl]]
-set auto_index(textToggle) [list source [file join $dir search.tcl]]
-set auto_index(itemEnter) [list source [file join $dir items.tcl]]
-set auto_index(itemLeave) [list source [file join $dir items.tcl]]
-set auto_index(itemMark) [list source [file join $dir items.tcl]]
-set auto_index(itemStroke) [list source [file join $dir items.tcl]]
-set auto_index(itemsUnderArea) [list source [file join $dir items.tcl]]
-set auto_index(itemStartDrag) [list source [file join $dir items.tcl]]
-set auto_index(itemDrag) [list source [file join $dir items.tcl]]
-set auto_index(butPress) [list source [file join $dir items.tcl]]
-set auto_index(loadDir) [list source [file join $dir image2.tcl]]
-set auto_index(loadImage) [list source [file join $dir image2.tcl]]
-set auto_index(rulerMkTab) [list source [file join $dir ruler.tcl]]
-set auto_index(rulerNewTab) [list source [file join $dir ruler.tcl]]
-set auto_index(rulerSelectTab) [list source [file join $dir ruler.tcl]]
-set auto_index(rulerMoveTab) [list source [file join $dir ruler.tcl]]
-set auto_index(rulerReleaseTab) [list source [file join $dir ruler.tcl]]
-set auto_index(mkTextConfig) [list source [file join $dir ctext.tcl]]
-set auto_index(textEnter) [list source [file join $dir ctext.tcl]]
-set auto_index(textInsert) [list source [file join $dir ctext.tcl]]
-set auto_index(textPaste) [list source [file join $dir ctext.tcl]]
-set auto_index(textB1Press) [list source [file join $dir ctext.tcl]]
-set auto_index(textB1Move) [list source [file join $dir ctext.tcl]]
-set auto_index(textBs) [list source [file join $dir ctext.tcl]]
-set auto_index(textDel) [list source [file join $dir ctext.tcl]]
-set auto_index(bitmapRow) [list source [file join $dir bitmap.tcl]]
-set auto_index(scrollEnter) [list source [file join $dir cscroll.tcl]]
-set auto_index(scrollLeave) [list source [file join $dir cscroll.tcl]]
-set auto_index(scrollButton) [list source [file join $dir cscroll.tcl]]
-set auto_index(textWindOn) [list source [file join $dir twind.tcl]]
-set auto_index(textWindOff) [list source [file join $dir twind.tcl]]
-set auto_index(textWindPlot) [list source [file join $dir twind.tcl]]
-set auto_index(embPlotDown) [list source [file join $dir twind.tcl]]
-set auto_index(embPlotMove) [list source [file join $dir twind.tcl]]
-set auto_index(textWindDel) [list source [file join $dir twind.tcl]]
-set auto_index(embDefBg) [list source [file join $dir twind.tcl]]
-set auto_index(floorDisplay) [list source [file join $dir floor.tcl]]
-set auto_index(newRoom) [list source [file join $dir floor.tcl]]
-set auto_index(roomChanged) [list source [file join $dir floor.tcl]]
-set auto_index(bg1) [list source [file join $dir floor.tcl]]
-set auto_index(bg2) [list source [file join $dir floor.tcl]]
-set auto_index(bg3) [list source [file join $dir floor.tcl]]
-set auto_index(fg1) [list source [file join $dir floor.tcl]]
-set auto_index(fg2) [list source [file join $dir floor.tcl]]
-set auto_index(fg3) [list source [file join $dir floor.tcl]]
-set auto_index(setWidth) [list source [file join $dir hscale.tcl]]
-set auto_index(plotDown) [list source [file join $dir plot.tcl]]
-set auto_index(plotMove) [list source [file join $dir plot.tcl]]
-set auto_index(puzzleSwitch) [list source [file join $dir puzzle.tcl]]
-set auto_index(setHeight) [list source [file join $dir vscale.tcl]]
-set auto_index(showMessageBox) [list source [file join $dir msgbox.tcl]]
-set auto_index(setColor) [list source [file join $dir clrpick.tcl]]
-set auto_index(setColor_helper) [list source [file join $dir clrpick.tcl]]
-set auto_index(fileDialog) [list source [file join $dir filebox.tcl]]
+set auto_index(arrowSetup) [list source -encoding utf-8 [file join $dir arrow.tcl]]
+set auto_index(arrowMove1) [list source -encoding utf-8 [file join $dir arrow.tcl]]
+set auto_index(arrowMove2) [list source -encoding utf-8 [file join $dir arrow.tcl]]
+set auto_index(arrowMove3) [list source -encoding utf-8 [file join $dir arrow.tcl]]
+set auto_index(textLoadFile) [list source -encoding utf-8 [file join $dir search.tcl]]
+set auto_index(textSearch) [list source -encoding utf-8 [file join $dir search.tcl]]
+set auto_index(textToggle) [list source -encoding utf-8 [file join $dir search.tcl]]
+set auto_index(itemEnter) [list source -encoding utf-8 [file join $dir items.tcl]]
+set auto_index(itemLeave) [list source -encoding utf-8 [file join $dir items.tcl]]
+set auto_index(itemMark) [list source -encoding utf-8 [file join $dir items.tcl]]
+set auto_index(itemStroke) [list source -encoding utf-8 [file join $dir items.tcl]]
+set auto_index(itemsUnderArea) [list source -encoding utf-8 [file join $dir items.tcl]]
+set auto_index(itemStartDrag) [list source -encoding utf-8 [file join $dir items.tcl]]
+set auto_index(itemDrag) [list source -encoding utf-8 [file join $dir items.tcl]]
+set auto_index(butPress) [list source -encoding utf-8 [file join $dir items.tcl]]
+set auto_index(loadDir) [list source -encoding utf-8 [file join $dir image2.tcl]]
+set auto_index(loadImage) [list source -encoding utf-8 [file join $dir image2.tcl]]
+set auto_index(rulerMkTab) [list source -encoding utf-8 [file join $dir ruler.tcl]]
+set auto_index(rulerNewTab) [list source -encoding utf-8 [file join $dir ruler.tcl]]
+set auto_index(rulerSelectTab) [list source -encoding utf-8 [file join $dir ruler.tcl]]
+set auto_index(rulerMoveTab) [list source -encoding utf-8 [file join $dir ruler.tcl]]
+set auto_index(rulerReleaseTab) [list source -encoding utf-8 [file join $dir ruler.tcl]]
+set auto_index(mkTextConfig) [list source -encoding utf-8 [file join $dir ctext.tcl]]
+set auto_index(textEnter) [list source -encoding utf-8 [file join $dir ctext.tcl]]
+set auto_index(textInsert) [list source -encoding utf-8 [file join $dir ctext.tcl]]
+set auto_index(textPaste) [list source -encoding utf-8 [file join $dir ctext.tcl]]
+set auto_index(textB1Press) [list source -encoding utf-8 [file join $dir ctext.tcl]]
+set auto_index(textB1Move) [list source -encoding utf-8 [file join $dir ctext.tcl]]
+set auto_index(textBs) [list source -encoding utf-8 [file join $dir ctext.tcl]]
+set auto_index(textDel) [list source -encoding utf-8 [file join $dir ctext.tcl]]
+set auto_index(bitmapRow) [list source -encoding utf-8 [file join $dir bitmap.tcl]]
+set auto_index(scrollEnter) [list source -encoding utf-8 [file join $dir cscroll.tcl]]
+set auto_index(scrollLeave) [list source -encoding utf-8 [file join $dir cscroll.tcl]]
+set auto_index(scrollButton) [list source -encoding utf-8 [file join $dir cscroll.tcl]]
+set auto_index(textWindOn) [list source -encoding utf-8 [file join $dir twind.tcl]]
+set auto_index(textWindOff) [list source -encoding utf-8 [file join $dir twind.tcl]]
+set auto_index(textWindPlot) [list source -encoding utf-8 [file join $dir twind.tcl]]
+set auto_index(embPlotDown) [list source -encoding utf-8 [file join $dir twind.tcl]]
+set auto_index(embPlotMove) [list source -encoding utf-8 [file join $dir twind.tcl]]
+set auto_index(textWindDel) [list source -encoding utf-8 [file join $dir twind.tcl]]
+set auto_index(embDefBg) [list source -encoding utf-8 [file join $dir twind.tcl]]
+set auto_index(floorDisplay) [list source -encoding utf-8 [file join $dir floor.tcl]]
+set auto_index(newRoom) [list source -encoding utf-8 [file join $dir floor.tcl]]
+set auto_index(roomChanged) [list source -encoding utf-8 [file join $dir floor.tcl]]
+set auto_index(bg1) [list source -encoding utf-8 [file join $dir floor.tcl]]
+set auto_index(bg2) [list source -encoding utf-8 [file join $dir floor.tcl]]
+set auto_index(bg3) [list source -encoding utf-8 [file join $dir floor.tcl]]
+set auto_index(fg1) [list source -encoding utf-8 [file join $dir floor.tcl]]
+set auto_index(fg2) [list source -encoding utf-8 [file join $dir floor.tcl]]
+set auto_index(fg3) [list source -encoding utf-8 [file join $dir floor.tcl]]
+set auto_index(setWidth) [list source -encoding utf-8 [file join $dir hscale.tcl]]
+set auto_index(plotDown) [list source -encoding utf-8 [file join $dir plot.tcl]]
+set auto_index(plotMove) [list source -encoding utf-8 [file join $dir plot.tcl]]
+set auto_index(puzzleSwitch) [list source -encoding utf-8 [file join $dir puzzle.tcl]]
+set auto_index(setHeight) [list source -encoding utf-8 [file join $dir vscale.tcl]]
+set auto_index(showMessageBox) [list source -encoding utf-8 [file join $dir msgbox.tcl]]
+set auto_index(setColor) [list source -encoding utf-8 [file join $dir clrpick.tcl]]
+set auto_index(setColor_helper) [list source -encoding utf-8 [file join $dir clrpick.tcl]]
+set auto_index(fileDialog) [list source -encoding utf-8 [file join $dir filebox.tcl]]
-- 
cgit v0.12


From 0880b455913f559282daeb268693b8fb7a5b894c Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Thu, 22 Oct 2020 14:13:14 +0000
Subject: Remove an unneeded echo command in GNUmakefile.

---
 macosx/GNUmakefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/macosx/GNUmakefile b/macosx/GNUmakefile
index c2e1b77..ff028b5 100644
--- a/macosx/GNUmakefile
+++ b/macosx/GNUmakefile
@@ -290,7 +290,6 @@ else
 	fix_install_id Frameworks/Tcl.framework/Tcl Tcl && fix_install_id Frameworks/Tk.framework/Tk Tk && \
 	fix_install_name MacOS/Wish Tcl && fix_install_name MacOS/Wish Tk
 ifeq (${INSTALL_BUILD},1)
-	echo removing frameworks
 	@cd "${TOP_DIR}" && rm -rf "./${FMWK_DIR}"/T{cl,k}.framework && rmdir -p "./${FMWK_DIR}" 2>&- || true
 endif # install not subframework
 endif # embedded
-- 
cgit v0.12


From 33ba7348673118b491542cd4ba2e50f04ef249c9 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Thu, 22 Oct 2020 19:50:59 +0000
Subject: Aqua: small change to showOpenSavePanel which might prevent some API
 warnings.

---
 macosx/tkMacOSXDialog.c | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c
index 42cb4a5..ba6fabd 100644
--- a/macosx/tkMacOSXDialog.c
+++ b/macosx/tkMacOSXDialog.c
@@ -346,23 +346,25 @@ static NSInteger showOpenSavePanel(
     NSWindow *parent,
     FilePanelCallbackInfo *callbackInfo)
 {
-    NSInteger modalReturnCode;
+    __block NSInteger modalReturnCode = modalOther;
 
     if (parent && ![parent attachedSheet]) {
 	[panel beginSheetModalForWindow:parent
-	       completionHandler:^(NSModalResponse returnCode) {
-	    [NSApp tkFilePanelDidEnd:panel
-		       returnCode:returnCode
-		       contextInfo:callbackInfo ];
+		      completionHandler:^(NSModalResponse result) {
+		[NSApp tkFilePanelDidEnd:panel
+			      returnCode:result
+			     contextInfo:callbackInfo ];
+		modalReturnCode = result;
 	    }];
-
-	modalReturnCode = callbackInfo->cmdObj ? modalOther :
-	    [panel runModal];
     } else {
-	modalReturnCode = [panel runModal];
-	[NSApp tkFilePanelDidEnd:panel returnCode:modalReturnCode
-		     contextInfo:callbackInfo];
+	[panel beginWithCompletionHandler:^(NSModalResponse result) {
+		[NSApp tkFilePanelDidEnd:panel
+			      returnCode:result
+			     contextInfo:callbackInfo ];
+		modalReturnCode = result;
+	    }];
     }
+    [panel runModal];
     return modalReturnCode;
 }
 
-- 
cgit v0.12


From 5164db768ac805564630f25daae0357dad688b0c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 23 Oct 2020 08:10:17 +0000
Subject: Fix bug in TIP #474 implementation: Wrong bindings for Mousewheel in
 text widgets

---
 library/text.tcl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/text.tcl b/library/text.tcl
index e4f00d1..5d41dc3 100644
--- a/library/text.tcl
+++ b/library/text.tcl
@@ -442,16 +442,16 @@ bind Text <B2-Motion> {
 set ::tk::Priv(prevPos) {}
 
 bind Text <MouseWheel> {
-    tk::MouseWheel y %D -3.0 pixels
+    tk::MouseWheel %W y %D -3.0 pixels
 }
 bind Text <Option-MouseWheel> {
-    tk::MouseWheel y %D -0.3 pixels
+    tk::MouseWheel %W y %D -0.3 pixels
 }
 bind Text <Shift-MouseWheel> {
-    tk::MouseWheel x %D -3.0 pixels
+    tk::MouseWheel %W x %D -3.0 pixels
 }
 bind Text <Shift-Option-MouseWheel> {
-    tk::MouseWheel x %D -0.3 pixels
+    tk::MouseWheel %W x %D -0.3 pixels
 }
 
 # ::tk::TextClosestGap --
-- 
cgit v0.12


From b214554afac1888e696aabb53e87a04468ec9359 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 23 Oct 2020 10:42:02 +0000
Subject: Always "source -encoding utf-8" Tk's own script files. Since Tk 8.7
 runs in either Tcl 8.6 or 8.7, we then can trust the real encoding used, even
 though (in Tk 8.6) all those files are still ASCII

---
 library/console.tcl |  4 ++--
 library/tk.tcl      |  6 +++---
 library/ttk/ttk.tcl | 34 +++++++++++++++++-----------------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/library/console.tcl b/library/console.tcl
index 4e2b9d0..e59e6e2 100644
--- a/library/console.tcl
+++ b/library/console.tcl
@@ -215,7 +215,7 @@ proc ::tk::ConsoleSource {} {
 	    [list [mc "Tcl Scripts"] .tcl] \
 	    [list [mc "All Files"] *]]]
     if {$filename ne ""} {
-    	set cmd [list source $filename]
+    	set cmd [list source -encoding utf-8 $filename]
 	if {[catch {consoleinterp eval $cmd} result]} {
 	    ConsoleOutput stderr "$result\n"
 	}
@@ -592,7 +592,7 @@ proc ::tk::ConsoleBind {w} {
     }
     bind Console <F9> {
 	eval destroy [winfo child .]
-	source [file join $tk_library console.tcl]
+	source -encoding utf-8 [file join $tk_library console.tcl]
     }
     if {[tk windowingsystem] eq "aqua"} {
 	bind Console <Command-q> {
diff --git a/library/tk.tcl b/library/tk.tcl
index 3657511..514ebcf 100644
--- a/library/tk.tcl
+++ b/library/tk.tcl
@@ -496,7 +496,7 @@ switch -exact -- [tk windowingsystem] {
 
 if {$::tk_library ne ""} {
     proc ::tk::SourceLibFile {file} {
-        namespace eval :: [list source [file join $::tk_library $file.tcl]]
+        namespace eval :: [list source -encoding utf-8 [file join $::tk_library $file.tcl]]
     }
     namespace eval ::tk {
 	SourceLibFile icons
@@ -688,7 +688,7 @@ if {[tk windowingsystem] eq "aqua"} {
     #stub procedures to respond to "do script" Apple Events
     proc ::tk::mac::DoScriptFile {file} {
 	uplevel #0 $file
-    	source $file
+    	source -encoding utf-8 $file
     }
     proc ::tk::mac::DoScriptText {script} {
 	uplevel #0 $script
@@ -703,7 +703,7 @@ set ::tk::Priv(IMETextMark) [dict create]
 
 # Run the Ttk themed widget set initialization
 if {$::ttk::library ne ""} {
-    uplevel \#0 [list source $::ttk::library/ttk.tcl]
+    uplevel \#0 [list source -encoding utf-8 $::ttk::library/ttk.tcl]
 }
 
 # Local Variables:
diff --git a/library/ttk/ttk.tcl b/library/ttk/ttk.tcl
index 665222d..73ee3d9 100644
--- a/library/ttk/ttk.tcl
+++ b/library/ttk/ttk.tcl
@@ -12,9 +12,9 @@ namespace eval ::ttk {
     }
 }
 
-source [file join $::ttk::library fonts.tcl]
-source [file join $::ttk::library cursors.tcl]
-source [file join $::ttk::library utils.tcl]
+source -encoding utf-8 [file join $::ttk::library fonts.tcl]
+source -encoding utf-8 [file join $::ttk::library cursors.tcl]
+source -encoding utf-8 [file join $::ttk::library utils.tcl]
 
 ## ttk::deprecated $old $new --
 #	Define $old command as a deprecated alias for $new command
@@ -97,18 +97,18 @@ proc ::ttk::setTheme {theme} {
 
 ### Load widget bindings.
 #
-source [file join $::ttk::library button.tcl]
-source [file join $::ttk::library menubutton.tcl]
-source [file join $::ttk::library scrollbar.tcl]
-source [file join $::ttk::library scale.tcl]
-source [file join $::ttk::library progress.tcl]
-source [file join $::ttk::library notebook.tcl]
-source [file join $::ttk::library panedwindow.tcl]
-source [file join $::ttk::library entry.tcl]
-source [file join $::ttk::library combobox.tcl]	;# dependency: entry.tcl
-source [file join $::ttk::library spinbox.tcl]  ;# dependency: entry.tcl
-source [file join $::ttk::library treeview.tcl]
-source [file join $::ttk::library sizegrip.tcl]
+source -encoding utf-8 [file join $::ttk::library button.tcl]
+source -encoding utf-8 [file join $::ttk::library menubutton.tcl]
+source -encoding utf-8 [file join $::ttk::library scrollbar.tcl]
+source -encoding utf-8 [file join $::ttk::library scale.tcl]
+source -encoding utf-8 [file join $::ttk::library progress.tcl]
+source -encoding utf-8 [file join $::ttk::library notebook.tcl]
+source -encoding utf-8 [file join $::ttk::library panedwindow.tcl]
+source -encoding utf-8 [file join $::ttk::library entry.tcl]
+source -encoding utf-8 [file join $::ttk::library combobox.tcl]	;# dependency: entry.tcl
+source -encoding utf-8 [file join $::ttk::library spinbox.tcl]  ;# dependency: entry.tcl
+source -encoding utf-8 [file join $::ttk::library treeview.tcl]
+source -encoding utf-8 [file join $::ttk::library sizegrip.tcl]
 
 ## Label and Labelframe bindings:
 #  (not enough to justify their own file...)
@@ -122,7 +122,7 @@ proc ttk::LoadThemes {} {
     variable library
 
     # "default" always present:
-    uplevel #0 [list source [file join $library defaults.tcl]]
+    uplevel #0 [list source -encoding utf-8 [file join $library defaults.tcl]]
 
     set builtinThemes [style theme names]
     foreach {theme scripts} {
@@ -135,7 +135,7 @@ proc ttk::LoadThemes {} {
     } {
 	if {[lsearch -exact $builtinThemes $theme] >= 0} {
             foreach script $scripts {
-                uplevel #0 [list source [file join $library $script]]
+                uplevel #0 [list source -encoding utf-8 [file join $library $script]]
             }
 	}
     }
-- 
cgit v0.12


From 4d8498f181894261f21358d49ab8ba2dfe3b021a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 23 Oct 2020 10:47:53 +0000
Subject: See previous commit, but don't do this for user-provided script files

---
 library/console.tcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/console.tcl b/library/console.tcl
index e59e6e2..30c4d88 100644
--- a/library/console.tcl
+++ b/library/console.tcl
@@ -215,7 +215,7 @@ proc ::tk::ConsoleSource {} {
 	    [list [mc "Tcl Scripts"] .tcl] \
 	    [list [mc "All Files"] *]]]
     if {$filename ne ""} {
-    	set cmd [list source -encoding utf-8 $filename]
+    	set cmd [list source $filename]
 	if {[catch {consoleinterp eval $cmd} result]} {
 	    ConsoleOutput stderr "$result\n"
 	}
-- 
cgit v0.12


From e164fe342189dd2f98830e9b3854b56519d8bf74 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 23 Oct 2020 11:07:51 +0000
Subject: One more use of "source -encoding utf-8", in case we are running with
 Tcl 8.6

---
 tests/visual_bb.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/visual_bb.test b/tests/visual_bb.test
index eda67e4..36612a9 100644
--- a/tests/visual_bb.test
+++ b/tests/visual_bb.test
@@ -23,7 +23,7 @@ proc runTest {file} {
     global testNum
 
     test "2.$testNum" "testing $file" {userInteraction} {
-    uplevel \#0 source [file join [testsDirectory] $file]
+    uplevel #0 [list source -encoding utf-8 [file join [testsDirectory] $file]]
     concat ""
     } {}
     incr testNum
-- 
cgit v0.12


From 36747f6a9df2594bce1221bb241ff76364f1a324 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 23 Oct 2020 16:36:56 +0000
Subject: Fix [b5c419c8a6]: scrollbar-3.42 fails

---
 generic/tkScrollbar.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/generic/tkScrollbar.c b/generic/tkScrollbar.c
index 86ec25a..d646434 100644
--- a/generic/tkScrollbar.c
+++ b/generic/tkScrollbar.c
@@ -226,8 +226,8 @@ ScrollbarWidgetObjCmd(
     Tcl_Obj *const objv[])		/* Argument strings. */
 {
     TkScrollbar *scrollPtr = (TkScrollbar *)clientData;
-    int result = TCL_OK, cmdIndex;
-    TkSizeT length;
+    int result = TCL_OK, cmdIndex, length;
+    TkSizeT len;
     static const char *const commandNames[] = {
         "activate", "cget", "configure", "delta", "fraction",
         "get", "identify", "set", NULL
@@ -271,13 +271,13 @@ ScrollbarWidgetObjCmd(
 		Tcl_WrongNumArgs(interp, 1, objv, "activate element");
 	    goto error;
 	}
-	c = TkGetStringFromObj(objv[2], &length)[0];
+	c = TkGetStringFromObj(objv[2], &len)[0];
 	oldActiveField = scrollPtr->activeField;
 	if ((c == 'a') && (strcmp(Tcl_GetString(objv[2]), "arrow1") == 0)) {
 	    scrollPtr->activeField = TOP_ARROW;
 	} else if ((c == 'a') && (strcmp(Tcl_GetString(objv[2]), "arrow2") == 0)) {
 	    scrollPtr->activeField = BOTTOM_ARROW;
-	} else if ((c == 's') && (strncmp(Tcl_GetString(objv[2]), "slider", length) == 0)) {
+	} else if ((c == 's') && (strncmp(Tcl_GetString(objv[2]), "slider", len) == 0)) {
 	    scrollPtr->activeField = SLIDER;
 	} else {
 	    scrollPtr->activeField = OUTSIDE;
-- 
cgit v0.12


From 38f8f81b3b2a5ed3db23fc8fa7edb35c52a9eac5 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Sun, 25 Oct 2020 00:01:47 +0000
Subject: Back out change to tkMacOSXDialog.c from commit b53baf71. The
 preferred API works in Catalina and Big Sur but fails in earlier OS versions.

---
 macosx/tkMacOSXDialog.c | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c
index ba6fabd..42cb4a5 100644
--- a/macosx/tkMacOSXDialog.c
+++ b/macosx/tkMacOSXDialog.c
@@ -346,25 +346,23 @@ static NSInteger showOpenSavePanel(
     NSWindow *parent,
     FilePanelCallbackInfo *callbackInfo)
 {
-    __block NSInteger modalReturnCode = modalOther;
+    NSInteger modalReturnCode;
 
     if (parent && ![parent attachedSheet]) {
 	[panel beginSheetModalForWindow:parent
-		      completionHandler:^(NSModalResponse result) {
-		[NSApp tkFilePanelDidEnd:panel
-			      returnCode:result
-			     contextInfo:callbackInfo ];
-		modalReturnCode = result;
+	       completionHandler:^(NSModalResponse returnCode) {
+	    [NSApp tkFilePanelDidEnd:panel
+		       returnCode:returnCode
+		       contextInfo:callbackInfo ];
 	    }];
+
+	modalReturnCode = callbackInfo->cmdObj ? modalOther :
+	    [panel runModal];
     } else {
-	[panel beginWithCompletionHandler:^(NSModalResponse result) {
-		[NSApp tkFilePanelDidEnd:panel
-			      returnCode:result
-			     contextInfo:callbackInfo ];
-		modalReturnCode = result;
-	    }];
+	modalReturnCode = [panel runModal];
+	[NSApp tkFilePanelDidEnd:panel returnCode:modalReturnCode
+		     contextInfo:callbackInfo];
     }
-    [panel runModal];
     return modalReturnCode;
 }
 
-- 
cgit v0.12


From 9be66cd1af6db0fad2e35ff761f35f69f13d77f4 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Sun, 25 Oct 2020 15:04:54 +0000
Subject: Document the TK_CONSOLE environment variable for macOS

---
 doc/console.n | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/doc/console.n b/doc/console.n
index 1313d3a..86dbd46 100644
--- a/doc/console.n
+++ b/doc/console.n
@@ -25,9 +25,12 @@ the Tk library. Except for TkAqua, this command is not available when
 Tk is loaded into a tclsh interpreter with
 .QW "\fBpackage require Tk\fR" ,
 as a conventional terminal is expected to be present in that case.
-In TkAqua, this command is only available when stdin is \fB/dev/null\fR
-(as is the case e.g. when the application embedding Tk is started
-from the Mac OS X Finder).
+In TkAqua, this command is disabled when there is a startup script
+and stdin is \fB/dev/null\fR (as is the case e.g. when a bundled application
+embedding Tk is started by the macOS Launcher).  To enable the command
+in that case, define the environment variable \fBTK_CONSOLE\fR.  This can be
+done by modifying the Info.plist file by adding the LSEnvironment key
+to the main dict and setting its value to be a dict with the key \fBTK_CONSOLE\fR.
 .PP
 .TP
 \fBconsole eval \fIscript\fR
-- 
cgit v0.12


From 9a4cae2ef7fa38418385bd4d35e0095f3e59cdc2 Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Sun, 25 Oct 2020 19:45:08 +0000
Subject: Fix [5cc72e002c]: file dialogs return an empty string on older macOS
 systems.

---
 macosx/tkMacOSXDialog.c | 52 +++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 42 insertions(+), 10 deletions(-)

diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c
index 42cb4a5..05cdd95 100644
--- a/macosx/tkMacOSXDialog.c
+++ b/macosx/tkMacOSXDialog.c
@@ -23,7 +23,7 @@
 #define modalOK     NSModalResponseOK
 #define modalCancel NSModalResponseCancel
 #endif // MAC_OS_X_VERSION_MIN_REQUIRED < 1090
-#define modalOther  -1
+#define modalOther  -1 // indicates that the -command option was used. 
 #define modalError  -2
 
 /*
@@ -52,6 +52,10 @@ typedef struct {
 					 * filter. */
 } filepanelFilterInfo;
 
+/*
+ * Only one of these is needed for the application, so they can be static.
+ */
+
 static filepanelFilterInfo filterInfo;
 static NSOpenPanel *openpanel;
 static NSSavePanel *savepanel;
@@ -250,13 +254,13 @@ getFileURL(
     } else if (returnCode == modalCancel) {
 	Tcl_ResetResult(callbackInfo->interp);
     }
-    if (panel == [NSApp modalWindow]) {
-	[NSApp stopModalWithCode:returnCode];
-    }
     if (callbackInfo->cmdObj) {
 	Tcl_DecrRefCount(callbackInfo->cmdObj);
+    }
+    if (callbackInfo) {
 	ckfree(callbackInfo);
     }
+    [NSApp stopModalWithCode:returnCode];
 }
 
 - (void) tkAlertDidEnd: (NSAlert *) alert returnCode: (NSInteger) returnCode
@@ -356,14 +360,42 @@ static NSInteger showOpenSavePanel(
 		       contextInfo:callbackInfo ];
 	    }];
 
-	modalReturnCode = callbackInfo->cmdObj ? modalOther :
-	    [panel runModal];
+	/*
+	 * The sheet has been prepared, so now we have to run it as a modal
+	 * window.  Using [NSApp runModalForWindow:] on macOS 10.15 or later
+	 * generates warnings on stderr.  But using [NSOpenPanel runModal] or
+	 * [NSSavePanel runModal] on 10.14 or earler does not cause the
+	 * completion handler to run when the panel is closed.
+	 */
+
+	if ([NSApp macOSVersion] > 101400) {
+	    modalReturnCode = [panel runModal];
+	} else {
+	    modalReturnCode = [NSApp runModalForWindow:panel];
+	}
     } else {
-	modalReturnCode = [panel runModal];
-	[NSApp tkFilePanelDidEnd:panel returnCode:modalReturnCode
-		     contextInfo:callbackInfo];
+
+	/* 
+	 * For the standalone file dialog, completion handlers do not work
+	 * at all on macOS 10.14 and earlier.
+	 */
+
+	if ([NSApp macOSVersion] > 101400) {
+	    [panel beginWithCompletionHandler:^(NSModalResponse returnCode) {
+		    [NSApp tkFilePanelDidEnd:panel
+			          returnCode:returnCode
+			         contextInfo:callbackInfo ];
+	    }];
+	    modalReturnCode = [panel runModal];
+	} else {
+	    modalReturnCode = [NSApp runModalForWindow:panel];
+	    [NSApp tkFilePanelDidEnd:panel
+		   	  returnCode:modalReturnCode
+		         contextInfo:callbackInfo ];
+	    [panel close];
+	}
     }
-    return modalReturnCode;
+    return callbackInfo->cmdObj ? modalOther : modalReturnCode;
 }
 
 /*
-- 
cgit v0.12


From fd9301ebb217fdc1bfc1726a2ccdb450bbfc89f7 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Sun, 25 Oct 2020 20:11:47 +0000
Subject: Adjustment for Sierra.

---
 macosx/tkMacOSXDialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c
index 05cdd95..40f4b12 100644
--- a/macosx/tkMacOSXDialog.c
+++ b/macosx/tkMacOSXDialog.c
@@ -388,7 +388,7 @@ static NSInteger showOpenSavePanel(
 	    }];
 	    modalReturnCode = [panel runModal];
 	} else {
-	    modalReturnCode = [NSApp runModalForWindow:panel];
+	    modalReturnCode = [panel runModal];
 	    [NSApp tkFilePanelDidEnd:panel
 		   	  returnCode:modalReturnCode
 		         contextInfo:callbackInfo ];
-- 
cgit v0.12


From 7bd5c1e5436cf2f6f8fd655d891cf7d964c2a3e1 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 26 Oct 2020 08:55:43 +0000
Subject: Don't use \\U escape sequence any more in demo: No longer needed
 starting with Tcl 8.7a4

---
 library/demos/unicodeout.tcl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/library/demos/unicodeout.tcl b/library/demos/unicodeout.tcl
index bb4d8f8..759dc00 100644
--- a/library/demos/unicodeout.tcl
+++ b/library/demos/unicodeout.tcl
@@ -133,8 +133,7 @@ addSample $w Russian \
 	"\u0420\u0443\u0441\u0441\u043A\u0438\u0439 \u044F\u0437\u044B\u043A"
 if {([tk windowingsystem] ne "x11") || (![catch {tk::pkgconfig get fontsystem} fs] && ($fs eq "xft"))} {
     if {[package vsatisfies [package provide Tcl] 8.7-]} {
-	addSample $w Emoji \
-		"\U1F600\U1F4A9\U1F44D\U1F1F3\U1F1F1"
+	addSample $w Emoji "😀💩👍🇳🇱"
     } else {
 	addSample $w Emoji \
 		"\uD83D\uDE00\uD83D\uDCA9\uD83D\uDC4D\uD83C\uDDF3\uD83C\uDDF1"
-- 
cgit v0.12

-- 
cgit v0.12


From 9c4c75d2646667f334d7b2abf2942f47ed06bc4e Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 27 Oct 2020 12:19:41 +0000
Subject: No need to specify "install" and "script" in sub-builds, when they
 are equal to the global specification

---
 .travis.yml | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f52dc1b..3621b0b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -137,37 +137,24 @@ jobs:
       env:
         - BUILD_DIR=unix
         - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include"
-      install:
-        - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1)
-      script: &mactest
-        - make binaries libraries tktest
     - name: "macOS/Xcode 12/Static"
       os: osx
       osx_image: xcode12
       env:
         - BUILD_DIR=unix
         - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua --disable-shared CFLAGS=-I/usr/local/opt/tcl-tk/include"
-      install:
-        - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1)
-      script: *mactest
     - name: "macOS/Xcode 12/Debug"
       os: osx
       osx_image: xcode12
       env:
         - BUILD_DIR=unix
         - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua --enable-symbols CFLAGS=-I/usr/local/opt/tcl-tk/include"
-      install:
-        - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1)
-      script: *mactest
     - name: "macOS/Xcode 12/Shared/XQuartz"
       os: osx
       osx_image: xcode12
       env:
         - BUILD_DIR=unix
         - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --disable-corefoundation --x-includes=/opt/X11/include --x-libraries=/opt/X11/lib CFLAGS=-I/usr/local/opt/tcl-tk/include"
-      install:
-        - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1)
-      script: *mactest
 # Older MacOS versions
     - name: "macOS/Xcode 11/Shared"
       os: osx
@@ -175,9 +162,6 @@ jobs:
       env:
         - BUILD_DIR=unix
         - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.14"
-      install:
-        - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1)
-      script: *mactest
     - name: "macOS/Xcode 10/Shared"
       os: osx
       osx_image: xcode10.3
@@ -189,9 +173,6 @@ jobs:
       env:
         - BUILD_DIR=unix
         - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.14"
-      install:
-        - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1)
-      script: *mactest
     - name: "macOS/Xcode 9/Shared"
       os: osx
       osx_image: xcode9.4
@@ -203,9 +184,6 @@ jobs:
       env:
         - BUILD_DIR=unix
         - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --enable-aqua CFLAGS=-I/usr/local/opt/tcl-tk/include CPPFLAGS=-mmacosx-version-min=10.13"
-      install:
-        - ./configure ${CFGOPT} "--prefix=$HOME" || (cat config.log && exit 1)
-      script: *mactest
 # Test on Windows with MSVC native
 #   - name: "Windows/MSVC/Shared"
 #     os: windows
-- 
cgit v0.12


From 0fd1dde8cc2bed51e25230af8f739e7280e54389 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 28 Oct 2020 13:22:32 +0000
Subject: MSVC++ 6.0 does't handle C++ comments

---
 macosx/tkMacOSXDialog.c | 4 ++--
 win/tkWinDialog.c       | 6 +++---
 win/ttkWinXPTheme.c     | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c
index 40f4b12..71bb120 100644
--- a/macosx/tkMacOSXDialog.c
+++ b/macosx/tkMacOSXDialog.c
@@ -23,7 +23,7 @@
 #define modalOK     NSModalResponseOK
 #define modalCancel NSModalResponseCancel
 #endif // MAC_OS_X_VERSION_MIN_REQUIRED < 1090
-#define modalOther  -1 // indicates that the -command option was used. 
+#define modalOther  -1 // indicates that the -command option was used.
 #define modalError  -2
 
 /*
@@ -375,7 +375,7 @@ static NSInteger showOpenSavePanel(
 	}
     } else {
 
-	/* 
+	/*
 	 * For the standalone file dialog, completion handlers do not work
 	 * at all on macOS 10.14 and earlier.
 	 */
diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c
index 3702efa..cdfdafa 100644
--- a/win/tkWinDialog.c
+++ b/win/tkWinDialog.c
@@ -1086,7 +1086,7 @@ ParseOFNOptions(
     }
 
     ZeroMemory(optsPtr, sizeof(*optsPtr));
-    // optsPtr->forceXPStyle = 1;
+    /* optsPtr->forceXPStyle = 1; */
     optsPtr->tkwin = (Tk_Window)clientData;
     optsPtr->confirmOverwrite = 1; /* By default we ask for confirmation */
     Tcl_DStringInit(&optsPtr->utfDirString);
@@ -2711,10 +2711,10 @@ ChooseDirectoryValidateProc(
 
 	if (SHGetPathFromIDListW((LPITEMIDLIST) lParam, selDir)) {
 	    SendMessageW(hwnd, BFFM_SETSTATUSTEXTW, 0, (LPARAM) selDir);
-	    // enable the OK button
+	    /* enable the OK button */
 	    SendMessageW(hwnd, BFFM_ENABLEOK, 0, (LPARAM) 1);
 	} else {
-	    // disable the OK button
+	    /* disable the OK button */
 	    SendMessageW(hwnd, BFFM_ENABLEOK, 0, (LPARAM) 0);
 	}
 	UpdateWindow(hwnd);
diff --git a/win/ttkWinXPTheme.c b/win/ttkWinXPTheme.c
index 361ee8a..1c543d0 100644
--- a/win/ttkWinXPTheme.c
+++ b/win/ttkWinXPTheme.c
@@ -849,7 +849,7 @@ static void TextElementSize(
 	    Ttk_StateTableLookup(elementData->info->statemap, 0),
 	    Tcl_UtfToWCharDString(src, len, &ds),
 	    -1,
-	    DT_LEFT,// | DT_BOTTOM | DT_NOPREFIX,
+	    DT_LEFT /* | DT_BOTTOM | DT_NOPREFIX */,
 	    NULL,
 	    &rc);
 
@@ -888,7 +888,7 @@ static void TextElementDraw(
 	    Ttk_StateTableLookup(elementData->info->statemap, state),
 	    Tcl_UtfToWCharDString(src, len, &ds),
 	    -1,
-	    DT_LEFT,// | DT_BOTTOM | DT_NOPREFIX,
+	    DT_LEFT /* | DT_BOTTOM | DT_NOPREFIX */,
 	    (state & TTK_STATE_DISABLED) ? DTT_GRAYED : 0,
 	    &rc);
 
-- 
cgit v0.12


From 561fe24459c6d4f750c4ebe2a138aa563b1fb58c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 28 Oct 2020 14:20:10 +0000
Subject: Fix some C++ comments in ttkWinXPTheme.c (needed for MSVC++ 6.0) Fix
 some typing errors in code comments. Some eol-spacing elimination

---
 generic/tkCanvUtil.c |  2 +-
 generic/tkImgPhoto.c |  4 ++--
 macosx/tkMacOSXWm.c  |  8 ++++----
 win/tkWin.h          |  8 ++++----
 win/tkWinCursor.c    |  2 +-
 win/tkWinFont.c      |  8 ++++----
 win/tkWinInt.h       |  4 ++--
 win/tkWinMenu.c      |  2 +-
 win/tkWinPort.h      |  2 +-
 win/ttkWinMonitor.c  |  4 ++--
 win/ttkWinXPTheme.c  | 46 +++++++++++++++++++++++++---------------------
 xlib/xcolors.c       |  6 +++---
 12 files changed, 50 insertions(+), 46 deletions(-)

diff --git a/generic/tkCanvUtil.c b/generic/tkCanvUtil.c
index bbf8bea..420e11a 100644
--- a/generic/tkCanvUtil.c
+++ b/generic/tkCanvUtil.c
@@ -757,7 +757,7 @@ TkSmoothParseProc(
     }
 
     /*
-     * Backward compatability hack.
+     * Backward compatibility hack.
      */
 
     if (strncmp(value, "bezier", length) == 0) {
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c
index ffe4a3f..aaea896 100644
--- a/generic/tkImgPhoto.c
+++ b/generic/tkImgPhoto.c
@@ -6069,7 +6069,7 @@ ImgPhotoPostscript(
  *
  * Tk_PhotoPutBlock_NoComposite, Tk_PhotoPutZoomedBlock_NoComposite --
  *
- * These backward-compatability functions just exist to fill slots in stubs
+ * 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
@@ -6110,7 +6110,7 @@ Tk_PhotoPutZoomedBlock_NoComposite(
  * Tk_PhotoExpand_Panic, Tk_PhotoPutBlock_Panic,
  * Tk_PhotoPutZoomedBlock_Panic, Tk_PhotoSetSize_Panic
  *
- * Backward compatability functions for preserving the old behaviour (i.e.
+ * 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
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index be7bf47..f4cc084 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -1568,7 +1568,7 @@ WmColormapwindowsCmd(
     wmPtr->cmapCount = windowObjc;
 
     /*
-     * On the Macintosh all of this is just an excercise in compatability as
+     * On the Macintosh all of this is just an excercise in compatibility as
      * we don't support colormaps. If we did they would be installed here.
      */
 
@@ -4677,7 +4677,7 @@ TkWmAddToColormapWindows(
     topPtr->wmInfoPtr->cmapCount = count+1;
 
     /*
-     * On the Macintosh all of this is just an excercise in compatability as
+     * On the Macintosh all of this is just an excercise in compatibility as
      * we don't support colormaps. If we did they would be installed here.
      */
 }
@@ -5965,7 +5965,7 @@ TkpChangeFocus(
 	    [win makeKeyAndOrderFront:NSApp];
 	}
     }
-	
+
     /*
      * Remember the current serial number for the X server and issue a dummy
      * server request. This marks the position at which we changed the focus,
@@ -6447,7 +6447,7 @@ TkMacOSXMakeFullscreen(
 	[window setStyleMask: NSBorderlessWindowMask];
 	[NSApp setPresentationOptions: NSApplicationPresentationAutoHideDock
 	     | NSApplicationPresentationAutoHideMenuBar];
-        
+
 #endif /*TK_GOT_AT_LEAST_SNOW_LEOPARD*/
     } else {
 	wmPtr->flags &= ~WM_FULLSCREEN;
diff --git a/win/tkWin.h b/win/tkWin.h
index 00d3486..8e4bdef 100644
--- a/win/tkWin.h
+++ b/win/tkWin.h
@@ -43,9 +43,9 @@
 
 /*
  * The following messages are used to communicate between a Tk toplevel
- * and its container window. A Tk container may not be able to provide 
- * service to all of the following requests at the moment. But an embedded 
- * Tk window will send out these requests to support external Tk container 
+ * and its container window. A Tk container may not be able to provide
+ * service to all of the following requests at the moment. But an embedded
+ * Tk window will send out these requests to support external Tk container
  * application.
  */
 
@@ -66,7 +66,7 @@
 
 /*
  * The following are sub-messages (wParam) for TK_INFO.  An embedded window may
- * send a TK_INFO message with one of the sub-messages to query a container 
+ * send a TK_INFO message with one of the sub-messages to query a container
  * for verification and availability
  */
 #define TK_CONTAINER_VERIFY	    0x01
diff --git a/win/tkWinCursor.c b/win/tkWinCursor.c
index dee3419..cb36b29 100644
--- a/win/tkWinCursor.c
+++ b/win/tkWinCursor.c
@@ -104,7 +104,7 @@ TkGetCursorByName(
 
     /*
      * All cursor names are valid lists of one element (for
-     * Unix-compatability), even unadorned system cursor names.
+     * Unix-compatibility), even unadorned system cursor names.
      */
 
     if (Tcl_SplitList(interp, string, &argc, &argv) != TCL_OK) {
diff --git a/win/tkWinFont.c b/win/tkWinFont.c
index 1292772..bdd0d05 100644
--- a/win/tkWinFont.c
+++ b/win/tkWinFont.c
@@ -338,7 +338,7 @@ CreateNamedSystemLogFont(
 {
     HFONT hFont;
     int r;
-    
+
     hFont = CreateFontIndirect(logFontPtr);
     r = CreateNamedSystemFont(interp, tkwin, name, hFont);
     DeleteObject((HGDIOBJ)hFont);
@@ -368,7 +368,7 @@ CreateNamedSystemFont(
 {
     WinFont winfont;
     int r;
-    
+
     TkDeleteNamedFont(NULL, tkwin, name);
     InitFont(tkwin, hFont, 0, &winfont);
     r = TkCreateNamedFont(interp, tkwin, name, &winfont.font.fa);
@@ -446,7 +446,7 @@ TkWinSetupSystemFonts(TkMainInfo *mainPtr)
     {
 	LOGFONTA lfFixed = {
 	    0, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, DEFAULT_CHARSET,
-	    0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, "" 
+	    0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, ""
 	};
 	long pointSize, dpi;
 	HDC hdc = GetDC(NULL);
@@ -457,7 +457,7 @@ TkWinSetupSystemFonts(TkMainInfo *mainPtr)
 	CreateNamedSystemLogFont(interp, tkwin, "TkFixedFont", &lfFixed);
     }
 
-    /* 
+    /*
      * Setup the remaining standard Tk font names as named fonts.
      */
 
diff --git a/win/tkWinInt.h b/win/tkWinInt.h
index abac7b0..451457d 100644
--- a/win/tkWinInt.h
+++ b/win/tkWinInt.h
@@ -243,8 +243,8 @@ int			TkpWmGetState(TkWindow *winPtr);
 
 /*
  * The following functions are not present in old versions of Windows
- * API headers but are used in the Tk source to ensure 64bit 
- * compatability.
+ * API headers but are used in the Tk source to ensure 64bit
+ * compatibility.
  */
 
 #ifndef GetClassLongPtr
diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c
index 5772f04..64d3d65 100644
--- a/win/tkWinMenu.c
+++ b/win/tkWinMenu.c
@@ -217,7 +217,7 @@ GetNewID(
     TkMenuEntry *mePtr,		/* The menu we are working with. */
     WORD *menuIDPtr)		/* The resulting id. */
 {
-    ThreadSpecificData *tsdPtr = (ThreadSpecificData *) 
+    ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
     WORD curID = tsdPtr->lastCommandID;
 
diff --git a/win/tkWinPort.h b/win/tkWinPort.h
index 2925dae..54e07b7 100644
--- a/win/tkWinPort.h
+++ b/win/tkWinPort.h
@@ -118,7 +118,7 @@
 	| ((p)->green & 0xff00) | (((p)->blue << 8) & 0xff0000)) | 0x20000000)
 
 /*
- * These calls implement native bitmaps which are not currently 
+ * These calls implement native bitmaps which are not currently
  * supported under Windows.  The macros eliminate the calls.
  */
 
diff --git a/win/ttkWinMonitor.c b/win/ttkWinMonitor.c
index 25c9c0c..6848a1b 100644
--- a/win/ttkWinMonitor.c
+++ b/win/ttkWinMonitor.c
@@ -74,7 +74,7 @@ CreateThemeMonitorWindow(HINSTANCE hinst, Tcl_Interp *interp)
     HWND       hwnd = NULL;
     TCHAR      title[32] = TEXT("TtkMonitorWindow");
     TCHAR      name[32] = TEXT("TtkMonitorClass");
-    
+
     wc.cbSize        = sizeof(WNDCLASSEX);
     wc.style         = CS_HREDRAW | CS_VREDRAW;
     wc.lpfnWndProc   = (WNDPROC)WndProc;
@@ -99,7 +99,7 @@ CreateThemeMonitorWindow(HINSTANCE hinst, Tcl_Interp *interp)
     return hwnd;
 }
 
-static void 
+static void
 DestroyThemeMonitorWindow(void *clientData)
 {
     HWND hwnd = (HWND)clientData;
diff --git a/win/ttkWinXPTheme.c b/win/ttkWinXPTheme.c
index 5bc2483..bd83dfa 100644
--- a/win/ttkWinXPTheme.c
+++ b/win/ttkWinXPTheme.c
@@ -106,7 +106,7 @@ LoadXPThemeProcs(HINSTANCE *phlib)
 	 * We have successfully loaded the library. Proceed in storing the
 	 * addresses of the functions we want to use.
 	 */
-	XPThemeProcs *procs = (XPThemeProcs*)ckalloc(sizeof(XPThemeProcs));
+	XPThemeProcs *procs = (XPThemeProcs *)ckalloc(sizeof(XPThemeProcs));
 #define LOADPROC(name) \
 	(0 != (procs->name = (name ## Proc *)(void *)GetProcAddress(handle, #name) ))
 
@@ -138,7 +138,7 @@ LoadXPThemeProcs(HINSTANCE *phlib)
 static void
 XPThemeDeleteProc(void *clientData)
 {
-    XPThemeData *themeData = clientData;
+    XPThemeData *themeData = (XPThemeData *)clientData;
     FreeLibrary(themeData->hlibrary);
     ckfree(clientData);
 }
@@ -146,9 +146,11 @@ XPThemeDeleteProc(void *clientData)
 static int
 XPThemeEnabled(Ttk_Theme theme, void *clientData)
 {
-    XPThemeData *themeData = clientData;
+    XPThemeData *themeData = (XPThemeData *)clientData;
     int active = themeData->procs->IsThemeActive();
     int themed = themeData->procs->IsAppThemed();
+    (void)theme;
+
     return (active && themed);
 }
 
@@ -411,7 +413,7 @@ typedef struct
 static ElementData *
 NewElementData(XPThemeProcs *procs, ElementInfo *info)
 {
-    ElementData *elementData = (ElementData*)ckalloc(sizeof(ElementData));
+    ElementData *elementData = (ElementData *)ckalloc(sizeof(ElementData));
 
     elementData->procs = procs;
     elementData->info = info;
@@ -427,7 +429,7 @@ NewElementData(XPThemeProcs *procs, ElementInfo *info)
  */
 static void DestroyElementData(void *clientData)
 {
-    ElementData *elementData = clientData;
+    ElementData *elementData = (ElementData *)clientData;
     if (elementData->info->flags & HEAP_ELEMENT) {
 	ckfree((char *)elementData->info->statemap);
 	ckfree((char *)elementData->info->className);
@@ -453,7 +455,7 @@ InitElementData(ElementData *elementData, Tk_Window tkwin, Drawable d)
 {
     Window win = Tk_WindowId(tkwin);
 
-    if (win != None) {
+    if (win) {
 	elementData->hwnd = Tk_GetHWND(win);
     } else  {
 	elementData->hwnd = elementData->procs->stubWindow;
@@ -495,9 +497,10 @@ static void GenericElementSize(
     void *clientData, void *elementRecord, Tk_Window tkwin,
     int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr)
 {
-    ElementData *elementData = clientData;
+    ElementData *elementData = (ElementData *)clientData;
     HRESULT result;
     SIZE size;
+    (void)elementRecord;
 
     if (!InitElementData(elementData, tkwin, 0))
 	return;
@@ -531,8 +534,9 @@ static void GenericElementDraw(
     void *clientData, void *elementRecord, Tk_Window tkwin,
     Drawable d, Ttk_Box b, unsigned int state)
 {
-    ElementData *elementData = clientData;
+    ElementData *elementData = (ElementData *)clientData;
     RECT rc;
+    (void)elementRecord;
 
     if (!InitElementData(elementData, tkwin, d)) {
 	return;
@@ -576,7 +580,7 @@ GenericSizedElementSize(
     void *clientData, void *elementRecord, Tk_Window tkwin,
     int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr)
 {
-    ElementData *elementData = clientData;
+    ElementData *elementData = (ElementData *)clientData;
 
     if (!InitElementData(elementData, tkwin, 0))
 	return;
@@ -612,7 +616,7 @@ SpinboxArrowElementSize(
     void *clientData, void *elementRecord, Tk_Window tkwin,
     int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr)
 {
-    ElementData *elementData = clientData;
+    ElementData *elementData = (ElementData *)clientData;
 
     if (!InitElementData(elementData, tkwin, 0))
 	return;
@@ -641,9 +645,10 @@ static void ThumbElementDraw(
     void *clientData, void *elementRecord, Tk_Window tkwin,
     Drawable d, Ttk_Box b, unsigned int state)
 {
-    ElementData *elementData = clientData;
+    ElementData *elementData = (ElementData *)clientData;
     unsigned stateId = Ttk_StateTableLookup(elementData->info->statemap, state);
     RECT rc = BoxToRect(b);
+    (void)elementRecord;
 
     /*
      * Don't draw the thumb if we are disabled.
@@ -680,7 +685,7 @@ static void PbarElementSize(
     void *clientData, void *elementRecord, Tk_Window tkwin,
     int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr)
 {
-    ElementData *elementData = clientData;
+    ElementData *elementData = (ElementData *)clientData;
     int nBars = 3;
 
     GenericElementSize(clientData, elementRecord, tkwin,
@@ -720,9 +725,10 @@ static void TabElementDraw(
     void *clientData, void *elementRecord, Tk_Window tkwin,
     Drawable d, Ttk_Box b, unsigned int state)
 {
-    ElementData *elementData = clientData;
+    ElementData *elementData = (ElementData *)clientData;
     int partId = elementData->info->partId;
     RECT rc = BoxToRect(b);
+    (void)elementRecord;
 
     if (!InitElementData(elementData, tkwin, d))
 	return;
@@ -791,7 +797,7 @@ static Ttk_ElementSpec TreeIndicatorElementSpec =
     TreeIndicatorElementDraw
 };
 
-#if BROKEN_TEXT_ELEMENT
+#ifdef BROKEN_TEXT_ELEMENT
 
 /*
  *----------------------------------------------------------------------
@@ -838,7 +844,7 @@ static void TextElementSize(
 	    Ttk_StateTableLookup(elementData->info->statemap, 0),
 	    Tcl_GetUnicode(element->textObj),
 	    -1,
-	    DT_LEFT,// | DT_BOTTOM | DT_NOPREFIX,
+	    DT_LEFT /* | DT_BOTTOM | DT_NOPREFIX */,
 	    NULL,
 	    &rc);
 
@@ -871,7 +877,7 @@ static void TextElementDraw(
 	    Ttk_StateTableLookup(elementData->info->statemap, state),
 	    Tcl_GetUnicode(element->textObj),
 	    -1,
-	    DT_LEFT,// | DT_BOTTOM | DT_NOPREFIX,
+	    DT_LEFT /* | DT_BOTTOM | DT_NOPREFIX */,
 	    (state & TTK_STATE_DISABLED) ? DTT_GRAYED : 0,
 	    &rc);
     FreeElementData(elementData);
@@ -1029,12 +1035,10 @@ static ElementInfo ElementInfoTable[] = {
     { "Spinbox.downarrow", &SpinboxArrowElementSpec, L"SPIN",
 	SPNP_DOWN, spinbutton_statemap, NOPAD,
 	PAD_MARGINS | ((SM_CXVSCROLL << 8) | SM_CYVSCROLL) },
-
-#if BROKEN_TEXT_ELEMENT
+#ifdef BROKEN_TEXT_ELEMENT
     { "Labelframe.text", &TextElementSpec, L"BUTTON",
     	BP_GROUPBOX, groupbox_statemap, NOPAD,0 },
 #endif
-
     { 0,0,0,0,0,NOPAD,0 }
 };
 #undef PAD
@@ -1096,7 +1100,7 @@ Ttk_CreateVsapiElement(
     int objc,
     Tcl_Obj *const objv[])
 {
-    XPThemeData *themeData = clientData;
+    XPThemeData *themeData = (XPThemeData *)clientData;
     ElementInfo *elementPtr = NULL;
     ClientData elementData;
     Tcl_UniChar *className;
@@ -1227,7 +1231,7 @@ Ttk_CreateVsapiElement(
     elementPtr->flags = HEAP_ELEMENT | flags;
 
     /* set the element name to an allocated copy */
-    name = ckalloc(strlen(elementName) + 1);
+    name = (char *)ckalloc(strlen(elementName) + 1);
     strcpy(name, elementName);
     elementPtr->elementName = name;
 
diff --git a/xlib/xcolors.c b/xlib/xcolors.c
index 7b7223c..b5fdd5d 100644
--- a/xlib/xcolors.c
+++ b/xlib/xcolors.c
@@ -347,14 +347,14 @@ XParseColor(
 
 	/*
 	 * If *p does not point to the end of the string, there were invalid
-	 * digits in the spec. Ergo, it is not a vailid color string.
+	 * digits in the spec. Ergo, it is not a valid color string.
 	 * (Bug f0188aca9e)
 	 */
-	
+
 	if (*p != '\0') {
 	    return 0;
 	}
-	
+
 	switch ((int)(p-spec)) {
 	case 3:
 	    colorPtr->red = US(((value >> 8) & 0xf) * 0x1111);
-- 
cgit v0.12


From 1006de1bd6db7a02ce00f2b1bc5376c169498b08 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 28 Oct 2020 15:49:47 +0000
Subject: Fix [https://github.com/msys2/MINGW-packages/issues/6931|python:
 investigate build crash when building with high-entropy-va]

---
 win/tkWin32Dll.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/win/tkWin32Dll.c b/win/tkWin32Dll.c
index 88b0507..8cfddee 100644
--- a/win/tkWin32Dll.c
+++ b/win/tkWin32Dll.c
@@ -134,7 +134,7 @@ DllMain(
 	    "leaq	%[registration], %%rdx"		"\n\t"
 	    "movq	%%gs:0,		%%rax"		"\n\t"
 	    "movq	%%rax,		0x0(%%rdx)"	"\n\t" /* link */
-	    "leaq	1f,		%%rax"		"\n\t"
+	    "leaq	1f(%%rip),	%%rax"		"\n\t"
 	    "movq	%%rax,		0x8(%%rdx)"	"\n\t" /* handler */
 	    "movq	%%rbp,		0x10(%%rdx)"	"\n\t" /* rbp */
 	    "movq	%%rsp,		0x18(%%rdx)"	"\n\t" /* rsp */
-- 
cgit v0.12


From ab7e7f10137def475bf072146d6270b48a2efe49 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 29 Oct 2020 17:08:38 +0000
Subject: Fix cygwin build

---
 generic/tkDecls.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/generic/tkDecls.h b/generic/tkDecls.h
index 87bb218..2072930 100644
--- a/generic/tkDecls.h
+++ b/generic/tkDecls.h
@@ -1754,4 +1754,6 @@ extern const TkStubs *tkStubsPtr;
 #undef TCL_STORAGE_CLASS
 #define TCL_STORAGE_CLASS DLLIMPORT
 
+#undef TkUnusedStubEntry
+
 #endif /* _TKDECLS */
-- 
cgit v0.12


From 4d296190563cb28ae6c394e243da8f70973290b5 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 1 Nov 2020 14:17:03 +0000
Subject: Fix [4ebcc04dc4]: tk fontchooser partial configure on X11 overwrites
 options not specified.

---
 library/comdlg.tcl      | 9 ++++++---
 library/fontchooser.tcl | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/library/comdlg.tcl b/library/comdlg.tcl
index 18df8a6..b4d8978 100644
--- a/library/comdlg.tcl
+++ b/library/comdlg.tcl
@@ -29,7 +29,8 @@
 #    {....}
 # }
 #
-# flags = currently unused.
+# flags = a list of flags. Currently supported flags are:
+#     DONTSETDEFAULTS = skip default values setting
 #
 # argList = The list of  "-option value" pairs.
 #
@@ -63,8 +64,10 @@ proc tclParseConfigSpec {w specs flags argList} {
 
     # 2: set the default values
     #
-    foreach cmdsw [array names cmd] {
-	set data($cmdsw) $def($cmdsw)
+    if {"DONTSETDEFAULTS" ni $flags} {
+        foreach cmdsw [array names cmd] {
+	    set data($cmdsw) $def($cmdsw)
+        }
     }
 
     # 3: parse the argument list
diff --git a/library/fontchooser.tcl b/library/fontchooser.tcl
index a9bd706..9d49c57 100644
--- a/library/fontchooser.tcl
+++ b/library/fontchooser.tcl
@@ -111,7 +111,7 @@ proc ::tk::fontchooser::Configure {args} {
 
     set cache [dict create -parent $S(-parent) -title $S(-title) \
                    -font $S(-font) -command $S(-command)]
-    set r [tclParseConfigSpec [namespace which -variable S] $specs "" $args]
+    set r [tclParseConfigSpec [namespace which -variable S] $specs DONTSETDEFAULTS $args]
     if {![winfo exists $S(-parent)]} {
 	set code [list TK LOOKUP WINDOW $S(-parent)]
         set err "bad window path name \"$S(-parent)\""
-- 
cgit v0.12


From b098fed752fbc72a9b83c0d4869e140a12913857 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 2 Nov 2020 16:21:43 +0000
Subject: (experiment) possible solution for [ef0e2629ea]

---
 generic/tkBind.c         | 4 ++++
 library/ttk/notebook.tcl | 9 ++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/generic/tkBind.c b/generic/tkBind.c
index 3776c95..9c9142a 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -458,7 +458,11 @@ static const ModInfo modArray[] = {
     {"Command",		Mod1Mask,	0},
     {"Mod2",		Mod2Mask,	0},
     {"M2",		Mod2Mask,	0},
+#ifdef MAC_OSX_TK
     {"Option",		Mod2Mask,	0},
+#else
+    {"Option",		ALT_MASK,	0},
+#endif
     {"Mod3",		Mod3Mask,	0},
     {"M3",		Mod3Mask,	0},
     {"Mod4",		Mod4Mask,	0},
diff --git a/library/ttk/notebook.tcl b/library/ttk/notebook.tcl
index c5340a5..a871081 100644
--- a/library/ttk/notebook.tcl
+++ b/library/ttk/notebook.tcl
@@ -112,13 +112,8 @@ proc ttk::notebook::enableTraversal {nb} {
 	catch {
 	bind $top <Control-ISO_Left_Tab>     {+ttk::notebook::TLCycleTab %W -1}
 	}
-	if {[tk windowingsystem] eq "aqua"} {
-	    bind $top <Option-Key> \
-		+[list ttk::notebook::MnemonicActivation $top %K]
-	} else {
-	    bind $top <Alt-Key> \
-		+[list ttk::notebook::MnemonicActivation $top %K]
-	}
+	bind $top <Option-Key> \
+	    +[list ttk::notebook::MnemonicActivation $top %K]
 	bind $top <Destroy> {+ttk::notebook::TLCleanup %W}
     }
 
-- 
cgit v0.12


From 2e1a2e301249b913cac77a3a9631f3005115e246 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 3 Nov 2020 07:23:24 +0000
Subject: Handle "Commmand-" bindings platform-dependant too

---
 generic/tkBind.c       |  6 ++++++
 library/button.tcl     |  4 ++--
 library/console.tcl    | 23 +++++++----------------
 library/entry.tcl      |  4 +---
 library/spinbox.tcl    |  4 +---
 library/text.tcl       |  4 +---
 library/ttk/button.tcl |  2 +-
 7 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/generic/tkBind.c b/generic/tkBind.c
index 9c9142a..3416f52 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -455,7 +455,13 @@ static const ModInfo modArray[] = {
     {"Button9",		Button9Mask,	0},
     {"Mod1",		Mod1Mask,	0},
     {"M1",		Mod1Mask,	0},
+#ifdef MAC_OSX_TK
     {"Command",		Mod1Mask,	0},
+#elif defined (_WIN32)
+    {"Command",		ControlMask,	0},
+#else
+    {"Command",		META_MASK,	0},
+#endif
     {"Mod2",		Mod2Mask,	0},
     {"M2",		Mod2Mask,	0},
 #ifdef MAC_OSX_TK
diff --git a/library/button.tcl b/library/button.tcl
index 39431e8..4be16b1 100644
--- a/library/button.tcl
+++ b/library/button.tcl
@@ -41,10 +41,10 @@ if {[tk windowingsystem] eq "aqua"} {
     }
 }
 if {"win32" eq [tk windowingsystem]} {
-    bind Checkbutton <equal> {
+    bind Checkbutton <=> {
 	tk::CheckRadioInvoke %W select
     }
-    bind Checkbutton <plus> {
+    bind Checkbutton <+> {
 	tk::CheckRadioInvoke %W select
     }
     bind Checkbutton <minus> {
diff --git a/library/console.tcl b/library/console.tcl
index 1da85be..f88cfc1 100644
--- a/library/console.tcl
+++ b/library/console.tcl
@@ -454,23 +454,16 @@ proc ::tk::ConsoleBind {w} {
 	<<Console_Transpose>>		<Control-t>
 	<<Console_ClearLine>>		<Control-u>
 	<<Console_SaveCommand>>		<Control-z>
-	<<Console_FontSizeIncr>>	<Control-plus>
+	<<Console_FontSizeIncr>>	<Control-+>
 	<<Console_FontSizeDecr>>	<Control-minus>
+	<<Console_FontSizeIncr>>	<Command-+>
+	<<Console_FontSizeDecr>>	<Command-minus>
     } {
 	event add $ev $key
 	bind Console $key {}
     }
-    if {[tk windowingsystem] eq "aqua"} {
-	foreach {ev key} {
-	    <<Console_FontSizeIncr>>	<Command-plus>
-	    <<Console_FontSizeDecr>>	<Command-minus>
-	} {
-	    event add $ev $key
-	    bind Console $key {}
-	}
-	if {$::tk::console::useFontchooser} {
-	    bind Console <Command-t> [list ::tk::console::FontchooserToggle]
-	}
+    if {$::tk::console::useFontchooser} {
+	bind Console <Command-t> [list ::tk::console::FontchooserToggle]
     }
     bind Console <<Console_Expand>> {
 	if {[%W compare insert > promptEnd]} {
@@ -594,10 +587,8 @@ proc ::tk::ConsoleBind {w} {
 	eval destroy [winfo child .]
 	source -encoding utf-8 [file join $tk_library console.tcl]
     }
-    if {[tk windowingsystem] eq "aqua"} {
-	bind Console <Command-q> {
-	    exit
-	}
+    bind Console <Command-q> {
+	exit
     }
     bind Console <<Cut>> { ::tk::console::Cut %W }
     bind Console <<Copy>> { ::tk::console::Copy %W }
diff --git a/library/entry.tcl b/library/entry.tcl
index bdd9fcc..99f6eb4 100644
--- a/library/entry.tcl
+++ b/library/entry.tcl
@@ -209,9 +209,7 @@ bind Entry <KP_Enter> {# nothing}
 bind Entry <Tab> {# nothing}
 bind Entry <Prior> {# nothing}
 bind Entry <Next> {# nothing}
-if {[tk windowingsystem] eq "aqua"} {
-    bind Entry <Command-Key> {# nothing}
-}
+bind Entry <Command-Key> {# nothing}
 # Tk-on-Cocoa generates characters for these two keys. [Bug 2971663]
 bind Entry <<NextLine>> {# nothing}
 bind Entry <<PrevLine>> {# nothing}
diff --git a/library/spinbox.tcl b/library/spinbox.tcl
index 3d479ef..ad4aacc 100644
--- a/library/spinbox.tcl
+++ b/library/spinbox.tcl
@@ -218,9 +218,7 @@ bind Spinbox <KP_Enter> {# nothing}
 bind Spinbox <Tab> {# nothing}
 bind Spinbox <Prior> {# nothing}
 bind Spinbox <Next> {# nothing}
-if {[tk windowingsystem] eq "aqua"} {
-    bind Spinbox <Command-Key> {# nothing}
-}
+bind Spinbox <Command-Key> {# nothing}
 
 # On Windows, paste is done using Shift-Insert.  Shift-Insert already
 # generates the <<Paste>> event, so we don't need to do anything here.
diff --git a/library/text.tcl b/library/text.tcl
index 5d41dc3..aa6c3f5 100644
--- a/library/text.tcl
+++ b/library/text.tcl
@@ -306,9 +306,7 @@ bind Text <Meta-Key> {# nothing}
 bind Text <Control-Key> {# nothing}
 bind Text <Escape> {# nothing}
 bind Text <KP_Enter> {# nothing}
-if {[tk windowingsystem] eq "aqua"} {
-    bind Text <Command-Key> {# nothing}
-}
+bind Text <Command-Key> {# nothing}
 
 # Additional emacs-like bindings:
 
diff --git a/library/ttk/button.tcl b/library/ttk/button.tcl
index e8c24a1..14460a2 100644
--- a/library/ttk/button.tcl
+++ b/library/ttk/button.tcl
@@ -42,7 +42,7 @@ ttk::copyBindings TButton TRadiobutton
 bind TRadiobutton <Up>  		{ ttk::button::RadioTraverse %W -1 }
 bind TRadiobutton <Down> 		{ ttk::button::RadioTraverse %W +1 }
 
-# bind TCheckbutton <plus> { %W select }
+# bind TCheckbutton <+> { %W select }
 # bind TCheckbutton <minus> { %W deselect }
 
 # activate --
-- 
cgit v0.12


From e7133d9dbbefecfc508a4b5260ad2470da27de9e Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 3 Nov 2020 10:17:27 +0000
Subject: Redundant "-accelerator" option in menu demo

---
 library/demos/menu.tcl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/demos/menu.tcl b/library/demos/menu.tcl
index e19df57..8275eae 100644
--- a/library/demos/menu.tcl
+++ b/library/demos/menu.tcl
@@ -16,7 +16,7 @@ wm title $w "Menu Demonstration"
 wm iconname $w "menu"
 positionWindow $w
 
-label $w.msg -font $font -wraplength 4i -justify left 
+label $w.msg -font $font -wraplength 4i -justify left
 if {[tk windowingsystem] eq "aqua"} {
     catch {set origUseCustomMDEF $::tk::mac::useCustomMDEF; set ::tk::mac::useCustomMDEF 1}
     $w.msg configure -text "This window has a menubar with cascaded menus.  You can invoke entries with an accelerator by typing Command+x, where \"x\" is the character next to the command key symbol. The rightmost menu can be torn off into a palette by selecting the first item in the menu."
@@ -63,7 +63,7 @@ if {[tk windowingsystem] eq "aqua"} {
 }
 foreach i {A B C D E F} {
     $m add command -label "Print letter \"$i\"" -underline 14 \
-	    -accelerator Meta+$i -command "puts $i" -accelerator $modifier+$i
+	    -accelerator $modifier+$i -command "puts $i"
     bind $w <$modifier-[string tolower $i]> "puts $i"
 }
 
-- 
cgit v0.12


From 8e6febd2151aacb1b563f09f2f3dbb5a2a25efde Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 3 Nov 2020 10:28:19 +0000
Subject: Don't bother MacOS builds on XQuarz, since that's basically the same
 as on Ubuntu

---
 .travis.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 517857e..e8d4e41 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -131,12 +131,12 @@ jobs:
         - BUILD_DIR=unix
         - CFGOPT="--enable-symbols"
 # Testing on Mac, various styles
-    - name: "macOS/Xcode 12/Shared/XQuartz"
-      os: osx
-      osx_image: xcode12
-      env:
-        - BUILD_DIR=unix
-        - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --disable-corefoundation --x-includes=/opt/X11/include --x-libraries=/opt/X11/lib CFLAGS=-I/usr/local/opt/tcl-tk/include"
+#   - name: "macOS/Xcode 12/Shared/XQuartz"
+#     os: osx
+#     osx_image: xcode12
+#     env:
+#       - BUILD_DIR=unix
+#       - CFGOPT="--with-tcl=/usr/local/opt/tcl-tk/lib --disable-corefoundation --x-includes=/opt/X11/include --x-libraries=/opt/X11/lib CFLAGS=-I/usr/local/opt/tcl-tk/include"
 # Test on Windows with MSVC native
 #   - name: "Windows/MSVC/Shared"
 #     os: windows
-- 
cgit v0.12


From 6fc711197df28ee4520dc3c733981693ba54a15a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 4 Nov 2020 15:58:23 +0000
Subject: Fix [5224aa89ac]: Bug in the ttk::bindMouseWheel proc

---
 library/ttk/utils.tcl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/ttk/utils.tcl b/library/ttk/utils.tcl
index 7a5cc71..f6a6c9e 100644
--- a/library/ttk/utils.tcl
+++ b/library/ttk/utils.tcl
@@ -302,10 +302,10 @@ proc ttk::bindMouseWheel {bindtag callback} {
 	bind $bindtag <Button-5> "$callback +1"
     }
     if {[tk windowingsystem] eq "aqua"} {
-	bind $bindtag <MouseWheel> [append callback { [expr {-(%D)}]} ]
-	bind $bindtag <Option-MouseWheel> [append callback { [expr {-10 *(%D)}]} ]
+	bind $bindtag <MouseWheel> "$callback \[expr {-%D}\]"
+	bind $bindtag <Option-MouseWheel> "$callback \[expr {-10*%D}\]"
     } else {
-	bind $bindtag <MouseWheel> [append callback { [expr {-(%D / 120)}]}]
+	bind $bindtag <MouseWheel> "$callback \[expr {-%D/120)}\]"
     }
 }
 
-- 
cgit v0.12


From 68b9f24bffdefaf08d53329d8ebad1460e05f206 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 5 Nov 2020 10:40:53 +0000
Subject: Cache homebrew on Travis MacOS builds

---
 .travis.yml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e8d4e41..6fd1194 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,8 +17,8 @@ addons:
   homebrew:
     packages:
       - tcl-tk
-    casks:
-      - xquartz
+#   casks:
+#     - xquartz
 jobs:
   include:
 # Testing on Linux GCC
@@ -173,7 +173,15 @@ install:
 script:
   - make binaries libraries tktest
   - make install
+before_cache:
+  - |-
+      case $TRAVIS_OS_NAME in
+        osx)
+          brew cleanup
+          ;;
+      esac
 cache:
   directories:
+  - $HOME/Library/Caches/Homebrew
   - $HOME/AppData/Local/Temp/chocolatey
   - $HOME/AppData/Local/Apps/Tcl86
-- 
cgit v0.12


From 761262151f938bc9d578fb0f30962a3c9b1b1002 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Thu, 5 Nov 2020 19:07:37 +0000
Subject: Test using the real standardAboutPanel as the manual indicates is
 done

---
 macosx/Credits.html.in  |    24 +
 macosx/tkMacOSXDialog.c |    61 +-
 macosx/tkMacOSXMenus.c  |     2 +-
 unix/configure          | 11151 ++++++++++++++++++----------------------------
 unix/configure.in       |     5 +-
 5 files changed, 4467 insertions(+), 6776 deletions(-)
 create mode 100644 macosx/Credits.html.in

diff --git a/macosx/Credits.html.in b/macosx/Credits.html.in
new file mode 100644
index 0000000..cc409b1
--- /dev/null
+++ b/macosx/Credits.html.in
@@ -0,0 +1,24 @@
+<!doctype htmL>
+<html>
+<head>
+</head>
+<body style="font-size:120%;font-family:Arial,sans-serif;">
+<p>
+Tcl and Tk are distributed under a modified BSD license:<br>
+<a href="https:www.tcl.tk/software/tcltk/license.html">
+  https:www.tcl.tk/software/tcltk/license.html
+</a>
+</p>
+<ul style="list-style-type:none;">
+<li>&copy; 1987-@TK_YEAR@ Tcl Core Team and Contributers.</li>
+<li>&copy; 2011-@TK_YEAR@ Kevin Walzer/WordTech Communications LLC.</li>
+<li>&copy; 2014-@TK_YEAR@ Marc Culler.</li>
+<li>&copy; 2002-2012 Daniel A. Steffen.</li>
+<li>&copy; 2001-2009 Apple Inc.</li>
+<li>&copy; 2001-2002 Jim Ingham &amp; Ian Reid.</li>
+<li>&copy; 1998-2000 Jim Ingham &amp; Ray Johnson.</li>
+<li>&copy; 1998-2000 Scriptics Inc.</li>
+<li>&copy; 1996-1997 Sun Microsystems Inc.</li>
+</ul>
+</body>
+</html>
diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c
index 71bb120..52b6e99 100644
--- a/macosx/tkMacOSXDialog.c
+++ b/macosx/tkMacOSXDialog.c
@@ -1315,64 +1315,9 @@ Tk_ChooseDirectoryObjCmd(
 void
 TkAboutDlg(void)
 {
-    NSImage *image;
-    NSString *path = [NSApp tkFrameworkImagePath: @"Tk.tiff"];
-
-    if (path) {
-	image = [[[NSImage alloc] initWithContentsOfFile:path] autorelease];
-    } else {
-	image = [NSApp applicationIconImage];
-    }
-
-    NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
-
-    [dateFormatter setFormatterBehavior:NSDateFormatterBehavior10_4];
-    [dateFormatter setDateFormat:@"Y"];
-
-    NSString *year = [dateFormatter stringFromDate:[NSDate date]];
-
-    [dateFormatter release];
-
-    /*
-     * This replaces the old about dialog with a standard alert that displays
-     * correctly on 10.14.
-     */
-
-    NSString *version =  @"Tcl " TCL_PATCH_LEVEL " & Tk " TCL_PATCH_LEVEL;
-    NSString *url = @"www.tcl-lang.org";
-    NSTextView *credits = [[NSTextView alloc] initWithFrame:NSMakeRect(0,0,300,300)];
-    NSFont *font = [NSFont systemFontOfSize:[NSFont systemFontSize]];
-    NSDictionary *textAttributes = [NSDictionary dictionaryWithObject:font
-					        forKey:NSFontAttributeName];
-
-    [credits insertText: [[NSAttributedString alloc]
-		 initWithString:[NSString stringWithFormat: @"\n"
-		"Tcl and Tk are distributed under a modified BSD license: "
-		"www.tcl.tk/software/tcltk/license.html\n\n"
-		"%1$C 1987-%2$@ Tcl Core Team and Contributers.\n\n"
-		"%1$C 2011-%2$@ Kevin Walzer/WordTech Communications LLC.\n\n"
-		"%1$C 2014-%2$@ Marc Culler.\n\n"
-		"%1$C 2002-2012 Daniel A. Steffen.\n\n"
-		"%1$C 2001-2009 Apple Inc.\n\n"
-		"%1$C 2001-2002 Jim Ingham & Ian Reid\n\n"
-		"%1$C 1998-2000 Jim Ingham & Ray Johnson\n\n"
-		"%1$C 1998-2000 Scriptics Inc.\n\n"
-		"%1$C 1996-1997 Sun Microsystems Inc.", 0xA9, year]
-	    attributes:textAttributes]
-            replacementRange:NSMakeRange(0,0)];
-    [credits setDrawsBackground:NO];
-    [credits setEditable:NO];
-
-    NSAlert *about = [[NSAlert alloc] init];
-
-    [[about window] setTitle:@"About Tcl & Tk"];
-    [about setMessageText: version];
-    [about setInformativeText:url];
-    about.accessoryView = credits;
-    [about runModal];
-    [about release];
+    [NSApp orderFrontStandardAboutPanel:nil];
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
@@ -1400,7 +1345,7 @@ TkMacOSXStandardAboutPanelObjCmd(
 	Tcl_WrongNumArgs(interp, 1, objv, NULL);
 	return TCL_ERROR;
     }
-    TkAboutDlg();
+    [NSApp orderFrontStandardAboutPanel:nil];
     return TCL_OK;
 }
 
diff --git a/macosx/tkMacOSXMenus.c b/macosx/tkMacOSXMenus.c
index a1519f5..54105d2 100644
--- a/macosx/tkMacOSXMenus.c
+++ b/macosx/tkMacOSXMenus.c
@@ -201,7 +201,7 @@ static Tcl_Obj *	GetWidgetDemoPath(Tcl_Interp *interp);
 {
     if (!_eventInterp || !Tcl_FindCommand(_eventInterp, "tkAboutDialog",
 	    NULL, 0) || (GetCurrentEventKeyModifiers() & optionKey)) {
-	TkAboutDlg();
+	[super orderFrontStandardAboutPanel:nil];
     } else {
 	int code = Tcl_EvalEx(_eventInterp, "tkAboutDialog", -1,
 		TCL_EVAL_GLOBAL);
diff --git a/unix/configure b/unix/configure
index 7e1f291..0230827 100755
--- a/unix/configure
+++ b/unix/configure
@@ -1,81 +1,459 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for tk 8.6.
+# Generated by GNU Autoconf 2.69 for tk 8.6.
+#
+#
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+#
 #
-# Copyright (C) 2003 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
 fi
-DUALCASE=1; export DUALCASE # for MKS sh
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
 fi
 
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
 
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
 PS1='$ '
 PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
+if test "x$CONFIG_SHELL" = x; then
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
+
+exitcode=0
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
+else
+  as_have_required=no
+fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  as_found=:
+  case $as_dir in #(
+	 /*)
+	   for as_base in sh bash ksh sh5; do
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
+	   done;;
+       esac
+  as_found=false
+done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
+IFS=$as_save_IFS
+
+
+      if test "x$CONFIG_SHELL" != x; then :
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
+fi
+
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
-    $as_unset $as_var
+    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
   fi
-done
+  exit 1
+fi
+fi
+fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
 
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
   as_basename=basename
 else
   as_basename=false
 fi
 
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
 
-# Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
 
-
-# PATH needs CR, and LINENO needs CR and PATH.
 # Avoid depending upon Character Ranges.
 as_cr_letters='abcdefghijklmnopqrstuvwxyz'
 as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
@@ -83,146 +461,91 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
 
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
     sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
       N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
       t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
+      s/-\n.*//
     ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
   # Exit status is that of the last command.
   exit
 }
 
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
 esac
 
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
 else
-  as_expr=false
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
 fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
     as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
   fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
-rm -f conf$$ conf$$.exe conf$$.file
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
-as_executable_p="test -f"
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -231,38 +554,25 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
-exec 6>&1
-
 #
 # Initializations.
 #
 ac_default_prefix=/usr/local
+ac_clean_files=
 ac_config_libobj_dir=.
+LIBOBJS=
 cross_compiling=no
 subdirs=
 MFLAGS=
 MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
 
 # Identity of this package.
 PACKAGE_NAME='tk'
@@ -270,50 +580,221 @@ PACKAGE_TARNAME='tk'
 PACKAGE_VERSION='8.6'
 PACKAGE_STRING='tk 8.6'
 PACKAGE_BUGREPORT=''
+PACKAGE_URL=''
 
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
-#if HAVE_SYS_TYPES_H
+#ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
-#if HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
-#if STDC_HEADERS
+#ifdef STDC_HEADERS
 # include <stdlib.h>
 # include <stddef.h>
 #else
-# if HAVE_STDLIB_H
+# ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
 # endif
 #endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
 #  include <memory.h>
 # endif
 # include <string.h>
 #endif
-#if HAVE_STRINGS_H
+#ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
-#if HAVE_INTTYPES_H
+#ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
 #endif
-#if HAVE_UNISTD_H
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS TCL_VERSION TCL_PATCH_LEVEL TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TCLSH_PROG BUILD_TCLSH MAN_FLAGS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP TCL_THREADS RANLIB ac_ct_RANLIB AR ac_ct_AR LIBOBJS TCL_LIBS DL_LIBS DL_OBJS PLAT_OBJS PLAT_SRCS LDAIX_SRC CFLAGS_DEBUG CFLAGS_OPTIMIZE CFLAGS_WARNING LDFLAGS_DEBUG LDFLAGS_OPTIMIZE CC_SEARCH_FLAGS LD_SEARCH_FLAGS STLIB_LD SHLIB_LD TCL_SHLIB_LD_EXTRAS TK_SHLIB_LD_EXTRAS SHLIB_LD_LIBS SHLIB_CFLAGS SHLIB_SUFFIX MAKE_LIB MAKE_STUB_LIB INSTALL_LIB DLL_INSTALL_DIR INSTALL_STUB_LIB CFLAGS_DEFAULT LDFLAGS_DEFAULT XFT_CFLAGS XFT_LIBS UNIX_FONT_OBJS TK_VERSION TK_MAJOR_VERSION TK_MINOR_VERSION TK_PATCH_LEVEL TK_YEAR TK_LIB_FILE TK_LIB_FLAG TK_LIB_SPEC TK_STUB_LIB_FILE TK_STUB_LIB_FLAG TK_STUB_LIB_SPEC TK_STUB_LIB_PATH TK_INCLUDE_SPEC TK_BUILD_STUB_LIB_SPEC TK_BUILD_STUB_LIB_PATH TK_SRC_DIR TK_SHARED_BUILD LD_LIBRARY_PATH_VAR TK_BUILD_LIB_SPEC TCL_STUB_FLAGS XINCLUDES XLIBSW LOCALES TK_WINDOWINGSYSTEM TK_PKG_DIR TK_LIBRARY LIB_RUNTIME_DIR PRIVATE_INCLUDE_DIR HTML_DIR EXTRA_CC_SWITCHES EXTRA_APP_CC_SWITCHES EXTRA_INSTALL EXTRA_INSTALL_BINARIES EXTRA_BUILD_HTML EXTRA_WISH_LIBS CFBUNDLELOCALIZATIONS TK_RSRC_FILE WISH_RSRC_FILE LIB_RSRC_FILE APP_RSRC_FILE REZ REZ_FLAGS LTLIBOBJS'
+ac_subst_vars='LTLIBOBJS
+REZ_FLAGS
+REZ
+APP_RSRC_FILE
+LIB_RSRC_FILE
+WISH_RSRC_FILE
+TK_RSRC_FILE
+CFBUNDLELOCALIZATIONS
+EXTRA_WISH_LIBS
+EXTRA_BUILD_HTML
+EXTRA_INSTALL_BINARIES
+EXTRA_INSTALL
+EXTRA_APP_CC_SWITCHES
+EXTRA_CC_SWITCHES
+HTML_DIR
+PRIVATE_INCLUDE_DIR
+LIB_RUNTIME_DIR
+TK_LIBRARY
+TK_PKG_DIR
+TK_WINDOWINGSYSTEM
+LOCALES
+XLIBSW
+XINCLUDES
+TCL_STUB_FLAGS
+TK_BUILD_LIB_SPEC
+LD_LIBRARY_PATH_VAR
+TK_SHARED_BUILD
+TK_SRC_DIR
+TK_BUILD_STUB_LIB_PATH
+TK_BUILD_STUB_LIB_SPEC
+TK_INCLUDE_SPEC
+TK_STUB_LIB_PATH
+TK_STUB_LIB_SPEC
+TK_STUB_LIB_FLAG
+TK_STUB_LIB_FILE
+TK_LIB_SPEC
+TK_LIB_FLAG
+TK_LIB_FILE
+TK_YEAR
+TK_PATCH_LEVEL
+TK_MINOR_VERSION
+TK_MAJOR_VERSION
+TK_VERSION
+UNIX_FONT_OBJS
+XFT_LIBS
+XFT_CFLAGS
+XMKMF
+LDFLAGS_DEFAULT
+CFLAGS_DEFAULT
+INSTALL_STUB_LIB
+DLL_INSTALL_DIR
+INSTALL_LIB
+MAKE_STUB_LIB
+MAKE_LIB
+SHLIB_SUFFIX
+SHLIB_CFLAGS
+SHLIB_LD_LIBS
+TK_SHLIB_LD_EXTRAS
+TCL_SHLIB_LD_EXTRAS
+SHLIB_LD
+STLIB_LD
+LD_SEARCH_FLAGS
+CC_SEARCH_FLAGS
+LDFLAGS_OPTIMIZE
+LDFLAGS_DEBUG
+CFLAGS_WARNING
+CFLAGS_OPTIMIZE
+CFLAGS_DEBUG
+LDAIX_SRC
+PLAT_SRCS
+PLAT_OBJS
+DL_OBJS
+DL_LIBS
+TCL_LIBS
+LIBOBJS
+AR
+RANLIB
+TCL_THREADS
+EGREP
+GREP
+CPP
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+MAN_FLAGS
+BUILD_TCLSH
+TCLSH_PROG
+TCL_STUB_LIB_SPEC
+TCL_STUB_LIB_FLAG
+TCL_STUB_LIB_FILE
+TCL_LIB_SPEC
+TCL_LIB_FLAG
+TCL_LIB_FILE
+TCL_SRC_DIR
+TCL_BIN_DIR
+TCL_PATCH_LEVEL
+TCL_VERSION
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
 ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+with_tcl
+enable_man_symlinks
+enable_man_compression
+enable_man_suffix
+enable_threads
+enable_shared
+enable_64bit
+enable_64bit_vis
+enable_rpath
+enable_corefoundation
+enable_load
+enable_symbols
+enable_aqua
+with_x
+enable_xft
+enable_xss
+enable_framework
+'
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CPP
+XMKMF'
+
 
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
@@ -336,34 +817,49 @@ x_libraries=NONE
 # and all the variables that are supposed to be based on exec_prefix
 # by default will actually change.
 # Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
 libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
 
 ac_prev=
+ac_dashdash=
 for ac_option
 do
   # If the previous option needs an argument, assign it.
   if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
+    eval $ac_prev=\$ac_option
     ac_prev=
     continue
   fi
 
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
+  case $ac_option in
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
+  esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 
-  case $ac_option in
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;
@@ -385,33 +881,59 @@ do
   --config-cache | -C)
     cache_file=config.cache ;;
 
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+  -datadir | --datadir | --datadi | --datad)
     ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
     datadir=$ac_optarg ;;
 
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
   -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
     esac
-    eval "enable_$ac_feature='$ac_optarg'" ;;
+    eval enable_$ac_useropt=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -438,6 +960,12 @@ do
   -host=* | --host=* | --hos=* | --ho=*)
     host_alias=$ac_optarg ;;
 
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
   -includedir | --includedir | --includedi | --included | --include \
   | --includ | --inclu | --incl | --inc)
     ac_prev=includedir ;;
@@ -462,13 +990,16 @@ do
   | --libexe=* | --libex=* | --libe=*)
     libexecdir=$ac_optarg ;;
 
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
   -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
+  | --localstate | --localstat | --localsta | --localst | --locals)
     ac_prev=localstatedir ;;
   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
     localstatedir=$ac_optarg ;;
 
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
@@ -533,6 +1064,16 @@ do
   | --progr-tra=* | --program-tr=* | --program-t=*)
     program_transform_name=$ac_optarg ;;
 
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
@@ -583,26 +1124,36 @@ do
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
     esac
-    eval "with_$ac_package='$ac_optarg'" ;;
+    eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/-/_/g'`
-    eval "with_$ac_package=no" ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -622,27 +1173,26 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
     ;;
 
   *=*)
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+    esac
+    eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
   esac
@@ -650,31 +1200,36 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error $? "missing argument to $ac_option"
 fi
 
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
-done
+fi
 
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
+# Check all directory arguments for consistency.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir
 do
-  eval ac_val=$`echo $ac_var`
+  eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
   case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -688,8 +1243,6 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -701,74 +1254,72 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias-
 test "$silent" = yes && exec 6>/dev/null
 
 
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  as_fn_error $? "working directory cannot be determined"
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  as_fn_error $? "pwd does not report name of working directory"
+
+
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
   srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
+  if test ! -r "$srcdir/$ac_unique_file"; then
     srcdir=..
   fi
 else
   ac_srcdir_defaulted=no
 fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-  fi
-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-   { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-ac_env_CC_set=${CC+set}
-ac_env_CC_value=$CC
-ac_cv_env_CC_set=${CC+set}
-ac_cv_env_CC_value=$CC
-ac_env_CFLAGS_set=${CFLAGS+set}
-ac_env_CFLAGS_value=$CFLAGS
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
-ac_cv_env_CFLAGS_value=$CFLAGS
-ac_env_LDFLAGS_set=${LDFLAGS+set}
-ac_env_LDFLAGS_value=$LDFLAGS
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_env_CPPFLAGS_value=$CPPFLAGS
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-ac_env_CPP_set=${CPP+set}
-ac_env_CPP_value=$CPP
-ac_cv_env_CPP_set=${CPP+set}
-ac_cv_env_CPP_value=$CPP
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
 
 #
 # Report the --help message.
@@ -791,20 +1342,17 @@ Configuration:
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
 
-_ACEOF
-
-  cat <<_ACEOF
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
+                          [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -814,18 +1362,25 @@ for instance \`--prefix=\$HOME'.
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/tk]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -843,6 +1398,7 @@ if test -n "$ac_init_help"; then
   cat <<\_ACEOF
 
 Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-man-symlinks   use symlinks for the manpages (default: off)
@@ -879,169 +1435,546 @@ Some influential environment variables:
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
-  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
-              headers in a nonstandard directory <include dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
+  XMKMF       Path to xmkmf, Makefile generator for X Window System
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
+Report bugs to the package provider.
 _ACEOF
+ac_status=$?
 fi
 
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
     ac_builddir=.
 
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
 
 case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
+  .)  # We are building in place.
     ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
     ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
 esac
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested configure.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd $ac_popdir
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
   done
 fi
 
-test -n "$ac_init_help" && exit 0
+test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 tk configure 8.6
-generated by GNU Autoconf 2.59
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
-  exit 0
+  exit
 fi
-exec 5>config.log
-cat >&5 <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by tk $as_me 8.6, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
 
-  $ $0 $@
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
 
-_ACEOF
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
 {
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-_ASUNAME
+	ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
 
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
+} # ac_fn_c_try_compile
 
-} >&5
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-cat >&5 <<_ACEOF
+    ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
 
+} # ac_fn_c_try_cpp
 
-## ----------- ##
-## Core tests. ##
-## ----------- ##
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if eval \${$3+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 test -x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_func
+
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+	 return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+	    return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_type
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by tk $as_me 8.6, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  $ $0 $@
+
+_ACEOF
+exec 5>>config.log
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    $as_echo "PATH: $as_dir"
+  done
+IFS=$as_save_IFS
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
 
 _ACEOF
 
@@ -1054,7 +1987,6 @@ _ACEOF
 ac_configure_args=
 ac_configure_args0=
 ac_configure_args1=
-ac_sep=
 ac_must_keep_next=false
 for ac_pass in 1 2
 do
@@ -1065,13 +1997,13 @@ do
     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*)
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
     2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+      as_fn_append ac_configure_args1 " '$ac_arg'"
       if test $ac_must_keep_next = true; then
 	ac_must_keep_next=false # Got value, back to normal.
       else
@@ -1087,104 +2019,115 @@ do
 	  -* ) ac_must_keep_next=true ;;
 	esac
       fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
+      as_fn_append ac_configure_args " '$ac_arg'"
       ;;
     esac
   done
 done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
 
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
 # would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
 trap 'exit_status=$?
   # Save into config.log some information that might help in debugging.
   {
     echo
 
-    cat <<\_ASBOX
-## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
     echo
     # The following way of writing the cache mishandles newlines in values,
-{
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
   (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
       sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
     *)
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
-    esac;
-}
+    esac |
+    sort
+)
     echo
 
-    cat <<\_ASBOX
-## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
     echo
     for ac_var in $ac_subst_vars
     do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
-_ASBOX
+      $as_echo "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"
       echo
       for ac_var in $ac_subst_files
       do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
 
     if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
       echo
-      sed "/^$/d" confdefs.h | sort
+      cat confdefs.h
       echo
     fi
     test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
-     ' 0
+' 0
 for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo >confdefs.h
+rm -f -r conftest* confdefs.h
+
+$as_echo "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
@@ -1192,112 +2135,137 @@ cat >>confdefs.h <<_ACEOF
 #define PACKAGE_NAME "$PACKAGE_NAME"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION "$PACKAGE_VERSION"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_STRING "$PACKAGE_STRING"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
 _ACEOF
 
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
+elif test "x$prefix" != xNONE; then
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
+else
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
 fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+do
+  test "x$ac_site_file" = xNONE && continue
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
   fi
 done
 
 if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+for ac_var in $ac_precious_vars; do
   eval ac_old_set=\$ac_cv_env_${ac_var}_set
   eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
     esac
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -1310,31 +2278,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 TK_VERSION=8.6
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=6
@@ -1357,15 +2300,15 @@ LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv"
 	# we reset no_tcl in case something fails here
 	no_tcl=true
 
-# Check whether --with-tcl or --without-tcl was given.
-if test "${with_tcl+set}" = set; then
-  withval="$with_tcl"
-  with_tclconfig="${withval}"
-fi;
-	echo "$as_me:$LINENO: checking for Tcl configuration" >&5
-echo $ECHO_N "checking for Tcl configuration... $ECHO_C" >&6
-	if test "${ac_cv_c_tclconfig+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+# Check whether --with-tcl was given.
+if test "${with_tcl+set}" = set; then :
+  withval=$with_tcl; with_tclconfig="${withval}"
+fi
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl configuration" >&5
+$as_echo_n "checking for Tcl configuration... " >&6; }
+	if ${ac_cv_c_tclconfig+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
 
@@ -1374,17 +2317,15 @@ else
 		case "${with_tclconfig}" in
 		    */tclConfig.sh )
 			if test -f "${with_tclconfig}"; then
-			    { echo "$as_me:$LINENO: WARNING: --with-tcl argument should refer to directory containing tclConfig.sh, not to tclConfig.sh itself" >&5
-echo "$as_me: WARNING: --with-tcl argument should refer to directory containing tclConfig.sh, not to tclConfig.sh itself" >&2;}
+			    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tcl argument should refer to directory containing tclConfig.sh, not to tclConfig.sh itself" >&5
+$as_echo "$as_me: WARNING: --with-tcl argument should refer to directory containing tclConfig.sh, not to tclConfig.sh itself" >&2;}
 			    with_tclconfig="`echo "${with_tclconfig}" | sed 's!/tclConfig\.sh$!!'`"
 			fi ;;
 		esac
 		if test -f "${with_tclconfig}/tclConfig.sh" ; then
 		    ac_cv_c_tclconfig="`(cd "${with_tclconfig}"; pwd)`"
 		else
-		    { { echo "$as_me:$LINENO: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" >&5
-echo "$as_me: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" >&2;}
-   { (exit 1); exit 1; }; }
+		    as_fn_error $? "${with_tclconfig} directory doesn't contain tclConfig.sh" "$LINENO" 5
 		fi
 	    fi
 
@@ -1463,28 +2404,26 @@ fi
 
 	if test x"${ac_cv_c_tclconfig}" = x ; then
 	    TCL_BIN_DIR="# no Tcl configs found"
-	    { { echo "$as_me:$LINENO: error: Can't find Tcl configuration definitions. Use --with-tcl to specify a directory containing tclConfig.sh" >&5
-echo "$as_me: error: Can't find Tcl configuration definitions. Use --with-tcl to specify a directory containing tclConfig.sh" >&2;}
-   { (exit 1); exit 1; }; }
+	    as_fn_error $? "Can't find Tcl configuration definitions. Use --with-tcl to specify a directory containing tclConfig.sh" "$LINENO" 5
 	else
 	    no_tcl=
 	    TCL_BIN_DIR="${ac_cv_c_tclconfig}"
-	    echo "$as_me:$LINENO: result: found ${TCL_BIN_DIR}/tclConfig.sh" >&5
-echo "${ECHO_T}found ${TCL_BIN_DIR}/tclConfig.sh" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found ${TCL_BIN_DIR}/tclConfig.sh" >&5
+$as_echo "found ${TCL_BIN_DIR}/tclConfig.sh" >&6; }
 	fi
     fi
 
 
-    echo "$as_me:$LINENO: checking for existence of ${TCL_BIN_DIR}/tclConfig.sh" >&5
-echo $ECHO_N "checking for existence of ${TCL_BIN_DIR}/tclConfig.sh... $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${TCL_BIN_DIR}/tclConfig.sh" >&5
+$as_echo_n "checking for existence of ${TCL_BIN_DIR}/tclConfig.sh... " >&6; }
 
     if test -f "${TCL_BIN_DIR}/tclConfig.sh" ; then
-        echo "$as_me:$LINENO: result: loading" >&5
-echo "${ECHO_T}loading" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5
+$as_echo "loading" >&6; }
 	. "${TCL_BIN_DIR}/tclConfig.sh"
     else
-        echo "$as_me:$LINENO: result: could not find ${TCL_BIN_DIR}/tclConfig.sh" >&5
-echo "${ECHO_T}could not find ${TCL_BIN_DIR}/tclConfig.sh" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: could not find ${TCL_BIN_DIR}/tclConfig.sh" >&5
+$as_echo "could not find ${TCL_BIN_DIR}/tclConfig.sh" >&6; }
     fi
 
     # If the TCL_BIN_DIR is the build directory (not the install directory),
@@ -1535,25 +2474,19 @@ echo "${ECHO_T}could not find ${TCL_BIN_DIR}/tclConfig.sh" >&6
 
 
 if test "${TCL_MAJOR_VERSION}" -ne 8 ; then
-    { { echo "$as_me:$LINENO: error: ${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6+
-Found config for Tcl ${TCL_VERSION}" >&5
-echo "$as_me: error: ${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6+
-Found config for Tcl ${TCL_VERSION}" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6+
+Found config for Tcl ${TCL_VERSION}" "$LINENO" 5
 fi
 if test "${TCL_MINOR_VERSION}" -lt 6 ; then
-    { { echo "$as_me:$LINENO: error: ${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6+
-Found config for Tcl ${TCL_VERSION}" >&5
-echo "$as_me: error: ${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6+
-Found config for Tcl ${TCL_VERSION}" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6+
+Found config for Tcl ${TCL_VERSION}" "$LINENO" 5
 fi
 
 
-    echo "$as_me:$LINENO: checking for tclsh" >&5
-echo $ECHO_N "checking for tclsh... $ECHO_C" >&6
-    if test "${ac_cv_path_tclsh+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclsh" >&5
+$as_echo_n "checking for tclsh... " >&6; }
+    if ${ac_cv_path_tclsh+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
 	search_path=`echo ${PATH} | sed -e 's/:/ /g'`
@@ -1574,22 +2507,22 @@ fi
 
     if test -f "$ac_cv_path_tclsh" ; then
 	TCLSH_PROG="$ac_cv_path_tclsh"
-	echo "$as_me:$LINENO: result: $TCLSH_PROG" >&5
-echo "${ECHO_T}$TCLSH_PROG" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCLSH_PROG" >&5
+$as_echo "$TCLSH_PROG" >&6; }
     else
 	# It is not an error if an installed version of Tcl can't be located.
 	TCLSH_PROG=""
-	echo "$as_me:$LINENO: result: No tclsh found on PATH" >&5
-echo "${ECHO_T}No tclsh found on PATH" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: No tclsh found on PATH" >&5
+$as_echo "No tclsh found on PATH" >&6; }
     fi
 
 
 
-    echo "$as_me:$LINENO: checking for tclsh in Tcl build directory" >&5
-echo $ECHO_N "checking for tclsh in Tcl build directory... $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclsh in Tcl build directory" >&5
+$as_echo_n "checking for tclsh in Tcl build directory... " >&6; }
     BUILD_TCLSH="${TCL_BIN_DIR}"/tclsh
-    echo "$as_me:$LINENO: result: $BUILD_TCLSH" >&5
-echo "${ECHO_T}$BUILD_TCLSH" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_TCLSH" >&5
+$as_echo "$BUILD_TCLSH" >&6; }
 
 
 
@@ -1612,62 +2545,60 @@ TK_SRC_DIR="`cd "$srcdir"/..; pwd`"
 #------------------------------------------------------------------------
 
 
-    echo "$as_me:$LINENO: checking whether to use symlinks for manpages" >&5
-echo $ECHO_N "checking whether to use symlinks for manpages... $ECHO_C" >&6
-    # Check whether --enable-man-symlinks or --disable-man-symlinks was given.
-if test "${enable_man_symlinks+set}" = set; then
-  enableval="$enable_man_symlinks"
-  test "$enableval" != "no" && MAN_FLAGS="$MAN_FLAGS --symlinks"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use symlinks for manpages" >&5
+$as_echo_n "checking whether to use symlinks for manpages... " >&6; }
+    # Check whether --enable-man-symlinks was given.
+if test "${enable_man_symlinks+set}" = set; then :
+  enableval=$enable_man_symlinks; test "$enableval" != "no" && MAN_FLAGS="$MAN_FLAGS --symlinks"
 else
   enableval="no"
-fi;
-    echo "$as_me:$LINENO: result: $enableval" >&5
-echo "${ECHO_T}$enableval" >&6
-
-    echo "$as_me:$LINENO: checking whether to compress the manpages" >&5
-echo $ECHO_N "checking whether to compress the manpages... $ECHO_C" >&6
-    # Check whether --enable-man-compression or --disable-man-compression was given.
-if test "${enable_man_compression+set}" = set; then
-  enableval="$enable_man_compression"
-  case $enableval in
-	    yes) { { echo "$as_me:$LINENO: error: missing argument to --enable-man-compression" >&5
-echo "$as_me: error: missing argument to --enable-man-compression" >&2;}
-   { (exit 1); exit 1; }; };;
+fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
+$as_echo "$enableval" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to compress the manpages" >&5
+$as_echo_n "checking whether to compress the manpages... " >&6; }
+    # Check whether --enable-man-compression was given.
+if test "${enable_man_compression+set}" = set; then :
+  enableval=$enable_man_compression; case $enableval in
+	    yes) as_fn_error $? "missing argument to --enable-man-compression" "$LINENO" 5;;
 	    no)  ;;
 	    *)   MAN_FLAGS="$MAN_FLAGS --compress $enableval";;
 	esac
 else
   enableval="no"
-fi;
-    echo "$as_me:$LINENO: result: $enableval" >&5
-echo "${ECHO_T}$enableval" >&6
+fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
+$as_echo "$enableval" >&6; }
     if test "$enableval" != "no"; then
-	echo "$as_me:$LINENO: checking for compressed file suffix" >&5
-echo $ECHO_N "checking for compressed file suffix... $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compressed file suffix" >&5
+$as_echo_n "checking for compressed file suffix... " >&6; }
 	touch TeST
 	$enableval TeST
 	Z=`ls TeST* | sed 's/^....//'`
 	rm -f TeST*
 	MAN_FLAGS="$MAN_FLAGS --extension $Z"
-	echo "$as_me:$LINENO: result: $Z" >&5
-echo "${ECHO_T}$Z" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $Z" >&5
+$as_echo "$Z" >&6; }
     fi
 
-    echo "$as_me:$LINENO: checking whether to add a package name suffix for the manpages" >&5
-echo $ECHO_N "checking whether to add a package name suffix for the manpages... $ECHO_C" >&6
-    # Check whether --enable-man-suffix or --disable-man-suffix was given.
-if test "${enable_man_suffix+set}" = set; then
-  enableval="$enable_man_suffix"
-  case $enableval in
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to add a package name suffix for the manpages" >&5
+$as_echo_n "checking whether to add a package name suffix for the manpages... " >&6; }
+    # Check whether --enable-man-suffix was given.
+if test "${enable_man_suffix+set}" = set; then :
+  enableval=$enable_man_suffix; case $enableval in
 	    yes) enableval="tk" MAN_FLAGS="$MAN_FLAGS --suffix $enableval";;
 	    no)  ;;
 	    *)   MAN_FLAGS="$MAN_FLAGS --suffix $enableval";;
 	esac
 else
   enableval="no"
-fi;
-    echo "$as_me:$LINENO: result: $enableval" >&5
-echo "${ECHO_T}$enableval" >&6
+fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
+$as_echo "$enableval" >&6; }
 
 
 
@@ -1690,10 +2621,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1703,35 +2634,37 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
 fi
 if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -1741,39 +2674,50 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-  CC=$ac_ct_CC
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
 else
   CC="$ac_cv_prog_CC"
 fi
 
 if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1783,99 +2727,60 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
+  fi
 fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
+if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
 else
+  ac_prog_rejected=no
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 if test $ac_prog_rejected = yes; then
   # We found a bogon in the path, so make sure we never use it.
@@ -1893,24 +2798,25 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
 fi
 if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl
+  for ac_prog in cl.exe
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1920,39 +2826,41 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
     test -n "$CC" && break
   done
 fi
 if test -z "$CC"; then
   ac_ct_CC=$CC
-  for ac_prog in cl
+  for ac_prog in cl.exe
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -1962,66 +2870,78 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   test -n "$ac_ct_CC" && break
 done
 
-  CC=$ac_ct_CC
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
 fi
 
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -2033,112 +2953,108 @@ main ()
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-  (eval $ac_link_default) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Find the output, starting from the most likely.  This scheme is
-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-# resort.
-
-# Be careful to initialize this variable, since it used to be cached.
-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-ac_cv_exeext=
-# b.out is created by i960 compilers.
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { { ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link_default") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-	;;
-    conftest.$ac_ext )
-	# This is the source file.
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
 	# certainly right.
 	break;;
     *.* )
-	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	# FIXME: I believe we export ac_cv_exeext for Libtool,
-	# but it would be cool to find out if it's true.  Does anybody
-	# maintain Libtool? --akim.
-	export ac_cv_exeext
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	then :; else
+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an `-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
 	break;;
     * )
 	break;;
   esac
 done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
 else
-  echo "$as_me: failed program was:" >&5
+  ac_file=''
+fi
+if test -z "$ac_file"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 fi
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
-
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
 
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
-
-echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -2146,38 +3062,90 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  export ac_cv_exeext
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
 fi
-
-rm -f conftest$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
 _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if ${ac_cv_objext+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -2189,45 +3157,46 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
 fi
-
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -2241,55 +3210,34 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
+  ac_compiler_gnu=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -2300,39 +3248,49 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
 
-ac_cv_prog_cc_g=no
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -2348,23 +3306,18 @@ else
     CFLAGS=
   fi
 fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  ac_cv_prog_cc_stdc=no
+  ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -2387,12 +3340,17 @@ static char *f (char * (*g) (char **, int), char **p, ...)
 /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
    function prototypes and stuff, but not '\xHH' hex character constants.
    These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std1 is added to get
+   as 'x'.  The following induces an error, until -std is added to get
    proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
    array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std1.  */
+   that's true only with -std.  */
 int osf4_cc_array ['\x00' == 0 ? 1 : -1];
 
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
 int test (int i, double x);
 struct s1 {int (*f) (int a);};
 struct s2 {int (*f) (double a);};
@@ -2407,205 +3365,37 @@ return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
   return 0;
 }
 _ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX			-qlanglvl=ansi
-# Ultrix and OSF/1	-std1
-# HP-UX 10.20 and later	-Ae
-# HP-UX older versions	-Aa -D_HPUX_SOURCE
-# SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_stdc=$ac_arg
-break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
 fi
-rm -f conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
-rm -f conftest.$ac_ext conftest.$ac_objext
+rm -f conftest.$ac_ext
 CC=$ac_save_CC
 
 fi
-
-case "x$ac_cv_prog_cc_stdc" in
-  x|xno)
-    echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-    CC="$CC $ac_cv_prog_cc_stdc" ;;
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
 
-# Some people use a C++ compiler to compile C.  Since we use `exit',
-# in C++ we need to declare it.  In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
-  choke me
-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
 fi
 
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2613,18 +3403,14 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-echo "$as_me:$LINENO: checking for inline" >&5
-echo $ECHO_N "checking for inline... $ECHO_C" >&6
-if test "${ac_cv_c_inline+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+$as_echo_n "checking for inline... " >&6; }
+if ${ac_cv_c_inline+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifndef __cplusplus
 typedef int foo_t;
@@ -2633,41 +3419,16 @@ $ac_kw foo_t foo () {return 0; }
 #endif
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_inline=$ac_kw; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_inline=$ac_kw
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  test "$ac_cv_c_inline" != no && break
 done
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+$as_echo "$ac_cv_c_inline" >&6; }
 
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -2695,15 +3456,15 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  if ${ac_cv_prog_CPP+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -2717,11 +3478,7 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -2730,78 +3487,34 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether non-existent headers
+  # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
   break
 fi
 
@@ -2813,8 +3526,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -2824,11 +3537,7 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -2837,85 +3546,40 @@ cat >>conftest.$ac_ext <<_ACEOF
 #endif
 		     Syntax error
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether non-existent headers
+  # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -2925,31 +3589,142 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-if test "${ac_cv_prog_egrep+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if ${ac_cv_path_GREP+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
+  if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in grep ggrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_GREP" || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
     fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_GREP=$GREP
+fi
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
- EGREP=$ac_cv_prog_egrep
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
 
 
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if ${ac_cv_path_EGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in egrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_EGREP" || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
@@ -2964,51 +3739,23 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_stdc=no
+  ac_cv_header_stdc=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -3018,18 +3765,14 @@ fi
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
+  $EGREP "free" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -3039,16 +3782,13 @@ fi
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   :
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ctype.h>
+#include <stdlib.h>
 #if ((' ' & 0x0FF) == 0x020)
 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
@@ -3068,109 +3808,39 @@ main ()
   for (i = 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
 	|| toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
+      return 2;
+  return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
 
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+  ac_cv_header_stdc=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
+
 fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Header=no"
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -3178,196 +3848,48 @@ fi
 done
 
 
-if test "${ac_cv_header_stdlib_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for stdlib.h" >&5
-echo $ECHO_N "checking for stdlib.h... $ECHO_C" >&6
-if test "${ac_cv_header_stdlib_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdlib_h" >&5
-echo "${ECHO_T}$ac_cv_header_stdlib_h" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking stdlib.h usability" >&5
-echo $ECHO_N "checking stdlib.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <stdlib.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking stdlib.h presence" >&5
-echo $ECHO_N "checking stdlib.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: stdlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: stdlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: stdlib.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: stdlib.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: stdlib.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: stdlib.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: stdlib.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: stdlib.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: stdlib.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: stdlib.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: stdlib.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: stdlib.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: stdlib.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: stdlib.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: stdlib.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: stdlib.h: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ----------------------------- ##
-## Report this to the tk lists.  ##
-## ----------------------------- ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for stdlib.h" >&5
-echo $ECHO_N "checking for stdlib.h... $ECHO_C" >&6
-if test "${ac_cv_header_stdlib_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_stdlib_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdlib_h" >&5
-echo "${ECHO_T}$ac_cv_header_stdlib_h" >&6
-
-fi
-if test $ac_cv_header_stdlib_h = yes; then
+ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdlib_h" = xyes; then :
   tk_ok=1
 else
   tk_ok=0
 fi
 
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "strtol" >/dev/null 2>&1; then
-  :
+  $EGREP "strtol" >/dev/null 2>&1; then :
+
 else
   tk_ok=0
 fi
 rm -f conftest*
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "strtoul" >/dev/null 2>&1; then
-  :
+  $EGREP "strtoul" >/dev/null 2>&1; then :
+
 else
   tk_ok=0
 fi
 rm -f conftest*
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "strtod" >/dev/null 2>&1; then
-  :
+  $EGREP "strtod" >/dev/null 2>&1; then :
+
 else
   tk_ok=0
 fi
@@ -3375,9 +3897,7 @@ rm -f conftest*
 
 if test $tk_ok = 0; then
 
-cat >>confdefs.h <<\_ACEOF
-#define NO_STDLIB_H 1
-_ACEOF
+$as_echo "#define NO_STDLIB_H 1" >>confdefs.h
 
 fi
 
@@ -3387,18 +3907,14 @@ fi
 #------------------------------------------------------------------------
 
 if test -z "$no_pipe" && test -n "$GCC"; then
-    echo "$as_me:$LINENO: checking if the compiler understands -pipe" >&5
-echo $ECHO_N "checking if the compiler understands -pipe... $ECHO_C" >&6
-if test "${tcl_cv_cc_pipe+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the compiler understands -pipe" >&5
+$as_echo_n "checking if the compiler understands -pipe... " >&6; }
+if ${tcl_cv_cc_pipe+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
 	hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -pipe"
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3409,40 +3925,16 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_cv_cc_pipe=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_cc_pipe=no
+  tcl_cv_cc_pipe=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	CFLAGS=$hold_cflags
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_cc_pipe" >&5
-echo "${ECHO_T}$tcl_cv_cc_pipe" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cc_pipe" >&5
+$as_echo "$tcl_cv_cc_pipe" >&6; }
     if test $tcl_cv_cc_pipe = yes; then
 	CFLAGS="$CFLAGS -pipe"
     fi
@@ -3453,13 +3945,13 @@ fi
 #------------------------------------------------------------------------
 
 
-    # Check whether --enable-threads or --disable-threads was given.
-if test "${enable_threads+set}" = set; then
-  enableval="$enable_threads"
-  tcl_ok=$enableval
+    # Check whether --enable-threads was given.
+if test "${enable_threads+set}" = set; then :
+  enableval=$enable_threads; tcl_ok=$enableval
 else
   tcl_ok=yes
-fi;
+fi
+
 
     if test "${TCL_THREADS}" = 1; then
 	tcl_threaded_core=1;
@@ -3470,92 +3962,56 @@ fi;
 	# USE_THREAD_ALLOC tells us to try the special thread-based
 	# allocator that significantly reduces lock contention
 
-cat >>confdefs.h <<\_ACEOF
-#define USE_THREAD_ALLOC 1
-_ACEOF
+$as_echo "#define USE_THREAD_ALLOC 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define _REENTRANT 1
-_ACEOF
+$as_echo "#define _REENTRANT 1" >>confdefs.h
 
 	if test "`uname -s`" = "SunOS" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define _POSIX_PTHREAD_SEMANTICS 1
-_ACEOF
+$as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
 
 	fi
 
-cat >>confdefs.h <<\_ACEOF
-#define _THREAD_SAFE 1
-_ACEOF
+$as_echo "#define _THREAD_SAFE 1" >>confdefs.h
 
-	echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthread" >&5
-echo $ECHO_N "checking for pthread_mutex_init in -lpthread... $ECHO_C" >&6
-if test "${ac_cv_lib_pthread_pthread_mutex_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_init in -lpthread" >&5
+$as_echo_n "checking for pthread_mutex_init in -lpthread... " >&6; }
+if ${ac_cv_lib_pthread_pthread_mutex_init+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthread  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char pthread_mutex_init ();
 int
 main ()
 {
-pthread_mutex_init ();
+return pthread_mutex_init ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pthread_pthread_mutex_init=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pthread_pthread_mutex_init=no
+  ac_cv_lib_pthread_pthread_mutex_init=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_mutex_init" >&5
-echo "${ECHO_T}$ac_cv_lib_pthread_pthread_mutex_init" >&6
-if test $ac_cv_lib_pthread_pthread_mutex_init = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_mutex_init" >&5
+$as_echo "$ac_cv_lib_pthread_pthread_mutex_init" >&6; }
+if test "x$ac_cv_lib_pthread_pthread_mutex_init" = xyes; then :
   tcl_ok=yes
 else
   tcl_ok=no
@@ -3567,71 +4023,43 @@ fi
 	    # defined.  We could alternatively do an AC_TRY_COMPILE with
 	    # pthread.h, but that will work with libpthread really doesn't
 	    # exist, like AIX 4.2.  [Bug: 4359]
-	    echo "$as_me:$LINENO: checking for __pthread_mutex_init in -lpthread" >&5
-echo $ECHO_N "checking for __pthread_mutex_init in -lpthread... $ECHO_C" >&6
-if test "${ac_cv_lib_pthread___pthread_mutex_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __pthread_mutex_init in -lpthread" >&5
+$as_echo_n "checking for __pthread_mutex_init in -lpthread... " >&6; }
+if ${ac_cv_lib_pthread___pthread_mutex_init+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthread  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char __pthread_mutex_init ();
 int
 main ()
 {
-__pthread_mutex_init ();
+return __pthread_mutex_init ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pthread___pthread_mutex_init=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pthread___pthread_mutex_init=no
+  ac_cv_lib_pthread___pthread_mutex_init=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pthread___pthread_mutex_init" >&5
-echo "${ECHO_T}$ac_cv_lib_pthread___pthread_mutex_init" >&6
-if test $ac_cv_lib_pthread___pthread_mutex_init = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread___pthread_mutex_init" >&5
+$as_echo "$ac_cv_lib_pthread___pthread_mutex_init" >&6; }
+if test "x$ac_cv_lib_pthread___pthread_mutex_init" = xyes; then :
   tcl_ok=yes
 else
   tcl_ok=no
@@ -3643,71 +4071,43 @@ fi
 	    # The space is needed
 	    THREADS_LIBS=" -lpthread"
 	else
-	    echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthreads" >&5
-echo $ECHO_N "checking for pthread_mutex_init in -lpthreads... $ECHO_C" >&6
-if test "${ac_cv_lib_pthreads_pthread_mutex_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_init in -lpthreads" >&5
+$as_echo_n "checking for pthread_mutex_init in -lpthreads... " >&6; }
+if ${ac_cv_lib_pthreads_pthread_mutex_init+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthreads  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char pthread_mutex_init ();
 int
 main ()
 {
-pthread_mutex_init ();
+return pthread_mutex_init ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pthreads_pthread_mutex_init=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pthreads_pthread_mutex_init=no
+  ac_cv_lib_pthreads_pthread_mutex_init=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pthreads_pthread_mutex_init" >&5
-echo "${ECHO_T}$ac_cv_lib_pthreads_pthread_mutex_init" >&6
-if test $ac_cv_lib_pthreads_pthread_mutex_init = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthreads_pthread_mutex_init" >&5
+$as_echo "$ac_cv_lib_pthreads_pthread_mutex_init" >&6; }
+if test "x$ac_cv_lib_pthreads_pthread_mutex_init" = xyes; then :
   tcl_ok=yes
 else
   tcl_ok=no
@@ -3717,142 +4117,86 @@ fi
 		# The space is needed
 		THREADS_LIBS=" -lpthreads"
 	    else
-		echo "$as_me:$LINENO: checking for pthread_mutex_init in -lc" >&5
-echo $ECHO_N "checking for pthread_mutex_init in -lc... $ECHO_C" >&6
-if test "${ac_cv_lib_c_pthread_mutex_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_init in -lc" >&5
+$as_echo_n "checking for pthread_mutex_init in -lc... " >&6; }
+if ${ac_cv_lib_c_pthread_mutex_init+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char pthread_mutex_init ();
 int
 main ()
 {
-pthread_mutex_init ();
+return pthread_mutex_init ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_c_pthread_mutex_init=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_c_pthread_mutex_init=no
+  ac_cv_lib_c_pthread_mutex_init=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_c_pthread_mutex_init" >&5
-echo "${ECHO_T}$ac_cv_lib_c_pthread_mutex_init" >&6
-if test $ac_cv_lib_c_pthread_mutex_init = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_pthread_mutex_init" >&5
+$as_echo "$ac_cv_lib_c_pthread_mutex_init" >&6; }
+if test "x$ac_cv_lib_c_pthread_mutex_init" = xyes; then :
   tcl_ok=yes
 else
   tcl_ok=no
 fi
 
 		if test "$tcl_ok" = "no"; then
-		    echo "$as_me:$LINENO: checking for pthread_mutex_init in -lc_r" >&5
-echo $ECHO_N "checking for pthread_mutex_init in -lc_r... $ECHO_C" >&6
-if test "${ac_cv_lib_c_r_pthread_mutex_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+		    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_init in -lc_r" >&5
+$as_echo_n "checking for pthread_mutex_init in -lc_r... " >&6; }
+if ${ac_cv_lib_c_r_pthread_mutex_init+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc_r  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char pthread_mutex_init ();
 int
 main ()
 {
-pthread_mutex_init ();
+return pthread_mutex_init ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_c_r_pthread_mutex_init=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_c_r_pthread_mutex_init=no
+  ac_cv_lib_c_r_pthread_mutex_init=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_pthread_mutex_init" >&5
-echo "${ECHO_T}$ac_cv_lib_c_r_pthread_mutex_init" >&6
-if test $ac_cv_lib_c_r_pthread_mutex_init = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_mutex_init" >&5
+$as_echo "$ac_cv_lib_c_r_pthread_mutex_init" >&6; }
+if test "x$ac_cv_lib_c_r_pthread_mutex_init" = xyes; then :
   tcl_ok=yes
 else
   tcl_ok=no
@@ -3863,8 +4207,8 @@ fi
 			THREADS_LIBS=" -pthread"
 		    else
 			TCL_THREADS=0
-			{ echo "$as_me:$LINENO: WARNING: Don't know how to find pthread lib on your system - you must disable thread support or edit the LIBS in the Makefile..." >&5
-echo "$as_me: WARNING: Don't know how to find pthread lib on your system - you must disable thread support or edit the LIBS in the Makefile..." >&2;}
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Don't know how to find pthread lib on your system - you must disable thread support or edit the LIBS in the Makefile..." >&5
+$as_echo "$as_me: WARNING: Don't know how to find pthread lib on your system - you must disable thread support or edit the LIBS in the Makefile..." >&2;}
 		    fi
 		fi
 	    fi
@@ -3875,104 +4219,13 @@ echo "$as_me: WARNING: Don't know how to find pthread lib on your system - you m
 
 	ac_saved_libs=$LIBS
 	LIBS="$LIBS $THREADS_LIBS"
-
-
-for ac_func in pthread_attr_setstacksize pthread_atfork
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+	for ac_func in pthread_attr_setstacksize pthread_atfork
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -3983,24 +4236,22 @@ done
 	TCL_THREADS=0
     fi
     # Do checking message here to not mess up interleaved configure output
-    echo "$as_me:$LINENO: checking for building with threads" >&5
-echo $ECHO_N "checking for building with threads... $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for building with threads" >&5
+$as_echo_n "checking for building with threads... " >&6; }
     if test "${TCL_THREADS}" = 1; then
 
-cat >>confdefs.h <<\_ACEOF
-#define TCL_THREADS 1
-_ACEOF
+$as_echo "#define TCL_THREADS 1" >>confdefs.h
 
 	if test "${tcl_threaded_core}" = 1; then
-	    echo "$as_me:$LINENO: result: yes (threaded core)" >&5
-echo "${ECHO_T}yes (threaded core)" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (threaded core)" >&5
+$as_echo "yes (threaded core)" >&6; }
 	else
-	    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 	fi
     else
-	echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     fi
 
 
@@ -4010,15 +4261,15 @@ echo "${ECHO_T}no" >&6
 LIBS="$LIBS$THREADS_LIBS"
 
 
-    echo "$as_me:$LINENO: checking how to build libraries" >&5
-echo $ECHO_N "checking how to build libraries... $ECHO_C" >&6
-    # Check whether --enable-shared or --disable-shared was given.
-if test "${enable_shared+set}" = set; then
-  enableval="$enable_shared"
-  tcl_ok=$enableval
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to build libraries" >&5
+$as_echo_n "checking how to build libraries... " >&6; }
+    # Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then :
+  enableval=$enable_shared; tcl_ok=$enableval
 else
   tcl_ok=yes
-fi;
+fi
+
 
     if test "${enable_shared+set}" = set; then
 	enableval="$enable_shared"
@@ -4028,17 +4279,15 @@ fi;
     fi
 
     if test "$tcl_ok" = "yes" ; then
-	echo "$as_me:$LINENO: result: shared" >&5
-echo "${ECHO_T}shared" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: shared" >&5
+$as_echo "shared" >&6; }
 	SHARED_BUILD=1
     else
-	echo "$as_me:$LINENO: result: static" >&5
-echo "${ECHO_T}static" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+$as_echo "static" >&6; }
 	SHARED_BUILD=0
 
-cat >>confdefs.h <<\_ACEOF
-#define STATIC_BUILD 1
-_ACEOF
+$as_echo "#define STATIC_BUILD 1" >>confdefs.h
 
     fi
 
@@ -4052,10 +4301,10 @@ _ACEOF
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -4065,35 +4314,37 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
 fi
 if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -4103,28 +4354,38 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
-  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
 fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-  RANLIB=$ac_ct_RANLIB
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
 else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
@@ -4133,52 +4394,47 @@ fi
 
     # Step 0.a: Enable 64 bit support?
 
-    echo "$as_me:$LINENO: checking if 64bit support is requested" >&5
-echo $ECHO_N "checking if 64bit support is requested... $ECHO_C" >&6
-    # Check whether --enable-64bit or --disable-64bit was given.
-if test "${enable_64bit+set}" = set; then
-  enableval="$enable_64bit"
-  do64bit=$enableval
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if 64bit support is requested" >&5
+$as_echo_n "checking if 64bit support is requested... " >&6; }
+    # Check whether --enable-64bit was given.
+if test "${enable_64bit+set}" = set; then :
+  enableval=$enable_64bit; do64bit=$enableval
 else
   do64bit=no
-fi;
-    echo "$as_me:$LINENO: result: $do64bit" >&5
-echo "${ECHO_T}$do64bit" >&6
+fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $do64bit" >&5
+$as_echo "$do64bit" >&6; }
 
     # Step 0.b: Enable Solaris 64 bit VIS support?
 
-    echo "$as_me:$LINENO: checking if 64bit Sparc VIS support is requested" >&5
-echo $ECHO_N "checking if 64bit Sparc VIS support is requested... $ECHO_C" >&6
-    # Check whether --enable-64bit-vis or --disable-64bit-vis was given.
-if test "${enable_64bit_vis+set}" = set; then
-  enableval="$enable_64bit_vis"
-  do64bitVIS=$enableval
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if 64bit Sparc VIS support is requested" >&5
+$as_echo_n "checking if 64bit Sparc VIS support is requested... " >&6; }
+    # Check whether --enable-64bit-vis was given.
+if test "${enable_64bit_vis+set}" = set; then :
+  enableval=$enable_64bit_vis; do64bitVIS=$enableval
 else
   do64bitVIS=no
-fi;
-    echo "$as_me:$LINENO: result: $do64bitVIS" >&5
-echo "${ECHO_T}$do64bitVIS" >&6
+fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $do64bitVIS" >&5
+$as_echo "$do64bitVIS" >&6; }
     # Force 64bit on with VIS
-    if test "$do64bitVIS" = "yes"; then
+    if test "$do64bitVIS" = "yes"; then :
   do64bit=yes
 fi
 
-
     # Step 0.c: Check if visibility support is available. Do this here so
     # that platform specific alternatives can be used below if this fails.
 
-    echo "$as_me:$LINENO: checking if compiler supports visibility \"hidden\"" >&5
-echo $ECHO_N "checking if compiler supports visibility \"hidden\"... $ECHO_C" >&6
-if test "${tcl_cv_cc_visibility_hidden+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports visibility \"hidden\"" >&5
+$as_echo_n "checking if compiler supports visibility \"hidden\"... " >&6; }
+if ${tcl_cv_cc_visibility_hidden+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
 	hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -Werror"
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 	    extern __attribute__((__visibility__("hidden"))) void f(void);
@@ -4191,79 +4447,50 @@ f();
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   tcl_cv_cc_visibility_hidden=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_cc_visibility_hidden=no
+  tcl_cv_cc_visibility_hidden=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 	CFLAGS=$hold_cflags
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_cc_visibility_hidden" >&5
-echo "${ECHO_T}$tcl_cv_cc_visibility_hidden" >&6
-    if test $tcl_cv_cc_visibility_hidden = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cc_visibility_hidden" >&5
+$as_echo "$tcl_cv_cc_visibility_hidden" >&6; }
+    if test $tcl_cv_cc_visibility_hidden = yes; then :
 
 
-cat >>confdefs.h <<\_ACEOF
-#define MODULE_SCOPE extern __attribute__((__visibility__("hidden")))
-_ACEOF
+$as_echo "#define MODULE_SCOPE extern __attribute__((__visibility__(\"hidden\")))" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_HIDDEN 1
-_ACEOF
+$as_echo "#define HAVE_HIDDEN 1" >>confdefs.h
 
 
 fi
 
-
     # Step 0.d: Disable -rpath support?
 
-    echo "$as_me:$LINENO: checking if rpath support is requested" >&5
-echo $ECHO_N "checking if rpath support is requested... $ECHO_C" >&6
-    # Check whether --enable-rpath or --disable-rpath was given.
-if test "${enable_rpath+set}" = set; then
-  enableval="$enable_rpath"
-  doRpath=$enableval
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if rpath support is requested" >&5
+$as_echo_n "checking if rpath support is requested... " >&6; }
+    # Check whether --enable-rpath was given.
+if test "${enable_rpath+set}" = set; then :
+  enableval=$enable_rpath; doRpath=$enableval
 else
   doRpath=yes
-fi;
-    echo "$as_me:$LINENO: result: $doRpath" >&5
-echo "${ECHO_T}$doRpath" >&6
+fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $doRpath" >&5
+$as_echo "$doRpath" >&6; }
 
     # Step 1: set the variable "system" to hold the name and version number
     # for the system.
 
 
-    echo "$as_me:$LINENO: checking system version" >&5
-echo $ECHO_N "checking system version... $ECHO_C" >&6
-if test "${tcl_cv_sys_version+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking system version" >&5
+$as_echo_n "checking system version... " >&6; }
+if ${tcl_cv_sys_version+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
 	if test -f /usr/lib/NextStep/software_version; then
@@ -4271,8 +4498,8 @@ else
 	else
 	    tcl_cv_sys_version=`uname -s`-`uname -r`
 	    if test "$?" -ne 0 ; then
-		{ echo "$as_me:$LINENO: WARNING: can't find uname command" >&5
-echo "$as_me: WARNING: can't find uname command" >&2;}
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: can't find uname command" >&5
+$as_echo "$as_me: WARNING: can't find uname command" >&2;}
 		tcl_cv_sys_version=unknown
 	    else
 		# Special check for weird MP-RAS system (uname returns weird
@@ -4291,79 +4518,51 @@ echo "$as_me: WARNING: can't find uname command" >&2;}
 	fi
 
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_sys_version" >&5
-echo "${ECHO_T}$tcl_cv_sys_version" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_sys_version" >&5
+$as_echo "$tcl_cv_sys_version" >&6; }
     system=$tcl_cv_sys_version
 
 
     # Step 2: check for existence of -ldl library.  This is needed because
     # Linux can use either -ldl or -ldld for dynamic loading.
 
-    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char dlopen ();
 int
 main ()
 {
-dlopen ();
+return dlopen ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
+  ac_cv_lib_dl_dlopen=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
   have_dl=yes
 else
   have_dl=no
@@ -4389,7 +4588,7 @@ fi
     ECHO_VERSION='`echo ${VERSION}`'
     TCL_LIB_VERSIONS_OK=ok
     CFLAGS_DEBUG=-g
-    if test "$GCC" = yes; then
+    if test "$GCC" = yes; then :
 
 	CFLAGS_OPTIMIZE=-O2
 	CFLAGS_WARNING="-Wall -Wpointer-arith"
@@ -4400,14 +4599,13 @@ else
 	CFLAGS_WARNING=""
 
 fi
-
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
@@ -4417,35 +4615,37 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="${ac_tool_prefix}ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
 fi
 if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
@@ -4455,27 +4655,38 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-echo "${ECHO_T}$ac_ct_AR" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-  AR=$ac_ct_AR
+  if test "x$ac_ct_AR" = x; then
+    AR=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
 else
   AR="$ac_cv_prog_AR"
 fi
@@ -4485,15 +4696,14 @@ fi
     PLAT_OBJS=""
     PLAT_SRCS=""
     LDAIX_SRC=""
-    if test "x${SHLIB_VERSION}" = x; then
+    if test "x${SHLIB_VERSION}" = x; then :
   SHLIB_VERSION=".1.0"
 else
   SHLIB_VERSION=".${SHLIB_VERSION}"
 fi
-
     case $system in
 	AIX-*)
-	    if test "${TCL_THREADS}" = "1" -a "$GCC" != "yes"; then
+	    if test "${TCL_THREADS}" = "1" -a "$GCC" != "yes"; then :
 
 		# AIX requires the _r compiler when gcc isn't being used
 		case "${CC}" in
@@ -4505,11 +4715,10 @@ fi
 		    	CC=`echo "$CC" | sed -e 's/^\([^ ]*\)/\1_r/'`
 			;;
 		esac
-		echo "$as_me:$LINENO: result: Using $CC for compiling with threads" >&5
-echo "${ECHO_T}Using $CC for compiling with threads" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $CC for compiling with threads" >&5
+$as_echo "Using $CC for compiling with threads" >&6; }
 
 fi
-
 	    LIBS="$LIBS -lc"
 	    SHLIB_CFLAGS=""
 	    SHLIB_SUFFIX=".so"
@@ -4522,12 +4731,12 @@ fi
 	    LDAIX_SRC='$(UNIX_DIR)/ldAix'
 
 	    # Check to enable 64-bit flags for compiler/linker
-	    if test "$do64bit" = yes; then
+	    if test "$do64bit" = yes; then :
 
-		if test "$GCC" = yes; then
+		if test "$GCC" = yes; then :
 
-		    { echo "$as_me:$LINENO: WARNING: 64bit mode not supported with GCC on $system" >&5
-echo "$as_me: WARNING: 64bit mode not supported with GCC on $system" >&2;}
+		    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 64bit mode not supported with GCC on $system" >&5
+$as_echo "$as_me: WARNING: 64bit mode not supported with GCC on $system" >&2;}
 
 else
 
@@ -4540,17 +4749,15 @@ else
 
 fi
 
-
 fi
 
-
-	    if test "`uname -m`" = ia64; then
+	    if test "`uname -m`" = ia64; then :
 
 		# AIX-5 uses ELF style dynamic libraries on IA-64, but not PPC
 		SHLIB_LD="/usr/ccs/bin/ld -G -z text"
 		# AIX-5 has dl* in libc.so
 		DL_LIBS=""
-		if test "$GCC" = yes; then
+		if test "$GCC" = yes; then :
 
 		    CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
 
@@ -4559,12 +4766,11 @@ else
 		    CC_SEARCH_FLAGS='-R${LIB_RUNTIME_DIR}'
 
 fi
-
 		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
 
 else
 
-		if test "$GCC" = yes; then
+		if test "$GCC" = yes; then :
 
 		    SHLIB_LD='${CC} -shared -Wl,-bexpall'
 
@@ -4574,14 +4780,12 @@ else
 		    LDFLAGS="$LDFLAGS -brtl"
 
 fi
-
 		SHLIB_LD="${SHLIB_LD} ${SHLIB_LD_FLAGS}"
 		DL_LIBS="-ldl"
 		CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
 
 fi
-
 	    ;;
 	BeOS*)
 	    SHLIB_CFLAGS="-fPIC"
@@ -4595,71 +4799,43 @@ fi
 	    # -lsocket, even if the network functions are in -lnet which
 	    # is always linked to, for compatibility.
 	    #-----------------------------------------------------------
-	    echo "$as_me:$LINENO: checking for inet_ntoa in -lbind" >&5
-echo $ECHO_N "checking for inet_ntoa in -lbind... $ECHO_C" >&6
-if test "${ac_cv_lib_bind_inet_ntoa+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_ntoa in -lbind" >&5
+$as_echo_n "checking for inet_ntoa in -lbind... " >&6; }
+if ${ac_cv_lib_bind_inet_ntoa+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char inet_ntoa ();
 int
 main ()
 {
-inet_ntoa ();
+return inet_ntoa ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind_inet_ntoa=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_bind_inet_ntoa=no
+  ac_cv_lib_bind_inet_ntoa=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_bind_inet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_lib_bind_inet_ntoa" >&6
-if test $ac_cv_lib_bind_inet_ntoa = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_inet_ntoa" >&5
+$as_echo "$ac_cv_lib_bind_inet_ntoa" >&6; }
+if test "x$ac_cv_lib_bind_inet_ntoa" = xyes; then :
   LIBS="$LIBS -lbind -lsocket"
 fi
 
@@ -4696,16 +4872,12 @@ fi
 	    TCL_NEEDS_EXP_FILE=1
 	    TCL_EXPORT_FILE_SUFFIX='${VERSION}.dll.a'
 	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$@.a"
-	    echo "$as_me:$LINENO: checking for Cygwin version of gcc" >&5
-echo $ECHO_N "checking for Cygwin version of gcc... $ECHO_C" >&6
-if test "${ac_cv_cygwin+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Cygwin version of gcc" >&5
+$as_echo_n "checking for Cygwin version of gcc... " >&6; }
+if ${ac_cv_cygwin+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 		#ifdef __CYGWIN__
@@ -4720,49 +4892,21 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_cygwin=no
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_cygwin=yes
+  ac_cv_cygwin=yes
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_cygwin" >&5
-echo "${ECHO_T}$ac_cv_cygwin" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cygwin" >&5
+$as_echo "$ac_cv_cygwin" >&6; }
 	    if test "$ac_cv_cygwin" = "no"; then
-		{ { echo "$as_me:$LINENO: error: ${CC} is not a cygwin compiler." >&5
-echo "$as_me: error: ${CC} is not a cygwin compiler." >&2;}
-   { (exit 1); exit 1; }; }
+		as_fn_error $? "${CC} is not a cygwin compiler." "$LINENO" 5
 	    fi
 	    if test "x${TCL_THREADS}" = "x0"; then
-		{ { echo "$as_me:$LINENO: error: CYGWIN compile is only supported with --enable-threads" >&5
-echo "$as_me: error: CYGWIN compile is only supported with --enable-threads" >&2;}
-   { (exit 1); exit 1; }; }
+		as_fn_error $? "CYGWIN compile is only supported with --enable-threads" "$LINENO" 5
 	    fi
 	    do64bit_ok=yes
 	    if test "x${SHARED_BUILD}" = "x1"; then
@@ -4792,71 +4936,43 @@ echo "$as_me: error: CYGWIN compile is only supported with --enable-threads" >&2
 	    SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared'
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS="-lroot"
-	    echo "$as_me:$LINENO: checking for inet_ntoa in -lnetwork" >&5
-echo $ECHO_N "checking for inet_ntoa in -lnetwork... $ECHO_C" >&6
-if test "${ac_cv_lib_network_inet_ntoa+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_ntoa in -lnetwork" >&5
+$as_echo_n "checking for inet_ntoa in -lnetwork... " >&6; }
+if ${ac_cv_lib_network_inet_ntoa+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char inet_ntoa ();
 int
 main ()
 {
-inet_ntoa ();
+return inet_ntoa ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_network_inet_ntoa=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_network_inet_ntoa=no
+  ac_cv_lib_network_inet_ntoa=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_network_inet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_lib_network_inet_ntoa" >&6
-if test $ac_cv_lib_network_inet_ntoa = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_inet_ntoa" >&5
+$as_echo "$ac_cv_lib_network_inet_ntoa" >&6; }
+if test "x$ac_cv_lib_network_inet_ntoa" = xyes; then :
   LIBS="$LIBS -lnetwork"
 fi
 
@@ -4864,18 +4980,14 @@ fi
 	HP-UX-*.11.*)
 	    # Use updated header definitions where possible
 
-cat >>confdefs.h <<\_ACEOF
-#define _XOPEN_SOURCE_EXTENDED 1
-_ACEOF
+$as_echo "#define _XOPEN_SOURCE_EXTENDED 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define _XOPEN_SOURCE 1
-_ACEOF
+$as_echo "#define _XOPEN_SOURCE 1" >>confdefs.h
 
 	    LIBS="$LIBS -lxnet"               # Use the XOPEN network library
 
-	    if test "`uname -m`" = ia64; then
+	    if test "`uname -m`" = ia64; then :
 
 		SHLIB_SUFFIX=".so"
 
@@ -4884,78 +4996,49 @@ else
 		SHLIB_SUFFIX=".sl"
 
 fi
-
-	    echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
+if ${ac_cv_lib_dld_shl_load+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char shl_load ();
 int
 main ()
 {
-shl_load ();
+return shl_load ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dld_shl_load=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_shl_load=no
+  ac_cv_lib_dld_shl_load=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-if test $ac_cv_lib_dld_shl_load = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
   tcl_ok=yes
 else
   tcl_ok=no
 fi
 
-	    if test "$tcl_ok" = yes; then
+	    if test "$tcl_ok" = yes; then :
 
 		SHLIB_CFLAGS="+z"
 		SHLIB_LD="ld -b"
@@ -4967,8 +5050,7 @@ fi
 		LD_LIBRARY_PATH_VAR="SHLIB_PATH"
 
 fi
-
-	    if test "$GCC" = yes; then
+	    if test "$GCC" = yes; then :
 
 		SHLIB_LD='${CC} -shared'
 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
@@ -4979,30 +5061,28 @@ else
 
 fi
 
-
 	    # Users may want PA-RISC 1.1/2.0 portable code - needs HP cc
 	    #CFLAGS="$CFLAGS +DAportable"
 
 	    # Check to enable 64-bit flags for compiler/linker
-	    if test "$do64bit" = "yes"; then
+	    if test "$do64bit" = "yes"; then :
 
-		if test "$GCC" = yes; then
+		if test "$GCC" = yes; then :
 
 		    case `${CC} -dumpmachine` in
 			hppa64*)
 			    # 64-bit gcc in use.  Fix flags for GNU ld.
 			    do64bit_ok=yes
 			    SHLIB_LD='${CC} -shared'
-			    if test $doRpath = yes; then
+			    if test $doRpath = yes; then :
 
 				CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
 fi
-
 			    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
 			    ;;
 			*)
-			    { echo "$as_me:$LINENO: WARNING: 64bit mode not supported with GCC on $system" >&5
-echo "$as_me: WARNING: 64bit mode not supported with GCC on $system" >&2;}
+			    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 64bit mode not supported with GCC on $system" >&5
+$as_echo "$as_me: WARNING: 64bit mode not supported with GCC on $system" >&2;}
 			    ;;
 		    esac
 
@@ -5014,82 +5094,52 @@ else
 
 fi
 
-
-fi
- ;;
+fi ;;
 	HP-UX-*.08.*|HP-UX-*.09.*|HP-UX-*.10.*)
 	    SHLIB_SUFFIX=".sl"
-	    echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
+if ${ac_cv_lib_dld_shl_load+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char shl_load ();
 int
 main ()
 {
-shl_load ();
+return shl_load ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dld_shl_load=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_shl_load=no
+  ac_cv_lib_dld_shl_load=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-if test $ac_cv_lib_dld_shl_load = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
   tcl_ok=yes
 else
   tcl_ok=no
 fi
 
-	    if test "$tcl_ok" = yes; then
+	    if test "$tcl_ok" = yes; then :
 
 		SHLIB_CFLAGS="+z"
 		SHLIB_LD="ld -b"
@@ -5101,28 +5151,24 @@ fi
 		LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.'
 		LD_LIBRARY_PATH_VAR="SHLIB_PATH"
 
-fi
- ;;
+fi ;;
 	IRIX-5.*)
 	    SHLIB_CFLAGS=""
 	    SHLIB_LD="ld -shared -rdata_shared"
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""
-	    case $LIBOBJS in
-    "mkstemp.$ac_objext"   | \
-  *" mkstemp.$ac_objext"   | \
-    "mkstemp.$ac_objext "* | \
+	    case " $LIBOBJS " in
   *" mkstemp.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS mkstemp.$ac_objext" ;;
+  *) LIBOBJS="$LIBOBJS mkstemp.$ac_objext"
+ ;;
 esac
 
-	    if test $doRpath = yes; then
+	    if test $doRpath = yes; then :
 
 		CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
 		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
 fi
-
 	    ;;
 	IRIX-6.*)
 	    SHLIB_CFLAGS=""
@@ -5130,21 +5176,18 @@ fi
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""
-	    case $LIBOBJS in
-    "mkstemp.$ac_objext"   | \
-  *" mkstemp.$ac_objext"   | \
-    "mkstemp.$ac_objext "* | \
+	    case " $LIBOBJS " in
   *" mkstemp.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS mkstemp.$ac_objext" ;;
+  *) LIBOBJS="$LIBOBJS mkstemp.$ac_objext"
+ ;;
 esac
 
-	    if test $doRpath = yes; then
+	    if test $doRpath = yes; then :
 
 		CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
 		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
 fi
-
-	    if test "$GCC" = yes; then
+	    if test "$GCC" = yes; then :
 
 		CFLAGS="$CFLAGS -mabi=n32"
 		LDFLAGS="$LDFLAGS -mabi=n32"
@@ -5163,7 +5206,6 @@ else
 		LDFLAGS="$LDFLAGS -n32"
 
 fi
-
 	    ;;
 	IRIX64-6.*)
 	    SHLIB_CFLAGS=""
@@ -5171,29 +5213,26 @@ fi
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""
-	    case $LIBOBJS in
-    "mkstemp.$ac_objext"   | \
-  *" mkstemp.$ac_objext"   | \
-    "mkstemp.$ac_objext "* | \
+	    case " $LIBOBJS " in
   *" mkstemp.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS mkstemp.$ac_objext" ;;
+  *) LIBOBJS="$LIBOBJS mkstemp.$ac_objext"
+ ;;
 esac
 
-	    if test $doRpath = yes; then
+	    if test $doRpath = yes; then :
 
 		CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
 		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
 fi
 
-
 	    # Check to enable 64-bit flags for compiler/linker
 
-	    if test "$do64bit" = yes; then
+	    if test "$do64bit" = yes; then :
 
-	        if test "$GCC" = yes; then
+	        if test "$GCC" = yes; then :
 
-	            { echo "$as_me:$LINENO: WARNING: 64bit mode not supported by gcc" >&5
-echo "$as_me: WARNING: 64bit mode not supported by gcc" >&2;}
+	            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 64bit mode not supported by gcc" >&5
+$as_echo "$as_me: WARNING: 64bit mode not supported by gcc" >&2;}
 
 else
 
@@ -5204,9 +5243,7 @@ else
 
 fi
 
-
 fi
-
 	    ;;
 	Linux*|GNU*|NetBSD-Debian)
 	    SHLIB_CFLAGS="-fPIC"
@@ -5222,31 +5259,25 @@ fi
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS="-ldl"
 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
-	    if test $doRpath = yes; then
+	    if test $doRpath = yes; then :
 
 		CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
 fi
-
 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-	    if test "`uname -m`" = "alpha"; then
+	    if test "`uname -m`" = "alpha"; then :
   CFLAGS="$CFLAGS -mieee"
 fi
+	    if test $do64bit = yes; then :
 
-	    if test $do64bit = yes; then
-
-		echo "$as_me:$LINENO: checking if compiler accepts -m64 flag" >&5
-echo $ECHO_N "checking if compiler accepts -m64 flag... $ECHO_C" >&6
-if test "${tcl_cv_cc_m64+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -m64 flag" >&5
+$as_echo_n "checking if compiler accepts -m64 flag... " >&6; }
+if ${tcl_cv_cc_m64+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
 		    hold_cflags=$CFLAGS
 		    CFLAGS="$CFLAGS -m64"
-		    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+		    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -5257,62 +5288,35 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   tcl_cv_cc_m64=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_cc_m64=no
+  tcl_cv_cc_m64=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 		    CFLAGS=$hold_cflags
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_cc_m64" >&5
-echo "${ECHO_T}$tcl_cv_cc_m64" >&6
-		if test $tcl_cv_cc_m64 = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cc_m64" >&5
+$as_echo "$tcl_cv_cc_m64" >&6; }
+		if test $tcl_cv_cc_m64 = yes; then :
 
 		    CFLAGS="$CFLAGS -m64"
 		    do64bit_ok=yes
 
 fi
 
-
 fi
 
-
 	    # The combo of gcc + glibc has a bug related to inlining of
 	    # functions like strtod(). The -fno-builtin flag should address
 	    # this problem but it does not work. The -fno-inline flag is kind
 	    # of overkill but it works. Disable inlining only when one of the
 	    # files in compat/*.c is being linked in.
 
-	    if test x"${USE_COMPAT}" != x; then
+	    if test x"${USE_COMPAT}" != x; then :
   CFLAGS="$CFLAGS -fno-inline"
 fi
-
 	    ;;
 	Lynx*)
 	    SHLIB_CFLAGS="-fPIC"
@@ -5322,12 +5326,11 @@ fi
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS="-mshared -ldl"
 	    LD_FLAGS="-Wl,--export-dynamic"
-	    if test $doRpath = yes; then
+	    if test $doRpath = yes; then :
 
 		CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
 		LD_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
 fi
-
 	    ;;
 	MP-RAS-02*)
 	    SHLIB_CFLAGS="-K PIC"
@@ -5364,16 +5367,15 @@ fi
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""
-	    if test $doRpath = yes; then
+	    if test $doRpath = yes; then :
 
 		CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
 fi
-
 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
 	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
 	    LDFLAGS="-Wl,-export-dynamic"
 	    CFLAGS_OPTIMIZE="-O2"
-	    if test "${TCL_THREADS}" = "1"; then
+	    if test "${TCL_THREADS}" = "1"; then :
 
 		# On OpenBSD:	Compile with -pthread
 		#		Don't link with -lpthread
@@ -5381,7 +5383,6 @@ fi
 		CFLAGS="$CFLAGS -pthread"
 
 fi
-
 	    # OpenBSD doesn't do version numbers with dots.
 	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 	    TCL_LIB_VERSIONS_OK=nodots
@@ -5394,13 +5395,12 @@ fi
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""
 	    LDFLAGS="$LDFLAGS -export-dynamic"
-	    if test $doRpath = yes; then
+	    if test $doRpath = yes; then :
 
 		CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
 fi
-
 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-	    if test "${TCL_THREADS}" = "1"; then
+	    if test "${TCL_THREADS}" = "1"; then :
 
 		# The -pthread needs to go in the CFLAGS, not LIBS
 		LIBS=`echo $LIBS | sed s/-pthread//`
@@ -5408,7 +5408,6 @@ fi
 	    	LDFLAGS="$LDFLAGS -pthread"
 
 fi
-
 	    ;;
 	DragonFly-*|FreeBSD-*)
 	    # This configuration from FreeBSD Ports.
@@ -5418,20 +5417,18 @@ fi
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""
-	    if test $doRpath = yes; then
+	    if test $doRpath = yes; then :
 
 		CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
 		LD_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
 fi
-
-	    if test "${TCL_THREADS}" = "1"; then
+	    if test "${TCL_THREADS}" = "1"; then :
 
 		# The -pthread needs to go in the LDFLAGS, not LIBS
 		LIBS=`echo $LIBS | sed s/-pthread//`
 		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
 		LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
 fi
-
 	    case $system in
 	    FreeBSD-3.*)
 		# Version numbers are dot-stripped by system policy.
@@ -5454,23 +5451,19 @@ fi
 	    CFLAGS="`echo " ${CFLAGS}" | \
 		awk 'BEGIN {FS=" +-";ORS=" "}; {for (i=2;i<=NF;i++) \
 		if (!($i~/^(isysroot|mmacosx-version-min)/)) print "-"$i}'`"
-	    if test $do64bit = yes; then
+	    if test $do64bit = yes; then :
 
 		case `arch` in
 		    ppc)
-			echo "$as_me:$LINENO: checking if compiler accepts -arch ppc64 flag" >&5
-echo $ECHO_N "checking if compiler accepts -arch ppc64 flag... $ECHO_C" >&6
-if test "${tcl_cv_cc_arch_ppc64+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -arch ppc64 flag" >&5
+$as_echo_n "checking if compiler accepts -arch ppc64 flag... " >&6; }
+if ${tcl_cv_cc_arch_ppc64+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
 			    hold_cflags=$CFLAGS
 			    CFLAGS="$CFLAGS -arch ppc64 -mpowerpc64 -mcpu=G5"
-			    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+			    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -5481,62 +5474,33 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   tcl_cv_cc_arch_ppc64=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_cc_arch_ppc64=no
+  tcl_cv_cc_arch_ppc64=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 			    CFLAGS=$hold_cflags
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_cc_arch_ppc64" >&5
-echo "${ECHO_T}$tcl_cv_cc_arch_ppc64" >&6
-			if test $tcl_cv_cc_arch_ppc64 = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cc_arch_ppc64" >&5
+$as_echo "$tcl_cv_cc_arch_ppc64" >&6; }
+			if test $tcl_cv_cc_arch_ppc64 = yes; then :
 
 			    CFLAGS="$CFLAGS -arch ppc64 -mpowerpc64 -mcpu=G5"
 			    do64bit_ok=yes
 
-fi
-;;
+fi;;
 		    i386)
-			echo "$as_me:$LINENO: checking if compiler accepts -arch x86_64 flag" >&5
-echo $ECHO_N "checking if compiler accepts -arch x86_64 flag... $ECHO_C" >&6
-if test "${tcl_cv_cc_arch_x86_64+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -arch x86_64 flag" >&5
+$as_echo_n "checking if compiler accepts -arch x86_64 flag... " >&6; }
+if ${tcl_cv_cc_arch_x86_64+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
 			    hold_cflags=$CFLAGS
 			    CFLAGS="$CFLAGS -arch x86_64"
-			    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+			    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -5547,79 +5511,48 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   tcl_cv_cc_arch_x86_64=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_cc_arch_x86_64=no
+  tcl_cv_cc_arch_x86_64=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 			    CFLAGS=$hold_cflags
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_cc_arch_x86_64" >&5
-echo "${ECHO_T}$tcl_cv_cc_arch_x86_64" >&6
-			if test $tcl_cv_cc_arch_x86_64 = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cc_arch_x86_64" >&5
+$as_echo "$tcl_cv_cc_arch_x86_64" >&6; }
+			if test $tcl_cv_cc_arch_x86_64 = yes; then :
 
 			    CFLAGS="$CFLAGS -arch x86_64"
 			    do64bit_ok=yes
 
-fi
-;;
+fi;;
 		    *)
-			{ echo "$as_me:$LINENO: WARNING: Don't know how enable 64-bit on architecture \`arch\`" >&5
-echo "$as_me: WARNING: Don't know how enable 64-bit on architecture \`arch\`" >&2;};;
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Don't know how enable 64-bit on architecture \`arch\`" >&5
+$as_echo "$as_me: WARNING: Don't know how enable 64-bit on architecture \`arch\`" >&2;};;
 		esac
 
 else
 
 		# Check for combined 32-bit and 64-bit fat build
 		if echo "$CFLAGS " |grep -E -q -- '-arch (ppc64|x86_64) ' \
-		    && echo "$CFLAGS " |grep -E -q -- '-arch (ppc|i386) '; then
+		    && echo "$CFLAGS " |grep -E -q -- '-arch (ppc|i386) '; then :
 
 		    fat_32_64=yes
 fi
 
-
 fi
-
 	    SHLIB_LD='${CC} -dynamiclib ${CFLAGS} ${LDFLAGS}'
-	    echo "$as_me:$LINENO: checking if ld accepts -single_module flag" >&5
-echo $ECHO_N "checking if ld accepts -single_module flag... $ECHO_C" >&6
-if test "${tcl_cv_ld_single_module+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ld accepts -single_module flag" >&5
+$as_echo_n "checking if ld accepts -single_module flag... " >&6; }
+if ${tcl_cv_ld_single_module+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
 		hold_ldflags=$LDFLAGS
 		LDFLAGS="$LDFLAGS -dynamiclib -Wl,-single_module"
-		cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -5630,64 +5563,35 @@ int i;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   tcl_cv_ld_single_module=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_ld_single_module=no
+  tcl_cv_ld_single_module=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 		LDFLAGS=$hold_ldflags
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_ld_single_module" >&5
-echo "${ECHO_T}$tcl_cv_ld_single_module" >&6
-	    if test $tcl_cv_ld_single_module = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_ld_single_module" >&5
+$as_echo "$tcl_cv_ld_single_module" >&6; }
+	    if test $tcl_cv_ld_single_module = yes; then :
 
 		SHLIB_LD="${SHLIB_LD} -Wl,-single_module"
 
 fi
-
 	    SHLIB_SUFFIX=".dylib"
 	    DL_OBJS="tclLoadDyld.o"
 	    DL_LIBS=""
 	    LDFLAGS="$LDFLAGS -headerpad_max_install_names"
-	    echo "$as_me:$LINENO: checking if ld accepts -search_paths_first flag" >&5
-echo $ECHO_N "checking if ld accepts -search_paths_first flag... $ECHO_C" >&6
-if test "${tcl_cv_ld_search_paths_first+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ld accepts -search_paths_first flag" >&5
+$as_echo_n "checking if ld accepts -search_paths_first flag... " >&6; }
+if ${tcl_cv_ld_search_paths_first+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
 		hold_ldflags=$LDFLAGS
 		LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
-		cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -5698,89 +5602,59 @@ int i;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   tcl_cv_ld_search_paths_first=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_ld_search_paths_first=no
+  tcl_cv_ld_search_paths_first=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 		LDFLAGS=$hold_ldflags
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_ld_search_paths_first" >&5
-echo "${ECHO_T}$tcl_cv_ld_search_paths_first" >&6
-	    if test $tcl_cv_ld_search_paths_first = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_ld_search_paths_first" >&5
+$as_echo "$tcl_cv_ld_search_paths_first" >&6; }
+	    if test $tcl_cv_ld_search_paths_first = yes; then :
 
 		LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
 
 fi
+	    if test "$tcl_cv_cc_visibility_hidden" != yes; then :
 
-	    if test "$tcl_cv_cc_visibility_hidden" != yes; then
 
-
-cat >>confdefs.h <<\_ACEOF
-#define MODULE_SCOPE __private_extern__
-_ACEOF
+$as_echo "#define MODULE_SCOPE __private_extern__" >>confdefs.h
 
 		tcl_cv_cc_visibility_hidden=yes
 
 fi
-
 	    CC_SEARCH_FLAGS=""
 	    LD_SEARCH_FLAGS=""
 	    LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH"
 
-cat >>confdefs.h <<\_ACEOF
-#define MAC_OSX_TCL 1
-_ACEOF
+$as_echo "#define MAC_OSX_TCL 1" >>confdefs.h
 
 	    PLAT_OBJS='${MAC_OSX_OBJS}'
 	    PLAT_SRCS='${MAC_OSX_SRCS}'
-	    echo "$as_me:$LINENO: checking whether to use CoreFoundation" >&5
-echo $ECHO_N "checking whether to use CoreFoundation... $ECHO_C" >&6
-	    # Check whether --enable-corefoundation or --disable-corefoundation was given.
-if test "${enable_corefoundation+set}" = set; then
-  enableval="$enable_corefoundation"
-  tcl_corefoundation=$enableval
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use CoreFoundation" >&5
+$as_echo_n "checking whether to use CoreFoundation... " >&6; }
+	    # Check whether --enable-corefoundation was given.
+if test "${enable_corefoundation+set}" = set; then :
+  enableval=$enable_corefoundation; tcl_corefoundation=$enableval
 else
   tcl_corefoundation=yes
-fi;
-	    echo "$as_me:$LINENO: result: $tcl_corefoundation" >&5
-echo "${ECHO_T}$tcl_corefoundation" >&6
-	    if test $tcl_corefoundation = yes; then
+fi
+
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_corefoundation" >&5
+$as_echo "$tcl_corefoundation" >&6; }
+	    if test $tcl_corefoundation = yes; then :
 
-		echo "$as_me:$LINENO: checking for CoreFoundation.framework" >&5
-echo $ECHO_N "checking for CoreFoundation.framework... $ECHO_C" >&6
-if test "${tcl_cv_lib_corefoundation+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CoreFoundation.framework" >&5
+$as_echo_n "checking for CoreFoundation.framework... " >&6; }
+if ${tcl_cv_lib_corefoundation+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
 		    hold_libs=$LIBS
-		    if test "$fat_32_64" = yes; then
+		    if test "$fat_32_64" = yes; then :
 
 			for v in CFLAGS CPPFLAGS LDFLAGS; do
 			    # On Tiger there is no 64-bit CF, so remove 64-bit
@@ -5790,13 +5664,8 @@ else
 			    eval 'hold_'$v'="$'$v'";'$v'="`echo "$'$v' "|sed -e "s/-arch ppc64 / /g" -e "s/-arch x86_64 / /g"`"'
 			done
 fi
-
 		    LIBS="$LIBS -framework CoreFoundation"
-		    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+		    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <CoreFoundation/CoreFoundation.h>
 int
@@ -5807,77 +5676,45 @@ CFBundleRef b = CFBundleGetMainBundle();
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   tcl_cv_lib_corefoundation=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_lib_corefoundation=no
+  tcl_cv_lib_corefoundation=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-		    if test "$fat_32_64" = yes; then
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+		    if test "$fat_32_64" = yes; then :
 
 			for v in CFLAGS CPPFLAGS LDFLAGS; do
 			    eval $v'="$hold_'$v'"'
 		        done
 fi
-
 		    LIBS=$hold_libs
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_lib_corefoundation" >&5
-echo "${ECHO_T}$tcl_cv_lib_corefoundation" >&6
-		if test $tcl_cv_lib_corefoundation = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_lib_corefoundation" >&5
+$as_echo "$tcl_cv_lib_corefoundation" >&6; }
+		if test $tcl_cv_lib_corefoundation = yes; then :
 
 		    LIBS="$LIBS -framework CoreFoundation"
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_COREFOUNDATION 1
-_ACEOF
+$as_echo "#define HAVE_COREFOUNDATION 1" >>confdefs.h
 
 
 else
   tcl_corefoundation=no
 fi
+		if test "$fat_32_64" = yes -a $tcl_corefoundation = yes; then :
 
-		if test "$fat_32_64" = yes -a $tcl_corefoundation = yes; then
-
-		    echo "$as_me:$LINENO: checking for 64-bit CoreFoundation" >&5
-echo $ECHO_N "checking for 64-bit CoreFoundation... $ECHO_C" >&6
-if test "${tcl_cv_lib_corefoundation_64+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+		    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit CoreFoundation" >&5
+$as_echo_n "checking for 64-bit CoreFoundation... " >&6; }
+if ${tcl_cv_lib_corefoundation_64+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
 			for v in CFLAGS CPPFLAGS LDFLAGS; do
 			    eval 'hold_'$v'="$'$v'";'$v'="`echo "$'$v' "|sed -e "s/-arch ppc / /g" -e "s/-arch i386 / /g"`"'
 			done
-			cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <CoreFoundation/CoreFoundation.h>
 int
@@ -5888,60 +5725,31 @@ CFBundleRef b = CFBundleGetMainBundle();
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   tcl_cv_lib_corefoundation_64=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_lib_corefoundation_64=no
+  tcl_cv_lib_corefoundation_64=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 			for v in CFLAGS CPPFLAGS LDFLAGS; do
 			    eval $v'="$hold_'$v'"'
 			done
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_lib_corefoundation_64" >&5
-echo "${ECHO_T}$tcl_cv_lib_corefoundation_64" >&6
-		    if test $tcl_cv_lib_corefoundation_64 = no; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_lib_corefoundation_64" >&5
+$as_echo "$tcl_cv_lib_corefoundation_64" >&6; }
+		    if test $tcl_cv_lib_corefoundation_64 = no; then :
 
 
-cat >>confdefs.h <<\_ACEOF
-#define NO_COREFOUNDATION_64 1
-_ACEOF
+$as_echo "#define NO_COREFOUNDATION_64 1" >>confdefs.h
 
                         LDFLAGS="$LDFLAGS -Wl,-no_arch_warnings"
 
 fi
 
-
 fi
 
-
 fi
-
 	    ;;
 	NEXTSTEP-*)
 	    SHLIB_CFLAGS=""
@@ -5957,9 +5765,7 @@ fi
 	    SHLIB_LD_LIBS=""
 	    CFLAGS_OPTIMIZE=""		# Optimizer is buggy
 
-cat >>confdefs.h <<\_ACEOF
-#define _OE_SOCKETS 1
-_ACEOF
+$as_echo "#define _OE_SOCKETS 1" >>confdefs.h
 
 	    ;;
 	OSF1-1.0|OSF1-1.1|OSF1-1.2)
@@ -5977,14 +5783,13 @@ _ACEOF
 	OSF1-1.*)
 	    # OSF/1 1.3 from OSF using ELF, and derivatives, including AD2
 	    SHLIB_CFLAGS="-fPIC"
-	    if test "$SHARED_BUILD" = 1; then
+	    if test "$SHARED_BUILD" = 1; then :
   SHLIB_LD="ld -shared"
 else
 
 	        SHLIB_LD="ld -non_shared"
 
 fi
-
 	    SHLIB_LD_LIBS=""
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
@@ -5995,7 +5800,7 @@ fi
 	OSF1-V*)
 	    # Digital OSF/1
 	    SHLIB_CFLAGS=""
-	    if test "$SHARED_BUILD" = 1; then
+	    if test "$SHARED_BUILD" = 1; then :
 
 	        SHLIB_LD='ld -shared -expect_unresolved "*"'
 
@@ -6004,30 +5809,27 @@ else
 	        SHLIB_LD='ld -non_shared -expect_unresolved "*"'
 
 fi
-
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""
-	    if test $doRpath = yes; then
+	    if test $doRpath = yes; then :
 
 		CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
 		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
 fi
-
-	    if test "$GCC" = yes; then
+	    if test "$GCC" = yes; then :
   CFLAGS="$CFLAGS -mieee"
 else
 
 		CFLAGS="$CFLAGS -DHAVE_TZSET -std1 -ieee"
 fi
-
 	    # see pthread_intro(3) for pthread support on osf1, k.furukawa
-	    if test "${TCL_THREADS}" = 1; then
+	    if test "${TCL_THREADS}" = 1; then :
 
 		CFLAGS="$CFLAGS -DHAVE_PTHREAD_ATTR_SETSTACKSIZE"
 		CFLAGS="$CFLAGS -DTCL_THREAD_STACK_MIN=PTHREAD_STACK_MIN*64"
 		LIBS=`echo $LIBS | sed s/-lpthreads//`
-		if test "$GCC" = yes; then
+		if test "$GCC" = yes; then :
 
 		    LIBS="$LIBS -lpthread -lmach -lexc"
 
@@ -6038,9 +5840,7 @@ else
 
 fi
 
-
 fi
-
 	    ;;
 	QNX-6*)
 	    # QNX RTP
@@ -6059,7 +5859,7 @@ fi
 	    # Note, dlopen is available only on SCO 3.2.5 and greater. However,
 	    # this test works, since "uname -s" was non-standard in 3.2.4 and
 	    # below.
-	    if test "$GCC" = yes; then
+	    if test "$GCC" = yes; then :
 
 	    	SHLIB_CFLAGS="-fPIC -melf"
 	    	LDFLAGS="$LDFLAGS -melf -Wl,-Bexport"
@@ -6070,7 +5870,6 @@ else
 	    	LDFLAGS="$LDFLAGS -belf -Wl,-Bexport"
 
 fi
-
 	    SHLIB_LD="ld -G"
 	    SHLIB_LD_LIBS=""
 	    SHLIB_SUFFIX=".so"
@@ -6115,21 +5914,17 @@ fi
 	    # won't define thread-safe library routines.
 
 
-cat >>confdefs.h <<\_ACEOF
-#define _REENTRANT 1
-_ACEOF
+$as_echo "#define _REENTRANT 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define _POSIX_PTHREAD_SEMANTICS 1
-_ACEOF
+$as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
 
 
 	    SHLIB_CFLAGS="-KPIC"
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS="-ldl"
-	    if test "$GCC" = yes; then
+	    if test "$GCC" = yes; then :
 
 		SHLIB_LD='${CC} -shared'
 		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
@@ -6142,37 +5937,32 @@ else
 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
 
 fi
-
 	    ;;
 	SunOS-5*)
 	    # Note: If _REENTRANT isn't defined, then Solaris
 	    # won't define thread-safe library routines.
 
 
-cat >>confdefs.h <<\_ACEOF
-#define _REENTRANT 1
-_ACEOF
+$as_echo "#define _REENTRANT 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define _POSIX_PTHREAD_SEMANTICS 1
-_ACEOF
+$as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
 
 
 	    SHLIB_CFLAGS="-KPIC"
 
 	    # Check to enable 64-bit flags for compiler/linker
-	    if test "$do64bit" = yes; then
+	    if test "$do64bit" = yes; then :
 
 		arch=`isainfo`
-		if test "$arch" = "sparcv9 sparc"; then
+		if test "$arch" = "sparcv9 sparc"; then :
 
-		    if test "$GCC" = yes; then
+		    if test "$GCC" = yes; then :
 
-			if test "`${CC} -dumpversion | awk -F. '{print $1}'`" -lt 3; then
+			if test "`${CC} -dumpversion | awk -F. '{print $1}'`" -lt 3; then :
 
-			    { echo "$as_me:$LINENO: WARNING: 64bit mode not supported with GCC < 3.2 on $system" >&5
-echo "$as_me: WARNING: 64bit mode not supported with GCC < 3.2 on $system" >&2;}
+			    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 64bit mode not supported with GCC < 3.2 on $system" >&5
+$as_echo "$as_me: WARNING: 64bit mode not supported with GCC < 3.2 on $system" >&2;}
 
 else
 
@@ -6183,11 +5973,10 @@ else
 
 fi
 
-
 else
 
 			do64bit_ok=yes
-			if test "$do64bitVIS" = yes; then
+			if test "$do64bitVIS" = yes; then :
 
 			    CFLAGS="$CFLAGS -xarch=v9a"
 			    LDFLAGS_ARCH="-xarch=v9a"
@@ -6198,17 +5987,15 @@ else
 			    LDFLAGS_ARCH="-xarch=v9"
 
 fi
-
 			# Solaris 64 uses this as well
 			#LD_LIBRARY_PATH_VAR="LD_LIBRARY_PATH_64"
 
 fi
 
-
 else
-  if test "$arch" = "amd64 i386"; then
+  if test "$arch" = "amd64 i386"; then :
 
-		    if test "$GCC" = yes; then
+		    if test "$GCC" = yes; then :
 
 			case $system in
 			    SunOS-5.1[1-9]*|SunOS-5.[2-9][0-9]*)
@@ -6216,8 +6003,8 @@ else
 				CFLAGS="$CFLAGS -m64"
 				LDFLAGS="$LDFLAGS -m64";;
 			    *)
-				{ echo "$as_me:$LINENO: WARNING: 64bit mode not supported with GCC on $system" >&5
-echo "$as_me: WARNING: 64bit mode not supported with GCC on $system" >&2;};;
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 64bit mode not supported with GCC on $system" >&5
+$as_echo "$as_me: WARNING: 64bit mode not supported with GCC on $system" >&2;};;
 			esac
 
 else
@@ -6234,169 +6021,32 @@ else
 
 fi
 
-
 else
-  { echo "$as_me:$LINENO: WARNING: 64bit mode not supported for $arch" >&5
-echo "$as_me: WARNING: 64bit mode not supported for $arch" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 64bit mode not supported for $arch" >&5
+$as_echo "$as_me: WARNING: 64bit mode not supported for $arch" >&2;}
 fi
-
 fi
 
-
 fi
 
-
 	    #--------------------------------------------------------------------
 	    # On Solaris 5.x i386 with the sunpro compiler we need to link
 	    # with sunmath to get floating point rounding control
 	    #--------------------------------------------------------------------
-	    if test "$GCC" = yes; then
+	    if test "$GCC" = yes; then :
   use_sunmath=no
 else
 
 		arch=`isainfo`
-		echo "$as_me:$LINENO: checking whether to use -lsunmath for fp rounding control" >&5
-echo $ECHO_N "checking whether to use -lsunmath for fp rounding control... $ECHO_C" >&6
-		if test "$arch" = "amd64 i386" -o "$arch" = "i386"; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use -lsunmath for fp rounding control" >&5
+$as_echo_n "checking whether to use -lsunmath for fp rounding control... " >&6; }
+		if test "$arch" = "amd64 i386" -o "$arch" = "i386"; then :
 
-			echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 			MATH_LIBS="-lsunmath $MATH_LIBS"
-			if test "${ac_cv_header_sunmath_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for sunmath.h" >&5
-echo $ECHO_N "checking for sunmath.h... $ECHO_C" >&6
-if test "${ac_cv_header_sunmath_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_sunmath_h" >&5
-echo "${ECHO_T}$ac_cv_header_sunmath_h" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking sunmath.h usability" >&5
-echo $ECHO_N "checking sunmath.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <sunmath.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking sunmath.h presence" >&5
-echo $ECHO_N "checking sunmath.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sunmath.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: sunmath.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: sunmath.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sunmath.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: sunmath.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: sunmath.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: sunmath.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sunmath.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: sunmath.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sunmath.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: sunmath.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sunmath.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: sunmath.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sunmath.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: sunmath.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sunmath.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: sunmath.h: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ----------------------------- ##
-## Report this to the tk lists.  ##
-## ----------------------------- ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for sunmath.h" >&5
-echo $ECHO_N "checking for sunmath.h... $ECHO_C" >&6
-if test "${ac_cv_header_sunmath_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_sunmath_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_sunmath_h" >&5
-echo "${ECHO_T}$ac_cv_header_sunmath_h" >&6
+			ac_fn_c_check_header_mongrel "$LINENO" "sunmath.h" "ac_cv_header_sunmath_h" "$ac_includes_default"
+if test "x$ac_cv_header_sunmath_h" = xyes; then :
 
 fi
 
@@ -6405,26 +6055,24 @@ fi
 
 else
 
-			echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 			use_sunmath=no
 
 fi
 
-
 fi
-
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS="-ldl"
-	    if test "$GCC" = yes; then
+	    if test "$GCC" = yes; then :
 
 		SHLIB_LD='${CC} -shared'
 		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-		if test "$do64bit_ok" = yes; then
+		if test "$do64bit_ok" = yes; then :
 
-		    if test "$arch" = "sparcv9 sparc"; then
+		    if test "$arch" = "sparcv9 sparc"; then :
 
 			# We need to specify -static-libgcc or we need to
 			# add the path to the sparv9 libgcc.
@@ -6435,26 +6083,22 @@ fi
 			#CC_SEARCH_FLAGS="${CC_SEARCH_FLAGS},-R,$v9gcclibdir"
 
 else
-  if test "$arch" = "amd64 i386"; then
+  if test "$arch" = "amd64 i386"; then :
 
 			SHLIB_LD="$SHLIB_LD -m64 -static-libgcc"
 
 fi
-
 fi
 
-
 fi
 
-
 else
 
-		if test "$use_sunmath" = yes; then
+		if test "$use_sunmath" = yes; then :
   textmode=textoff
 else
   textmode=text
 fi
-
 		case $system in
 		    SunOS-5.[1-9][0-9]*|SunOS-5.[7-9])
 			SHLIB_LD="\${CC} -G -z $textmode \${LDFLAGS}";;
@@ -6465,7 +6109,6 @@ fi
 		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
 
 fi
-
 	    ;;
 	UNIX_SV* | UnixWare-5*)
 	    SHLIB_CFLAGS="-KPIC"
@@ -6476,19 +6119,15 @@ fi
 	    DL_LIBS="-ldl"
 	    # Some UNIX_SV* systems (unixware 1.1.2 for example) have linkers
 	    # that don't grok the -Bexport option.  Test that it does.
-	    echo "$as_me:$LINENO: checking for ld accepts -Bexport flag" >&5
-echo $ECHO_N "checking for ld accepts -Bexport flag... $ECHO_C" >&6
-if test "${tcl_cv_ld_Bexport+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld accepts -Bexport flag" >&5
+$as_echo_n "checking for ld accepts -Bexport flag... " >&6; }
+if ${tcl_cv_ld_Bexport+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
 		hold_ldflags=$LDFLAGS
 		LDFLAGS="$LDFLAGS -Wl,-Bexport"
-		cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -6499,93 +6138,63 @@ int i;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   tcl_cv_ld_Bexport=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_ld_Bexport=no
+  tcl_cv_ld_Bexport=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 	        LDFLAGS=$hold_ldflags
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_ld_Bexport" >&5
-echo "${ECHO_T}$tcl_cv_ld_Bexport" >&6
-	    if test $tcl_cv_ld_Bexport = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_ld_Bexport" >&5
+$as_echo "$tcl_cv_ld_Bexport" >&6; }
+	    if test $tcl_cv_ld_Bexport = yes; then :
 
 		LDFLAGS="$LDFLAGS -Wl,-Bexport"
 
 fi
-
 	    CC_SEARCH_FLAGS=""
 	    LD_SEARCH_FLAGS=""
 	    ;;
     esac
 
-    if test "$do64bit" = yes -a "$do64bit_ok" = no; then
+    if test "$do64bit" = yes -a "$do64bit_ok" = no; then :
 
-	{ echo "$as_me:$LINENO: WARNING: 64bit support being disabled -- don't know magic for this platform" >&5
-echo "$as_me: WARNING: 64bit support being disabled -- don't know magic for this platform" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 64bit support being disabled -- don't know magic for this platform" >&5
+$as_echo "$as_me: WARNING: 64bit support being disabled -- don't know magic for this platform" >&2;}
 
 fi
 
+    if test "$do64bit" = yes -a "$do64bit_ok" = yes; then :
 
-    if test "$do64bit" = yes -a "$do64bit_ok" = yes; then
 
-
-cat >>confdefs.h <<\_ACEOF
-#define TCL_CFG_DO64BIT 1
-_ACEOF
+$as_echo "#define TCL_CFG_DO64BIT 1" >>confdefs.h
 
 
 fi
 
 
 
-
     # Step 4: disable dynamic loading if requested via a command-line switch.
 
-    # Check whether --enable-load or --disable-load was given.
-if test "${enable_load+set}" = set; then
-  enableval="$enable_load"
-  tcl_ok=$enableval
+    # Check whether --enable-load was given.
+if test "${enable_load+set}" = set; then :
+  enableval=$enable_load; tcl_ok=$enableval
 else
   tcl_ok=yes
-fi;
-    if test "$tcl_ok" = no; then
-  DL_OBJS=""
 fi
 
+    if test "$tcl_ok" = no; then :
+  DL_OBJS=""
+fi
 
-    if test "x$DL_OBJS" != x; then
+    if test "x$DL_OBJS" != x; then :
   BUILD_DLTEST="\$(DLTEST_TARGETS)"
 else
 
-	{ echo "$as_me:$LINENO: WARNING: Can't figure out how to do dynamic loading or shared libraries on this system." >&5
-echo "$as_me: WARNING: Can't figure out how to do dynamic loading or shared libraries on this system." >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can't figure out how to do dynamic loading or shared libraries on this system." >&5
+$as_echo "$as_me: WARNING: Can't figure out how to do dynamic loading or shared libraries on this system." >&2;}
 	SHLIB_CFLAGS=""
 	SHLIB_LD=""
 	SHLIB_SUFFIX=""
@@ -6597,14 +6206,13 @@ echo "$as_me: WARNING: Can't figure out how to do dynamic loading or shared libr
 	BUILD_DLTEST=""
 
 fi
-
     LDFLAGS="$LDFLAGS $LDFLAGS_ARCH"
 
     # If we're running gcc, then change the C flags for compiling shared
     # libraries to the right flags for gcc, instead of those for the
     # standard manufacturer compiler.
 
-    if test "$DL_OBJS" != "tclLoadNone.o" -a "$GCC" = yes; then
+    if test "$DL_OBJS" != "tclLoadNone.o" -a "$GCC" = yes; then :
 
 	case $system in
 	    AIX-*) ;;
@@ -6618,35 +6226,29 @@ fi
 	esac
 fi
 
-
-    if test "$tcl_cv_cc_visibility_hidden" != yes; then
+    if test "$tcl_cv_cc_visibility_hidden" != yes; then :
 
 
-cat >>confdefs.h <<\_ACEOF
-#define MODULE_SCOPE extern
-_ACEOF
+$as_echo "#define MODULE_SCOPE extern" >>confdefs.h
 
 
 fi
 
-
-    if test "$SHARED_LIB_SUFFIX" = ""; then
+    if test "$SHARED_LIB_SUFFIX" = ""; then :
 
 	SHARED_LIB_SUFFIX='${VERSION}${SHLIB_SUFFIX}'
 fi
-
-    if test "$UNSHARED_LIB_SUFFIX" = ""; then
+    if test "$UNSHARED_LIB_SUFFIX" = ""; then :
 
 	UNSHARED_LIB_SUFFIX='${VERSION}.a'
 fi
-
     DLL_INSTALL_DIR="\$(LIB_INSTALL_DIR)"
 
-    if test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""; then
+    if test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""; then :
 
         LIB_SUFFIX=${SHARED_LIB_SUFFIX}
         MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${LDFLAGS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
-        if test "${SHLIB_SUFFIX}" = ".dll"; then
+        if test "${SHLIB_SUFFIX}" = ".dll"; then :
 
             INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)";if test -f $(LIB_FILE).a; then $(INSTALL_DATA) $(LIB_FILE).a "$(LIB_INSTALL_DIR)"; fi;'
             DLL_INSTALL_DIR="\$(BIN_INSTALL_DIR)"
@@ -6657,12 +6259,11 @@ else
 
 fi
 
-
 else
 
         LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
 
-        if test "$RANLIB" = ""; then
+        if test "$RANLIB" = ""; then :
 
             MAKE_LIB='$(STLIB_LD) $@ ${OBJS}'
 
@@ -6671,14 +6272,12 @@ else
             MAKE_LIB='${STLIB_LD} $@ ${OBJS} ; ${RANLIB} $@'
 
 fi
-
         INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"'
 
 fi
 
-
     # Stub lib does not depend on shared/static configuration
-    if test "$RANLIB" = ""; then
+    if test "$RANLIB" = ""; then :
 
         MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS}'
 
@@ -6687,33 +6286,27 @@ else
         MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS} ; ${RANLIB} $@'
 
 fi
-
     INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)"'
 
     # Define TCL_LIBS now that we know what DL_LIBS is.
     # The trick here is that we don't want to change the value of TCL_LIBS if
     # it is already set when tclConfig.sh had been loaded by Tk.
-    if test "x${TCL_LIBS}" = x; then
+    if test "x${TCL_LIBS}" = x; then :
 
         TCL_LIBS="${DL_LIBS} ${LIBS} ${MATH_LIBS}"
 fi
 
 
-
 	# See if the compiler supports casting to a union type.
 	# This is used to stop gcc from printing a compiler
 	# warning when initializing a union member.
 
-	echo "$as_me:$LINENO: checking for cast to union support" >&5
-echo $ECHO_N "checking for cast to union support... $ECHO_C" >&6
-if test "${tcl_cv_cast_to_union+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cast to union support" >&5
+$as_echo_n "checking for cast to union support... " >&6; }
+if ${tcl_cv_cast_to_union+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -6727,45 +6320,19 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_cv_cast_to_union=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_cast_to_union=no
+  tcl_cv_cast_to_union=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_cast_to_union" >&5
-echo "${ECHO_T}$tcl_cv_cast_to_union" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cast_to_union" >&5
+$as_echo "$tcl_cv_cast_to_union" >&6; }
 	if test "$tcl_cv_cast_to_union" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CAST_TO_UNION 1
-_ACEOF
+$as_echo "#define HAVE_CAST_TO_UNION 1" >>confdefs.h
 
 	fi
 
@@ -6811,37 +6378,33 @@ _ACEOF
 
 
 
-    echo "$as_me:$LINENO: checking for build with symbols" >&5
-echo $ECHO_N "checking for build with symbols... $ECHO_C" >&6
-    # Check whether --enable-symbols or --disable-symbols was given.
-if test "${enable_symbols+set}" = set; then
-  enableval="$enable_symbols"
-  tcl_ok=$enableval
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for build with symbols" >&5
+$as_echo_n "checking for build with symbols... " >&6; }
+    # Check whether --enable-symbols was given.
+if test "${enable_symbols+set}" = set; then :
+  enableval=$enable_symbols; tcl_ok=$enableval
 else
   tcl_ok=no
-fi;
+fi
+
 # FIXME: Currently, LDFLAGS_DEFAULT is not used, it should work like CFLAGS_DEFAULT.
     if test "$tcl_ok" = "no"; then
 	CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)'
 	LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)'
 
-cat >>confdefs.h <<\_ACEOF
-#define NDEBUG 1
-_ACEOF
+$as_echo "#define NDEBUG 1" >>confdefs.h
 
-	echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define TCL_CFG_OPTIMIZED 1
-_ACEOF
+$as_echo "#define TCL_CFG_OPTIMIZED 1" >>confdefs.h
 
     else
 	CFLAGS_DEFAULT='$(CFLAGS_DEBUG)'
 	LDFLAGS_DEFAULT='$(LDFLAGS_DEBUG)'
 	if test "$tcl_ok" = "yes"; then
-	    echo "$as_me:$LINENO: result: yes (standard debugging)" >&5
-echo "${ECHO_T}yes (standard debugging)" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (standard debugging)" >&5
+$as_echo "yes (standard debugging)" >&6; }
 	fi
     fi
 
@@ -6849,9 +6412,7 @@ echo "${ECHO_T}yes (standard debugging)" >&6
 
     if test "$tcl_ok" = "mem" -o "$tcl_ok" = "all"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define TCL_MEM_DEBUG 1
-_ACEOF
+$as_echo "#define TCL_MEM_DEBUG 1" >>confdefs.h
 
     fi
 
@@ -6859,11 +6420,11 @@ _ACEOF
 
     if test "$tcl_ok" != "yes" -a "$tcl_ok" != "no"; then
 	if test "$tcl_ok" = "all"; then
-	    echo "$as_me:$LINENO: result: enabled symbols mem debugging" >&5
-echo "${ECHO_T}enabled symbols mem debugging" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabled symbols mem debugging" >&5
+$as_echo "enabled symbols mem debugging" >&6; }
 	else
-	    echo "$as_me:$LINENO: result: enabled $tcl_ok debugging" >&5
-echo "${ECHO_T}enabled $tcl_ok debugging" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabled $tcl_ok debugging" >&5
+$as_echo "enabled $tcl_ok debugging" >&6; }
 	fi
     fi
 
@@ -6873,18 +6434,14 @@ echo "${ECHO_T}enabled $tcl_ok debugging" >&6
 #--------------------------------------------------------------------
 
 
-    echo "$as_me:$LINENO: checking for required early compiler flags" >&5
-echo $ECHO_N "checking for required early compiler flags... $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for required early compiler flags" >&5
+$as_echo_n "checking for required early compiler flags... " >&6; }
     tcl_flags=""
 
-    if test "${tcl_cv_flag__isoc99_source+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    if ${tcl_cv_flag__isoc99_source+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 int
@@ -6895,38 +6452,10 @@ char *p = (char *)strtoll; char *q = (char *)strtoull;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_cv_flag__isoc99_source=no
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #define _ISOC99_SOURCE 1
 #include <stdlib.h>
@@ -6938,58 +6467,28 @@ char *p = (char *)strtoll; char *q = (char *)strtoull;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_cv_flag__isoc99_source=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_flag__isoc99_source=no
+  tcl_cv_flag__isoc99_source=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
     if test "x${tcl_cv_flag__isoc99_source}" = "xyes" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define _ISOC99_SOURCE 1
-_ACEOF
+$as_echo "#define _ISOC99_SOURCE 1" >>confdefs.h
 
 	tcl_flags="$tcl_flags _ISOC99_SOURCE"
     fi
 
 
-    if test "${tcl_cv_flag__largefile64_source+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    if ${tcl_cv_flag__largefile64_source+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/stat.h>
 int
@@ -7000,38 +6499,10 @@ struct stat64 buf; int i = stat64("/", &buf);
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_cv_flag__largefile64_source=no
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #define _LARGEFILE64_SOURCE 1
 #include <sys/stat.h>
@@ -7043,58 +6514,28 @@ struct stat64 buf; int i = stat64("/", &buf);
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_cv_flag__largefile64_source=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_flag__largefile64_source=no
+  tcl_cv_flag__largefile64_source=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
     if test "x${tcl_cv_flag__largefile64_source}" = "xyes" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define _LARGEFILE64_SOURCE 1
-_ACEOF
+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
 
 	tcl_flags="$tcl_flags _LARGEFILE64_SOURCE"
     fi
 
 
-    if test "${tcl_cv_flag__largefile_source64+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    if ${tcl_cv_flag__largefile_source64+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/stat.h>
 int
@@ -7105,38 +6546,10 @@ char *p = (char *)open64;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_cv_flag__largefile_source64=no
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #define _LARGEFILE_SOURCE64 1
 #include <sys/stat.h>
@@ -7148,72 +6561,42 @@ char *p = (char *)open64;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_cv_flag__largefile_source64=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_flag__largefile_source64=no
+  tcl_cv_flag__largefile_source64=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
     if test "x${tcl_cv_flag__largefile_source64}" = "xyes" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define _LARGEFILE_SOURCE64 1
-_ACEOF
+$as_echo "#define _LARGEFILE_SOURCE64 1" >>confdefs.h
 
 	tcl_flags="$tcl_flags _LARGEFILE_SOURCE64"
     fi
 
     if test "x${tcl_flags}" = "x" ; then
-	echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
     else
-	echo "$as_me:$LINENO: result: ${tcl_flags}" >&5
-echo "${ECHO_T}${tcl_flags}" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${tcl_flags}" >&5
+$as_echo "${tcl_flags}" >&6; }
     fi
 
 
 
-    echo "$as_me:$LINENO: checking for 64-bit integer type" >&5
-echo $ECHO_N "checking for 64-bit integer type... $ECHO_C" >&6
-    if test "${tcl_cv_type_64bit+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit integer type" >&5
+$as_echo_n "checking for 64-bit integer type... " >&6; }
+    if ${tcl_cv_type_64bit+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
 	tcl_cv_type_64bit=none
 	# See if the compiler knows natively about __int64
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -7224,44 +6607,16 @@ __int64 value = (__int64) 0;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_type_64bit=__int64
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_type_64bit="long long"
+  tcl_type_64bit="long long"
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	# See if we should use long anyway  Note that we substitute in the
 	# type that is our current guess for a 64-bit type inside this check
 	# program, so it should be modified only carefully...
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -7274,66 +6629,35 @@ switch (0) {
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_cv_type_64bit=${tcl_type_64bit}
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
     if test "${tcl_cv_type_64bit}" = none ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define TCL_WIDE_INT_IS_LONG 1
-_ACEOF
+$as_echo "#define TCL_WIDE_INT_IS_LONG 1" >>confdefs.h
 
-	echo "$as_me:$LINENO: result: using long" >&5
-echo "${ECHO_T}using long" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using long" >&5
+$as_echo "using long" >&6; }
     else
 
 cat >>confdefs.h <<_ACEOF
 #define TCL_WIDE_INT_TYPE ${tcl_cv_type_64bit}
 _ACEOF
 
-	echo "$as_me:$LINENO: result: ${tcl_cv_type_64bit}" >&5
-echo "${ECHO_T}${tcl_cv_type_64bit}" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${tcl_cv_type_64bit}" >&5
+$as_echo "${tcl_cv_type_64bit}" >&6; }
 
 	# Now check for auxiliary declarations
-	echo "$as_me:$LINENO: checking for struct dirent64" >&5
-echo $ECHO_N "checking for struct dirent64... $ECHO_C" >&6
-if test "${tcl_cv_struct_dirent64+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct dirent64" >&5
+$as_echo_n "checking for struct dirent64... " >&6; }
+if ${tcl_cv_struct_dirent64+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
-	    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <dirent.h>
@@ -7345,58 +6669,28 @@ struct dirent64 p;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_cv_struct_dirent64=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_struct_dirent64=no
+  tcl_cv_struct_dirent64=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_struct_dirent64" >&5
-echo "${ECHO_T}$tcl_cv_struct_dirent64" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_struct_dirent64" >&5
+$as_echo "$tcl_cv_struct_dirent64" >&6; }
 	if test "x${tcl_cv_struct_dirent64}" = "xyes" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_DIRENT64 1
-_ACEOF
+$as_echo "#define HAVE_STRUCT_DIRENT64 1" >>confdefs.h
 
 	fi
 
-	echo "$as_me:$LINENO: checking for DIR64" >&5
-echo $ECHO_N "checking for DIR64... $ECHO_C" >&6
-if test "${tcl_cv_DIR64+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DIR64" >&5
+$as_echo_n "checking for DIR64... " >&6; }
+if ${tcl_cv_DIR64+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
-	    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <dirent.h>
@@ -7409,58 +6703,28 @@ struct dirent64 *p; DIR64 d = opendir64(".");
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_cv_DIR64=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_DIR64=no
+  tcl_cv_DIR64=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_DIR64" >&5
-echo "${ECHO_T}$tcl_cv_DIR64" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_DIR64" >&5
+$as_echo "$tcl_cv_DIR64" >&6; }
 	if test "x${tcl_cv_DIR64}" = "xyes" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DIR64 1
-_ACEOF
+$as_echo "#define HAVE_DIR64 1" >>confdefs.h
 
 	fi
 
-	echo "$as_me:$LINENO: checking for struct stat64" >&5
-echo $ECHO_N "checking for struct stat64... $ECHO_C" >&6
-if test "${tcl_cv_struct_stat64+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct stat64" >&5
+$as_echo_n "checking for struct stat64... " >&6; }
+if ${tcl_cv_struct_stat64+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
-	    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/stat.h>
 int
@@ -7472,161 +6736,40 @@ struct stat64 p;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_cv_struct_stat64=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_struct_stat64=no
+  tcl_cv_struct_stat64=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_struct_stat64" >&5
-echo "${ECHO_T}$tcl_cv_struct_stat64" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_struct_stat64" >&5
+$as_echo "$tcl_cv_struct_stat64" >&6; }
 	if test "x${tcl_cv_struct_stat64}" = "xyes" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_STAT64 1
-_ACEOF
+$as_echo "#define HAVE_STRUCT_STAT64 1" >>confdefs.h
 
 	fi
 
-
-
-for ac_func in open64 lseek64
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+	for ac_func in open64 lseek64
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
-	echo "$as_me:$LINENO: checking for off64_t" >&5
-echo $ECHO_N "checking for off64_t... $ECHO_C" >&6
-	if test "${tcl_cv_type_off64_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for off64_t" >&5
+$as_echo_n "checking for off64_t... " >&6; }
+	if ${tcl_cv_type_off64_t+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
-	    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 int
@@ -7638,51 +6781,25 @@ off64_t offset;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_cv_type_off64_t=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_type_off64_t=no
+  tcl_cv_type_off64_t=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
 			if test "x${tcl_cv_type_off64_t}" = "xyes" && \
 	        test "x${ac_cv_func_lseek64}" = "xyes" && \
 	        test "x${ac_cv_func_open64}" = "xyes" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_TYPE_OFF64_T 1
-_ACEOF
+$as_echo "#define HAVE_TYPE_OFF64_T 1" >>confdefs.h
 
-	    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 	else
-	    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 	fi
     fi
 
@@ -7691,235 +6808,229 @@ echo "${ECHO_T}no" >&6
 #	Check endianness because we can optimize some operations
 #--------------------------------------------------------------------
 
-echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
-if test "${ac_cv_c_bigendian+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+if ${ac_cv_c_bigendian+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  # See if sys/param.h defines the BYTE_ORDER macro.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  ac_cv_c_bigendian=unknown
+    # See if we're dealing with a universal compiler.
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __APPLE_CC__
+	       not a universal capable compiler
+	     #endif
+	     typedef int dummy;
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+	# Check for potential -arch flags.  It is not universal unless
+	# there are at least two -arch flags with different values.
+	ac_arch=
+	ac_prev=
+	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
+	 if test -n "$ac_prev"; then
+	   case $ac_word in
+	     i?86 | x86_64 | ppc | ppc64)
+	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+		 ac_arch=$ac_word
+	       else
+		 ac_cv_c_bigendian=universal
+		 break
+	       fi
+	       ;;
+	   esac
+	   ac_prev=
+	 elif test "x$ac_word" = "x-arch"; then
+	   ac_prev=arch
+	 fi
+       done
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if sys/param.h defines the BYTE_ORDER macro.
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
-#include <sys/param.h>
+	     #include <sys/param.h>
 
 int
 main ()
 {
-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
- bogus endian macros
-#endif
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+		     && LITTLE_ENDIAN)
+	      bogus endian macros
+	     #endif
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   # It does; now see whether it defined to BIG_ENDIAN or not.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
-#include <sys/param.h>
+		#include <sys/param.h>
 
 int
 main ()
 {
 #if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
+		 not big endian
+		#endif
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_c_bigendian=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_c_bigendian=no
+  ac_cv_c_bigendian=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
 
-# It does not; compile a test program.
-if test "$cross_compiling" = yes; then
-  # try to guess the endianness by grepping values into an object file
-  ac_cv_c_bigendian=unknown
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+int
+main ()
+{
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+	      bogus endian macros
+	     #endif
+
+  ;
+  return 0;
+}
 _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  # It does; now see whether it defined to _BIG_ENDIAN or not.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
-short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
+#include <limits.h>
+
 int
 main ()
 {
- _ascii (); _ebcdic ();
+#ifndef _BIG_ENDIAN
+		 not big endian
+		#endif
+
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_c_bigendian=yes
+else
+  ac_cv_c_bigendian=no
 fi
-if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-  if test "$ac_cv_c_bigendian" = unknown; then
-    ac_cv_c_bigendian=no
-  else
-    # finding both strings is unlikely to happen, but who knows?
-    ac_cv_c_bigendian=unknown
-  fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # Compile a test program.
+      if test "$cross_compiling" = yes; then :
+  # Try to guess by grepping values from an object file.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+short int ascii_mm[] =
+		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+		short int ascii_ii[] =
+		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+		int use_ascii (int i) {
+		  return ascii_mm[i] + ascii_ii[i];
+		}
+		short int ebcdic_ii[] =
+		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+		short int ebcdic_mm[] =
+		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+		int use_ebcdic (int i) {
+		  return ebcdic_mm[i] + ebcdic_ii[i];
+		}
+		extern int foo;
 
+int
+main ()
+{
+return use_ascii (foo) == use_ebcdic (foo);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+	      ac_cv_c_bigendian=yes
+	    fi
+	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+	      if test "$ac_cv_c_bigendian" = unknown; then
+		ac_cv_c_bigendian=no
+	      else
+		# finding both strings is unlikely to happen, but who knows?
+		ac_cv_c_bigendian=unknown
+	      fi
+	    fi
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+$ac_includes_default
 int
 main ()
 {
-  /* Are we little or big endian?  From Harbison&Steele.  */
-  union
-  {
-    long l;
-    char c[sizeof (long)];
-  } u;
-  u.l = 1;
-  exit (u.c[sizeof (long) - 1] == 1);
+
+	     /* Are we little or big endian?  From Harbison&Steele.  */
+	     union
+	     {
+	       long int l;
+	       char c[sizeof (long int)];
+	     } u;
+	     u.l = 1;
+	     return u.c[sizeof (long int) - 1] == 1;
+
+  ;
+  return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_c_bigendian=no
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_bigendian=yes
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+  ac_cv_c_bigendian=yes
 fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+    fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian" >&6
-case $ac_cv_c_bigendian in
-  yes)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in #(
+   yes)
+     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
+;; #(
+   no)
+      ;; #(
+   universal)
 
-cat >>confdefs.h <<\_ACEOF
-#define WORDS_BIGENDIAN 1
-_ACEOF
- ;;
-  no)
-     ;;
-  *)
-    { { echo "$as_me:$LINENO: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-echo "$as_me: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+
+     ;; #(
+   *)
+     as_fn_error $? "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ esac
 
 
 #------------------------------------------------------------------------
@@ -7934,10 +7045,10 @@ if test "$TCL_EXEC_PREFIX" != "$exec_prefix"; then
 fi
 
 if test "$TCL_PREFIX" != "$prefix"; then
-    { echo "$as_me:$LINENO: WARNING:
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
         Different --prefix selected for Tk and Tcl!
         [package require Tk] may not work correctly in tclsh." >&5
-echo "$as_me: WARNING:
+$as_echo "$as_me: WARNING:
         Different --prefix selected for Tk and Tcl!
         [package require Tk] may not work correctly in tclsh." >&2;}
 fi
@@ -7952,17 +7063,13 @@ fi
 #	special flag.
 #--------------------------------------------------------------------
 
-echo "$as_me:$LINENO: checking for fd_set in sys/types" >&5
-echo $ECHO_N "checking for fd_set in sys/types... $ECHO_C" >&6
-if test "${tcl_cv_type_fd_set+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fd_set in sys/types" >&5
+$as_echo_n "checking for fd_set in sys/types... " >&6; }
+if ${tcl_cv_type_fd_set+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 int
@@ -7973,58 +7080,30 @@ fd_set readMask, writeMask;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_cv_type_fd_set=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_type_fd_set=no
+  tcl_cv_type_fd_set=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_type_fd_set" >&5
-echo "${ECHO_T}$tcl_cv_type_fd_set" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_type_fd_set" >&5
+$as_echo "$tcl_cv_type_fd_set" >&6; }
 tk_ok=$tcl_cv_type_fd_set
 if test $tk_ok = no; then
-    echo "$as_me:$LINENO: checking for fd_mask in sys/select" >&5
-echo $ECHO_N "checking for fd_mask in sys/select... $ECHO_C" >&6
-if test "${tcl_cv_grep_fd_mask+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fd_mask in sys/select" >&5
+$as_echo_n "checking for fd_mask in sys/select... " >&6; }
+if ${tcl_cv_grep_fd_mask+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/select.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "fd_mask" >/dev/null 2>&1; then
+  $EGREP "fd_mask" >/dev/null 2>&1; then :
   tcl_cv_grep_fd_mask=present
 else
   tcl_cv_grep_fd_mask=missing
@@ -8032,22 +7111,18 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_grep_fd_mask" >&5
-echo "${ECHO_T}$tcl_cv_grep_fd_mask" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_grep_fd_mask" >&5
+$as_echo "$tcl_cv_grep_fd_mask" >&6; }
     if test $tcl_cv_grep_fd_mask = present; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SYS_SELECT_H 1
-_ACEOF
+$as_echo "#define HAVE_SYS_SELECT_H 1" >>confdefs.h
 
 	tk_ok=yes
     fi
 fi
 if test $tk_ok = no; then
 
-cat >>confdefs.h <<\_ACEOF
-#define NO_FD_SET 1
-_ACEOF
+$as_echo "#define NO_FD_SET 1" >>confdefs.h
 
 fi
 
@@ -8055,166 +7130,24 @@ fi
 #       Find out all about time handling differences.
 #------------------------------------------------------------------------------
 
-
 for ac_header in sys/time.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ----------------------------- ##
-## Report this to the tk lists.  ##
-## ----------------------------- ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_time_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_TIME_H 1
 _ACEOF
 
 fi
 
 done
 
-echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
-if test "${ac_cv_header_time+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
+$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
+if ${ac_cv_header_time+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <sys/time.h>
@@ -8229,44 +7162,18 @@ return 0;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_time=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_time=no
+  ac_cv_header_time=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
-echo "${ECHO_T}$ac_cv_header_time" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
+$as_echo "$ac_cv_header_time" >&6; }
 if test $ac_cv_header_time = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define TIME_WITH_SYS_TIME 1
-_ACEOF
+$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
 
 fi
 
@@ -8276,64 +7183,9 @@ fi
 #	they don't exist.
 #--------------------------------------------------------------------
 
-echo "$as_me:$LINENO: checking for mode_t" >&5
-echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
-if test "${ac_cv_type_mode_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((mode_t *) 0)
-  return 0;
-if (sizeof (mode_t))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_mode_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
+if test "x$ac_cv_type_mode_t" = xyes; then :
 
-ac_cv_type_mode_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
-echo "${ECHO_T}$ac_cv_type_mode_t" >&6
-if test $ac_cv_type_mode_t = yes; then
-  :
 else
 
 cat >>confdefs.h <<_ACEOF
@@ -8342,64 +7194,9 @@ _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking for pid_t" >&5
-echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
-if test "${ac_cv_type_pid_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((pid_t *) 0)
-  return 0;
-if (sizeof (pid_t))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_pid_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
+if test "x$ac_cv_type_pid_t" = xyes; then :
 
-ac_cv_type_pid_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
-echo "${ECHO_T}$ac_cv_type_pid_t" >&6
-if test $ac_cv_type_pid_t = yes; then
-  :
 else
 
 cat >>confdefs.h <<_ACEOF
@@ -8408,88 +7205,29 @@ _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6
-if test "${ac_cv_type_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((size_t *) 0)
-  return 0;
-if (sizeof (size_t))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_size_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = xyes; then :
 
-ac_cv_type_size_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6
-if test $ac_cv_type_size_t = yes; then
-  :
 else
 
 cat >>confdefs.h <<_ACEOF
-#define size_t unsigned
+#define size_t unsigned int
 _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
-echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
-if test "${ac_cv_type_uid_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
+$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
+if ${ac_cv_type_uid_t+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "uid_t" >/dev/null 2>&1; then
+  $EGREP "uid_t" >/dev/null 2>&1; then :
   ac_cv_type_uid_t=yes
 else
   ac_cv_type_uid_t=no
@@ -8497,147 +7235,59 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
-echo "${ECHO_T}$ac_cv_type_uid_t" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
+$as_echo "$ac_cv_type_uid_t" >&6; }
 if test $ac_cv_type_uid_t = no; then
 
-cat >>confdefs.h <<\_ACEOF
-#define uid_t int
-_ACEOF
+$as_echo "#define uid_t int" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define gid_t int
-_ACEOF
+$as_echo "#define gid_t int" >>confdefs.h
 
 fi
 
 
-echo "$as_me:$LINENO: checking for intptr_t" >&5
-echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6
-if test "${ac_cv_type_intptr_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((intptr_t *) 0)
-  return 0;
-if (sizeof (intptr_t))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_intptr_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_intptr_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_intptr_t" >&5
-echo "${ECHO_T}$ac_cv_type_intptr_t" >&6
-if test $ac_cv_type_intptr_t = yes; then
+ac_fn_c_check_type "$LINENO" "intptr_t" "ac_cv_type_intptr_t" "$ac_includes_default"
+if test "x$ac_cv_type_intptr_t" = xyes; then :
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_INTPTR_T 1
-_ACEOF
+$as_echo "#define HAVE_INTPTR_T 1" >>confdefs.h
 
 else
 
-    echo "$as_me:$LINENO: checking for pointer-size signed integer type" >&5
-echo $ECHO_N "checking for pointer-size signed integer type... $ECHO_C" >&6
-if test "${tcl_cv_intptr_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pointer-size signed integer type" >&5
+$as_echo_n "checking for pointer-size signed integer type... " >&6; }
+if ${tcl_cv_intptr_t+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
     for tcl_cv_intptr_t in "int" "long" "long long" none; do
 	if test "$tcl_cv_intptr_t" != none; then
-	    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
 main ()
 {
 static int test_array [1 - 2 * !(sizeof (void *) <= sizeof ($tcl_cv_intptr_t))];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_ok=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_ok=no
+  tcl_ok=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	    test "$tcl_ok" = yes && break; fi
     done
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_intptr_t" >&5
-echo "${ECHO_T}$tcl_cv_intptr_t" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_intptr_t" >&5
+$as_echo "$tcl_cv_intptr_t" >&6; }
     if test "$tcl_cv_intptr_t" != none; then
 
 cat >>confdefs.h <<_ACEOF
@@ -8648,132 +7298,48 @@ _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking for uintptr_t" >&5
-echo $ECHO_N "checking for uintptr_t... $ECHO_C" >&6
-if test "${ac_cv_type_uintptr_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((uintptr_t *) 0)
-  return 0;
-if (sizeof (uintptr_t))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_uintptr_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_uintptr_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_uintptr_t" >&5
-echo "${ECHO_T}$ac_cv_type_uintptr_t" >&6
-if test $ac_cv_type_uintptr_t = yes; then
+ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "$ac_includes_default"
+if test "x$ac_cv_type_uintptr_t" = xyes; then :
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_UINTPTR_T 1
-_ACEOF
+$as_echo "#define HAVE_UINTPTR_T 1" >>confdefs.h
 
 else
 
-    echo "$as_me:$LINENO: checking for pointer-size unsigned integer type" >&5
-echo $ECHO_N "checking for pointer-size unsigned integer type... $ECHO_C" >&6
-if test "${tcl_cv_uintptr_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pointer-size unsigned integer type" >&5
+$as_echo_n "checking for pointer-size unsigned integer type... " >&6; }
+if ${tcl_cv_uintptr_t+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
     for tcl_cv_uintptr_t in "unsigned int" "unsigned long" "unsigned long long" \
 	    none; do
 	if test "$tcl_cv_uintptr_t" != none; then
-	    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
 main ()
 {
 static int test_array [1 - 2 * !(sizeof (void *) <= sizeof ($tcl_cv_uintptr_t))];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_ok=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_ok=no
+  tcl_ok=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	    test "$tcl_ok" = yes && break; fi
     done
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_uintptr_t" >&5
-echo "${ECHO_T}$tcl_cv_uintptr_t" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_uintptr_t" >&5
+$as_echo "$tcl_cv_uintptr_t" >&6; }
     if test "$tcl_cv_uintptr_t" != none; then
 
 cat >>confdefs.h <<_ACEOF
@@ -8789,17 +7355,13 @@ fi
 #     In OS/390 struct pwd has no pw_gecos field
 #-------------------------------------------
 
-echo "$as_me:$LINENO: checking pw_gecos in struct pwd" >&5
-echo $ECHO_N "checking pw_gecos in struct pwd... $ECHO_C" >&6
-if test "${tcl_cv_pwd_pw_gecos+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pw_gecos in struct pwd" >&5
+$as_echo_n "checking pw_gecos in struct pwd... " >&6; }
+if ${tcl_cv_pwd_pw_gecos+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pwd.h>
 int
@@ -8810,44 +7372,18 @@ struct passwd pwd; (void)pwd.pw_gecos;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_cv_pwd_pw_gecos=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_pwd_pw_gecos=no
+  tcl_cv_pwd_pw_gecos=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_pwd_pw_gecos" >&5
-echo "${ECHO_T}$tcl_cv_pwd_pw_gecos" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_pwd_pw_gecos" >&5
+$as_echo "$tcl_cv_pwd_pw_gecos" >&6; }
 if test $tcl_cv_pwd_pw_gecos = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PW_GECOS 1
-_ACEOF
+$as_echo "#define HAVE_PW_GECOS 1" >>confdefs.h
 
 fi
 
@@ -8856,41 +7392,41 @@ fi
 #--------------------------------------------------------------------
 
 if test "`uname -s`" = "Darwin" ; then
-    echo "$as_me:$LINENO: checking whether to use Aqua" >&5
-echo $ECHO_N "checking whether to use Aqua... $ECHO_C" >&6
-    # Check whether --enable-aqua or --disable-aqua was given.
-if test "${enable_aqua+set}" = set; then
-  enableval="$enable_aqua"
-  tk_aqua=$enableval
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use Aqua" >&5
+$as_echo_n "checking whether to use Aqua... " >&6; }
+    # Check whether --enable-aqua was given.
+if test "${enable_aqua+set}" = set; then :
+  enableval=$enable_aqua; tk_aqua=$enableval
 else
   tk_aqua=no
-fi;
+fi
+
     if test $tk_aqua = yes -o $tk_aqua = cocoa; then
 	tk_aqua=yes
 	if test $tcl_corefoundation = no; then
-	    { echo "$as_me:$LINENO: WARNING: Aqua can only be used when CoreFoundation is available" >&5
-echo "$as_me: WARNING: Aqua can only be used when CoreFoundation is available" >&2;}
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Aqua can only be used when CoreFoundation is available" >&5
+$as_echo "$as_me: WARNING: Aqua can only be used when CoreFoundation is available" >&2;}
 	    tk_aqua=no
 	fi
 	if test ! -d /System/Library/Frameworks/Cocoa.framework; then
-	    { echo "$as_me:$LINENO: WARNING: Aqua can only be used when Cocoa is available" >&5
-echo "$as_me: WARNING: Aqua can only be used when Cocoa is available" >&2;}
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Aqua can only be used when Cocoa is available" >&5
+$as_echo "$as_me: WARNING: Aqua can only be used when Cocoa is available" >&2;}
 	    tk_aqua=no
 	fi
 	if test "`uname -r | awk -F. '{print $1}'`" -lt 9; then
-	    { echo "$as_me:$LINENO: WARNING: Aqua requires Mac OS X 10.5 or later" >&5
-echo "$as_me: WARNING: Aqua requires Mac OS X 10.5 or later" >&2;}
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Aqua requires Mac OS X 10.5 or later" >&5
+$as_echo "$as_me: WARNING: Aqua requires Mac OS X 10.5 or later" >&2;}
 	    tk_aqua=no
 	fi
     fi
-    echo "$as_me:$LINENO: result: $tk_aqua" >&5
-echo "${ECHO_T}$tk_aqua" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tk_aqua" >&5
+$as_echo "$tk_aqua" >&6; }
     if test "$fat_32_64" = yes; then
 	if test $tk_aqua = no; then
-	    echo "$as_me:$LINENO: checking for 64-bit X11" >&5
-echo $ECHO_N "checking for 64-bit X11... $ECHO_C" >&6
-if test "${tcl_cv_lib_x11_64+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit X11" >&5
+$as_echo_n "checking for 64-bit X11... " >&6; }
+if ${tcl_cv_lib_x11_64+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
 		for v in CFLAGS CPPFLAGS LDFLAGS; do
@@ -8898,11 +7434,7 @@ else
 		done
 		CPPFLAGS="$CPPFLAGS -I/usr/X11R6/include"
 		LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -lX11"
-		cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <X11/Xlib.h>
 int
@@ -8913,49 +7445,25 @@ XrmInitialize();
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   tcl_cv_lib_x11_64=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_lib_x11_64=no
+  tcl_cv_lib_x11_64=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 		for v in CFLAGS CPPFLAGS LDFLAGS; do
 		    eval $v'="$hold_'$v'"'
 		done
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_lib_x11_64" >&5
-echo "${ECHO_T}$tcl_cv_lib_x11_64" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_lib_x11_64" >&5
+$as_echo "$tcl_cv_lib_x11_64" >&6; }
 	fi
 	# remove 64-bit arch flags from CFLAGS et al. for combined 32 & 64 bit
 	# fat builds if configuration does not support 64-bit.
 	if test "$tcl_cv_lib_x11_64" = no; then
-	    { echo "$as_me:$LINENO: Removing 64-bit architectures from compiler & linker flags" >&5
-echo "$as_me: Removing 64-bit architectures from compiler & linker flags" >&6;}
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: Removing 64-bit architectures from compiler & linker flags" >&5
+$as_echo "$as_me: Removing 64-bit architectures from compiler & linker flags" >&6;}
 	    for v in CFLAGS CPPFLAGS LDFLAGS; do
 		eval $v'="`echo "$'$v' "|sed -e "s/-arch ppc64 / /g" -e "s/-arch x86_64 / /g"`"'
 	    done
@@ -8963,19 +7471,15 @@ echo "$as_me: Removing 64-bit architectures from compiler & linker flags" >&6;}
     fi
     if test $tk_aqua = no; then
 	# check if weak linking whole libraries is possible.
-	echo "$as_me:$LINENO: checking if ld accepts -weak-l flag" >&5
-echo $ECHO_N "checking if ld accepts -weak-l flag... $ECHO_C" >&6
-if test "${tcl_cv_ld_weak_l+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if ld accepts -weak-l flag" >&5
+$as_echo_n "checking if ld accepts -weak-l flag... " >&6; }
+if ${tcl_cv_ld_weak_l+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
 	    hold_ldflags=$LDFLAGS
 	    LDFLAGS="$LDFLAGS -Wl,-weak-lm"
-	    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <math.h>
 int
@@ -8986,186 +7490,24 @@ double f = sin(1.0);
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   tcl_cv_ld_weak_l=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_ld_weak_l=no
+  tcl_cv_ld_weak_l=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 	    LDFLAGS=$hold_ldflags
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_ld_weak_l" >&5
-echo "${ECHO_T}$tcl_cv_ld_weak_l" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_ld_weak_l" >&5
+$as_echo "$tcl_cv_ld_weak_l" >&6; }
     fi
-
-for ac_header in AvailabilityMacros.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ----------------------------- ##
-## Report this to the tk lists.  ##
-## ----------------------------- ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+    for ac_header in AvailabilityMacros.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "AvailabilityMacros.h" "ac_cv_header_AvailabilityMacros_h" "$ac_includes_default"
+if test "x$ac_cv_header_AvailabilityMacros_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_AVAILABILITYMACROS_H 1
 _ACEOF
 
 fi
@@ -9173,18 +7515,14 @@ fi
 done
 
     if test "$ac_cv_header_AvailabilityMacros_h" = yes; then
-	echo "$as_me:$LINENO: checking if weak import is available" >&5
-echo $ECHO_N "checking if weak import is available... $ECHO_C" >&6
-if test "${tcl_cv_cc_weak_import+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if weak import is available" >&5
+$as_echo_n "checking if weak import is available... " >&6; }
+if ${tcl_cv_cc_weak_import+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
 	    hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -Werror"
-	    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 		    #ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
@@ -9204,60 +7542,30 @@ rand();
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   tcl_cv_cc_weak_import=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_cc_weak_import=no
+  tcl_cv_cc_weak_import=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 	    CFLAGS=$hold_cflags
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_cc_weak_import" >&5
-echo "${ECHO_T}$tcl_cv_cc_weak_import" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cc_weak_import" >&5
+$as_echo "$tcl_cv_cc_weak_import" >&6; }
 	if test $tcl_cv_cc_weak_import = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_WEAK_IMPORT 1
-_ACEOF
+$as_echo "#define HAVE_WEAK_IMPORT 1" >>confdefs.h
 
 	fi
-	echo "$as_me:$LINENO: checking if Darwin SUSv3 extensions are available" >&5
-echo $ECHO_N "checking if Darwin SUSv3 extensions are available... $ECHO_C" >&6
-if test "${tcl_cv_cc_darwin_c_source+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if Darwin SUSv3 extensions are available" >&5
+$as_echo_n "checking if Darwin SUSv3 extensions are available... " >&6; }
+if ${tcl_cv_cc_darwin_c_source+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
 	    hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -Werror"
-	    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 		    #ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
@@ -9278,45 +7586,19 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_cv_cc_darwin_c_source=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_cc_darwin_c_source=no
+  tcl_cv_cc_darwin_c_source=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	    CFLAGS=$hold_cflags
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_cc_darwin_c_source" >&5
-echo "${ECHO_T}$tcl_cv_cc_darwin_c_source" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cc_darwin_c_source" >&5
+$as_echo "$tcl_cv_cc_darwin_c_source" >&6; }
 	if test $tcl_cv_cc_darwin_c_source = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define _DARWIN_C_SOURCE 1
-_ACEOF
+$as_echo "#define _DARWIN_C_SOURCE 1" >>confdefs.h
 
 	fi
     fi
@@ -9326,18 +7608,14 @@ fi
 
 if test $tk_aqua = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define MAC_OSX_TK 1
-_ACEOF
+$as_echo "#define MAC_OSX_TK 1" >>confdefs.h
 
     LIBS="$LIBS -framework Cocoa -framework Carbon -framework IOKit"
     EXTRA_CC_SWITCHES='-std=gnu99 -x objective-c'
     TK_WINDOWINGSYSTEM=AQUA
     if test -n "${enable_symbols}" -a "${enable_symbols}" != no; then
 
-cat >>confdefs.h <<\_ACEOF
-#define TK_MAC_DEBUG 1
-_ACEOF
+$as_echo "#define TK_MAC_DEBUG 1" >>confdefs.h
 
     fi
 else
@@ -9351,44 +7629,47 @@ else
     #--------------------------------------------------------------------
 
 
-    echo "$as_me:$LINENO: checking for X" >&5
-echo $ECHO_N "checking for X... $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
+$as_echo_n "checking for X... " >&6; }
 
 
-# Check whether --with-x or --without-x was given.
-if test "${with_x+set}" = set; then
-  withval="$with_x"
+# Check whether --with-x was given.
+if test "${with_x+set}" = set; then :
+  withval=$with_x;
+fi
 
-fi;
 # $have_x is `yes', `no', `disabled', or empty when we do not yet know.
 if test "x$with_x" = xno; then
   # The user explicitly disabled X.
   have_x=disabled
 else
-  if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
-    # Both variables are already set.
-    have_x=yes
-  else
-    if test "${ac_cv_have_x+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  case $x_includes,$x_libraries in #(
+    *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
+    *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   # One or both of the vars are not set, and there is no cached value.
 ac_x_includes=no ac_x_libraries=no
-rm -fr conftest.dir
+rm -f -r conftest.dir
 if mkdir conftest.dir; then
   cd conftest.dir
-  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
   cat >Imakefile <<'_ACEOF'
-acfindx:
-	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
-_ACEOF
-  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
-    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
+incroot:
+	@echo incroot='${INCROOT}'
+usrlibdir:
+	@echo usrlibdir='${USRLIBDIR}'
+libdir:
+	@echo libdir='${LIBDIR}'
+_ACEOF
+  if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
+    # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+    for ac_var in incroot usrlibdir libdir; do
+      eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
+    done
     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-    for ac_extension in a so sl; do
-      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
-	 test -f $ac_im_libdir/libX11.$ac_extension; then
+    for ac_extension in a so sl dylib la dll; do
+      if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
+	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
 	ac_im_usrlibdir=$ac_im_libdir; break
       fi
     done
@@ -9396,37 +7677,41 @@ _ACEOF
     # bogus both because they are the default anyway, and because
     # using them would break gcc on systems where it needs fixed includes.
     case $ac_im_incroot in
-	/usr/include) ;;
+	/usr/include) ac_x_includes= ;;
 	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
     esac
     case $ac_im_usrlibdir in
-	/usr/lib | /lib) ;;
+	/usr/lib | /usr/lib64 | /lib | /lib64) ;;
 	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
     esac
   fi
   cd ..
-  rm -fr conftest.dir
+  rm -f -r conftest.dir
 fi
 
 # Standard set of common directories for X headers.
 # Check X11 before X11Rn because it is often a symlink to the current release.
 ac_x_header_dirs='
 /usr/X11/include
+/usr/X11R7/include
 /usr/X11R6/include
 /usr/X11R5/include
 /usr/X11R4/include
 
 /usr/include/X11
+/usr/include/X11R7
 /usr/include/X11R6
 /usr/include/X11R5
 /usr/include/X11R4
 
 /usr/local/X11/include
+/usr/local/X11R7/include
 /usr/local/X11R6/include
 /usr/local/X11R5/include
 /usr/local/X11R4/include
 
 /usr/local/include/X11
+/usr/local/include/X11R7
 /usr/local/include/X11R6
 /usr/local/include/X11R5
 /usr/local/include/X11R4
@@ -9448,38 +7733,14 @@ ac_x_header_dirs='
 if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Xlib.h.
   # First, try using that file with no special directory specified.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <X11/Xlib.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # We can compile using X headers with no special include directory.
 ac_x_includes=
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   for ac_dir in $ac_x_header_dirs; do
   if test -r "$ac_dir/X11/Xlib.h"; then
     ac_x_includes=$ac_dir
@@ -9487,7 +7748,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
   fi
 done
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 fi # $ac_x_includes = no
 
 if test "$ac_x_libraries" = no; then
@@ -9496,11 +7757,7 @@ if test "$ac_x_libraries" = no; then
   # Don't add to $LIBS permanently.
   ac_save_LIBS=$LIBS
   LIBS="-lX11 $LIBS"
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <X11/Xlib.h>
 int
@@ -9511,117 +7768,73 @@ XrmInitialize ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
 ac_x_libraries=
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-LIBS=$ac_save_LIBS
-for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
+  LIBS=$ac_save_LIBS
+for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
 do
   # Don't even attempt the hair of trying to link an X program!
-  for ac_extension in a so sl; do
-    if test -r $ac_dir/libXt.$ac_extension; then
+  for ac_extension in a so sl dylib la dll; do
+    if test -r "$ac_dir/libX11.$ac_extension"; then
       ac_x_libraries=$ac_dir
       break 2
     fi
   done
 done
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi # $ac_x_libraries = no
 
-if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
-  # Didn't find X anywhere.  Cache the known absence of X.
-  ac_cv_have_x="have_x=no"
-else
-  # Record where we found X for the cache.
-  ac_cv_have_x="have_x=yes \
-		ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
-fi
+case $ac_x_includes,$ac_x_libraries in #(
+  no,* | *,no | *\'*)
+    # Didn't find X, or a directory has "'" in its name.
+    ac_cv_have_x="have_x=no";; #(
+  *)
+    # Record where we found X for the cache.
+    ac_cv_have_x="have_x=yes\
+	ac_x_includes='$ac_x_includes'\
+	ac_x_libraries='$ac_x_libraries'"
+esac
 fi
-
-  fi
+;; #(
+    *) have_x=yes;;
+  esac
   eval "$ac_cv_have_x"
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:$LINENO: result: $have_x" >&5
-echo "${ECHO_T}$have_x" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5
+$as_echo "$have_x" >&6; }
   no_x=yes
 else
   # If each of the values was on the command line, it overrides each guess.
   test "x$x_includes" = xNONE && x_includes=$ac_x_includes
   test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
   # Update the cache value to reflect the command line values.
-  ac_cv_have_x="have_x=yes \
-		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
-echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+  ac_cv_have_x="have_x=yes\
+	ac_x_includes='$x_includes'\
+	ac_x_libraries='$x_libraries'"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5
+$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
 fi
 
     not_really_there=""
     if test "$no_x" = ""; then
 	if test "$x_includes" = ""; then
-	    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <X11/Xlib.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   not_really_there="yes"
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 	else
 	    if test ! -r $x_includes/X11/Xlib.h; then
 		not_really_there="yes"
@@ -9629,49 +7842,25 @@ rm -f conftest.err conftest.$ac_ext
 	fi
     fi
     if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then
-	echo "$as_me:$LINENO: checking for X11 header files" >&5
-echo $ECHO_N "checking for X11 header files... $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11 header files" >&5
+$as_echo_n "checking for X11 header files... " >&6; }
 	found_xincludes="no"
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <X11/Xlib.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   found_xincludes="yes"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   found_xincludes="no"
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 	if test "$found_xincludes" = "no"; then
 	    dirs="/usr/unsupported/include /usr/local/include /usr/X386/include /usr/X11R6/include /usr/X11R5/include /usr/include/X11R5 /usr/include/X11R4 /usr/openwin/include /usr/X11/include /usr/sww/include"
 	    for i in $dirs ; do
 		if test -r $i/X11/Xlib.h; then
-		    echo "$as_me:$LINENO: result: $i" >&5
-echo "${ECHO_T}$i" >&6
+		    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $i" >&5
+$as_echo "$i" >&6; }
 		    XINCLUDES=" -I$i"
 		    found_xincludes="yes"
 		    break
@@ -9685,19 +7874,19 @@ echo "${ECHO_T}$i" >&6
 	fi
     fi
     if test "$found_xincludes" = "no"; then
-	echo "$as_me:$LINENO: result: couldn't find any!" >&5
-echo "${ECHO_T}couldn't find any!" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: couldn't find any!" >&5
+$as_echo "couldn't find any!" >&6; }
     fi
 
     if test "$no_x" = yes; then
-	echo "$as_me:$LINENO: checking for X11 libraries" >&5
-echo $ECHO_N "checking for X11 libraries... $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11 libraries" >&5
+$as_echo_n "checking for X11 libraries... " >&6; }
 	XLIBSW=nope
 	dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/X11R6/lib /usr/X11R5/lib /usr/lib/X11R5 /usr/lib/X11R4 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib"
 	for i in $dirs ; do
 	    if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl -o -r $i/libX11.dylib; then
-		echo "$as_me:$LINENO: result: $i" >&5
-echo "${ECHO_T}$i" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $i" >&5
+$as_echo "$i" >&6; }
 		XLIBSW="-L$i -lX11"
 		x_libraries="$i"
 		break
@@ -9711,78 +7900,50 @@ echo "${ECHO_T}$i" >&6
 	fi
     fi
     if test "$XLIBSW" = nope ; then
-	echo "$as_me:$LINENO: checking for XCreateWindow in -lXwindow" >&5
-echo $ECHO_N "checking for XCreateWindow in -lXwindow... $ECHO_C" >&6
-if test "${ac_cv_lib_Xwindow_XCreateWindow+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCreateWindow in -lXwindow" >&5
+$as_echo_n "checking for XCreateWindow in -lXwindow... " >&6; }
+if ${ac_cv_lib_Xwindow_XCreateWindow+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXwindow  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char XCreateWindow ();
 int
 main ()
 {
-XCreateWindow ();
+return XCreateWindow ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_Xwindow_XCreateWindow=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_Xwindow_XCreateWindow=no
+  ac_cv_lib_Xwindow_XCreateWindow=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_Xwindow_XCreateWindow" >&5
-echo "${ECHO_T}$ac_cv_lib_Xwindow_XCreateWindow" >&6
-if test $ac_cv_lib_Xwindow_XCreateWindow = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xwindow_XCreateWindow" >&5
+$as_echo "$ac_cv_lib_Xwindow_XCreateWindow" >&6; }
+if test "x$ac_cv_lib_Xwindow_XCreateWindow" = xyes; then :
   XLIBSW=-lXwindow
 fi
 
     fi
     if test "$XLIBSW" = nope ; then
-	echo "$as_me:$LINENO: result: could not find any!  Using -lX11." >&5
-echo "${ECHO_T}could not find any!  Using -lX11." >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: could not find any!  Using -lX11." >&5
+$as_echo "could not find any!  Using -lX11." >&6; }
 	XLIBSW=-lX11
     fi
 
@@ -9831,65 +7992,37 @@ fi
 #--------------------------------------------------------------------
 
 if test $tk_aqua = no; then
-    echo "$as_me:$LINENO: checking for main in -lXbsd" >&5
-echo $ECHO_N "checking for main in -lXbsd... $ECHO_C" >&6
-if test "${ac_cv_lib_Xbsd_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lXbsd" >&5
+$as_echo_n "checking for main in -lXbsd... " >&6; }
+if ${ac_cv_lib_Xbsd_main+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXbsd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 int
 main ()
 {
-main ();
+return main ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_Xbsd_main=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_Xbsd_main=no
+  ac_cv_lib_Xbsd_main=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_Xbsd_main" >&5
-echo "${ECHO_T}$ac_cv_lib_Xbsd_main" >&6
-if test $ac_cv_lib_Xbsd_main = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xbsd_main" >&5
+$as_echo "$ac_cv_lib_Xbsd_main" >&6; }
+if test "x$ac_cv_lib_Xbsd_main" = xyes; then :
   LIBS="$LIBS -lXbsd"
 fi
 
@@ -9907,17 +8040,13 @@ fi
 #--------------------------------------------------------------------
 
 if test -d /usr/include/mit -a $tk_aqua = no; then
-    echo "$as_me:$LINENO: checking MIT X libraries" >&5
-echo $ECHO_N "checking MIT X libraries... $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking MIT X libraries" >&5
+$as_echo_n "checking MIT X libraries... " >&6; }
     tk_oldCFlags=$CFLAGS
     CFLAGS="$CFLAGS -I/usr/include/mit"
     tk_oldLibs=$LIBS
     LIBS="$LIBS -lX11-mit"
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 	#include <X11/Xlib.h>
@@ -9932,43 +8061,19 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
 
-	echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 	XLIBSW="-lX11-mit"
 	XINCLUDES="-I/usr/include/mit"
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
     CFLAGS=$tk_oldCFlags
     LIBS=$tk_oldLibs
 fi
@@ -9978,20 +8083,20 @@ fi
 #--------------------------------------------------------------------
 
 if test $tk_aqua = no; then
-    echo "$as_me:$LINENO: checking whether to use xft" >&5
-echo $ECHO_N "checking whether to use xft... $ECHO_C" >&6
-    # Check whether --enable-xft or --disable-xft was given.
-if test "${enable_xft+set}" = set; then
-  enableval="$enable_xft"
-  enable_xft=$enableval
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use xft" >&5
+$as_echo_n "checking whether to use xft... " >&6; }
+    # Check whether --enable-xft was given.
+if test "${enable_xft+set}" = set; then :
+  enableval=$enable_xft; enable_xft=$enableval
 else
   enable_xft="default"
-fi;
+fi
+
     XFT_CFLAGS=""
     XFT_LIBS=""
     if test "$enable_xft" = "no" ; then
-	echo "$as_me:$LINENO: result: $enable_xft" >&5
-echo "${ECHO_T}$enable_xft" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_xft" >&5
+$as_echo "$enable_xft" >&6; }
     else
 	found_xft="yes"
 			XFT_CFLAGS=`xft-config --cflags 2>/dev/null` || found_xft="no"
@@ -10001,63 +8106,17 @@ echo "${ECHO_T}$enable_xft" >&6
 	    XFT_CFLAGS=`pkg-config --cflags xft fontconfig 2>/dev/null` || found_xft="no"
 	    XFT_LIBS=`pkg-config --libs xft fontconfig 2>/dev/null` || found_xft="no"
 	fi
-	echo "$as_me:$LINENO: result: $found_xft" >&5
-echo "${ECHO_T}$found_xft" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_xft" >&5
+$as_echo "$found_xft" >&6; }
 		if test "$found_xft" = "yes" ; then
 	    tk_oldCFlags=$CFLAGS
 	    CFLAGS="$CFLAGS $XINCLUDES $XFT_CFLAGS"
 	    tk_oldLibs=$LIBS
 	    LIBS="$tk_oldLIBS $XFT_LIBS $XLIBSW"
-	    echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5
-echo $ECHO_N "checking for X11/Xft/Xft.h... $ECHO_C" >&6
-if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <X11/Xlib.h>
-
-#include <X11/Xft/Xft.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_header_X11_Xft_Xft_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+	    ac_fn_c_check_header_compile "$LINENO" "X11/Xft/Xft.h" "ac_cv_header_X11_Xft_Xft_h" "#include <X11/Xlib.h>
+"
+if test "x$ac_cv_header_X11_Xft_Xft_h" = xyes; then :
 
-ac_cv_header_X11_Xft_Xft_h=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xft_Xft_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_Xft_Xft_h" >&6
-if test $ac_cv_header_X11_Xft_Xft_h = yes; then
-  :
 else
 
 		found_xft=no
@@ -10073,72 +8132,43 @@ fi
 	    CFLAGS="$CFLAGS $XINCLUDES $XFT_CFLAGS"
 	    tk_oldLibs=$LIBS
 	    LIBS="$tk_oldLIBS $XFT_LIBS $XLIBSW"
-
-echo "$as_me:$LINENO: checking for XftFontOpen in -lXft" >&5
-echo $ECHO_N "checking for XftFontOpen in -lXft... $ECHO_C" >&6
-if test "${ac_cv_lib_Xft_XftFontOpen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XftFontOpen in -lXft" >&5
+$as_echo_n "checking for XftFontOpen in -lXft... " >&6; }
+if ${ac_cv_lib_Xft_XftFontOpen+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXft  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char XftFontOpen ();
 int
 main ()
 {
-XftFontOpen ();
+return XftFontOpen ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_Xft_XftFontOpen=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_Xft_XftFontOpen=no
+  ac_cv_lib_Xft_XftFontOpen=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_Xft_XftFontOpen" >&5
-echo "${ECHO_T}$ac_cv_lib_Xft_XftFontOpen" >&6
-if test $ac_cv_lib_Xft_XftFontOpen = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xft_XftFontOpen" >&5
+$as_echo "$ac_cv_lib_Xft_XftFontOpen" >&6; }
+if test "x$ac_cv_lib_Xft_XftFontOpen" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBXFT 1
 _ACEOF
@@ -10159,71 +8189,43 @@ fi
 	    CFLAGS="$CFLAGS $XINCLUDES $XFT_CFLAGS"
 	    tk_oldLibs=$LIBS
 	    LIBS="$tk_oldLIBS $XFT_LIBS $XLIBSW -lfontconfig"
-	    echo "$as_me:$LINENO: checking for FcFontSort in -lfontconfig" >&5
-echo $ECHO_N "checking for FcFontSort in -lfontconfig... $ECHO_C" >&6
-if test "${ac_cv_lib_fontconfig_FcFontSort+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FcFontSort in -lfontconfig" >&5
+$as_echo_n "checking for FcFontSort in -lfontconfig... " >&6; }
+if ${ac_cv_lib_fontconfig_FcFontSort+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lfontconfig  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char FcFontSort ();
 int
 main ()
 {
-FcFontSort ();
+return FcFontSort ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_fontconfig_FcFontSort=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_fontconfig_FcFontSort=no
+  ac_cv_lib_fontconfig_FcFontSort=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_fontconfig_FcFontSort" >&5
-echo "${ECHO_T}$ac_cv_lib_fontconfig_FcFontSort" >&6
-if test $ac_cv_lib_fontconfig_FcFontSort = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fontconfig_FcFontSort" >&5
+$as_echo "$ac_cv_lib_fontconfig_FcFontSort" >&6; }
+if test "x$ac_cv_lib_fontconfig_FcFontSort" = xyes; then :
 
 		XFT_LIBS="$XFT_LIBS -lfontconfig"
 
@@ -10234,8 +8236,8 @@ fi
 	fi
 		if test "$found_xft" = "no" ; then
 	    if test "$enable_xft" = "yes" ; then
-		{ echo "$as_me:$LINENO: WARNING: Can't find xft configuration, or xft is unusable" >&5
-echo "$as_me: WARNING: Can't find xft configuration, or xft is unusable" >&2;}
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can't find xft configuration, or xft is unusable" >&5
+$as_echo "$as_me: WARNING: Can't find xft configuration, or xft is unusable" >&2;}
 	    fi
 	    enable_xft=no
 	    XFT_CFLAGS=""
@@ -10247,9 +8249,7 @@ echo "$as_me: WARNING: Can't find xft configuration, or xft is unusable" >&2;}
     if test $enable_xft = "yes" ; then
 	UNIX_FONT_OBJS=tkUnixRFont.o
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_XFT 1
-_ACEOF
+$as_echo "#define HAVE_XFT 1" >>confdefs.h
 
     else
 	UNIX_FONT_OBJS=tkUnixFont.o
@@ -10268,55 +8268,9 @@ if test $tk_aqua = no; then
     tk_oldLibs=$LIBS
     CFLAGS="$CFLAGS $XINCLUDES"
     LIBS="$LIBS $XLIBSW"
-    echo "$as_me:$LINENO: checking for X11/XKBlib.h" >&5
-echo $ECHO_N "checking for X11/XKBlib.h... $ECHO_C" >&6
-if test "${ac_cv_header_X11_XKBlib_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <X11/Xlib.h>
-
-#include <X11/XKBlib.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_header_X11_XKBlib_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_X11_XKBlib_h=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_X11_XKBlib_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_XKBlib_h" >&6
-if test $ac_cv_header_X11_XKBlib_h = yes; then
+    ac_fn_c_check_header_compile "$LINENO" "X11/XKBlib.h" "ac_cv_header_X11_XKBlib_h" "#include <X11/Xlib.h>
+"
+if test "x$ac_cv_header_X11_XKBlib_h" = xyes; then :
 
 	xkblib_header_found=yes
 
@@ -10328,71 +8282,43 @@ fi
 
 
     if test $xkblib_header_found = "yes" ; then
-	echo "$as_me:$LINENO: checking for XkbKeycodeToKeysym in -lX11" >&5
-echo $ECHO_N "checking for XkbKeycodeToKeysym in -lX11... $ECHO_C" >&6
-if test "${ac_cv_lib_X11_XkbKeycodeToKeysym+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XkbKeycodeToKeysym in -lX11" >&5
+$as_echo_n "checking for XkbKeycodeToKeysym in -lX11... " >&6; }
+if ${ac_cv_lib_X11_XkbKeycodeToKeysym+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char XkbKeycodeToKeysym ();
 int
 main ()
 {
-XkbKeycodeToKeysym ();
+return XkbKeycodeToKeysym ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_X11_XkbKeycodeToKeysym=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_X11_XkbKeycodeToKeysym=no
+  ac_cv_lib_X11_XkbKeycodeToKeysym=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XkbKeycodeToKeysym" >&5
-echo "${ECHO_T}$ac_cv_lib_X11_XkbKeycodeToKeysym" >&6
-if test $ac_cv_lib_X11_XkbKeycodeToKeysym = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XkbKeycodeToKeysym" >&5
+$as_echo "$ac_cv_lib_X11_XkbKeycodeToKeysym" >&6; }
+if test "x$ac_cv_lib_X11_XkbKeycodeToKeysym" = xyes; then :
 
 	    xkbkeycodetokeysym_found=yes
 
@@ -10407,9 +8333,7 @@ fi
     fi
     if test $xkbkeycodetokeysym_found = "yes" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_XKBKEYCODETOKEYSYM 1
-_ACEOF
+$as_echo "#define HAVE_XKBKEYCODETOKEYSYM 1" >>confdefs.h
 
     fi
     CFLAGS=$tk_oldCFlags
@@ -10421,15 +8345,11 @@ fi
 #--------------------------------------------------------------------
 
 if test $tk_aqua = no && test "$GCC" = yes; then
-    echo "$as_me:$LINENO: checking whether XKeycodeToKeysym is deprecated" >&5
-echo $ECHO_N "checking whether XKeycodeToKeysym is deprecated... $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether XKeycodeToKeysym is deprecated" >&5
+$as_echo_n "checking whether XKeycodeToKeysym is deprecated... " >&6; }
     tk_oldCFlags=$CFLAGS
     CFLAGS="$CFLAGS -Werror"
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 	#include <X11/Xlib.h>
@@ -10444,48 +8364,22 @@ main ()
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
 
-	echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-cat >>confdefs.h <<\_ACEOF
-#define XKEYCODETOKEYSYM_IS_DEPRECATED 1
-_ACEOF
+$as_echo "#define XKEYCODETOKEYSYM_IS_DEPRECATED 1" >>confdefs.h
 
 
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
     CFLAGS=$tk_oldCFlags
 fi
 
@@ -10505,306 +8399,115 @@ if test $tk_aqua = no; then
     LIBS="$tk_oldLibs $XLIBSW"
     xss_header_found=no
     xss_lib_found=no
-    echo "$as_me:$LINENO: checking whether to try to use XScreenSaver" >&5
-echo $ECHO_N "checking whether to try to use XScreenSaver... $ECHO_C" >&6
-    # Check whether --enable-xss or --disable-xss was given.
-if test "${enable_xss+set}" = set; then
-  enableval="$enable_xss"
-  enable_xss=$enableval
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to try to use XScreenSaver" >&5
+$as_echo_n "checking whether to try to use XScreenSaver... " >&6; }
+    # Check whether --enable-xss was given.
+if test "${enable_xss+set}" = set; then :
+  enableval=$enable_xss; enable_xss=$enableval
 else
   enable_xss=yes
-fi;
+fi
+
     if test "$enable_xss" = "no" ; then
-	echo "$as_me:$LINENO: result: $enable_xss" >&5
-echo "${ECHO_T}$enable_xss" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_xss" >&5
+$as_echo "$enable_xss" >&6; }
     else
-	echo "$as_me:$LINENO: result: $enable_xss" >&5
-echo "${ECHO_T}$enable_xss" >&6
-	echo "$as_me:$LINENO: checking for X11/extensions/scrnsaver.h" >&5
-echo $ECHO_N "checking for X11/extensions/scrnsaver.h... $ECHO_C" >&6
-if test "${ac_cv_header_X11_extensions_scrnsaver_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <X11/Xlib.h>
-
-#include <X11/extensions/scrnsaver.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_header_X11_extensions_scrnsaver_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_X11_extensions_scrnsaver_h=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_scrnsaver_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_extensions_scrnsaver_h" >&6
-if test $ac_cv_header_X11_extensions_scrnsaver_h = yes; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_xss" >&5
+$as_echo "$enable_xss" >&6; }
+	ac_fn_c_check_header_compile "$LINENO" "X11/extensions/scrnsaver.h" "ac_cv_header_X11_extensions_scrnsaver_h" "#include <X11/Xlib.h>
+"
+if test "x$ac_cv_header_X11_extensions_scrnsaver_h" = xyes; then :
 
 	    xss_header_found=yes
 
 fi
 
 
-	echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo" >&5
-echo $ECHO_N "checking for XScreenSaverQueryInfo... $ECHO_C" >&6
-if test "${ac_cv_func_XScreenSaverQueryInfo+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define XScreenSaverQueryInfo to an innocuous variant, in case <limits.h> declares XScreenSaverQueryInfo.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define XScreenSaverQueryInfo innocuous_XScreenSaverQueryInfo
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char XScreenSaverQueryInfo (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef XScreenSaverQueryInfo
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char XScreenSaverQueryInfo ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_XScreenSaverQueryInfo) || defined (__stub___XScreenSaverQueryInfo)
-choke me
-#else
-char (*f) () = XScreenSaverQueryInfo;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != XScreenSaverQueryInfo;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_XScreenSaverQueryInfo=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+	ac_fn_c_check_func "$LINENO" "XScreenSaverQueryInfo" "ac_cv_func_XScreenSaverQueryInfo"
+if test "x$ac_cv_func_XScreenSaverQueryInfo" = xyes; then :
 
-ac_cv_func_XScreenSaverQueryInfo=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_XScreenSaverQueryInfo" >&5
-echo "${ECHO_T}$ac_cv_func_XScreenSaverQueryInfo" >&6
-if test $ac_cv_func_XScreenSaverQueryInfo = yes; then
-  :
 else
 
-	    echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXext" >&5
-echo $ECHO_N "checking for XScreenSaverQueryInfo in -lXext... $ECHO_C" >&6
-if test "${ac_cv_lib_Xext_XScreenSaverQueryInfo+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XScreenSaverQueryInfo in -lXext" >&5
+$as_echo_n "checking for XScreenSaverQueryInfo in -lXext... " >&6; }
+if ${ac_cv_lib_Xext_XScreenSaverQueryInfo+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char XScreenSaverQueryInfo ();
 int
 main ()
 {
-XScreenSaverQueryInfo ();
+return XScreenSaverQueryInfo ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_Xext_XScreenSaverQueryInfo=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_Xext_XScreenSaverQueryInfo=no
+  ac_cv_lib_Xext_XScreenSaverQueryInfo=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XScreenSaverQueryInfo" >&5
-echo "${ECHO_T}$ac_cv_lib_Xext_XScreenSaverQueryInfo" >&6
-if test $ac_cv_lib_Xext_XScreenSaverQueryInfo = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XScreenSaverQueryInfo" >&5
+$as_echo "$ac_cv_lib_Xext_XScreenSaverQueryInfo" >&6; }
+if test "x$ac_cv_lib_Xext_XScreenSaverQueryInfo" = xyes; then :
 
 		XLIBSW="$XLIBSW -lXext"
 		xss_lib_found=yes
 
 else
 
-		echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXss" >&5
-echo $ECHO_N "checking for XScreenSaverQueryInfo in -lXss... $ECHO_C" >&6
-if test "${ac_cv_lib_Xss_XScreenSaverQueryInfo+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XScreenSaverQueryInfo in -lXss" >&5
+$as_echo_n "checking for XScreenSaverQueryInfo in -lXss... " >&6; }
+if ${ac_cv_lib_Xss_XScreenSaverQueryInfo+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXss -lXext $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char XScreenSaverQueryInfo ();
 int
 main ()
 {
-XScreenSaverQueryInfo ();
+return XScreenSaverQueryInfo ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_Xss_XScreenSaverQueryInfo=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_Xss_XScreenSaverQueryInfo=no
+  ac_cv_lib_Xss_XScreenSaverQueryInfo=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_Xss_XScreenSaverQueryInfo" >&5
-echo "${ECHO_T}$ac_cv_lib_Xss_XScreenSaverQueryInfo" >&6
-if test $ac_cv_lib_Xss_XScreenSaverQueryInfo = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xss_XScreenSaverQueryInfo" >&5
+$as_echo "$ac_cv_lib_Xss_XScreenSaverQueryInfo" >&6; }
+if test "x$ac_cv_lib_Xss_XScreenSaverQueryInfo" = xyes; then :
 
 		    if test "$tcl_cv_ld_weak_l" = yes; then
 			# On Darwin, weak link libXss if possible,
@@ -10826,9 +8529,7 @@ fi
     fi
     if test $enable_xss = yes -a $xss_lib_found = yes -a $xss_header_found = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_XSS 1
-_ACEOF
+$as_echo "#define HAVE_XSS 1" >>confdefs.h
 
     fi
     CFLAGS=$tk_oldCFlags
@@ -10840,66 +8541,36 @@ fi
 #	#define for __CHAR_UNSIGNED__.
 #--------------------------------------------------------------------
 
-
-echo "$as_me:$LINENO: checking whether char is unsigned" >&5
-echo $ECHO_N "checking whether char is unsigned... $ECHO_C" >&6
-if test "${ac_cv_c_char_unsigned+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether char is unsigned" >&5
+$as_echo_n "checking whether char is unsigned... " >&6; }
+if ${ac_cv_c_char_unsigned+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
 main ()
 {
 static int test_array [1 - 2 * !(((char) -1) < 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_c_char_unsigned=no
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_c_char_unsigned=yes
+  ac_cv_c_char_unsigned=yes
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_char_unsigned" >&5
-echo "${ECHO_T}$ac_cv_c_char_unsigned" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_char_unsigned" >&5
+$as_echo "$ac_cv_c_char_unsigned" >&6; }
 if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define __CHAR_UNSIGNED__ 1
-_ACEOF
+  $as_echo "#define __CHAR_UNSIGNED__ 1" >>confdefs.h
 
 fi
 
@@ -10938,38 +8609,38 @@ WISH_RSRC_FILE='wish$(VERSION).rsrc'
 if test "`uname -s`" = "Darwin" ; then
 
     if test "`uname -s`" = "Darwin" ; then
-	echo "$as_me:$LINENO: checking how to package libraries" >&5
-echo $ECHO_N "checking how to package libraries... $ECHO_C" >&6
-	# Check whether --enable-framework or --disable-framework was given.
-if test "${enable_framework+set}" = set; then
-  enableval="$enable_framework"
-  enable_framework=$enableval
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to package libraries" >&5
+$as_echo_n "checking how to package libraries... " >&6; }
+	# Check whether --enable-framework was given.
+if test "${enable_framework+set}" = set; then :
+  enableval=$enable_framework; enable_framework=$enableval
 else
   enable_framework=no
-fi;
+fi
+
 	if test $enable_framework = yes; then
 	    if test $SHARED_BUILD = 0; then
-		{ echo "$as_me:$LINENO: WARNING: Frameworks can only be built if --enable-shared is yes" >&5
-echo "$as_me: WARNING: Frameworks can only be built if --enable-shared is yes" >&2;}
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Frameworks can only be built if --enable-shared is yes" >&5
+$as_echo "$as_me: WARNING: Frameworks can only be built if --enable-shared is yes" >&2;}
 		enable_framework=no
 	    fi
 	    if test $tcl_corefoundation = no; then
-		{ echo "$as_me:$LINENO: WARNING: Frameworks can only be used when CoreFoundation is available" >&5
-echo "$as_me: WARNING: Frameworks can only be used when CoreFoundation is available" >&2;}
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Frameworks can only be used when CoreFoundation is available" >&5
+$as_echo "$as_me: WARNING: Frameworks can only be used when CoreFoundation is available" >&2;}
 		enable_framework=no
 	    fi
 	fi
 	if test $enable_framework = yes; then
-	    echo "$as_me:$LINENO: result: framework" >&5
-echo "${ECHO_T}framework" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: framework" >&5
+$as_echo "framework" >&6; }
 	    FRAMEWORK_BUILD=1
 	else
 	    if test $SHARED_BUILD = 1; then
-		echo "$as_me:$LINENO: result: shared library" >&5
-echo "${ECHO_T}shared library" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: shared library" >&5
+$as_echo "shared library" >&6; }
 	    else
-		echo "$as_me:$LINENO: result: static library" >&5
-echo "${ECHO_T}static library" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static library" >&5
+$as_echo "static library" >&6; }
 	    fi
 	    FRAMEWORK_BUILD=0
 	fi
@@ -10980,8 +8651,9 @@ echo "${ECHO_T}static library" >&6
     echo "$LDFLAGS " | grep -q -- '-prebind ' && TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -seg1addr 0xb000000'
     TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -sectcreate __TEXT __info_plist Tk-Info.plist'
     EXTRA_WISH_LIBS='-sectcreate __TEXT __info_plist Wish-Info.plist'
+    EXTRA_WISH_LIBS=${EXTRA_WISH_LIBS}' -sectcreate __TEXT __credits_html Credits.html'
     EXTRA_APP_CC_SWITCHES="${EXTRA_APP_CC_SWITCHES}"' -mdynamic-no-pic'
-                        ac_config_files="$ac_config_files Tk-Info.plist:../macosx/Tk-Info.plist.in Wish-Info.plist:../macosx/Wish-Info.plist.in"
+    ac_config_files="$ac_config_files Tk-Info.plist:../macosx/Tk-Info.plist.in Wish-Info.plist:../macosx/Wish-Info.plist.in Credits.html:../macosx/Credits.html.in"
 
     for l in ${LOCALES}; do CFBUNDLELOCALIZATIONS="${CFBUNDLELOCALIZATIONS}<string>$l</string>"; done
     TK_YEAR="`date +%Y`"
@@ -10989,13 +8661,11 @@ fi
 
 if test "$FRAMEWORK_BUILD" = "1" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define TK_FRAMEWORK 1
-_ACEOF
+$as_echo "#define TK_FRAMEWORK 1" >>confdefs.h
 
     # Construct a fake local framework structure to make linking with
     # '-framework Tk' and running of tktest work
-              ac_config_commands="$ac_config_commands Tk.framework"
+    ac_config_commands="$ac_config_commands Tk.framework"
 
     LD_LIBRARY_PATH_VAR="DYLD_FRAMEWORK_PATH"
     if test "${libdir}" = '${exec_prefix}/lib'; then
@@ -11017,6 +8687,7 @@ _ACEOF
     EXTRA_INSTALL="install-private-headers html-tk"
     EXTRA_BUILD_HTML='@ln -fs contents.htm "$(HTML_INSTALL_DIR)"/TkTOC.html'
     EXTRA_INSTALL_BINARIES='@echo "Installing Info.plist to $(LIB_INSTALL_DIR)/Resources/" && $(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)/Resources" && $(INSTALL_DATA) Tk-Info.plist "$(LIB_INSTALL_DIR)/Resources/Info.plist"'
+    EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Credits.html to $(LIB_INSTALL_DIR)/Resources/" && $(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)/Resources" && $(INSTALL_DATA) Credits.html "$(LIB_INSTALL_DIR)/Resources"'
     EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing license.terms to $(LIB_INSTALL_DIR)/Resources/" && $(INSTALL_DATA) "$(TOP_DIR)/license.terms" "$(LIB_INSTALL_DIR)/Resources"'
     if test $tk_aqua = yes; then
 	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Images to $(LIB_INSTALL_DIR)/Resources/" && $(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)/Resources" && for i in Tk.tiff Tk.icns; do $(INSTALL_DATA) "$(MAC_OSX_DIR)/$$i" "$(LIB_INSTALL_DIR)/Resources"; done'
@@ -11026,6 +8697,7 @@ _ACEOF
 	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Wish.icns to $(BIN_INSTALL_DIR)/../Resources" && $(INSTALL_DATA_DIR) "$(BIN_INSTALL_DIR)/../Resources"'
 	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && $(INSTALL_DATA) "$(MAC_OSX_DIR)/Tk.icns" "$(BIN_INSTALL_DIR)/../Resources/Wish.icns"'
 	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Wish.sdef to $(BIN_INSTALL_DIR)/../Resources" && $(INSTALL_DATA) "$(MAC_OSX_DIR)/Wish.sdef" "$(BIN_INSTALL_DIR)/../Resources"'
+	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Credits.html to $(BIN_INSTALL_DIR)/../Resources" && $(INSTALL_DATA) Credits.html "$(BIN_INSTALL_DIR)/../Resources"'
     fi
     EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Finalizing Tk.framework" && rm -f "$(LIB_INSTALL_DIR)/../Current" && ln -s "$(VERSION)" "$(LIB_INSTALL_DIR)/../Current" && for f in "$(LIB_FILE)" tkConfig.sh Resources Headers PrivateHeaders; do rm -f "$(LIB_INSTALL_DIR)/../../$$f" && ln -s "Versions/Current/$$f" "$(LIB_INSTALL_DIR)/../.."; done && f="$(STUB_LIB_FILE)" && rm -f "$(LIB_INSTALL_DIR)/../../$$f" && ln -s "Versions/$(VERSION)/$$f" "$(LIB_INSTALL_DIR)/../.."'
     # Don't use AC_DEFINE for the following as the framework version define
@@ -11133,7 +8805,7 @@ TK_SHARED_BUILD=${SHARED_BUILD}
 
 
 
-                              ac_config_files="$ac_config_files Makefile:../unix/Makefile.in tkConfig.sh:../unix/tkConfig.sh.in tk.pc:../unix/tk.pc.in"
+ac_config_files="$ac_config_files Makefile:../unix/Makefile.in tkConfig.sh:../unix/tkConfig.sh.in tk.pc:../unix/tk.pc.in"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -11153,39 +8825,70 @@ _ACEOF
 
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
+# So, we kill variables containing newlines.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
-{
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+
   (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
       sed -n \
 	"s/'/'\\\\''/g;
 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
+      ;; #(
     *)
       # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
-    esac;
-} |
+    esac |
+    sort
+) |
   sed '
+     /^ac_cv_env_/b end
      t clear
-     : clear
+     :clear
      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
      t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    if test "x$cache_file" != "x/dev/null"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
   else
-    echo "not updating unwritable cache $cache_file"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -11194,63 +8897,55 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix
 # Let make expand exec_prefix.
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
-fi
-
 # Transform confdefs.h into DEFS.
 # Protect against shell expansion while executing Makefile rules.
 # Protect against Makefile macro expansion.
 #
 # If the first sed substitution is executed (which looks for macros that
-# take arguments), then we branch to the quote section.  Otherwise,
+# take arguments), then branch to the quote section.  Otherwise,
 # look for a macro that doesn't take arguments.
-cat >confdef2opt.sed <<\_ACEOF
+ac_script='
+:mline
+/\\$/{
+ N
+ s,\\\n,,
+ b mline
+}
 t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\),-D\1=\2,g
+:clear
+s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\)/-D\1=\2/g
 t quote
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\),-D\1=\2,g
+s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)/-D\1=\2/g
 t quote
-d
-: quote
-s,[	 `~#$^&*(){}\\|;'"<>?],\\&,g
-s,\[,\\&,g
-s,\],\\&,g
-s,\$,$$,g
-p
-_ACEOF
-# We use echo to avoid assuming a particular line-breaking character.
-# The extra dot is to prevent the shell from consuming trailing
-# line-breaks from the sub-command output.  A line-break within
-# single-quotes doesn't work because, if this script is created in a
-# platform that uses two characters for line-breaks (e.g., DOS), tr
-# would break.
-ac_LF_and_DOT=`echo; echo .`
-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
-rm -f confdef2opt.sed
+b any
+:quote
+s/[	 `~#$^&*(){}\\|;'\''"<>?]/\\&/g
+s/\[/\\&/g
+s/\]/\\&/g
+s/\$/$$/g
+H
+:any
+${
+	g
+	s/^\n//
+	s/\n/ /g
+	p
+}
+'
+DEFS=`sed -n "$ac_script" confdefs.h`
 
 
 ac_libobjs=
 ac_ltlibobjs=
+U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
@@ -11259,12 +8954,15 @@ LTLIBOBJS=$ac_ltlibobjs
 
 CFLAGS="${CFLAGS} ${CPPFLAGS}"; CPPFLAGS=""
 
-: ${CONFIG_STATUS=./config.status}
+
+: "${CONFIG_STATUS=./config.status}"
+ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -11274,230 +8972,365 @@ cat >$CONFIG_STATUS <<_ACEOF
 debug=false
 ac_cs_recheck=false
 ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
 
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
+  setopt NO_GLOB_SUBST
 else
-  as_unset=false
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
 fi
 
 
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
   else
-    $as_unset $as_var
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
 
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
+PS1='$ '
+PS2='> '
+PS4='+ '
 
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
 
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
 
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
 
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
 
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
 
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
 rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
     as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
   fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
-rm -f conf$$ conf$$.exe conf$$.file
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
 
+} # as_fn_mkdir_p
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
-as_executable_p="test -f"
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -11506,31 +9339,20 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
 exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
+# values after options handling.
+ac_log="
 This file was extended by tk $as_me 8.6, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -11538,43 +9360,41 @@ generated by GNU Autoconf 2.59.  Invocation command line was
   CONFIG_COMMANDS = $CONFIG_COMMANDS
   $ $0 $@
 
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
 _ACEOF
 
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
 
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
 
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
 
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_commands="$ac_config_commands"
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+_ACEOF
 
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
 
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [TAG]...
 
   -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
+  -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
 
 Configuration files:
 $config_files
@@ -11582,83 +9402,78 @@ $config_files
 Configuration commands:
 $config_commands
 
-Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
+Report bugs to the package provider."
 
-cat >>$CONFIG_STATUS <<_ACEOF
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 tk config.status 8.6
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.69,
+  with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+test -n "\$AWK" || AWK=awk
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
 do
   case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+  --*=?*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
     ac_shift=:
     ;;
-  -*)
+  *)
     ac_option=$1
     ac_optarg=$2
     ac_shift=shift
     ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
   esac
 
   case $ac_option in
   # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
+  --he | --h |  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
+  -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
 
-  *) ac_config_targets="$ac_config_targets $1" ;;
+  *) as_fn_append ac_config_targets " $1"
+     ac_need_defaults=false ;;
 
   esac
   shift
@@ -11672,42 +9487,55 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
 fi
 
 _ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
 
-cat >>$CONFIG_STATUS <<_ACEOF
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #
-# INIT-COMMANDS section.
+# INIT-COMMANDS
 #
-
 VERSION=${TK_VERSION} && tk_aqua=${tk_aqua}
 
 _ACEOF
 
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
-
-cat >>$CONFIG_STATUS <<\_ACEOF
+# Handling of arguments.
 for ac_config_target in $ac_config_targets
 do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Tk-Info.plist" ) CONFIG_FILES="$CONFIG_FILES Tk-Info.plist:../macosx/Tk-Info.plist.in" ;;
-  "Wish-Info.plist" ) CONFIG_FILES="$CONFIG_FILES Wish-Info.plist:../macosx/Wish-Info.plist.in" ;;
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile:../unix/Makefile.in" ;;
-  "tkConfig.sh" ) CONFIG_FILES="$CONFIG_FILES tkConfig.sh:../unix/tkConfig.sh.in" ;;
-  "tk.pc" ) CONFIG_FILES="$CONFIG_FILES tk.pc:../unix/tk.pc.in" ;;
-  "Tk.framework" ) CONFIG_COMMANDS="$CONFIG_COMMANDS Tk.framework" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
+  case $ac_config_target in
+    "Tk-Info.plist") CONFIG_FILES="$CONFIG_FILES Tk-Info.plist:../macosx/Tk-Info.plist.in" ;;
+    "Wish-Info.plist") CONFIG_FILES="$CONFIG_FILES Wish-Info.plist:../macosx/Wish-Info.plist.in" ;;
+    "Credits.html") CONFIG_FILES="$CONFIG_FILES Credits.html:../macosx/Credits.html.in" ;;
+    "Tk.framework") CONFIG_COMMANDS="$CONFIG_COMMANDS Tk.framework" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile:../unix/Makefile.in" ;;
+    "tkConfig.sh") CONFIG_FILES="$CONFIG_FILES tkConfig.sh:../unix/tkConfig.sh.in" ;;
+    "tk.pc") CONFIG_FILES="$CONFIG_FILES tk.pc:../unix/tk.pc.in" ;;
+
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
+
 # If the user did not use the arguments to specify the items to instantiate,
 # then the envvar interface is used.  Set only those that are not.
 # We use the long form for the default assignment because of an extremely
@@ -11718,523 +9546,409 @@ if $ac_need_defaults; then
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
+# simply because there is no reason against having it here, and in addition,
 # creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
+  tmp= ac_tmp=
+  trap 'exit_status=$?
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+' 0
+  trap 'as_fn_exit 1' 1 2 13 15
 }
-
 # Create a (secure) tmp directory for tmp files.
 
 {
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -d "$tmp"
 }  ||
 {
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+_ACEOF
+
+
 {
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\)..*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\)..*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
 }
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
 
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-cat >>$CONFIG_STATUS <<_ACEOF
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
+s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
+s/^[^=]*=[	 ]*$//
+}'
+fi
 
-#
-# CONFIG_FILES section.
-#
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
 
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@TCL_VERSION@,$TCL_VERSION,;t t
-s,@TCL_PATCH_LEVEL@,$TCL_PATCH_LEVEL,;t t
-s,@TCL_BIN_DIR@,$TCL_BIN_DIR,;t t
-s,@TCL_SRC_DIR@,$TCL_SRC_DIR,;t t
-s,@TCL_LIB_FILE@,$TCL_LIB_FILE,;t t
-s,@TCL_LIB_FLAG@,$TCL_LIB_FLAG,;t t
-s,@TCL_LIB_SPEC@,$TCL_LIB_SPEC,;t t
-s,@TCL_STUB_LIB_FILE@,$TCL_STUB_LIB_FILE,;t t
-s,@TCL_STUB_LIB_FLAG@,$TCL_STUB_LIB_FLAG,;t t
-s,@TCL_STUB_LIB_SPEC@,$TCL_STUB_LIB_SPEC,;t t
-s,@TCLSH_PROG@,$TCLSH_PROG,;t t
-s,@BUILD_TCLSH@,$BUILD_TCLSH,;t t
-s,@MAN_FLAGS@,$MAN_FLAGS,;t t
-s,@CC@,$CC,;t t
-s,@CFLAGS@,$CFLAGS,;t t
-s,@LDFLAGS@,$LDFLAGS,;t t
-s,@CPPFLAGS@,$CPPFLAGS,;t t
-s,@ac_ct_CC@,$ac_ct_CC,;t t
-s,@EXEEXT@,$EXEEXT,;t t
-s,@OBJEXT@,$OBJEXT,;t t
-s,@CPP@,$CPP,;t t
-s,@EGREP@,$EGREP,;t t
-s,@TCL_THREADS@,$TCL_THREADS,;t t
-s,@RANLIB@,$RANLIB,;t t
-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-s,@AR@,$AR,;t t
-s,@ac_ct_AR@,$ac_ct_AR,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@TCL_LIBS@,$TCL_LIBS,;t t
-s,@DL_LIBS@,$DL_LIBS,;t t
-s,@DL_OBJS@,$DL_OBJS,;t t
-s,@PLAT_OBJS@,$PLAT_OBJS,;t t
-s,@PLAT_SRCS@,$PLAT_SRCS,;t t
-s,@LDAIX_SRC@,$LDAIX_SRC,;t t
-s,@CFLAGS_DEBUG@,$CFLAGS_DEBUG,;t t
-s,@CFLAGS_OPTIMIZE@,$CFLAGS_OPTIMIZE,;t t
-s,@CFLAGS_WARNING@,$CFLAGS_WARNING,;t t
-s,@LDFLAGS_DEBUG@,$LDFLAGS_DEBUG,;t t
-s,@LDFLAGS_OPTIMIZE@,$LDFLAGS_OPTIMIZE,;t t
-s,@CC_SEARCH_FLAGS@,$CC_SEARCH_FLAGS,;t t
-s,@LD_SEARCH_FLAGS@,$LD_SEARCH_FLAGS,;t t
-s,@STLIB_LD@,$STLIB_LD,;t t
-s,@SHLIB_LD@,$SHLIB_LD,;t t
-s,@TCL_SHLIB_LD_EXTRAS@,$TCL_SHLIB_LD_EXTRAS,;t t
-s,@TK_SHLIB_LD_EXTRAS@,$TK_SHLIB_LD_EXTRAS,;t t
-s,@SHLIB_LD_LIBS@,$SHLIB_LD_LIBS,;t t
-s,@SHLIB_CFLAGS@,$SHLIB_CFLAGS,;t t
-s,@SHLIB_SUFFIX@,$SHLIB_SUFFIX,;t t
-s,@MAKE_LIB@,$MAKE_LIB,;t t
-s,@MAKE_STUB_LIB@,$MAKE_STUB_LIB,;t t
-s,@INSTALL_LIB@,$INSTALL_LIB,;t t
-s,@DLL_INSTALL_DIR@,$DLL_INSTALL_DIR,;t t
-s,@INSTALL_STUB_LIB@,$INSTALL_STUB_LIB,;t t
-s,@CFLAGS_DEFAULT@,$CFLAGS_DEFAULT,;t t
-s,@LDFLAGS_DEFAULT@,$LDFLAGS_DEFAULT,;t t
-s,@XFT_CFLAGS@,$XFT_CFLAGS,;t t
-s,@XFT_LIBS@,$XFT_LIBS,;t t
-s,@UNIX_FONT_OBJS@,$UNIX_FONT_OBJS,;t t
-s,@TK_VERSION@,$TK_VERSION,;t t
-s,@TK_MAJOR_VERSION@,$TK_MAJOR_VERSION,;t t
-s,@TK_MINOR_VERSION@,$TK_MINOR_VERSION,;t t
-s,@TK_PATCH_LEVEL@,$TK_PATCH_LEVEL,;t t
-s,@TK_YEAR@,$TK_YEAR,;t t
-s,@TK_LIB_FILE@,$TK_LIB_FILE,;t t
-s,@TK_LIB_FLAG@,$TK_LIB_FLAG,;t t
-s,@TK_LIB_SPEC@,$TK_LIB_SPEC,;t t
-s,@TK_STUB_LIB_FILE@,$TK_STUB_LIB_FILE,;t t
-s,@TK_STUB_LIB_FLAG@,$TK_STUB_LIB_FLAG,;t t
-s,@TK_STUB_LIB_SPEC@,$TK_STUB_LIB_SPEC,;t t
-s,@TK_STUB_LIB_PATH@,$TK_STUB_LIB_PATH,;t t
-s,@TK_INCLUDE_SPEC@,$TK_INCLUDE_SPEC,;t t
-s,@TK_BUILD_STUB_LIB_SPEC@,$TK_BUILD_STUB_LIB_SPEC,;t t
-s,@TK_BUILD_STUB_LIB_PATH@,$TK_BUILD_STUB_LIB_PATH,;t t
-s,@TK_SRC_DIR@,$TK_SRC_DIR,;t t
-s,@TK_SHARED_BUILD@,$TK_SHARED_BUILD,;t t
-s,@LD_LIBRARY_PATH_VAR@,$LD_LIBRARY_PATH_VAR,;t t
-s,@TK_BUILD_LIB_SPEC@,$TK_BUILD_LIB_SPEC,;t t
-s,@TCL_STUB_FLAGS@,$TCL_STUB_FLAGS,;t t
-s,@XINCLUDES@,$XINCLUDES,;t t
-s,@XLIBSW@,$XLIBSW,;t t
-s,@LOCALES@,$LOCALES,;t t
-s,@TK_WINDOWINGSYSTEM@,$TK_WINDOWINGSYSTEM,;t t
-s,@TK_PKG_DIR@,$TK_PKG_DIR,;t t
-s,@TK_LIBRARY@,$TK_LIBRARY,;t t
-s,@LIB_RUNTIME_DIR@,$LIB_RUNTIME_DIR,;t t
-s,@PRIVATE_INCLUDE_DIR@,$PRIVATE_INCLUDE_DIR,;t t
-s,@HTML_DIR@,$HTML_DIR,;t t
-s,@EXTRA_CC_SWITCHES@,$EXTRA_CC_SWITCHES,;t t
-s,@EXTRA_APP_CC_SWITCHES@,$EXTRA_APP_CC_SWITCHES,;t t
-s,@EXTRA_INSTALL@,$EXTRA_INSTALL,;t t
-s,@EXTRA_INSTALL_BINARIES@,$EXTRA_INSTALL_BINARIES,;t t
-s,@EXTRA_BUILD_HTML@,$EXTRA_BUILD_HTML,;t t
-s,@EXTRA_WISH_LIBS@,$EXTRA_WISH_LIBS,;t t
-s,@CFBUNDLELOCALIZATIONS@,$CFBUNDLELOCALIZATIONS,;t t
-s,@TK_RSRC_FILE@,$TK_RSRC_FILE,;t t
-s,@WISH_RSRC_FILE@,$WISH_RSRC_FILE,;t t
-s,@LIB_RSRC_FILE@,$LIB_RSRC_FILE,;t t
-s,@APP_RSRC_FILE@,$APP_RSRC_FILE,;t t
-s,@REZ@,$REZ,;t t
-s,@REZ_FLAGS@,$REZ_FLAGS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # Split the substitutions into bite-sized pieces for seds with
-  # small command number limits, like on Digital OSF/1 and HP-UX.
-  ac_max_sed_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # Line after last line for current file.
-  ac_more_lines=:
-  ac_sed_cmds=
-  while $ac_more_lines; do
-    if test $ac_beg -gt 1; then
-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
+
+eval set X "  :F $CONFIG_FILES      :C $CONFIG_COMMANDS"
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$ac_tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append ac_file_inputs " '$ac_f'"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
     fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
 
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
+    case $ac_tag in
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+    esac
+    ;;
   esac
 
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+  ac_dir=`$as_dirname -- "$ac_file" ||
 $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  as_dir="$ac_dir"; as_fn_mkdir_p
   ac_builddir=.
 
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
 
 case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
+  .)  # We are building in place.
     ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
     ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
 esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
 
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
 
+_ACEOF
 
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+  s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_COMMANDS section.
-#
-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
-  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
-  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_dest" : 'X\(//\)[^/]' \| \
-	 X"$ac_dest" : 'X\(//\)$' \| \
-	 X"$ac_dest" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_dest" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&2;}
+
+  rm -f "$ac_tmp/stdin"
+  case $ac_file in
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
 
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
 
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
 
 
-  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-echo "$as_me: executing $ac_dest commands" >&6;}
-  case $ac_dest in
-    Tk.framework ) n=Tk &&
+  case $ac_file$ac_mode in
+    "Tk.framework":C) n=Tk &&
         f=$n.framework && v=Versions/$VERSION &&
         rm -rf $f && mkdir -p $f/$v/Resources &&
         ln -s $v/$n $v/Resources $f && ln -s ../../../$n $f/$v &&
@@ -12242,17 +9956,18 @@ echo "$as_me: executing $ac_dest commands" >&6;}
         if test $tk_aqua = yes; then ln -s ../../../../$n.rsrc $f/$v/Resources; fi &&
         unset n f v
      ;;
+
   esac
-done
-_ACEOF
+done # for ac_tag
 
-cat >>$CONFIG_STATUS <<\_ACEOF
 
-{ (exit 0); exit 0; }
+as_fn_exit 0
 _ACEOF
-chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+test $ac_write_fail = 0 ||
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -12272,7 +9987,11 @@ if test "$no_create" != yes; then
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
+  $ac_cs_success || as_fn_exit 1
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 
diff --git a/unix/configure.in b/unix/configure.in
index 8242c7b..a313d32 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -682,8 +682,9 @@ if test "`uname -s`" = "Darwin" ; then
     echo "$LDFLAGS " | grep -q -- '-prebind ' && TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -seg1addr 0xb000000'
     TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -sectcreate __TEXT __info_plist Tk-Info.plist'
     EXTRA_WISH_LIBS='-sectcreate __TEXT __info_plist Wish-Info.plist'
+    EXTRA_WISH_LIBS=${EXTRA_WISH_LIBS}' -sectcreate __TEXT __credits_html Credits.html'
     EXTRA_APP_CC_SWITCHES="${EXTRA_APP_CC_SWITCHES}"' -mdynamic-no-pic'
-    AC_CONFIG_FILES([Tk-Info.plist:../macosx/Tk-Info.plist.in Wish-Info.plist:../macosx/Wish-Info.plist.in])
+    AC_CONFIG_FILES([Tk-Info.plist:../macosx/Tk-Info.plist.in Wish-Info.plist:../macosx/Wish-Info.plist.in Credits.html:../macosx/Credits.html.in])
     for l in ${LOCALES}; do CFBUNDLELOCALIZATIONS="${CFBUNDLELOCALIZATIONS}<string>$l</string>"; done
     TK_YEAR="`date +%Y`"
 fi
@@ -720,6 +721,7 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
     EXTRA_INSTALL="install-private-headers html-tk"
     EXTRA_BUILD_HTML='@ln -fs contents.htm "$(HTML_INSTALL_DIR)"/TkTOC.html'
     EXTRA_INSTALL_BINARIES='@echo "Installing Info.plist to $(LIB_INSTALL_DIR)/Resources/" && $(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)/Resources" && $(INSTALL_DATA) Tk-Info.plist "$(LIB_INSTALL_DIR)/Resources/Info.plist"'
+    EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Credits.html to $(LIB_INSTALL_DIR)/Resources/" && $(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)/Resources" && $(INSTALL_DATA) Credits.html "$(LIB_INSTALL_DIR)/Resources"'
     EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing license.terms to $(LIB_INSTALL_DIR)/Resources/" && $(INSTALL_DATA) "$(TOP_DIR)/license.terms" "$(LIB_INSTALL_DIR)/Resources"'
     if test $tk_aqua = yes; then
 	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Images to $(LIB_INSTALL_DIR)/Resources/" && $(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)/Resources" && for i in Tk.tiff Tk.icns; do $(INSTALL_DATA) "$(MAC_OSX_DIR)/$$i" "$(LIB_INSTALL_DIR)/Resources"; done'
@@ -729,6 +731,7 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
 	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Wish.icns to $(BIN_INSTALL_DIR)/../Resources" && $(INSTALL_DATA_DIR) "$(BIN_INSTALL_DIR)/../Resources"'
 	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && $(INSTALL_DATA) "$(MAC_OSX_DIR)/Tk.icns" "$(BIN_INSTALL_DIR)/../Resources/Wish.icns"'
 	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Wish.sdef to $(BIN_INSTALL_DIR)/../Resources" && $(INSTALL_DATA) "$(MAC_OSX_DIR)/Wish.sdef" "$(BIN_INSTALL_DIR)/../Resources"'
+	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Credits.html to $(BIN_INSTALL_DIR)/../Resources" && $(INSTALL_DATA) Credits.html "$(BIN_INSTALL_DIR)/../Resources"'
     fi
     EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Finalizing Tk.framework" && rm -f "$(LIB_INSTALL_DIR)/../Current" && ln -s "$(VERSION)" "$(LIB_INSTALL_DIR)/../Current" && for f in "$(LIB_FILE)" tkConfig.sh Resources Headers PrivateHeaders; do rm -f "$(LIB_INSTALL_DIR)/../../$$f" && ln -s "Versions/Current/$$f" "$(LIB_INSTALL_DIR)/../.."; done && f="$(STUB_LIB_FILE)" && rm -f "$(LIB_INSTALL_DIR)/../../$$f" && ln -s "Versions/$(VERSION)/$$f" "$(LIB_INSTALL_DIR)/../.."'
     # Don't use AC_DEFINE for the following as the framework version define
-- 
cgit v0.12


From ff890fed7c252e3ffcf2caef046aff7f6d39ee58 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 6 Nov 2020 15:53:26 +0000
Subject: re-generate configure script with (locally modified) autoconf-2.59

---
 unix/configure | 11145 +++++++++++++++++++++++++++++++++----------------------
 1 file changed, 6715 insertions(+), 4430 deletions(-)

diff --git a/unix/configure b/unix/configure
index 0230827..4be5c70 100755
--- a/unix/configure
+++ b/unix/configure
@@ -1,459 +1,81 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for tk 8.6.
-#
-#
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
-#
+# Generated by GNU Autoconf 2.59 for tk 8.6.
 #
+# Copyright (C) 2003 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
 
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
 fi
+DUALCASE=1; export DUALCASE # for MKS sh
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
 fi
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
+# Work around bugs in pre-3.0 UWIN ksh.
+$as_unset ENV MAIL MAILPATH
 PS1='$ '
 PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-# Use a proper internal environment variable to ensure we don't fall
-  # into an infinite loop, continuously re-executing ourselves.
-  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
-    _as_can_reexec=no; export _as_can_reexec;
-    # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
-  fi
-  # We don't want this to propagate to other subprocesses.
-          { _as_can_reexec=; unset _as_can_reexec;}
-if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-"
-  as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
-
-exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-
-else
-  exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1
-test -x / || exit 1"
-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+for as_var in \
+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+  LC_TELEPHONE LC_TIME
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  as_found=:
-  case $as_dir in #(
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
-	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  break 2
-fi
-fi
-	   done;;
-       esac
-  as_found=false
-done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
-IFS=$as_save_IFS
-
-
-      if test "x$CONFIG_SHELL" != x; then :
-  export CONFIG_SHELL
-             # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-exit 255
-fi
-
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+    eval $as_var=C; export $as_var
   else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
-$0: including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
-  fi
-  exit 1
-fi
-fi
-fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    $as_unset $as_var
   fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
+done
 
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1; then
   as_expr=expr
 else
   as_expr=false
 fi
 
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
   as_basename=basename
 else
   as_basename=false
 fi
 
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
 
-as_me=`$as_basename -- "$0" ||
+# Name of the executable.
+as_me=`$as_basename "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
+	 X"$0" : 'X\(/\)$' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\/\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
 
+
+# PATH needs CR, and LINENO needs CR and PATH.
 # Avoid depending upon Character Ranges.
 as_cr_letters='abcdefghijklmnopqrstuvwxyz'
 as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
@@ -461,91 +83,146 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+  # Find who we are.  Look in the path if we contain no path at all
+  # relative or not.
+  case $0 in
+    *[\\/]* ) as_myself=$0 ;;
+    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+
+       ;;
+  esac
+  # We did not find ourselves, most probably we were run as `sh COMMAND'
+  # in which case we are not to be found in the path.
+  if test "x$as_myself" = x; then
+    as_myself=$0
+  fi
+  if test ! -f "$as_myself"; then
+    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
+   { (exit 1); exit 1; }; }
+  fi
+  case $CONFIG_SHELL in
+  '')
+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for as_base in sh bash ksh sh5; do
+	 case $as_dir in
+	 /*)
+	   if ("$as_dir/$as_base" -c '
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+	     CONFIG_SHELL=$as_dir/$as_base
+	     export CONFIG_SHELL
+	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+	   fi;;
+	 esac
+       done
+done
+;;
+  esac
 
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line before each line; the second 'sed' does the real
+  # work.  The second script uses 'N' to pair each line-number line
+  # with the numbered line, and appends trailing '-' during
+  # substitution so that $LINENO is not a special case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+  sed '=' <$as_myself |
     sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
       N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      s,$,-,
+      : loop
+      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
       t loop
-      s/-\n.*//
+      s,-$,,
+      s,^['$as_cr_digits']*\n,,
     ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+  chmod +x $as_me.lineno ||
+    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+   { (exit 1); exit 1; }; }
 
-  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
-  # already done that, so ensure we don't try to do so again and fall
-  # in an infinite loop.  This has already happened in practice.
-  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
+  # original and so on.  Autoconf is especially sensible to this).
+  . ./$as_me.lineno
   # Exit status is that of the last command.
   exit
 }
 
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
+
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+  *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T='	' ;;
+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
 esac
 
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
 else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
+  as_expr=false
 fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
+    as_ln_s='cp -p'
   else
-    as_ln_s='cp -pR'
+    as_ln_s='ln -s'
   fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
 else
-  as_ln_s='cp -pR'
+  as_ln_s='cp -p'
 fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
+rm -f conf$$ conf$$.exe conf$$.file
 
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
+  as_mkdir_p=:
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
+as_executable_p="test -f"
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -554,25 +231,38 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-test -n "$DJDIR" || exec 7<&0 </dev/null
-exec 6>&1
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" 	$as_nl"
+
+# CDPATH.
+$as_unset CDPATH
+
 
 # Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
+exec 6>&1
+
 #
 # Initializations.
 #
 ac_default_prefix=/usr/local
-ac_clean_files=
 ac_config_libobj_dir=.
-LIBOBJS=
 cross_compiling=no
 subdirs=
 MFLAGS=
 MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+# Maximum number of lines to put in a shell here document.
+# This variable seems obsolete.  It should probably be removed, and
+# only ac_max_sed_lines should be used.
+: ${ac_max_here_lines=38}
 
 # Identity of this package.
 PACKAGE_NAME='tk'
@@ -580,221 +270,50 @@ PACKAGE_TARNAME='tk'
 PACKAGE_VERSION='8.6'
 PACKAGE_STRING='tk 8.6'
 PACKAGE_BUGREPORT=''
-PACKAGE_URL=''
 
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
+#if HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
-#ifdef HAVE_SYS_STAT_H
+#if HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
-#ifdef STDC_HEADERS
+#if STDC_HEADERS
 # include <stdlib.h>
 # include <stddef.h>
 #else
-# ifdef HAVE_STDLIB_H
+# if HAVE_STDLIB_H
 #  include <stdlib.h>
 # endif
 #endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#if HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
 #  include <memory.h>
 # endif
 # include <string.h>
 #endif
-#ifdef HAVE_STRINGS_H
+#if HAVE_STRINGS_H
 # include <strings.h>
 #endif
-#ifdef HAVE_INTTYPES_H
+#if HAVE_INTTYPES_H
 # include <inttypes.h>
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
 #endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
+#if HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='LTLIBOBJS
-REZ_FLAGS
-REZ
-APP_RSRC_FILE
-LIB_RSRC_FILE
-WISH_RSRC_FILE
-TK_RSRC_FILE
-CFBUNDLELOCALIZATIONS
-EXTRA_WISH_LIBS
-EXTRA_BUILD_HTML
-EXTRA_INSTALL_BINARIES
-EXTRA_INSTALL
-EXTRA_APP_CC_SWITCHES
-EXTRA_CC_SWITCHES
-HTML_DIR
-PRIVATE_INCLUDE_DIR
-LIB_RUNTIME_DIR
-TK_LIBRARY
-TK_PKG_DIR
-TK_WINDOWINGSYSTEM
-LOCALES
-XLIBSW
-XINCLUDES
-TCL_STUB_FLAGS
-TK_BUILD_LIB_SPEC
-LD_LIBRARY_PATH_VAR
-TK_SHARED_BUILD
-TK_SRC_DIR
-TK_BUILD_STUB_LIB_PATH
-TK_BUILD_STUB_LIB_SPEC
-TK_INCLUDE_SPEC
-TK_STUB_LIB_PATH
-TK_STUB_LIB_SPEC
-TK_STUB_LIB_FLAG
-TK_STUB_LIB_FILE
-TK_LIB_SPEC
-TK_LIB_FLAG
-TK_LIB_FILE
-TK_YEAR
-TK_PATCH_LEVEL
-TK_MINOR_VERSION
-TK_MAJOR_VERSION
-TK_VERSION
-UNIX_FONT_OBJS
-XFT_LIBS
-XFT_CFLAGS
-XMKMF
-LDFLAGS_DEFAULT
-CFLAGS_DEFAULT
-INSTALL_STUB_LIB
-DLL_INSTALL_DIR
-INSTALL_LIB
-MAKE_STUB_LIB
-MAKE_LIB
-SHLIB_SUFFIX
-SHLIB_CFLAGS
-SHLIB_LD_LIBS
-TK_SHLIB_LD_EXTRAS
-TCL_SHLIB_LD_EXTRAS
-SHLIB_LD
-STLIB_LD
-LD_SEARCH_FLAGS
-CC_SEARCH_FLAGS
-LDFLAGS_OPTIMIZE
-LDFLAGS_DEBUG
-CFLAGS_WARNING
-CFLAGS_OPTIMIZE
-CFLAGS_DEBUG
-LDAIX_SRC
-PLAT_SRCS
-PLAT_OBJS
-DL_OBJS
-DL_LIBS
-TCL_LIBS
-LIBOBJS
-AR
-RANLIB
-TCL_THREADS
-EGREP
-GREP
-CPP
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-MAN_FLAGS
-BUILD_TCLSH
-TCLSH_PROG
-TCL_STUB_LIB_SPEC
-TCL_STUB_LIB_FLAG
-TCL_STUB_LIB_FILE
-TCL_LIB_SPEC
-TCL_LIB_FLAG
-TCL_LIB_FILE
-TCL_SRC_DIR
-TCL_BIN_DIR
-TCL_PATCH_LEVEL
-TCL_VERSION
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_URL
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS TCL_VERSION TCL_PATCH_LEVEL TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TCLSH_PROG BUILD_TCLSH MAN_FLAGS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP TCL_THREADS RANLIB ac_ct_RANLIB AR ac_ct_AR LIBOBJS TCL_LIBS DL_LIBS DL_OBJS PLAT_OBJS PLAT_SRCS LDAIX_SRC CFLAGS_DEBUG CFLAGS_OPTIMIZE CFLAGS_WARNING LDFLAGS_DEBUG LDFLAGS_OPTIMIZE CC_SEARCH_FLAGS LD_SEARCH_FLAGS STLIB_LD SHLIB_LD TCL_SHLIB_LD_EXTRAS TK_SHLIB_LD_EXTRAS SHLIB_LD_LIBS SHLIB_CFLAGS SHLIB_SUFFIX MAKE_LIB MAKE_STUB_LIB INSTALL_LIB DLL_INSTALL_DIR INSTALL_STUB_LIB CFLAGS_DEFAULT LDFLAGS_DEFAULT XFT_CFLAGS XFT_LIBS UNIX_FONT_OBJS TK_VERSION TK_MAJOR_VERSION TK_MINOR_VERSION TK_PATCH_LEVEL TK_YEAR TK_LIB_FILE TK_LIB_FLAG TK_LIB_SPEC TK_STUB_LIB_FILE TK_STUB_LIB_FLAG TK_STUB_LIB_SPEC TK_STUB_LIB_PATH TK_INCLUDE_SPEC TK_BUILD_STUB_LIB_SPEC TK_BUILD_STUB_LIB_PATH TK_SRC_DIR TK_SHARED_BUILD LD_LIBRARY_PATH_VAR TK_BUILD_LIB_SPEC TCL_STUB_FLAGS XINCLUDES XLIBSW LOCALES TK_WINDOWINGSYSTEM TK_PKG_DIR TK_LIBRARY LIB_RUNTIME_DIR PRIVATE_INCLUDE_DIR HTML_DIR EXTRA_CC_SWITCHES EXTRA_APP_CC_SWITCHES EXTRA_INSTALL EXTRA_INSTALL_BINARIES EXTRA_BUILD_HTML EXTRA_WISH_LIBS CFBUNDLELOCALIZATIONS TK_RSRC_FILE WISH_RSRC_FILE LIB_RSRC_FILE APP_RSRC_FILE REZ REZ_FLAGS LTLIBOBJS'
 ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-with_tcl
-enable_man_symlinks
-enable_man_compression
-enable_man_suffix
-enable_threads
-enable_shared
-enable_64bit
-enable_64bit_vis
-enable_rpath
-enable_corefoundation
-enable_load
-enable_symbols
-enable_aqua
-with_x
-enable_xft
-enable_xss
-enable_framework
-'
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP
-XMKMF'
-
 
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
@@ -817,49 +336,34 @@ x_libraries=NONE
 # and all the variables that are supposed to be based on exec_prefix
 # by default will actually change.
 # Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
 libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
+datadir='${prefix}/share'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+libdir='${exec_prefix}/lib'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
+infodir='${prefix}/info'
+mandir='${prefix}/man'
 
 ac_prev=
-ac_dashdash=
 for ac_option
 do
   # If the previous option needs an argument, assign it.
   if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
+    eval "$ac_prev=\$ac_option"
     ac_prev=
     continue
   fi
 
-  case $ac_option in
-  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *=)   ac_optarg= ;;
-  *)    ac_optarg=yes ;;
-  esac
+  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
+  case $ac_option in
 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;
@@ -881,59 +385,33 @@ do
   --config-cache | -C)
     cache_file=config.cache ;;
 
-  -datadir | --datadir | --datadi | --datad)
+  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
     ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+  | --da=*)
     datadir=$ac_optarg ;;
 
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
   -disable-* | --disable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
+    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+   { (exit 1); exit 1; }; }
+    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+    eval "enable_$ac_feature=no" ;;
 
   -enable-* | --enable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
+    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+   { (exit 1); exit 1; }; }
+    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+      *) ac_optarg=yes ;;
     esac
-    eval enable_$ac_useropt=\$ac_optarg ;;
+    eval "enable_$ac_feature='$ac_optarg'" ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -960,12 +438,6 @@ do
   -host=* | --host=* | --hos=* | --ho=*)
     host_alias=$ac_optarg ;;
 
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
   -includedir | --includedir | --includedi | --included | --include \
   | --includ | --inclu | --incl | --inc)
     ac_prev=includedir ;;
@@ -990,16 +462,13 @@ do
   | --libexe=* | --libex=* | --libe=*)
     libexecdir=$ac_optarg ;;
 
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
   -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
+  | --localstate | --localstat | --localsta | --localst \
+  | --locals | --local | --loca | --loc | --lo)
     ac_prev=localstatedir ;;
   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
     localstatedir=$ac_optarg ;;
 
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
@@ -1064,16 +533,6 @@ do
   | --progr-tra=* | --program-tr=* | --program-t=*)
     program_transform_name=$ac_optarg ;;
 
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
@@ -1124,36 +583,26 @@ do
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
+    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid package name: $ac_package" >&2
+   { (exit 1); exit 1; }; }
+    ac_package=`echo $ac_package| sed 's/-/_/g'`
+    case $ac_option in
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+      *) ac_optarg=yes ;;
     esac
-    eval with_$ac_useropt=\$ac_optarg ;;
+    eval "with_$ac_package='$ac_optarg'" ;;
 
   -without-* | --without-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=no ;;
+    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid package name: $ac_package" >&2
+   { (exit 1); exit 1; }; }
+    ac_package=`echo $ac_package | sed 's/-/_/g'`
+    eval "with_$ac_package=no" ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -1173,26 +622,27 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
+  -*) { echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; }
     ;;
 
   *=*)
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
-    case $ac_envvar in #(
-      '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
-    esac
-    eval $ac_envvar=\$ac_optarg
+    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+   { (exit 1); exit 1; }; }
+    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+    eval "$ac_envvar='$ac_optarg'"
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
   esac
@@ -1200,36 +650,31 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error $? "missing argument to $ac_option"
-fi
-
-if test -n "$ac_unrecognized_opts"; then
-  case $enable_option_checking in
-    no) ;;
-    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-  esac
+  { echo "$as_me: error: missing argument to $ac_option" >&2
+   { (exit 1); exit 1; }; }
 fi
 
-# Check all directory arguments for consistency.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+# Be sure to have absolute paths.
+for ac_var in exec_prefix prefix
 do
-  eval ac_val=\$$ac_var
-  # Remove trailing slashes.
+  eval ac_val=$`echo $ac_var`
   case $ac_val in
-    */ )
-      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-      eval $ac_var=\$ac_val;;
+    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; };;
   esac
-  # Be sure to have absolute directory names.
+done
+
+# Be sure to have absolute paths.
+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+	      localstatedir libdir includedir oldincludedir infodir mandir
+do
+  eval ac_val=$`echo $ac_var`
   case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+    [\\/$]* | ?:[\\/]* ) ;;
+    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; };;
   esac
-  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1243,6 +688,8 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
+    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1254,72 +701,74 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias-
 test "$silent" = yes && exec 6>/dev/null
 
 
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error $? "working directory cannot be determined"
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error $? "pwd does not report name of working directory"
-
-
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_myself" : 'X\(//\)[^/]' \| \
-	 X"$as_myself" : 'X\(//\)$' \| \
-	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
+  # Try the directory containing this script, then its parent.
+  ac_confdir=`(dirname "$0") 2>/dev/null ||
+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$0" : 'X\(//\)[^/]' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X"$0" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
   srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
+  if test ! -r $srcdir/$ac_unique_file; then
     srcdir=..
   fi
 else
   ac_srcdir_defaulted=no
 fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
+if test ! -r $srcdir/$ac_unique_file; then
+  if test "$ac_srcdir_defaulted" = yes; then
+    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+   { (exit 1); exit 1; }; }
+  else
+    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+   { (exit 1); exit 1; }; }
+  fi
+fi
+(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+   { (exit 1); exit 1; }; }
+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+ac_env_build_alias_set=${build_alias+set}
+ac_env_build_alias_value=$build_alias
+ac_cv_env_build_alias_set=${build_alias+set}
+ac_cv_env_build_alias_value=$build_alias
+ac_env_host_alias_set=${host_alias+set}
+ac_env_host_alias_value=$host_alias
+ac_cv_env_host_alias_set=${host_alias+set}
+ac_cv_env_host_alias_value=$host_alias
+ac_env_target_alias_set=${target_alias+set}
+ac_env_target_alias_value=$target_alias
+ac_cv_env_target_alias_set=${target_alias+set}
+ac_cv_env_target_alias_value=$target_alias
+ac_env_CC_set=${CC+set}
+ac_env_CC_value=$CC
+ac_cv_env_CC_set=${CC+set}
+ac_cv_env_CC_value=$CC
+ac_env_CFLAGS_set=${CFLAGS+set}
+ac_env_CFLAGS_value=$CFLAGS
+ac_cv_env_CFLAGS_set=${CFLAGS+set}
+ac_cv_env_CFLAGS_value=$CFLAGS
+ac_env_LDFLAGS_set=${LDFLAGS+set}
+ac_env_LDFLAGS_value=$LDFLAGS
+ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+ac_cv_env_LDFLAGS_value=$LDFLAGS
+ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_env_CPPFLAGS_value=$CPPFLAGS
+ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+ac_env_CPP_set=${CPP+set}
+ac_env_CPP_value=$CPP
+ac_cv_env_CPP_set=${CPP+set}
+ac_cv_env_CPP_value=$CPP
 
 #
 # Report the --help message.
@@ -1342,17 +791,20 @@ Configuration:
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking ...' messages
+  -q, --quiet, --silent   do not print \`checking...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
 
+_ACEOF
+
+  cat <<_ACEOF
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
+			  [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
+			  [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1362,25 +814,18 @@ for instance \`--prefix=\$HOME'.
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR            user executables [EPREFIX/bin]
-  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR        program executables [EPREFIX/libexec]
-  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --libdir=DIR            object code libraries [EPREFIX/lib]
-  --includedir=DIR        C header files [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR           info documentation [DATAROOTDIR/info]
-  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/tk]
-  --htmldir=DIR           html documentation [DOCDIR]
-  --dvidir=DIR            dvi documentation [DOCDIR]
-  --pdfdir=DIR            pdf documentation [DOCDIR]
-  --psdir=DIR             ps documentation [DOCDIR]
+  --bindir=DIR           user executables [EPREFIX/bin]
+  --sbindir=DIR          system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR       program executables [EPREFIX/libexec]
+  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+  --libdir=DIR           object code libraries [EPREFIX/lib]
+  --includedir=DIR       C header files [PREFIX/include]
+  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+  --infodir=DIR          info documentation [PREFIX/info]
+  --mandir=DIR           man documentation [PREFIX/man]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1398,7 +843,6 @@ if test -n "$ac_init_help"; then
   cat <<\_ACEOF
 
 Optional Features:
-  --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-man-symlinks   use symlinks for the manpages (default: off)
@@ -1435,537 +879,160 @@ Some influential environment variables:
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
+  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
+              headers in a nonstandard directory <include dir>
   CPP         C preprocessor
-  XMKMF       Path to xmkmf, Makefile generator for X Window System
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to the package provider.
 _ACEOF
-ac_status=$?
 fi
 
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
+  ac_popdir=`pwd`
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" ||
-      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-      continue
+    test -d $ac_dir || continue
     ac_builddir=.
 
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
+if test "$ac_dir" != .; then
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+  ac_dir_suffix= ac_top_builddir=
+fi
 
 case $srcdir in
-  .)  # We are building in place.
+  .)  # No --srcdir option.  We are building in place.
     ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.
     ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+    ac_top_srcdir=$srcdir ;;
+  *) # Relative path.
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+  case "$ac_dir" in
+  .) ac_abs_builddir=`pwd`;;
+  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+  case ${ac_top_builddir}. in
+  .) ac_abs_top_builddir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+  case $ac_srcdir in
+  .) ac_abs_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+  case $ac_top_srcdir in
+  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+  esac;;
 esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
+
+    cd $ac_dir
+    # Check for guested configure; otherwise get Cygnus style configure.
+    if test -f $ac_srcdir/configure.gnu; then
+      echo
+      $SHELL $ac_srcdir/configure.gnu  --help=recursive
+    elif test -f $ac_srcdir/configure; then
+      echo
+      $SHELL $ac_srcdir/configure  --help=recursive
+    elif test -f $ac_srcdir/configure.ac ||
+	   test -f $ac_srcdir/configure.in; then
+      echo
+      $ac_configure --help
     else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
+      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi
+    cd $ac_popdir
   done
 fi
 
-test -n "$ac_init_help" && exit $ac_status
+test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
 tk configure 8.6
-generated by GNU Autoconf 2.69
+generated by GNU Autoconf 2.59
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2003 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
-  exit
+  exit 0
 fi
+exec 5>config.log
+cat >&5 <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by tk $as_me 8.6, which was
+generated by GNU Autoconf 2.59.  Invocation command line was
 
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
+  $ $0 $@
 
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
+_ACEOF
 {
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
 
-	ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
 
-} # ac_fn_c_try_compile
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
 
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
 
-    ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
+_ASUNAME
 
-} # ac_fn_c_try_cpp
-
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_mongrel
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_compile
-
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
-
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_func
-
-# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
-# -------------------------------------------
-# Tests whether TYPE exists after having included INCLUDES, setting cache
-# variable VAR accordingly.
-ac_fn_c_check_type ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=no"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-if (sizeof ($2))
-	 return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-if (sizeof (($2)))
-	    return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  eval "$3=yes"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_type
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by tk $as_me 8.6, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
-  done
-IFS=$as_save_IFS
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  echo "PATH: $as_dir"
+done
 
 } >&5
 
@@ -1987,6 +1054,7 @@ _ACEOF
 ac_configure_args=
 ac_configure_args0=
 ac_configure_args1=
+ac_sep=
 ac_must_keep_next=false
 for ac_pass in 1 2
 do
@@ -1997,13 +1065,13 @@ do
     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
-    *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
-    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
     2)
-      as_fn_append ac_configure_args1 " '$ac_arg'"
+      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
       if test $ac_must_keep_next = true; then
 	ac_must_keep_next=false # Got value, back to normal.
       else
@@ -2019,115 +1087,104 @@ do
 	  -* ) ac_must_keep_next=true ;;
 	esac
       fi
-      as_fn_append ac_configure_args " '$ac_arg'"
+      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+      # Get rid of the leading space.
+      ac_sep=" "
       ;;
     esac
   done
 done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
 
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
 # would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+# WARNING: Be sure not to use single quotes in there, as some shells,
+# such as our DU 5.0 friend, will then `close' the trap.
 trap 'exit_status=$?
   # Save into config.log some information that might help in debugging.
   {
     echo
 
-    $as_echo "## ---------------- ##
+    cat <<\_ASBOX
+## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##"
+## ---------------- ##
+_ASBOX
     echo
     # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
+{
   (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
+    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
       sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
+	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+      ;;
     *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      sed -n \
+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
       ;;
-    esac |
-    sort
-)
+    esac;
+}
     echo
 
-    $as_echo "## ----------------- ##
+    cat <<\_ASBOX
+## ----------------- ##
 ## Output variables. ##
-## ----------------- ##"
+## ----------------- ##
+_ASBOX
     echo
     for ac_var in $ac_subst_vars
     do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      $as_echo "$ac_var='\''$ac_val'\''"
+      eval ac_val=$`echo $ac_var`
+      echo "$ac_var='"'"'$ac_val'"'"'"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
-## File substitutions. ##
-## ------------------- ##"
+      cat <<\_ASBOX
+## ------------- ##
+## Output files. ##
+## ------------- ##
+_ASBOX
       echo
       for ac_var in $ac_subst_files
       do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
+	eval ac_val=$`echo $ac_var`
+	echo "$ac_var='"'"'$ac_val'"'"'"
       done | sort
       echo
     fi
 
     if test -s confdefs.h; then
-      $as_echo "## ----------- ##
+      cat <<\_ASBOX
+## ----------- ##
 ## confdefs.h. ##
-## ----------- ##"
+## ----------- ##
+_ASBOX
       echo
-      cat confdefs.h
+      sed "/^$/d" confdefs.h | sort
       echo
     fi
     test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
+      echo "$as_me: caught signal $ac_signal"
+    echo "$as_me: exit $exit_status"
   } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+  rm -f core *.core &&
+  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
-' 0
+     ' 0
 for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-$as_echo "/* confdefs.h */" > confdefs.h
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo >confdefs.h
 
 # Predefined preprocessor variables.
 
@@ -2135,137 +1192,112 @@ cat >>confdefs.h <<_ACEOF
 #define PACKAGE_NAME "$PACKAGE_NAME"
 _ACEOF
 
+
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
 _ACEOF
 
+
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION "$PACKAGE_VERSION"
 _ACEOF
 
+
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_STRING "$PACKAGE_STRING"
 _ACEOF
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
 
 cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
 _ACEOF
 
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
-elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
-else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
+# Prefer explicitly selected file to automatically selected ones.
+if test -z "$CONFIG_SITE"; then
+  if test "x$prefix" != xNONE; then
+    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+  else
+    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+  fi
 fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-do
-  test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+for ac_site_file in $CONFIG_SITE; do
+  if test -r "$ac_site_file"; then
+    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
+    . "$ac_site_file"
   fi
 done
 
 if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special files
-  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
+  # Some versions of bash will fail to source /dev/null (special
+  # files actually), so we avoid doing that.
+  if test -f "$cache_file"; then
+    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
+echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
+      [\\/]* | ?:[\\/]* ) . $cache_file;;
+      *)                      . ./$cache_file;;
     esac
   fi
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
+  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
+echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
+for ac_var in `(set) 2>&1 |
+	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
   eval ac_old_set=\$ac_cv_env_${ac_var}_set
   eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
+  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+  eval ac_new_val="\$ac_env_${ac_var}_value"
   case $ac_old_set,$ac_new_set in
     set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
+echo "$as_me:   former value:  $ac_old_val" >&2;}
+	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
+echo "$as_me:   current value: $ac_new_val" >&2;}
+	ac_cache_corrupted=:
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
     esac
   fi
 done
 if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+   { (exit 1); exit 1; }; }
 fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -2278,6 +1310,31 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 TK_VERSION=8.6
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=6
@@ -2300,15 +1357,15 @@ LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv"
 	# we reset no_tcl in case something fails here
 	no_tcl=true
 
-# Check whether --with-tcl was given.
-if test "${with_tcl+set}" = set; then :
-  withval=$with_tcl; with_tclconfig="${withval}"
-fi
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl configuration" >&5
-$as_echo_n "checking for Tcl configuration... " >&6; }
-	if ${ac_cv_c_tclconfig+:} false; then :
-  $as_echo_n "(cached) " >&6
+# Check whether --with-tcl or --without-tcl was given.
+if test "${with_tcl+set}" = set; then
+  withval="$with_tcl"
+  with_tclconfig="${withval}"
+fi;
+	echo "$as_me:$LINENO: checking for Tcl configuration" >&5
+echo $ECHO_N "checking for Tcl configuration... $ECHO_C" >&6
+	if test "${ac_cv_c_tclconfig+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 
@@ -2317,15 +1374,17 @@ else
 		case "${with_tclconfig}" in
 		    */tclConfig.sh )
 			if test -f "${with_tclconfig}"; then
-			    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tcl argument should refer to directory containing tclConfig.sh, not to tclConfig.sh itself" >&5
-$as_echo "$as_me: WARNING: --with-tcl argument should refer to directory containing tclConfig.sh, not to tclConfig.sh itself" >&2;}
+			    { echo "$as_me:$LINENO: WARNING: --with-tcl argument should refer to directory containing tclConfig.sh, not to tclConfig.sh itself" >&5
+echo "$as_me: WARNING: --with-tcl argument should refer to directory containing tclConfig.sh, not to tclConfig.sh itself" >&2;}
 			    with_tclconfig="`echo "${with_tclconfig}" | sed 's!/tclConfig\.sh$!!'`"
 			fi ;;
 		esac
 		if test -f "${with_tclconfig}/tclConfig.sh" ; then
 		    ac_cv_c_tclconfig="`(cd "${with_tclconfig}"; pwd)`"
 		else
-		    as_fn_error $? "${with_tclconfig} directory doesn't contain tclConfig.sh" "$LINENO" 5
+		    { { echo "$as_me:$LINENO: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" >&5
+echo "$as_me: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" >&2;}
+   { (exit 1); exit 1; }; }
 		fi
 	    fi
 
@@ -2404,26 +1463,28 @@ fi
 
 	if test x"${ac_cv_c_tclconfig}" = x ; then
 	    TCL_BIN_DIR="# no Tcl configs found"
-	    as_fn_error $? "Can't find Tcl configuration definitions. Use --with-tcl to specify a directory containing tclConfig.sh" "$LINENO" 5
+	    { { echo "$as_me:$LINENO: error: Can't find Tcl configuration definitions. Use --with-tcl to specify a directory containing tclConfig.sh" >&5
+echo "$as_me: error: Can't find Tcl configuration definitions. Use --with-tcl to specify a directory containing tclConfig.sh" >&2;}
+   { (exit 1); exit 1; }; }
 	else
 	    no_tcl=
 	    TCL_BIN_DIR="${ac_cv_c_tclconfig}"
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found ${TCL_BIN_DIR}/tclConfig.sh" >&5
-$as_echo "found ${TCL_BIN_DIR}/tclConfig.sh" >&6; }
+	    echo "$as_me:$LINENO: result: found ${TCL_BIN_DIR}/tclConfig.sh" >&5
+echo "${ECHO_T}found ${TCL_BIN_DIR}/tclConfig.sh" >&6
 	fi
     fi
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${TCL_BIN_DIR}/tclConfig.sh" >&5
-$as_echo_n "checking for existence of ${TCL_BIN_DIR}/tclConfig.sh... " >&6; }
+    echo "$as_me:$LINENO: checking for existence of ${TCL_BIN_DIR}/tclConfig.sh" >&5
+echo $ECHO_N "checking for existence of ${TCL_BIN_DIR}/tclConfig.sh... $ECHO_C" >&6
 
     if test -f "${TCL_BIN_DIR}/tclConfig.sh" ; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5
-$as_echo "loading" >&6; }
+        echo "$as_me:$LINENO: result: loading" >&5
+echo "${ECHO_T}loading" >&6
 	. "${TCL_BIN_DIR}/tclConfig.sh"
     else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: could not find ${TCL_BIN_DIR}/tclConfig.sh" >&5
-$as_echo "could not find ${TCL_BIN_DIR}/tclConfig.sh" >&6; }
+        echo "$as_me:$LINENO: result: could not find ${TCL_BIN_DIR}/tclConfig.sh" >&5
+echo "${ECHO_T}could not find ${TCL_BIN_DIR}/tclConfig.sh" >&6
     fi
 
     # If the TCL_BIN_DIR is the build directory (not the install directory),
@@ -2474,19 +1535,25 @@ $as_echo "could not find ${TCL_BIN_DIR}/tclConfig.sh" >&6; }
 
 
 if test "${TCL_MAJOR_VERSION}" -ne 8 ; then
-    as_fn_error $? "${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6+
-Found config for Tcl ${TCL_VERSION}" "$LINENO" 5
+    { { echo "$as_me:$LINENO: error: ${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6+
+Found config for Tcl ${TCL_VERSION}" >&5
+echo "$as_me: error: ${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6+
+Found config for Tcl ${TCL_VERSION}" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 if test "${TCL_MINOR_VERSION}" -lt 6 ; then
-    as_fn_error $? "${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6+
-Found config for Tcl ${TCL_VERSION}" "$LINENO" 5
+    { { echo "$as_me:$LINENO: error: ${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6+
+Found config for Tcl ${TCL_VERSION}" >&5
+echo "$as_me: error: ${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6+
+Found config for Tcl ${TCL_VERSION}" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclsh" >&5
-$as_echo_n "checking for tclsh... " >&6; }
-    if ${ac_cv_path_tclsh+:} false; then :
-  $as_echo_n "(cached) " >&6
+    echo "$as_me:$LINENO: checking for tclsh" >&5
+echo $ECHO_N "checking for tclsh... $ECHO_C" >&6
+    if test "${ac_cv_path_tclsh+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	search_path=`echo ${PATH} | sed -e 's/:/ /g'`
@@ -2507,22 +1574,22 @@ fi
 
     if test -f "$ac_cv_path_tclsh" ; then
 	TCLSH_PROG="$ac_cv_path_tclsh"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCLSH_PROG" >&5
-$as_echo "$TCLSH_PROG" >&6; }
+	echo "$as_me:$LINENO: result: $TCLSH_PROG" >&5
+echo "${ECHO_T}$TCLSH_PROG" >&6
     else
 	# It is not an error if an installed version of Tcl can't be located.
 	TCLSH_PROG=""
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: No tclsh found on PATH" >&5
-$as_echo "No tclsh found on PATH" >&6; }
+	echo "$as_me:$LINENO: result: No tclsh found on PATH" >&5
+echo "${ECHO_T}No tclsh found on PATH" >&6
     fi
 
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclsh in Tcl build directory" >&5
-$as_echo_n "checking for tclsh in Tcl build directory... " >&6; }
+    echo "$as_me:$LINENO: checking for tclsh in Tcl build directory" >&5
+echo $ECHO_N "checking for tclsh in Tcl build directory... $ECHO_C" >&6
     BUILD_TCLSH="${TCL_BIN_DIR}"/tclsh
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_TCLSH" >&5
-$as_echo "$BUILD_TCLSH" >&6; }
+    echo "$as_me:$LINENO: result: $BUILD_TCLSH" >&5
+echo "${ECHO_T}$BUILD_TCLSH" >&6
 
 
 
@@ -2545,60 +1612,62 @@ TK_SRC_DIR="`cd "$srcdir"/..; pwd`"
 #------------------------------------------------------------------------
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use symlinks for manpages" >&5
-$as_echo_n "checking whether to use symlinks for manpages... " >&6; }
-    # Check whether --enable-man-symlinks was given.
-if test "${enable_man_symlinks+set}" = set; then :
-  enableval=$enable_man_symlinks; test "$enableval" != "no" && MAN_FLAGS="$MAN_FLAGS --symlinks"
+    echo "$as_me:$LINENO: checking whether to use symlinks for manpages" >&5
+echo $ECHO_N "checking whether to use symlinks for manpages... $ECHO_C" >&6
+    # Check whether --enable-man-symlinks or --disable-man-symlinks was given.
+if test "${enable_man_symlinks+set}" = set; then
+  enableval="$enable_man_symlinks"
+  test "$enableval" != "no" && MAN_FLAGS="$MAN_FLAGS --symlinks"
 else
   enableval="no"
-fi
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
-$as_echo "$enableval" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to compress the manpages" >&5
-$as_echo_n "checking whether to compress the manpages... " >&6; }
-    # Check whether --enable-man-compression was given.
-if test "${enable_man_compression+set}" = set; then :
-  enableval=$enable_man_compression; case $enableval in
-	    yes) as_fn_error $? "missing argument to --enable-man-compression" "$LINENO" 5;;
+fi;
+    echo "$as_me:$LINENO: result: $enableval" >&5
+echo "${ECHO_T}$enableval" >&6
+
+    echo "$as_me:$LINENO: checking whether to compress the manpages" >&5
+echo $ECHO_N "checking whether to compress the manpages... $ECHO_C" >&6
+    # Check whether --enable-man-compression or --disable-man-compression was given.
+if test "${enable_man_compression+set}" = set; then
+  enableval="$enable_man_compression"
+  case $enableval in
+	    yes) { { echo "$as_me:$LINENO: error: missing argument to --enable-man-compression" >&5
+echo "$as_me: error: missing argument to --enable-man-compression" >&2;}
+   { (exit 1); exit 1; }; };;
 	    no)  ;;
 	    *)   MAN_FLAGS="$MAN_FLAGS --compress $enableval";;
 	esac
 else
   enableval="no"
-fi
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
-$as_echo "$enableval" >&6; }
+fi;
+    echo "$as_me:$LINENO: result: $enableval" >&5
+echo "${ECHO_T}$enableval" >&6
     if test "$enableval" != "no"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compressed file suffix" >&5
-$as_echo_n "checking for compressed file suffix... " >&6; }
+	echo "$as_me:$LINENO: checking for compressed file suffix" >&5
+echo $ECHO_N "checking for compressed file suffix... $ECHO_C" >&6
 	touch TeST
 	$enableval TeST
 	Z=`ls TeST* | sed 's/^....//'`
 	rm -f TeST*
 	MAN_FLAGS="$MAN_FLAGS --extension $Z"
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $Z" >&5
-$as_echo "$Z" >&6; }
+	echo "$as_me:$LINENO: result: $Z" >&5
+echo "${ECHO_T}$Z" >&6
     fi
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to add a package name suffix for the manpages" >&5
-$as_echo_n "checking whether to add a package name suffix for the manpages... " >&6; }
-    # Check whether --enable-man-suffix was given.
-if test "${enable_man_suffix+set}" = set; then :
-  enableval=$enable_man_suffix; case $enableval in
+    echo "$as_me:$LINENO: checking whether to add a package name suffix for the manpages" >&5
+echo $ECHO_N "checking whether to add a package name suffix for the manpages... $ECHO_C" >&6
+    # Check whether --enable-man-suffix or --disable-man-suffix was given.
+if test "${enable_man_suffix+set}" = set; then
+  enableval="$enable_man_suffix"
+  case $enableval in
 	    yes) enableval="tk" MAN_FLAGS="$MAN_FLAGS --suffix $enableval";;
 	    no)  ;;
 	    *)   MAN_FLAGS="$MAN_FLAGS --suffix $enableval";;
 	esac
 else
   enableval="no"
-fi
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
-$as_echo "$enableval" >&6; }
+fi;
+    echo "$as_me:$LINENO: result: $enableval" >&5
+echo "${ECHO_T}$enableval" >&6
 
 
 
@@ -2621,10 +1690,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2634,37 +1703,35 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
 fi
 if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2674,50 +1741,39 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
+  CC=$ac_ct_CC
 else
   CC="$ac_cv_prog_CC"
 fi
 
 if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2727,37 +1783,77 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="cc"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
   fi
+done
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  CC=$ac_ct_CC
+else
+  CC="$ac_cv_prog_CC"
+fi
+
 fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2768,19 +1864,18 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
 if test $ac_prog_rejected = yes; then
   # We found a bogon in the path, so make sure we never use it.
@@ -2798,25 +1893,24 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
 fi
 if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
+  for ac_prog in cl
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2826,41 +1920,39 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
     test -n "$CC" && break
   done
 fi
 if test -z "$CC"; then
   ac_ct_CC=$CC
-  for ac_prog in cl.exe
+  for ac_prog in cl
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2870,78 +1962,66 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
   test -n "$ac_ct_CC" && break
 done
 
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
+  CC=$ac_ct_CC
 fi
 
 fi
 
 
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&5
+echo "$as_me: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+echo "$as_me:$LINENO:" \
+     "checking for C compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+  (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }
 
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -2953,108 +2033,112 @@ main ()
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { { ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
+echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
+  (eval $ac_link_default) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # Find the output, starting from the most likely.  This scheme is
+# not robust to junk in `.', hence go to wildcards (a.*) only as a last
+# resort.
+
+# Be careful to initialize this variable, since it used to be cached.
+# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
+ac_cv_exeext=
+# b.out is created by i960 compilers.
+for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
+	;;
+    conftest.$ac_ext )
+	# This is the source file.
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
 	# certainly right.
 	break;;
     *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
+	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	# FIXME: I believe we export ac_cv_exeext for Libtool,
+	# but it would be cool to find out if it's true.  Does anybody
+	# maintain Libtool? --akim.
+	export ac_cv_exeext
 	break;;
     * )
 	break;;
   esac
 done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
 else
-  ac_file=''
-fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+See \`config.log' for more details." >&5
+echo "$as_me: error: C compiler cannot create executables
+See \`config.log' for more details." >&2;}
+   { (exit 77); exit 77; }; }
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
+
 ac_exeext=$ac_cv_exeext
+echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6
+
+# Check the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+# If not cross compiling, check that we can run a simple program.
+if test "$cross_compiling" != yes; then
+  if { ac_try='./$ac_file'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+  fi
+fi
+echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+rm -f a.out a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
+# Check the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+echo "$as_me:$LINENO: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6
+
+echo "$as_me:$LINENO: checking for suffix of executables" >&5
+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -3062,90 +2146,38 @@ $as_echo "$ac_try_echo"; } >&5
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	  export ac_cv_exeext
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
+  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
 fi
-rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
+
+rm -f conftest$ac_cv_exeext
+echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+echo "${ECHO_T}$ac_cv_exeext" >&6
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-if test "$cross_compiling" != yes; then
-  { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-  if { ac_try='./conftest$ac_cv_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for suffix of object files" >&5
+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
+if test "${ac_cv_objext+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -3157,46 +2189,45 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  $as_echo "$as_me: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
 fi
+
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+if test "${ac_cv_c_compiler_gnu+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -3210,65 +2241,55 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else
-  ac_compiler_gnu=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
+echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
+CFLAGS="-g"
+echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+if test "${ac_cv_prog_cc_g+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -3279,18 +2300,39 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_prog_cc_g=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -3306,18 +2348,23 @@ else
     CFLAGS=
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
+echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+if test "${ac_cv_prog_cc_stdc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_prog_cc_c89=no
+  ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-struct stat;
+#include <sys/types.h>
+#include <sys/stat.h>
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -3340,17 +2387,12 @@ static char *f (char * (*g) (char **, int), char **p, ...)
 /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
    function prototypes and stuff, but not '\xHH' hex character constants.
    These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
+   as 'x'.  The following induces an error, until -std1 is added to get
    proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
    array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
+   that's true only with -std1.  */
 int osf4_cc_array ['\x00' == 0 ? 1 : -1];
 
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
 int test (int i, double x);
 struct s1 {int (*f) (int a);};
 struct s2 {int (*f) (double a);};
@@ -3365,37 +2407,205 @@ return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
   return 0;
 }
 _ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+# Don't try gcc -ansi; that turns off useful extensions and
+# breaks some systems' header files.
+# AIX			-qlanglvl=ansi
+# Ultrix and OSF/1	-std1
+# HP-UX 10.20 and later	-Ae
+# HP-UX older versions	-Aa -D_HPUX_SOURCE
+# SVR4			-Xc -D__EXTENSIONS__
+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
+  rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_prog_cc_stdc=$ac_arg
+break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
 fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
+rm -f conftest.err conftest.$ac_objext
 done
-rm -f conftest.$ac_ext
+rm -f conftest.$ac_ext conftest.$ac_objext
 CC=$ac_save_CC
 
 fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
+
+case "x$ac_cv_prog_cc_stdc" in
+  x|xno)
+    echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6 ;;
   *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+    CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
 
+# Some people use a C++ compiler to compile C.  Since we use `exit',
+# in C++ we need to declare it.  In case someone uses the same compiler
+# for both compiling C and C++ we need to have the C++ compiler decide
+# the declaration of exit, since it's the most demanding environment.
+cat >conftest.$ac_ext <<_ACEOF
+#ifndef __cplusplus
+  choke me
+#endif
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  for ac_declaration in \
+   '' \
+   'extern "C" void std::exit (int) throw (); using std::exit;' \
+   'extern "C" void std::exit (int); using std::exit;' \
+   'extern "C" void exit (int) throw ();' \
+   'extern "C" void exit (int);' \
+   'void exit (int);'
+do
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_declaration
+#include <stdlib.h>
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+continue
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+rm -f conftest*
+if test -n "$ac_declaration"; then
+  echo '#ifdef __cplusplus' >>confdefs.h
+  echo $ac_declaration      >>confdefs.h
+  echo '#endif'             >>confdefs.h
 fi
 
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3403,14 +2613,18 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
-$as_echo_n "checking for inline... " >&6; }
-if ${ac_cv_c_inline+:} false; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for inline" >&5
+echo $ECHO_N "checking for inline... $ECHO_C" >&6
+if test "${ac_cv_c_inline+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #ifndef __cplusplus
 typedef int foo_t;
@@ -3419,16 +2633,41 @@ $ac_kw foo_t foo () {return 0; }
 #endif
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_inline=$ac_kw
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_c_inline=$ac_kw; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  test "$ac_cv_c_inline" != no && break
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
-$as_echo "$ac_cv_c_inline" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+echo "${ECHO_T}$ac_cv_c_inline" >&6
+
 
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -3456,15 +2695,15 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
+echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
-  $as_echo_n "(cached) " >&6
+  if test "${ac_cv_prog_CPP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -3478,7 +2717,11 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -3487,34 +2730,78 @@ do
 #endif
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
 else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether nonexistent headers
+  # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
   # Broken: success on invalid input.
 continue
 else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
   break
 fi
 
@@ -3526,8 +2813,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
+echo "$as_me:$LINENO: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -3537,7 +2824,11 @@ do
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -3546,40 +2837,85 @@ do
 #endif
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
 else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether nonexistent headers
+  # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
   # Broken: success on invalid input.
 continue
 else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  :
 else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&5
+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 
 ac_ext=c
@@ -3589,142 +2925,31 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+if test "${ac_cv_prog_egrep+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_GREP" || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
+  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+    then ac_cv_prog_egrep='grep -E'
+    else ac_cv_prog_egrep='egrep'
     fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_GREP=$GREP
-fi
-
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
+echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+ EGREP=$ac_cv_prog_egrep
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+if test "${ac_cv_header_stdc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_EGREP" || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3739,23 +2964,51 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_header_stdc=yes
 else
-  ac_cv_header_stdc=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_header_stdc=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
+  $EGREP "memchr" >/dev/null 2>&1; then
+  :
 else
   ac_cv_header_stdc=no
 fi
@@ -3765,14 +3018,18 @@ fi
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
+  $EGREP "free" >/dev/null 2>&1; then
+  :
 else
   ac_cv_header_stdc=no
 fi
@@ -3782,13 +3039,16 @@ fi
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
+  if test "$cross_compiling" = yes; then
   :
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <ctype.h>
-#include <stdlib.h>
 #if ((' ' & 0x0FF) == 0x020)
 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
@@ -3808,39 +3068,109 @@ main ()
   for (i = 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
 	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
+      exit(2);
+  exit (0);
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
 else
-  ac_cv_header_stdc=no
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_header_stdc=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
 
 fi
 
 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
+
+
+
+
+
+
+
+
+
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_Header=no"
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -3848,48 +3178,196 @@ fi
 done
 
 
-ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdlib_h" = xyes; then :
+if test "${ac_cv_header_stdlib_h+set}" = set; then
+  echo "$as_me:$LINENO: checking for stdlib.h" >&5
+echo $ECHO_N "checking for stdlib.h... $ECHO_C" >&6
+if test "${ac_cv_header_stdlib_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_stdlib_h" >&5
+echo "${ECHO_T}$ac_cv_header_stdlib_h" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking stdlib.h usability" >&5
+echo $ECHO_N "checking stdlib.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <stdlib.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking stdlib.h presence" >&5
+echo $ECHO_N "checking stdlib.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: stdlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: stdlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: stdlib.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: stdlib.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: stdlib.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: stdlib.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: stdlib.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: stdlib.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: stdlib.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: stdlib.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: stdlib.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: stdlib.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: stdlib.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: stdlib.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: stdlib.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: stdlib.h: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ----------------------------- ##
+## Report this to the tk lists.  ##
+## ----------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for stdlib.h" >&5
+echo $ECHO_N "checking for stdlib.h... $ECHO_C" >&6
+if test "${ac_cv_header_stdlib_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_stdlib_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_stdlib_h" >&5
+echo "${ECHO_T}$ac_cv_header_stdlib_h" >&6
+
+fi
+if test $ac_cv_header_stdlib_h = yes; then
   tk_ok=1
 else
   tk_ok=0
 fi
 
 
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "strtol" >/dev/null 2>&1; then :
-
+  $EGREP "strtol" >/dev/null 2>&1; then
+  :
 else
   tk_ok=0
 fi
 rm -f conftest*
 
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "strtoul" >/dev/null 2>&1; then :
-
+  $EGREP "strtoul" >/dev/null 2>&1; then
+  :
 else
   tk_ok=0
 fi
 rm -f conftest*
 
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "strtod" >/dev/null 2>&1; then :
-
+  $EGREP "strtod" >/dev/null 2>&1; then
+  :
 else
   tk_ok=0
 fi
@@ -3897,7 +3375,9 @@ rm -f conftest*
 
 if test $tk_ok = 0; then
 
-$as_echo "#define NO_STDLIB_H 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define NO_STDLIB_H 1
+_ACEOF
 
 fi
 
@@ -3907,14 +3387,18 @@ fi
 #------------------------------------------------------------------------
 
 if test -z "$no_pipe" && test -n "$GCC"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the compiler understands -pipe" >&5
-$as_echo_n "checking if the compiler understands -pipe... " >&6; }
-if ${tcl_cv_cc_pipe+:} false; then :
-  $as_echo_n "(cached) " >&6
+    echo "$as_me:$LINENO: checking if the compiler understands -pipe" >&5
+echo $ECHO_N "checking if the compiler understands -pipe... $ECHO_C" >&6
+if test "${tcl_cv_cc_pipe+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -pipe"
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -3925,16 +3409,40 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   tcl_cv_cc_pipe=yes
 else
-  tcl_cv_cc_pipe=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+tcl_cv_cc_pipe=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 	CFLAGS=$hold_cflags
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cc_pipe" >&5
-$as_echo "$tcl_cv_cc_pipe" >&6; }
+echo "$as_me:$LINENO: result: $tcl_cv_cc_pipe" >&5
+echo "${ECHO_T}$tcl_cv_cc_pipe" >&6
     if test $tcl_cv_cc_pipe = yes; then
 	CFLAGS="$CFLAGS -pipe"
     fi
@@ -3945,13 +3453,13 @@ fi
 #------------------------------------------------------------------------
 
 
-    # Check whether --enable-threads was given.
-if test "${enable_threads+set}" = set; then :
-  enableval=$enable_threads; tcl_ok=$enableval
+    # Check whether --enable-threads or --disable-threads was given.
+if test "${enable_threads+set}" = set; then
+  enableval="$enable_threads"
+  tcl_ok=$enableval
 else
   tcl_ok=yes
-fi
-
+fi;
 
     if test "${TCL_THREADS}" = 1; then
 	tcl_threaded_core=1;
@@ -3962,56 +3470,92 @@ fi
 	# USE_THREAD_ALLOC tells us to try the special thread-based
 	# allocator that significantly reduces lock contention
 
-$as_echo "#define USE_THREAD_ALLOC 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define USE_THREAD_ALLOC 1
+_ACEOF
 
 
-$as_echo "#define _REENTRANT 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define _REENTRANT 1
+_ACEOF
 
 	if test "`uname -s`" = "SunOS" ; then
 
-$as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define _POSIX_PTHREAD_SEMANTICS 1
+_ACEOF
 
 	fi
 
-$as_echo "#define _THREAD_SAFE 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define _THREAD_SAFE 1
+_ACEOF
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_init in -lpthread" >&5
-$as_echo_n "checking for pthread_mutex_init in -lpthread... " >&6; }
-if ${ac_cv_lib_pthread_pthread_mutex_init+:} false; then :
-  $as_echo_n "(cached) " >&6
+	echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthread" >&5
+echo $ECHO_N "checking for pthread_mutex_init in -lpthread... $ECHO_C" >&6
+if test "${ac_cv_lib_pthread_pthread_mutex_init+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthread  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char pthread_mutex_init ();
 int
 main ()
 {
-return pthread_mutex_init ();
+pthread_mutex_init ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_pthread_pthread_mutex_init=yes
 else
-  ac_cv_lib_pthread_pthread_mutex_init=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_pthread_pthread_mutex_init=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_mutex_init" >&5
-$as_echo "$ac_cv_lib_pthread_pthread_mutex_init" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_mutex_init" = xyes; then :
+echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_mutex_init" >&5
+echo "${ECHO_T}$ac_cv_lib_pthread_pthread_mutex_init" >&6
+if test $ac_cv_lib_pthread_pthread_mutex_init = yes; then
   tcl_ok=yes
 else
   tcl_ok=no
@@ -4023,43 +3567,71 @@ fi
 	    # defined.  We could alternatively do an AC_TRY_COMPILE with
 	    # pthread.h, but that will work with libpthread really doesn't
 	    # exist, like AIX 4.2.  [Bug: 4359]
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __pthread_mutex_init in -lpthread" >&5
-$as_echo_n "checking for __pthread_mutex_init in -lpthread... " >&6; }
-if ${ac_cv_lib_pthread___pthread_mutex_init+:} false; then :
-  $as_echo_n "(cached) " >&6
+	    echo "$as_me:$LINENO: checking for __pthread_mutex_init in -lpthread" >&5
+echo $ECHO_N "checking for __pthread_mutex_init in -lpthread... $ECHO_C" >&6
+if test "${ac_cv_lib_pthread___pthread_mutex_init+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthread  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char __pthread_mutex_init ();
 int
 main ()
 {
-return __pthread_mutex_init ();
+__pthread_mutex_init ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_pthread___pthread_mutex_init=yes
 else
-  ac_cv_lib_pthread___pthread_mutex_init=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_pthread___pthread_mutex_init=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread___pthread_mutex_init" >&5
-$as_echo "$ac_cv_lib_pthread___pthread_mutex_init" >&6; }
-if test "x$ac_cv_lib_pthread___pthread_mutex_init" = xyes; then :
+echo "$as_me:$LINENO: result: $ac_cv_lib_pthread___pthread_mutex_init" >&5
+echo "${ECHO_T}$ac_cv_lib_pthread___pthread_mutex_init" >&6
+if test $ac_cv_lib_pthread___pthread_mutex_init = yes; then
   tcl_ok=yes
 else
   tcl_ok=no
@@ -4071,43 +3643,71 @@ fi
 	    # The space is needed
 	    THREADS_LIBS=" -lpthread"
 	else
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_init in -lpthreads" >&5
-$as_echo_n "checking for pthread_mutex_init in -lpthreads... " >&6; }
-if ${ac_cv_lib_pthreads_pthread_mutex_init+:} false; then :
-  $as_echo_n "(cached) " >&6
+	    echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthreads" >&5
+echo $ECHO_N "checking for pthread_mutex_init in -lpthreads... $ECHO_C" >&6
+if test "${ac_cv_lib_pthreads_pthread_mutex_init+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthreads  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char pthread_mutex_init ();
 int
 main ()
 {
-return pthread_mutex_init ();
+pthread_mutex_init ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_pthreads_pthread_mutex_init=yes
 else
-  ac_cv_lib_pthreads_pthread_mutex_init=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_pthreads_pthread_mutex_init=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthreads_pthread_mutex_init" >&5
-$as_echo "$ac_cv_lib_pthreads_pthread_mutex_init" >&6; }
-if test "x$ac_cv_lib_pthreads_pthread_mutex_init" = xyes; then :
+echo "$as_me:$LINENO: result: $ac_cv_lib_pthreads_pthread_mutex_init" >&5
+echo "${ECHO_T}$ac_cv_lib_pthreads_pthread_mutex_init" >&6
+if test $ac_cv_lib_pthreads_pthread_mutex_init = yes; then
   tcl_ok=yes
 else
   tcl_ok=no
@@ -4117,86 +3717,142 @@ fi
 		# The space is needed
 		THREADS_LIBS=" -lpthreads"
 	    else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_init in -lc" >&5
-$as_echo_n "checking for pthread_mutex_init in -lc... " >&6; }
-if ${ac_cv_lib_c_pthread_mutex_init+:} false; then :
-  $as_echo_n "(cached) " >&6
+		echo "$as_me:$LINENO: checking for pthread_mutex_init in -lc" >&5
+echo $ECHO_N "checking for pthread_mutex_init in -lc... $ECHO_C" >&6
+if test "${ac_cv_lib_c_pthread_mutex_init+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char pthread_mutex_init ();
 int
 main ()
 {
-return pthread_mutex_init ();
+pthread_mutex_init ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_c_pthread_mutex_init=yes
 else
-  ac_cv_lib_c_pthread_mutex_init=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_c_pthread_mutex_init=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_pthread_mutex_init" >&5
-$as_echo "$ac_cv_lib_c_pthread_mutex_init" >&6; }
-if test "x$ac_cv_lib_c_pthread_mutex_init" = xyes; then :
+echo "$as_me:$LINENO: result: $ac_cv_lib_c_pthread_mutex_init" >&5
+echo "${ECHO_T}$ac_cv_lib_c_pthread_mutex_init" >&6
+if test $ac_cv_lib_c_pthread_mutex_init = yes; then
   tcl_ok=yes
 else
   tcl_ok=no
 fi
 
 		if test "$tcl_ok" = "no"; then
-		    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_init in -lc_r" >&5
-$as_echo_n "checking for pthread_mutex_init in -lc_r... " >&6; }
-if ${ac_cv_lib_c_r_pthread_mutex_init+:} false; then :
-  $as_echo_n "(cached) " >&6
+		    echo "$as_me:$LINENO: checking for pthread_mutex_init in -lc_r" >&5
+echo $ECHO_N "checking for pthread_mutex_init in -lc_r... $ECHO_C" >&6
+if test "${ac_cv_lib_c_r_pthread_mutex_init+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc_r  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char pthread_mutex_init ();
 int
 main ()
 {
-return pthread_mutex_init ();
+pthread_mutex_init ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_c_r_pthread_mutex_init=yes
 else
-  ac_cv_lib_c_r_pthread_mutex_init=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_c_r_pthread_mutex_init=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_mutex_init" >&5
-$as_echo "$ac_cv_lib_c_r_pthread_mutex_init" >&6; }
-if test "x$ac_cv_lib_c_r_pthread_mutex_init" = xyes; then :
+echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_pthread_mutex_init" >&5
+echo "${ECHO_T}$ac_cv_lib_c_r_pthread_mutex_init" >&6
+if test $ac_cv_lib_c_r_pthread_mutex_init = yes; then
   tcl_ok=yes
 else
   tcl_ok=no
@@ -4207,8 +3863,8 @@ fi
 			THREADS_LIBS=" -pthread"
 		    else
 			TCL_THREADS=0
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Don't know how to find pthread lib on your system - you must disable thread support or edit the LIBS in the Makefile..." >&5
-$as_echo "$as_me: WARNING: Don't know how to find pthread lib on your system - you must disable thread support or edit the LIBS in the Makefile..." >&2;}
+			{ echo "$as_me:$LINENO: WARNING: Don't know how to find pthread lib on your system - you must disable thread support or edit the LIBS in the Makefile..." >&5
+echo "$as_me: WARNING: Don't know how to find pthread lib on your system - you must disable thread support or edit the LIBS in the Makefile..." >&2;}
 		    fi
 		fi
 	    fi
@@ -4219,13 +3875,104 @@ $as_echo "$as_me: WARNING: Don't know how to find pthread lib on your system - y
 
 	ac_saved_libs=$LIBS
 	LIBS="$LIBS $THREADS_LIBS"
-	for ac_func in pthread_attr_setstacksize pthread_atfork
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+
+
+for ac_func in pthread_attr_setstacksize pthread_atfork
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -4236,22 +3983,24 @@ done
 	TCL_THREADS=0
     fi
     # Do checking message here to not mess up interleaved configure output
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for building with threads" >&5
-$as_echo_n "checking for building with threads... " >&6; }
+    echo "$as_me:$LINENO: checking for building with threads" >&5
+echo $ECHO_N "checking for building with threads... $ECHO_C" >&6
     if test "${TCL_THREADS}" = 1; then
 
-$as_echo "#define TCL_THREADS 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define TCL_THREADS 1
+_ACEOF
 
 	if test "${tcl_threaded_core}" = 1; then
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (threaded core)" >&5
-$as_echo "yes (threaded core)" >&6; }
+	    echo "$as_me:$LINENO: result: yes (threaded core)" >&5
+echo "${ECHO_T}yes (threaded core)" >&6
 	else
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+	    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 	fi
     else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
     fi
 
 
@@ -4261,15 +4010,15 @@ $as_echo "no" >&6; }
 LIBS="$LIBS$THREADS_LIBS"
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to build libraries" >&5
-$as_echo_n "checking how to build libraries... " >&6; }
-    # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
-  enableval=$enable_shared; tcl_ok=$enableval
+    echo "$as_me:$LINENO: checking how to build libraries" >&5
+echo $ECHO_N "checking how to build libraries... $ECHO_C" >&6
+    # Check whether --enable-shared or --disable-shared was given.
+if test "${enable_shared+set}" = set; then
+  enableval="$enable_shared"
+  tcl_ok=$enableval
 else
   tcl_ok=yes
-fi
-
+fi;
 
     if test "${enable_shared+set}" = set; then
 	enableval="$enable_shared"
@@ -4279,15 +4028,17 @@ fi
     fi
 
     if test "$tcl_ok" = "yes" ; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: shared" >&5
-$as_echo "shared" >&6; }
+	echo "$as_me:$LINENO: result: shared" >&5
+echo "${ECHO_T}shared" >&6
 	SHARED_BUILD=1
     else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
-$as_echo "static" >&6; }
+	echo "$as_me:$LINENO: result: static" >&5
+echo "${ECHO_T}static" >&6
 	SHARED_BUILD=0
 
-$as_echo "#define STATIC_BUILD 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define STATIC_BUILD 1
+_ACEOF
 
     fi
 
@@ -4301,10 +4052,10 @@ $as_echo "#define STATIC_BUILD 1" >>confdefs.h
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_RANLIB+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -4314,37 +4065,35 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
 fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
+  echo "$as_me:$LINENO: result: $RANLIB" >&5
+echo "${ECHO_T}$RANLIB" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
 fi
 if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -4354,38 +4103,28 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
+  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
 fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
+  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
+  RANLIB=$ac_ct_RANLIB
 else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
@@ -4394,47 +4133,52 @@ fi
 
     # Step 0.a: Enable 64 bit support?
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if 64bit support is requested" >&5
-$as_echo_n "checking if 64bit support is requested... " >&6; }
-    # Check whether --enable-64bit was given.
-if test "${enable_64bit+set}" = set; then :
-  enableval=$enable_64bit; do64bit=$enableval
+    echo "$as_me:$LINENO: checking if 64bit support is requested" >&5
+echo $ECHO_N "checking if 64bit support is requested... $ECHO_C" >&6
+    # Check whether --enable-64bit or --disable-64bit was given.
+if test "${enable_64bit+set}" = set; then
+  enableval="$enable_64bit"
+  do64bit=$enableval
 else
   do64bit=no
-fi
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $do64bit" >&5
-$as_echo "$do64bit" >&6; }
+fi;
+    echo "$as_me:$LINENO: result: $do64bit" >&5
+echo "${ECHO_T}$do64bit" >&6
 
     # Step 0.b: Enable Solaris 64 bit VIS support?
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if 64bit Sparc VIS support is requested" >&5
-$as_echo_n "checking if 64bit Sparc VIS support is requested... " >&6; }
-    # Check whether --enable-64bit-vis was given.
-if test "${enable_64bit_vis+set}" = set; then :
-  enableval=$enable_64bit_vis; do64bitVIS=$enableval
+    echo "$as_me:$LINENO: checking if 64bit Sparc VIS support is requested" >&5
+echo $ECHO_N "checking if 64bit Sparc VIS support is requested... $ECHO_C" >&6
+    # Check whether --enable-64bit-vis or --disable-64bit-vis was given.
+if test "${enable_64bit_vis+set}" = set; then
+  enableval="$enable_64bit_vis"
+  do64bitVIS=$enableval
 else
   do64bitVIS=no
-fi
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $do64bitVIS" >&5
-$as_echo "$do64bitVIS" >&6; }
+fi;
+    echo "$as_me:$LINENO: result: $do64bitVIS" >&5
+echo "${ECHO_T}$do64bitVIS" >&6
     # Force 64bit on with VIS
-    if test "$do64bitVIS" = "yes"; then :
+    if test "$do64bitVIS" = "yes"; then
   do64bit=yes
 fi
 
+
     # Step 0.c: Check if visibility support is available. Do this here so
     # that platform specific alternatives can be used below if this fails.
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports visibility \"hidden\"" >&5
-$as_echo_n "checking if compiler supports visibility \"hidden\"... " >&6; }
-if ${tcl_cv_cc_visibility_hidden+:} false; then :
-  $as_echo_n "(cached) " >&6
+    echo "$as_me:$LINENO: checking if compiler supports visibility \"hidden\"" >&5
+echo $ECHO_N "checking if compiler supports visibility \"hidden\"... $ECHO_C" >&6
+if test "${tcl_cv_cc_visibility_hidden+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -Werror"
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 	    extern __attribute__((__visibility__("hidden"))) void f(void);
@@ -4447,50 +4191,79 @@ f();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   tcl_cv_cc_visibility_hidden=yes
 else
-  tcl_cv_cc_visibility_hidden=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+tcl_cv_cc_visibility_hidden=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 	CFLAGS=$hold_cflags
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cc_visibility_hidden" >&5
-$as_echo "$tcl_cv_cc_visibility_hidden" >&6; }
-    if test $tcl_cv_cc_visibility_hidden = yes; then :
+echo "$as_me:$LINENO: result: $tcl_cv_cc_visibility_hidden" >&5
+echo "${ECHO_T}$tcl_cv_cc_visibility_hidden" >&6
+    if test $tcl_cv_cc_visibility_hidden = yes; then
 
 
-$as_echo "#define MODULE_SCOPE extern __attribute__((__visibility__(\"hidden\")))" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define MODULE_SCOPE extern __attribute__((__visibility__("hidden")))
+_ACEOF
 
 
-$as_echo "#define HAVE_HIDDEN 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_HIDDEN 1
+_ACEOF
 
 
 fi
 
+
     # Step 0.d: Disable -rpath support?
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if rpath support is requested" >&5
-$as_echo_n "checking if rpath support is requested... " >&6; }
-    # Check whether --enable-rpath was given.
-if test "${enable_rpath+set}" = set; then :
-  enableval=$enable_rpath; doRpath=$enableval
+    echo "$as_me:$LINENO: checking if rpath support is requested" >&5
+echo $ECHO_N "checking if rpath support is requested... $ECHO_C" >&6
+    # Check whether --enable-rpath or --disable-rpath was given.
+if test "${enable_rpath+set}" = set; then
+  enableval="$enable_rpath"
+  doRpath=$enableval
 else
   doRpath=yes
-fi
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $doRpath" >&5
-$as_echo "$doRpath" >&6; }
+fi;
+    echo "$as_me:$LINENO: result: $doRpath" >&5
+echo "${ECHO_T}$doRpath" >&6
 
     # Step 1: set the variable "system" to hold the name and version number
     # for the system.
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking system version" >&5
-$as_echo_n "checking system version... " >&6; }
-if ${tcl_cv_sys_version+:} false; then :
-  $as_echo_n "(cached) " >&6
+    echo "$as_me:$LINENO: checking system version" >&5
+echo $ECHO_N "checking system version... $ECHO_C" >&6
+if test "${tcl_cv_sys_version+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	if test -f /usr/lib/NextStep/software_version; then
@@ -4498,8 +4271,8 @@ else
 	else
 	    tcl_cv_sys_version=`uname -s`-`uname -r`
 	    if test "$?" -ne 0 ; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: can't find uname command" >&5
-$as_echo "$as_me: WARNING: can't find uname command" >&2;}
+		{ echo "$as_me:$LINENO: WARNING: can't find uname command" >&5
+echo "$as_me: WARNING: can't find uname command" >&2;}
 		tcl_cv_sys_version=unknown
 	    else
 		# Special check for weird MP-RAS system (uname returns weird
@@ -4518,51 +4291,79 @@ $as_echo "$as_me: WARNING: can't find uname command" >&2;}
 	fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_sys_version" >&5
-$as_echo "$tcl_cv_sys_version" >&6; }
+echo "$as_me:$LINENO: result: $tcl_cv_sys_version" >&5
+echo "${ECHO_T}$tcl_cv_sys_version" >&6
     system=$tcl_cv_sys_version
 
 
     # Step 2: check for existence of -ldl library.  This is needed because
     # Linux can use either -ldl or -ldld for dynamic loading.
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
+    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char dlopen ();
 int
 main ()
 {
-return dlopen ();
+dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_dl_dlopen=yes
 else
-  ac_cv_lib_dl_dlopen=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dl_dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+if test $ac_cv_lib_dl_dlopen = yes; then
   have_dl=yes
 else
   have_dl=no
@@ -4588,7 +4389,7 @@ fi
     ECHO_VERSION='`echo ${VERSION}`'
     TCL_LIB_VERSIONS_OK=ok
     CFLAGS_DEBUG=-g
-    if test "$GCC" = yes; then :
+    if test "$GCC" = yes; then
 
 	CFLAGS_OPTIMIZE=-O2
 	CFLAGS_WARNING="-Wall -Wpointer-arith"
@@ -4599,13 +4400,14 @@ else
 	CFLAGS_WARNING=""
 
 fi
+
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_AR+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
@@ -4615,37 +4417,35 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="${ac_tool_prefix}ar"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
 fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
+  echo "$as_me:$LINENO: result: $AR" >&5
+echo "${ECHO_T}$AR" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-
 fi
 if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
@@ -4655,38 +4455,27 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="ar"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-  done
-IFS=$as_save_IFS
+done
 
 fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
+  echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-  if test "x$ac_ct_AR" = x; then
-    AR=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AR=$ac_ct_AR
-  fi
+  AR=$ac_ct_AR
 else
   AR="$ac_cv_prog_AR"
 fi
@@ -4696,14 +4485,15 @@ fi
     PLAT_OBJS=""
     PLAT_SRCS=""
     LDAIX_SRC=""
-    if test "x${SHLIB_VERSION}" = x; then :
+    if test "x${SHLIB_VERSION}" = x; then
   SHLIB_VERSION=".1.0"
 else
   SHLIB_VERSION=".${SHLIB_VERSION}"
 fi
+
     case $system in
 	AIX-*)
-	    if test "${TCL_THREADS}" = "1" -a "$GCC" != "yes"; then :
+	    if test "${TCL_THREADS}" = "1" -a "$GCC" != "yes"; then
 
 		# AIX requires the _r compiler when gcc isn't being used
 		case "${CC}" in
@@ -4715,10 +4505,11 @@ fi
 		    	CC=`echo "$CC" | sed -e 's/^\([^ ]*\)/\1_r/'`
 			;;
 		esac
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $CC for compiling with threads" >&5
-$as_echo "Using $CC for compiling with threads" >&6; }
+		echo "$as_me:$LINENO: result: Using $CC for compiling with threads" >&5
+echo "${ECHO_T}Using $CC for compiling with threads" >&6
 
 fi
+
 	    LIBS="$LIBS -lc"
 	    SHLIB_CFLAGS=""
 	    SHLIB_SUFFIX=".so"
@@ -4731,12 +4522,12 @@ fi
 	    LDAIX_SRC='$(UNIX_DIR)/ldAix'
 
 	    # Check to enable 64-bit flags for compiler/linker
-	    if test "$do64bit" = yes; then :
+	    if test "$do64bit" = yes; then
 
-		if test "$GCC" = yes; then :
+		if test "$GCC" = yes; then
 
-		    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 64bit mode not supported with GCC on $system" >&5
-$as_echo "$as_me: WARNING: 64bit mode not supported with GCC on $system" >&2;}
+		    { echo "$as_me:$LINENO: WARNING: 64bit mode not supported with GCC on $system" >&5
+echo "$as_me: WARNING: 64bit mode not supported with GCC on $system" >&2;}
 
 else
 
@@ -4749,15 +4540,17 @@ else
 
 fi
 
+
 fi
 
-	    if test "`uname -m`" = ia64; then :
+
+	    if test "`uname -m`" = ia64; then
 
 		# AIX-5 uses ELF style dynamic libraries on IA-64, but not PPC
 		SHLIB_LD="/usr/ccs/bin/ld -G -z text"
 		# AIX-5 has dl* in libc.so
 		DL_LIBS=""
-		if test "$GCC" = yes; then :
+		if test "$GCC" = yes; then
 
 		    CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
 
@@ -4766,11 +4559,12 @@ else
 		    CC_SEARCH_FLAGS='-R${LIB_RUNTIME_DIR}'
 
 fi
+
 		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
 
 else
 
-		if test "$GCC" = yes; then :
+		if test "$GCC" = yes; then
 
 		    SHLIB_LD='${CC} -shared -Wl,-bexpall'
 
@@ -4780,12 +4574,14 @@ else
 		    LDFLAGS="$LDFLAGS -brtl"
 
 fi
+
 		SHLIB_LD="${SHLIB_LD} ${SHLIB_LD_FLAGS}"
 		DL_LIBS="-ldl"
 		CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
 
 fi
+
 	    ;;
 	BeOS*)
 	    SHLIB_CFLAGS="-fPIC"
@@ -4799,43 +4595,71 @@ fi
 	    # -lsocket, even if the network functions are in -lnet which
 	    # is always linked to, for compatibility.
 	    #-----------------------------------------------------------
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_ntoa in -lbind" >&5
-$as_echo_n "checking for inet_ntoa in -lbind... " >&6; }
-if ${ac_cv_lib_bind_inet_ntoa+:} false; then :
-  $as_echo_n "(cached) " >&6
+	    echo "$as_me:$LINENO: checking for inet_ntoa in -lbind" >&5
+echo $ECHO_N "checking for inet_ntoa in -lbind... $ECHO_C" >&6
+if test "${ac_cv_lib_bind_inet_ntoa+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char inet_ntoa ();
 int
 main ()
 {
-return inet_ntoa ();
+inet_ntoa ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_bind_inet_ntoa=yes
 else
-  ac_cv_lib_bind_inet_ntoa=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_bind_inet_ntoa=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_inet_ntoa" >&5
-$as_echo "$ac_cv_lib_bind_inet_ntoa" >&6; }
-if test "x$ac_cv_lib_bind_inet_ntoa" = xyes; then :
+echo "$as_me:$LINENO: result: $ac_cv_lib_bind_inet_ntoa" >&5
+echo "${ECHO_T}$ac_cv_lib_bind_inet_ntoa" >&6
+if test $ac_cv_lib_bind_inet_ntoa = yes; then
   LIBS="$LIBS -lbind -lsocket"
 fi
 
@@ -4872,12 +4696,16 @@ fi
 	    TCL_NEEDS_EXP_FILE=1
 	    TCL_EXPORT_FILE_SUFFIX='${VERSION}.dll.a'
 	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$@.a"
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Cygwin version of gcc" >&5
-$as_echo_n "checking for Cygwin version of gcc... " >&6; }
-if ${ac_cv_cygwin+:} false; then :
-  $as_echo_n "(cached) " >&6
+	    echo "$as_me:$LINENO: checking for Cygwin version of gcc" >&5
+echo $ECHO_N "checking for Cygwin version of gcc... $ECHO_C" >&6
+if test "${ac_cv_cygwin+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 		#ifdef __CYGWIN__
@@ -4892,21 +4720,49 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_cygwin=no
 else
-  ac_cv_cygwin=yes
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_cygwin=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cygwin" >&5
-$as_echo "$ac_cv_cygwin" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_cygwin" >&5
+echo "${ECHO_T}$ac_cv_cygwin" >&6
 	    if test "$ac_cv_cygwin" = "no"; then
-		as_fn_error $? "${CC} is not a cygwin compiler." "$LINENO" 5
+		{ { echo "$as_me:$LINENO: error: ${CC} is not a cygwin compiler." >&5
+echo "$as_me: error: ${CC} is not a cygwin compiler." >&2;}
+   { (exit 1); exit 1; }; }
 	    fi
 	    if test "x${TCL_THREADS}" = "x0"; then
-		as_fn_error $? "CYGWIN compile is only supported with --enable-threads" "$LINENO" 5
+		{ { echo "$as_me:$LINENO: error: CYGWIN compile is only supported with --enable-threads" >&5
+echo "$as_me: error: CYGWIN compile is only supported with --enable-threads" >&2;}
+   { (exit 1); exit 1; }; }
 	    fi
 	    do64bit_ok=yes
 	    if test "x${SHARED_BUILD}" = "x1"; then
@@ -4936,43 +4792,71 @@ $as_echo "$ac_cv_cygwin" >&6; }
 	    SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared'
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS="-lroot"
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_ntoa in -lnetwork" >&5
-$as_echo_n "checking for inet_ntoa in -lnetwork... " >&6; }
-if ${ac_cv_lib_network_inet_ntoa+:} false; then :
-  $as_echo_n "(cached) " >&6
+	    echo "$as_me:$LINENO: checking for inet_ntoa in -lnetwork" >&5
+echo $ECHO_N "checking for inet_ntoa in -lnetwork... $ECHO_C" >&6
+if test "${ac_cv_lib_network_inet_ntoa+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char inet_ntoa ();
 int
 main ()
 {
-return inet_ntoa ();
+inet_ntoa ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_network_inet_ntoa=yes
 else
-  ac_cv_lib_network_inet_ntoa=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_network_inet_ntoa=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_inet_ntoa" >&5
-$as_echo "$ac_cv_lib_network_inet_ntoa" >&6; }
-if test "x$ac_cv_lib_network_inet_ntoa" = xyes; then :
+echo "$as_me:$LINENO: result: $ac_cv_lib_network_inet_ntoa" >&5
+echo "${ECHO_T}$ac_cv_lib_network_inet_ntoa" >&6
+if test $ac_cv_lib_network_inet_ntoa = yes; then
   LIBS="$LIBS -lnetwork"
 fi
 
@@ -4980,14 +4864,18 @@ fi
 	HP-UX-*.11.*)
 	    # Use updated header definitions where possible
 
-$as_echo "#define _XOPEN_SOURCE_EXTENDED 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define _XOPEN_SOURCE_EXTENDED 1
+_ACEOF
 
 
-$as_echo "#define _XOPEN_SOURCE 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define _XOPEN_SOURCE 1
+_ACEOF
 
 	    LIBS="$LIBS -lxnet"               # Use the XOPEN network library
 
-	    if test "`uname -m`" = ia64; then :
+	    if test "`uname -m`" = ia64; then
 
 		SHLIB_SUFFIX=".so"
 
@@ -4996,49 +4884,78 @@ else
 		SHLIB_SUFFIX=".sl"
 
 fi
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if ${ac_cv_lib_dld_shl_load+:} false; then :
-  $as_echo_n "(cached) " >&6
+
+	    echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char shl_load ();
 int
 main ()
 {
-return shl_load ();
+shl_load ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_dld_shl_load=yes
 else
-  ac_cv_lib_dld_shl_load=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dld_shl_load=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
+echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
+if test $ac_cv_lib_dld_shl_load = yes; then
   tcl_ok=yes
 else
   tcl_ok=no
 fi
 
-	    if test "$tcl_ok" = yes; then :
+	    if test "$tcl_ok" = yes; then
 
 		SHLIB_CFLAGS="+z"
 		SHLIB_LD="ld -b"
@@ -5050,7 +4967,8 @@ fi
 		LD_LIBRARY_PATH_VAR="SHLIB_PATH"
 
 fi
-	    if test "$GCC" = yes; then :
+
+	    if test "$GCC" = yes; then
 
 		SHLIB_LD='${CC} -shared'
 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
@@ -5061,28 +4979,30 @@ else
 
 fi
 
+
 	    # Users may want PA-RISC 1.1/2.0 portable code - needs HP cc
 	    #CFLAGS="$CFLAGS +DAportable"
 
 	    # Check to enable 64-bit flags for compiler/linker
-	    if test "$do64bit" = "yes"; then :
+	    if test "$do64bit" = "yes"; then
 
-		if test "$GCC" = yes; then :
+		if test "$GCC" = yes; then
 
 		    case `${CC} -dumpmachine` in
 			hppa64*)
 			    # 64-bit gcc in use.  Fix flags for GNU ld.
 			    do64bit_ok=yes
 			    SHLIB_LD='${CC} -shared'
-			    if test $doRpath = yes; then :
+			    if test $doRpath = yes; then
 
 				CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
 fi
+
 			    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
 			    ;;
 			*)
-			    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 64bit mode not supported with GCC on $system" >&5
-$as_echo "$as_me: WARNING: 64bit mode not supported with GCC on $system" >&2;}
+			    { echo "$as_me:$LINENO: WARNING: 64bit mode not supported with GCC on $system" >&5
+echo "$as_me: WARNING: 64bit mode not supported with GCC on $system" >&2;}
 			    ;;
 		    esac
 
@@ -5094,52 +5014,82 @@ else
 
 fi
 
-fi ;;
+
+fi
+ ;;
 	HP-UX-*.08.*|HP-UX-*.09.*|HP-UX-*.10.*)
 	    SHLIB_SUFFIX=".sl"
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if ${ac_cv_lib_dld_shl_load+:} false; then :
-  $as_echo_n "(cached) " >&6
+	    echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
+if test "${ac_cv_lib_dld_shl_load+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char shl_load ();
 int
 main ()
 {
-return shl_load ();
+shl_load ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_dld_shl_load=yes
 else
-  ac_cv_lib_dld_shl_load=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dld_shl_load=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
+echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
+if test $ac_cv_lib_dld_shl_load = yes; then
   tcl_ok=yes
 else
   tcl_ok=no
 fi
 
-	    if test "$tcl_ok" = yes; then :
+	    if test "$tcl_ok" = yes; then
 
 		SHLIB_CFLAGS="+z"
 		SHLIB_LD="ld -b"
@@ -5151,24 +5101,28 @@ fi
 		LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.'
 		LD_LIBRARY_PATH_VAR="SHLIB_PATH"
 
-fi ;;
+fi
+ ;;
 	IRIX-5.*)
 	    SHLIB_CFLAGS=""
 	    SHLIB_LD="ld -shared -rdata_shared"
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""
-	    case " $LIBOBJS " in
+	    case $LIBOBJS in
+    "mkstemp.$ac_objext"   | \
+  *" mkstemp.$ac_objext"   | \
+    "mkstemp.$ac_objext "* | \
   *" mkstemp.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS mkstemp.$ac_objext"
- ;;
+  *) LIBOBJS="$LIBOBJS mkstemp.$ac_objext" ;;
 esac
 
-	    if test $doRpath = yes; then :
+	    if test $doRpath = yes; then
 
 		CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
 		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
 fi
+
 	    ;;
 	IRIX-6.*)
 	    SHLIB_CFLAGS=""
@@ -5176,18 +5130,21 @@ fi
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""
-	    case " $LIBOBJS " in
+	    case $LIBOBJS in
+    "mkstemp.$ac_objext"   | \
+  *" mkstemp.$ac_objext"   | \
+    "mkstemp.$ac_objext "* | \
   *" mkstemp.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS mkstemp.$ac_objext"
- ;;
+  *) LIBOBJS="$LIBOBJS mkstemp.$ac_objext" ;;
 esac
 
-	    if test $doRpath = yes; then :
+	    if test $doRpath = yes; then
 
 		CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
 		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
 fi
-	    if test "$GCC" = yes; then :
+
+	    if test "$GCC" = yes; then
 
 		CFLAGS="$CFLAGS -mabi=n32"
 		LDFLAGS="$LDFLAGS -mabi=n32"
@@ -5206,6 +5163,7 @@ else
 		LDFLAGS="$LDFLAGS -n32"
 
 fi
+
 	    ;;
 	IRIX64-6.*)
 	    SHLIB_CFLAGS=""
@@ -5213,26 +5171,29 @@ fi
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""
-	    case " $LIBOBJS " in
+	    case $LIBOBJS in
+    "mkstemp.$ac_objext"   | \
+  *" mkstemp.$ac_objext"   | \
+    "mkstemp.$ac_objext "* | \
   *" mkstemp.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS mkstemp.$ac_objext"
- ;;
+  *) LIBOBJS="$LIBOBJS mkstemp.$ac_objext" ;;
 esac
 
-	    if test $doRpath = yes; then :
+	    if test $doRpath = yes; then
 
 		CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
 		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
 fi
 
+
 	    # Check to enable 64-bit flags for compiler/linker
 
-	    if test "$do64bit" = yes; then :
+	    if test "$do64bit" = yes; then
 
-	        if test "$GCC" = yes; then :
+	        if test "$GCC" = yes; then
 
-	            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 64bit mode not supported by gcc" >&5
-$as_echo "$as_me: WARNING: 64bit mode not supported by gcc" >&2;}
+	            { echo "$as_me:$LINENO: WARNING: 64bit mode not supported by gcc" >&5
+echo "$as_me: WARNING: 64bit mode not supported by gcc" >&2;}
 
 else
 
@@ -5243,7 +5204,9 @@ else
 
 fi
 
+
 fi
+
 	    ;;
 	Linux*|GNU*|NetBSD-Debian)
 	    SHLIB_CFLAGS="-fPIC"
@@ -5259,25 +5222,31 @@ fi
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS="-ldl"
 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
-	    if test $doRpath = yes; then :
+	    if test $doRpath = yes; then
 
 		CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
 fi
+
 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-	    if test "`uname -m`" = "alpha"; then :
+	    if test "`uname -m`" = "alpha"; then
   CFLAGS="$CFLAGS -mieee"
 fi
-	    if test $do64bit = yes; then :
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -m64 flag" >&5
-$as_echo_n "checking if compiler accepts -m64 flag... " >&6; }
-if ${tcl_cv_cc_m64+:} false; then :
-  $as_echo_n "(cached) " >&6
+	    if test $do64bit = yes; then
+
+		echo "$as_me:$LINENO: checking if compiler accepts -m64 flag" >&5
+echo $ECHO_N "checking if compiler accepts -m64 flag... $ECHO_C" >&6
+if test "${tcl_cv_cc_m64+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		    hold_cflags=$CFLAGS
 		    CFLAGS="$CFLAGS -m64"
-		    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+		    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -5288,35 +5257,62 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   tcl_cv_cc_m64=yes
 else
-  tcl_cv_cc_m64=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+tcl_cv_cc_m64=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 		    CFLAGS=$hold_cflags
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cc_m64" >&5
-$as_echo "$tcl_cv_cc_m64" >&6; }
-		if test $tcl_cv_cc_m64 = yes; then :
+echo "$as_me:$LINENO: result: $tcl_cv_cc_m64" >&5
+echo "${ECHO_T}$tcl_cv_cc_m64" >&6
+		if test $tcl_cv_cc_m64 = yes; then
 
 		    CFLAGS="$CFLAGS -m64"
 		    do64bit_ok=yes
 
 fi
 
+
 fi
 
+
 	    # The combo of gcc + glibc has a bug related to inlining of
 	    # functions like strtod(). The -fno-builtin flag should address
 	    # this problem but it does not work. The -fno-inline flag is kind
 	    # of overkill but it works. Disable inlining only when one of the
 	    # files in compat/*.c is being linked in.
 
-	    if test x"${USE_COMPAT}" != x; then :
+	    if test x"${USE_COMPAT}" != x; then
   CFLAGS="$CFLAGS -fno-inline"
 fi
+
 	    ;;
 	Lynx*)
 	    SHLIB_CFLAGS="-fPIC"
@@ -5326,11 +5322,12 @@ fi
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS="-mshared -ldl"
 	    LD_FLAGS="-Wl,--export-dynamic"
-	    if test $doRpath = yes; then :
+	    if test $doRpath = yes; then
 
 		CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
 		LD_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
 fi
+
 	    ;;
 	MP-RAS-02*)
 	    SHLIB_CFLAGS="-K PIC"
@@ -5367,15 +5364,16 @@ fi
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""
-	    if test $doRpath = yes; then :
+	    if test $doRpath = yes; then
 
 		CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
 fi
+
 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
 	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
 	    LDFLAGS="-Wl,-export-dynamic"
 	    CFLAGS_OPTIMIZE="-O2"
-	    if test "${TCL_THREADS}" = "1"; then :
+	    if test "${TCL_THREADS}" = "1"; then
 
 		# On OpenBSD:	Compile with -pthread
 		#		Don't link with -lpthread
@@ -5383,6 +5381,7 @@ fi
 		CFLAGS="$CFLAGS -pthread"
 
 fi
+
 	    # OpenBSD doesn't do version numbers with dots.
 	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 	    TCL_LIB_VERSIONS_OK=nodots
@@ -5395,12 +5394,13 @@ fi
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""
 	    LDFLAGS="$LDFLAGS -export-dynamic"
-	    if test $doRpath = yes; then :
+	    if test $doRpath = yes; then
 
 		CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
 fi
+
 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-	    if test "${TCL_THREADS}" = "1"; then :
+	    if test "${TCL_THREADS}" = "1"; then
 
 		# The -pthread needs to go in the CFLAGS, not LIBS
 		LIBS=`echo $LIBS | sed s/-pthread//`
@@ -5408,6 +5408,7 @@ fi
 	    	LDFLAGS="$LDFLAGS -pthread"
 
 fi
+
 	    ;;
 	DragonFly-*|FreeBSD-*)
 	    # This configuration from FreeBSD Ports.
@@ -5417,18 +5418,20 @@ fi
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""
-	    if test $doRpath = yes; then :
+	    if test $doRpath = yes; then
 
 		CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
 		LD_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
 fi
-	    if test "${TCL_THREADS}" = "1"; then :
+
+	    if test "${TCL_THREADS}" = "1"; then
 
 		# The -pthread needs to go in the LDFLAGS, not LIBS
 		LIBS=`echo $LIBS | sed s/-pthread//`
 		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
 		LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
 fi
+
 	    case $system in
 	    FreeBSD-3.*)
 		# Version numbers are dot-stripped by system policy.
@@ -5451,19 +5454,23 @@ fi
 	    CFLAGS="`echo " ${CFLAGS}" | \
 		awk 'BEGIN {FS=" +-";ORS=" "}; {for (i=2;i<=NF;i++) \
 		if (!($i~/^(isysroot|mmacosx-version-min)/)) print "-"$i}'`"
-	    if test $do64bit = yes; then :
+	    if test $do64bit = yes; then
 
 		case `arch` in
 		    ppc)
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -arch ppc64 flag" >&5
-$as_echo_n "checking if compiler accepts -arch ppc64 flag... " >&6; }
-if ${tcl_cv_cc_arch_ppc64+:} false; then :
-  $as_echo_n "(cached) " >&6
+			echo "$as_me:$LINENO: checking if compiler accepts -arch ppc64 flag" >&5
+echo $ECHO_N "checking if compiler accepts -arch ppc64 flag... $ECHO_C" >&6
+if test "${tcl_cv_cc_arch_ppc64+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 			    hold_cflags=$CFLAGS
 			    CFLAGS="$CFLAGS -arch ppc64 -mpowerpc64 -mcpu=G5"
-			    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+			    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -5474,33 +5481,62 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   tcl_cv_cc_arch_ppc64=yes
 else
-  tcl_cv_cc_arch_ppc64=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+tcl_cv_cc_arch_ppc64=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 			    CFLAGS=$hold_cflags
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cc_arch_ppc64" >&5
-$as_echo "$tcl_cv_cc_arch_ppc64" >&6; }
-			if test $tcl_cv_cc_arch_ppc64 = yes; then :
+echo "$as_me:$LINENO: result: $tcl_cv_cc_arch_ppc64" >&5
+echo "${ECHO_T}$tcl_cv_cc_arch_ppc64" >&6
+			if test $tcl_cv_cc_arch_ppc64 = yes; then
 
 			    CFLAGS="$CFLAGS -arch ppc64 -mpowerpc64 -mcpu=G5"
 			    do64bit_ok=yes
 
-fi;;
+fi
+;;
 		    i386)
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -arch x86_64 flag" >&5
-$as_echo_n "checking if compiler accepts -arch x86_64 flag... " >&6; }
-if ${tcl_cv_cc_arch_x86_64+:} false; then :
-  $as_echo_n "(cached) " >&6
+			echo "$as_me:$LINENO: checking if compiler accepts -arch x86_64 flag" >&5
+echo $ECHO_N "checking if compiler accepts -arch x86_64 flag... $ECHO_C" >&6
+if test "${tcl_cv_cc_arch_x86_64+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 			    hold_cflags=$CFLAGS
 			    CFLAGS="$CFLAGS -arch x86_64"
-			    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+			    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -5511,48 +5547,79 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   tcl_cv_cc_arch_x86_64=yes
 else
-  tcl_cv_cc_arch_x86_64=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+tcl_cv_cc_arch_x86_64=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 			    CFLAGS=$hold_cflags
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cc_arch_x86_64" >&5
-$as_echo "$tcl_cv_cc_arch_x86_64" >&6; }
-			if test $tcl_cv_cc_arch_x86_64 = yes; then :
+echo "$as_me:$LINENO: result: $tcl_cv_cc_arch_x86_64" >&5
+echo "${ECHO_T}$tcl_cv_cc_arch_x86_64" >&6
+			if test $tcl_cv_cc_arch_x86_64 = yes; then
 
 			    CFLAGS="$CFLAGS -arch x86_64"
 			    do64bit_ok=yes
 
-fi;;
+fi
+;;
 		    *)
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Don't know how enable 64-bit on architecture \`arch\`" >&5
-$as_echo "$as_me: WARNING: Don't know how enable 64-bit on architecture \`arch\`" >&2;};;
+			{ echo "$as_me:$LINENO: WARNING: Don't know how enable 64-bit on architecture \`arch\`" >&5
+echo "$as_me: WARNING: Don't know how enable 64-bit on architecture \`arch\`" >&2;};;
 		esac
 
 else
 
 		# Check for combined 32-bit and 64-bit fat build
 		if echo "$CFLAGS " |grep -E -q -- '-arch (ppc64|x86_64) ' \
-		    && echo "$CFLAGS " |grep -E -q -- '-arch (ppc|i386) '; then :
+		    && echo "$CFLAGS " |grep -E -q -- '-arch (ppc|i386) '; then
 
 		    fat_32_64=yes
 fi
 
+
 fi
+
 	    SHLIB_LD='${CC} -dynamiclib ${CFLAGS} ${LDFLAGS}'
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ld accepts -single_module flag" >&5
-$as_echo_n "checking if ld accepts -single_module flag... " >&6; }
-if ${tcl_cv_ld_single_module+:} false; then :
-  $as_echo_n "(cached) " >&6
+	    echo "$as_me:$LINENO: checking if ld accepts -single_module flag" >&5
+echo $ECHO_N "checking if ld accepts -single_module flag... $ECHO_C" >&6
+if test "${tcl_cv_ld_single_module+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		hold_ldflags=$LDFLAGS
 		LDFLAGS="$LDFLAGS -dynamiclib -Wl,-single_module"
-		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+		cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -5563,35 +5630,64 @@ int i;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   tcl_cv_ld_single_module=yes
 else
-  tcl_cv_ld_single_module=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+tcl_cv_ld_single_module=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 		LDFLAGS=$hold_ldflags
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_ld_single_module" >&5
-$as_echo "$tcl_cv_ld_single_module" >&6; }
-	    if test $tcl_cv_ld_single_module = yes; then :
+echo "$as_me:$LINENO: result: $tcl_cv_ld_single_module" >&5
+echo "${ECHO_T}$tcl_cv_ld_single_module" >&6
+	    if test $tcl_cv_ld_single_module = yes; then
 
 		SHLIB_LD="${SHLIB_LD} -Wl,-single_module"
 
 fi
+
 	    SHLIB_SUFFIX=".dylib"
 	    DL_OBJS="tclLoadDyld.o"
 	    DL_LIBS=""
 	    LDFLAGS="$LDFLAGS -headerpad_max_install_names"
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ld accepts -search_paths_first flag" >&5
-$as_echo_n "checking if ld accepts -search_paths_first flag... " >&6; }
-if ${tcl_cv_ld_search_paths_first+:} false; then :
-  $as_echo_n "(cached) " >&6
+	    echo "$as_me:$LINENO: checking if ld accepts -search_paths_first flag" >&5
+echo $ECHO_N "checking if ld accepts -search_paths_first flag... $ECHO_C" >&6
+if test "${tcl_cv_ld_search_paths_first+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		hold_ldflags=$LDFLAGS
 		LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
-		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+		cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -5602,59 +5698,89 @@ int i;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   tcl_cv_ld_search_paths_first=yes
 else
-  tcl_cv_ld_search_paths_first=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+tcl_cv_ld_search_paths_first=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 		LDFLAGS=$hold_ldflags
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_ld_search_paths_first" >&5
-$as_echo "$tcl_cv_ld_search_paths_first" >&6; }
-	    if test $tcl_cv_ld_search_paths_first = yes; then :
+echo "$as_me:$LINENO: result: $tcl_cv_ld_search_paths_first" >&5
+echo "${ECHO_T}$tcl_cv_ld_search_paths_first" >&6
+	    if test $tcl_cv_ld_search_paths_first = yes; then
 
 		LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
 
 fi
-	    if test "$tcl_cv_cc_visibility_hidden" != yes; then :
 
+	    if test "$tcl_cv_cc_visibility_hidden" != yes; then
 
-$as_echo "#define MODULE_SCOPE __private_extern__" >>confdefs.h
+
+cat >>confdefs.h <<\_ACEOF
+#define MODULE_SCOPE __private_extern__
+_ACEOF
 
 		tcl_cv_cc_visibility_hidden=yes
 
 fi
+
 	    CC_SEARCH_FLAGS=""
 	    LD_SEARCH_FLAGS=""
 	    LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH"
 
-$as_echo "#define MAC_OSX_TCL 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define MAC_OSX_TCL 1
+_ACEOF
 
 	    PLAT_OBJS='${MAC_OSX_OBJS}'
 	    PLAT_SRCS='${MAC_OSX_SRCS}'
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use CoreFoundation" >&5
-$as_echo_n "checking whether to use CoreFoundation... " >&6; }
-	    # Check whether --enable-corefoundation was given.
-if test "${enable_corefoundation+set}" = set; then :
-  enableval=$enable_corefoundation; tcl_corefoundation=$enableval
+	    echo "$as_me:$LINENO: checking whether to use CoreFoundation" >&5
+echo $ECHO_N "checking whether to use CoreFoundation... $ECHO_C" >&6
+	    # Check whether --enable-corefoundation or --disable-corefoundation was given.
+if test "${enable_corefoundation+set}" = set; then
+  enableval="$enable_corefoundation"
+  tcl_corefoundation=$enableval
 else
   tcl_corefoundation=yes
-fi
-
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_corefoundation" >&5
-$as_echo "$tcl_corefoundation" >&6; }
-	    if test $tcl_corefoundation = yes; then :
+fi;
+	    echo "$as_me:$LINENO: result: $tcl_corefoundation" >&5
+echo "${ECHO_T}$tcl_corefoundation" >&6
+	    if test $tcl_corefoundation = yes; then
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CoreFoundation.framework" >&5
-$as_echo_n "checking for CoreFoundation.framework... " >&6; }
-if ${tcl_cv_lib_corefoundation+:} false; then :
-  $as_echo_n "(cached) " >&6
+		echo "$as_me:$LINENO: checking for CoreFoundation.framework" >&5
+echo $ECHO_N "checking for CoreFoundation.framework... $ECHO_C" >&6
+if test "${tcl_cv_lib_corefoundation+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		    hold_libs=$LIBS
-		    if test "$fat_32_64" = yes; then :
+		    if test "$fat_32_64" = yes; then
 
 			for v in CFLAGS CPPFLAGS LDFLAGS; do
 			    # On Tiger there is no 64-bit CF, so remove 64-bit
@@ -5664,8 +5790,13 @@ else
 			    eval 'hold_'$v'="$'$v'";'$v'="`echo "$'$v' "|sed -e "s/-arch ppc64 / /g" -e "s/-arch x86_64 / /g"`"'
 			done
 fi
+
 		    LIBS="$LIBS -framework CoreFoundation"
-		    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+		    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <CoreFoundation/CoreFoundation.h>
 int
@@ -5676,45 +5807,77 @@ CFBundleRef b = CFBundleGetMainBundle();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   tcl_cv_lib_corefoundation=yes
 else
-  tcl_cv_lib_corefoundation=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+tcl_cv_lib_corefoundation=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-		    if test "$fat_32_64" = yes; then :
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+		    if test "$fat_32_64" = yes; then
 
 			for v in CFLAGS CPPFLAGS LDFLAGS; do
 			    eval $v'="$hold_'$v'"'
 		        done
 fi
+
 		    LIBS=$hold_libs
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_lib_corefoundation" >&5
-$as_echo "$tcl_cv_lib_corefoundation" >&6; }
-		if test $tcl_cv_lib_corefoundation = yes; then :
+echo "$as_me:$LINENO: result: $tcl_cv_lib_corefoundation" >&5
+echo "${ECHO_T}$tcl_cv_lib_corefoundation" >&6
+		if test $tcl_cv_lib_corefoundation = yes; then
 
 		    LIBS="$LIBS -framework CoreFoundation"
 
-$as_echo "#define HAVE_COREFOUNDATION 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_COREFOUNDATION 1
+_ACEOF
 
 
 else
   tcl_corefoundation=no
 fi
-		if test "$fat_32_64" = yes -a $tcl_corefoundation = yes; then :
 
-		    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit CoreFoundation" >&5
-$as_echo_n "checking for 64-bit CoreFoundation... " >&6; }
-if ${tcl_cv_lib_corefoundation_64+:} false; then :
-  $as_echo_n "(cached) " >&6
+		if test "$fat_32_64" = yes -a $tcl_corefoundation = yes; then
+
+		    echo "$as_me:$LINENO: checking for 64-bit CoreFoundation" >&5
+echo $ECHO_N "checking for 64-bit CoreFoundation... $ECHO_C" >&6
+if test "${tcl_cv_lib_corefoundation_64+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 			for v in CFLAGS CPPFLAGS LDFLAGS; do
 			    eval 'hold_'$v'="$'$v'";'$v'="`echo "$'$v' "|sed -e "s/-arch ppc / /g" -e "s/-arch i386 / /g"`"'
 			done
-			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+			cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <CoreFoundation/CoreFoundation.h>
 int
@@ -5725,31 +5888,60 @@ CFBundleRef b = CFBundleGetMainBundle();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   tcl_cv_lib_corefoundation_64=yes
 else
-  tcl_cv_lib_corefoundation_64=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+tcl_cv_lib_corefoundation_64=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 			for v in CFLAGS CPPFLAGS LDFLAGS; do
 			    eval $v'="$hold_'$v'"'
 			done
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_lib_corefoundation_64" >&5
-$as_echo "$tcl_cv_lib_corefoundation_64" >&6; }
-		    if test $tcl_cv_lib_corefoundation_64 = no; then :
+echo "$as_me:$LINENO: result: $tcl_cv_lib_corefoundation_64" >&5
+echo "${ECHO_T}$tcl_cv_lib_corefoundation_64" >&6
+		    if test $tcl_cv_lib_corefoundation_64 = no; then
 
 
-$as_echo "#define NO_COREFOUNDATION_64 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define NO_COREFOUNDATION_64 1
+_ACEOF
 
                         LDFLAGS="$LDFLAGS -Wl,-no_arch_warnings"
 
 fi
 
+
 fi
 
+
 fi
+
 	    ;;
 	NEXTSTEP-*)
 	    SHLIB_CFLAGS=""
@@ -5765,7 +5957,9 @@ fi
 	    SHLIB_LD_LIBS=""
 	    CFLAGS_OPTIMIZE=""		# Optimizer is buggy
 
-$as_echo "#define _OE_SOCKETS 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define _OE_SOCKETS 1
+_ACEOF
 
 	    ;;
 	OSF1-1.0|OSF1-1.1|OSF1-1.2)
@@ -5783,13 +5977,14 @@ $as_echo "#define _OE_SOCKETS 1" >>confdefs.h
 	OSF1-1.*)
 	    # OSF/1 1.3 from OSF using ELF, and derivatives, including AD2
 	    SHLIB_CFLAGS="-fPIC"
-	    if test "$SHARED_BUILD" = 1; then :
+	    if test "$SHARED_BUILD" = 1; then
   SHLIB_LD="ld -shared"
 else
 
 	        SHLIB_LD="ld -non_shared"
 
 fi
+
 	    SHLIB_LD_LIBS=""
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
@@ -5800,7 +5995,7 @@ fi
 	OSF1-V*)
 	    # Digital OSF/1
 	    SHLIB_CFLAGS=""
-	    if test "$SHARED_BUILD" = 1; then :
+	    if test "$SHARED_BUILD" = 1; then
 
 	        SHLIB_LD='ld -shared -expect_unresolved "*"'
 
@@ -5809,27 +6004,30 @@ else
 	        SHLIB_LD='ld -non_shared -expect_unresolved "*"'
 
 fi
+
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""
-	    if test $doRpath = yes; then :
+	    if test $doRpath = yes; then
 
 		CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'
 		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
 fi
-	    if test "$GCC" = yes; then :
+
+	    if test "$GCC" = yes; then
   CFLAGS="$CFLAGS -mieee"
 else
 
 		CFLAGS="$CFLAGS -DHAVE_TZSET -std1 -ieee"
 fi
+
 	    # see pthread_intro(3) for pthread support on osf1, k.furukawa
-	    if test "${TCL_THREADS}" = 1; then :
+	    if test "${TCL_THREADS}" = 1; then
 
 		CFLAGS="$CFLAGS -DHAVE_PTHREAD_ATTR_SETSTACKSIZE"
 		CFLAGS="$CFLAGS -DTCL_THREAD_STACK_MIN=PTHREAD_STACK_MIN*64"
 		LIBS=`echo $LIBS | sed s/-lpthreads//`
-		if test "$GCC" = yes; then :
+		if test "$GCC" = yes; then
 
 		    LIBS="$LIBS -lpthread -lmach -lexc"
 
@@ -5840,7 +6038,9 @@ else
 
 fi
 
+
 fi
+
 	    ;;
 	QNX-6*)
 	    # QNX RTP
@@ -5859,7 +6059,7 @@ fi
 	    # Note, dlopen is available only on SCO 3.2.5 and greater. However,
 	    # this test works, since "uname -s" was non-standard in 3.2.4 and
 	    # below.
-	    if test "$GCC" = yes; then :
+	    if test "$GCC" = yes; then
 
 	    	SHLIB_CFLAGS="-fPIC -melf"
 	    	LDFLAGS="$LDFLAGS -melf -Wl,-Bexport"
@@ -5870,6 +6070,7 @@ else
 	    	LDFLAGS="$LDFLAGS -belf -Wl,-Bexport"
 
 fi
+
 	    SHLIB_LD="ld -G"
 	    SHLIB_LD_LIBS=""
 	    SHLIB_SUFFIX=".so"
@@ -5914,17 +6115,21 @@ fi
 	    # won't define thread-safe library routines.
 
 
-$as_echo "#define _REENTRANT 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define _REENTRANT 1
+_ACEOF
 
 
-$as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define _POSIX_PTHREAD_SEMANTICS 1
+_ACEOF
 
 
 	    SHLIB_CFLAGS="-KPIC"
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS="-ldl"
-	    if test "$GCC" = yes; then :
+	    if test "$GCC" = yes; then
 
 		SHLIB_LD='${CC} -shared'
 		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
@@ -5937,32 +6142,37 @@ else
 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
 
 fi
+
 	    ;;
 	SunOS-5*)
 	    # Note: If _REENTRANT isn't defined, then Solaris
 	    # won't define thread-safe library routines.
 
 
-$as_echo "#define _REENTRANT 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define _REENTRANT 1
+_ACEOF
 
 
-$as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define _POSIX_PTHREAD_SEMANTICS 1
+_ACEOF
 
 
 	    SHLIB_CFLAGS="-KPIC"
 
 	    # Check to enable 64-bit flags for compiler/linker
-	    if test "$do64bit" = yes; then :
+	    if test "$do64bit" = yes; then
 
 		arch=`isainfo`
-		if test "$arch" = "sparcv9 sparc"; then :
+		if test "$arch" = "sparcv9 sparc"; then
 
-		    if test "$GCC" = yes; then :
+		    if test "$GCC" = yes; then
 
-			if test "`${CC} -dumpversion | awk -F. '{print $1}'`" -lt 3; then :
+			if test "`${CC} -dumpversion | awk -F. '{print $1}'`" -lt 3; then
 
-			    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 64bit mode not supported with GCC < 3.2 on $system" >&5
-$as_echo "$as_me: WARNING: 64bit mode not supported with GCC < 3.2 on $system" >&2;}
+			    { echo "$as_me:$LINENO: WARNING: 64bit mode not supported with GCC < 3.2 on $system" >&5
+echo "$as_me: WARNING: 64bit mode not supported with GCC < 3.2 on $system" >&2;}
 
 else
 
@@ -5973,10 +6183,11 @@ else
 
 fi
 
+
 else
 
 			do64bit_ok=yes
-			if test "$do64bitVIS" = yes; then :
+			if test "$do64bitVIS" = yes; then
 
 			    CFLAGS="$CFLAGS -xarch=v9a"
 			    LDFLAGS_ARCH="-xarch=v9a"
@@ -5987,15 +6198,17 @@ else
 			    LDFLAGS_ARCH="-xarch=v9"
 
 fi
+
 			# Solaris 64 uses this as well
 			#LD_LIBRARY_PATH_VAR="LD_LIBRARY_PATH_64"
 
 fi
 
+
 else
-  if test "$arch" = "amd64 i386"; then :
+  if test "$arch" = "amd64 i386"; then
 
-		    if test "$GCC" = yes; then :
+		    if test "$GCC" = yes; then
 
 			case $system in
 			    SunOS-5.1[1-9]*|SunOS-5.[2-9][0-9]*)
@@ -6003,8 +6216,8 @@ else
 				CFLAGS="$CFLAGS -m64"
 				LDFLAGS="$LDFLAGS -m64";;
 			    *)
-				{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 64bit mode not supported with GCC on $system" >&5
-$as_echo "$as_me: WARNING: 64bit mode not supported with GCC on $system" >&2;};;
+				{ echo "$as_me:$LINENO: WARNING: 64bit mode not supported with GCC on $system" >&5
+echo "$as_me: WARNING: 64bit mode not supported with GCC on $system" >&2;};;
 			esac
 
 else
@@ -6021,32 +6234,169 @@ else
 
 fi
 
+
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 64bit mode not supported for $arch" >&5
-$as_echo "$as_me: WARNING: 64bit mode not supported for $arch" >&2;}
+  { echo "$as_me:$LINENO: WARNING: 64bit mode not supported for $arch" >&5
+echo "$as_me: WARNING: 64bit mode not supported for $arch" >&2;}
 fi
+
 fi
 
+
 fi
 
+
 	    #--------------------------------------------------------------------
 	    # On Solaris 5.x i386 with the sunpro compiler we need to link
 	    # with sunmath to get floating point rounding control
 	    #--------------------------------------------------------------------
-	    if test "$GCC" = yes; then :
+	    if test "$GCC" = yes; then
   use_sunmath=no
 else
 
 		arch=`isainfo`
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use -lsunmath for fp rounding control" >&5
-$as_echo_n "checking whether to use -lsunmath for fp rounding control... " >&6; }
-		if test "$arch" = "amd64 i386" -o "$arch" = "i386"; then :
+		echo "$as_me:$LINENO: checking whether to use -lsunmath for fp rounding control" >&5
+echo $ECHO_N "checking whether to use -lsunmath for fp rounding control... $ECHO_C" >&6
+		if test "$arch" = "amd64 i386" -o "$arch" = "i386"; then
 
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+			echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 			MATH_LIBS="-lsunmath $MATH_LIBS"
-			ac_fn_c_check_header_mongrel "$LINENO" "sunmath.h" "ac_cv_header_sunmath_h" "$ac_includes_default"
-if test "x$ac_cv_header_sunmath_h" = xyes; then :
+			if test "${ac_cv_header_sunmath_h+set}" = set; then
+  echo "$as_me:$LINENO: checking for sunmath.h" >&5
+echo $ECHO_N "checking for sunmath.h... $ECHO_C" >&6
+if test "${ac_cv_header_sunmath_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_sunmath_h" >&5
+echo "${ECHO_T}$ac_cv_header_sunmath_h" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking sunmath.h usability" >&5
+echo $ECHO_N "checking sunmath.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <sunmath.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking sunmath.h presence" >&5
+echo $ECHO_N "checking sunmath.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sunmath.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: sunmath.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: sunmath.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sunmath.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: sunmath.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: sunmath.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: sunmath.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sunmath.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: sunmath.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sunmath.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: sunmath.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sunmath.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: sunmath.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sunmath.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: sunmath.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: sunmath.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: sunmath.h: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ----------------------------- ##
+## Report this to the tk lists.  ##
+## ----------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for sunmath.h" >&5
+echo $ECHO_N "checking for sunmath.h... $ECHO_C" >&6
+if test "${ac_cv_header_sunmath_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_sunmath_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_sunmath_h" >&5
+echo "${ECHO_T}$ac_cv_header_sunmath_h" >&6
 
 fi
 
@@ -6055,24 +6405,26 @@ fi
 
 else
 
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+			echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 			use_sunmath=no
 
 fi
 
+
 fi
+
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS="-ldl"
-	    if test "$GCC" = yes; then :
+	    if test "$GCC" = yes; then
 
 		SHLIB_LD='${CC} -shared'
 		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-		if test "$do64bit_ok" = yes; then :
+		if test "$do64bit_ok" = yes; then
 
-		    if test "$arch" = "sparcv9 sparc"; then :
+		    if test "$arch" = "sparcv9 sparc"; then
 
 			# We need to specify -static-libgcc or we need to
 			# add the path to the sparv9 libgcc.
@@ -6083,22 +6435,26 @@ fi
 			#CC_SEARCH_FLAGS="${CC_SEARCH_FLAGS},-R,$v9gcclibdir"
 
 else
-  if test "$arch" = "amd64 i386"; then :
+  if test "$arch" = "amd64 i386"; then
 
 			SHLIB_LD="$SHLIB_LD -m64 -static-libgcc"
 
 fi
+
 fi
 
+
 fi
 
+
 else
 
-		if test "$use_sunmath" = yes; then :
+		if test "$use_sunmath" = yes; then
   textmode=textoff
 else
   textmode=text
 fi
+
 		case $system in
 		    SunOS-5.[1-9][0-9]*|SunOS-5.[7-9])
 			SHLIB_LD="\${CC} -G -z $textmode \${LDFLAGS}";;
@@ -6109,6 +6465,7 @@ fi
 		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
 
 fi
+
 	    ;;
 	UNIX_SV* | UnixWare-5*)
 	    SHLIB_CFLAGS="-KPIC"
@@ -6119,15 +6476,19 @@ fi
 	    DL_LIBS="-ldl"
 	    # Some UNIX_SV* systems (unixware 1.1.2 for example) have linkers
 	    # that don't grok the -Bexport option.  Test that it does.
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld accepts -Bexport flag" >&5
-$as_echo_n "checking for ld accepts -Bexport flag... " >&6; }
-if ${tcl_cv_ld_Bexport+:} false; then :
-  $as_echo_n "(cached) " >&6
+	    echo "$as_me:$LINENO: checking for ld accepts -Bexport flag" >&5
+echo $ECHO_N "checking for ld accepts -Bexport flag... $ECHO_C" >&6
+if test "${tcl_cv_ld_Bexport+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		hold_ldflags=$LDFLAGS
 		LDFLAGS="$LDFLAGS -Wl,-Bexport"
-		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+		cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -6138,63 +6499,93 @@ int i;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   tcl_cv_ld_Bexport=yes
 else
-  tcl_cv_ld_Bexport=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+tcl_cv_ld_Bexport=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 	        LDFLAGS=$hold_ldflags
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_ld_Bexport" >&5
-$as_echo "$tcl_cv_ld_Bexport" >&6; }
-	    if test $tcl_cv_ld_Bexport = yes; then :
+echo "$as_me:$LINENO: result: $tcl_cv_ld_Bexport" >&5
+echo "${ECHO_T}$tcl_cv_ld_Bexport" >&6
+	    if test $tcl_cv_ld_Bexport = yes; then
 
 		LDFLAGS="$LDFLAGS -Wl,-Bexport"
 
 fi
+
 	    CC_SEARCH_FLAGS=""
 	    LD_SEARCH_FLAGS=""
 	    ;;
     esac
 
-    if test "$do64bit" = yes -a "$do64bit_ok" = no; then :
+    if test "$do64bit" = yes -a "$do64bit_ok" = no; then
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 64bit support being disabled -- don't know magic for this platform" >&5
-$as_echo "$as_me: WARNING: 64bit support being disabled -- don't know magic for this platform" >&2;}
+	{ echo "$as_me:$LINENO: WARNING: 64bit support being disabled -- don't know magic for this platform" >&5
+echo "$as_me: WARNING: 64bit support being disabled -- don't know magic for this platform" >&2;}
 
 fi
 
-    if test "$do64bit" = yes -a "$do64bit_ok" = yes; then :
 
+    if test "$do64bit" = yes -a "$do64bit_ok" = yes; then
 
-$as_echo "#define TCL_CFG_DO64BIT 1" >>confdefs.h
+
+cat >>confdefs.h <<\_ACEOF
+#define TCL_CFG_DO64BIT 1
+_ACEOF
 
 
 fi
 
 
 
+
     # Step 4: disable dynamic loading if requested via a command-line switch.
 
-    # Check whether --enable-load was given.
-if test "${enable_load+set}" = set; then :
-  enableval=$enable_load; tcl_ok=$enableval
+    # Check whether --enable-load or --disable-load was given.
+if test "${enable_load+set}" = set; then
+  enableval="$enable_load"
+  tcl_ok=$enableval
 else
   tcl_ok=yes
-fi
-
-    if test "$tcl_ok" = no; then :
+fi;
+    if test "$tcl_ok" = no; then
   DL_OBJS=""
 fi
 
-    if test "x$DL_OBJS" != x; then :
+
+    if test "x$DL_OBJS" != x; then
   BUILD_DLTEST="\$(DLTEST_TARGETS)"
 else
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can't figure out how to do dynamic loading or shared libraries on this system." >&5
-$as_echo "$as_me: WARNING: Can't figure out how to do dynamic loading or shared libraries on this system." >&2;}
+	{ echo "$as_me:$LINENO: WARNING: Can't figure out how to do dynamic loading or shared libraries on this system." >&5
+echo "$as_me: WARNING: Can't figure out how to do dynamic loading or shared libraries on this system." >&2;}
 	SHLIB_CFLAGS=""
 	SHLIB_LD=""
 	SHLIB_SUFFIX=""
@@ -6206,13 +6597,14 @@ $as_echo "$as_me: WARNING: Can't figure out how to do dynamic loading or shared
 	BUILD_DLTEST=""
 
 fi
+
     LDFLAGS="$LDFLAGS $LDFLAGS_ARCH"
 
     # If we're running gcc, then change the C flags for compiling shared
     # libraries to the right flags for gcc, instead of those for the
     # standard manufacturer compiler.
 
-    if test "$DL_OBJS" != "tclLoadNone.o" -a "$GCC" = yes; then :
+    if test "$DL_OBJS" != "tclLoadNone.o" -a "$GCC" = yes; then
 
 	case $system in
 	    AIX-*) ;;
@@ -6226,29 +6618,35 @@ fi
 	esac
 fi
 
-    if test "$tcl_cv_cc_visibility_hidden" != yes; then :
+
+    if test "$tcl_cv_cc_visibility_hidden" != yes; then
 
 
-$as_echo "#define MODULE_SCOPE extern" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define MODULE_SCOPE extern
+_ACEOF
 
 
 fi
 
-    if test "$SHARED_LIB_SUFFIX" = ""; then :
+
+    if test "$SHARED_LIB_SUFFIX" = ""; then
 
 	SHARED_LIB_SUFFIX='${VERSION}${SHLIB_SUFFIX}'
 fi
-    if test "$UNSHARED_LIB_SUFFIX" = ""; then :
+
+    if test "$UNSHARED_LIB_SUFFIX" = ""; then
 
 	UNSHARED_LIB_SUFFIX='${VERSION}.a'
 fi
+
     DLL_INSTALL_DIR="\$(LIB_INSTALL_DIR)"
 
-    if test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""; then :
+    if test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""; then
 
         LIB_SUFFIX=${SHARED_LIB_SUFFIX}
         MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${LDFLAGS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
-        if test "${SHLIB_SUFFIX}" = ".dll"; then :
+        if test "${SHLIB_SUFFIX}" = ".dll"; then
 
             INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)";if test -f $(LIB_FILE).a; then $(INSTALL_DATA) $(LIB_FILE).a "$(LIB_INSTALL_DIR)"; fi;'
             DLL_INSTALL_DIR="\$(BIN_INSTALL_DIR)"
@@ -6259,11 +6657,12 @@ else
 
 fi
 
+
 else
 
         LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
 
-        if test "$RANLIB" = ""; then :
+        if test "$RANLIB" = ""; then
 
             MAKE_LIB='$(STLIB_LD) $@ ${OBJS}'
 
@@ -6272,12 +6671,14 @@ else
             MAKE_LIB='${STLIB_LD} $@ ${OBJS} ; ${RANLIB} $@'
 
 fi
+
         INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"'
 
 fi
 
+
     # Stub lib does not depend on shared/static configuration
-    if test "$RANLIB" = ""; then :
+    if test "$RANLIB" = ""; then
 
         MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS}'
 
@@ -6286,27 +6687,33 @@ else
         MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS} ; ${RANLIB} $@'
 
 fi
+
     INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)"'
 
     # Define TCL_LIBS now that we know what DL_LIBS is.
     # The trick here is that we don't want to change the value of TCL_LIBS if
     # it is already set when tclConfig.sh had been loaded by Tk.
-    if test "x${TCL_LIBS}" = x; then :
+    if test "x${TCL_LIBS}" = x; then
 
         TCL_LIBS="${DL_LIBS} ${LIBS} ${MATH_LIBS}"
 fi
 
 
+
 	# See if the compiler supports casting to a union type.
 	# This is used to stop gcc from printing a compiler
 	# warning when initializing a union member.
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cast to union support" >&5
-$as_echo_n "checking for cast to union support... " >&6; }
-if ${tcl_cv_cast_to_union+:} false; then :
-  $as_echo_n "(cached) " >&6
+	echo "$as_me:$LINENO: checking for cast to union support" >&5
+echo $ECHO_N "checking for cast to union support... $ECHO_C" >&6
+if test "${tcl_cv_cast_to_union+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -6320,19 +6727,45 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   tcl_cv_cast_to_union=yes
 else
-  tcl_cv_cast_to_union=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+tcl_cv_cast_to_union=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cast_to_union" >&5
-$as_echo "$tcl_cv_cast_to_union" >&6; }
+echo "$as_me:$LINENO: result: $tcl_cv_cast_to_union" >&5
+echo "${ECHO_T}$tcl_cv_cast_to_union" >&6
 	if test "$tcl_cv_cast_to_union" = "yes"; then
 
-$as_echo "#define HAVE_CAST_TO_UNION 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_CAST_TO_UNION 1
+_ACEOF
 
 	fi
 
@@ -6378,33 +6811,37 @@ _ACEOF
 
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for build with symbols" >&5
-$as_echo_n "checking for build with symbols... " >&6; }
-    # Check whether --enable-symbols was given.
-if test "${enable_symbols+set}" = set; then :
-  enableval=$enable_symbols; tcl_ok=$enableval
+    echo "$as_me:$LINENO: checking for build with symbols" >&5
+echo $ECHO_N "checking for build with symbols... $ECHO_C" >&6
+    # Check whether --enable-symbols or --disable-symbols was given.
+if test "${enable_symbols+set}" = set; then
+  enableval="$enable_symbols"
+  tcl_ok=$enableval
 else
   tcl_ok=no
-fi
-
+fi;
 # FIXME: Currently, LDFLAGS_DEFAULT is not used, it should work like CFLAGS_DEFAULT.
     if test "$tcl_ok" = "no"; then
 	CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)'
 	LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)'
 
-$as_echo "#define NDEBUG 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define NDEBUG 1
+_ACEOF
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 
-$as_echo "#define TCL_CFG_OPTIMIZED 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define TCL_CFG_OPTIMIZED 1
+_ACEOF
 
     else
 	CFLAGS_DEFAULT='$(CFLAGS_DEBUG)'
 	LDFLAGS_DEFAULT='$(LDFLAGS_DEBUG)'
 	if test "$tcl_ok" = "yes"; then
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (standard debugging)" >&5
-$as_echo "yes (standard debugging)" >&6; }
+	    echo "$as_me:$LINENO: result: yes (standard debugging)" >&5
+echo "${ECHO_T}yes (standard debugging)" >&6
 	fi
     fi
 
@@ -6412,7 +6849,9 @@ $as_echo "yes (standard debugging)" >&6; }
 
     if test "$tcl_ok" = "mem" -o "$tcl_ok" = "all"; then
 
-$as_echo "#define TCL_MEM_DEBUG 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define TCL_MEM_DEBUG 1
+_ACEOF
 
     fi
 
@@ -6420,11 +6859,11 @@ $as_echo "#define TCL_MEM_DEBUG 1" >>confdefs.h
 
     if test "$tcl_ok" != "yes" -a "$tcl_ok" != "no"; then
 	if test "$tcl_ok" = "all"; then
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabled symbols mem debugging" >&5
-$as_echo "enabled symbols mem debugging" >&6; }
+	    echo "$as_me:$LINENO: result: enabled symbols mem debugging" >&5
+echo "${ECHO_T}enabled symbols mem debugging" >&6
 	else
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabled $tcl_ok debugging" >&5
-$as_echo "enabled $tcl_ok debugging" >&6; }
+	    echo "$as_me:$LINENO: result: enabled $tcl_ok debugging" >&5
+echo "${ECHO_T}enabled $tcl_ok debugging" >&6
 	fi
     fi
 
@@ -6434,14 +6873,18 @@ $as_echo "enabled $tcl_ok debugging" >&6; }
 #--------------------------------------------------------------------
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for required early compiler flags" >&5
-$as_echo_n "checking for required early compiler flags... " >&6; }
+    echo "$as_me:$LINENO: checking for required early compiler flags" >&5
+echo $ECHO_N "checking for required early compiler flags... $ECHO_C" >&6
     tcl_flags=""
 
-    if ${tcl_cv_flag__isoc99_source+:} false; then :
-  $as_echo_n "(cached) " >&6
+    if test "${tcl_cv_flag__isoc99_source+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <stdlib.h>
 int
@@ -6452,10 +6895,38 @@ char *p = (char *)strtoll; char *q = (char *)strtoull;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   tcl_cv_flag__isoc99_source=no
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #define _ISOC99_SOURCE 1
 #include <stdlib.h>
@@ -6467,28 +6938,58 @@ char *p = (char *)strtoll; char *q = (char *)strtoull;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   tcl_cv_flag__isoc99_source=yes
 else
-  tcl_cv_flag__isoc99_source=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+tcl_cv_flag__isoc99_source=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
     if test "x${tcl_cv_flag__isoc99_source}" = "xyes" ; then
 
-$as_echo "#define _ISOC99_SOURCE 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define _ISOC99_SOURCE 1
+_ACEOF
 
 	tcl_flags="$tcl_flags _ISOC99_SOURCE"
     fi
 
 
-    if ${tcl_cv_flag__largefile64_source+:} false; then :
-  $as_echo_n "(cached) " >&6
+    if test "${tcl_cv_flag__largefile64_source+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/stat.h>
 int
@@ -6499,10 +7000,38 @@ struct stat64 buf; int i = stat64("/", &buf);
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   tcl_cv_flag__largefile64_source=no
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #define _LARGEFILE64_SOURCE 1
 #include <sys/stat.h>
@@ -6514,28 +7043,58 @@ struct stat64 buf; int i = stat64("/", &buf);
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   tcl_cv_flag__largefile64_source=yes
 else
-  tcl_cv_flag__largefile64_source=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+tcl_cv_flag__largefile64_source=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
     if test "x${tcl_cv_flag__largefile64_source}" = "xyes" ; then
 
-$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define _LARGEFILE64_SOURCE 1
+_ACEOF
 
 	tcl_flags="$tcl_flags _LARGEFILE64_SOURCE"
     fi
 
 
-    if ${tcl_cv_flag__largefile_source64+:} false; then :
-  $as_echo_n "(cached) " >&6
+    if test "${tcl_cv_flag__largefile_source64+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/stat.h>
 int
@@ -6546,10 +7105,38 @@ char *p = (char *)open64;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   tcl_cv_flag__largefile_source64=no
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #define _LARGEFILE_SOURCE64 1
 #include <sys/stat.h>
@@ -6561,42 +7148,72 @@ char *p = (char *)open64;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   tcl_cv_flag__largefile_source64=yes
 else
-  tcl_cv_flag__largefile_source64=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+tcl_cv_flag__largefile_source64=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
     if test "x${tcl_cv_flag__largefile_source64}" = "xyes" ; then
 
-$as_echo "#define _LARGEFILE_SOURCE64 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define _LARGEFILE_SOURCE64 1
+_ACEOF
 
 	tcl_flags="$tcl_flags _LARGEFILE_SOURCE64"
     fi
 
     if test "x${tcl_flags}" = "x" ; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
+	echo "$as_me:$LINENO: result: none" >&5
+echo "${ECHO_T}none" >&6
     else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${tcl_flags}" >&5
-$as_echo "${tcl_flags}" >&6; }
+	echo "$as_me:$LINENO: result: ${tcl_flags}" >&5
+echo "${ECHO_T}${tcl_flags}" >&6
     fi
 
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit integer type" >&5
-$as_echo_n "checking for 64-bit integer type... " >&6; }
-    if ${tcl_cv_type_64bit+:} false; then :
-  $as_echo_n "(cached) " >&6
+    echo "$as_me:$LINENO: checking for 64-bit integer type" >&5
+echo $ECHO_N "checking for 64-bit integer type... $ECHO_C" >&6
+    if test "${tcl_cv_type_64bit+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	tcl_cv_type_64bit=none
 	# See if the compiler knows natively about __int64
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -6607,16 +7224,44 @@ __int64 value = (__int64) 0;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   tcl_type_64bit=__int64
 else
-  tcl_type_64bit="long long"
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+tcl_type_64bit="long long"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 	# See if we should use long anyway  Note that we substitute in the
 	# type that is our current guess for a 64-bit type inside this check
 	# program, so it should be modified only carefully...
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 int
@@ -6629,35 +7274,66 @@ switch (0) {
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   tcl_cv_type_64bit=${tcl_type_64bit}
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
     if test "${tcl_cv_type_64bit}" = none ; then
 
-$as_echo "#define TCL_WIDE_INT_IS_LONG 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define TCL_WIDE_INT_IS_LONG 1
+_ACEOF
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using long" >&5
-$as_echo "using long" >&6; }
+	echo "$as_me:$LINENO: result: using long" >&5
+echo "${ECHO_T}using long" >&6
     else
 
 cat >>confdefs.h <<_ACEOF
 #define TCL_WIDE_INT_TYPE ${tcl_cv_type_64bit}
 _ACEOF
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${tcl_cv_type_64bit}" >&5
-$as_echo "${tcl_cv_type_64bit}" >&6; }
+	echo "$as_me:$LINENO: result: ${tcl_cv_type_64bit}" >&5
+echo "${ECHO_T}${tcl_cv_type_64bit}" >&6
 
 	# Now check for auxiliary declarations
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct dirent64" >&5
-$as_echo_n "checking for struct dirent64... " >&6; }
-if ${tcl_cv_struct_dirent64+:} false; then :
-  $as_echo_n "(cached) " >&6
+	echo "$as_me:$LINENO: checking for struct dirent64" >&5
+echo $ECHO_N "checking for struct dirent64... $ECHO_C" >&6
+if test "${tcl_cv_struct_dirent64+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <dirent.h>
@@ -6669,28 +7345,58 @@ struct dirent64 p;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   tcl_cv_struct_dirent64=yes
 else
-  tcl_cv_struct_dirent64=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+tcl_cv_struct_dirent64=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_struct_dirent64" >&5
-$as_echo "$tcl_cv_struct_dirent64" >&6; }
+echo "$as_me:$LINENO: result: $tcl_cv_struct_dirent64" >&5
+echo "${ECHO_T}$tcl_cv_struct_dirent64" >&6
 	if test "x${tcl_cv_struct_dirent64}" = "xyes" ; then
 
-$as_echo "#define HAVE_STRUCT_DIRENT64 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_STRUCT_DIRENT64 1
+_ACEOF
 
 	fi
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DIR64" >&5
-$as_echo_n "checking for DIR64... " >&6; }
-if ${tcl_cv_DIR64+:} false; then :
-  $as_echo_n "(cached) " >&6
+	echo "$as_me:$LINENO: checking for DIR64" >&5
+echo $ECHO_N "checking for DIR64... $ECHO_C" >&6
+if test "${tcl_cv_DIR64+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <dirent.h>
@@ -6703,28 +7409,58 @@ struct dirent64 *p; DIR64 d = opendir64(".");
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   tcl_cv_DIR64=yes
 else
-  tcl_cv_DIR64=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+tcl_cv_DIR64=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_DIR64" >&5
-$as_echo "$tcl_cv_DIR64" >&6; }
+echo "$as_me:$LINENO: result: $tcl_cv_DIR64" >&5
+echo "${ECHO_T}$tcl_cv_DIR64" >&6
 	if test "x${tcl_cv_DIR64}" = "xyes" ; then
 
-$as_echo "#define HAVE_DIR64 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_DIR64 1
+_ACEOF
 
 	fi
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct stat64" >&5
-$as_echo_n "checking for struct stat64... " >&6; }
-if ${tcl_cv_struct_stat64+:} false; then :
-  $as_echo_n "(cached) " >&6
+	echo "$as_me:$LINENO: checking for struct stat64" >&5
+echo $ECHO_N "checking for struct stat64... $ECHO_C" >&6
+if test "${tcl_cv_struct_stat64+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/stat.h>
 int
@@ -6736,40 +7472,161 @@ struct stat64 p;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   tcl_cv_struct_stat64=yes
 else
-  tcl_cv_struct_stat64=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+tcl_cv_struct_stat64=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_struct_stat64" >&5
-$as_echo "$tcl_cv_struct_stat64" >&6; }
+echo "$as_me:$LINENO: result: $tcl_cv_struct_stat64" >&5
+echo "${ECHO_T}$tcl_cv_struct_stat64" >&6
 	if test "x${tcl_cv_struct_stat64}" = "xyes" ; then
 
-$as_echo "#define HAVE_STRUCT_STAT64 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_STRUCT_STAT64 1
+_ACEOF
 
 	fi
 
-	for ac_func in open64 lseek64
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+
+
+for ac_func in open64 lseek64
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for off64_t" >&5
-$as_echo_n "checking for off64_t... " >&6; }
-	if ${tcl_cv_type_off64_t+:} false; then :
-  $as_echo_n "(cached) " >&6
+	echo "$as_me:$LINENO: checking for off64_t" >&5
+echo $ECHO_N "checking for off64_t... $ECHO_C" >&6
+	if test "${tcl_cv_type_off64_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
 int
@@ -6781,25 +7638,51 @@ off64_t offset;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   tcl_cv_type_off64_t=yes
 else
-  tcl_cv_type_off64_t=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+tcl_cv_type_off64_t=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
 			if test "x${tcl_cv_type_off64_t}" = "xyes" && \
 	        test "x${ac_cv_func_lseek64}" = "xyes" && \
 	        test "x${ac_cv_func_open64}" = "xyes" ; then
 
-$as_echo "#define HAVE_TYPE_OFF64_T 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_TYPE_OFF64_T 1
+_ACEOF
 
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+	    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 	else
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 	fi
     fi
 
@@ -6808,229 +7691,235 @@ $as_echo "no" >&6; }
 #	Check endianness because we can optimize some operations
 #--------------------------------------------------------------------
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if ${ac_cv_c_bigendian+:} false; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
+if test "${ac_cv_c_bigendian+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_c_bigendian=unknown
-    # See if we're dealing with a universal compiler.
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifndef __APPLE_CC__
-	       not a universal capable compiler
-	     #endif
-	     typedef int dummy;
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-	# Check for potential -arch flags.  It is not universal unless
-	# there are at least two -arch flags with different values.
-	ac_arch=
-	ac_prev=
-	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
-	 if test -n "$ac_prev"; then
-	   case $ac_word in
-	     i?86 | x86_64 | ppc | ppc64)
-	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
-		 ac_arch=$ac_word
-	       else
-		 ac_cv_c_bigendian=universal
-		 break
-	       fi
-	       ;;
-	   esac
-	   ac_prev=
-	 elif test "x$ac_word" = "x-arch"; then
-	   ac_prev=arch
-	 fi
-       done
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    if test $ac_cv_c_bigendian = unknown; then
-      # See if sys/param.h defines the BYTE_ORDER macro.
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  # See if sys/param.h defines the BYTE_ORDER macro.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
-	     #include <sys/param.h>
+#include <sys/param.h>
 
 int
 main ()
 {
-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
-		     && LITTLE_ENDIAN)
-	      bogus endian macros
-	     #endif
+#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
+ bogus endian macros
+#endif
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   # It does; now see whether it defined to BIG_ENDIAN or not.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
-		#include <sys/param.h>
+#include <sys/param.h>
 
 int
 main ()
 {
 #if BYTE_ORDER != BIG_ENDIAN
-		 not big endian
-		#endif
+ not big endian
+#endif
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_c_bigendian=yes
 else
-  ac_cv_c_bigendian=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-    if test $ac_cv_c_bigendian = unknown; then
-      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <limits.h>
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-int
-main ()
-{
-#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
-	      bogus endian macros
-	     #endif
+ac_cv_c_bigendian=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-  ;
-  return 0;
-}
+# It does not; compile a test program.
+if test "$cross_compiling" = yes; then
+  # try to guess the endianness by grepping values into an object file
+  ac_cv_c_bigendian=unknown
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  # It does; now see whether it defined to _BIG_ENDIAN or not.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <limits.h>
-
+short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
+short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
 int
 main ()
 {
-#ifndef _BIG_ENDIAN
-		 not big endian
-		#endif
-
+ _ascii (); _ebcdic ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
   ac_cv_c_bigendian=yes
-else
-  ac_cv_c_bigendian=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+  if test "$ac_cv_c_bigendian" = unknown; then
+    ac_cv_c_bigendian=no
+  else
+    # finding both strings is unlikely to happen, but who knows?
+    ac_cv_c_bigendian=unknown
+  fi
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    fi
-    if test $ac_cv_c_bigendian = unknown; then
-      # Compile a test program.
-      if test "$cross_compiling" = yes; then :
-  # Try to guess by grepping values from an object file.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-short int ascii_mm[] =
-		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-		short int ascii_ii[] =
-		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-		int use_ascii (int i) {
-		  return ascii_mm[i] + ascii_ii[i];
-		}
-		short int ebcdic_ii[] =
-		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-		short int ebcdic_mm[] =
-		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-		int use_ebcdic (int i) {
-		  return ebcdic_mm[i] + ebcdic_ii[i];
-		}
-		extern int foo;
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-int
-main ()
-{
-return use_ascii (foo) == use_ebcdic (foo);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
-	      ac_cv_c_bigendian=yes
-	    fi
-	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-	      if test "$ac_cv_c_bigendian" = unknown; then
-		ac_cv_c_bigendian=no
-	      else
-		# finding both strings is unlikely to happen, but who knows?
-		ac_cv_c_bigendian=unknown
-	      fi
-	    fi
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-$ac_includes_default
 int
 main ()
 {
-
-	     /* Are we little or big endian?  From Harbison&Steele.  */
-	     union
-	     {
-	       long int l;
-	       char c[sizeof (long int)];
-	     } u;
-	     u.l = 1;
-	     return u.c[sizeof (long int) - 1] == 1;
-
-  ;
-  return 0;
+  /* Are we little or big endian?  From Harbison&Steele.  */
+  union
+  {
+    long l;
+    char c[sizeof (long)];
+  } u;
+  u.l = 1;
+  exit (u.c[sizeof (long) - 1] == 1);
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_c_bigendian=no
 else
-  ac_cv_c_bigendian=yes
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_c_bigendian=yes
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-
-    fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
-$as_echo "$ac_cv_c_bigendian" >&6; }
- case $ac_cv_c_bigendian in #(
-   yes)
-     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
-;; #(
-   no)
-      ;; #(
-   universal)
-
-$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+echo "${ECHO_T}$ac_cv_c_bigendian" >&6
+case $ac_cv_c_bigendian in
+  yes)
 
-     ;; #(
-   *)
-     as_fn_error $? "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
- esac
+cat >>confdefs.h <<\_ACEOF
+#define WORDS_BIGENDIAN 1
+_ACEOF
+ ;;
+  no)
+     ;;
+  *)
+    { { echo "$as_me:$LINENO: error: unknown endianness
+presetting ac_cv_c_bigendian=no (or yes) will help" >&5
+echo "$as_me: error: unknown endianness
+presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac
 
 
 #------------------------------------------------------------------------
@@ -7045,10 +7934,10 @@ if test "$TCL_EXEC_PREFIX" != "$exec_prefix"; then
 fi
 
 if test "$TCL_PREFIX" != "$prefix"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+    { echo "$as_me:$LINENO: WARNING:
         Different --prefix selected for Tk and Tcl!
         [package require Tk] may not work correctly in tclsh." >&5
-$as_echo "$as_me: WARNING:
+echo "$as_me: WARNING:
         Different --prefix selected for Tk and Tcl!
         [package require Tk] may not work correctly in tclsh." >&2;}
 fi
@@ -7063,13 +7952,17 @@ fi
 #	special flag.
 #--------------------------------------------------------------------
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fd_set in sys/types" >&5
-$as_echo_n "checking for fd_set in sys/types... " >&6; }
-if ${tcl_cv_type_fd_set+:} false; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for fd_set in sys/types" >&5
+echo $ECHO_N "checking for fd_set in sys/types... $ECHO_C" >&6
+if test "${tcl_cv_type_fd_set+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
 int
@@ -7080,30 +7973,58 @@ fd_set readMask, writeMask;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   tcl_cv_type_fd_set=yes
 else
-  tcl_cv_type_fd_set=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+tcl_cv_type_fd_set=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_type_fd_set" >&5
-$as_echo "$tcl_cv_type_fd_set" >&6; }
+echo "$as_me:$LINENO: result: $tcl_cv_type_fd_set" >&5
+echo "${ECHO_T}$tcl_cv_type_fd_set" >&6
 tk_ok=$tcl_cv_type_fd_set
 if test $tk_ok = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fd_mask in sys/select" >&5
-$as_echo_n "checking for fd_mask in sys/select... " >&6; }
-if ${tcl_cv_grep_fd_mask+:} false; then :
-  $as_echo_n "(cached) " >&6
+    echo "$as_me:$LINENO: checking for fd_mask in sys/select" >&5
+echo $ECHO_N "checking for fd_mask in sys/select... $ECHO_C" >&6
+if test "${tcl_cv_grep_fd_mask+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/select.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "fd_mask" >/dev/null 2>&1; then :
+  $EGREP "fd_mask" >/dev/null 2>&1; then
   tcl_cv_grep_fd_mask=present
 else
   tcl_cv_grep_fd_mask=missing
@@ -7111,18 +8032,22 @@ fi
 rm -f conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_grep_fd_mask" >&5
-$as_echo "$tcl_cv_grep_fd_mask" >&6; }
+echo "$as_me:$LINENO: result: $tcl_cv_grep_fd_mask" >&5
+echo "${ECHO_T}$tcl_cv_grep_fd_mask" >&6
     if test $tcl_cv_grep_fd_mask = present; then
 
-$as_echo "#define HAVE_SYS_SELECT_H 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_SYS_SELECT_H 1
+_ACEOF
 
 	tk_ok=yes
     fi
 fi
 if test $tk_ok = no; then
 
-$as_echo "#define NO_FD_SET 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define NO_FD_SET 1
+_ACEOF
 
 fi
 
@@ -7130,50 +8055,218 @@ fi
 #       Find out all about time handling differences.
 #------------------------------------------------------------------------------
 
+
 for ac_header in sys/time.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_time_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_TIME_H 1
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
 _ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+ac_header_compiler=no
 fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
-$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-if ${ac_cv_header_time+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/time.h>
-#include <time.h>
-
-int
-main ()
-{
-if ((struct tm *) 0)
-return 0;
-  ;
-  return 0;
-}
+#include <$ac_header>
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_time=yes
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
 else
-  ac_cv_header_time=no
+  ac_cpp_err=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
-$as_echo "$ac_cv_header_time" >&6; }
-if test $ac_cv_header_time = yes; then
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
 
-$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ----------------------------- ##
+## Report this to the tk lists.  ##
+## ----------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
+echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
+if test "${ac_cv_header_time+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <sys/time.h>
+#include <time.h>
+
+int
+main ()
+{
+if ((struct tm *) 0)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_header_time=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_header_time=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
+echo "${ECHO_T}$ac_cv_header_time" >&6
+if test $ac_cv_header_time = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define TIME_WITH_SYS_TIME 1
+_ACEOF
 
 fi
 
@@ -7183,9 +8276,64 @@ fi
 #	they don't exist.
 #--------------------------------------------------------------------
 
-ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
-if test "x$ac_cv_type_mode_t" = xyes; then :
+echo "$as_me:$LINENO: checking for mode_t" >&5
+echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
+if test "${ac_cv_type_mode_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if ((mode_t *) 0)
+  return 0;
+if (sizeof (mode_t))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_mode_t=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+ac_cv_type_mode_t=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
+echo "${ECHO_T}$ac_cv_type_mode_t" >&6
+if test $ac_cv_type_mode_t = yes; then
+  :
 else
 
 cat >>confdefs.h <<_ACEOF
@@ -7194,9 +8342,64 @@ _ACEOF
 
 fi
 
-ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
-if test "x$ac_cv_type_pid_t" = xyes; then :
+echo "$as_me:$LINENO: checking for pid_t" >&5
+echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
+if test "${ac_cv_type_pid_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if ((pid_t *) 0)
+  return 0;
+if (sizeof (pid_t))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_pid_t=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+ac_cv_type_pid_t=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
+echo "${ECHO_T}$ac_cv_type_pid_t" >&6
+if test $ac_cv_type_pid_t = yes; then
+  :
 else
 
 cat >>confdefs.h <<_ACEOF
@@ -7205,29 +8408,88 @@ _ACEOF
 
 fi
 
-ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
+echo "$as_me:$LINENO: checking for size_t" >&5
+echo $ECHO_N "checking for size_t... $ECHO_C" >&6
+if test "${ac_cv_type_size_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if ((size_t *) 0)
+  return 0;
+if (sizeof (size_t))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_size_t=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+ac_cv_type_size_t=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+echo "${ECHO_T}$ac_cv_type_size_t" >&6
+if test $ac_cv_type_size_t = yes; then
+  :
 else
 
 cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
+#define size_t unsigned
 _ACEOF
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
-$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
-if ${ac_cv_type_uid_t+:} false; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
+echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
+if test "${ac_cv_type_uid_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "uid_t" >/dev/null 2>&1; then :
+  $EGREP "uid_t" >/dev/null 2>&1; then
   ac_cv_type_uid_t=yes
 else
   ac_cv_type_uid_t=no
@@ -7235,59 +8497,147 @@ fi
 rm -f conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
-$as_echo "$ac_cv_type_uid_t" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
+echo "${ECHO_T}$ac_cv_type_uid_t" >&6
 if test $ac_cv_type_uid_t = no; then
 
-$as_echo "#define uid_t int" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define uid_t int
+_ACEOF
 
 
-$as_echo "#define gid_t int" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define gid_t int
+_ACEOF
 
 fi
 
 
-ac_fn_c_check_type "$LINENO" "intptr_t" "ac_cv_type_intptr_t" "$ac_includes_default"
-if test "x$ac_cv_type_intptr_t" = xyes; then :
+echo "$as_me:$LINENO: checking for intptr_t" >&5
+echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6
+if test "${ac_cv_type_intptr_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if ((intptr_t *) 0)
+  return 0;
+if (sizeof (intptr_t))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_intptr_t=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_intptr_t=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_intptr_t" >&5
+echo "${ECHO_T}$ac_cv_type_intptr_t" >&6
+if test $ac_cv_type_intptr_t = yes; then
 
 
-$as_echo "#define HAVE_INTPTR_T 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_INTPTR_T 1
+_ACEOF
 
 else
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pointer-size signed integer type" >&5
-$as_echo_n "checking for pointer-size signed integer type... " >&6; }
-if ${tcl_cv_intptr_t+:} false; then :
-  $as_echo_n "(cached) " >&6
+    echo "$as_me:$LINENO: checking for pointer-size signed integer type" >&5
+echo $ECHO_N "checking for pointer-size signed integer type... $ECHO_C" >&6
+if test "${tcl_cv_intptr_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     for tcl_cv_intptr_t in "int" "long" "long long" none; do
 	if test "$tcl_cv_intptr_t" != none; then
-	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 int
 main ()
 {
 static int test_array [1 - 2 * !(sizeof (void *) <= sizeof ($tcl_cv_intptr_t))];
-test_array [0] = 0;
-return test_array [0];
+test_array [0] = 0
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   tcl_ok=yes
 else
-  tcl_ok=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+tcl_ok=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 	    test "$tcl_ok" = yes && break; fi
     done
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_intptr_t" >&5
-$as_echo "$tcl_cv_intptr_t" >&6; }
+echo "$as_me:$LINENO: result: $tcl_cv_intptr_t" >&5
+echo "${ECHO_T}$tcl_cv_intptr_t" >&6
     if test "$tcl_cv_intptr_t" != none; then
 
 cat >>confdefs.h <<_ACEOF
@@ -7298,48 +8648,132 @@ _ACEOF
 
 fi
 
-ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "$ac_includes_default"
-if test "x$ac_cv_type_uintptr_t" = xyes; then :
+echo "$as_me:$LINENO: checking for uintptr_t" >&5
+echo $ECHO_N "checking for uintptr_t... $ECHO_C" >&6
+if test "${ac_cv_type_uintptr_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if ((uintptr_t *) 0)
+  return 0;
+if (sizeof (uintptr_t))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_uintptr_t=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_uintptr_t=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_uintptr_t" >&5
+echo "${ECHO_T}$ac_cv_type_uintptr_t" >&6
+if test $ac_cv_type_uintptr_t = yes; then
 
 
-$as_echo "#define HAVE_UINTPTR_T 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_UINTPTR_T 1
+_ACEOF
 
 else
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pointer-size unsigned integer type" >&5
-$as_echo_n "checking for pointer-size unsigned integer type... " >&6; }
-if ${tcl_cv_uintptr_t+:} false; then :
-  $as_echo_n "(cached) " >&6
+    echo "$as_me:$LINENO: checking for pointer-size unsigned integer type" >&5
+echo $ECHO_N "checking for pointer-size unsigned integer type... $ECHO_C" >&6
+if test "${tcl_cv_uintptr_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     for tcl_cv_uintptr_t in "unsigned int" "unsigned long" "unsigned long long" \
 	    none; do
 	if test "$tcl_cv_uintptr_t" != none; then
-	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 int
 main ()
 {
 static int test_array [1 - 2 * !(sizeof (void *) <= sizeof ($tcl_cv_uintptr_t))];
-test_array [0] = 0;
-return test_array [0];
+test_array [0] = 0
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   tcl_ok=yes
 else
-  tcl_ok=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+tcl_ok=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 	    test "$tcl_ok" = yes && break; fi
     done
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_uintptr_t" >&5
-$as_echo "$tcl_cv_uintptr_t" >&6; }
+echo "$as_me:$LINENO: result: $tcl_cv_uintptr_t" >&5
+echo "${ECHO_T}$tcl_cv_uintptr_t" >&6
     if test "$tcl_cv_uintptr_t" != none; then
 
 cat >>confdefs.h <<_ACEOF
@@ -7355,13 +8789,17 @@ fi
 #     In OS/390 struct pwd has no pw_gecos field
 #-------------------------------------------
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pw_gecos in struct pwd" >&5
-$as_echo_n "checking pw_gecos in struct pwd... " >&6; }
-if ${tcl_cv_pwd_pw_gecos+:} false; then :
-  $as_echo_n "(cached) " >&6
+echo "$as_me:$LINENO: checking pw_gecos in struct pwd" >&5
+echo $ECHO_N "checking pw_gecos in struct pwd... $ECHO_C" >&6
+if test "${tcl_cv_pwd_pw_gecos+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <pwd.h>
 int
@@ -7372,18 +8810,44 @@ struct passwd pwd; (void)pwd.pw_gecos;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   tcl_cv_pwd_pw_gecos=yes
 else
-  tcl_cv_pwd_pw_gecos=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+tcl_cv_pwd_pw_gecos=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_pwd_pw_gecos" >&5
-$as_echo "$tcl_cv_pwd_pw_gecos" >&6; }
+echo "$as_me:$LINENO: result: $tcl_cv_pwd_pw_gecos" >&5
+echo "${ECHO_T}$tcl_cv_pwd_pw_gecos" >&6
 if test $tcl_cv_pwd_pw_gecos = yes; then
 
-$as_echo "#define HAVE_PW_GECOS 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_PW_GECOS 1
+_ACEOF
 
 fi
 
@@ -7392,41 +8856,41 @@ fi
 #--------------------------------------------------------------------
 
 if test "`uname -s`" = "Darwin" ; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use Aqua" >&5
-$as_echo_n "checking whether to use Aqua... " >&6; }
-    # Check whether --enable-aqua was given.
-if test "${enable_aqua+set}" = set; then :
-  enableval=$enable_aqua; tk_aqua=$enableval
+    echo "$as_me:$LINENO: checking whether to use Aqua" >&5
+echo $ECHO_N "checking whether to use Aqua... $ECHO_C" >&6
+    # Check whether --enable-aqua or --disable-aqua was given.
+if test "${enable_aqua+set}" = set; then
+  enableval="$enable_aqua"
+  tk_aqua=$enableval
 else
   tk_aqua=no
-fi
-
+fi;
     if test $tk_aqua = yes -o $tk_aqua = cocoa; then
 	tk_aqua=yes
 	if test $tcl_corefoundation = no; then
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Aqua can only be used when CoreFoundation is available" >&5
-$as_echo "$as_me: WARNING: Aqua can only be used when CoreFoundation is available" >&2;}
+	    { echo "$as_me:$LINENO: WARNING: Aqua can only be used when CoreFoundation is available" >&5
+echo "$as_me: WARNING: Aqua can only be used when CoreFoundation is available" >&2;}
 	    tk_aqua=no
 	fi
 	if test ! -d /System/Library/Frameworks/Cocoa.framework; then
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Aqua can only be used when Cocoa is available" >&5
-$as_echo "$as_me: WARNING: Aqua can only be used when Cocoa is available" >&2;}
+	    { echo "$as_me:$LINENO: WARNING: Aqua can only be used when Cocoa is available" >&5
+echo "$as_me: WARNING: Aqua can only be used when Cocoa is available" >&2;}
 	    tk_aqua=no
 	fi
 	if test "`uname -r | awk -F. '{print $1}'`" -lt 9; then
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Aqua requires Mac OS X 10.5 or later" >&5
-$as_echo "$as_me: WARNING: Aqua requires Mac OS X 10.5 or later" >&2;}
+	    { echo "$as_me:$LINENO: WARNING: Aqua requires Mac OS X 10.5 or later" >&5
+echo "$as_me: WARNING: Aqua requires Mac OS X 10.5 or later" >&2;}
 	    tk_aqua=no
 	fi
     fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tk_aqua" >&5
-$as_echo "$tk_aqua" >&6; }
+    echo "$as_me:$LINENO: result: $tk_aqua" >&5
+echo "${ECHO_T}$tk_aqua" >&6
     if test "$fat_32_64" = yes; then
 	if test $tk_aqua = no; then
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit X11" >&5
-$as_echo_n "checking for 64-bit X11... " >&6; }
-if ${tcl_cv_lib_x11_64+:} false; then :
-  $as_echo_n "(cached) " >&6
+	    echo "$as_me:$LINENO: checking for 64-bit X11" >&5
+echo $ECHO_N "checking for 64-bit X11... $ECHO_C" >&6
+if test "${tcl_cv_lib_x11_64+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		for v in CFLAGS CPPFLAGS LDFLAGS; do
@@ -7434,7 +8898,11 @@ else
 		done
 		CPPFLAGS="$CPPFLAGS -I/usr/X11R6/include"
 		LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -lX11"
-		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+		cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <X11/Xlib.h>
 int
@@ -7445,25 +8913,49 @@ XrmInitialize();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   tcl_cv_lib_x11_64=yes
 else
-  tcl_cv_lib_x11_64=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+tcl_cv_lib_x11_64=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 		for v in CFLAGS CPPFLAGS LDFLAGS; do
 		    eval $v'="$hold_'$v'"'
 		done
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_lib_x11_64" >&5
-$as_echo "$tcl_cv_lib_x11_64" >&6; }
+echo "$as_me:$LINENO: result: $tcl_cv_lib_x11_64" >&5
+echo "${ECHO_T}$tcl_cv_lib_x11_64" >&6
 	fi
 	# remove 64-bit arch flags from CFLAGS et al. for combined 32 & 64 bit
 	# fat builds if configuration does not support 64-bit.
 	if test "$tcl_cv_lib_x11_64" = no; then
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: Removing 64-bit architectures from compiler & linker flags" >&5
-$as_echo "$as_me: Removing 64-bit architectures from compiler & linker flags" >&6;}
+	    { echo "$as_me:$LINENO: Removing 64-bit architectures from compiler & linker flags" >&5
+echo "$as_me: Removing 64-bit architectures from compiler & linker flags" >&6;}
 	    for v in CFLAGS CPPFLAGS LDFLAGS; do
 		eval $v'="`echo "$'$v' "|sed -e "s/-arch ppc64 / /g" -e "s/-arch x86_64 / /g"`"'
 	    done
@@ -7471,15 +8963,19 @@ $as_echo "$as_me: Removing 64-bit architectures from compiler & linker flags" >&
     fi
     if test $tk_aqua = no; then
 	# check if weak linking whole libraries is possible.
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if ld accepts -weak-l flag" >&5
-$as_echo_n "checking if ld accepts -weak-l flag... " >&6; }
-if ${tcl_cv_ld_weak_l+:} false; then :
-  $as_echo_n "(cached) " >&6
+	echo "$as_me:$LINENO: checking if ld accepts -weak-l flag" >&5
+echo $ECHO_N "checking if ld accepts -weak-l flag... $ECHO_C" >&6
+if test "${tcl_cv_ld_weak_l+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	    hold_ldflags=$LDFLAGS
 	    LDFLAGS="$LDFLAGS -Wl,-weak-lm"
-	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <math.h>
 int
@@ -7490,24 +8986,186 @@ double f = sin(1.0);
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   tcl_cv_ld_weak_l=yes
 else
-  tcl_cv_ld_weak_l=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+tcl_cv_ld_weak_l=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 	    LDFLAGS=$hold_ldflags
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_ld_weak_l" >&5
-$as_echo "$tcl_cv_ld_weak_l" >&6; }
+echo "$as_me:$LINENO: result: $tcl_cv_ld_weak_l" >&5
+echo "${ECHO_T}$tcl_cv_ld_weak_l" >&6
     fi
-    for ac_header in AvailabilityMacros.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "AvailabilityMacros.h" "ac_cv_header_AvailabilityMacros_h" "$ac_includes_default"
-if test "x$ac_cv_header_AvailabilityMacros_h" = xyes; then :
+
+for ac_header in AvailabilityMacros.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ----------------------------- ##
+## Report this to the tk lists.  ##
+## ----------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<_ACEOF
-#define HAVE_AVAILABILITYMACROS_H 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -7515,14 +9173,18 @@ fi
 done
 
     if test "$ac_cv_header_AvailabilityMacros_h" = yes; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if weak import is available" >&5
-$as_echo_n "checking if weak import is available... " >&6; }
-if ${tcl_cv_cc_weak_import+:} false; then :
-  $as_echo_n "(cached) " >&6
+	echo "$as_me:$LINENO: checking if weak import is available" >&5
+echo $ECHO_N "checking if weak import is available... $ECHO_C" >&6
+if test "${tcl_cv_cc_weak_import+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	    hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -Werror"
-	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 		    #ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
@@ -7542,30 +9204,60 @@ rand();
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   tcl_cv_cc_weak_import=yes
 else
-  tcl_cv_cc_weak_import=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+tcl_cv_cc_weak_import=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 	    CFLAGS=$hold_cflags
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cc_weak_import" >&5
-$as_echo "$tcl_cv_cc_weak_import" >&6; }
+echo "$as_me:$LINENO: result: $tcl_cv_cc_weak_import" >&5
+echo "${ECHO_T}$tcl_cv_cc_weak_import" >&6
 	if test $tcl_cv_cc_weak_import = yes; then
 
-$as_echo "#define HAVE_WEAK_IMPORT 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_WEAK_IMPORT 1
+_ACEOF
 
 	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if Darwin SUSv3 extensions are available" >&5
-$as_echo_n "checking if Darwin SUSv3 extensions are available... " >&6; }
-if ${tcl_cv_cc_darwin_c_source+:} false; then :
-  $as_echo_n "(cached) " >&6
+	echo "$as_me:$LINENO: checking if Darwin SUSv3 extensions are available" >&5
+echo $ECHO_N "checking if Darwin SUSv3 extensions are available... $ECHO_C" >&6
+if test "${tcl_cv_cc_darwin_c_source+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	    hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -Werror"
-	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 		    #ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
@@ -7586,19 +9278,45 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   tcl_cv_cc_darwin_c_source=yes
 else
-  tcl_cv_cc_darwin_c_source=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+tcl_cv_cc_darwin_c_source=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 	    CFLAGS=$hold_cflags
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cc_darwin_c_source" >&5
-$as_echo "$tcl_cv_cc_darwin_c_source" >&6; }
+echo "$as_me:$LINENO: result: $tcl_cv_cc_darwin_c_source" >&5
+echo "${ECHO_T}$tcl_cv_cc_darwin_c_source" >&6
 	if test $tcl_cv_cc_darwin_c_source = yes; then
 
-$as_echo "#define _DARWIN_C_SOURCE 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define _DARWIN_C_SOURCE 1
+_ACEOF
 
 	fi
     fi
@@ -7608,14 +9326,18 @@ fi
 
 if test $tk_aqua = yes; then
 
-$as_echo "#define MAC_OSX_TK 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define MAC_OSX_TK 1
+_ACEOF
 
     LIBS="$LIBS -framework Cocoa -framework Carbon -framework IOKit"
     EXTRA_CC_SWITCHES='-std=gnu99 -x objective-c'
     TK_WINDOWINGSYSTEM=AQUA
     if test -n "${enable_symbols}" -a "${enable_symbols}" != no; then
 
-$as_echo "#define TK_MAC_DEBUG 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define TK_MAC_DEBUG 1
+_ACEOF
 
     fi
 else
@@ -7629,47 +9351,44 @@ else
     #--------------------------------------------------------------------
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
-$as_echo_n "checking for X... " >&6; }
+    echo "$as_me:$LINENO: checking for X" >&5
+echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 
-# Check whether --with-x was given.
-if test "${with_x+set}" = set; then :
-  withval=$with_x;
-fi
+# Check whether --with-x or --without-x was given.
+if test "${with_x+set}" = set; then
+  withval="$with_x"
 
+fi;
 # $have_x is `yes', `no', `disabled', or empty when we do not yet know.
 if test "x$with_x" = xno; then
   # The user explicitly disabled X.
   have_x=disabled
 else
-  case $x_includes,$x_libraries in #(
-    *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
-    *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
-  $as_echo_n "(cached) " >&6
+  if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
+    # Both variables are already set.
+    have_x=yes
+  else
+    if test "${ac_cv_have_x+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # One or both of the vars are not set, and there is no cached value.
 ac_x_includes=no ac_x_libraries=no
-rm -f -r conftest.dir
+rm -fr conftest.dir
 if mkdir conftest.dir; then
   cd conftest.dir
+  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
   cat >Imakefile <<'_ACEOF'
-incroot:
-	@echo incroot='${INCROOT}'
-usrlibdir:
-	@echo usrlibdir='${USRLIBDIR}'
-libdir:
-	@echo libdir='${LIBDIR}'
-_ACEOF
-  if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
-    # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-    for ac_var in incroot usrlibdir libdir; do
-      eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
-    done
+acfindx:
+	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
+_ACEOF
+  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
+    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-    for ac_extension in a so sl dylib la dll; do
-      if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
-	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
+    for ac_extension in a so sl; do
+      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
+	 test -f $ac_im_libdir/libX11.$ac_extension; then
 	ac_im_usrlibdir=$ac_im_libdir; break
       fi
     done
@@ -7677,41 +9396,37 @@ _ACEOF
     # bogus both because they are the default anyway, and because
     # using them would break gcc on systems where it needs fixed includes.
     case $ac_im_incroot in
-	/usr/include) ac_x_includes= ;;
+	/usr/include) ;;
 	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
     esac
     case $ac_im_usrlibdir in
-	/usr/lib | /usr/lib64 | /lib | /lib64) ;;
+	/usr/lib | /lib) ;;
 	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
     esac
   fi
   cd ..
-  rm -f -r conftest.dir
+  rm -fr conftest.dir
 fi
 
 # Standard set of common directories for X headers.
 # Check X11 before X11Rn because it is often a symlink to the current release.
 ac_x_header_dirs='
 /usr/X11/include
-/usr/X11R7/include
 /usr/X11R6/include
 /usr/X11R5/include
 /usr/X11R4/include
 
 /usr/include/X11
-/usr/include/X11R7
 /usr/include/X11R6
 /usr/include/X11R5
 /usr/include/X11R4
 
 /usr/local/X11/include
-/usr/local/X11R7/include
 /usr/local/X11R6/include
 /usr/local/X11R5/include
 /usr/local/X11R4/include
 
 /usr/local/include/X11
-/usr/local/include/X11R7
 /usr/local/include/X11R6
 /usr/local/include/X11R5
 /usr/local/include/X11R4
@@ -7733,14 +9448,38 @@ ac_x_header_dirs='
 if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Xlib.h.
   # First, try using that file with no special directory specified.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <X11/Xlib.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
   # We can compile using X headers with no special include directory.
 ac_x_includes=
 else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   for ac_dir in $ac_x_header_dirs; do
   if test -r "$ac_dir/X11/Xlib.h"; then
     ac_x_includes=$ac_dir
@@ -7748,7 +9487,7 @@ else
   fi
 done
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 fi # $ac_x_includes = no
 
 if test "$ac_x_libraries" = no; then
@@ -7757,7 +9496,11 @@ if test "$ac_x_libraries" = no; then
   # Don't add to $LIBS permanently.
   ac_save_LIBS=$LIBS
   LIBS="-lX11 $LIBS"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <X11/Xlib.h>
 int
@@ -7768,73 +9511,117 @@ XrmInitialize ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
 ac_x_libraries=
 else
-  LIBS=$ac_save_LIBS
-for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+LIBS=$ac_save_LIBS
+for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
 do
   # Don't even attempt the hair of trying to link an X program!
-  for ac_extension in a so sl dylib la dll; do
-    if test -r "$ac_dir/libX11.$ac_extension"; then
+  for ac_extension in a so sl; do
+    if test -r $ac_dir/libXt.$ac_extension; then
       ac_x_libraries=$ac_dir
       break 2
     fi
   done
 done
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 fi # $ac_x_libraries = no
 
-case $ac_x_includes,$ac_x_libraries in #(
-  no,* | *,no | *\'*)
-    # Didn't find X, or a directory has "'" in its name.
-    ac_cv_have_x="have_x=no";; #(
-  *)
-    # Record where we found X for the cache.
-    ac_cv_have_x="have_x=yes\
-	ac_x_includes='$ac_x_includes'\
-	ac_x_libraries='$ac_x_libraries'"
-esac
+if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
+  # Didn't find X anywhere.  Cache the known absence of X.
+  ac_cv_have_x="have_x=no"
+else
+  # Record where we found X for the cache.
+  ac_cv_have_x="have_x=yes \
+		ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
 fi
-;; #(
-    *) have_x=yes;;
-  esac
+fi
+
+  fi
   eval "$ac_cv_have_x"
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5
-$as_echo "$have_x" >&6; }
+  echo "$as_me:$LINENO: result: $have_x" >&5
+echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
   # If each of the values was on the command line, it overrides each guess.
   test "x$x_includes" = xNONE && x_includes=$ac_x_includes
   test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
   # Update the cache value to reflect the command line values.
-  ac_cv_have_x="have_x=yes\
-	ac_x_includes='$x_includes'\
-	ac_x_libraries='$x_libraries'"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5
-$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
+  ac_cv_have_x="have_x=yes \
+		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
+echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
     not_really_there=""
     if test "$no_x" = ""; then
 	if test "$x_includes" = ""; then
-	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <X11/Xlib.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  :
 else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   not_really_there="yes"
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 	else
 	    if test ! -r $x_includes/X11/Xlib.h; then
 		not_really_there="yes"
@@ -7842,25 +9629,49 @@ rm -f conftest.err conftest.i conftest.$ac_ext
 	fi
     fi
     if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11 header files" >&5
-$as_echo_n "checking for X11 header files... " >&6; }
+	echo "$as_me:$LINENO: checking for X11 header files" >&5
+echo $ECHO_N "checking for X11 header files... $ECHO_C" >&6
 	found_xincludes="no"
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <X11/Xlib.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
   found_xincludes="yes"
 else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
   found_xincludes="no"
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 	if test "$found_xincludes" = "no"; then
 	    dirs="/usr/unsupported/include /usr/local/include /usr/X386/include /usr/X11R6/include /usr/X11R5/include /usr/include/X11R5 /usr/include/X11R4 /usr/openwin/include /usr/X11/include /usr/sww/include"
 	    for i in $dirs ; do
 		if test -r $i/X11/Xlib.h; then
-		    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $i" >&5
-$as_echo "$i" >&6; }
+		    echo "$as_me:$LINENO: result: $i" >&5
+echo "${ECHO_T}$i" >&6
 		    XINCLUDES=" -I$i"
 		    found_xincludes="yes"
 		    break
@@ -7874,19 +9685,19 @@ $as_echo "$i" >&6; }
 	fi
     fi
     if test "$found_xincludes" = "no"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: couldn't find any!" >&5
-$as_echo "couldn't find any!" >&6; }
+	echo "$as_me:$LINENO: result: couldn't find any!" >&5
+echo "${ECHO_T}couldn't find any!" >&6
     fi
 
     if test "$no_x" = yes; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11 libraries" >&5
-$as_echo_n "checking for X11 libraries... " >&6; }
+	echo "$as_me:$LINENO: checking for X11 libraries" >&5
+echo $ECHO_N "checking for X11 libraries... $ECHO_C" >&6
 	XLIBSW=nope
 	dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/X11R6/lib /usr/X11R5/lib /usr/lib/X11R5 /usr/lib/X11R4 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib"
 	for i in $dirs ; do
 	    if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl -o -r $i/libX11.dylib; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $i" >&5
-$as_echo "$i" >&6; }
+		echo "$as_me:$LINENO: result: $i" >&5
+echo "${ECHO_T}$i" >&6
 		XLIBSW="-L$i -lX11"
 		x_libraries="$i"
 		break
@@ -7900,50 +9711,78 @@ $as_echo "$i" >&6; }
 	fi
     fi
     if test "$XLIBSW" = nope ; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCreateWindow in -lXwindow" >&5
-$as_echo_n "checking for XCreateWindow in -lXwindow... " >&6; }
-if ${ac_cv_lib_Xwindow_XCreateWindow+:} false; then :
-  $as_echo_n "(cached) " >&6
+	echo "$as_me:$LINENO: checking for XCreateWindow in -lXwindow" >&5
+echo $ECHO_N "checking for XCreateWindow in -lXwindow... $ECHO_C" >&6
+if test "${ac_cv_lib_Xwindow_XCreateWindow+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXwindow  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char XCreateWindow ();
 int
 main ()
 {
-return XCreateWindow ();
+XCreateWindow ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_Xwindow_XCreateWindow=yes
 else
-  ac_cv_lib_Xwindow_XCreateWindow=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_Xwindow_XCreateWindow=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xwindow_XCreateWindow" >&5
-$as_echo "$ac_cv_lib_Xwindow_XCreateWindow" >&6; }
-if test "x$ac_cv_lib_Xwindow_XCreateWindow" = xyes; then :
+echo "$as_me:$LINENO: result: $ac_cv_lib_Xwindow_XCreateWindow" >&5
+echo "${ECHO_T}$ac_cv_lib_Xwindow_XCreateWindow" >&6
+if test $ac_cv_lib_Xwindow_XCreateWindow = yes; then
   XLIBSW=-lXwindow
 fi
 
     fi
     if test "$XLIBSW" = nope ; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: could not find any!  Using -lX11." >&5
-$as_echo "could not find any!  Using -lX11." >&6; }
+	echo "$as_me:$LINENO: result: could not find any!  Using -lX11." >&5
+echo "${ECHO_T}could not find any!  Using -lX11." >&6
 	XLIBSW=-lX11
     fi
 
@@ -7992,37 +9831,65 @@ fi
 #--------------------------------------------------------------------
 
 if test $tk_aqua = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lXbsd" >&5
-$as_echo_n "checking for main in -lXbsd... " >&6; }
-if ${ac_cv_lib_Xbsd_main+:} false; then :
-  $as_echo_n "(cached) " >&6
+    echo "$as_me:$LINENO: checking for main in -lXbsd" >&5
+echo $ECHO_N "checking for main in -lXbsd... $ECHO_C" >&6
+if test "${ac_cv_lib_Xbsd_main+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXbsd  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 
 int
 main ()
 {
-return main ();
+main ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_Xbsd_main=yes
 else
-  ac_cv_lib_Xbsd_main=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_Xbsd_main=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xbsd_main" >&5
-$as_echo "$ac_cv_lib_Xbsd_main" >&6; }
-if test "x$ac_cv_lib_Xbsd_main" = xyes; then :
+echo "$as_me:$LINENO: result: $ac_cv_lib_Xbsd_main" >&5
+echo "${ECHO_T}$ac_cv_lib_Xbsd_main" >&6
+if test $ac_cv_lib_Xbsd_main = yes; then
   LIBS="$LIBS -lXbsd"
 fi
 
@@ -8040,13 +9907,17 @@ fi
 #--------------------------------------------------------------------
 
 if test -d /usr/include/mit -a $tk_aqua = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking MIT X libraries" >&5
-$as_echo_n "checking MIT X libraries... " >&6; }
+    echo "$as_me:$LINENO: checking MIT X libraries" >&5
+echo $ECHO_N "checking MIT X libraries... $ECHO_C" >&6
     tk_oldCFlags=$CFLAGS
     CFLAGS="$CFLAGS -I/usr/include/mit"
     tk_oldLibs=$LIBS
     LIBS="$LIBS -lX11-mit"
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 	#include <X11/Xlib.h>
@@ -8061,19 +9932,43 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+	echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 	XLIBSW="-lX11-mit"
 	XINCLUDES="-I/usr/include/mit"
 
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
     CFLAGS=$tk_oldCFlags
     LIBS=$tk_oldLibs
 fi
@@ -8083,20 +9978,20 @@ fi
 #--------------------------------------------------------------------
 
 if test $tk_aqua = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use xft" >&5
-$as_echo_n "checking whether to use xft... " >&6; }
-    # Check whether --enable-xft was given.
-if test "${enable_xft+set}" = set; then :
-  enableval=$enable_xft; enable_xft=$enableval
+    echo "$as_me:$LINENO: checking whether to use xft" >&5
+echo $ECHO_N "checking whether to use xft... $ECHO_C" >&6
+    # Check whether --enable-xft or --disable-xft was given.
+if test "${enable_xft+set}" = set; then
+  enableval="$enable_xft"
+  enable_xft=$enableval
 else
   enable_xft="default"
-fi
-
+fi;
     XFT_CFLAGS=""
     XFT_LIBS=""
     if test "$enable_xft" = "no" ; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_xft" >&5
-$as_echo "$enable_xft" >&6; }
+	echo "$as_me:$LINENO: result: $enable_xft" >&5
+echo "${ECHO_T}$enable_xft" >&6
     else
 	found_xft="yes"
 			XFT_CFLAGS=`xft-config --cflags 2>/dev/null` || found_xft="no"
@@ -8106,17 +10001,63 @@ $as_echo "$enable_xft" >&6; }
 	    XFT_CFLAGS=`pkg-config --cflags xft fontconfig 2>/dev/null` || found_xft="no"
 	    XFT_LIBS=`pkg-config --libs xft fontconfig 2>/dev/null` || found_xft="no"
 	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_xft" >&5
-$as_echo "$found_xft" >&6; }
+	echo "$as_me:$LINENO: result: $found_xft" >&5
+echo "${ECHO_T}$found_xft" >&6
 		if test "$found_xft" = "yes" ; then
 	    tk_oldCFlags=$CFLAGS
 	    CFLAGS="$CFLAGS $XINCLUDES $XFT_CFLAGS"
 	    tk_oldLibs=$LIBS
 	    LIBS="$tk_oldLIBS $XFT_LIBS $XLIBSW"
-	    ac_fn_c_check_header_compile "$LINENO" "X11/Xft/Xft.h" "ac_cv_header_X11_Xft_Xft_h" "#include <X11/Xlib.h>
-"
-if test "x$ac_cv_header_X11_Xft_Xft_h" = xyes; then :
+	    echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5
+echo $ECHO_N "checking for X11/Xft/Xft.h... $ECHO_C" >&6
+if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <X11/Xlib.h>
+
+#include <X11/Xft/Xft.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_header_X11_Xft_Xft_h=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+ac_cv_header_X11_Xft_Xft_h=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xft_Xft_h" >&5
+echo "${ECHO_T}$ac_cv_header_X11_Xft_Xft_h" >&6
+if test $ac_cv_header_X11_Xft_Xft_h = yes; then
+  :
 else
 
 		found_xft=no
@@ -8132,43 +10073,72 @@ fi
 	    CFLAGS="$CFLAGS $XINCLUDES $XFT_CFLAGS"
 	    tk_oldLibs=$LIBS
 	    LIBS="$tk_oldLIBS $XFT_LIBS $XLIBSW"
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XftFontOpen in -lXft" >&5
-$as_echo_n "checking for XftFontOpen in -lXft... " >&6; }
-if ${ac_cv_lib_Xft_XftFontOpen+:} false; then :
-  $as_echo_n "(cached) " >&6
+
+echo "$as_me:$LINENO: checking for XftFontOpen in -lXft" >&5
+echo $ECHO_N "checking for XftFontOpen in -lXft... $ECHO_C" >&6
+if test "${ac_cv_lib_Xft_XftFontOpen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXft  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char XftFontOpen ();
 int
 main ()
 {
-return XftFontOpen ();
+XftFontOpen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_Xft_XftFontOpen=yes
 else
-  ac_cv_lib_Xft_XftFontOpen=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_Xft_XftFontOpen=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xft_XftFontOpen" >&5
-$as_echo "$ac_cv_lib_Xft_XftFontOpen" >&6; }
-if test "x$ac_cv_lib_Xft_XftFontOpen" = xyes; then :
+echo "$as_me:$LINENO: result: $ac_cv_lib_Xft_XftFontOpen" >&5
+echo "${ECHO_T}$ac_cv_lib_Xft_XftFontOpen" >&6
+if test $ac_cv_lib_Xft_XftFontOpen = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBXFT 1
 _ACEOF
@@ -8189,43 +10159,71 @@ fi
 	    CFLAGS="$CFLAGS $XINCLUDES $XFT_CFLAGS"
 	    tk_oldLibs=$LIBS
 	    LIBS="$tk_oldLIBS $XFT_LIBS $XLIBSW -lfontconfig"
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FcFontSort in -lfontconfig" >&5
-$as_echo_n "checking for FcFontSort in -lfontconfig... " >&6; }
-if ${ac_cv_lib_fontconfig_FcFontSort+:} false; then :
-  $as_echo_n "(cached) " >&6
+	    echo "$as_me:$LINENO: checking for FcFontSort in -lfontconfig" >&5
+echo $ECHO_N "checking for FcFontSort in -lfontconfig... $ECHO_C" >&6
+if test "${ac_cv_lib_fontconfig_FcFontSort+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lfontconfig  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char FcFontSort ();
 int
 main ()
 {
-return FcFontSort ();
+FcFontSort ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_fontconfig_FcFontSort=yes
 else
-  ac_cv_lib_fontconfig_FcFontSort=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_fontconfig_FcFontSort=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fontconfig_FcFontSort" >&5
-$as_echo "$ac_cv_lib_fontconfig_FcFontSort" >&6; }
-if test "x$ac_cv_lib_fontconfig_FcFontSort" = xyes; then :
+echo "$as_me:$LINENO: result: $ac_cv_lib_fontconfig_FcFontSort" >&5
+echo "${ECHO_T}$ac_cv_lib_fontconfig_FcFontSort" >&6
+if test $ac_cv_lib_fontconfig_FcFontSort = yes; then
 
 		XFT_LIBS="$XFT_LIBS -lfontconfig"
 
@@ -8236,8 +10234,8 @@ fi
 	fi
 		if test "$found_xft" = "no" ; then
 	    if test "$enable_xft" = "yes" ; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can't find xft configuration, or xft is unusable" >&5
-$as_echo "$as_me: WARNING: Can't find xft configuration, or xft is unusable" >&2;}
+		{ echo "$as_me:$LINENO: WARNING: Can't find xft configuration, or xft is unusable" >&5
+echo "$as_me: WARNING: Can't find xft configuration, or xft is unusable" >&2;}
 	    fi
 	    enable_xft=no
 	    XFT_CFLAGS=""
@@ -8249,7 +10247,9 @@ $as_echo "$as_me: WARNING: Can't find xft configuration, or xft is unusable" >&2
     if test $enable_xft = "yes" ; then
 	UNIX_FONT_OBJS=tkUnixRFont.o
 
-$as_echo "#define HAVE_XFT 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_XFT 1
+_ACEOF
 
     else
 	UNIX_FONT_OBJS=tkUnixFont.o
@@ -8268,9 +10268,55 @@ if test $tk_aqua = no; then
     tk_oldLibs=$LIBS
     CFLAGS="$CFLAGS $XINCLUDES"
     LIBS="$LIBS $XLIBSW"
-    ac_fn_c_check_header_compile "$LINENO" "X11/XKBlib.h" "ac_cv_header_X11_XKBlib_h" "#include <X11/Xlib.h>
-"
-if test "x$ac_cv_header_X11_XKBlib_h" = xyes; then :
+    echo "$as_me:$LINENO: checking for X11/XKBlib.h" >&5
+echo $ECHO_N "checking for X11/XKBlib.h... $ECHO_C" >&6
+if test "${ac_cv_header_X11_XKBlib_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <X11/Xlib.h>
+
+#include <X11/XKBlib.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_header_X11_XKBlib_h=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_header_X11_XKBlib_h=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_X11_XKBlib_h" >&5
+echo "${ECHO_T}$ac_cv_header_X11_XKBlib_h" >&6
+if test $ac_cv_header_X11_XKBlib_h = yes; then
 
 	xkblib_header_found=yes
 
@@ -8282,43 +10328,71 @@ fi
 
 
     if test $xkblib_header_found = "yes" ; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XkbKeycodeToKeysym in -lX11" >&5
-$as_echo_n "checking for XkbKeycodeToKeysym in -lX11... " >&6; }
-if ${ac_cv_lib_X11_XkbKeycodeToKeysym+:} false; then :
-  $as_echo_n "(cached) " >&6
+	echo "$as_me:$LINENO: checking for XkbKeycodeToKeysym in -lX11" >&5
+echo $ECHO_N "checking for XkbKeycodeToKeysym in -lX11... $ECHO_C" >&6
+if test "${ac_cv_lib_X11_XkbKeycodeToKeysym+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char XkbKeycodeToKeysym ();
 int
 main ()
 {
-return XkbKeycodeToKeysym ();
+XkbKeycodeToKeysym ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_X11_XkbKeycodeToKeysym=yes
 else
-  ac_cv_lib_X11_XkbKeycodeToKeysym=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_X11_XkbKeycodeToKeysym=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XkbKeycodeToKeysym" >&5
-$as_echo "$ac_cv_lib_X11_XkbKeycodeToKeysym" >&6; }
-if test "x$ac_cv_lib_X11_XkbKeycodeToKeysym" = xyes; then :
+echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XkbKeycodeToKeysym" >&5
+echo "${ECHO_T}$ac_cv_lib_X11_XkbKeycodeToKeysym" >&6
+if test $ac_cv_lib_X11_XkbKeycodeToKeysym = yes; then
 
 	    xkbkeycodetokeysym_found=yes
 
@@ -8333,7 +10407,9 @@ fi
     fi
     if test $xkbkeycodetokeysym_found = "yes" ; then
 
-$as_echo "#define HAVE_XKBKEYCODETOKEYSYM 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_XKBKEYCODETOKEYSYM 1
+_ACEOF
 
     fi
     CFLAGS=$tk_oldCFlags
@@ -8345,11 +10421,15 @@ fi
 #--------------------------------------------------------------------
 
 if test $tk_aqua = no && test "$GCC" = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether XKeycodeToKeysym is deprecated" >&5
-$as_echo_n "checking whether XKeycodeToKeysym is deprecated... " >&6; }
+    echo "$as_me:$LINENO: checking whether XKeycodeToKeysym is deprecated" >&5
+echo $ECHO_N "checking whether XKeycodeToKeysym is deprecated... $ECHO_C" >&6
     tk_oldCFlags=$CFLAGS
     CFLAGS="$CFLAGS -Werror"
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
 	#include <X11/Xlib.h>
@@ -8364,22 +10444,48 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+	echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 
 else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
 
-$as_echo "#define XKEYCODETOKEYSYM_IS_DEPRECATED 1" >>confdefs.h
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define XKEYCODETOKEYSYM_IS_DEPRECATED 1
+_ACEOF
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
     CFLAGS=$tk_oldCFlags
 fi
 
@@ -8399,115 +10505,306 @@ if test $tk_aqua = no; then
     LIBS="$tk_oldLibs $XLIBSW"
     xss_header_found=no
     xss_lib_found=no
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to try to use XScreenSaver" >&5
-$as_echo_n "checking whether to try to use XScreenSaver... " >&6; }
-    # Check whether --enable-xss was given.
-if test "${enable_xss+set}" = set; then :
-  enableval=$enable_xss; enable_xss=$enableval
+    echo "$as_me:$LINENO: checking whether to try to use XScreenSaver" >&5
+echo $ECHO_N "checking whether to try to use XScreenSaver... $ECHO_C" >&6
+    # Check whether --enable-xss or --disable-xss was given.
+if test "${enable_xss+set}" = set; then
+  enableval="$enable_xss"
+  enable_xss=$enableval
 else
   enable_xss=yes
-fi
-
+fi;
     if test "$enable_xss" = "no" ; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_xss" >&5
-$as_echo "$enable_xss" >&6; }
+	echo "$as_me:$LINENO: result: $enable_xss" >&5
+echo "${ECHO_T}$enable_xss" >&6
     else
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_xss" >&5
-$as_echo "$enable_xss" >&6; }
-	ac_fn_c_check_header_compile "$LINENO" "X11/extensions/scrnsaver.h" "ac_cv_header_X11_extensions_scrnsaver_h" "#include <X11/Xlib.h>
-"
-if test "x$ac_cv_header_X11_extensions_scrnsaver_h" = xyes; then :
+	echo "$as_me:$LINENO: result: $enable_xss" >&5
+echo "${ECHO_T}$enable_xss" >&6
+	echo "$as_me:$LINENO: checking for X11/extensions/scrnsaver.h" >&5
+echo $ECHO_N "checking for X11/extensions/scrnsaver.h... $ECHO_C" >&6
+if test "${ac_cv_header_X11_extensions_scrnsaver_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <X11/Xlib.h>
+
+#include <X11/extensions/scrnsaver.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_header_X11_extensions_scrnsaver_h=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_header_X11_extensions_scrnsaver_h=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_scrnsaver_h" >&5
+echo "${ECHO_T}$ac_cv_header_X11_extensions_scrnsaver_h" >&6
+if test $ac_cv_header_X11_extensions_scrnsaver_h = yes; then
 
 	    xss_header_found=yes
 
 fi
 
 
-	ac_fn_c_check_func "$LINENO" "XScreenSaverQueryInfo" "ac_cv_func_XScreenSaverQueryInfo"
-if test "x$ac_cv_func_XScreenSaverQueryInfo" = xyes; then :
+	echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo" >&5
+echo $ECHO_N "checking for XScreenSaverQueryInfo... $ECHO_C" >&6
+if test "${ac_cv_func_XScreenSaverQueryInfo+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define XScreenSaverQueryInfo to an innocuous variant, in case <limits.h> declares XScreenSaverQueryInfo.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define XScreenSaverQueryInfo innocuous_XScreenSaverQueryInfo
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char XScreenSaverQueryInfo (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef XScreenSaverQueryInfo
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char XScreenSaverQueryInfo ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_XScreenSaverQueryInfo) || defined (__stub___XScreenSaverQueryInfo)
+choke me
+#else
+char (*f) () = XScreenSaverQueryInfo;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != XScreenSaverQueryInfo;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_XScreenSaverQueryInfo=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+ac_cv_func_XScreenSaverQueryInfo=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_XScreenSaverQueryInfo" >&5
+echo "${ECHO_T}$ac_cv_func_XScreenSaverQueryInfo" >&6
+if test $ac_cv_func_XScreenSaverQueryInfo = yes; then
+  :
 else
 
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XScreenSaverQueryInfo in -lXext" >&5
-$as_echo_n "checking for XScreenSaverQueryInfo in -lXext... " >&6; }
-if ${ac_cv_lib_Xext_XScreenSaverQueryInfo+:} false; then :
-  $as_echo_n "(cached) " >&6
+	    echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXext" >&5
+echo $ECHO_N "checking for XScreenSaverQueryInfo in -lXext... $ECHO_C" >&6
+if test "${ac_cv_lib_Xext_XScreenSaverQueryInfo+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char XScreenSaverQueryInfo ();
 int
 main ()
 {
-return XScreenSaverQueryInfo ();
+XScreenSaverQueryInfo ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XScreenSaverQueryInfo=yes
 else
-  ac_cv_lib_Xext_XScreenSaverQueryInfo=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_Xext_XScreenSaverQueryInfo=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XScreenSaverQueryInfo" >&5
-$as_echo "$ac_cv_lib_Xext_XScreenSaverQueryInfo" >&6; }
-if test "x$ac_cv_lib_Xext_XScreenSaverQueryInfo" = xyes; then :
+echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XScreenSaverQueryInfo" >&5
+echo "${ECHO_T}$ac_cv_lib_Xext_XScreenSaverQueryInfo" >&6
+if test $ac_cv_lib_Xext_XScreenSaverQueryInfo = yes; then
 
 		XLIBSW="$XLIBSW -lXext"
 		xss_lib_found=yes
 
 else
 
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XScreenSaverQueryInfo in -lXss" >&5
-$as_echo_n "checking for XScreenSaverQueryInfo in -lXss... " >&6; }
-if ${ac_cv_lib_Xss_XScreenSaverQueryInfo+:} false; then :
-  $as_echo_n "(cached) " >&6
+		echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXss" >&5
+echo $ECHO_N "checking for XScreenSaverQueryInfo in -lXss... $ECHO_C" >&6
+if test "${ac_cv_lib_Xss_XScreenSaverQueryInfo+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXss -lXext $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
+/* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
 #endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
 char XScreenSaverQueryInfo ();
 int
 main ()
 {
-return XScreenSaverQueryInfo ();
+XScreenSaverQueryInfo ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_lib_Xss_XScreenSaverQueryInfo=yes
 else
-  ac_cv_lib_Xss_XScreenSaverQueryInfo=no
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_Xss_XScreenSaverQueryInfo=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xss_XScreenSaverQueryInfo" >&5
-$as_echo "$ac_cv_lib_Xss_XScreenSaverQueryInfo" >&6; }
-if test "x$ac_cv_lib_Xss_XScreenSaverQueryInfo" = xyes; then :
+echo "$as_me:$LINENO: result: $ac_cv_lib_Xss_XScreenSaverQueryInfo" >&5
+echo "${ECHO_T}$ac_cv_lib_Xss_XScreenSaverQueryInfo" >&6
+if test $ac_cv_lib_Xss_XScreenSaverQueryInfo = yes; then
 
 		    if test "$tcl_cv_ld_weak_l" = yes; then
 			# On Darwin, weak link libXss if possible,
@@ -8529,7 +10826,9 @@ fi
     fi
     if test $enable_xss = yes -a $xss_lib_found = yes -a $xss_header_found = yes; then
 
-$as_echo "#define HAVE_XSS 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_XSS 1
+_ACEOF
 
     fi
     CFLAGS=$tk_oldCFlags
@@ -8541,36 +10840,66 @@ fi
 #	#define for __CHAR_UNSIGNED__.
 #--------------------------------------------------------------------
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether char is unsigned" >&5
-$as_echo_n "checking whether char is unsigned... " >&6; }
-if ${ac_cv_c_char_unsigned+:} false; then :
-  $as_echo_n "(cached) " >&6
+
+echo "$as_me:$LINENO: checking whether char is unsigned" >&5
+echo $ECHO_N "checking whether char is unsigned... $ECHO_C" >&6
+if test "${ac_cv_c_char_unsigned+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
 int
 main ()
 {
 static int test_array [1 - 2 * !(((char) -1) < 0)];
-test_array [0] = 0;
-return test_array [0];
+test_array [0] = 0
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
   ac_cv_c_char_unsigned=no
 else
-  ac_cv_c_char_unsigned=yes
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_c_char_unsigned=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_char_unsigned" >&5
-$as_echo "$ac_cv_c_char_unsigned" >&6; }
+echo "$as_me:$LINENO: result: $ac_cv_c_char_unsigned" >&5
+echo "${ECHO_T}$ac_cv_c_char_unsigned" >&6
 if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then
-  $as_echo "#define __CHAR_UNSIGNED__ 1" >>confdefs.h
+  cat >>confdefs.h <<\_ACEOF
+#define __CHAR_UNSIGNED__ 1
+_ACEOF
 
 fi
 
@@ -8609,38 +10938,38 @@ WISH_RSRC_FILE='wish$(VERSION).rsrc'
 if test "`uname -s`" = "Darwin" ; then
 
     if test "`uname -s`" = "Darwin" ; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to package libraries" >&5
-$as_echo_n "checking how to package libraries... " >&6; }
-	# Check whether --enable-framework was given.
-if test "${enable_framework+set}" = set; then :
-  enableval=$enable_framework; enable_framework=$enableval
+	echo "$as_me:$LINENO: checking how to package libraries" >&5
+echo $ECHO_N "checking how to package libraries... $ECHO_C" >&6
+	# Check whether --enable-framework or --disable-framework was given.
+if test "${enable_framework+set}" = set; then
+  enableval="$enable_framework"
+  enable_framework=$enableval
 else
   enable_framework=no
-fi
-
+fi;
 	if test $enable_framework = yes; then
 	    if test $SHARED_BUILD = 0; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Frameworks can only be built if --enable-shared is yes" >&5
-$as_echo "$as_me: WARNING: Frameworks can only be built if --enable-shared is yes" >&2;}
+		{ echo "$as_me:$LINENO: WARNING: Frameworks can only be built if --enable-shared is yes" >&5
+echo "$as_me: WARNING: Frameworks can only be built if --enable-shared is yes" >&2;}
 		enable_framework=no
 	    fi
 	    if test $tcl_corefoundation = no; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Frameworks can only be used when CoreFoundation is available" >&5
-$as_echo "$as_me: WARNING: Frameworks can only be used when CoreFoundation is available" >&2;}
+		{ echo "$as_me:$LINENO: WARNING: Frameworks can only be used when CoreFoundation is available" >&5
+echo "$as_me: WARNING: Frameworks can only be used when CoreFoundation is available" >&2;}
 		enable_framework=no
 	    fi
 	fi
 	if test $enable_framework = yes; then
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: framework" >&5
-$as_echo "framework" >&6; }
+	    echo "$as_me:$LINENO: result: framework" >&5
+echo "${ECHO_T}framework" >&6
 	    FRAMEWORK_BUILD=1
 	else
 	    if test $SHARED_BUILD = 1; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: shared library" >&5
-$as_echo "shared library" >&6; }
+		echo "$as_me:$LINENO: result: shared library" >&5
+echo "${ECHO_T}shared library" >&6
 	    else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static library" >&5
-$as_echo "static library" >&6; }
+		echo "$as_me:$LINENO: result: static library" >&5
+echo "${ECHO_T}static library" >&6
 	    fi
 	    FRAMEWORK_BUILD=0
 	fi
@@ -8653,7 +10982,7 @@ $as_echo "static library" >&6; }
     EXTRA_WISH_LIBS='-sectcreate __TEXT __info_plist Wish-Info.plist'
     EXTRA_WISH_LIBS=${EXTRA_WISH_LIBS}' -sectcreate __TEXT __credits_html Credits.html'
     EXTRA_APP_CC_SWITCHES="${EXTRA_APP_CC_SWITCHES}"' -mdynamic-no-pic'
-    ac_config_files="$ac_config_files Tk-Info.plist:../macosx/Tk-Info.plist.in Wish-Info.plist:../macosx/Wish-Info.plist.in Credits.html:../macosx/Credits.html.in"
+                                  ac_config_files="$ac_config_files Tk-Info.plist:../macosx/Tk-Info.plist.in Wish-Info.plist:../macosx/Wish-Info.plist.in Credits.html:../macosx/Credits.html.in"
 
     for l in ${LOCALES}; do CFBUNDLELOCALIZATIONS="${CFBUNDLELOCALIZATIONS}<string>$l</string>"; done
     TK_YEAR="`date +%Y`"
@@ -8661,11 +10990,13 @@ fi
 
 if test "$FRAMEWORK_BUILD" = "1" ; then
 
-$as_echo "#define TK_FRAMEWORK 1" >>confdefs.h
+cat >>confdefs.h <<\_ACEOF
+#define TK_FRAMEWORK 1
+_ACEOF
 
     # Construct a fake local framework structure to make linking with
     # '-framework Tk' and running of tktest work
-    ac_config_commands="$ac_config_commands Tk.framework"
+              ac_config_commands="$ac_config_commands Tk.framework"
 
     LD_LIBRARY_PATH_VAR="DYLD_FRAMEWORK_PATH"
     if test "${libdir}" = '${exec_prefix}/lib'; then
@@ -8805,7 +11136,7 @@ TK_SHARED_BUILD=${SHARED_BUILD}
 
 
 
-ac_config_files="$ac_config_files Makefile:../unix/Makefile.in tkConfig.sh:../unix/tkConfig.sh.in tk.pc:../unix/tk.pc.in"
+                              ac_config_files="$ac_config_files Makefile:../unix/Makefile.in tkConfig.sh:../unix/tkConfig.sh.in tk.pc:../unix/tk.pc.in"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -8825,70 +11156,39 @@ _ACEOF
 
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
+# So, don't put newlines in cache variables' values.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
+{
   (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
       sed -n \
 	"s/'/'\\\\''/g;
 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
+      ;;
     *)
       # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      sed -n \
+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
       ;;
-    esac |
-    sort
-) |
+    esac;
+} |
   sed '
-     /^ac_cv_env_/b end
      t clear
-     :clear
+     : clear
      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
      t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    if test "x$cache_file" != "x/dev/null"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
-      if test ! -f "$cache_file" || test -h "$cache_file"; then
-	cat confcache >"$cache_file"
-      else
-        case $cache_file in #(
-        */* | ?:*)
-	  mv -f confcache "$cache_file"$$ &&
-	  mv -f "$cache_file"$$ "$cache_file" ;; #(
-        *)
-	  mv -f confcache "$cache_file" ;;
-	esac
-      fi
-    fi
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
+  if test -w $cache_file; then
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+    cat confcache >$cache_file
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    echo "not updating unwritable cache $cache_file"
   fi
 fi
 rm -f confcache
@@ -8897,55 +11197,63 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix
 # Let make expand exec_prefix.
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+s/:*\$(srcdir):*/:/;
+s/:*\${srcdir}:*/:/;
+s/:*@srcdir@:*/:/;
+s/^\([^=]*=[	 ]*\):*/\1/;
+s/:*$//;
+s/^[^=]*=[	 ]*$//;
+}'
+fi
+
 # Transform confdefs.h into DEFS.
 # Protect against shell expansion while executing Makefile rules.
 # Protect against Makefile macro expansion.
 #
 # If the first sed substitution is executed (which looks for macros that
-# take arguments), then branch to the quote section.  Otherwise,
+# take arguments), then we branch to the quote section.  Otherwise,
 # look for a macro that doesn't take arguments.
-ac_script='
-:mline
-/\\$/{
- N
- s,\\\n,,
- b mline
-}
+cat >confdef2opt.sed <<\_ACEOF
 t clear
-:clear
-s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\)/-D\1=\2/g
+: clear
+s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\),-D\1=\2,g
 t quote
-s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)/-D\1=\2/g
+s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\),-D\1=\2,g
 t quote
-b any
-:quote
-s/[	 `~#$^&*(){}\\|;'\''"<>?]/\\&/g
-s/\[/\\&/g
-s/\]/\\&/g
-s/\$/$$/g
-H
-:any
-${
-	g
-	s/^\n//
-	s/\n/ /g
-	p
-}
-'
-DEFS=`sed -n "$ac_script" confdefs.h`
+d
+: quote
+s,[	 `~#$^&*(){}\\|;'"<>?],\\&,g
+s,\[,\\&,g
+s,\],\\&,g
+s,\$,$$,g
+p
+_ACEOF
+# We use echo to avoid assuming a particular line-breaking character.
+# The extra dot is to prevent the shell from consuming trailing
+# line-breaks from the sub-command output.  A line-break within
+# single-quotes doesn't work because, if this script is created in a
+# platform that uses two characters for line-breaks (e.g., DOS), tr
+# would break.
+ac_LF_and_DOT=`echo; echo .`
+DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
+rm -f confdef2opt.sed
 
 
 ac_libobjs=
 ac_ltlibobjs=
-U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+  ac_i=`echo "$ac_i" |
+	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
+  # 2. Add them.
+  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
+  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
@@ -8954,15 +11262,12 @@ LTLIBOBJS=$ac_ltlibobjs
 
 CFLAGS="${CFLAGS} ${CPPFLAGS}"; CPPFLAGS=""
 
-
-: "${CONFIG_STATUS=./config.status}"
-ac_write_fail=0
+: ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -8972,253 +11277,81 @@ cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 debug=false
 ac_cs_recheck=false
 ac_cs_silent=false
-
 SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+## --------------------- ##
+## M4sh Initialization.  ##
+## --------------------- ##
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  as_unset=unset
 else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
+  as_unset=false
 fi
 
 
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
+# Work around bugs in pre-3.0 UWIN ksh.
+$as_unset ENV MAIL MAILPATH
 PS1='$ '
 PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+for as_var in \
+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+  LC_TELEPHONE LC_TIME
+do
+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+    eval $as_var=C; export $as_var
+  else
+    $as_unset $as_var
   fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
+done
 
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1; then
   as_expr=expr
 else
   as_expr=false
 fi
 
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
   as_basename=basename
 else
   as_basename=false
 fi
 
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
 
-as_me=`$as_basename -- "$0" ||
+# Name of the executable.
+as_me=`$as_basename "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
+	 X"$0" : 'X\(/\)$' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\/\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
 
+
+# PATH needs CR, and LINENO needs CR and PATH.
 # Avoid depending upon Character Ranges.
 as_cr_letters='abcdefghijklmnopqrstuvwxyz'
 as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
@@ -9226,111 +11359,148 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
   else
-    as_ln_s='cp -pR'
+    PATH_SEPARATOR=:
   fi
-else
-  as_ln_s='cp -pR'
+  rm -f conf$$.sh
 fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
 
 
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+  # Find who we are.  Look in the path if we contain no path at all
+  # relative or not.
+  case $0 in
+    *[\\/]* ) as_myself=$0 ;;
+    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
 
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
+       ;;
   esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+  # We did not find ourselves, most probably we were run as `sh COMMAND'
+  # in which case we are not to be found in the path.
+  if test "x$as_myself" = x; then
+    as_myself=$0
+  fi
+  if test ! -f "$as_myself"; then
+    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
+echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+  case $CONFIG_SHELL in
+  '')
+    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for as_base in sh bash ksh sh5; do
+	 case $as_dir in
+	 /*)
+	   if ("$as_dir/$as_base" -c '
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+	     CONFIG_SHELL=$as_dir/$as_base
+	     export CONFIG_SHELL
+	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+	   fi;;
+	 esac
+       done
+done
+;;
+  esac
+
+  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+  # uniformly replaced by the line number.  The first 'sed' inserts a
+  # line-number line before each line; the second 'sed' does the real
+  # work.  The second script uses 'N' to pair each line-number line
+  # with the numbered line, and appends trailing '-' during
+  # substitution so that $LINENO is not a special case at line end.
+  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+  sed '=' <$as_myself |
+    sed '
+      N
+      s,$,-,
+      : loop
+      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+      t loop
+      s,-$,,
+      s,^['$as_cr_digits']*\n,,
+    ' >$as_me.lineno &&
+  chmod +x $as_me.lineno ||
+    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
+echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
+   { (exit 1); exit 1; }; }
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensible to this).
+  . ./$as_me.lineno
+  # Exit status is that of the last command.
+  exit
+}
+
+
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+  *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T='	' ;;
+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+esac
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
 
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
+    as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
+  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
 
-} # as_fn_mkdir_p
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
+  as_mkdir_p=:
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
+as_executable_p="test -f"
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -9339,20 +11509,31 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" 	$as_nl"
+
+# CDPATH.
+$as_unset CDPATH
+
 exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
+
+# Open the log real soon, to keep \$[0] and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
+# values after options handling.  Logging --version etc. is OK.
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+} >&5
+cat >&5 <<_CSEOF
+
 This file was extended by tk $as_me 8.6, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -9360,41 +11541,43 @@ generated by GNU Autoconf 2.69.  Invocation command line was
   CONFIG_COMMANDS = $CONFIG_COMMANDS
   $ $0 $@
 
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
+_CSEOF
+echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
+echo >&5
 _ACEOF
 
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
+# Files that config.status was made for.
+if test -n "$ac_config_files"; then
+  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+fi
 
+if test -n "$ac_config_headers"; then
+  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+fi
 
+if test -n "$ac_config_links"; then
+  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+fi
 
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_commands="$ac_config_commands"
+if test -n "$ac_config_commands"; then
+  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+fi
 
-_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration.  Unless the files
-and actions are specified as TAGs, all are instantiated by default.
+\`$as_me' instantiates files from templates according to the
+current configuration.
 
-Usage: $0 [OPTION]... [TAG]...
+Usage: $0 [OPTIONS] [FILE]...
 
   -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-      --config     print configuration, then exit
-  -q, --quiet, --silent
-                   do not print progress messages
+  -V, --version    print version number, then exit
+  -q, --quiet      do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
-      --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
+  --file=FILE[:TEMPLATE]
+		   instantiate the configuration file FILE
 
 Configuration files:
 $config_files
@@ -9402,78 +11585,83 @@ $config_files
 Configuration commands:
 $config_commands
 
-Report bugs to the package provider."
-
+Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+
+cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 tk config.status 8.6
-configured by $0, generated by GNU Autoconf 2.69,
-  with options \\"\$ac_cs_config\\"
+configured by $0, generated by GNU Autoconf 2.59,
+  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2003 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-test -n "\$AWK" || AWK=awk
+srcdir=$srcdir
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
+cat >>$CONFIG_STATUS <<\_ACEOF
+# If no file are specified by the user, then we need to provide default
+# value.  By we need to know if files were specified by the user.
 ac_need_defaults=:
 while test $# != 0
 do
   case $1 in
-  --*=?*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+  --*=*)
+    ac_option=`expr "x$1" : 'x\([^=]*\)='`
+    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
     ac_shift=:
     ;;
-  --*=)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=
-    ac_shift=:
-    ;;
-  *)
+  -*)
     ac_option=$1
     ac_optarg=$2
     ac_shift=shift
     ;;
+  *) # This is not an option, so the user has probably given explicit
+     # arguments.
+     ac_option=$1
+     ac_need_defaults=false;;
   esac
 
   case $ac_option in
   # Handling of the options.
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
-  --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
+  --version | --vers* | -V )
+    echo "$ac_cs_version"; exit 0 ;;
+  --he | --h)
+    # Conflict between --help and --header
+    { { echo "$as_me:$LINENO: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&5
+echo "$as_me: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&2;}
+   { (exit 1); exit 1; }; };;
+  --help | --hel | -h )
+    echo "$ac_cs_usage"; exit 0 ;;
+  --debug | --d* | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    '') as_fn_error $? "missing file argument" ;;
-    esac
-    as_fn_append CONFIG_FILES " '$ac_optarg'"
+    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    $ac_shift
+    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
     ac_need_defaults=false;;
-  --he | --h |  --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error $? "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
+  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&5
+echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2;}
+   { (exit 1); exit 1; }; } ;;
 
-  *) as_fn_append ac_config_targets " $1"
-     ac_need_defaults=false ;;
+  *) ac_config_targets="$ac_config_targets $1" ;;
 
   esac
   shift
@@ -9487,55 +11675,43 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
 if \$ac_cs_recheck; then
-  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
-  export CONFIG_SHELL
-  exec "\$@"
+  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  $as_echo "$ac_log"
-} >&5
 
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<_ACEOF
 #
-# INIT-COMMANDS
+# INIT-COMMANDS section.
 #
+
 VERSION=${TK_VERSION} && tk_aqua=${tk_aqua}
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
-# Handling of arguments.
+
+cat >>$CONFIG_STATUS <<\_ACEOF
 for ac_config_target in $ac_config_targets
 do
-  case $ac_config_target in
-    "Tk-Info.plist") CONFIG_FILES="$CONFIG_FILES Tk-Info.plist:../macosx/Tk-Info.plist.in" ;;
-    "Wish-Info.plist") CONFIG_FILES="$CONFIG_FILES Wish-Info.plist:../macosx/Wish-Info.plist.in" ;;
-    "Credits.html") CONFIG_FILES="$CONFIG_FILES Credits.html:../macosx/Credits.html.in" ;;
-    "Tk.framework") CONFIG_COMMANDS="$CONFIG_COMMANDS Tk.framework" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile:../unix/Makefile.in" ;;
-    "tkConfig.sh") CONFIG_FILES="$CONFIG_FILES tkConfig.sh:../unix/tkConfig.sh.in" ;;
-    "tk.pc") CONFIG_FILES="$CONFIG_FILES tk.pc:../unix/tk.pc.in" ;;
-
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  case "$ac_config_target" in
+  # Handling of arguments.
+  "Tk-Info.plist" ) CONFIG_FILES="$CONFIG_FILES Tk-Info.plist:../macosx/Tk-Info.plist.in" ;;
+  "Wish-Info.plist" ) CONFIG_FILES="$CONFIG_FILES Wish-Info.plist:../macosx/Wish-Info.plist.in" ;;
+  "Credits.html" ) CONFIG_FILES="$CONFIG_FILES Credits.html:../macosx/Credits.html.in" ;;
+  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile:../unix/Makefile.in" ;;
+  "tkConfig.sh" ) CONFIG_FILES="$CONFIG_FILES tkConfig.sh:../unix/tkConfig.sh.in" ;;
+  "tk.pc" ) CONFIG_FILES="$CONFIG_FILES tk.pc:../unix/tk.pc.in" ;;
+  "Tk.framework" ) CONFIG_COMMANDS="$CONFIG_COMMANDS Tk.framework" ;;
+  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+   { (exit 1); exit 1; }; };;
   esac
 done
 
-
 # If the user did not use the arguments to specify the items to instantiate,
 # then the envvar interface is used.  Set only those that are not.
 # We use the long form for the default assignment because of an extremely
@@ -9546,409 +11722,523 @@ if $ac_need_defaults; then
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
+# simply because there is no reason to put it here, and in addition,
 # creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
+# Create a temporary directory, and hook for its removal unless debugging.
 $debug ||
 {
-  tmp= ac_tmp=
-  trap 'exit_status=$?
-  : "${ac_tmp:=$tmp}"
-  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
-' 0
-  trap 'as_fn_exit 1' 1 2 13 15
+  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+  trap '{ (exit 1); exit 1; }' 1 2 13 15
 }
+
 # Create a (secure) tmp directory for tmp files.
 
 {
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -d "$tmp"
+  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
+  test -n "$tmp" && test -d "$tmp"
 }  ||
 {
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
-  eval ac_cr=\$\'\\r\'
-fi
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
-else
-  ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
-_ACEOF
-
-
-{
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-  if test $ac_delim_n = $ac_delim_num; then
-    break
-  elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-rm -f conf$$subs.sh
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\)..*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\)..*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
-  N
-  s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = ""
-
-}
+  tmp=./confstat$$-$RANDOM
+  (umask 077 && mkdir $tmp)
+} ||
 {
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
+   echo "$me: cannot create a temporary directory in ." >&2
+   { (exit 1); exit 1; }
 }
 
-_ACAWK
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
-  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
-_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
-h
-s///
-s/^/:/
-s/[	 ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
-s/:*$//
-x
-s/\(=[	 ]*\).*/\1/
-G
-s/\n//
-s/^[^=]*=[	 ]*$//
-}'
-fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
-
-
-eval set X "  :F $CONFIG_FILES      :C $CONFIG_COMMANDS"
-shift
-for ac_tag
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
+cat >>$CONFIG_STATUS <<_ACEOF
 
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$ac_tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-      esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      as_fn_append ac_file_inputs " '$ac_f'"
-    done
+#
+# CONFIG_FILES section.
+#
 
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-	`' by configure.'
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
+# No need to generate the scripts if there are no CONFIG_FILES.
+# This happens for instance when ./config.status config.h
+if test -n "\$CONFIG_FILES"; then
+  # Protect against being on the right side of a sed subst in config.status.
+  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+s,@SHELL@,$SHELL,;t t
+s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
+s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
+s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
+s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
+s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
+s,@exec_prefix@,$exec_prefix,;t t
+s,@prefix@,$prefix,;t t
+s,@program_transform_name@,$program_transform_name,;t t
+s,@bindir@,$bindir,;t t
+s,@sbindir@,$sbindir,;t t
+s,@libexecdir@,$libexecdir,;t t
+s,@datadir@,$datadir,;t t
+s,@sysconfdir@,$sysconfdir,;t t
+s,@sharedstatedir@,$sharedstatedir,;t t
+s,@localstatedir@,$localstatedir,;t t
+s,@libdir@,$libdir,;t t
+s,@includedir@,$includedir,;t t
+s,@oldincludedir@,$oldincludedir,;t t
+s,@infodir@,$infodir,;t t
+s,@mandir@,$mandir,;t t
+s,@build_alias@,$build_alias,;t t
+s,@host_alias@,$host_alias,;t t
+s,@target_alias@,$target_alias,;t t
+s,@DEFS@,$DEFS,;t t
+s,@ECHO_C@,$ECHO_C,;t t
+s,@ECHO_N@,$ECHO_N,;t t
+s,@ECHO_T@,$ECHO_T,;t t
+s,@LIBS@,$LIBS,;t t
+s,@TCL_VERSION@,$TCL_VERSION,;t t
+s,@TCL_PATCH_LEVEL@,$TCL_PATCH_LEVEL,;t t
+s,@TCL_BIN_DIR@,$TCL_BIN_DIR,;t t
+s,@TCL_SRC_DIR@,$TCL_SRC_DIR,;t t
+s,@TCL_LIB_FILE@,$TCL_LIB_FILE,;t t
+s,@TCL_LIB_FLAG@,$TCL_LIB_FLAG,;t t
+s,@TCL_LIB_SPEC@,$TCL_LIB_SPEC,;t t
+s,@TCL_STUB_LIB_FILE@,$TCL_STUB_LIB_FILE,;t t
+s,@TCL_STUB_LIB_FLAG@,$TCL_STUB_LIB_FLAG,;t t
+s,@TCL_STUB_LIB_SPEC@,$TCL_STUB_LIB_SPEC,;t t
+s,@TCLSH_PROG@,$TCLSH_PROG,;t t
+s,@BUILD_TCLSH@,$BUILD_TCLSH,;t t
+s,@MAN_FLAGS@,$MAN_FLAGS,;t t
+s,@CC@,$CC,;t t
+s,@CFLAGS@,$CFLAGS,;t t
+s,@LDFLAGS@,$LDFLAGS,;t t
+s,@CPPFLAGS@,$CPPFLAGS,;t t
+s,@ac_ct_CC@,$ac_ct_CC,;t t
+s,@EXEEXT@,$EXEEXT,;t t
+s,@OBJEXT@,$OBJEXT,;t t
+s,@CPP@,$CPP,;t t
+s,@EGREP@,$EGREP,;t t
+s,@TCL_THREADS@,$TCL_THREADS,;t t
+s,@RANLIB@,$RANLIB,;t t
+s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
+s,@AR@,$AR,;t t
+s,@ac_ct_AR@,$ac_ct_AR,;t t
+s,@LIBOBJS@,$LIBOBJS,;t t
+s,@TCL_LIBS@,$TCL_LIBS,;t t
+s,@DL_LIBS@,$DL_LIBS,;t t
+s,@DL_OBJS@,$DL_OBJS,;t t
+s,@PLAT_OBJS@,$PLAT_OBJS,;t t
+s,@PLAT_SRCS@,$PLAT_SRCS,;t t
+s,@LDAIX_SRC@,$LDAIX_SRC,;t t
+s,@CFLAGS_DEBUG@,$CFLAGS_DEBUG,;t t
+s,@CFLAGS_OPTIMIZE@,$CFLAGS_OPTIMIZE,;t t
+s,@CFLAGS_WARNING@,$CFLAGS_WARNING,;t t
+s,@LDFLAGS_DEBUG@,$LDFLAGS_DEBUG,;t t
+s,@LDFLAGS_OPTIMIZE@,$LDFLAGS_OPTIMIZE,;t t
+s,@CC_SEARCH_FLAGS@,$CC_SEARCH_FLAGS,;t t
+s,@LD_SEARCH_FLAGS@,$LD_SEARCH_FLAGS,;t t
+s,@STLIB_LD@,$STLIB_LD,;t t
+s,@SHLIB_LD@,$SHLIB_LD,;t t
+s,@TCL_SHLIB_LD_EXTRAS@,$TCL_SHLIB_LD_EXTRAS,;t t
+s,@TK_SHLIB_LD_EXTRAS@,$TK_SHLIB_LD_EXTRAS,;t t
+s,@SHLIB_LD_LIBS@,$SHLIB_LD_LIBS,;t t
+s,@SHLIB_CFLAGS@,$SHLIB_CFLAGS,;t t
+s,@SHLIB_SUFFIX@,$SHLIB_SUFFIX,;t t
+s,@MAKE_LIB@,$MAKE_LIB,;t t
+s,@MAKE_STUB_LIB@,$MAKE_STUB_LIB,;t t
+s,@INSTALL_LIB@,$INSTALL_LIB,;t t
+s,@DLL_INSTALL_DIR@,$DLL_INSTALL_DIR,;t t
+s,@INSTALL_STUB_LIB@,$INSTALL_STUB_LIB,;t t
+s,@CFLAGS_DEFAULT@,$CFLAGS_DEFAULT,;t t
+s,@LDFLAGS_DEFAULT@,$LDFLAGS_DEFAULT,;t t
+s,@XFT_CFLAGS@,$XFT_CFLAGS,;t t
+s,@XFT_LIBS@,$XFT_LIBS,;t t
+s,@UNIX_FONT_OBJS@,$UNIX_FONT_OBJS,;t t
+s,@TK_VERSION@,$TK_VERSION,;t t
+s,@TK_MAJOR_VERSION@,$TK_MAJOR_VERSION,;t t
+s,@TK_MINOR_VERSION@,$TK_MINOR_VERSION,;t t
+s,@TK_PATCH_LEVEL@,$TK_PATCH_LEVEL,;t t
+s,@TK_YEAR@,$TK_YEAR,;t t
+s,@TK_LIB_FILE@,$TK_LIB_FILE,;t t
+s,@TK_LIB_FLAG@,$TK_LIB_FLAG,;t t
+s,@TK_LIB_SPEC@,$TK_LIB_SPEC,;t t
+s,@TK_STUB_LIB_FILE@,$TK_STUB_LIB_FILE,;t t
+s,@TK_STUB_LIB_FLAG@,$TK_STUB_LIB_FLAG,;t t
+s,@TK_STUB_LIB_SPEC@,$TK_STUB_LIB_SPEC,;t t
+s,@TK_STUB_LIB_PATH@,$TK_STUB_LIB_PATH,;t t
+s,@TK_INCLUDE_SPEC@,$TK_INCLUDE_SPEC,;t t
+s,@TK_BUILD_STUB_LIB_SPEC@,$TK_BUILD_STUB_LIB_SPEC,;t t
+s,@TK_BUILD_STUB_LIB_PATH@,$TK_BUILD_STUB_LIB_PATH,;t t
+s,@TK_SRC_DIR@,$TK_SRC_DIR,;t t
+s,@TK_SHARED_BUILD@,$TK_SHARED_BUILD,;t t
+s,@LD_LIBRARY_PATH_VAR@,$LD_LIBRARY_PATH_VAR,;t t
+s,@TK_BUILD_LIB_SPEC@,$TK_BUILD_LIB_SPEC,;t t
+s,@TCL_STUB_FLAGS@,$TCL_STUB_FLAGS,;t t
+s,@XINCLUDES@,$XINCLUDES,;t t
+s,@XLIBSW@,$XLIBSW,;t t
+s,@LOCALES@,$LOCALES,;t t
+s,@TK_WINDOWINGSYSTEM@,$TK_WINDOWINGSYSTEM,;t t
+s,@TK_PKG_DIR@,$TK_PKG_DIR,;t t
+s,@TK_LIBRARY@,$TK_LIBRARY,;t t
+s,@LIB_RUNTIME_DIR@,$LIB_RUNTIME_DIR,;t t
+s,@PRIVATE_INCLUDE_DIR@,$PRIVATE_INCLUDE_DIR,;t t
+s,@HTML_DIR@,$HTML_DIR,;t t
+s,@EXTRA_CC_SWITCHES@,$EXTRA_CC_SWITCHES,;t t
+s,@EXTRA_APP_CC_SWITCHES@,$EXTRA_APP_CC_SWITCHES,;t t
+s,@EXTRA_INSTALL@,$EXTRA_INSTALL,;t t
+s,@EXTRA_INSTALL_BINARIES@,$EXTRA_INSTALL_BINARIES,;t t
+s,@EXTRA_BUILD_HTML@,$EXTRA_BUILD_HTML,;t t
+s,@EXTRA_WISH_LIBS@,$EXTRA_WISH_LIBS,;t t
+s,@CFBUNDLELOCALIZATIONS@,$CFBUNDLELOCALIZATIONS,;t t
+s,@TK_RSRC_FILE@,$TK_RSRC_FILE,;t t
+s,@WISH_RSRC_FILE@,$WISH_RSRC_FILE,;t t
+s,@LIB_RSRC_FILE@,$LIB_RSRC_FILE,;t t
+s,@APP_RSRC_FILE@,$APP_RSRC_FILE,;t t
+s,@REZ@,$REZ,;t t
+s,@REZ_FLAGS@,$REZ_FLAGS,;t t
+s,@LTLIBOBJS@,$LTLIBOBJS,;t t
+CEOF
+
+_ACEOF
+
+  cat >>$CONFIG_STATUS <<\_ACEOF
+  # Split the substitutions into bite-sized pieces for seds with
+  # small command number limits, like on Digital OSF/1 and HP-UX.
+  ac_max_sed_lines=48
+  ac_sed_frag=1 # Number of current file.
+  ac_beg=1 # First line for current file.
+  ac_end=$ac_max_sed_lines # Line after last line for current file.
+  ac_more_lines=:
+  ac_sed_cmds=
+  while $ac_more_lines; do
+    if test $ac_beg -gt 1; then
+      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    else
+      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
     fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
+    if test ! -s $tmp/subs.frag; then
+      ac_more_lines=false
+    else
+      # The purpose of the label and of the branching condition is to
+      # speed up the sed processing (if there are no `@' at all, there
+      # is no need to browse any of the substitutions).
+      # These are the two extra sed commands mentioned above.
+      (echo ':t
+  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+      if test -z "$ac_sed_cmds"; then
+	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+      else
+	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+      fi
+      ac_sed_frag=`expr $ac_sed_frag + 1`
+      ac_beg=$ac_end
+      ac_end=`expr $ac_end + $ac_max_sed_lines`
+    fi
+  done
+  if test -z "$ac_sed_cmds"; then
+    ac_sed_cmds=cat
+  fi
+fi # test -n "$CONFIG_FILES"
 
-    case $ac_tag in
-    *:-:* | *:-) cat >"$ac_tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
-    esac
-    ;;
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+  case $ac_file in
+  - | *:- | *:-:* ) # input from stdin
+	cat >$tmp/stdin
+	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  * )   ac_file_in=$ac_file.in ;;
   esac
 
-  ac_dir=`$as_dirname -- "$ac_file" ||
+  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
 $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  as_dir="$ac_dir"; as_fn_mkdir_p
+	 X"$ac_file" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+  { if $as_mkdir_p; then
+    mkdir -p "$ac_dir"
+  else
+    as_dir="$ac_dir"
+    as_dirs=
+    while test ! -d "$as_dir"; do
+      as_dirs="$as_dir $as_dirs"
+      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+    done
+    test ! -n "$as_dirs" || mkdir $as_dirs
+  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+   { (exit 1); exit 1; }; }; }
+
   ac_builddir=.
 
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
+if test "$ac_dir" != .; then
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+  ac_dir_suffix= ac_top_builddir=
+fi
 
 case $srcdir in
-  .)  # We are building in place.
+  .)  # No --srcdir option.  We are building in place.
     ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.
     ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+    ac_top_srcdir=$srcdir ;;
+  *) # Relative path.
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
 esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+  case "$ac_dir" in
+  .) ac_abs_builddir=`pwd`;;
+  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+  case ${ac_top_builddir}. in
+  .) ac_abs_top_builddir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+  case $ac_srcdir in
+  .) ac_abs_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+  case $ac_top_srcdir in
+  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+  esac;;
+esac
 
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
 
-_ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-ac_sed_dataroot='
-/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-  s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
+  if test x"$ac_file" != x-; then
+    { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
+  # Let's still pretend it is `configure' which instantiates (i.e., don't
+  # use $as_me), people would be surprised to read:
+  #    /* config.h.  Generated by config.status.  */
+  if test x"$ac_file" = x-; then
+    configure_input=
+  else
+    configure_input="$ac_file.  "
+  fi
+  configure_input=$configure_input"Generated from `echo $ac_file_in |
+				     sed 's,.*/,,'` by configure."
+
+  # First look for the input files in the build tree, otherwise in the
+  # src tree.
+  ac_file_inputs=`IFS=:
+    for f in $ac_file_in; do
+      case $f in
+      -) echo $tmp/stdin ;;
+      [\\/$]*)
+	 # Absolute (can't be DOS-style, as IFS=:)
+	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+	 echo "$f";;
+      *) # Relative
+	 if test -f "$f"; then
+	   # Build tree
+	   echo "$f"
+	 elif test -f "$srcdir/$f"; then
+	   # Source tree
+	   echo "$srcdir/$f"
+	 else
+	   # /dev/null tree
+	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+	 fi;;
+      esac
+    done` || { (exit 1); exit 1; }
 _ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF
+  sed "$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+cat >>$CONFIG_STATUS <<\_ACEOF
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
-  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
-      "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&2;}
-
-  rm -f "$ac_tmp/stdin"
-  case $ac_file in
-  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
-  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
-  esac \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- ;;
+s,@configure_input@,$configure_input,;t t
+s,@srcdir@,$ac_srcdir,;t t
+s,@abs_srcdir@,$ac_abs_srcdir,;t t
+s,@top_srcdir@,$ac_top_srcdir,;t t
+s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
+s,@builddir@,$ac_builddir,;t t
+s,@abs_builddir@,$ac_abs_builddir,;t t
+s,@top_builddir@,$ac_top_builddir,;t t
+s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
+" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+  rm -f $tmp/stdin
+  if test x"$ac_file" != x-; then
+    mv $tmp/out $ac_file
+  else
+    cat $tmp/out
+    rm -f $tmp/out
+  fi
 
+done
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
 
-  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
+#
+# CONFIG_COMMANDS section.
+#
+for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
+  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
+$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_dest" : 'X\(//\)[^/]' \| \
+	 X"$ac_dest" : 'X\(//\)$' \| \
+	 X"$ac_dest" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X"$ac_dest" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+  { if $as_mkdir_p; then
+    mkdir -p "$ac_dir"
+  else
+    as_dir="$ac_dir"
+    as_dirs=
+    while test ! -d "$as_dir"; do
+      as_dirs="$as_dir $as_dirs"
+      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+    done
+    test ! -n "$as_dirs" || mkdir $as_dirs
+  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+   { (exit 1); exit 1; }; }; }
+
+  ac_builddir=.
+
+if test "$ac_dir" != .; then
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+  ac_dir_suffix= ac_top_builddir=
+fi
 
+case $srcdir in
+  .)  # No --srcdir option.  We are building in place.
+    ac_srcdir=.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir ;;
+  *) # Relative path.
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
 
-  case $ac_file$ac_mode in
-    "Tk.framework":C) n=Tk &&
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+  case "$ac_dir" in
+  .) ac_abs_builddir=`pwd`;;
+  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+  case ${ac_top_builddir}. in
+  .) ac_abs_top_builddir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+  case $ac_srcdir in
+  .) ac_abs_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+  case $ac_top_srcdir in
+  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+  esac;;
+esac
+
+
+  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
+echo "$as_me: executing $ac_dest commands" >&6;}
+  case $ac_dest in
+    Tk.framework ) n=Tk &&
         f=$n.framework && v=Versions/$VERSION &&
         rm -rf $f && mkdir -p $f/$v/Resources &&
         ln -s $v/$n $v/Resources $f && ln -s ../../../$n $f/$v &&
@@ -9956,18 +12246,17 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
         if test $tk_aqua = yes; then ln -s ../../../../$n.rsrc $f/$v/Resources; fi &&
         unset n f v
      ;;
-
   esac
-done # for ac_tag
+done
+_ACEOF
 
+cat >>$CONFIG_STATUS <<\_ACEOF
 
-as_fn_exit 0
+{ (exit 0); exit 0; }
 _ACEOF
+chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
-test $ac_write_fail = 0 ||
-  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
-
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -9987,11 +12276,7 @@ if test "$no_create" != yes; then
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit 1
-fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+  $ac_cs_success || { (exit 1); exit 1; }
 fi
 
 
-- 
cgit v0.12


From fabaa9a4a02eeac5385cd1693876a5f3748e6efd Mon Sep 17 00:00:00 2001
From: marc_culler <marc.culler@gmail.com>
Date: Fri, 6 Nov 2020 16:40:25 +0000
Subject: Update the man page for tk::mac::standardAboutPanel

---
 doc/tk_mac.n | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/doc/tk_mac.n b/doc/tk_mac.n
index 87c43aa..f42fa66 100644
--- a/doc/tk_mac.n
+++ b/doc/tk_mac.n
@@ -218,11 +218,17 @@ support.
 .TP
 \fB::tk::mac::standardAboutPanel\fR
 .
-Brings the standard Cocoa about panel to the front, with all its information
-filled in from your application bundle files (standard about panel with no
-options specified). See Apple Technote TN2179 and the AppKit documentation for
--[NSApplication orderFrontStandardAboutPanelWithOptions:] for details on the
-Info.plist keys and app bundle files used by the about panel.
+Brings the standard Cocoa about panel to the front with information filled in
+from the application bundle files. The panel displays the application icon and
+the values associated to the info.plist keys named CFBundleName,
+CFBundleShortVersionString, NSAboutPanelOptionVersion and
+NSHumanReadableCopyright.  If a file named \fICredits.html\fR or
+\fICredits.rtf\fR exists in the bundle's Resources directory then its contents
+will be displayed in a scrolling text box at the bottom of the dialog. See the
+documentation for -[NSApplication orderFrontStandardAboutPanelWithOptions:]
+for more details. A hook is also provided for a custom About dialog.  If a Tcl
+proc named tkAboutDialog is defined in the main interpreter then that
+procedure will be called instead of opening the standardAboutPanel.
 .SH "SYSTEM CONFIGURATION"
 .PP
 There are a number of additional global configuration options that control the
-- 
cgit v0.12


From d0302a7516eb49d7b73d356685cda4d964749ce0 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sat, 7 Nov 2020 18:13:42 +0000
Subject: Add non regression test for bug [4ebcc04dc4]

---
 tests/fontchooser.test | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/fontchooser.test b/tests/fontchooser.test
index 3ec7309..f34349a 100644
--- a/tests/fontchooser.test
+++ b/tests/fontchooser.test
@@ -11,7 +11,7 @@ testConstraint failsOnUbuntuNoXft [expr {[testConstraint failsOnUbuntu] || (![ca
 
 # the following helper functions are related to the functions used
 # in winDialog.test where they are used to send messages to the win32
-# dialog (hence the wierdness).
+# dialog (hence the weirdness).
 
 proc start {cmd} {
     set ::tk_dialog {}
@@ -193,6 +193,12 @@ test fontchooser-4.4 {fontchooser -font} -constraints {scriptImpl failsOnUbuntuN
     lrange $::testfont 1 end
 } -result {14 bold}
 
+test fontchooser-5.1 {fontchooser multiple configure} -constraints {scriptImpl} -body {
+    tk fontchooser configure -title TestTitle -command foo
+    tk fontchooser configure -command bar
+    tk fontchooser configure -title
+} -result {TestTitle}
+
 # -------------------------------------------------------------------------
 
 cleanupTests
-- 
cgit v0.12