diff options
| author | das <das> | 2007-11-09 06:26:53 (GMT) |
|---|---|---|
| committer | das <das> | 2007-11-09 06:26:53 (GMT) |
| commit | b0e3f55fe56f3f1fa4ad3cf7c63dddcfff5a9846 (patch) | |
| tree | 40938979466c8caac1c03c907753bc43175304bd /macosx/tkMacOSXFont.c | |
| parent | 455d9dc4b8b50ed064729851295535018eb99449 (diff) | |
| download | tk-b0e3f55fe56f3f1fa4ad3cf7c63dddcfff5a9846.zip tk-b0e3f55fe56f3f1fa4ad3cf7c63dddcfff5a9846.tar.gz tk-b0e3f55fe56f3f1fa4ad3cf7c63dddcfff5a9846.tar.bz2 | |
Backport from HEAD of Aqua changes from 2007-10-12 to 2007-11-09
Diffstat (limited to 'macosx/tkMacOSXFont.c')
| -rw-r--r-- | macosx/tkMacOSXFont.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/macosx/tkMacOSXFont.c b/macosx/tkMacOSXFont.c index 94c2ade..23f279b 100644 --- a/macosx/tkMacOSXFont.c +++ b/macosx/tkMacOSXFont.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXFont.c,v 1.3.2.10 2007/06/29 03:22:02 das Exp $ + * RCS: @(#) $Id: tkMacOSXFont.c,v 1.3.2.11 2007/11/09 06:26:55 das Exp $ */ #include "tkMacOSXPrivate.h" @@ -1025,7 +1025,9 @@ Tk_DrawChars( MacFont *fontPtr = (MacFont *) tkfont; TkMacOSXDrawingContext drawingContext; - TkMacOSXSetupDrawingContext(drawable, gc, 0, &drawingContext); + if (!TkMacOSXSetupDrawingContext(drawable, gc, 0, &drawingContext)) { + return; + } #if 0 /* * Stippled QD text drawing only kind of works and is ugly, so disable it @@ -1044,7 +1046,10 @@ Tk_DrawChars( stippleMap = TkMacOSXMakeStippleMap(drawable, gc->stipple); pixmap = Tk_GetPixmap(display, drawable, stippleMap->bounds.right, stippleMap->bounds.bottom, 0); - TkMacOSXSetupDrawingContext(pixmap, gc, 0, &pixmapDrawingContext); + if (!TkMacOSXSetupDrawingContext(pixmap, gc, 0, + &pixmapDrawingContext)) { + return; + } GetQDGlobalsWhite(&white); FillRect(&stippleMap->bounds, &white); MultiFontDrawText(fontPtr, source, numBytes, 0, macWin->yOff + y); |