Merge trunkcore-tk-print-fixes

21 files changed, 132 insertions, 145 deletions

diff --git a/unix/Makefile.in b/unix/Makefile.in
index 3c2f890..d4cc7aa 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -223,8 +223,8 @@ INSTALL_STRIP_PROGRAM	= strip
 INSTALL_STRIP_LIBRARY	= strip -x
 
 INSTALL			= $(SHELL) $(UNIX_DIR)/install-sh -c
-INSTALL_PROGRAM		= ${INSTALL}
-INSTALL_LIBRARY		= ${INSTALL}
+INSTALL_PROGRAM		= ${INSTALL} -m 755
+INSTALL_LIBRARY		= ${INSTALL} -m 755
 INSTALL_DATA		= ${INSTALL} -m 644
 INSTALL_DATA_DIR	= ${INSTALL} -d -m 755
 
@@ -385,8 +385,8 @@ TTK_OBJS = \
 	ttkInit.o ttkLabel.o ttkLayout.o ttkManager.o ttkNotebook.o \
 	ttkPanedwindow.o ttkProgress.o ttkScale.o ttkScrollbar.o ttkScroll.o \
 	ttkSeparator.o ttkSquare.o ttkState.o \
-	ttkTagSet.o ttkTheme.o ttkTrace.o ttkTrack.o ttkTreeview.o \
-	ttkWidget.o ttkStubInit.o
+	ttkTagSet.o ttkTheme.o ttkToggleswitch.o ttkTrace.o ttkTrack.o \
+	ttkTreeview.o ttkWidget.o ttkStubInit.o
 
 STUB_OBJS = tkStubInit.o
 
@@ -495,6 +495,7 @@ TTK_SRCS = \
 	$(TTK_DIR)/ttkState.c \
 	$(TTK_DIR)/ttkTagSet.c \
 	$(TTK_DIR)/ttkTheme.c \
+	$(TTK_DIR)/ttkToggleswitch.c \
 	$(TTK_DIR)/ttkTrace.c \
 	$(TTK_DIR)/ttkTrack.c \
 	$(TTK_DIR)/ttkTreeview.c \
@@ -722,10 +723,10 @@ tktest-real: ${TK_STUB_LIB_FILE}
 test: test-classic test-ttk
 
 test-classic: $(TKTEST_EXE)
-	$(SHELL_ENV) ./$(TKTEST_EXE) $(TEST_DIR)/all.tcl -geometry +0+0 $(TESTFLAGS)
+	$(SHELL_ENV) ./$(TKTEST_EXE) $(TEST_DIR)/all.tcl $(TESTFLAGS)
 
 test-ttk: $(TKTEST_EXE)
-	$(SHELL_ENV) ./$(TKTEST_EXE) $(TEST_DIR)/ttk/all.tcl -geometry +0+0 \
+	$(SHELL_ENV) ./$(TKTEST_EXE) $(TEST_DIR)/ttk/all.tcl \
 	$(TESTFLAGS)
 
 # Tests with different languages
@@ -734,7 +735,7 @@ testlang: $(TKTEST_EXE)
 	for lang in $(LOCALES) ;  \
 	do \
 	LANG=$(lang); export LANG; \
-	./$(TKTEST_EXE) $(TEST_DIR)/all.tcl -geometry +0+0 \
+	./$(TKTEST_EXE) $(TEST_DIR)/all.tcl \
 	$(TESTFLAGS); \
 	done
 
@@ -761,7 +762,7 @@ gdb: ${WISH_EXE}
 VALGRINDARGS=--tool=memcheck --num-callers=8 --leak-resolution=high --leak-check=yes --show-reachable=yes -v
 
 valgrind: $(TKTEST_EXE)
-	$(SHELL_ENV) valgrind $(VALGRINDARGS) ./$(TKTEST_EXE) $(TEST_DIR)/all.tcl -geometry +0+0 -singleproc 1 $(TESTFLAGS)
+	$(SHELL_ENV) valgrind $(VALGRINDARGS) ./$(TKTEST_EXE) $(TEST_DIR)/all.tcl -singleproc 1 $(TESTFLAGS)
 
 valgrindshell: $(TKTEST_EXE)
 	$(SHELL_ENV) valgrind $(VALGRINDARGS) ./$(TKTEST_EXE) $(SCRIPT)
@@ -812,10 +813,8 @@ install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) ${WISH_EXE}
 	    fi
 	@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
 	@@INSTALL_LIB@
-	@chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
 	@if test -f "tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \
 	    $(INSTALL_LIBRARY) "tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\
-	    chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\
 	fi
 	@echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}"
 	@$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}"
@@ -970,7 +969,7 @@ Makefile: $(UNIX_DIR)/Makefile.in
 
 clean:
 	rm -rf *.vfs
-	rm -f *.a *.o libtk* libtcl9tk* core errs *~ \#* TAGS *.E a.out \
+	rm -f *.a *.o libtk* libtcl9tk* cygtcl9tk* core errs *~ \#* TAGS *.E a.out \
 		errors ${WISH_EXE} $(TKTEST_EXE) lib.exp Tk *.rsrc \
 		 *.zip
 
@@ -1424,9 +1423,6 @@ tkMacOSXPrint.o: $(MAC_OSX_DIR)/tkMacOSXPrint.c
 tkMacOSXRegion.o: $(MAC_OSX_DIR)/tkMacOSXRegion.c
 	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXRegion.c
 
-tkMacOSXScale.o: $(MAC_OSX_DIR)/tkMacOSXScale.c
-	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXScale.c
-
 tkMacOSXScrlbr.o: $(MAC_OSX_DIR)/tkMacOSXScrlbr.c
 	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXScrlbr.c
 
@@ -1559,6 +1555,9 @@ ttkTagSet.o: $(TTK_DIR)/ttkTagSet.c
 ttkTheme.o: $(TTK_DIR)/ttkTheme.c
 	$(CC) -c $(CC_SWITCHES) $(TTK_DIR)/ttkTheme.c
 
+ttkToggleswitch.o: $(TTK_DIR)/ttkToggleswitch.c
+	$(CC) -c $(CC_SWITCHES) $(TTK_DIR)/ttkToggleswitch.c
+
 ttkTrace.o: $(TTK_DIR)/ttkTrace.c
 	$(CC) -c $(CC_SWITCHES) $(TTK_DIR)/ttkTrace.c
 
@@ -1729,8 +1728,7 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in \
 		$(DISTDIR)/macosx
 	$(DIST_INSTALL_DATA) $(TOP_DIR)/license.terms $(DISTDIR)/macosx
 	$(INSTALL_DATA_DIR) $(DISTDIR)/compat
-	$(DIST_INSTALL_DATA) $(TOP_DIR)/license.terms \
-		$(TOP_DIR)/compat/stdbool.h $(DISTDIR)/compat
+	$(DIST_INSTALL_DATA) $(TOP_DIR)/license.terms $(DISTDIR)/compat
 	$(INSTALL_DATA_DIR) $(DISTDIR)/xlib
 	$(DIST_INSTALL_DATA) $(XLIB_DIR)/*.[ch] $(DISTDIR)/xlib
 	$(DIST_INSTALL_DATA) $(TOP_DIR)/license.terms $(DISTDIR)/xlib
@@ -1778,8 +1776,8 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in \
 	$(DIST_INSTALL_DATA) $(TOP_DIR)/license.terms $(TOP_DIR)/doc/*.[13n] \
 		$(TOP_DIR)/doc/man.macros $(DISTDIR)/doc
 	$(INSTALL_DATA_DIR) $(DISTDIR)/tests
-	$(DIST_INSTALL_DATA) $(TOP_DIR)/license.terms $(TEST_DIR)/*.{test,tcl} \
-		$(TEST_DIR)/README $(TEST_DIR)/*.{gif,png,ppm,xbm} \
+	$(DIST_INSTALL_DATA) $(TOP_DIR)/license.terms $(TEST_DIR)/testutils.GUIDE \
+		$(TEST_DIR)/README $(TEST_DIR)/*.{test,tcl,gif,png,ppm,xbm} \
 		$(TEST_DIR)/option.file* $(DISTDIR)/tests
 	$(INSTALL_DATA_DIR) $(DISTDIR)/tests/ttk
 	$(DIST_INSTALL_DATA) $(TEST_DIR)/ttk/*.{svg,test,tcl} $(DISTDIR)/tests/ttk
diff --git a/unix/configure b/unix/configure
index f837abb..38ac8c9 100755
--- a/unix/configure
+++ b/unix/configure
@@ -2605,7 +2605,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 TK_VERSION=9.1
 TK_MAJOR_VERSION=9
 TK_MINOR_VERSION=1
-TK_PATCH_LEVEL="a0"
+TK_PATCH_LEVEL="a1"
 VERSION=${TK_VERSION}
 LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv"
 
@@ -6366,15 +6366,6 @@ printf "%s\n" "$tcl_cv_cc_input_charset" >&6; }
 	CFLAGS="$CFLAGS -finput-charset=UTF-8"
     fi
 
-    ac_fn_c_check_header_compile "$LINENO" "stdbool.h" "ac_cv_header_stdbool_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdbool_h" = xyes
-then :
-
-printf "%s\n" "#define HAVE_STDBOOL_H 1" >>confdefs.h
-
-fi
-
-
     # Check for vfork, posix_spawnp() and friends unconditionally
     ac_fn_c_check_func "$LINENO" "vfork" "ac_cv_func_vfork"
 if test "x$ac_cv_func_vfork" = xyes
@@ -7763,9 +7754,6 @@ if test $tk_aqua = yes; then
 printf "%s\n" "#define MAC_OSX_TK 1" >>confdefs.h
 
     LIBS="$LIBS -framework Cocoa -framework Carbon -framework IOKit -framework QuartzCore -framework Security -framework CoreGraphics"
-    if test -d /System/Library/Frameworks/UserNotifications.framework; then
-	LIBS="$LIBS -framework UserNotifications"
-    fi
     if test -d "/System/Library/Frameworks/UniformTypeIdentifiers.framework"; then
 	LIBS="$LIBS -weak_framework UniformTypeIdentifiers"
     fi
@@ -9046,8 +9034,9 @@ fi
 	MACHER_PROG="$ac_cv_path_macher"
 	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MACHER_PROG" >&5
 printf "%s\n" "$MACHER_PROG" >&6; }
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Found macher in environment" >&5
-printf "%s\n" "Found macher in environment" >&6; }
+    else
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Macher not found" >&5
+printf "%s\n" "Macher not found" >&6; }
     fi
     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zip" >&5
 printf %s "checking for zip... " >&6; }
@@ -9078,8 +9067,6 @@ fi
 printf "%s\n" "$ZIP_PROG" >&6; }
 	ZIP_PROG_OPTIONS="-rq"
 	ZIP_PROG_VFSSEARCH="*"
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Found INFO Zip in environment" >&5
-printf "%s\n" "Found INFO Zip in environment" >&6; }
 	# Use standard arguments for zip
     else
 	# It is not an error if an installed version of Zip can't be located.
diff --git a/unix/configure.ac b/unix/configure.ac
index d8e1873..7a9f7c0 100644
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -26,7 +26,7 @@ m4_ifdef([SC_USE_CONFIG_HEADERS], [
 TK_VERSION=9.1
 TK_MAJOR_VERSION=9
 TK_MINOR_VERSION=1
-TK_PATCH_LEVEL="a0"
+TK_PATCH_LEVEL="a1"
 VERSION=${TK_VERSION}
 LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv"
 
@@ -241,9 +241,6 @@ fi
 if test $tk_aqua = yes; then
     AC_DEFINE(MAC_OSX_TK, 1, [Are we building TkAqua?])
     LIBS="$LIBS -framework Cocoa -framework Carbon -framework IOKit -framework QuartzCore -framework Security -framework CoreGraphics"
-    if test -d /System/Library/Frameworks/UserNotifications.framework; then
-	LIBS="$LIBS -framework UserNotifications"
-    fi
     if test -d "/System/Library/Frameworks/UniformTypeIdentifiers.framework"; then
 	LIBS="$LIBS -weak_framework UniformTypeIdentifiers"
     fi
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index dbe61c5..3a2ddfc 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1862,8 +1862,6 @@ dnl # preprocessing tests use only CPPFLAGS.
 	CFLAGS="$CFLAGS -finput-charset=UTF-8"
     fi
 
-    AC_CHECK_HEADER(stdbool.h, [AC_DEFINE(HAVE_STDBOOL_H, 1, [Do we have <stdbool.h>?])],)
-
     # Check for vfork, posix_spawnp() and friends unconditionally
     AC_CHECK_FUNCS(vfork posix_spawnp posix_spawn_file_actions_adddup2 posix_spawnattr_setflags)
 
@@ -2258,9 +2256,6 @@ AC_DEFUN([SC_TCL_LINK_LIBS], [
     LIBS="$LIBS $THREADS_LIBS"
     AC_CHECK_FUNCS(pthread_attr_setstacksize pthread_atfork)
     LIBS=$ac_saved_libs
-
-    # TIP #509
-    AC_CHECK_DECLS([PTHREAD_MUTEX_RECURSIVE],tcl_ok=yes,tcl_ok=no, [[#include <pthread.h>]])
 ])
 
 #--------------------------------------------------------------------
@@ -3001,7 +2996,8 @@ AC_DEFUN([SC_ZIPFS_SUPPORT], [
     if test -f "$ac_cv_path_macher" ; then
 	MACHER_PROG="$ac_cv_path_macher"
 	AC_MSG_RESULT([$MACHER_PROG])
-	AC_MSG_RESULT([Found macher in environment])
+    else
+	AC_MSG_RESULT([Macher not found])
     fi
     AC_MSG_CHECKING([for zip])
     AC_CACHE_VAL(ac_cv_path_zip, [
@@ -3023,7 +3019,6 @@ AC_DEFUN([SC_ZIPFS_SUPPORT], [
 	AC_MSG_RESULT([$ZIP_PROG])
 	ZIP_PROG_OPTIONS="-rq"
 	ZIP_PROG_VFSSEARCH="*"
-	AC_MSG_RESULT([Found INFO Zip in environment])
 	# Use standard arguments for zip
     else
 	# It is not an error if an installed version of Zip can't be located.
diff --git a/unix/tk.spec b/unix/tk.spec
index 3a096fe..9453bad 100644
--- a/unix/tk.spec
+++ b/unix/tk.spec
@@ -4,7 +4,7 @@
 
 Name:          tk
 Summary:       Tk graphical toolkit for the Tcl scripting language.
-Version:       9.1a0
+Version:       9.1a1
 Release:       2
 License:       BSD
 Group:         Development/Languages
diff --git a/unix/tkConfig.h.in b/unix/tkConfig.h.in
index 695fb3a..84c93e5 100644
--- a/unix/tkConfig.h.in
+++ b/unix/tkConfig.h.in
@@ -46,9 +46,6 @@
 /* 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
 
diff --git a/unix/tkUnix.c b/unix/tkUnix.c
index 1c61603..a687156 100644
--- a/unix/tkUnix.c
+++ b/unix/tkUnix.c
@@ -201,9 +201,9 @@ TkpBuildRegionFromAlphaData(
 		lineDataPtr += pixelStride;
 	    }
 	    if (end > x1) {
-		rect.x = x + x1;
-		rect.y = y + y1;
-		rect.width = end - x1;
+		rect.x = (short)(x + x1);
+		rect.y = (short)(y + y1);
+		rect.width = (unsigned short)(end - x1);
 		rect.height = 1;
 		TkUnionRectWithRegion(&rect, region, region);
 	    }
@@ -261,7 +261,7 @@ Tk_GetUserInactiveTime(
 	    Tcl_Panic("Out of memory: XScreenSaverAllocInfo failed in Tk_GetUserInactiveTime");
 	}
 	if (XScreenSaverQueryInfo(dpy, DefaultRootWindow(dpy), info)) {
-	    inactiveTime = info->idle;
+	    inactiveTime = (long)info->idle;
 	}
 	XFree(info);
     }
diff --git a/unix/tkUnixColor.c b/unix/tkUnixColor.c
index 20149a3..300275b 100644
--- a/unix/tkUnixColor.c
+++ b/unix/tkUnixColor.c
@@ -119,7 +119,7 @@ TkpFreeColor(
 TkColor *
 TkpGetColor(
     Tk_Window tkwin,		/* Window in which color will be used. */
-    Tk_Uid name)		/* Name of color to allocated (in form
+    const char *name)		/* Name of color to allocated (in form
 				 * suitable for passing to XParseColor). */
 {
     Display *display = Tk_Display(tkwin);
diff --git a/unix/tkUnixCursor.c b/unix/tkUnixCursor.c
index 073bae4..4fe4f0f 100644
--- a/unix/tkUnixCursor.c
+++ b/unix/tkUnixCursor.c
@@ -277,7 +277,7 @@ TkGetCursorByName(
 	    if (TkParseColor(display, Tk_Colormap(tkwin), argv[1], &fg) == 0) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 			"invalid color name \"%s\"", argv[1]));
-		Tcl_SetErrorCode(interp, "TK", "CURSOR", "COLOR", NULL);
+		Tcl_SetErrorCode(interp, "TK", "CURSOR", "COLOR", (char *)NULL);
 		goto cleanup;
 	    }
 	    if (argc == 2) {
@@ -287,7 +287,7 @@ TkGetCursorByName(
 		    &bg) == 0) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 			"invalid color name \"%s\"", argv[2]));
-		Tcl_SetErrorCode(interp, "TK", "CURSOR", "COLOR", NULL);
+		Tcl_SetErrorCode(interp, "TK", "CURSOR", "COLOR", (char *)NULL);
 		goto cleanup;
 	    }
 	}
@@ -297,7 +297,7 @@ TkGetCursorByName(
 	    if (dispPtr->cursorFont == None) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			"couldn't load cursor font", TCL_INDEX_NONE));
-		Tcl_SetErrorCode(interp, "TK", "CURSOR", "FONT", NULL);
+		Tcl_SetErrorCode(interp, "TK", "CURSOR", "FONT", (char *)NULL);
 		goto cleanup;
 	    }
 	}
@@ -313,7 +313,7 @@ TkGetCursorByName(
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "cannot get cursor from a file in a safe interpreter",
 		    TCL_INDEX_NONE));
-	    Tcl_SetErrorCode(interp, "TK", "SAFE", "CURSOR_FILE", NULL);
+	    Tcl_SetErrorCode(interp, "TK", "SAFE", "CURSOR_FILE", (char *)NULL);
 	    cursorPtr = NULL;
 	    goto cleanup;
 	}
@@ -354,7 +354,7 @@ TkGetCursorByName(
 	ckfree(argv);
     }
     Tcl_SetObjResult(interp, Tcl_ObjPrintf("bad cursor spec \"%s\"", string));
-    Tcl_SetErrorCode(interp, "TK", "VALUE", "CURSOR", NULL);
+    Tcl_SetErrorCode(interp, "TK", "VALUE", "CURSOR", (char *)NULL);
     return NULL;
 }
 
@@ -428,7 +428,7 @@ CreateCursorFromTableOrFile(
 	if (data == NULL) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "error reading bitmap data for \"%s\"", argv[0]));
-	    Tcl_SetErrorCode(interp, "TK", "CURSOR", "BITMAP_DATA", NULL);
+	    Tcl_SetErrorCode(interp, "TK", "CURSOR", "BITMAP_DATA", (char *)NULL);
 	    goto cleanup;
 	}
 
@@ -440,7 +440,7 @@ CreateCursorFromTableOrFile(
 		&source, &xHot, &yHot) != BitmapSuccess) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "cleanup reading bitmap file \"%s\"", &argv[0][1]));
-	    Tcl_SetErrorCode(interp, "TK", "CURSOR", "BITMAP_FILE", NULL);
+	    Tcl_SetErrorCode(interp, "TK", "CURSOR", "BITMAP_FILE", (char *)NULL);
 	    goto cleanup;
 	}
     }
@@ -453,7 +453,7 @@ CreateCursorFromTableOrFile(
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "bad hot spot in bitmap file \"%s\"", &argv[0][1]));
 	}
-	Tcl_SetErrorCode(interp, "TK", "CURSOR", "HOTSPOT", NULL);
+	Tcl_SetErrorCode(interp, "TK", "CURSOR", "HOTSPOT", (char *)NULL);
 	goto cleanup;
     }
 
@@ -469,7 +469,7 @@ CreateCursorFromTableOrFile(
 	if (TkParseColor(display, Tk_Colormap(tkwin), fgColor, &fg) == 0) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "invalid color name \"%s\"", fgColor));
-	    Tcl_SetErrorCode(interp, "TK", "CURSOR", "COLOR", NULL);
+	    Tcl_SetErrorCode(interp, "TK", "CURSOR", "COLOR", (char *)NULL);
 	    goto cleanup;
 	}
 	if (inTkTable) {
@@ -489,13 +489,13 @@ CreateCursorFromTableOrFile(
 	if (TkParseColor(display, Tk_Colormap(tkwin), fgColor, &fg) == 0) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "invalid color name \"%s\"", fgColor));
-	    Tcl_SetErrorCode(interp, "TK", "CURSOR", "COLOR", NULL);
+	    Tcl_SetErrorCode(interp, "TK", "CURSOR", "COLOR", (char *)NULL);
 	    goto cleanup;
 	}
 	if (TkParseColor(display, Tk_Colormap(tkwin), bgColor, &bg) == 0) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "invalid color name \"%s\"", bgColor));
-	    Tcl_SetErrorCode(interp, "TK", "CURSOR", "COLOR", NULL);
+	    Tcl_SetErrorCode(interp, "TK", "CURSOR", "COLOR", (char *)NULL);
 	    goto cleanup;
 	}
     }
@@ -526,7 +526,7 @@ CreateCursorFromTableOrFile(
 	if (data == NULL) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "error reading bitmap mask data for \"%s\"", argv[0]));
-	    Tcl_SetErrorCode(interp, "TK", "CURSOR", "MASK_DATA", NULL);
+	    Tcl_SetErrorCode(interp, "TK", "CURSOR", "MASK_DATA", (char *)NULL);
 	    goto cleanup;
 	}
 
@@ -540,7 +540,7 @@ CreateCursorFromTableOrFile(
 		&mask, &dummy1, &dummy2) != BitmapSuccess) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "cleanup reading bitmap file \"%s\"", argv[1]));
-	    Tcl_SetErrorCode(interp, "TK", "CURSOR", "MASK_FILE", NULL);
+	    Tcl_SetErrorCode(interp, "TK", "CURSOR", "MASK_FILE", (char *)NULL);
 	    goto cleanup;
 	}
     }
@@ -548,7 +548,7 @@ CreateCursorFromTableOrFile(
     if ((maskWidth != width) || (maskHeight != height)) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		"source and mask bitmaps have different sizes", TCL_INDEX_NONE));
-	Tcl_SetErrorCode(interp, "TK", "CURSOR", "SIZE_MATCH", NULL);
+	Tcl_SetErrorCode(interp, "TK", "CURSOR", "SIZE_MATCH", (char *)NULL);
 	goto cleanup;
     }
 
diff --git a/unix/tkUnixDraw.c b/unix/tkUnixDraw.c
index fe1dea0..ead6c41 100644
--- a/unix/tkUnixDraw.c
+++ b/unix/tkUnixDraw.c
@@ -137,10 +137,10 @@ ScrollRestrictProc(
     if (eventPtr->type == NoExpose) {
 	info->done = 1;
     } else if (eventPtr->type == GraphicsExpose) {
-	rect.x = eventPtr->xgraphicsexpose.x;
-	rect.y = eventPtr->xgraphicsexpose.y;
-	rect.width = eventPtr->xgraphicsexpose.width;
-	rect.height = eventPtr->xgraphicsexpose.height;
+	rect.x = (short)eventPtr->xgraphicsexpose.x;
+	rect.y = (short)eventPtr->xgraphicsexpose.y;
+	rect.width = (unsigned short)eventPtr->xgraphicsexpose.width;
+	rect.height = (unsigned short)eventPtr->xgraphicsexpose.height;
 	XUnionRectWithRegion(&rect, info->region,
 		info->region);
 
@@ -156,14 +156,14 @@ ScrollRestrictProc(
 	 * area as damaged.
 	 */
 
-	rect.x = eventPtr->xexpose.x;
-	rect.y = eventPtr->xexpose.y;
-	rect.width = eventPtr->xexpose.width;
-	rect.height = eventPtr->xexpose.height;
+	rect.x = (short)eventPtr->xexpose.x;
+	rect.y = (short)eventPtr->xexpose.y;
+	rect.width = (unsigned short)eventPtr->xexpose.width;
+	rect.height = (unsigned short)eventPtr->xexpose.height;
 	XUnionRectWithRegion(&rect, info->region,
 		info->region);
-	rect.x += info->dx;
-	rect.y += info->dy;
+	rect.x += (short)info->dx;
+	rect.y += (short)info->dy;
 	XUnionRectWithRegion(&rect, info->region,
 		info->region);
     } else {
diff --git a/unix/tkUnixEmbed.c b/unix/tkUnixEmbed.c
index a8765bd..965cbae 100644
--- a/unix/tkUnixEmbed.c
+++ b/unix/tkUnixEmbed.c
@@ -112,7 +112,7 @@ Tk_UseWindow(
     if (winPtr->window != None) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		"can't modify container after widget is created", TCL_INDEX_NONE));
-	Tcl_SetErrorCode(interp, "TK", "EMBED", "POST_CREATE", NULL);
+	Tcl_SetErrorCode(interp, "TK", "EMBED", "POST_CREATE", (char *)NULL);
 	return TCL_ERROR;
     }
     if (TkpScanWindowId(interp, string, &parent) != TCL_OK) {
@@ -124,7 +124,7 @@ Tk_UseWindow(
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"window \"%s\" doesn't have -container option set",
 		usePtr->pathName));
-	Tcl_SetErrorCode(interp, "TK", "EMBED", "CONTAINER", NULL);
+	Tcl_SetErrorCode(interp, "TK", "EMBED", "CONTAINER", (char *)NULL);
 	return TCL_ERROR;
     }
 
@@ -147,7 +147,7 @@ Tk_UseWindow(
 	if (interp != NULL) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "couldn't create child of window \"%s\"", string));
-	    Tcl_SetErrorCode(interp, "TK", "EMBED", "NO_TARGET", NULL);
+	    Tcl_SetErrorCode(interp, "TK", "EMBED", "NO_TARGET", (char *)NULL);
 	}
 	return TCL_ERROR;
     }
@@ -1129,7 +1129,7 @@ TkpMakeTransparentWindowExist(
     Window parent)		/* Parent window. */
 {
     TkWindow *winPtr = (TkWindow *) tkwin;
-    long int mask = CWDontPropagate | CWEventMask;
+    unsigned long mask = CWDontPropagate | CWEventMask;
 
     /*
      * Ignore the important events while the window is mapped.
diff --git a/unix/tkUnixEvent.c b/unix/tkUnixEvent.c
index 5e2c0fa..ae60692 100644
--- a/unix/tkUnixEvent.c
+++ b/unix/tkUnixEvent.c
@@ -184,13 +184,13 @@ TkpOpenDisplay(
     if (WidthMMOfScreen(DefaultScreenOfDisplay(display)) <= 0) {
 	int mm;
 
-	mm = WidthOfScreen(DefaultScreenOfDisplay(display)) * (25.4 / 75.0);
+	mm = (int)(WidthOfScreen(DefaultScreenOfDisplay(display)) * (25.4 / 75.0));
 	WidthMMOfScreen(DefaultScreenOfDisplay(display)) = mm;
     }
     if (HeightMMOfScreen(DefaultScreenOfDisplay(display)) <= 0) {
 	int mm;
 
-	mm = HeightOfScreen(DefaultScreenOfDisplay(display)) * (25.4 / 75.0);
+	mm = (int)(HeightOfScreen(DefaultScreenOfDisplay(display)) * (25.4 / 75.0));
 	HeightMMOfScreen(DefaultScreenOfDisplay(display)) = mm;
     }
 
@@ -592,8 +592,8 @@ TkUnixDoOneXEvent(
 	    blockTime.tv_usec = 0;
 	}
 	fd = ConnectionNumber(dispPtr->display);
-	index = fd/(NBBY*sizeof(fd_mask));
-	bit = ((fd_mask)1) << (fd%(NBBY*sizeof(fd_mask)));
+	index = fd/(NBBY*(int)sizeof(fd_mask));
+	bit = ((fd_mask)1) << (fd%(NBBY*(int)sizeof(fd_mask)));
 	readMask[index] |= bit;
 	if (numFdBits <= fd) {
 	    numFdBits = fd+1;
@@ -618,8 +618,8 @@ TkUnixDoOneXEvent(
     for (dispPtr = TkGetDisplayList(); dispPtr != NULL;
 	    dispPtr = dispPtr->nextPtr) {
 	fd = ConnectionNumber(dispPtr->display);
-	index = fd/(NBBY*sizeof(fd_mask));
-	bit = ((fd_mask)1) << (fd%(NBBY*sizeof(fd_mask)));
+	index = fd/(NBBY*(int)sizeof(fd_mask));
+	bit = ((fd_mask)1) << (fd%(NBBY*(int)sizeof(fd_mask)));
 	if ((readMask[index] & bit) || (QLength(dispPtr->display) > 0)) {
 	    DisplayFileProc(dispPtr, TCL_READABLE);
 	}
diff --git a/unix/tkUnixFocus.c b/unix/tkUnixFocus.c
index 7ab6e3e..5cae99a 100644
--- a/unix/tkUnixFocus.c
+++ b/unix/tkUnixFocus.c
@@ -34,7 +34,7 @@
  *----------------------------------------------------------------------
  */
 
-int
+size_t
 TkpChangeFocus(
     TkWindow *winPtr,		/* Window that is to receive the X focus. */
     int force)			/* Non-zero means claim the focus even if it
@@ -44,7 +44,8 @@ TkpChangeFocus(
     TkDisplay *dispPtr = winPtr->dispPtr;
     Tk_ErrorHandler errHandler;
     Window window, root, parent, *children;
-    unsigned int numChildren, serial;
+    unsigned int numChildren;
+    size_t serial;
     TkWindow *winPtr2;
     int dummy;
 
diff --git a/unix/tkUnixInt.h b/unix/tkUnixInt.h
index f46212e..b6a739e 100644
--- a/unix/tkUnixInt.h
+++ b/unix/tkUnixInt.h
@@ -22,7 +22,7 @@
  * they're defined in.
  */
 
-#include "tkIntPlatDecls.h"
+#include "tkIntPlatDecls.h"  /* IWYU pragma: export */
 
 MODULE_SCOPE  int       Tktray_Init (Tcl_Interp* interp);
 MODULE_SCOPE  int       SysNotify_Init (Tcl_Interp* interp);
diff --git a/unix/tkUnixPort.h b/unix/tkUnixPort.h
index af79850..02f9bd3 100644
--- a/unix/tkUnixPort.h
+++ b/unix/tkUnixPort.h
@@ -97,7 +97,7 @@
 #   define NBBY 8
 #endif
 
-#include "tkIntXlibDecls.h"
+#include "tkIntXlibDecls.h"  /* IWYU pragma: export */
 #define UINT unsigned int
 #define HWND void *
 #define HDC void *
diff --git a/unix/tkUnixPrint.c b/unix/tkUnixPrint.c
index 978b58f..bf89865 100644
--- a/unix/tkUnixPrint.c
+++ b/unix/tkUnixPrint.c
@@ -15,7 +15,7 @@
 #ifdef HAVE_CUPS
 #include <cups/cups.h>
 
-typedef int (CupsSubCmdOp)(Tcl_Interp *, int, Tcl_Obj *const []);
+typedef int (CupsSubCmdOp)(Tcl_Interp *, Tcl_Size, Tcl_Obj *const []);
 
 static Tcl_ObjCmdProc2 Cups_Cmd;
 static CupsSubCmdOp DefaultPrinterOp;
@@ -85,7 +85,7 @@ Cups_Cmd(
 static int
 DefaultPrinterOp(
     Tcl_Interp *interp,
-    TCL_UNUSED(int),
+    TCL_UNUSED(Tcl_Size),
     TCL_UNUSED(Tcl_Obj *const *))
 {
     cups_dest_t *printer;
@@ -109,7 +109,7 @@ DefaultPrinterOp(
 static int
 GetPrintersOp(
     Tcl_Interp *interp,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *const objv[])
 {
     cups_dest_t *dests;
@@ -197,7 +197,7 @@ static const struct ParseData {
 static int
 PrintOp(
     Tcl_Interp *interp,
-    int objc,
+    Tcl_Size objc,
     Tcl_Obj *const objv[])
 {
     cups_dest_t *printer;
diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c
index 64be894..31b12a6 100644
--- a/unix/tkUnixRFont.c
+++ b/unix/tkUnixRFont.c
@@ -1098,7 +1098,7 @@ TkDrawAngledChars(
     int originX, originY;
 
     if (fontPtr->ftDraw == 0) {
-	DEBUG(("Switch to drawable 0x%x\n", drawable));
+	DEBUG(("Switch to drawable 0x%lx\n", drawable));
 	fontPtr->ftDraw = XftDrawCreate(display, drawable,
 		DefaultVisual(display, fontPtr->screen),
 		DefaultColormap(display, fontPtr->screen));
diff --git a/unix/tkUnixSelect.c b/unix/tkUnixSelect.c
index 13c2b30..e8d0922 100644
--- a/unix/tkUnixSelect.c
+++ b/unix/tkUnixSelect.c
@@ -583,7 +583,7 @@ TkSelEventProc(
 	if (bytesAfter != 0) {
 	    Tcl_SetObjResult(retrPtr->interp, Tcl_NewStringObj(
 		    "selection property too large", TCL_INDEX_NONE));
-	    Tcl_SetErrorCode(retrPtr->interp, "TK", "SELECTION", "SIZE",NULL);
+	    Tcl_SetErrorCode(retrPtr->interp, "TK", "SELECTION", "SIZE", (char *)NULL);
 	    retrPtr->result = TCL_ERROR;
 	    XFree(propInfo);
 	    return;
@@ -762,7 +762,7 @@ SelTimeoutProc(
 
 	Tcl_SetObjResult(retrPtr->interp, Tcl_NewStringObj(
 		"selection owner didn't respond", TCL_INDEX_NONE));
-	Tcl_SetErrorCode(retrPtr->interp, "TK", "SELECTION", "IGNORED", NULL);
+	Tcl_SetErrorCode(retrPtr->interp, "TK", "SELECTION", "IGNORED", (char *)NULL);
 	retrPtr->result = TCL_ERROR;
     } else {
 	retrPtr->timeout = Tcl_CreateTimerHandler(1000, SelTimeoutProc,
@@ -1150,7 +1150,7 @@ SelRcvIncrProc(
     if (bytesAfter != 0) {
 	Tcl_SetObjResult(retrPtr->interp, Tcl_NewStringObj(
 		"selection property too large", TCL_INDEX_NONE));
-	Tcl_SetErrorCode(retrPtr->interp, "TK", "SELECTION", "SIZE", NULL);
+	Tcl_SetErrorCode(retrPtr->interp, "TK", "SELECTION", "SIZE", (char *)NULL);
 	retrPtr->result = TCL_ERROR;
 	goto done;
     }
diff --git a/unix/tkUnixSend.c b/unix/tkUnixSend.c
index 9d4d570..762c2e8 100644
--- a/unix/tkUnixSend.c
+++ b/unix/tkUnixSend.c
@@ -961,7 +961,8 @@ Tk_SendObjCmd(
     Window commWindow;
     PendingCommand pending;
     RegisteredInterp *riPtr;
-    int result, async, i, firstArg, index;
+    int result, async, index;
+    Tcl_Size i, firstArg;
     Tk_RestrictProc *prevProc;
     void *prevArg;
     TkDisplay *dispPtr;
diff --git a/unix/tkUnixSysTray.c b/unix/tkUnixSysTray.c
index 9c087ba..8776d95 100644
--- a/unix/tkUnixSysTray.c
+++ b/unix/tkUnixSysTray.c
@@ -301,8 +301,9 @@ TrayIconObjectCmd(
 	    return TCL_ERROR;
 	}
 	if (objc == 4) {
-	    if (Tcl_GetLongFromObj(interp,objv[3],&timeout) != TCL_OK)
+	    if (Tcl_GetLongFromObj(interp,objv[3],&timeout) != TCL_OK) {
 		return TCL_ERROR;
+	    }
 	}
 	msgid = PostBalloon(icon,Tcl_GetString(objv[2]), timeout);
 	Tcl_SetObjResult(interp,Tcl_NewIntObj(msgid));
@@ -316,8 +317,9 @@ TrayIconObjectCmd(
 	if (Tcl_GetIntFromObj(interp,objv[2],&msgid) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	if (msgid)
+	if (msgid) {
 	    CancelBalloon(icon,msgid);
+	}
 	return TCL_OK;
 
     case XWC_BBOX:
@@ -1016,8 +1018,9 @@ RetargetEvent(
 {
     int send = 0;
     Window* saveWin1 = NULL, *saveWin2 = NULL;
-    if (!icon->visible)
+    if (!icon->visible) {
 	return;
+    }
     switch (ev->type) {
     case MotionNotify:
 	send = 1;
@@ -1092,8 +1095,9 @@ TrayIconWrapperEvent(
 		if (icon->drawingWin) {
 		    /* we were sent away to root */
 		    TKU_WmWithdraw(icon->drawingWin,icon->interp);
-		    if (icon->myManager)
+		    if (icon->myManager) {
 			Tk_SendVirtualEvent(icon->tkwin,Tk_GetUid("IconDestroy"), NULL);
+		    }
 		    icon->myManager = None;
 		}
 	    } /* Reparenting into some other embedder is theoretically possible,
@@ -1129,8 +1133,9 @@ TrayIconEvent(
 
     switch (ev->type) {
     case Expose:
-	if (!ev->xexpose.count)
+	if (!ev->xexpose.count) {
 	    EventuallyRedrawIcon(icon);
+	}
 	break;
 
     case DestroyNotify:
@@ -1261,12 +1266,14 @@ PostBalloon(
     int length = strlen(utf8msg);
     XEvent ev;
 
-    if (!(icon->drawingWin) || (icon->myManager == None))
+    if (!(icon->drawingWin) || (icon->myManager == None)) {
 	return 0;
+    }
 
     /* overflow protection */
-    if (icon->msgid < 0)
+    if (icon->msgid < 0) {
 	icon->msgid = 0;
+    }
 
     memset(&ev, 0, sizeof(ev));
     ev.xclient.type = ClientMessage;
@@ -1324,11 +1331,13 @@ CancelBalloon(
     Display* dpy = Tk_Display(tkwin);
     XEvent ev;
 
-    if (!(icon->drawingWin) || (icon->myManager == None))
+    if (!(icon->drawingWin) || (icon->myManager == None)) {
 	return;
+    }
     /* overflow protection */
-    if (icon->msgid < 0)
+    if (icon->msgid < 0) {
 	icon->msgid = 0;
+    }
 
     memset(&ev, 0, sizeof(ev));
     ev.type = ClientMessage;
@@ -1372,8 +1381,9 @@ IconGenericHandler(
 	    ((Atom)ev->xclient.data.l[1] == icon->a_NET_SYSTEM_TRAY_Sn)) {
 	icon->trayManager = (Window)ev->xclient.data.l[2];
 	XSelectInput(ev->xclient.display,icon->trayManager,StructureNotifyMask);
-	if (icon->myManager == None)
+	if (icon->myManager == None) {
 	    TrayIconUpdate(icon, ICON_CONF_XEMBED);
+	}
 	return 1;
     }
     if (ev->type == DestroyNotify) {
@@ -1417,8 +1427,9 @@ TrayIconUpdate(
      * anyway, let's handle it if we provide it.
      */
     if (mask & ICON_CONF_CLASS) {
-	if (icon->drawingWin)
+	if (icon->drawingWin) {
 	    Tk_SetClass(icon->drawingWin,Tk_GetUid(Tcl_GetString(icon->classObj)));
+	}
     }
     /*
      * First, ensure right icon visibility.
diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c
index 41dc5e3..b9ce1ca 100644
--- a/unix/tkUnixWm.c
+++ b/unix/tkUnixWm.c
@@ -1225,7 +1225,7 @@ WmAspectCmd(
 		(denom2 <= 0)) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "aspect number can't be <= 0", TCL_INDEX_NONE));
-	    Tcl_SetErrorCode(interp, "TK", "VALUE", "ASPECT", NULL);
+	    Tcl_SetErrorCode(interp, "TK", "VALUE", "ASPECT", (char *)NULL);
 	    return TCL_ERROR;
 	}
 	wmPtr->minAspect.x = numer1;
@@ -1724,14 +1724,14 @@ WmDeiconifyCmd(
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"can't deiconify %s: it is an icon for %s",
 		Tcl_GetString(objv[2]), Tk_PathName(wmPtr->iconFor)));
-	Tcl_SetErrorCode(interp, "TK", "WM", "DEICONIFY", "ICON", NULL);
+	Tcl_SetErrorCode(interp, "TK", "WM", "DEICONIFY", "ICON", (char *)NULL);
 	return TCL_ERROR;
     }
     if (winPtr->flags & TK_EMBEDDED) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"can't deiconify %s: it is an embedded window",
 		winPtr->pathName));
-	Tcl_SetErrorCode(interp, "TK", "WM", "DEICONIFY", "EMBEDDED", NULL);
+	Tcl_SetErrorCode(interp, "TK", "WM", "DEICONIFY", "EMBEDDED", (char *)NULL);
 	return TCL_ERROR;
     }
     wmPtr->flags &= ~WM_WITHDRAWN;
@@ -2019,25 +2019,25 @@ WmGridCmd(
 	if (reqWidth < 0) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "baseWidth can't be < 0", TCL_INDEX_NONE));
-	    Tcl_SetErrorCode(interp, "TK", "VALUE", "GRID", NULL);
+	    Tcl_SetErrorCode(interp, "TK", "VALUE", "GRID", (char *)NULL);
 	    return TCL_ERROR;
 	}
 	if (reqHeight < 0) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "baseHeight can't be < 0", TCL_INDEX_NONE));
-	    Tcl_SetErrorCode(interp, "TK", "VALUE", "GRID", NULL);
+	    Tcl_SetErrorCode(interp, "TK", "VALUE", "GRID", (char *)NULL);
 	    return TCL_ERROR;
 	}
 	if (widthInc <= 0) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "widthInc can't be <= 0", TCL_INDEX_NONE));
-	    Tcl_SetErrorCode(interp, "TK", "VALUE", "GRID", NULL);
+	    Tcl_SetErrorCode(interp, "TK", "VALUE", "GRID", (char *)NULL);
 	    return TCL_ERROR;
 	}
 	if (heightInc <= 0) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "heightInc can't be <= 0", TCL_INDEX_NONE));
-	    Tcl_SetErrorCode(interp, "TK", "VALUE", "GRID", NULL);
+	    Tcl_SetErrorCode(interp, "TK", "VALUE", "GRID", (char *)NULL);
 	    return TCL_ERROR;
 	}
 	Tk_SetGrid((Tk_Window) winPtr, reqWidth, reqHeight, widthInc,
@@ -2268,27 +2268,27 @@ WmIconifyCmd(
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"can't iconify \"%s\": it is a transient",
 		winPtr->pathName));
-	Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "TRANSIENT", NULL);
+	Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "TRANSIENT", (char *)NULL);
 	return TCL_ERROR;
     }
     if (wmPtr->iconFor != NULL) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"can't iconify \"%s\": it is an icon for \"%s\"",
 		winPtr->pathName, Tk_PathName(wmPtr->iconFor)));
-	Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "ICON", NULL);
+	Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "ICON", (char *)NULL);
 	return TCL_ERROR;
     }
     if (winPtr->flags & TK_EMBEDDED) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"can't iconify \"%s\": it is an embedded window",
 		winPtr->pathName));
-	Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "EMBEDDED", NULL);
+	Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "EMBEDDED", (char *)NULL);
 	return TCL_ERROR;
     }
     if (TkpWmSetState(winPtr, IconicState) == 0) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		"couldn't send iconify message to window manager", TCL_INDEX_NONE));
-	Tcl_SetErrorCode(interp, "TK", "WM", "COMMUNICATION", NULL);
+	Tcl_SetErrorCode(interp, "TK", "WM", "COMMUNICATION", (char *)NULL);
 	return TCL_ERROR;
     }
     return TCL_OK;
@@ -2461,7 +2461,7 @@ WmIconphotoCmd(
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "can't use \"%s\" as iconphoto: not a photo image",
 		    Tcl_GetString(objv[i])));
-	    Tcl_SetErrorCode(interp, "TK", "WM", "ICONPHOTO", "PHOTO", NULL);
+	    Tcl_SetErrorCode(interp, "TK", "WM", "ICONPHOTO", "PHOTO", (char *)NULL);
 	    return TCL_ERROR;
 	}
 	Tk_PhotoGetSize(photo, &width, &height);
@@ -2494,7 +2494,7 @@ WmIconphotoCmd(
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"failed to create an iconphoto with image \"%s\"",
 		Tcl_GetString(objv[i])));
-	    Tcl_SetErrorCode(interp, "TK", "WM", "ICONPHOTO", "IMAGE", NULL);
+	    Tcl_SetErrorCode(interp, "TK", "WM", "ICONPHOTO", "IMAGE", (char *)NULL);
 	    return TCL_ERROR;
 	}
 	Tk_PhotoGetSize(photo, &width, &height);
@@ -2678,7 +2678,7 @@ WmIconwindowCmd(
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "can't use %s as icon window: not at top level",
 		    Tcl_GetString(objv[3])));
-	    Tcl_SetErrorCode(interp, "TK", "WM", "ICONWINDOW", "INNER", NULL);
+	    Tcl_SetErrorCode(interp, "TK", "WM", "ICONWINDOW", "INNER", (char *)NULL);
 	    return TCL_ERROR;
 	}
 	wmPtr2 = ((TkWindow *) tkwin2)->wmInfoPtr;
@@ -2686,7 +2686,7 @@ WmIconwindowCmd(
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "%s is already an icon for %s",
 		    Tcl_GetString(objv[3]), Tk_PathName(wmPtr2->iconFor)));
-	    Tcl_SetErrorCode(interp, "TK", "WM", "ICONWINDOW", "ICON", NULL);
+	    Tcl_SetErrorCode(interp, "TK", "WM", "ICONWINDOW", "ICON", (char *)NULL);
 	    return TCL_ERROR;
 	}
 	if (wmPtr->icon != NULL) {
@@ -2722,7 +2722,7 @@ WmIconwindowCmd(
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			"couldn't send withdraw message to window manager",
 			-1));
-		Tcl_SetErrorCode(interp, "TK", "WM", "COMMUNICATION", NULL);
+		Tcl_SetErrorCode(interp, "TK", "WM", "COMMUNICATION", (char *)NULL);
 		return TCL_ERROR;
 	    }
 	    WaitForMapNotify((TkWindow *) tkwin2, 0);
@@ -2765,7 +2765,7 @@ WmManageCmd(
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "window \"%s\" is not manageable: must be a frame,"
 		    " labelframe or toplevel", Tk_PathName(frameWin)));
-	    Tcl_SetErrorCode(interp, "TK", "WM", "MANAGE", NULL);
+	    Tcl_SetErrorCode(interp, "TK", "WM", "MANAGE", (char *)NULL);
 	    return TCL_ERROR;
 	}
 	TkFocusSplit(winPtr);
@@ -3103,7 +3103,7 @@ WmProtocolCmd(
     if (strcmp(Tcl_GetString(objv[3]), "_NET_WM_PING") == 0) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		"may not alter handling of that protocol", TCL_INDEX_NONE));
-	Tcl_SetErrorCode(interp, "TK", "WM", "PROTOCOL", "RESERVED", NULL);
+	Tcl_SetErrorCode(interp, "TK", "WM", "PROTOCOL", "RESERVED", (char *)NULL);
 	return TCL_ERROR;
     }
 
@@ -3333,21 +3333,21 @@ WmStackorderCmd(
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "window \"%s\" isn't a top-level window",
 		    winPtr2->pathName));
-	    Tcl_SetErrorCode(interp, "TK", "WM", "STACK", "TOPLEVEL", NULL);
+	    Tcl_SetErrorCode(interp, "TK", "WM", "STACK", "TOPLEVEL", (char *)NULL);
 	    return TCL_ERROR;
 	}
 
 	if (!Tk_IsMapped(winPtr)) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "window \"%s\" isn't mapped", winPtr->pathName));
-	    Tcl_SetErrorCode(interp, "TK", "WM", "STACK", "MAPPED", NULL);
+	    Tcl_SetErrorCode(interp, "TK", "WM", "STACK", "MAPPED", (char *)NULL);
 	    return TCL_ERROR;
 	}
 
 	if (!Tk_IsMapped(winPtr2)) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "window \"%s\" isn't mapped", winPtr2->pathName));
-	    Tcl_SetErrorCode(interp, "TK", "WM", "STACK", "MAPPED", NULL);
+	    Tcl_SetErrorCode(interp, "TK", "WM", "STACK", "MAPPED", (char *)NULL);
 	    return TCL_ERROR;
 	}
 
@@ -3360,7 +3360,7 @@ WmStackorderCmd(
 	if (windows == NULL) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "TkWmStackorderToplevel failed", TCL_INDEX_NONE));
-	    Tcl_SetErrorCode(interp, "TK", "WM", "COMMUNICATION", NULL);
+	    Tcl_SetErrorCode(interp, "TK", "WM", "COMMUNICATION", (char *)NULL);
 	    return TCL_ERROR;
 	}
 
@@ -3431,7 +3431,7 @@ WmStateCmd(
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "can't change state of %s: it is an icon for %s",
 		    Tcl_GetString(objv[2]), Tk_PathName(wmPtr->iconFor)));
-	    Tcl_SetErrorCode(interp, "TK", "WM", "STATE", "ICON", NULL);
+	    Tcl_SetErrorCode(interp, "TK", "WM", "STATE", "ICON", (char *)NULL);
 	    return TCL_ERROR;
 	}
 
@@ -3464,7 +3464,7 @@ WmStateCmd(
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			"couldn't send iconify message to window manager",
 			-1));
-		Tcl_SetErrorCode(interp, "TK", "WM", "COMMUNICATION", NULL);
+		Tcl_SetErrorCode(interp, "TK", "WM", "COMMUNICATION", (char *)NULL);
 		return TCL_ERROR;
 	    }
 	} else { /* OPT_WITHDRAWN */
@@ -3473,7 +3473,7 @@ WmStateCmd(
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			"couldn't send withdraw message to window manager",
 			-1));
-		Tcl_SetErrorCode(interp, "TK", "WM", "COMMUNICATION", NULL);
+		Tcl_SetErrorCode(interp, "TK", "WM", "COMMUNICATION", (char *)NULL);
 		return TCL_ERROR;
 	    }
 	}
@@ -3627,7 +3627,7 @@ WmTransientCmd(
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "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);
+	    Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "ICON", (char *)NULL);
 	    return TCL_ERROR;
 	}
 
@@ -3640,7 +3640,7 @@ WmTransientCmd(
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "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);
+	    Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "ICON", (char *)NULL);
 	    return TCL_ERROR;
 	}
 
@@ -3650,7 +3650,7 @@ WmTransientCmd(
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "can't set \"%s\" as container: would cause management loop",
 		    Tk_PathName(containerPtr)));
-		Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "SELF", NULL);
+		Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "SELF", (char *)NULL);
 		return TCL_ERROR;
 	    }
 	}
@@ -3681,7 +3681,7 @@ WmTransientCmd(
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			"couldn't send withdraw message to window manager",
 			-1));
-		Tcl_SetErrorCode(interp, "TK", "WM", "COMMUNICATION", NULL);
+		Tcl_SetErrorCode(interp, "TK", "WM", "COMMUNICATION", (char *)NULL);
 		return TCL_ERROR;
 	    }
 	} else {
@@ -3733,14 +3733,14 @@ WmWithdrawCmd(
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"can't withdraw %s: it is an icon for %s",
 		Tcl_GetString(objv[2]), Tk_PathName(wmPtr->iconFor)));
-	Tcl_SetErrorCode(interp, "TK", "WM", "WITHDRAW", "ICON", NULL);
+	Tcl_SetErrorCode(interp, "TK", "WM", "WITHDRAW", "ICON", (char *)NULL);
 	return TCL_ERROR;
     }
     wmPtr->flags |= WM_WITHDRAWN;
     if (TkpWmSetState(winPtr, WithdrawnState) == 0) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		"couldn't send withdraw message to window manager", TCL_INDEX_NONE));
-	Tcl_SetErrorCode(interp, "TK", "WM", "COMMUNICATION", NULL);
+	Tcl_SetErrorCode(interp, "TK", "WM", "COMMUNICATION", (char *)NULL);
 	return TCL_ERROR;
     }
     return TCL_OK;
@@ -5721,7 +5721,7 @@ ParseGeometry(
   error:
     Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 	    "bad geometry specifier \"%s\"", string));
-    Tcl_SetErrorCode(interp, "TK", "VALUE", "GEOMETRY", NULL);
+    Tcl_SetErrorCode(interp, "TK", "VALUE", "GEOMETRY", (char *)NULL);
     return TCL_ERROR;
 }