diff options
| author | dgp <dgp@users.sourceforge.net> | 2015-02-06 14:10:46 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2015-02-06 14:10:46 (GMT) |
| commit | ed6771d84fd1df762a2b45cf1887e72ccbc5c737 (patch) | |
| tree | 5a03fd46f869d71887bec9445df9d662721e3028 /generic | |
| parent | 1da8583477af9afe1de3e3be9a79a0134474c0f6 (diff) | |
| parent | 6ea7663596de2decf2c756e237af905a62d1a0ef (diff) | |
| download | tk-ed6771d84fd1df762a2b45cf1887e72ccbc5c737.zip tk-ed6771d84fd1df762a2b45cf1887e72ccbc5c737.tar.gz tk-ed6771d84fd1df762a2b45cf1887e72ccbc5c737.tar.bz2 | |
[a6c2807c13] Don't let forgotten slave trick us into layout computations outside the layout grid.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkGrid.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tkGrid.c b/generic/tkGrid.c index 3e40875..2a88b76 100644 --- a/generic/tkGrid.c +++ b/generic/tkGrid.c @@ -2018,7 +2018,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) { @@ -2037,7 +2037,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) { |