From 0ac9408c31c8eaeafab81b43654706393ff5f86d Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 30 Oct 2016 20:16:38 +0000
Subject: Added test grid-23 (currently failing) showing bug [6aea69fccb] -
 grid configure -in problem

---
 tests/grid.test | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/tests/grid.test b/tests/grid.test
index c1d9d06..cba69db 100644
--- a/tests/grid.test
+++ b/tests/grid.test
@@ -1998,6 +1998,25 @@ test grid-22.5 {remove} {
     grid info .c
 } {-in . -column 0 -row 0 -columnspan 2 -rowspan 2 -ipadx 0 -ipady 0 -padx {3 5} -pady {4 7} -sticky ns}
 grid_reset 22.5
+
+test grid-23 {grid configure -in leaked from previous master - bug
+              6aea69fccbb266b7f0437686379fbe5b55442958} {
+    frame .f
+    frame .g
+    pack .f .g
+    text .t
+    grid .t -in .f
+    pack forget .f
+    update
+    grid .t -in .g
+    # .t is now managed by .g; following lines must have no effect on .t
+    pack .f
+    update
+    pack forget .f
+    update
+    winfo ismapped .t ; # must return 1
+} {1}
+grid_reset 23
 
 # cleanup
 cleanupTests
-- 
cgit v0.12


From 700f29364eb3fe91c5eca604342acbba3c0ce7e8 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 30 Oct 2016 20:23:37 +0000
Subject: Fixed [6aea69fccb] - grid configure -in problem. Patch by Koen
 Danckaert.

---
 generic/tkGrid.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/generic/tkGrid.c b/generic/tkGrid.c
index 2a88b76..62c9c59 100644
--- a/generic/tkGrid.c
+++ b/generic/tkGrid.c
@@ -3314,6 +3314,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;
 	}
-- 
cgit v0.12