Merge 8.6

7 files changed, 44 insertions, 43 deletions

diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index 73854c8..1388367 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -636,10 +636,10 @@ declare 184 {
 }
 
 # Support for aqua's inability to draw outside [NSView drawRect:]
-declare 185 aqua {
+declare 185 macosx {
     void TkpRedrawWidget(Tk_Window tkwin)
 }
-declare 186 aqua {
+declare 186 macosx {
     int TkpWillDrawWidget(Tk_Window tkwin)
 }
 
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h
index cee4da2..6741704 100644
--- a/generic/tkIntDecls.h
+++ b/generic/tkIntDecls.h
@@ -558,14 +558,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 */
+#ifdef MAC_OSX_TCL /* MACOSX */
 /* 185 */
 EXTERN void		TkpRedrawWidget(Tk_Window tkwin);
-#endif /* AQUA */
-#ifdef MAC_OSX_TK /* AQUA */
+#endif /* MACOSX */
+#ifdef MAC_OSX_TCL /* MACOSX */
 /* 186 */
 EXTERN int		TkpWillDrawWidget(Tk_Window tkwin);
-#endif /* AQUA */
+#endif /* MACOSX */
 /* 187 */
 EXTERN int		TkDebugPhotoStringMatchDef(Tcl_Interp *inter,
 				Tcl_Obj *data, Tcl_Obj *formatString,
@@ -787,26 +787,24 @@ 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 */
+#if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */
     void (*reserved185)(void);
-#endif /* X11 */
+#endif /* UNIX */
 #if defined(_WIN32) /* WIN */
     void (*reserved185)(void);
 #endif /* WIN */
-#ifdef MAC_OSX_TK /* AQUA */
-    void (*reserved185)(void); /* Dummy entry for stubs table backwards compatibility */
+#ifdef MAC_OSX_TCL /* MACOSX */
     void (*tkpRedrawWidget) (Tk_Window tkwin); /* 185 */
-#endif /* AQUA */
-#if !(defined(_WIN32) || defined(MAC_OSX_TK)) /* X11 */
+#endif /* MACOSX */
+#if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */
     void (*reserved186)(void);
-#endif /* X11 */
+#endif /* UNIX */
 #if defined(_WIN32) /* WIN */
     void (*reserved186)(void);
 #endif /* WIN */
-#ifdef MAC_OSX_TK /* AQUA */
-    void (*reserved186)(void); /* Dummy entry for stubs table backwards compatibility */
+#ifdef MAC_OSX_TCL /* MACOSX */
     int (*tkpWillDrawWidget) (Tk_Window tkwin); /* 186 */
-#endif /* AQUA */
+#endif /* MACOSX */
     int (*tkDebugPhotoStringMatchDef) (Tcl_Interp *inter, Tcl_Obj *data, Tcl_Obj *formatString, int *widthPtr, int *heightPtr); /* 187 */
 } TkIntStubs;
 
@@ -1180,14 +1178,14 @@ extern const TkIntStubs *tkIntStubsPtr;
 	(tkIntStubsPtr->tkIntersectAngledTextLayout) /* 183 */
 #define TkDrawAngledChars \
 	(tkIntStubsPtr->tkDrawAngledChars) /* 184 */
-#ifdef MAC_OSX_TK /* AQUA */
+#ifdef MAC_OSX_TCL /* MACOSX */
 #define TkpRedrawWidget \
 	(tkIntStubsPtr->tkpRedrawWidget) /* 185 */
-#endif /* AQUA */
-#ifdef MAC_OSX_TK /* AQUA */
+#endif /* MACOSX */
+#ifdef MAC_OSX_TCL /* MACOSX */
 #define TkpWillDrawWidget \
 	(tkIntStubsPtr->tkpWillDrawWidget) /* 186 */
-#endif /* AQUA */
+#endif /* MACOSX */
 #define TkDebugPhotoStringMatchDef \
 	(tkIntStubsPtr->tkDebugPhotoStringMatchDef) /* 187 */
 
@@ -1207,4 +1205,11 @@ extern const TkIntStubs *tkIntStubsPtr;
 #undef TkSendCleanup_
 #undef TkpTestsendCmd_
 
+#if !defined(MAC_OSX_TK)
+#   undef TkpWillDrawWidget
+#   undef TkpRedrawWidget
+#   define TkpWillDrawWidget(w) 0
+#   define TkpRedrawWidget(w)
+#endif
+
 #endif /* _TKINTDECLS */
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 686fa80..bdcc4ae 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -81,10 +81,11 @@ doNothing(void)
 }
 #endif
 #else
-static void
+static void *
 doNothing(void)
 {
     /* dummy implementation, no need to do anything */
+    return NULL;
 }
 #define Tk_FreeXId ((void (*)(Display *, XID))(void *)doNothing)
 #define Tk_FreeStyleFromObj ((void (*)(Tcl_Obj *))(void *)doNothing)
@@ -113,6 +114,12 @@ static Tk_Style Tk_GetStyleFromObj(Tcl_Obj *obj)
 		(const char *(*) (void *,Tk_Window, char *, int, \
 		Tcl_FreeProc **))(void *)TkCanvasTagsPrintProc
 
+#if !defined(MAC_OSX_TK)
+#   undef TkpWillDrawWidget
+#   undef TkpRedrawWidget
+#   define TkpWillDrawWidget ((int (*)(Tk_Window))(void *)doNothing)
+#   define TkpRedrawWidget ((void (*)(Tk_Window))(void *)doNothing)
+#endif
 
 #ifdef _WIN32
 
@@ -501,26 +508,24 @@ static const TkIntStubs tkIntStubs = {
     TkUnderlineAngledTextLayout, /* 182 */
     TkIntersectAngledTextLayout, /* 183 */
     TkDrawAngledChars, /* 184 */
-#if !(defined(_WIN32) || defined(MAC_OSX_TK)) /* X11 */
+#if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */
     0, /* 185 */
-#endif /* X11 */
+#endif /* UNIX */
 #if defined(_WIN32) /* WIN */
     0, /* 185 */
 #endif /* WIN */
-#ifdef MAC_OSX_TK /* AQUA */
-    0, /* 185 */ /* Dummy entry for stubs table backwards compatibility */
+#ifdef MAC_OSX_TCL /* MACOSX */
     TkpRedrawWidget, /* 185 */
-#endif /* AQUA */
-#if !(defined(_WIN32) || defined(MAC_OSX_TK)) /* X11 */
+#endif /* MACOSX */
+#if !defined(_WIN32) && !defined(MAC_OSX_TCL) /* UNIX */
     0, /* 186 */
-#endif /* X11 */
+#endif /* UNIX */
 #if defined(_WIN32) /* WIN */
     0, /* 186 */
 #endif /* WIN */
-#ifdef MAC_OSX_TK /* AQUA */
-    0, /* 186 */ /* Dummy entry for stubs table backwards compatibility */
+#ifdef MAC_OSX_TCL /* MACOSX */
     TkpWillDrawWidget, /* 186 */
-#endif /* AQUA */
+#endif /* MACOSX */
     TkDebugPhotoStringMatchDef, /* 187 */
 };
 
diff --git a/tests/focus.test b/tests/focus.test
index 7c40f1d..7da289d 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/unix/Makefile.in b/unix/Makefile.in
index b0d2bcf..c22f8fb 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -632,8 +632,8 @@ $(TKTEST_EXE): $(TKTEST_OBJS) $(TK_LIB_FILE)
 	$(MAKE) tktest-real LIB_RUNTIME_DIR="`pwd`:$(TCL_BIN_DIR)"
 
 tktest-real: ${TK_STUB_LIB_FILE}
-	${CC} ${CFLAGS} ${LDFLAGS} $(TKTEST_OBJS) ${TK_STUB_LIB_FILE} ${TCL_STUB_LIB_SPEC} @TK_BUILD_LIB_SPEC@ \
-		$(WISH_LIBS) $(CC_SEARCH_FLAGS) -o $(TKTEST_EXE)
+	${CC} ${CFLAGS} ${LDFLAGS} $(TKTEST_OBJS) @TK_BUILD_LIB_SPEC@ $(WISH_LIBS) \
+		${TK_STUB_LIB_FILE} ${TCL_STUB_LIB_SPEC} $(CC_SEARCH_FLAGS) -o $(TKTEST_EXE)
 
 # # FIXME: This xttest rule seems to be broken in a number of ways.  It should
 # # use CC_SEARCH_FLAGS, it does not include the shared lib location logic from
diff --git a/unix/tkUnixPort.h b/unix/tkUnixPort.h
index da38710..347c9d8 100644
--- a/unix/tkUnixPort.h
+++ b/unix/tkUnixPort.h
@@ -149,8 +149,6 @@
 
 #define TkpButtonSetDefaults() {}
 #define TkpDestroyButton(butPtr) {}
-#define TkpWillDrawWidget(tkwin) 0
-#define TkpRedrawWidget(tkwin)
 #define TkSelUpdateClipboard(a,b) {}
 #ifndef __CYGWIN__
 #define TkSetPixmapColormap(p,c) {}
diff --git a/win/tkWinPort.h b/win/tkWinPort.h
index 955e9b8..8df19ed 100644
--- a/win/tkWinPort.h
+++ b/win/tkWinPort.h
@@ -133,11 +133,4 @@
 #define TkpCreateNativeBitmap(display, source) None
 #define TkpGetNativeAppBitmap(display, name, w, h) None
 
-/*
- * Other functions not used under Windows
- */
-
-#define TkpWillDrawWidget(tkwin) 0
-#define TkpRedrawWidget(tkwin)
-
 #endif /* _WINPORT */