summaryrefslogtreecommitdiffstats
path: root/xlib/xgc.c
diff options
context:
space:
mode:
Diffstat (limited to 'xlib/xgc.c')
-rw-r--r--xlib/xgc.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/xlib/xgc.c b/xlib/xgc.c
index b18cb9e..38d2783 100644
--- a/xlib/xgc.c
+++ b/xlib/xgc.c
@@ -50,7 +50,7 @@
static TkpClipMask *AllocClipMask(GC gc) {
TkpClipMask *clip_mask = (TkpClipMask*) gc->clip_mask;
- if (clip_mask == None) {
+ if (clip_mask == NULL) {
clip_mask = (TkpClipMask*) ckalloc(sizeof(TkpClipMask));
gc->clip_mask = (Pixmap) clip_mask;
#ifdef MAC_OSX_TK
@@ -126,7 +126,7 @@ XCreateGC(
gp = (XGCValues *) ckalloc(sizeof(XGCValues) + MAX_DASH_LIST_SIZE +
gcCacheSize);
if (!gp) {
- return None;
+ return NULL;
}
#define InitField(name,maskbit,default) \
@@ -269,7 +269,7 @@ int XFreeGC(
Display *d,
GC gc)
{
- if (gc != None) {
+ if (gc != NULL) {
FreeClipMask(gc);
TkpFreeGCCache(gc);
ckfree((char *) gc);
@@ -465,8 +465,8 @@ TkSetRegion(
GC gc,
TkRegion r)
{
- if (r == None) {
- Tcl_Panic("must not pass None to TkSetRegion for compatibility with X11; use XSetClipMask instead");
+ if (r == NULL) {
+ Tcl_Panic("must not pass NULL to TkSetRegion for compatibility with X11; use XSetClipMask instead");
} else {
TkpClipMask *clip_mask = AllocClipMask(gc);