Import Tk 8.6.8

2018-02-22 14:31:15 -05:00
parent b1c28856bb
commit 8e57feeeb9
193 changed files with 6172 additions and 4033 deletions
--- a/generic/tkGrid.c
+++ b/generic/tkGrid.c
@@ -3083,7 +3083,8 @@ ConfigureSlaves(
    }

    /*
-     * If no -row is given, use the first unoccupied row of the master.
+     * If no -row is given, use the next row after the highest occupied row
+     * of the master.
     */

    if (defaultRow < 0) {
@@ -3314,6 +3315,9 @@ ConfigureSlaves(
    	}

 	if (slavePtr->masterPtr != NULL && slavePtr->masterPtr != masterPtr) {
+            if (slavePtr->masterPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
+                Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->masterPtr->tkwin);
+            }
 	    Unlink(slavePtr);
 	    slavePtr->masterPtr = NULL;
 	}