diff options
| author | das <das> | 2007-10-12 03:14:47 (GMT) |
|---|---|---|
| committer | das <das> | 2007-10-12 03:14:47 (GMT) |
| commit | 7431f1df73fd6f9a388022bb44685f98120518ad (patch) | |
| tree | eb61b1b1e215cb3c0ce151014bd73b7b63db5257 /macosx/tkMacOSXFont.c | |
| parent | 1519243b786bb496a969fa8861037409bb487aa7 (diff) | |
| download | tk-7431f1df73fd6f9a388022bb44685f98120518ad.zip tk-7431f1df73fd6f9a388022bb44685f98120518ad.tar.gz tk-7431f1df73fd6f9a388022bb44685f98120518ad.tar.bz2 | |
* macosx/tkMacOSXDraw.c: replace all (internal) use of QD region
* macosx/tkMacOSXSubwindows.c: API by HIShape API, with conversion to
* macosx/tkMacOSXWindowEvent.c QD regions only when required by legacy
* macosx/tkMacOSXPrivate.h: Carbon or Tk API.
* macosx/tkMacOSXRegion.c:
* macosx/tkMacOSXDebug.c:
* macosx/tkMacOSXDebug.h:
* macosx/tkMacOSXInt.h: replace MacDrawable's QD RgnHandles
* macosx/tkMacOSXEmbed.c: clipRgn, aboveClipRgn & drawRgn by
* macosx/tkMacOSXMenu.c: HIShapeRefs visRgn & aboveVisRgn and
* macosx/tkMacOSXSubwindows.c: CGRect drawRect.
* macosx/tkMacOSXWindowEvent.c: remove use of QD port vis rgn in window
* macosx/tkMacOSXSubwindows.c: update rgn calculation, manually excise
* macosx/tkMacOSXWm.c: growbox from toplevel clip rgn instead.
* macosx/tkMacOSXDraw.c: replace use of QD port clip rgn by new
* macosx/tkMacOSXPrivate.h: clipRgn fld in TkMacOSXDrawingContext;
handle QD/CG drawing mismatches in
XCopyArea, XCopyPlane and TkPutImage;
cleanup/speedup CGContext setup in
TkMacOSXSetupDrawingContext().
* macosx/tkMacOSXDraw.c: change TkMacOSXSetupDrawingContext() to
* macosx/tkMacOSXEntry.c: return boolean indicating whether
* macosx/tkMacOSXFont.c: drawing is allowed (and was setup) or
* macosx/tkMacOSXMenu.c: not (e.g. when clipRgn is empty).
* macosx/ttkMacOSXTheme.c:
* macosx/tkMacOSXSubwindows.c: signal that drawable is a pixmap via
* macosx/tkMacOSXInt.h: new explicit TK_IS_PIXMAP flag instead
of a NULL cligRgn field.
* macosx/tkMacOSXRegion.c: add wrappers for missing/buggy HIShape
* macosx/tkMacOSXPrivate.h: API, and private helpers to operate on
HIShapeRefs & convert to/from TkRegion.
* macosx/tkMacOSXRegion.c: add Tkp{Retain,Release}Region() API for
* macosx/tkMacOSXInt.h: TkRegion.
Diffstat (limited to 'macosx/tkMacOSXFont.c')
| -rw-r--r-- | macosx/tkMacOSXFont.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/macosx/tkMacOSXFont.c b/macosx/tkMacOSXFont.c index fdd522a..c744ac8 100644 --- a/macosx/tkMacOSXFont.c +++ b/macosx/tkMacOSXFont.c @@ -35,7 +35,7 @@ * that such fonts can not be used for controls, because controls * definitely require a family id (this assertion needs testing). * - * RCS: @(#) $Id: tkMacOSXFont.c,v 1.28 2007/06/29 03:20:01 das Exp $ + * RCS: @(#) $Id: tkMacOSXFont.c,v 1.29 2007/10/12 03:14:48 das Exp $ */ #include "tkMacOSXPrivate.h" @@ -1054,8 +1054,10 @@ TkpDrawCharsInContext( Tcl_DString runString; #endif - TkMacOSXSetupDrawingContext(drawable, gc, tkMacOSXUseCGDrawing, - &drawingContext); + if (!TkMacOSXSetupDrawingContext(drawable, gc, tkMacOSXUseCGDrawing, + &drawingContext)) { + return; + } #if 0 /* |