summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authormdejong <mdejong>2002-05-23 19:55:17 (GMT)
committermdejong <mdejong>2002-05-23 19:55:17 (GMT)
commit7232648b41b68bdd036d35aed2b081ba08809e55 (patch)
treee08af2a029c21a0e9c9134497d082986cc298a42 /unix
parent3009398fd48768c0775ee9fc23a4d8982abc758f (diff)
downloadtk-7232648b41b68bdd036d35aed2b081ba08809e55.zip
tk-7232648b41b68bdd036d35aed2b081ba08809e55.tar.gz
tk-7232648b41b68bdd036d35aed2b081ba08809e55.tar.bz2
* mac/tkMacWm.c (TkWmStackorderToplevelWrapperMap):
* tests/wm.test: Add embedded Window test case for the stackorder command. * unix/tkUnixWm.c (TkWmStackorderToplevelWrapperMap): * win/tkWinWm.c (TkWmStackorderToplevelWrapperMap): Ignore embedded windows during wm stackorder command.
Diffstat (limited to 'unix')
-rw-r--r--unix/tkUnixWm.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c
index 2ad7401..5fbd83b 100644
--- a/unix/tkUnixWm.c
+++ b/unix/tkUnixWm.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: tkUnixWm.c,v 1.15 2002/04/12 10:01:13 hobbs Exp $
+ * RCS: @(#) $Id: tkUnixWm.c,v 1.16 2002/05/23 19:55:18 mdejong Exp $
*/
#include "tkPort.h"
@@ -4253,7 +4253,8 @@ TkWmStackorderToplevelWrapperMap(winPtr, table)
Window wrapper;
int newEntry;
- if (Tk_IsMapped(winPtr) && Tk_IsTopLevel(winPtr)) {
+ if (Tk_IsMapped(winPtr) && Tk_IsTopLevel(winPtr) &&
+ !Tk_IsEmbedded(winPtr)) {
wrapper = (winPtr->wmInfoPtr->reparent != None)
? winPtr->wmInfoPtr->reparent
: winPtr->wmInfoPtr->wrapperPtr->window;