After some discussion with Joe English and subsequently the

        X.org developers (Keith Packard in particular), it was discovered
        that Tk is doing management of XIDs that it shouldn't need to do.
        The very common XC-MISC extension which has come with every version
        of X for the last 15 years is used with Xlib now, to retrieve the
        information about the used/unused XIDs.

        The public Tk_FreeXId is now a no-op.

        Joe English reviewed the patch, and said "please commit."
        The patch is associated with the bug tracker id: 2039720

        generic/tkError.c: Remove the usage of TkpWindowWasRecentlyDeleted.
        generic/tkInt.decls: Update the declarations for the now unused
                internalstubs.
        generic/tkIntDecls.h: Regenerated based on tkInt.decls.
        generic/tkIntPlatDecls.h: Regenerated based on tkInt.decls.
        generic/tkStubInit.c
        generic/tkWindow.c: Remove the calls to TkInitXId, and TkFreeWindowId.

        macosx/tkMaxOSXPort.h: Remove TkFreeWindowId and TkInitXId macro
                definitions.
        macosx/tkMacOSXXStubs.c: Remove the no-op
                TkpWindowWasRecentlyDeleted.

        unix/tkUnixEvent.c: Remove call to TkFreeXId.
        unix/tkUnixXId.c: Remove a lot of unnecessary code (see above).

        win/tkWinPort.h: Remove TkFreeWindowId and TkInitXId.
        win/tkWinWindow.c: Remove TkpWindowWasRecentlyDeleted.

2 files changed, 2 insertions, 30 deletions

diff --git a/win/tkWinPort.h b/win/tkWinPort.h
index cb8def1..282fa79 100644
--- a/win/tkWinPort.h
+++ b/win/tkWinPort.h
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWinPort.h,v 1.10 2005/09/28 18:31:57 dgp Exp $
+ * RCS: @(#) $Id: tkWinPort.h,v 1.11 2008/08/19 15:52:14 georgeps Exp $
  */
 
 #ifndef _WINPORT
@@ -85,8 +85,6 @@
  * under Windows.
  */
 
-#define TkFreeWindowId(dispPtr,w)
-#define TkInitXId(dispPtr)
 #define TkpCmapStressed(tkwin,colormap) (0)
 #define XFlush(display)
 #define XGrabServer(display)
diff --git a/win/tkWinWindow.c b/win/tkWinWindow.c
index 95e7a16..a934f62 100644
--- a/win/tkWinWindow.c
+++ b/win/tkWinWindow.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWinWindow.c,v 1.17 2008/07/26 11:17:25 patthoyts Exp $
+ * RCS: @(#) $Id: tkWinWindow.c,v 1.18 2008/08/19 15:52:14 georgeps Exp $
  */
 
 #include "tkWinInt.h"
@@ -784,32 +784,6 @@ TkWinSetWindowPos(
 }
 
 /*
- *----------------------------------------------------------------------
- *
- * TkpWindowWasRecentlyDeleted --
- *
- *	Determines whether we know if the window given as argument was
- *	recently deleted. Called by the generic code error handler to handle
- *	BadWindow events.
- *
- * Results:
- *	Always 0. We do not keep this information on Windows.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TkpWindowWasRecentlyDeleted(
-    Window win,
-    TkDisplay *dispPtr)
-{
-    return 0;
-}
-
-/*
  * Local Variables:
  * mode: c
  * c-basic-offset: 4