summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
authorgeorgeps <georgeps>2008-08-19 15:52:11 (GMT)
committergeorgeps <georgeps>2008-08-19 15:52:11 (GMT)
commit65721df535d2aea9213fc2c357a9c4c256b2cec6 (patch)
treec84b392e06fb0dd9d69a9a13c3f46b8a56267704 /macosx
parent03d77dae7c7add838a4b5a9e29dd3561899decc5 (diff)
downloadtk-65721df535d2aea9213fc2c357a9c4c256b2cec6.zip
tk-65721df535d2aea9213fc2c357a9c4c256b2cec6.tar.gz
tk-65721df535d2aea9213fc2c357a9c4c256b2cec6.tar.bz2
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.
Diffstat (limited to 'macosx')
-rw-r--r--macosx/tkMacOSXPort.h4
-rw-r--r--macosx/tkMacOSXXStubs.c29
2 files changed, 2 insertions, 31 deletions
diff --git a/macosx/tkMacOSXPort.h b/macosx/tkMacOSXPort.h
index 81d9167..3e89e7e 100644
--- a/macosx/tkMacOSXPort.h
+++ b/macosx/tkMacOSXPort.h
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXPort.h,v 1.13 2007/12/13 15:27:10 dgp Exp $
+ * RCS: @(#) $Id: tkMacOSXPort.h,v 1.14 2008/08/19 15:52:13 georgeps Exp $
*/
#ifndef _TKMACPORT
@@ -140,8 +140,6 @@
* The following functions are not used on the Mac, so we stub them out.
*/
-#define TkFreeWindowId(dispPtr,w)
-#define TkInitXId(dispPtr)
#define TkpButtonSetDefaults(specPtr) {}
#define TkpCmapStressed(tkwin,colormap) (0)
#define TkpFreeColor(tkColPtr)
diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c
index 706c175..0b0ab49 100644
--- a/macosx/tkMacOSXXStubs.c
+++ b/macosx/tkMacOSXXStubs.c
@@ -13,7 +13,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXXStubs.c,v 1.28 2008/06/12 06:32:11 das Exp $
+ * RCS: @(#) $Id: tkMacOSXXStubs.c,v 1.29 2008/08/19 15:52:13 georgeps Exp $
*/
#include "tkMacOSXPrivate.h"
@@ -323,33 +323,6 @@ MacXIdAlloc(
/*
*----------------------------------------------------------------------
*
- * TkpWindowWasRecentlyDeleted --
- *
- * Tries to determine whether the given window was recently deleted.
- * Called from the generic code error handler to attempt to deal with
- * async BadWindow errors under some circumstances.
- *
- * Results:
- * Always 0, we do not keep this information on the Mac, so we do not
- * know whether the window was destroyed.
- *
- * Side effects:
- * None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TkpWindowWasRecentlyDeleted(
- Window win,
- TkDisplay *dispPtr)
-{
- return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
* DefaultErrorHandler --
*
* This procedure is the default X error handler. Tk uses it's own error