From a45518466641e434c288c0585d8e2413a4aae760 Mon Sep 17 00:00:00 2001
From: hobbs2 <hobbs2>
Date: Mon, 29 Nov 2004 20:20:22 +0000
Subject: 	* generic/tkTreeCtrl.c: adapt to Tk_PhotoPut(Zoomed)Block API 
 changes for 8.5 (TIP #116).

---
 ChangeLog            |  5 +++++
 generic/tkTreeCtrl.c | 25 ++++++++++++++++++++-----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f5a40ee..c64c3ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-29  Jeff Hobbs  <jeffh@ActiveState.com>
+
+	* generic/tkTreeCtrl.c: adapt to Tk_PhotoPut(Zoomed)Block API
+	changes for 8.5 (TIP #116).
+
 2004-10-09  Jeff Hobbs  <jeffh@ActiveState.com>
 
 	* Makefile.in:      Revamp build system to use TEA 3.1 setup.
diff --git a/generic/tkTreeCtrl.c b/generic/tkTreeCtrl.c
index 911a59d..fddbfcc 100644
--- a/generic/tkTreeCtrl.c
+++ b/generic/tkTreeCtrl.c
@@ -5,13 +5,28 @@
  *
  * Copyright (c) 2002-2004 Tim Baker
  * Copyright (c) 2002-2003 Christian Krone
- * Copyright (c) 2003 ActiveState Corporation
+ * Copyright (c) 2003-2004 ActiveState, a division of Sophos
  *
- * RCS: @(#) $Id: tkTreeCtrl.c,v 1.25 2004/10/09 22:57:44 hobbs2 Exp $
+ * RCS: @(#) $Id: tkTreeCtrl.c,v 1.26 2004/11/29 20:20:22 hobbs2 Exp $
  */
 
 #include "tkTreeCtrl.h"
 
+/*
+ * TIP #116 altered Tk_PhotoPutBlock API to add interp arg.
+ * We need to remove that for compiling with 8.4.
+ */
+#if ((TK_MAJOR_VERSION > 8) || \
+	((TK_MAJOR_VERSION == 8) && (TK_MINOR_VERSION > 4)))
+#define TK_PHOTOPUTBLOCK	Tk_PhotoPutBlock
+#define TK_PHOTOPUTZOOMEDBLOCK	Tk_PhotoPutZoomedBlock
+#else
+#define TK_PHOTOPUTBLOCK(interp, hdl, blk, x, y, w, cr) \
+		Tk_PhotoPutBlock(hdl, blk, x, y, w, cr)
+#define TK_PHOTOPUTZOOMEDBLOCK(interp, hdl, blk, x, y, w, zx, zy, sx, sy, cr) \
+		Tk_PhotoPutZoomedBlock(hdl, blk, x, y, w, zx, zy, sx, sy, cr)
+#endif
+
 static CONST char *bgModeST[] = {
     "column", "index", "row", "visindex", (char *) NULL
 };
@@ -2800,7 +2815,7 @@ int ImageTintCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *C
 		pixelPtr[x * 4 + 3] = 0;
 	    }
 	}
-	Tk_PhotoPutBlock(photoH, &photoBlock, 0, y,
+	TK_PHOTOPUTBLOCK(interp, photoH, &photoBlock, 0, y,
 		imgW, 1, TK_PHOTO_COMPOSITE_OVERLAY);
 #if 1
 	photoPix += pitch;
@@ -2915,7 +2930,7 @@ int LoupeCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST
     }
 
     XQueryColors(display, Tk_Colormap(tkwin), xcolors, ncolors);
- 
+
     /* XImage -> Tk_Image */
     pixelPtr = (unsigned char *) Tcl_Alloc(ximage->width * ximage->height * 4);
     photoBlock.pixelPtr  = pixelPtr;
@@ -2947,7 +2962,7 @@ int LoupeCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST
 	}
     }
 
-    Tk_PhotoPutZoomedBlock(photoH, &photoBlock, 0, 0, w, h,
+    TK_PHOTOPUTZOOMEDBLOCK(interp, photoH, &photoBlock, 0, 0, w, h,
 	    zoom, zoom, 1, 1, TK_PHOTO_COMPOSITE_SET);
 
     Tcl_Free((char *) pixelPtr);
-- 
cgit v0.12