diff options
| author | das <das> | 2007-04-29 02:24:01 (GMT) |
|---|---|---|
| committer | das <das> | 2007-04-29 02:24:01 (GMT) |
| commit | 0ee713439182546f0e884ac2db7f83101456d56e (patch) | |
| tree | b6b29a677c5c6c642d97f66297edf93f269b37b6 /generic/tkCanvText.c | |
| parent | 7614214a0526527a62f6cc88b6560f003397c1a3 (diff) | |
| download | tk-0ee713439182546f0e884ac2db7f83101456d56e.zip tk-0ee713439182546f0e884ac2db7f83101456d56e.tar.gz tk-0ee713439182546f0e884ac2db7f83101456d56e.tar.bz2 | |
* generic/tkCanvas.c: allow -selectforeground option to be None; add
* generic/tkCanvText.c: fallback to fgColor when selFgColor is None
* generic/tkEntry.c: (new default on aqua to match native L&F).
* generic/tkListbox.c:
* generic/tkText.c:
* generic/tkCanvas.c: add support for bypassing all of Tk's double
* generic/tkEntry.c: buffered drawing into intermediate pixmaps
* generic/tkFrame.c: (via TK_NO_DOUBLE_BUFFERING #define), it is
* generic/tkListbox.c: unnecessary & wasteful on aqua where all
* generic/tkPanedWindow.c: drawing is already double-buffered by the
* generic/tkTextDisp.c: window server. (Use of this on other
* unix/tkUnixScale.c: platforms would only require implementation
of TkpClipDrawableToRect()).
Diffstat (limited to 'generic/tkCanvText.c')
| -rw-r--r-- | generic/tkCanvText.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/generic/tkCanvText.c b/generic/tkCanvText.c index d2c1bf8..e9652ec 100644 --- a/generic/tkCanvText.c +++ b/generic/tkCanvText.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkCanvText.c,v 1.15.2.2 2005/08/11 12:17:09 dkf Exp $ + * RCS: @(#) $Id: tkCanvText.c,v 1.15.2.3 2007/04/29 02:24:01 das Exp $ */ #include <stdio.h> @@ -466,7 +466,9 @@ ConfigureText(interp, canvas, itemPtr, objc, objv, flags) gcValues.fill_style = FillStippled; mask |= GCStipple|GCFillStyle; } - gcValues.foreground = textInfoPtr->selFgColorPtr->pixel; + if (textInfoPtr->selFgColorPtr != NULL) { + gcValues.foreground = textInfoPtr->selFgColorPtr->pixel; + } newSelGC = Tk_GetGC(tkwin, mask|GCForeground, &gcValues); } if (textPtr->gc != None) { |