Merge 8.7

tcltk · Mar 17, 2024 · 1f30bac · 1f30bac
2 parents 6ecf17e + 73a13ad
commit 1f30bac
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c
@@ -3,11 +3,11 @@
  *
  *	Contains the Mac implementation of the common dialog boxes.
  *
- * Copyright (c) 1996-1997 Sun Microsystems, Inc.
- * Copyright (c) 2001-2009, Apple Inc.
- * Copyright (c) 2006-2009 Daniel A. Steffen <das@users.sourceforge.net>
- * Copyright (c) 2017 Christian Gollwitzer
- * Copyright (c) 2022 Marc Culler
+ * Copyright © 1996-1997 Sun Microsystems, Inc.
+ * Copyright © 2001-2009, Apple Inc.
+ * Copyright © 2006-2009 Daniel A. Steffen <das@users.sourceforge.net>
+ * Copyright © 2017 Christian Gollwitzer
+ * Copyright © 2022 Marc Culler
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.

diff --git a/macosx/tkMacOSXImage.c b/macosx/tkMacOSXImage.c
@@ -4,10 +4,10 @@
  *	The code in this file provides an interface for XImages, and
  *      implements the nsimage image type.
  *
- * Copyright (c) 1995-1997 Sun Microsystems, Inc.
- * Copyright (c) 2001-2009, Apple Inc.
- * Copyright (c) 2005-2009 Daniel A. Steffen <das@users.sourceforge.net>
- * Copyright (c) 2017-2021 Marc Culler.
+ * Copyright © 1995-1997 Sun Microsystems, Inc.
+ * Copyright © 2001-2009, Apple Inc.
+ * Copyright © 2005-2009 Daniel A. Steffen <das@users.sourceforge.net>
+ * Copyright © 2017-2021 Marc Culler.
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -502,6 +502,9 @@ TkMacOSXPutImage(
     MacDrawable *macDraw = (MacDrawable *)drawable;
     int result = Success;
 
+    if (width <= 0 || height <= 0) {
+	return Success; /* Is OK. Nothing to see here, literally. */
+    }
     LastKnownRequestProcessed(display)++;
     if (!TkMacOSXSetupDrawingContext(drawable, gc, &dc)) {
 	return BadDrawable;
@@ -623,7 +626,7 @@ int TkpPutRGBAImage(
  *----------------------------------------------------------------------
  */
 
-CGImageRef
+static CGImageRef
 CreateCGImageFromDrawableRect(
     Drawable drawable,
     int x,
@@ -736,7 +739,7 @@ CreatePDFFromDrawableRect(
  *----------------------------------------------------------------------
  */
 
-CGImageRef
+static CGImageRef
 CreateCGImageFromPixmap(
     Drawable pixmap)
 {

diff --git a/macosx/tkMacOSXImage.h b/macosx/tkMacOSXImage.h
@@ -18,8 +18,5 @@
  * Function prototypes
  */
 
-CGImageRef CreateCGImageFromPixmap(Drawable pixmap);
-CGImageRef CreateCGImageFromDrawableRect( Drawable drawable,
-	   int x, int y, unsigned int width, unsigned int height);
-CFDataRef CreatePDFFromDrawableRect( Drawable drawable,
+MODULE_SCOPE CFDataRef CreatePDFFromDrawableRect( Drawable drawable,
 	   int x, int y, unsigned int width, unsigned int height);
diff --git a/macosx/tkMacOSXPrint.c b/macosx/tkMacOSXPrint.c
@@ -22,7 +22,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <fcntl.h>
-#include <tkMacOSXImage.h>
+#include "tkMacOSXImage.h"
 #include "tkMacOSXPrivate.h"
 
 NSString * fileName = nil;

diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c
@@ -3,12 +3,12 @@
  *
  *      Tk theme engine for Mac OSX, using the Appearance Manager API.
  *
- * Copyright (c) 2004 Joe English
- * Copyright (c) 2005 Neil Madden
- * Copyright (c) 2006-2009 Daniel A. Steffen <das@users.sourceforge.net>
- * Copyright (c) 2008-2009 Apple Inc.
- * Copyright (c) 2009 Kevin Walzer/WordTech Communications LLC.
- * Copyright (c) 2019 Marc Culler
+ * Copyright © 2004 Joe English
+ * Copyright © 2005 Neil Madden
+ * Copyright © 2006-2009 Daniel A. Steffen <das@users.sourceforge.net>
+ * Copyright © 2008-2009 Apple Inc.
+ * Copyright © 2009 Kevin Walzer/WordTech Communications LLC.
+ * Copyright © 2019 Marc Culler
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.