summaryrefslogtreecommitdiffstats
path: root/generic/tkWindow.c
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2009-09-04 09:55:17 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2009-09-04 09:55:17 (GMT)
commitbf73e552c985aa37d9ee9e76f462c4015a3cfd6f (patch)
tree634b8724987ceb08258649142e1f452d7548e97e /generic/tkWindow.c
parent9f87c721622a74c927926066ac9fe58e4f2fc93f (diff)
downloadtk-bf73e552c985aa37d9ee9e76f462c4015a3cfd6f.zip
tk-bf73e552c985aa37d9ee9e76f462c4015a3cfd6f.tar.gz
tk-bf73e552c985aa37d9ee9e76f462c4015a3cfd6f.tar.bz2
Finish purging remains of old XID hacks (a bunch of unused/write-only fields in
the TkDisplay structure...)
Diffstat (limited to 'generic/tkWindow.c')
-rw-r--r--generic/tkWindow.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index 70c8472..962f356 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkWindow.c,v 1.104 2009/08/19 23:02:00 pspjuth Exp $
+ * RCS: @(#) $Id: tkWindow.c,v 1.105 2009/09/04 09:55:17 dkf Exp $
*/
#include "tkInt.h"
@@ -1347,7 +1347,6 @@ Tk_DestroyWindow(
if (!(halfdeadPtr->flags & HD_DESTROY_COUNT)) {
halfdeadPtr->flags |= HD_DESTROY_COUNT;
- dispPtr->destroyCount++;
}
while (winPtr->childList != NULL) {
@@ -1462,7 +1461,6 @@ Tk_DestroyWindow(
* to do an explicit destroy of this X window.
*/
- dispPtr->lastDestroyRequest = NextRequest(winPtr->display);
XDestroyWindow(winPtr->display, winPtr->window);
}
#endif
@@ -1470,7 +1468,6 @@ Tk_DestroyWindow(
(char *) winPtr->window));
winPtr->window = None;
}
- dispPtr->destroyCount--;
UnlinkWindow(winPtr);
TkEventDeadWindow(winPtr);
TkBindDeadWindow(winPtr);
@@ -1536,7 +1533,7 @@ Tk_DestroyWindow(
Tcl_CreateCommand(winPtr->mainPtr->interp, "send",
TkDeadAppCmd, NULL, NULL);
Tcl_UnlinkVar(winPtr->mainPtr->interp, "tk_strictMotif");
- Tcl_UnlinkVar(winPtr->mainPtr->interp,
+ Tcl_UnlinkVar(winPtr->mainPtr->interp,
"::tk::AlwaysShowSelection");
}