summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorpspjuth <peter.spjuth@gmail.com>2002-10-10 21:07:51 (GMT)
committerpspjuth <peter.spjuth@gmail.com>2002-10-10 21:07:51 (GMT)
commit9d868002e735f03a02b204864b139004861e6ff6 (patch)
tree4aaa2c6b1324c85b05259766380573941a817551 /generic
parentdd2a728b2874239f39fa0a833ea27e33beb07340 (diff)
downloadtk-9d868002e735f03a02b204864b139004861e6ff6.zip
tk-9d868002e735f03a02b204864b139004861e6ff6.tar.gz
tk-9d868002e735f03a02b204864b139004861e6ff6.tar.bz2
The grid size was not updated properly
when removing a widget from a grid. [Bug #621241] (forssen)
Diffstat (limited to 'generic')
-rw-r--r--generic/tkGrid.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/generic/tkGrid.c b/generic/tkGrid.c
index 27f9dde..f5c3503 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.24 2002/08/05 04:30:38 dgp Exp $
+ * RCS: @(#) $Id: tkGrid.c,v 1.25 2002/10/10 21:07:51 pspjuth Exp $
*/
#include "tkInt.h"
@@ -2342,18 +2342,15 @@ Unlink(slavePtr)
register Gridder *slavePtr; /* Window to unlink. */
{
register Gridder *masterPtr, *slavePtr2;
- GridMaster *gridPtr; /* pointer to grid data */
masterPtr = slavePtr->masterPtr;
if (masterPtr == NULL) {
return;
}
- gridPtr = masterPtr->masterDataPtr;
if (masterPtr->slavePtr == slavePtr) {
masterPtr->slavePtr = slavePtr->nextPtr;
- }
- else {
+ } else {
for (slavePtr2 = masterPtr->slavePtr; ; slavePtr2 = slavePtr2->nextPtr) {
if (slavePtr2 == NULL) {
panic("Unlink couldn't find previous window");
@@ -2372,9 +2369,7 @@ Unlink(slavePtr)
*masterPtr->abortPtr = 1;
}
- if ((slavePtr->numCols+slavePtr->column == gridPtr->columnMax)
- || (slavePtr->numRows+slavePtr->row == gridPtr->rowMax)) {
- }
+ SetGridSize(slavePtr->masterPtr);
slavePtr->masterPtr = NULL;
}