diff options
| author | georgeps <georgeps@noemail.net> | 2008-08-19 15:52:10 (GMT) |
|---|---|---|
| committer | georgeps <georgeps@noemail.net> | 2008-08-19 15:52:10 (GMT) |
| commit | 7f5e85ccee9837750f42acac3534375cba4bf3db (patch) | |
| tree | c84b392e06fb0dd9d69a9a13c3f46b8a56267704 /generic/tkError.c | |
| parent | 9131210d2b27a780ec96eae253e27d5a30c330ff (diff) | |
| download | tk-7f5e85ccee9837750f42acac3534375cba4bf3db.zip tk-7f5e85ccee9837750f42acac3534375cba4bf3db.tar.gz tk-7f5e85ccee9837750f42acac3534375cba4bf3db.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.
FossilOrigin-Name: 8356aa0eec57fa7af4840febe78bf647259ff203
Diffstat (limited to 'generic/tkError.c')
| -rw-r--r-- | generic/tkError.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/generic/tkError.c b/generic/tkError.c index 518cfdb..6144093 100644 --- a/generic/tkError.c +++ b/generic/tkError.c @@ -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: tkError.c,v 1.6 2007/12/13 15:24:14 dgp Exp $ + * RCS: @(#) $Id: tkError.c,v 1.7 2008/08/19 15:52:11 georgeps Exp $ */ #include "tkInt.h" @@ -271,8 +271,7 @@ ErrorProc( if (errEventPtr->error_code == BadWindow) { Window w = (Window) errEventPtr->resourceid; - if (Tk_IdToWindow(display, w) != NULL - || TkpWindowWasRecentlyDeleted(w, dispPtr)) { + if (Tk_IdToWindow(display, w) != NULL) { return 0; } } |