diff options
| author | culler <culler> | 2018-12-20 14:24:15 (GMT) |
|---|---|---|
| committer | culler <culler> | 2018-12-20 14:24:15 (GMT) |
| commit | a8e38d4f0a2001f03c453a3267e7785496f85359 (patch) | |
| tree | 51eacb3dd005bb406b879b6ddadacb8cb74b2c37 /generic/tkBitmap.c | |
| parent | f0ba2d7b3ec3c978c9433acfb4766978cbef6175 (diff) | |
| parent | e26cd8eb2b04a4bd764e382cbcbfe4b1030796c6 (diff) | |
| download | tk-a8e38d4f0a2001f03c453a3267e7785496f85359.zip tk-a8e38d4f0a2001f03c453a3267e7785496f85359.tar.gz tk-a8e38d4f0a2001f03c453a3267e7785496f85359.tar.bz2 | |
merge core-8-6-branch.
Diffstat (limited to 'generic/tkBitmap.c')
| -rw-r--r-- | generic/tkBitmap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tkBitmap.c b/generic/tkBitmap.c index 88f3e2b..1dd11bf 100644 --- a/generic/tkBitmap.c +++ b/generic/tkBitmap.c @@ -219,7 +219,7 @@ Tk_AllocBitmapFromObj( bitmapPtr = GetBitmap(interp, tkwin, Tcl_GetString(objPtr)); objPtr->internalRep.twoPtrValue.ptr1 = bitmapPtr; if (bitmapPtr == NULL) { - return None; + return 0; } bitmapPtr->objRefCount++; return bitmapPtr->bitmap; @@ -261,7 +261,7 @@ Tk_GetBitmap( TkBitmap *bitmapPtr = GetBitmap(interp, tkwin, string); if (bitmapPtr == NULL) { - return None; + return 0; } return bitmapPtr->bitmap; } @@ -385,7 +385,7 @@ GetBitmap( bitmap = TkpGetNativeAppBitmap(Tk_Display(tkwin), string, &width, &height); - if (bitmap == None) { + if (!bitmap) { if (interp != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "bitmap \"%s\" not defined", string)); @@ -401,7 +401,7 @@ GetBitmap( if (predefPtr->native) { bitmap = TkpCreateNativeBitmap(Tk_Display(tkwin), predefPtr->source); - if (bitmap == None) { + if (!bitmap) { Tcl_Panic("native bitmap creation failed"); } } else { |