diff options
| author | hobbs <hobbs> | 1999-09-21 06:42:16 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 1999-09-21 06:42:16 (GMT) |
| commit | f29a5be23f295f3e213d950ffbbea8ccbc06c8b5 (patch) | |
| tree | cbe860d1508f98a6d812f3f3090568a2d2f0bdbe /generic/tkWindow.c | |
| parent | c0f23beb65e9af4511e5e455ca71039be233300b (diff) | |
| download | tk-f29a5be23f295f3e213d950ffbbea8ccbc06c8b5.zip tk-f29a5be23f295f3e213d950ffbbea8ccbc06c8b5.tar.gz tk-f29a5be23f295f3e213d950ffbbea8ccbc06c8b5.tar.bz2 | |
1999-09-16 Jeff Hobbs <hobbs@scriptics.com>
* generic/tkFont.c: fixed processing of font options and error
returned [Bug: 2075]
* win/tkWinWm.c: fixed bug in 'wm deiconify' that raised the
wrong toplevel, and changed it to not set focus on overridden
toplevels
1999-09-15 Jeff Hobbs <hobbs@scriptics.com>
* unix/aclocal.m4: added fix for FreeBSD-[1-2] recognition [Bug: 2070]
and fix to AIX-* to get ldAix right [Bug: 2624], fixed AIX
version check (readjust from 8-21 fix) and several other config
fixes for AIX
* mac/tkMacMenubutton.c:
* unix/tkUnixMenubu.c: fixed permanently stippled menubutton image
* win/tkWinButton.c: fixed possible pointer smash [Bug: 2733]
1999-09-14 Jeff Hobbs <hobbs@scriptics.com>
* win/tkWinMenu.c: fix for stack overrun in GetTextFace [Bug: 909]
Diffstat (limited to 'generic/tkWindow.c')
| -rw-r--r-- | generic/tkWindow.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/generic/tkWindow.c b/generic/tkWindow.c index 78d130c..df15d65 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.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: tkWindow.c,v 1.8 1999/04/21 21:53:28 rjohnson Exp $ + * RCS: @(#) $Id: tkWindow.c,v 1.9 1999/09/21 06:42:30 hobbs Exp $ */ #include "tkPort.h" @@ -2258,9 +2258,6 @@ Tk_RestackWindow(tkwin, aboveBelow, other) { TkWindow *winPtr = (TkWindow *) tkwin; TkWindow *otherPtr = (TkWindow *) other; - XWindowChanges changes; - unsigned int mask; - /* * Special case: if winPtr is a top-level window then just find @@ -2268,8 +2265,6 @@ Tk_RestackWindow(tkwin, aboveBelow, other) * otherPtr without changing any of Tk's childLists. */ - changes.stack_mode = aboveBelow; - mask = CWStackMode; if (winPtr->flags & TK_TOP_LEVEL) { while ((otherPtr != NULL) && !(otherPtr->flags & TK_TOP_LEVEL)) { otherPtr = otherPtr->parentPtr; @@ -2341,6 +2336,10 @@ Tk_RestackWindow(tkwin, aboveBelow, other) */ if (winPtr->window != None) { + XWindowChanges changes; + unsigned int mask; + + mask = CWStackMode; changes.stack_mode = Above; for (otherPtr = winPtr->nextPtr; otherPtr != NULL; otherPtr = otherPtr->nextPtr) { |