summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2012-07-16 19:37:47 (GMT)
committerdgp <dgp@users.sourceforge.net>2012-07-16 19:37:47 (GMT)
commit2ef3587473dbc2fd4ddec6a6a0c2374e54a20364 (patch)
tree1e8f9df5f98687e043c1c9b7d903e4c170c55b15 /unix
parent763538938fe9fcfcbb6fda499d06930f54c77c73 (diff)
parent78d66d5a3c3804ab79bdea5bd12ee198918da2f8 (diff)
downloadtk-2ef3587473dbc2fd4ddec6a6a0c2374e54a20364.zip
tk-2ef3587473dbc2fd4ddec6a6a0c2374e54a20364.tar.gz
tk-2ef3587473dbc2fd4ddec6a6a0c2374e54a20364.tar.bz2
merge 8.5
Diffstat (limited to 'unix')
-rw-r--r--unix/tkUnixRFont.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c
index deecceb..c3ece5e 100644
--- a/unix/tkUnixRFont.c
+++ b/unix/tkUnixRFont.c
@@ -810,10 +810,10 @@ Tk_DrawChars(
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;
}