diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-08-30 23:03:06 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-08-30 23:03:06 (GMT) |
| commit | 19cb6769c6c765a88656be5ff4c87bb90a21503a (patch) | |
| tree | 07bc6215a3a59180fd29323cd99b59e5fe94aa57 /generic/tkImgBmap.c | |
| parent | 72931c4fec9756b8efdd07911940a92ccb92d691 (diff) | |
| download | tk-19cb6769c6c765a88656be5ff4c87bb90a21503a.zip tk-19cb6769c6c765a88656be5ff4c87bb90a21503a.tar.gz tk-19cb6769c6c765a88656be5ff4c87bb90a21503a.tar.bz2 | |
Fix typo's. Backport more usefull parts from 9.0
Diffstat (limited to 'generic/tkImgBmap.c')
| -rw-r--r-- | generic/tkImgBmap.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/generic/tkImgBmap.c b/generic/tkImgBmap.c index c6f10b9..fca3e44 100644 --- a/generic/tkImgBmap.c +++ b/generic/tkImgBmap.c @@ -240,7 +240,7 @@ ImgBmapConfigureModel( int maskWidth, maskHeight, dummy1, dummy2; if (Tk_ConfigureWidget(modelPtr->interp, Tk_MainWindow(modelPtr->interp), - configSpecs, objc, (const char **) objv, (char *) modelPtr, flags|TK_CONFIG_OBJS) != TCL_OK) { + configSpecs, objc, (const char **)objv, (char *)modelPtr, flags|TK_CONFIG_OBJS) != TCL_OK) { return TCL_ERROR; } @@ -269,9 +269,9 @@ ImgBmapConfigureModel( || (modelPtr->maskDataString != NULL)) { if (modelPtr->data == NULL) { Tcl_SetObjResult(modelPtr->interp, Tcl_NewStringObj( - "cannot have mask without bitmap", TCL_INDEX_NONE)); + "cannot have a mask without a bitmap", TCL_INDEX_NONE)); Tcl_SetErrorCode(modelPtr->interp, "TK", "IMAGE", "BITMAP", - "NO_BITMAP", NULL); + "NO_BITMAP", (char *)NULL); return TCL_ERROR; } modelPtr->maskData = TkGetBitmapData(modelPtr->interp, @@ -287,7 +287,7 @@ ImgBmapConfigureModel( Tcl_SetObjResult(modelPtr->interp, Tcl_NewStringObj( "bitmap and mask have different sizes", TCL_INDEX_NONE)); Tcl_SetErrorCode(modelPtr->interp, "TK", "IMAGE", "BITMAP", - "MASK_SIZE", NULL); + "MASK_SIZE", (char *)NULL); return TCL_ERROR; } } @@ -488,7 +488,7 @@ TkGetBitmapData( Tcl_SetObjResult(interp, Tcl_NewStringObj( "can't get bitmap data from a file in a safe interpreter", -1)); - Tcl_SetErrorCode(interp, "TK", "SAFE", "BITMAP_FILE", NULL); + Tcl_SetErrorCode(interp, "TK", "SAFE", "BITMAP_FILE", (char *)NULL); return NULL; } expandedFileName = Tcl_TranslateFileName(NULL, fileName, &buffer); @@ -593,7 +593,7 @@ TkGetBitmapData( "format error in bitmap data; looks like it's an" " obsolete X10 bitmap file", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "IMAGE", "BITMAP", "OBSOLETE", - NULL); + (char *)NULL); } goto errorCleanup; } @@ -637,7 +637,7 @@ TkGetBitmapData( if (interp != NULL) { Tcl_SetObjResult(interp, Tcl_NewStringObj( "format error in bitmap data", TCL_INDEX_NONE)); - Tcl_SetErrorCode(interp, "TK", "IMAGE", "BITMAP", "FORMAT", NULL); + Tcl_SetErrorCode(interp, "TK", "IMAGE", "BITMAP", "FORMAT", (char *)NULL); } errorCleanup: @@ -1210,7 +1210,7 @@ ImgBmapPostscript( Tcl_SetObjResult(interp, Tcl_NewStringObj( "unable to generate postscript for bitmaps larger than 60000" " pixels", TCL_INDEX_NONE)); - Tcl_SetErrorCode(interp, "TK", "CANVAS", "PS", "MEMLIMIT", NULL); + Tcl_SetErrorCode(interp, "TK", "CANVAS", "PS", "MEMLIMIT", (char *)NULL); return TCL_ERROR; } |