diff -u -r tktreectrl-2.2.1/generic/tkTreeColumn.c tktreectrl-2.2.1_changed/generic/tkTreeColumn.c
--- tktreectrl-2.2.1/generic/tkTreeColumn.c	2006-12-09 02:19:04.000000000 +0100
+++ tktreectrl-2.2.1_changed/generic/tkTreeColumn.c	2007-01-17 17:22:40.000000000 +0100
@@ -2749,7 +2749,7 @@
 	    } else {
 		partText.width = widthForText;
 		partText.height = layout->fm.linespace;
-		layout->bytesThatFit = Ellipsis(layout->tkfont, column->text,
+		layout->bytesThatFit = TkTc_Ellipsis(layout->tkfont, column->text,
 			column->textLen, &partText.width, "...", FALSE);
 	    }
 	    parts[n] = &partText;
diff -u -r tktreectrl-2.2.1/generic/tkTreeCtrl.h tktreectrl-2.2.1_changed/generic/tkTreeCtrl.h
--- tktreectrl-2.2.1/generic/tkTreeCtrl.h	2006-12-09 02:19:05.000000000 +0100
+++ tktreectrl-2.2.1_changed/generic/tkTreeCtrl.h	2007-01-17 17:22:55.000000000 +0100
@@ -824,7 +824,7 @@
 #define WFREE(p,t) WIPEFREE(p, sizeof(t))
 #define WCFREE(p,t,c) WIPEFREE(p, sizeof(t) * (c))
 
-extern int Ellipsis(Tk_Font tkfont, char *string, int numBytes, int *maxPixels, char *ellipsis, int force);
+extern int TkTc_Ellipsis(Tk_Font tkfont, char *string, int numBytes, int *maxPixels, char *ellipsis, int force);
 extern void HDotLine(TreeCtrl *tree, Drawable drawable, GC gc, int x1, int y1, int x2);
 extern void VDotLine(TreeCtrl *tree, Drawable drawable, GC gc, int x1, int y1, int y2);
 extern void DotRect(TreeCtrl *tree, Drawable drawable, int x, int y, int width, int height);
diff -u -r tktreectrl-2.2.1/generic/tkTreeElem.c tktreectrl-2.2.1_changed/generic/tkTreeElem.c
--- tktreectrl-2.2.1/generic/tkTreeElem.c	2006-12-09 02:19:05.000000000 +0100
+++ tktreectrl-2.2.1_changed/generic/tkTreeElem.c	2007-01-17 17:23:11.000000000 +0100
@@ -3031,7 +3031,7 @@
     Tk_GetFontMetrics(tkfont, &fm);
 
     pixelsForText = args->display.width;
-    bytesThatFit = Ellipsis(tkfont, text, textLen, &pixelsForText, ellipsis, FALSE);
+    bytesThatFit = TkTc_Ellipsis(tkfont, text, textLen, &pixelsForText, ellipsis, FALSE);
     width = pixelsForText, height = fm.linespace;
     /* Hack -- The actual size of the text may be slightly smaller than
     * the available space when squeezed. If so we don't want to center
diff -u -r tktreectrl-2.2.1/generic/tkTreeUtils.c tktreectrl-2.2.1_changed/generic/tkTreeUtils.c
--- tktreectrl-2.2.1/generic/tkTreeUtils.c	2006-12-09 02:19:05.000000000 +0100
+++ tktreectrl-2.2.1_changed/generic/tkTreeUtils.c	2007-01-17 17:23:55.000000000 +0100
@@ -118,7 +118,7 @@
 /*
  *----------------------------------------------------------------------
  *
- * Ellipsis --
+ * TkTc_Ellipsis --
  *
  *	Determine the number of bytes from the string that will fit
  *	in the given horizontal span. If the entire string does not
@@ -138,7 +138,7 @@
  */
 
 int
-Ellipsis(
+TkTc_Ellipsis(
     Tk_Font tkfont,		/* The font used to display the string. */
     char *string,		/* UTF-8 string, need not be NULL-terminated. */
     int numBytes,		/* Number of bytes to consider. */
@@ -1678,7 +1678,7 @@
 		newX = chunkPtr->totalWidth - 1;
 		if (chunkPtr->x + chunkPtr->totalWidth < wrapLength)
 		    newX = wrapLength - chunkPtr->x;
-		bytesThisChunk = Ellipsis(tkfont, (char *) chunkPtr->start,
+		bytesThisChunk = TkTc_Ellipsis(tkfont, (char *) chunkPtr->start,
 		    chunkPtr->numBytes, &newX, ellipsis, TRUE);
 		if (bytesThisChunk > 0)
 		{