diff options
| author | peter.spjuth@gmail.com <pspjuth> | 2006-04-12 22:31:01 (GMT) |
|---|---|---|
| committer | peter.spjuth@gmail.com <pspjuth> | 2006-04-12 22:31:01 (GMT) |
| commit | 7ce851f2033ed14278a4c985001df5affe6b1461 (patch) | |
| tree | bc99d563ca4b767f878a955c481969955142f203 | |
| parent | c4924b37e4a7986fec5049347e1cdef76ef88882 (diff) | |
| download | tk-7ce851f2033ed14278a4c985001df5affe6b1461.zip tk-7ce851f2033ed14278a4c985001df5affe6b1461.tar.gz tk-7ce851f2033ed14278a4c985001df5affe6b1461.tar.bz2 | |
Correction to 1432666 fix.
| -rw-r--r-- | generic/tkGrid.c | 7 | ||||
| -rw-r--r-- | tests/grid.test | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/generic/tkGrid.c b/generic/tkGrid.c index 373567d..a1987a1 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.25.2.5 2006/04/12 17:35:21 dgp Exp $ + * RCS: @(#) $Id: tkGrid.c,v 1.25.2.6 2006/04/12 22:31:01 pspjuth Exp $ */ #include "tkInt.h" @@ -2835,7 +2835,6 @@ ConfigureSlaves(interp, tkwin, objc, objv) "\": must be a positive integer", (char *)NULL); return TCL_ERROR; } - slavePtr->numRows = tmp; if (SetSlaveRow(interp, slavePtr, -1, tmp) != TCL_OK) { return TCL_ERROR; } @@ -2929,12 +2928,8 @@ ConfigureSlaves(interp, tkwin, objc, objv) } if (slavePtr->row == -1) { if (masterPtr->masterDataPtr == NULL) { - if (SetSlaveRow(interp, slavePtr, 0, -1) != TCL_OK) { - return TCL_ERROR; - } slavePtr->row = 0; } else { - slavePtr->row = masterPtr->masterDataPtr->rowEnd; if (SetSlaveRow(interp, slavePtr, masterPtr->masterDataPtr->rowEnd, -1) != TCL_OK) { return TCL_ERROR; diff --git a/tests/grid.test b/tests/grid.test index ccf2eca..9853780 100644 --- a/tests/grid.test +++ b/tests/grid.test @@ -5,7 +5,7 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: grid.test,v 1.17.2.3 2006/04/12 17:35:21 dgp Exp $ +# RCS: @(#) $Id: grid.test,v 1.17.2.4 2006/04/12 22:31:01 pspjuth Exp $ package require tcltest 2.1 namespace import -force tcltest::configure @@ -724,11 +724,14 @@ test grid-10.38 {column/row configure} -body { # Test different combinations of row/column overflow frame .f set res {} + grid .f -column 0 -columnspan 1 -row 0 -rowspan 1 lappend res [catch {grid .f -row 10 -column 9999} msg] $msg ; update lappend res [catch {grid .f -row 9999 -column 10} msg] $msg ; update lappend res [catch {grid .f -columnspan 2 -column 9998} msg] $msg ; update lappend res [catch {grid .f -rowspan 2 -row 9998} msg] $msg ; update + grid .f -column 0 -columnspan 1 -row 0 -rowspan 1 lappend res [catch {grid .f -column 9998 -columnspan 2} msg] $msg ; update + grid .f -column 0 -columnspan 1 -row 0 -rowspan 1 lappend res [catch {grid .f -row 9998 -rowspan 2} msg] $msg ; update set res } -cleanup {destroy .f} -result [lrange { |