Merge 9.0 and follow-up to previous commit: Remove copyright

jan.nijtmans · jan.nijtmans · commit 41b5314f4ae5 · 2025-11-06T07:40:12.000Z
diff --git a/doc/print.n b/doc/print.n
@@ -1,6 +1,6 @@
 .\" Text automatically generated by txt2man
 '\"
-'\" Copyright (c) 2021 Kevin Walzer/WordTech Communications LLC.
+'\" Copyright (c) 2021 Kevin Walzer.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
diff --git a/doc/sysnotify.n b/doc/sysnotify.n
@@ -1,6 +1,6 @@
 .\" Text automatically generated by txt2man
 '\"
-'\" Copyright (c) 2020 Kevin Walzer/WordTech Communications LLC.
+'\" Copyright (c) 2020 Kevin Walzer.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
diff --git a/doc/systray.n b/doc/systray.n
@@ -1,6 +1,6 @@
 .\" Text automatically generated by txt2man
 '\"
-'\" Copyright (c) 2020 Kevin Walzer/WordTech Communications LLC.
+'\" Copyright (c) 2020 Kevin Walzer.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
diff --git a/generic/ttk/ttkCache.c b/generic/ttk/ttkCache.c
@@ -253,7 +253,7 @@ static void CacheWinEventHandler(void *clientData, XEvent *eventPtr)
  * InitCacheWindow --
  *	Specify the cache window if not already set.
  */
-static void InitCacheWindow(Ttk_ResourceCache cache, Tk_Window tkwin)
+static void InitCacheWindow(Ttk_ResourceCache cache)
 {
     if (cache->tkwin == NULL) {
 	cache->tkwin = Tk_MainWindow(cache->interp);
@@ -278,7 +278,7 @@ void Ttk_RegisterNamedColor(
     Tcl_Obj *colorNameObj;
 
     snprintf(nameBuf, sizeof(nameBuf), "#%04X%04X%04X",
-	colorPtr->red, colorPtr->green, colorPtr->blue);
+	    colorPtr->red, colorPtr->green, colorPtr->blue);
     colorNameObj = Tcl_NewStringObj(nameBuf, -1);
     Tcl_IncrRefCount(colorNameObj);
 
@@ -300,7 +300,7 @@ void Ttk_RegisterNamedColor(
 static Tcl_Obj *CheckNamedColor(Ttk_ResourceCache cache, Tcl_Obj *objPtr)
 {
     Tcl_HashEntry *entryPtr =
-	Tcl_FindHashEntry(&cache->namedColors, Tcl_GetString(objPtr));
+	    Tcl_FindHashEntry(&cache->namedColors, Tcl_GetString(objPtr));
     if (entryPtr) {	/* Use named color instead */
 	objPtr = (Tcl_Obj *)Tcl_GetHashValue(entryPtr);
     }
@@ -386,7 +386,7 @@ static Tcl_Obj *Ttk_Use(
  */
 Tcl_Obj *Ttk_UseFont(Ttk_ResourceCache cache, Tk_Window tkwin, Tcl_Obj *objPtr)
 {
-    InitCacheWindow(cache, tkwin);
+    InitCacheWindow(cache);
     return Ttk_Use(cache->interp,
 	&cache->fontTable, AllocFont, tkwin, objPtr);
 }
@@ -398,7 +398,7 @@ Tcl_Obj *Ttk_UseFont(Ttk_ResourceCache cache, Tk_Window tkwin, Tcl_Obj *objPtr)
 Tcl_Obj *Ttk_UseColor(Ttk_ResourceCache cache, Tk_Window tkwin, Tcl_Obj *objPtr)
 {
     objPtr = CheckNamedColor(cache, objPtr);
-    InitCacheWindow(cache, tkwin);
+    InitCacheWindow(cache);
     return Ttk_Use(cache->interp,
 	&cache->colorTable, AllocColor, tkwin, objPtr);
 }
@@ -411,7 +411,7 @@ Tcl_Obj *Ttk_UseBorder(
     Ttk_ResourceCache cache, Tk_Window tkwin, Tcl_Obj *objPtr)
 {
     objPtr = CheckNamedColor(cache, objPtr);
-    InitCacheWindow(cache, tkwin);
+    InitCacheWindow(cache);
     return Ttk_Use(cache->interp,
 	&cache->borderTable, AllocBorder, tkwin, objPtr);
 }
@@ -442,7 +442,7 @@ Tk_Image Ttk_UseImage(Ttk_ResourceCache cache, Tk_Window tkwin, Tcl_Obj *objPtr)
     Tcl_HashEntry *entryPtr;
     Tk_Image image;
 
-    InitCacheWindow(cache, tkwin);
+    InitCacheWindow(cache);
 #if !NEED_EXTRA_INFO
     entryPtr = Tcl_CreateHashEntry(&cache->imageTable, imageName, &newEntry);
 #else
diff --git a/library/iconbadges.tcl b/library/iconbadges.tcl
@@ -3,7 +3,7 @@
 #	Notification badges for Tk applications.
 #
 #
-# Copyright © 2021 Kevin Walzer/WordTech Communications LLC
+# Copyright © 2021 Kevin Walzer
 
 namespace eval ::tk::icons {}
 
diff --git a/macosx/Credits.html.in b/macosx/Credits.html.in
@@ -11,7 +11,7 @@ Tcl and Tk are distributed under a modified BSD license:<br>
 </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; 2011-@TK_YEAR@ Kevin Walzer.</li>
 <li>&copy; 2014-@TK_YEAR@ Marc Culler.</li>
 <li>&copy; 2002-2012 Daniel A. Steffen.</li>
 <li>&copy; 2001-2009 Apple Inc.</li>
diff --git a/macosx/Tk-Info.plist.in b/macosx/Tk-Info.plist.in
@@ -18,8 +18,7 @@
 Copyright © 1989-@TK_YEAR@ Tcl Core Team,
 Copyright © 2002-@TK_YEAR@ Daniel A. Steffen,
 	Copyright © 1989-@TK_YEAR@ Contributors,
-	Copyright © 2011-@TK_YEAR@ Kevin Walzer/WordTech
-	Communications LLC,
+	Copyright © 2011-@TK_YEAR@ Kevin Walzer,
 	Copyright © 2014-@TK_YEAR@ Marc Culler,
 Copyright © 2001-2009 Apple Inc.,
 Copyright © 2001-2002 Jim Ingham &amp; Ian Reid</string>
diff --git a/macosx/Wish-Info.plist.in b/macosx/Wish-Info.plist.in
@@ -55,7 +55,7 @@
     <string>Wish Shell @TK_VERSION@@TK_PATCH_LEVEL@,
     Copyright © 1989-@TK_YEAR@ Tcl Core Team,
     Copyright © 1989-@TK_YEAR@ Contributors,
-    Copyright © 2011-@TK_YEAR@ Kevin Walzer/WordTech Communications LLC,
+    Copyright © 2011-@TK_YEAR@ Kevin Walzer,
     Copyright © 2014-@TK_YEAR@ Marc Culler,
     Copyright © 2002-@TK_YEAR@ Daniel A. Steffen,
     Copyright © 2001-2009 Apple Inc.,
diff --git a/macosx/Wish.sdef b/macosx/Wish.sdef
@@ -2,7 +2,7 @@
 <!DOCTYPE dictionary SYSTEM "file://localhost/System/Library/DTDs/sdef.dtd">
 <!--
 	Copyright © 1997 Sun Microsystems, Inc.
-	Copyright © 2009 Kevin Walzer/WordTech Communications LLC.
+	Copyright © 2009 Kevin Walzer.
 	Copyright © 2009 Daniel A. Steffen <das@users.sourceforge.net>
 
 	See the file "license.terms" for information on usage and redistribution of
diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c
@@ -7,7 +7,7 @@
  * Copyright © 1996 Sun Microsystems, Inc.
  * Copyright © 2001-2009 Apple Inc.
  * Copyright © 2006-2009 Daniel A. Steffen <das@users.sourceforge.net>
- * Copyright © 2015 Kevin Walzer/WordTech Commununications LLC.
+ * Copyright © 2015 Kevin Walzer.
  * Copyright © 2018-2019 Marc Culler
  *
  * See the file "license.terms" for information on usage and redistribution
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
@@ -338,12 +338,6 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
     TKLog(@"-[%@(%p) %s] %@", [self class], self, sel_getName(_cmd), notification);
     NSWindow *w = [notification object];
     TkWindow *winPtr = TkMacOSXGetTkWindow(w);
-
-#if 0
-    if (winPtr) {
-	Tk_UnmapWindow((Tk_Window)winPtr);
-    }
-#endif
 }
 
 #endif /* TK_MAC_DEBUG_NOTIFICATIONS */
@@ -387,6 +381,7 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
 static void RefocusGrabWindow(void *data) {
     TkWindow *winPtr = (TkWindow *) data;
     TkpChangeFocus(winPtr, 1);
+    Tcl_Release(winPtr);
 }
 
 #pragma mark TKApplication(TKApplicationEvent)
@@ -423,6 +418,7 @@ static void RefocusGrabWindow(void *data) {
 	    [win orderOut:NSApp];
 	}
 	if (winPtr->dispPtr->grabWinPtr == winPtr) {
+	    Tcl_Preserve(winPtr);
 	    Tcl_DoWhenIdle(RefocusGrabWindow, winPtr);
 	}
 	if (iconifiedWindow == nil && [win isMiniaturized]) {
@@ -575,11 +571,6 @@ GenerateUpdates(
     NSView *view = TkMacOSXGetNSViewForDrawable((Drawable)winPtr->privatePtr);
 
     TkMacOSXWinCGBounds(winPtr, &bounds);
-#if 0
-    if (!CGRectIntersectsRect(bounds, *updateBounds)) {
-	return 0;
-    }
-#endif
 
     /*
      * Compute the bounding box of the area that the damage occurred in.
@@ -1090,8 +1081,8 @@ ExposeRestrictProc(
     Tk_Window tkwin = (Tk_Window)winPtr;
 
     if (winPtr) {
-	unsigned int width = (unsigned int) newsize.width;
-	unsigned int height= (unsigned int) newsize.height;
+	unsigned int width = (unsigned int)newsize.width;
+	unsigned int height= (unsigned int)newsize.height;
 
 	/*
 	 * This function can be re-entered, so we need to make sure we don't
@@ -1135,7 +1126,6 @@ ExposeRestrictProc(
 	 */
 
 	[NSApp _unlockAutoreleasePool];
-
     }
 }
 
diff --git a/tests/systray.test b/tests/systray.test
@@ -1,6 +1,6 @@
 # This file is a Tcl script to test systray and sysnotify features in Tk.
 #
-# Copyright © 2020 Kevin Walzer/WordTech Communications LLC.
+# Copyright © 2020 Kevin Walzer.
 # Copyright © 2020 Francois Vogel.
 # All rights reserved.
 

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`# Notification badges for Tk applications.`
`4`	`4`	`#`
`5`	`5`	`#`
`6`		`-# Copyright © 2021 Kevin Walzer/WordTech Communications LLC`
	`6`	`+# Copyright © 2021 Kevin Walzer`
`7`	`7`
`8`	`8`	`namespace eval ::tk::icons {}`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Copyright © 1996 Sun Microsystems, Inc.`
`8`	`8`	`* Copyright © 2001-2009 Apple Inc.`
`9`	`9`	`* Copyright © 2006-2009 Daniel A. Steffen <das@users.sourceforge.net>`
`10`		`- * Copyright © 2015 Kevin Walzer/WordTech Commununications LLC.`
	`10`	`+ * Copyright © 2015 Kevin Walzer.`
`11`	`11`	`* Copyright © 2018-2019 Marc Culler`
`12`	`12`	`*`
`13`	`13`	`* See the file "license.terms" for information on usage and redistribution`