summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2012-07-12 12:29:42 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2012-07-12 12:29:42 (GMT)
commit02e336a3fe60cf9e3cc1d90d2d2d3fa98e1a3a5a (patch)
tree9afbb242702ecdaf583a8549bbb16ecdebc50066
parent6e3155d279cf28581344bfd172fa4ad96b372f0a (diff)
downloadtk-02e336a3fe60cf9e3cc1d90d2d2d3fa98e1a3a5a.zip
tk-02e336a3fe60cf9e3cc1d90d2d2d3fa98e1a3a5a.tar.gz
tk-02e336a3fe60cf9e3cc1d90d2d2d3fa98e1a3a5a.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 a95adf8..c30eceb 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -1187,7 +1187,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 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;
}