diff options
| author | fvogel <fvogelnew1@free.fr> | 2023-08-01 20:35:27 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2023-08-01 20:35:27 (GMT) |
| commit | 46a76ac6fef3b94a27c3a4f07a086dd652fa16b2 (patch) | |
| tree | ed963de9e64e7eff71f8233b03968d3c0400bf4d /macosx/tkMacOSXRegion.c | |
| parent | 83f6c0fb39f92f7ea971e7bb0a69bd7cd3c26593 (diff) | |
| download | tk-46a76ac6fef3b94a27c3a4f07a086dd652fa16b2.zip tk-46a76ac6fef3b94a27c3a4f07a086dd652fa16b2.tar.gz tk-46a76ac6fef3b94a27c3a4f07a086dd652fa16b2.tar.bz2 | |
Fix [0f29a2222d]: Aqua: HIShape wrapper function cleanup. Patch from Christopher Chavez.
Diffstat (limited to 'macosx/tkMacOSXRegion.c')
| -rw-r--r-- | macosx/tkMacOSXRegion.c | 64 |
1 files changed, 4 insertions, 60 deletions
diff --git a/macosx/tkMacOSXRegion.c b/macosx/tkMacOSXRegion.c index b022d98..995edaf 100644 --- a/macosx/tkMacOSXRegion.c +++ b/macosx/tkMacOSXRegion.c @@ -161,12 +161,12 @@ TkUnionRectWithRegion( rectangle->width, rectangle->height); if (src_region == dest_region_return) { - ChkErr(TkMacOSHIShapeUnionWithRect, + ChkErr(HIShapeUnionWithRect, (HIMutableShapeRef) dest_region_return, &r); } else { HIShapeRef rectRgn = HIShapeCreateWithRect(&r); - ChkErr(TkMacOSHIShapeUnion, rectRgn, (HIShapeRef) src_region, + ChkErr(HIShapeUnion, rectRgn, (HIShapeRef) src_region, (HIMutableShapeRef) dest_region_return); CFRelease(rectRgn); } @@ -446,7 +446,7 @@ TkMacOSXSetWithNativeRegion( TkRegion r, HIShapeRef rgn) { - ChkErr(TkMacOSXHIShapeSetWithShape, (HIMutableShapeRef) r, rgn); + ChkErr(HIShapeSetWithShape, (HIMutableShapeRef) r, rgn); } /* @@ -502,46 +502,13 @@ TkpCopyRegion( /* *---------------------------------------------------------------------- * - * TkMacOSXHIShapeCreateEmpty, TkMacOSXHIShapeCreateMutableWithRect, - * TkMacOSXHIShapeSetWithShape, - * TkMacOSHIShapeDifferenceWithRect, TkMacOSHIShapeUnionWithRect, - * TkMacOSHIShapeUnion -- + * TkMacOSHIShapeDifferenceWithRect -- * * Wrapper functions for missing/buggy HIShape API * *---------------------------------------------------------------------- */ -HIShapeRef -TkMacOSXHIShapeCreateEmpty(void) -{ - HIShapeRef result; - - result = HIShapeCreateEmpty(); - return result; -} - -HIMutableShapeRef -TkMacOSXHIShapeCreateMutableWithRect( - const CGRect *inRect) -{ - HIMutableShapeRef result; - - result = HIShapeCreateMutableWithRect(inRect); - return result; -} - -OSStatus -TkMacOSXHIShapeSetWithShape( - HIMutableShapeRef inDestShape, - HIShapeRef inSrcShape) -{ - OSStatus result; - - result = HIShapeSetWithShape(inDestShape, inSrcShape); - return result; -} - OSStatus TkMacOSHIShapeDifferenceWithRect( HIMutableShapeRef inShape, @@ -555,29 +522,6 @@ TkMacOSHIShapeDifferenceWithRect( return result; } - -OSStatus -TkMacOSHIShapeUnionWithRect( - HIMutableShapeRef inShape, - const CGRect *inRect) -{ - OSStatus result; - - result = HIShapeUnionWithRect(inShape, inRect); - return result; -} - -OSStatus -TkMacOSHIShapeUnion( - HIShapeRef inShape1, - HIShapeRef inShape2, - HIMutableShapeRef outResult) -{ - OSStatus result; - - result = HIShapeUnion(inShape1, inShape2, outResult); - return result; -} static OSStatus rectCounter( |