From 6f43610172ef499ef09197cc5e0adf3582360a5c Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 11 Apr 2016 10:39:54 +0000
Subject: Deprecate Tk_FreeXId(), since it doesn't do anything since
 2008-08-19: [8356aa0eec57fa7a]

---
 doc/FreeXId.3          | 20 +-------------------
 generic/tkBind.c       |  2 +-
 generic/tkGC.c         |  7 -------
 macosx/tkMacOSXEmbed.c |  2 +-
 unix/tkUnixCursor.c    |  1 -
 unix/tkUnixXId.c       |  1 -
 6 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/doc/FreeXId.3 b/doc/FreeXId.3
index 56c7804..84fef26 100644
--- a/doc/FreeXId.3
+++ b/doc/FreeXId.3
@@ -25,24 +25,6 @@ context, or colormap) that is no longer in use.
 .BE
 .SH DESCRIPTION
 .PP
-The default allocator for resource identifiers provided by Xlib is very
-simple-minded and does not allow resource identifiers to be re-used.
-If a long-running application reaches the end of the resource id
-space, it will generate an X protocol error and crash.
-Tk replaces the default id allocator with its own allocator, which
-allows identifiers to be reused.
-In order for this to work, \fBTk_FreeXId\fR must be called to
-tell the allocator about resources that have been freed.
-Tk automatically calls \fBTk_FreeXId\fR whenever it frees a
-resource, so if you use procedures like \fBTk_GetFont\fR,
-\fBTk_GetGC\fR, and \fBTk_GetPixmap\fR then you need not call
-\fBTk_FreeXId\fR.
-However, if you allocate resources directly from Xlib, for example
-by calling \fBXCreatePixmap\fR, then you should call \fBTk_FreeXId\fR
-when you call the corresponding Xlib free procedure, such as
-\fBXFreePixmap\fR.
-If you do not call \fBTk_FreeXId\fR then the resource identifier will
-be lost, which could cause problems if the application runs long enough
-to lose all of the available identifiers.
+This function is deprecated, it doesn't do anything since 2008-08-19.
 .SH KEYWORDS
 resource identifier
diff --git a/generic/tkBind.c b/generic/tkBind.c
index cb516e8..c75f6a0 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -2868,7 +2868,7 @@ GetAllVirtualEvents(
  *	Any other fields in eventPtr which are not specified by the pattern
  *	string or the optional arguments, are set to 0.
  *
- *	The event may be handled sychronously or asynchronously, depending on
+ *	The event may be handled synchronously or asynchronously, depending on
  *	the value specified by the optional "-when" option. The default
  *	setting is synchronous.
  *
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/macosx/tkMacOSXEmbed.c b/macosx/tkMacOSXEmbed.c
index 99f7584..5ea7603 100644
--- a/macosx/tkMacOSXEmbed.c
+++ b/macosx/tkMacOSXEmbed.c
@@ -193,7 +193,7 @@ TkpMakeWindow(
 int
 TkpScanWindowId(
     Tcl_Interp *interp,
-    CONST char * string,
+    const char * string,
     Window *idPtr)
 {
     int code;
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