From 39dd1134f379cf247b40c74d68ea6bec62edb33e Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Mon, 8 May 2017 12:02:25 +0000 Subject: Remove calls to Tk_FreeXId(), since it's just a NOP. --- generic/tkGC.c | 7 ------- unix/tkUnixCursor.c | 1 - unix/tkUnixXId.c | 1 - 3 files changed, 9 deletions(-) diff --git a/generic/tkGC.c b/generic/tkGC.c index 5663ede..c424e30 100644 --- a/generic/tkGC.c +++ b/generic/tkGC.c @@ -314,7 +314,6 @@ Tk_FreeGC( gcPtr = Tcl_GetHashValue(idHashPtr); gcPtr->refCount--; if (gcPtr->refCount == 0) { - Tk_FreeXId(gcPtr->display, (XID) XGContextFromGC(gcPtr->gc)); XFreeGC(gcPtr->display, gcPtr->gc); Tcl_DeleteHashEntry(gcPtr->valueHashPtr); Tcl_DeleteHashEntry(idHashPtr); @@ -351,12 +350,6 @@ TkGCCleanup( entryPtr != NULL; entryPtr = Tcl_NextHashEntry(&search)) { gcPtr = Tcl_GetHashValue(entryPtr); - /* - * This call is not needed, as it is only used on Unix to restore the - * Id to the stack pool, and we don't want to use them anymore. - * Tk_FreeXId(gcPtr->display, (XID) XGContextFromGC(gcPtr->gc)); - */ - XFreeGC(gcPtr->display, gcPtr->gc); Tcl_DeleteHashEntry(gcPtr->valueHashPtr); Tcl_DeleteHashEntry(entryPtr); diff --git a/unix/tkUnixCursor.c b/unix/tkUnixCursor.c index 5266bde..8afb92d 100644 --- a/unix/tkUnixCursor.c +++ b/unix/tkUnixCursor.c @@ -639,7 +639,6 @@ TkpFreeCursor( TkUnixCursor *unixCursorPtr = (TkUnixCursor *) cursorPtr; XFreeCursor(unixCursorPtr->display, (Cursor) unixCursorPtr->info.cursor); - Tk_FreeXId(unixCursorPtr->display, (XID) unixCursorPtr->info.cursor); } /* diff --git a/unix/tkUnixXId.c b/unix/tkUnixXId.c index 668f228..ec2451c 100644 --- a/unix/tkUnixXId.c +++ b/unix/tkUnixXId.c @@ -96,7 +96,6 @@ Tk_FreePixmap( Pixmap pixmap) /* Identifier for pixmap. */ { XFreePixmap(display, pixmap); - Tk_FreeXId(display, (XID) pixmap); } -- cgit v0.12