diff options
| author | das <das> | 2007-10-12 03:13:55 (GMT) |
|---|---|---|
| committer | das <das> | 2007-10-12 03:13:55 (GMT) |
| commit | 094e7eca4116ed18efcfafa5da28ec55aba5251f (patch) | |
| tree | 19db4bde02cd865bf8f7eeedf826c2080de5b5f8 /macosx | |
| parent | 413cb8a5b4a397fe2ff658b06b5cc801c899dcdf (diff) | |
| download | tk-094e7eca4116ed18efcfafa5da28ec55aba5251f.zip tk-094e7eca4116ed18efcfafa5da28ec55aba5251f.tar.gz tk-094e7eca4116ed18efcfafa5da28ec55aba5251f.tar.bz2 | |
* xlib/xgc.c: factor out alloc/free of GC clip_mask;
* macosx/tkMacOSXXStubs.c: manage clip rgn lifetime with new
Tkp{Retain,Release}Region().
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/tkMacOSXXStubs.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c index 31ae7ea..78bd909 100644 --- a/macosx/tkMacOSXXStubs.c +++ b/macosx/tkMacOSXXStubs.c @@ -13,7 +13,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXXStubs.c,v 1.23 2007/07/04 17:32:39 andreas_kupries Exp $ + * RCS: @(#) $Id: tkMacOSXXStubs.c,v 1.24 2007/10/12 03:13:55 das Exp $ */ #include "tkMacOSXPrivate.h" @@ -706,15 +706,7 @@ XSetClipRectangles( int n, int ordering) { - TkRegion clipRgn; - - if (gc->clip_mask && ((TkpClipMask*)gc->clip_mask)->type - == TKP_CLIP_REGION) { - clipRgn = ((TkpClipMask*)gc->clip_mask)->value.region; - SetEmptyRgn((RgnHandle) clipRgn); - } else { - clipRgn = TkCreateRegion(); /* LEAK! */ - } + TkRegion clipRgn = TkCreateRegion(); while (n--) { XRectangle rect = *rectangles; @@ -725,6 +717,7 @@ XSetClipRectangles( rectangles++; } TkSetRegion(d, gc, clipRgn); + TkDestroyRegion(clipRgn); return 1; } #endif |