From 04429f2a6222f283c8296af146530bab3273382b Mon Sep 17 00:00:00 2001 From: hobbs Date: Sun, 9 Feb 2003 07:51:04 +0000 Subject: 2003-02-05 Fred Fish * macosx/tkMacOSXWm.c (Tk_SetGrid): Fix precedence problem with * mac/tkMacWm.c (Tk_SetGrid): '==' and '|'. --- ChangeLog | 5 +++++ mac/tkMacWm.c | 4 ++-- macosx/tkMacOSXWm.c | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5d22c7f..21a87bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-02-05 Fred Fish + + * macosx/tkMacOSXWm.c (Tk_SetGrid): Fix precedence problem with + * mac/tkMacWm.c (Tk_SetGrid): '==' and '|'. + 2003-02-08 Jeff Hobbs * generic/tkCanvArc.c (CreateArc): Rework canvas create item diff --git a/mac/tkMacWm.c b/mac/tkMacWm.c index 08e4901..d313633 100644 --- a/mac/tkMacWm.c +++ b/mac/tkMacWm.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: tkMacWm.c,v 1.23 2002/10/09 11:57:01 das Exp $ + * RCS: @(#) $Id: tkMacWm.c,v 1.24 2003/02/09 07:51:04 hobbs Exp $ */ #include @@ -2861,7 +2861,7 @@ Tk_SetGrid( && (wmPtr->widthInc == widthInc) && (wmPtr->heightInc == heightInc) && ((wmPtr->sizeHintsFlags & (PBaseSize|PResizeInc)) - == PBaseSize|PResizeInc)) { + == (PBaseSize|PResizeInc))) { return; } diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c index a8cf4ab..7264f19 100644 --- a/macosx/tkMacOSXWm.c +++ b/macosx/tkMacOSXWm.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: tkMacOSXWm.c,v 1.5 2002/09/23 07:21:12 wolfsuit Exp $ + * RCS: @(#) $Id: tkMacOSXWm.c,v 1.6 2003/02/09 07:51:04 hobbs Exp $ */ #include @@ -2675,7 +2675,7 @@ Tk_SetGrid( && (wmPtr->widthInc == widthInc) && (wmPtr->heightInc == heightInc) && ((wmPtr->sizeHintsFlags & (PBaseSize|PResizeInc)) - == PBaseSize|PResizeInc)) { + == (PBaseSize|PResizeInc))) { return; } -- cgit v0.12