From 489d54fcecc142a1feb7d87c793d721875294291 Mon Sep 17 00:00:00 2001
From: rmax <rmax>
Date: Thu, 23 Mar 2006 22:08:51 +0000
Subject: * unix/tkUnixRFont.c (TkpMeasureCharsInContext): Copied over from
 tkUnixFont.c to fix compiling with --enable-xft .

---
 ChangeLog          | 10 ++++++----
 unix/tkUnixRFont.c | 12 +++++++++++-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bf265f1..3d9ffab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,10 @@
-2006-03-23  Reinhard Max  <max@suse.de>
+2006-03-23  Reinhard Max  <max@tclers.tk>
 
-	* unix/tk.spec: Cleaned up and completed the spec file.
-			An RPM can now be built from the tk source
-			distribution with "rpmbuild -tb <tarball>".
+	* unix/tkUnixRFont.c (TkpMeasureCharsInContext): Copied over from
+	tkUnixFont.c to fix compiling with --enable-xft .
+
+	* unix/tk.spec: Cleaned up and completed.  An RPM can now be built
+	from the tk source distribution with "rpmbuild -tb <tarball>".
 
 2006-03-23  Don Porter  <dgp@users.sourceforge.net>
 
diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c
index 0421573..407bcf6 100644
--- a/unix/tkUnixRFont.c
+++ b/unix/tkUnixRFont.c
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkUnixRFont.c,v 1.12 2006/02/07 11:33:18 dkf Exp $
+ * RCS: @(#) $Id: tkUnixRFont.c,v 1.13 2006/03/23 22:08:51 rmax Exp $
  */
 
 #include "tkUnixInt.h"
@@ -567,6 +567,16 @@ Tk_MeasureChars(
     return curByte;
 }
 
+int
+TkpMeasureCharsInContext(Tk_Font tkfont, CONST char * source, int numBytes,
+			 int rangeStart, int rangeLength, int maxLength,
+			 int flags, int * lengthPtr)
+{
+    (void) numBytes; /*unused*/
+    return Tk_MeasureChars(tkfont, source + rangeStart, rangeLength,
+	    maxLength, flags, lengthPtr);
+}
+
 #define NUM_SPEC    1024
 
 void
-- 
cgit v0.12