diff options
author | dkf <donal.k.fellows@manchester.ac.uk> | 2012-08-08 10:56:04 (GMT) |
---|---|---|
committer | dkf <donal.k.fellows@manchester.ac.uk> | 2012-08-08 10:56:04 (GMT) |
commit | 7e939fd5ee197e9660052a6351e6b2ea501fafb5 (patch) | |
tree | 1e832456672c8f3df4fbfe96b51e7d9c06f73427 /unix/tkUnixWm.c | |
parent | 25d454344e3782af50e4de2b30951409e349dc07 (diff) | |
parent | f531aed3d3a538cc2ea2614e6c590813fa85c008 (diff) | |
download | tk-7e939fd5ee197e9660052a6351e6b2ea501fafb5.zip tk-7e939fd5ee197e9660052a6351e6b2ea501fafb5.tar.gz tk-7e939fd5ee197e9660052a6351e6b2ea501fafb5.tar.bz2 |
merge trunk
Diffstat (limited to 'unix/tkUnixWm.c')
-rw-r--r-- | unix/tkUnixWm.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c index 90c195a..1c7dae7 100644 --- a/unix/tkUnixWm.c +++ b/unix/tkUnixWm.c @@ -5494,7 +5494,7 @@ SetNetWmType(TkWindow *winPtr, Tcl_Obj *typePtr) * GetNetWmType -- * * Read the extended window manager type hint from a window - * and return as a list of names suitable for use with + * and return as a list of names suitable for use with * SetNetWmType. * *---------------------------------------------------------------------- @@ -6409,7 +6409,7 @@ TkWmStackorderToplevel( goto done; case 1: hPtr = Tcl_FirstHashEntry(&table, &search); - windows[0] = (TkWindow *) Tcl_GetHashValue(hPtr); + windows[0] = Tcl_GetHashValue(hPtr); windows[1] = NULL; goto done; } @@ -6427,12 +6427,13 @@ TkWmStackorderToplevel( for (i = 0; i < numChildren; i++) { hPtr = Tcl_FindHashEntry(&table, (char *) children[i]); if (hPtr != NULL) { - childWinPtr = (TkWindow *) Tcl_GetHashValue(hPtr); + childWinPtr = Tcl_GetHashValue(hPtr); *window_ptr++ = childWinPtr; } } - /* ASSERT: window_ptr - windows == table.numEntries + /* + * ASSERT: window_ptr - windows == table.numEntries * (#matched toplevel windows == #children) [Bug 1789819] */ |