summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-07-12 18:36:56 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-07-12 18:36:56 (GMT)
commit5c42e7037f5ba27a7d2aee8e4b838e756155b9cc (patch)
tree0a222e9d6f0a016c0f1b76db0d65f033bf78d68a
parente81b3e379034e1e6eb711c04117dc61a1fa564ca (diff)
downloadtk-5c42e7037f5ba27a7d2aee8e4b838e756155b9cc.zip
tk-5c42e7037f5ba27a7d2aee8e4b838e756155b9cc.tar.gz
tk-5c42e7037f5ba27a7d2aee8e4b838e756155b9cc.tar.bz2
Type correctness fix, to stop compiler complaint
-rw-r--r--generic/tkInt.h2
-rw-r--r--unix/tkUnixRFont.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/generic/tkInt.h b/generic/tkInt.h
index bc0e0a3..88e0c25 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -1219,7 +1219,7 @@ MODULE_SCOPE Status TkParseColor (Display * display,
XColor * colorPtr);
#endif
#ifdef HAVE_XFT
-MODULE_SCOPE void TkUnixSetXftClipRegion(Region clipRegion);
+MODULE_SCOPE void TkUnixSetXftClipRegion(TkRegion clipRegion);
#endif
/*
diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c
index a8f5289..4203ff9 100644
--- a/unix/tkUnixRFont.c
+++ b/unix/tkUnixRFont.c
@@ -1124,12 +1124,12 @@ TkDrawAngledChars(
void
TkUnixSetXftClipRegion(
- Region clipRegion) /* The clipping region to install. */
+ TkRegion clipRegion) /* The clipping region to install. */
{
ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
- tsdPtr->clipRegion = clipRegion;
+ tsdPtr->clipRegion = (Region) clipRegion;
}
/*