diff options
| author | das <das> | 2007-04-23 21:15:17 (GMT) |
|---|---|---|
| committer | das <das> | 2007-04-23 21:15:17 (GMT) |
| commit | 3f327d2ec34a6b97f29f1ecf1943bc742e50bdc6 (patch) | |
| tree | 32076caa36b64498e5a51239d238793d593cfd09 /generic/tkCanvText.c | |
| parent | 53ee65a4e07f94ce8b61704964496db7d699a908 (diff) | |
| download | tk-3f327d2ec34a6b97f29f1ecf1943bc742e50bdc6.zip tk-3f327d2ec34a6b97f29f1ecf1943bc742e50bdc6.tar.gz tk-3f327d2ec34a6b97f29f1ecf1943bc742e50bdc6.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
* generic/ttk/ttkWidget.c: platforms would only require implementation
* unix/tkUnixScale.c: 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 5e7c400..b6f8878 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.23 2007/02/13 11:29:17 das Exp $ + * RCS: @(#) $Id: tkCanvText.c,v 1.24 2007/04/23 21:15:17 das Exp $ */ #include <stdio.h> @@ -465,7 +465,9 @@ ConfigureText( 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) { |