From 9ae6bc5321e3c93ac3ae2a96b6842232f60a770e Mon Sep 17 00:00:00 2001 From: oehhar Date: Fri, 26 Jul 2024 08:44:11 +0000 Subject: Correct syntactic error in doc/SetOptions.3 --- doc/SetOptions.3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/SetOptions.3 b/doc/SetOptions.3 index 62b48d8..41e49e9 100644 --- a/doc/SetOptions.3 +++ b/doc/SetOptions.3 @@ -530,7 +530,7 @@ free, and restore saved copies of the type and creating a structure pointing to those procedures: .CS typedef struct { - const char *\fname\fR; + const char *\fIname\fR; Tk_CustomOptionSetProc *\fIsetProc\fR; Tk_CustomOptionGetProc *\fIgetProc\fR; Tk_CustomOptionRestoreProc *\fIrestoreProc\fR; -- cgit v0.12 From b3ea008132706a6ad972d0323a956359d28b9891 Mon Sep 17 00:00:00 2001 From: apnadkarni Date: Fri, 26 Jul 2024 14:14:15 +0000 Subject: Fix crash - clipboard cleanup after main window destroyed --- win/tkWinWm.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/win/tkWinWm.c b/win/tkWinWm.c index ba52b32..e3948e0 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.c @@ -2463,7 +2463,15 @@ TkpWmGetState( static void CheckForPointer(TkWindow *winPtr) { - POINT mouse; + if (winPtr == NULL || winPtr->mainPtr == NULL) { + /* + * Bug [d233f01e2a] - clipboard clean up after main window destroyed + * Nothing to do. + */ + return; + } + + POINT mouse; int x, y; unsigned int state = TkWinGetModifierState(); TkWindow **windows = TkWmStackorderToplevel(winPtr->mainPtr->winPtr); -- cgit v0.12 From a2efd04f843a8fc8e5159203168e655d48061d70 Mon Sep 17 00:00:00 2001 From: apnadkarni Date: Fri, 26 Jul 2024 15:00:14 +0000 Subject: Fix indentation --- win/tkWinWm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/win/tkWinWm.c b/win/tkWinWm.c index e3948e0..c02e1f5 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.c @@ -2463,15 +2463,15 @@ TkpWmGetState( static void CheckForPointer(TkWindow *winPtr) { - if (winPtr == NULL || winPtr->mainPtr == NULL) { - /* - * Bug [d233f01e2a] - clipboard clean up after main window destroyed - * Nothing to do. - */ - return; - } + if (winPtr == NULL || winPtr->mainPtr == NULL) { + /* + * Bug [d233f01e2a] - clipboard clean up after main window destroyed + * Nothing to do. + */ + return; + } - POINT mouse; + POINT mouse; int x, y; unsigned int state = TkWinGetModifierState(); TkWindow **windows = TkWmStackorderToplevel(winPtr->mainPtr->winPtr); -- cgit v0.12 From d68f02fce179fa48c0a7fef7359b6ea08b63e631 Mon Sep 17 00:00:00 2001 From: oehhar Date: Sat, 27 Jul 2024 17:39:18 +0000 Subject: Ticket [957190f1]: replace NULL by (char *) NULL --- generic/tkImgGIF.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/generic/tkImgGIF.c b/generic/tkImgGIF.c index 33bf004..a22e2c9 100644 --- a/generic/tkImgGIF.c +++ b/generic/tkImgGIF.c @@ -436,7 +436,8 @@ FileReadGIF( Tcl_SetObjResult(interp, Tcl_ObjPrintf( "no value given for \"%s\" option", Tcl_GetString(objv[i]))); - Tcl_SetErrorCode(interp, "TK", "IMAGE", "GIF", "OPT_VALUE", NULL); + Tcl_SetErrorCode(interp, "TK", "IMAGE", "GIF", "OPT_VALUE", + (char *) NULL); return TCL_ERROR; } if (Tcl_GetIntFromObj(interp, objv[++i], &index) != TCL_OK) { @@ -451,13 +452,15 @@ FileReadGIF( if (!ReadGIFHeader(gifConfPtr, chan, &fileWidth, &fileHeight)) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "couldn't read GIF header from file \"%s\"", fileName)); - Tcl_SetErrorCode(interp, "TK", "IMAGE", "GIF", "HEADER", NULL); + Tcl_SetErrorCode(interp, "TK", "IMAGE", "GIF", "HEADER", + (char *) NULL); return TCL_ERROR; } if ((fileWidth <= 0) || (fileHeight <= 0)) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "GIF image file \"%s\" has dimension(s) <= 0", fileName)); - Tcl_SetErrorCode(interp, "TK", "IMAGE", "GIF", "BOGUS_SIZE", NULL); + Tcl_SetErrorCode(interp, "TK", "IMAGE", "GIF", "BOGUS_SIZE", + (char *) NULL); return TCL_ERROR; } @@ -471,7 +474,8 @@ FileReadGIF( */ Tcl_SetObjResult(interp, Tcl_NewStringObj( "GIF file truncated", -1)); - Tcl_SetErrorCode(interp, "TK", "IMAGE", "GIF", "TRUNCATED", NULL); + Tcl_SetErrorCode(interp, "TK", "IMAGE", "GIF", "TRUNCATED", + (char *) NULL); return TCL_ERROR; } bitPixel = 2 << (buf[0] & 0x07); @@ -480,7 +484,8 @@ FileReadGIF( if (!ReadColorMap(gifConfPtr, chan, bitPixel, colorMap)) { Tcl_SetObjResult(interp, Tcl_NewStringObj( "error reading color map", -1)); - Tcl_SetErrorCode(interp, "TK", "IMAGE", "GIF", "COLOR_MAP", NULL); + Tcl_SetErrorCode(interp, "TK", "IMAGE", "GIF", "COLOR_MAP", + (char *) NULL); return TCL_ERROR; } } @@ -519,7 +524,7 @@ FileReadGIF( Tcl_SetObjResult(interp, Tcl_NewStringObj( "premature end of image data for this index", -1)); Tcl_SetErrorCode(interp, "TK", "IMAGE", "GIF", "PREMATURE_END", - NULL); + (char *) NULL); goto error; } @@ -527,7 +532,8 @@ FileReadGIF( case GIF_TERMINATOR: Tcl_SetObjResult(interp, Tcl_NewStringObj( "no image data for this index", -1)); - Tcl_SetErrorCode(interp, "TK", "IMAGE", "GIF", "NO_DATA", NULL); + Tcl_SetErrorCode(interp, "TK", "IMAGE", "GIF", "NO_DATA", + (char *) NULL); goto error; case GIF_EXTENSION: @@ -540,7 +546,7 @@ FileReadGIF( "error reading extension function code in GIF image", -1)); Tcl_SetErrorCode(interp, "TK", "IMAGE", "GIF", "BAD_EXT", - NULL); + (char *) NULL); goto error; } if (DoExtension(gifConfPtr, chan, buf[0], @@ -548,7 +554,7 @@ FileReadGIF( Tcl_SetObjResult(interp, Tcl_NewStringObj( "error reading extension in GIF image", -1)); Tcl_SetErrorCode(interp, "TK", "IMAGE", "GIF", "BAD_EXT", - NULL); + (char *) NULL); goto error; } continue; @@ -558,7 +564,7 @@ FileReadGIF( "couldn't read left/top/width/height in GIF image", -1)); Tcl_SetErrorCode(interp, "TK", "IMAGE", "GIF", "DIMENSIONS", - NULL); + (char *) NULL); goto error; } break; @@ -589,7 +595,7 @@ FileReadGIF( Tcl_SetObjResult(interp, Tcl_NewStringObj( "error reading color map", -1)); Tcl_SetErrorCode(interp, "TK", "IMAGE", "GIF", - "COLOR_MAP", NULL); + "COLOR_MAP", (char *) NULL); goto error; } } @@ -651,7 +657,8 @@ FileReadGIF( if (!ReadColorMap(gifConfPtr, chan, bitPixel, colorMap)) { Tcl_SetObjResult(interp, Tcl_NewStringObj( "error reading color map", -1)); - Tcl_SetErrorCode(interp, "TK", "IMAGE", "GIF", "COLOR_MAP", NULL); + Tcl_SetErrorCode(interp, "TK", "IMAGE", "GIF", "COLOR_MAP", + (char *) NULL); goto error; } } @@ -1079,7 +1086,8 @@ ReadImage( if (initialCodeSize > MAX_LWZ_BITS) { Tcl_SetObjResult(interp, Tcl_NewStringObj("malformed image", -1)); - Tcl_SetErrorCode(interp, "TK", "IMAGE", "GIF", "MALFORMED", NULL); + Tcl_SetErrorCode(interp, "TK", "IMAGE", "GIF", "MALFORMED", + (char *) NULL); return TCL_ERROR; } @@ -1768,7 +1776,8 @@ CommonWriteGIF( SaveMap(&state, blockPtr); if (state.num >= MAXCOLORMAPSIZE) { Tcl_SetObjResult(interp, Tcl_NewStringObj("too many colors", -1)); - Tcl_SetErrorCode(interp, "TK", "IMAGE", "GIF", "COLORFUL", NULL); + Tcl_SetErrorCode(interp, "TK", "IMAGE", "GIF", "COLORFUL", + (char *) NULL); return TCL_ERROR; } if (state.num<2) { -- cgit v0.12