summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--generic/tkGrid.c4
-rw-r--r--generic/tkPack.c4
3 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 529cb5a..10aaf31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-09-17 Don Porter <dgp@users.sourceforge.net>
+
+ * generic/tkGrid.c (ConfigureSlaves):
+ * generic/tkPack.c (PackAfter): Corrected type definition of
+ argument passed to Tcl_GetStringFromObj() from size_t to int.
+ Incorrect type broke [pack] and [grid] on systems where
+ sizeof(size_t) != sizeof(int). [Bugs 462375, 462342, 462338]
+
2001-09-17 Donal K. Fellows <fellowsd@cs.man.ac.uk>
* library/choosedir.tcl (DblClick):
diff --git a/generic/tkGrid.c b/generic/tkGrid.c
index 9ac3d41..28c872e 100644
--- a/generic/tkGrid.c
+++ b/generic/tkGrid.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkGrid.c,v 1.14 2001/08/22 19:59:49 pspjuth Exp $
+ * RCS: @(#) $Id: tkGrid.c,v 1.15 2001/09/17 23:16:26 dgp Exp $
*/
#include "tkInt.h"
@@ -2384,7 +2384,7 @@ ConfigureSlaves(interp, tkwin, objc, objv)
Gridder *slavePtr;
Tk_Window other, slave, parent, ancestor;
int i, j, tmp;
- size_t length;
+ int length;
int numWindows;
int width;
int defaultColumn = 0; /* default column number */
diff --git a/generic/tkPack.c b/generic/tkPack.c
index cada2c2..01ee852 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.9 2001/08/22 17:29:08 hobbs Exp $
+ * RCS: @(#) $Id: tkPack.c,v 1.10 2001/09/17 23:16:26 dgp Exp $
*/
#include "tkPort.h"
@@ -1141,7 +1141,7 @@ PackAfter(interp, prevPtr, masterPtr, objc, objv)
{
register Packer *packPtr;
Tk_Window tkwin, ancestor, parent;
- size_t length;
+ int length;
Tcl_Obj **options;
int index, optionCount, c;