diff options
Diffstat (limited to 'generic')
-rw-r--r-- | generic/tkFont.c | 4 | ||||
-rw-r--r-- | generic/tkPack.c | 7 | ||||
-rw-r--r-- | generic/tkWindow.c | 11 |
3 files changed, 10 insertions, 12 deletions
diff --git a/generic/tkFont.c b/generic/tkFont.c index a59c1b7..d63e58d 100644 --- a/generic/tkFont.c +++ b/generic/tkFont.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: tkFont.c,v 1.5 1999/06/02 18:15:54 stanton Exp $ + * RCS: @(#) $Id: tkFont.c,v 1.6 1999/09/21 06:42:30 hobbs Exp $ */ #include "tkPort.h" @@ -2837,7 +2837,7 @@ ConfigAttributesObj(interp, tkwin, objc, objv, faPtr) &index) != TCL_OK) { return TCL_ERROR; } - if (objc & 1) { + if ((i+2 >= objc) && (objc & 1)) { /* * This test occurs after Tcl_GetIndexFromObj() so that * "font create xyz -xyz" will return the error message diff --git a/generic/tkPack.c b/generic/tkPack.c index 20a8a23..b5bb7be 100644 --- a/generic/tkPack.c +++ b/generic/tkPack.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkPack.c,v 1.3 1999/04/16 01:51:20 stanton Exp $ + * RCS: @(#) $Id: tkPack.c,v 1.4 1999/09/21 06:42:30 hobbs Exp $ */ #include "tkPort.h" @@ -1366,16 +1366,15 @@ PackStructureProc(clientData, eventPtr) Tcl_DoWhenIdle(ArrangePacking, (ClientData) packPtr); } } else if (eventPtr->type == UnmapNotify) { - Packer *packPtr2; + register Packer *packPtr2; /* * Unmap all of the slaves when the master gets unmapped, * so that they don't bother to keep redisplaying * themselves. */ - for (packPtr2 = packPtr->slavePtr; packPtr2 != NULL; - packPtr2 = packPtr2->nextPtr) { + packPtr2 = packPtr2->nextPtr) { Tk_UnmapWindow(packPtr2->tkwin); } } 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) { |