diff -ur blt2.4z/library/Makefile.vc blt2.4z-8.5.2/library/Makefile.vc

--- blt2.4z/library/Makefile.vc	2002-08-21 08:20:51.000000000 +0200

+++ blt2.4z-8.5.2/library/Makefile.vc	2008-04-15 17:31:26.000000000 +0200

@@ -6,7 +6,6 @@

 include ../win/makedefs

 version =	$(BLT_MAJOR_VERSION).$(BLT_MINOR_VERSION)

-pkgdir =	$(libdir)/tcl$(v1)/blt$(version)

 srcdir =	.

 cursors = 	treeview.cur

@@ -30,8 +29,7 @@

 		tclIndex

 instdirs =	$(prefix) $(exec_prefix) $(libdir) \

-		$(scriptdir) $(scriptdir)/dd_protocols $(libdir)/tcl$(v1) \

-		$(pkgdir)

+		$(scriptdir) $(scriptdir)/dd_protocols $(libdir)/tcl$(v1)

 all: build-pkgindex

@@ -62,7 +60,6 @@

 install-pkgindex: pkgIndex.tcl

 	$(INSTALL_DATA) pkgIndex.tcl $(scriptdir)

-	$(INSTALL_DATA) pkgIndex.tcl $(pkgdir)

 clean:

 	$(RM) pkgIndex.tcl

diff -ur blt2.4z/Makefile.in blt2.4z-8.5.2/Makefile.in

--- blt2.4z/Makefile.in	2002-02-19 01:11:43.000000000 +0100

+++ blt2.4z-8.5.2/Makefile.in	2008-04-15 17:31:26.000000000 +0200

@@ -72,4 +72,8 @@

 	config.status config.cache config.log Makefile 

 distclean: clean

+	(cd src; $(MAKE) distclean)

+	(cd library; $(MAKE) distclean)

+	(cd man; $(MAKE) distclean)

+	(cd demos; $(MAKE) distclean)

 	$(RM) $(GENERATED_FILES)

diff -ur blt2.4z/src/bltBgexec.c blt2.4z-8.5.2/src/bltBgexec.c

--- blt2.4z/src/bltBgexec.c	2002-09-19 00:30:50.000000000 +0200

+++ blt2.4z-8.5.2/src/bltBgexec.c	2008-04-15 17:31:26.000000000 +0200

@@ -58,7 +58,7 @@

 typedef int Process;

 #endif

-#if (TCL_VERSION_NUMBER <  _VERSION(8,1,0)) 

+#if (TCL_VERSION_NUMBER <  _VERSION(8,1,0))

 typedef void *Tcl_Encoding;	/* Make up dummy type for encoding.  */

 #endif

@@ -276,7 +276,7 @@

     int objc;			/*  */

 #endif

-    int flags;			

+    int flags;

     Tcl_File file;		/* Used for backward compatability

 				 * with Tcl 7.5 */

@@ -370,35 +370,35 @@

     StringToSignal, (Blt_SwitchFreeProc *)NULL, (ClientData)0,

 };

-static Blt_SwitchSpec switchSpecs[] = 

+static Blt_SwitchSpec switchSpecs[] =

 {

-    {BLT_SWITCH_STRING, "-decodeoutput", 

+    {BLT_SWITCH_STRING, "-decodeoutput",

          Blt_Offset(BackgroundInfo, outputEncodingName), 0},

-    {BLT_SWITCH_STRING, "-decodeerror", 

+    {BLT_SWITCH_STRING, "-decodeerror",

          Blt_Offset(BackgroundInfo, errorEncodingName), 0},

-    {BLT_SWITCH_BOOLEAN, "-echo", 

+    {BLT_SWITCH_BOOLEAN, "-echo",

          Blt_Offset(BackgroundInfo, sink2.echo), 0},

-    {BLT_SWITCH_STRING, "-error", 

+    {BLT_SWITCH_STRING, "-error",

          Blt_Offset(BackgroundInfo, sink2.doneVar), 0},

-    {BLT_SWITCH_STRING, "-update", 

+    {BLT_SWITCH_STRING, "-update",

 	Blt_Offset(BackgroundInfo, sink1.updateVar), 0},

-    {BLT_SWITCH_STRING, "-output", 

+    {BLT_SWITCH_STRING, "-output",

         Blt_Offset(BackgroundInfo, sink1.doneVar), 0},

-    {BLT_SWITCH_STRING, "-lasterror", 

+    {BLT_SWITCH_STRING, "-lasterror",

 	Blt_Offset(BackgroundInfo, sink2.updateVar), 0},

-    {BLT_SWITCH_STRING, "-lastoutput", 

+    {BLT_SWITCH_STRING, "-lastoutput",

 	Blt_Offset(BackgroundInfo, sink1.updateVar), 0},

-    {BLT_SWITCH_LIST, "-onerror", 

+    {BLT_SWITCH_LIST, "-onerror",

 	Blt_Offset(BackgroundInfo, sink2.updateCmd), 0},

-    {BLT_SWITCH_LIST, "-onoutput", 

+    {BLT_SWITCH_LIST, "-onoutput",

 	Blt_Offset(BackgroundInfo, sink1.updateCmd), 0},

-    {BLT_SWITCH_BOOLEAN, "-keepnewline", 

+    {BLT_SWITCH_BOOLEAN, "-keepnewline",

 	Blt_Offset(BackgroundInfo, keepNewline), 0},

-    {BLT_SWITCH_BOOLEAN, "-check", 

+    {BLT_SWITCH_INT, "-check",

 	Blt_Offset(BackgroundInfo, interval), 0},

-    {BLT_SWITCH_CUSTOM, "-killsignal", 

+    {BLT_SWITCH_CUSTOM, "-killsignal",

 	Blt_Offset(BackgroundInfo, signalNum), 0, &killSignalSwitch},

-    {BLT_SWITCH_BOOLEAN, "-linebuffered", 

+    {BLT_SWITCH_BOOLEAN, "-linebuffered",

 	Blt_Offset(BackgroundInfo, lineBuffered), 0},

     {BLT_SWITCH_END, NULL, 0, 0}

 };

@@ -517,7 +517,7 @@

  *	Returns the next block of data since the last time this

  *	routine was called.

  *

- *---------------------------------------------------------------------- 

+ *----------------------------------------------------------------------

  */

 static unsigned char *

 NextBlock(sinkPtr, lengthPtr)

@@ -531,7 +531,7 @@

     length = sinkPtr->mark - sinkPtr->lastMark;

     sinkPtr->lastMark = sinkPtr->mark;

     if (length > 0) {

-	if ((!(sinkPtr->flags & SINK_KEEP_NL)) && 

+	if ((!(sinkPtr->flags & SINK_KEEP_NL)) &&

 	    (string[length - 1] == '\n')) {

 	    length--;

 	}

@@ -565,7 +565,7 @@

 	for (i = 0; i < newBytes; i++) {

 	    if (string[i] == '\n') {

 		int length;

-		

+

 		length = i + 1;

 		sinkPtr->lastMark += length;

 		if (!(sinkPtr->flags & SINK_KEEP_NL)) {

@@ -594,13 +594,13 @@

  *	keeping all the data collected from the channel (no -output

  *	flag and the process is detached).

  *

- *---------------------------------------------------------------------- 

+ *----------------------------------------------------------------------

  */

 static void

 ResetSink(sinkPtr)

     Sink *sinkPtr;

-{ 

-    if ((sinkPtr->flags & SINK_BUFFERED) && 

+{

+    if ((sinkPtr->flags & SINK_BUFFERED) &&

 	(sinkPtr->fill > sinkPtr->lastMark)) {

 	register size_t i, j;

@@ -654,8 +654,8 @@

     }

     if (bgPtr->lineBuffered) {

 	sinkPtr->flags |= SINK_BUFFERED;

-    }	

-    if ((sinkPtr->updateCmd != NULL) || 

+    }

+    if ((sinkPtr->updateCmd != NULL) ||

 	(sinkPtr->updateVar != NULL) ||

 	(sinkPtr->echo)) {

 	sinkPtr->flags |= SINK_NOTIFY;

@@ -843,7 +843,7 @@

 #define IsOpenSink(sinkPtr)  ((sinkPtr)->fd != -1)

 static void

-CloseSink(interp, sinkPtr) 

+CloseSink(interp, sinkPtr)

     Tcl_Interp *interp;

     Sink *sinkPtr;

 {

@@ -864,19 +864,19 @@

 	if (sinkPtr->doneVar != NULL) {

 	    unsigned char *data;

 	    size_t length;

-	    /* 

+	    /*

 	     * If data is to be collected, set the "done" variable

-	     * with the contents of the buffer.  

+	     * with the contents of the buffer.

 	     */

 	    GetSinkData(sinkPtr, &data, &length);

-#if (TCL_VERSION_NUMBER <  _VERSION(8,1,0)) 

+#if (TCL_VERSION_NUMBER <  _VERSION(8,1,0))

 	    data[length] = '\0';

-	    if (Tcl_SetVar(interp, sinkPtr->doneVar, data, 

+	    if (Tcl_SetVar(interp, sinkPtr->doneVar, data,

 			   TCL_GLOBAL_ONLY) == NULL) {

 		Tcl_BackgroundError(interp);

 	    }

 #else

-	    if (Tcl_SetVar2Ex(interp, sinkPtr->doneVar, NULL, 

+	    if (Tcl_SetVar2Ex(interp, sinkPtr->doneVar, NULL,

 			      Tcl_NewByteArrayObj(data, length),

 			      (TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG)) == NULL) {

 		Tcl_BackgroundError(interp);

@@ -917,9 +917,9 @@

 #endif

     if (sinkPtr->encoding == ENCODING_BINARY) { /* binary */

 	/* No translation needed. */

-	sinkPtr->mark = sinkPtr->fill; 

+	sinkPtr->mark = sinkPtr->fill;

     } else if (sinkPtr->encoding == ENCODING_ASCII) { /* ascii */

-#if (TCL_VERSION_NUMBER <  _VERSION(8,1,0)) 

+#if (TCL_VERSION_NUMBER <  _VERSION(8,1,0))

 	/* Convert NUL bytes to question marks. */

 	srcPtr = sinkPtr->byteArr + sinkPtr->mark;

 	endPtr = sinkPtr->byteArr + sinkPtr->fill;

@@ -932,7 +932,7 @@

 #endif /* < 8.1.0 */

 	/* One-to-one translation. mark == fill. */

 	sinkPtr->mark = sinkPtr->fill;

-#if (TCL_VERSION_NUMBER >= _VERSION(8,1,0)) 

+#if (TCL_VERSION_NUMBER >= _VERSION(8,1,0))

     } else { /* unicode. */

 	int nSrcCooked, nCooked;

 	int result;

@@ -941,41 +941,41 @@

 	unsigned char *destPtr;

 	unsigned char *raw, *cooked;

 	unsigned char leftover[100];

-	

+

 	raw = sinkPtr->byteArr + sinkPtr->mark;

 	nRaw = sinkPtr->fill - sinkPtr->mark;

 	/* Ideally, the cooked buffer size should be smaller */

 	cookedSize = nRaw * TCL_UTF_MAX + 1;

 	cooked = Blt_Malloc(cookedSize);

-	result = Tcl_ExternalToUtf(interp, sinkPtr->encoding, 

-			(char *)raw, nRaw, 0, NULL, (char *)cooked, 

+	result = Tcl_ExternalToUtf(interp, sinkPtr->encoding,

+			(char *)raw, nRaw, 0, NULL, (char *)cooked,

 			cookedSize, &nSrcCooked, &nCooked, NULL);

 	nLeftOver = 0;

 	if (result == TCL_CONVERT_MULTIBYTE) {

-	    /* 

+	    /*

 	     * Last multibyte sequence wasn't completed.  Save the

-	     * extra characters in a temporary buffer.  

+	     * extra characters in a temporary buffer.

 	     */

 	    nLeftOver = (nRaw - nSrcCooked);

-	    srcPtr = sinkPtr->byteArr + (sinkPtr->mark + nSrcCooked); 

+	    srcPtr = sinkPtr->byteArr + (sinkPtr->mark + nSrcCooked);

 	    endPtr = srcPtr + nLeftOver;

 	    destPtr = leftover;

 	    while (srcPtr < endPtr) {

 		*destPtr++ = *srcPtr++;

 	    }

-	} 

+	}

 	/*

-	 * Create a bigger 

+	 * Create a bigger

 	 */

-						 

+

 	needed = nLeftOver + nCooked;

 	spaceLeft = sinkPtr->size - sinkPtr->mark;

 	if (spaceLeft >= needed) {

 	    spaceLeft = ExtendSinkBuffer(sinkPtr);

 	}

 	assert(spaceLeft > needed);

-	/* 

-	 * Replace the characters from the mark with the translated 

+	/*

+	 * Replace the characters from the mark with the translated

 	 * characters.

 	 */

 	srcPtr = cooked;

@@ -986,7 +986,7 @@

 	}

 	/* Add the number of newly translated characters to the mark */

 	sinkPtr->mark += nCooked;

-	

+

 	srcPtr = leftover;

 	endPtr = leftover + nLeftOver;

 	while (srcPtr < endPtr) {

@@ -996,7 +996,7 @@

 #endif /* >= 8.1.0  */

     }

 #ifdef WIN32

-    /* 

+    /*

      * Translate CRLF character sequences to LF characters.  We have to

      * do this after converting the string to UTF from UNICODE.

      */

@@ -1072,7 +1072,7 @@

 #endif

     timeout = (flags & WNOHANG) ? 0 : INFINITE;

     status = WaitForSingleObject(child.hProcess, timeout);

-				 

+

 #if WINDEBUG

     PurifyPrintf("WAITPID: wait status is %d\n", status);

 #endif

@@ -1147,9 +1147,9 @@

     EnumWindows(EnumWindowsProc, (LPARAM)&proc;;

-    /* 

+    /*

      * Wait on the handle. If it signals, great. If it times out,

-     * then call TerminateProcess on it.  

+     * then call TerminateProcess on it.

      *

      * On Windows 95/98 this also has the added benefit of stopping

      * KERNEL32.dll from dumping.  The 2 second number is arbitrary.

@@ -1171,7 +1171,7 @@

 #endif /* WIN32 */

-#if (TCL_VERSION_NUMBER < _VERSION(8,1,0)) 

+#if (TCL_VERSION_NUMBER < _VERSION(8,1,0))

 static void

 NotifyOnUpdate(interp, sinkPtr, data, nBytes)

@@ -1192,7 +1192,7 @@

     data[nBytes] = '\0';

     if (sinkPtr->echo) {

 	Tcl_Channel channel;

-	

+

 	channel = Tcl_GetStdChannel(TCL_STDERR);

 	if (channel == NULL) {

 	    Tcl_AppendResult(interp, "can't get stderr channel", (char *)NULL);

@@ -1235,7 +1235,7 @@

     data[nBytes] = save;

 }

-#else 

+#else

 static void

 NotifyOnUpdate(interp, sinkPtr, data, nBytes)

@@ -1254,7 +1254,7 @@

     }

     if (sinkPtr->echo) {

 	Tcl_Channel channel;

-	

+

 	channel = Tcl_GetStdChannel(TCL_STDERR);

 	if (channel == NULL) {

 	    Tcl_AppendResult(interp, "can't get stderr channel", (char *)NULL);

@@ -1285,7 +1285,7 @@

     if (sinkPtr->updateVar != NULL) {

 	Tcl_Obj *result;

-	result = Tcl_SetVar2Ex(interp, sinkPtr->updateVar, NULL, objPtr, 

+	result = Tcl_SetVar2Ex(interp, sinkPtr->updateVar, NULL, objPtr,

 	       (TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG));

 	if (result == NULL) {

 	    Tcl_BackgroundError(interp);

@@ -1306,7 +1306,7 @@

     }

     ReadBytes(sinkPtr);

     CookSink(bgPtr->interp, sinkPtr);

-    if ((sinkPtr->mark > sinkPtr->lastMark) && 

+    if ((sinkPtr->mark > sinkPtr->lastMark) &&

 	(sinkPtr->flags & SINK_NOTIFY)) {

 	unsigned char *data;

 	int length;

@@ -1390,7 +1390,7 @@

 {

     if (bgPtr->traced) {

-	Tcl_UntraceVar(bgPtr->interp, bgPtr->statVar, TRACE_FLAGS, 

+	Tcl_UntraceVar(bgPtr->interp, bgPtr->statVar, TRACE_FLAGS,

 		VariableProc, bgPtr);

 	bgPtr->traced = FALSE;

     }

@@ -1558,7 +1558,7 @@

     register int i;

     unsigned int lastPid;

     int pid;

-    enum PROCESS_STATUS { 

+    enum PROCESS_STATUS {

 	PROCESS_EXITED, PROCESS_STOPPED, PROCESS_KILLED, PROCESS_UNKNOWN

     } pcode;

     WAIT_STATUS_TYPE waitStatus, lastStatus;

@@ -1595,7 +1595,7 @@

     }

     bgPtr->nProcs = nLeft;

-    if ((nLeft > 0) || (IsOpenSink(&bgPtr->sink1)) || 

+    if ((nLeft > 0) || (IsOpenSink(&bgPtr->sink1)) ||

 	(IsOpenSink(&bgPtr->sink2))) {

 	/* Keep polling for the status of the children that are left */

 	bgPtr->timerToken = Tcl_CreateTimerHandler(bgPtr->interval, TimerProc,

@@ -1641,11 +1641,11 @@

 	Tcl_DStringAppendElement(&dString, "child completed normally");

 	break;

     case PROCESS_KILLED:

-	Tcl_DStringAppendElement(&dString, 

+	Tcl_DStringAppendElement(&dString,

 				Tcl_SignalMsg((int)(WTERMSIG(lastStatus))));

 	break;

     case PROCESS_STOPPED:

-	Tcl_DStringAppendElement(&dString, 

+	Tcl_DStringAppendElement(&dString,

 		 Tcl_SignalMsg((int)(WSTOPSIG(lastStatus))));

 	break;

     case PROCESS_UNKNOWN:

@@ -1658,8 +1658,8 @@

 	*bgPtr->exitCodePtr = code;

     }

     DisableTriggers(bgPtr);

-    result = Tcl_SetVar(bgPtr->interp, bgPtr->statVar, 

-	Tcl_DStringValue(&dString), TCL_GLOBAL_ONLY);

+    result = Tcl_SetVar(bgPtr->interp, bgPtr->statVar,

+	Tcl_DStringValue(&dString), TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG);

     Tcl_DStringFree(&dString);

     if (result == NULL) {

 	Tcl_BackgroundError(bgPtr->interp);

@@ -1712,7 +1712,7 @@

      * timer handler to periodically poll for the exit status of each

      * process.  Initially check at the next idle interval.

      */

-    if (!IsOpenSink(&bgPtr->sink2)) {

+    if (!IsOpenSink(&bgPtr->sink2) && bgPtr->timerToken == 0) {

 	bgPtr->timerToken = Tcl_CreateTimerHandler(0, TimerProc, clientData);

     }

 }

@@ -1760,7 +1760,7 @@

      * timer handler to periodically poll for the exit status of each

      * process.  Initially check at the next idle interval.

      */

-    if (!IsOpenSink(&bgPtr->sink1)) {

+    if (!IsOpenSink(&bgPtr->sink1) && bgPtr->timerToken == 0) {

 	bgPtr->timerToken = Tcl_CreateTimerHandler(0, TimerProc, clientData);

     }

 }

@@ -1827,7 +1827,7 @@

     /* Try to clean up any detached processes */

     Tcl_ReapDetachedProcs();

-    i = Blt_ProcessSwitches(interp, switchSpecs, argc - 2, argv + 2, 

+    i = Blt_ProcessSwitches(interp, switchSpecs, argc - 2, argv + 2,

 	(char *)bgPtr, BLT_SWITCH_ARGV_PARTIAL);

     if (i < 0) {

 	FreeBackgroundInfo(bgPtr);

@@ -1853,7 +1853,7 @@

 	if (strcmp(bgPtr->outputEncodingName, "binary") == 0) {

 	    encoding = ENCODING_BINARY;

 	} else {

-#if (TCL_VERSION_NUMBER >= _VERSION(8,1,0)) 

+#if (TCL_VERSION_NUMBER >= _VERSION(8,1,0))

 	    encoding = Tcl_GetEncoding(interp, bgPtr->outputEncodingName);

 	    if (encoding == NULL) {

 		goto error;

@@ -1866,7 +1866,7 @@

 	if (strcmp(bgPtr->errorEncodingName, "binary") == 0) {

 	    encoding = ENCODING_BINARY;

 	} else {

-#if (TCL_VERSION_NUMBER >= _VERSION(8,1,0)) 

+#if (TCL_VERSION_NUMBER >= _VERSION(8,1,0))

 	    encoding = Tcl_GetEncoding(interp, bgPtr->errorEncodingName);

 	    if (encoding == NULL) {

 		goto error;

@@ -1878,18 +1878,18 @@

     outFdPtr = errFdPtr = (int *)NULL;

 #ifdef WIN32

-    if ((!bgPtr->detached) || 

-	(bgPtr->sink1.doneVar != NULL) || 

-	(bgPtr->sink1.updateVar != NULL) || 

+    if ((!bgPtr->detached) ||

+	(bgPtr->sink1.doneVar != NULL) ||

+	(bgPtr->sink1.updateVar != NULL) ||

 	(bgPtr->sink1.updateCmd != NULL)) {

 	outFdPtr = &bgPtr->sink1.fd;

     }

 #else

     outFdPtr = &bgPtr->sink1.fd;

 #endif

-    if ((bgPtr->sink2.doneVar != NULL) || 

+    if ((bgPtr->sink2.doneVar != NULL) ||

 	(bgPtr->sink2.updateVar != NULL) ||

-	(bgPtr->sink2.updateCmd != NULL) || 

+	(bgPtr->sink2.updateCmd != NULL) ||

 	(bgPtr->sink2.echo)) {

 	errFdPtr = &bgPtr->sink2.fd;

     }

@@ -1900,6 +1900,7 @@

     }

     bgPtr->procArr = pidPtr;

     bgPtr->nProcs = nProcs;

+    bgPtr->timerToken = 0;

     if (bgPtr->sink1.fd == -1) {

@@ -1919,7 +1920,7 @@

 	(CreateSinkHandler(bgPtr, &bgPtr->sink2, StderrProc) != TCL_OK)) {

  	goto error;

     }

-    if (bgPtr->detached) {	

+    if (bgPtr->detached) {

 	char string[200];

 	/* If detached, return a list of the child process ids instead

@@ -1927,7 +1928,7 @@

 	for (i = 0; i < nProcs; i++) {

 #ifdef WIN32

 	    sprintf(string, "%u", (unsigned int)bgPtr->procArr[i].pid);

-#else 

+#else

 	    sprintf(string, "%d", bgPtr->procArr[i]);

 #endif

 	    Tcl_AppendElement(interp, string);

@@ -1950,7 +1951,7 @@

 	    /* Return the output of the pipeline. */

 	    GetSinkData(&bgPtr->sink1, &data, &length);

-#if (TCL_VERSION_NUMBER <  _VERSION(8,1,0)) 

+#if (TCL_VERSION_NUMBER <  _VERSION(8,1,0))

 	    data[length] = '\0';

 	    Tcl_SetResult(interp, data, TCL_VOLATILE);

 #else

diff -ur blt2.4z/src/bltGrMarker.c blt2.4z-8.5.2/src/bltGrMarker.c

--- blt2.4z/src/bltGrMarker.c	2002-09-19 00:30:51.000000000 +0200

+++ blt2.4z-8.5.2/src/bltGrMarker.c	2008-04-16 16:47:48.000000000 +0200

@@ -1061,10 +1061,12 @@

     Graph *graphPtr;

     Extents2D *extsPtr;

 {

+/*

     assert(extsPtr->right >= extsPtr->left);

     assert(extsPtr->bottom >= extsPtr->top);

     assert(graphPtr->right >= graphPtr->left);

     assert(graphPtr->bottom >= graphPtr->top);

+*/

     return (((double)graphPtr->right < extsPtr->left) ||

 	    ((double)graphPtr->bottom < extsPtr->top) ||

diff -ur blt2.4z/src/bltInit.c blt2.4z-8.5.2/src/bltInit.c

--- blt2.4z/src/bltInit.c	2002-09-10 07:12:33.000000000 +0200

+++ blt2.4z-8.5.2/src/bltInit.c	2008-04-15 17:31:25.000000000 +0200

@@ -28,7 +28,7 @@

 #include <bltInt.h>

-#define EXACT 1

+#define EXACT 0

 #ifndef BLT_LIBRARY

 #ifdef WIN32

diff -ur blt2.4z/src/bltNsUtil.h blt2.4z-8.5.2/src/bltNsUtil.h

--- blt2.4z/src/bltNsUtil.h	2002-07-18 08:35:32.000000000 +0200

+++ blt2.4z-8.5.2/src/bltNsUtil.h	2008-04-15 17:31:26.000000000 +0200

@@ -48,7 +48,7 @@

 EXTERN Tcl_Command Tcl_FindCommand _ANSI_ARGS_((Tcl_Interp *interp,

-	char *name, Tcl_Namespace *nsPtr, int flags));

+	CONST char *name, Tcl_Namespace *nsPtr, int flags));

 #define NS_SEARCH_NONE		(0)

 #define NS_SEARCH_CURRENT	(1<<0)

@@ -65,15 +65,15 @@

 #if (TCL_MAJOR_VERSION >= 8)

 EXTERN Tcl_Namespace *Tcl_CreateNamespace _ANSI_ARGS_((Tcl_Interp *interp,

-	char *name, ClientData clientData, Tcl_NamespaceDeleteProc *nsDelProc));

+	CONST char *name, ClientData clientData, Tcl_NamespaceDeleteProc *nsDelProc));

 EXTERN void Tcl_DeleteNamespace _ANSI_ARGS_((Tcl_Namespace *nsPtr));

 EXTERN Tcl_Namespace *Tcl_FindNamespace _ANSI_ARGS_((Tcl_Interp *interp,

-	char *name, Tcl_Namespace *context, int flags));

+	CONST char *name, Tcl_Namespace *context, int flags));

 EXTERN int Tcl_Export _ANSI_ARGS_((Tcl_Interp *interp, Tcl_Namespace *nsPtr,

-	char *name, int resetFlag));

+	CONST char *name, int resetFlag));

 EXTERN Tcl_Var Tcl_FindNamespaceVar _ANSI_ARGS_((Tcl_Interp *interp, char *name,

 	Tcl_Namespace *contextNsPtr, int flags));

diff -ur blt2.4z/src/bltText.c blt2.4z-8.5.2/src/bltText.c

--- blt2.4z/src/bltText.c	2002-08-13 21:45:20.000000000 +0200

+++ blt2.4z-8.5.2/src/bltText.c	2008-04-16 16:37:41.000000000 +0200

@@ -671,6 +671,9 @@

     Pixmap bitmap;

     int active;

+    if (!textPtr)

+	return;

+    

     display = Tk_Display(tkwin);

     theta = FMOD(tsPtr->theta, (double)360.0);

     if (theta < 0.0) {

diff -ur blt2.4z/src/bltWindow.c blt2.4z-8.5.2/src/bltWindow.c

--- blt2.4z/src/bltWindow.c	2002-09-19 05:02:09.000000000 +0200

+++ blt2.4z-8.5.2/src/bltWindow.c	2008-04-16 16:38:15.000000000 +0200

@@ -89,9 +89,9 @@

 typedef struct TkDisplayStruct {

     Display *display;		/* Xlib's info about display. */

-    struct TkDisplayStruct *nextPtr; /* Next in list of all displays. */

-    char *name;			/* Name of display (with any screen

-				 * identifier removed).  Malloc-ed. */

+    struct TkDisplay *nextPtr;	/* Next in list of all displays. */

+    char *name;			/* Name of display (with any screen identifier

+				 * removed). Malloc-ed. */

     Time lastEventTime;		/* Time of last event received for this

 				 * display. */

@@ -107,8 +107,8 @@

      * Information used by tkAtom.c only:

      */

-    int atomInit;		/* 0 means stuff below hasn't been

-				 * initialized yet. */

+    int atomInit;		/* 0 means stuff below hasn't been initialized

+				 * yet. */

     Tcl_HashTable nameTable;	/* Maps from names to Atom's. */

     Tcl_HashTable atomTable;	/* Maps from Atom's back to names. */

@@ -116,27 +116,26 @@

      * Information used primarily by tkBind.c:

      */

-    int bindInfoStale;		/* Non-zero means the variables in this

-				 * part of the structure are potentially

-				 * incorrect and should be recomputed. */

+    int bindInfoStale;		/* Non-zero means the variables in this part

+				 * of the structure are potentially incorrect

+				 * and should be recomputed. */

     unsigned int modeModMask;	/* Has one bit set to indicate the modifier

-				 * corresponding to "mode shift".  If no

-				 * such modifier, than this is zero. */

+				 * corresponding to "mode shift". If no such

+				 * modifier, than this is zero. */

     unsigned int metaModMask;	/* Has one bit set to indicate the modifier

-				 * corresponding to the "Meta" key.  If no

-				 * such modifier, then this is zero. */

+				 * corresponding to the "Meta" key. If no such

+				 * modifier, then this is zero. */

     unsigned int altModMask;	/* Has one bit set to indicate the modifier

-				 * corresponding to the "Meta" key.  If no

-				 * such modifier, then this is zero. */

-    enum {

-	LU_IGNORE, LU_CAPS, LU_SHIFT

-    } lockUsage;		/* Indicates how to interpret lock modifier. */

+				 * corresponding to the "Meta" key. If no such

+				 * modifier, then this is zero. */

+    enum {LU_IGNORE, LU_CAPS, LU_SHIFT} lockUsage;

+				/* Indicates how to interpret lock

+				 * modifier. */

     int numModKeyCodes;		/* Number of entries in modKeyCodes array

 				 * below. */

-    KeyCode *modKeyCodes;	/* Pointer to an array giving keycodes for

-				 * all of the keys that have modifiers

-				 * associated with them.  Malloc'ed, but

-				 * may be NULL. */

+    KeyCode *modKeyCodes;	/* Pointer to an array giving keycodes for all

+				 * of the keys that have modifiers associated

+				 * with them. Malloc'ed, but may be NULL. */

     /*

      * Information used by tkBitmap.c only:

@@ -150,10 +149,10 @@

     Tcl_HashTable bitmapIdTable;/* Maps from bitmap id to the TkBitmap

 				 * structure for the bitmap. */

     Tcl_HashTable bitmapDataTable;

-				/* Used by Tk_GetBitmapFromData to map from

-				 * a collection of in-core data about a

-				 * bitmap to a reference giving an auto-

-				 * matically-generated name for the bitmap. */

+				/* Used by Tk_GetBitmapFromData to map from a

+				 * collection of in-core data about a bitmap

+				 * to a reference giving an automatically-

+				 * generated name for the bitmap. */

     /*

      * Information used by tkCanvas.c only:

@@ -167,9 +166,9 @@

      */

     int colorInit;		/* 0 means color module needs initializing. */

-    TkStressedCmap *stressPtr;	/* First in list of colormaps that have

-				 * filled up, so we have to pick an

-				 * approximate color. */

+    TkStressedCmap *stressPtr;	/* First in list of colormaps that have filled

+				 * up, so we have to pick an approximate

+				 * color. */

     Tcl_HashTable colorNameTable;

 				/* Maps from color name to TkColor structure

 				 * for that color. */

@@ -192,34 +191,33 @@

 				/* Maps from a cursor id to the TkCursor

 				 * structure for the cursor. */

     char cursorString[20];	/* Used to store a cursor id string. */

-    Font cursorFont;		/* Font to use for standard cursors.

-				 * None means font not loaded yet. */

+    Font cursorFont;		/* Font to use for standard cursors. None

+				 * means font not loaded yet. */

     /*

      * Information used by tkError.c only:

      */

     struct TkErrorHandler *errorPtr;

-				/* First in list of error handlers

-				 * for this display.  NULL means

-				 * no handlers exist at present. */

-    int deleteCount;		/* Counts # of handlers deleted since

-				 * last time inactive handlers were

-				 * garbage-collected.  When this number

-				 * gets big, handlers get cleaned up. */