diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-01-10 10:07:19 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-01-10 10:07:19 (GMT) |
| commit | ef50c3a8b950562b14a7fd5677492c3deaf1bf8f (patch) | |
| tree | 7e3ba7422180dab95eadaa951af2978df714c3c6 /generic/tkFrame.c | |
| parent | 65b61144b87cb08978118bcc11ddbf96768c02f4 (diff) | |
| parent | 7b3b30d439640b2474a81ff1b97c8ae264811165 (diff) | |
| download | tk-ef50c3a8b950562b14a7fd5677492c3deaf1bf8f.zip tk-ef50c3a8b950562b14a7fd5677492c3deaf1bf8f.tar.gz tk-ef50c3a8b950562b14a7fd5677492c3deaf1bf8f.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic/tkFrame.c')
| -rw-r--r-- | generic/tkFrame.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tkFrame.c b/generic/tkFrame.c index 53c019c..392799e 100644 --- a/generic/tkFrame.c +++ b/generic/tkFrame.c @@ -663,13 +663,13 @@ CreateFrame( framePtr->type = type; framePtr->colormap = colormap; framePtr->relief = TK_RELIEF_FLAT; - framePtr->cursor = None; + framePtr->cursor = NULL; if (framePtr->type == TYPE_LABELFRAME) { Labelframe *labelframePtr = (Labelframe *) framePtr; labelframePtr->labelAnchor = LABELANCHOR_NW; - labelframePtr->textGC = None; + labelframePtr->textGC = NULL; } /* @@ -866,7 +866,7 @@ DestroyFrame( if (framePtr->type == TYPE_LABELFRAME) { Tk_FreeTextLayout(labelframePtr->textLayout); - if (labelframePtr->textGC != None) { + if (labelframePtr->textGC != NULL) { Tk_FreeGC(framePtr->display, labelframePtr->textGC); } } @@ -1122,7 +1122,7 @@ FrameWorldChanged( gcValues.graphics_exposures = False; gc = Tk_GetGC(tkwin, GCForeground | GCFont | GCGraphicsExposures, &gcValues); - if (labelframePtr->textGC != None) { + if (labelframePtr->textGC != NULL) { Tk_FreeGC(framePtr->display, labelframePtr->textGC); } labelframePtr->textGC = gc; |