summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--unix/tkUnixFont.c5
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0dc1488..fe92cdd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-25 Don Porter <dgp@users.sf.net>
+
+ * unix/tkUnixFont.c: (Tk_DrawChars) silence compiler warning.
+
2002-06-26 David Gravereaux <davygrvy@pobox.com>
* generic/tkStyle.c: <eol> of the committing cvs client didn't
diff --git a/unix/tkUnixFont.c b/unix/tkUnixFont.c
index 9bfeef6..2c39433 100644
--- a/unix/tkUnixFont.c
+++ b/unix/tkUnixFont.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkUnixFont.c,v 1.13 2002/06/05 22:11:09 a_kovalenko Exp $
+ * RCS: @(#) $Id: tkUnixFont.c,v 1.14 2002/06/26 23:02:45 dgp Exp $
*/
#include "tkUnixInt.h"
@@ -1158,7 +1158,8 @@ Tk_DrawChars(display, drawable, gc, tkfont, source, numBytes, x, y)
int xStart, needWidth, window_width;
Tcl_UniChar ch;
FontFamily *familyPtr;
- int rx, ry, width, height, border_width, depth;
+ int rx, ry;
+ unsigned int width, height, border_width, depth;
int do_width;
Drawable root;