summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2017-05-08 16:39:34 (GMT)
committerdgp <dgp@users.sourceforge.net>2017-05-08 16:39:34 (GMT)
commit5933c912e0ca328f932a7570535db8530736a88a (patch)
treebcfb4aa7204b3a5bcf399bc0a2b44db13f40efef /unix
parent1d8d022bbb6e739c99c55a2473ce5ada2cf61192 (diff)
parent39dd1134f379cf247b40c74d68ea6bec62edb33e (diff)
downloadtk-5933c912e0ca328f932a7570535db8530736a88a.zip
tk-5933c912e0ca328f932a7570535db8530736a88a.tar.gz
tk-5933c912e0ca328f932a7570535db8530736a88a.tar.bz2
merge 8.6
Diffstat (limited to 'unix')
-rw-r--r--unix/tkUnixCursor.c1
-rw-r--r--unix/tkUnixXId.c1
2 files changed, 0 insertions, 2 deletions
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);
}