summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2015-02-06 14:09:24 (GMT)
committerdgp <dgp@users.sourceforge.net>2015-02-06 14:09:24 (GMT)
commitd0a04da15e64d7bcf8fcec65ceae7c721c8c4ad2 (patch)
tree7f86a6d391842cfb9647dca6dbb747e6f7690c3d
parentbedea5a5c74e0fb7f66c572836dc4d98a3285147 (diff)
downloadtk-d0a04da15e64d7bcf8fcec65ceae7c721c8c4ad2.zip
tk-d0a04da15e64d7bcf8fcec65ceae7c721c8c4ad2.tar.gz
tk-d0a04da15e64d7bcf8fcec65ceae7c721c8c4ad2.tar.bz2
[a6c2807c13] Don't let forgotten slave trick us into layout computations
outside the layout grid.
-rw-r--r--generic/tkGrid.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tkGrid.c b/generic/tkGrid.c
index c6a00d5..ccdde19 100644
--- a/generic/tkGrid.c
+++ b/generic/tkGrid.c
@@ -1991,7 +1991,7 @@ ResolveConstraints(
if (slavePtr->numCols > 1) {
slavePtr->binNextPtr = layoutPtr[rightEdge].binNextPtr;
layoutPtr[rightEdge].binNextPtr = slavePtr;
- } else {
+ } else if (rightEdge >= 0) {
int size = slavePtr->size + layoutPtr[rightEdge].pad;
if (size > layoutPtr[rightEdge].minSize) {
@@ -2010,7 +2010,7 @@ ResolveConstraints(
if (slavePtr->numRows > 1) {
slavePtr->binNextPtr = layoutPtr[rightEdge].binNextPtr;
layoutPtr[rightEdge].binNextPtr = slavePtr;
- } else {
+ } else if (rightEdge >= 0) {
int size = slavePtr->size + layoutPtr[rightEdge].pad;
if (size > layoutPtr[rightEdge].minSize) {