X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=blobdiff_plain;f=TWidget.java;h=ce22330576309206861b8246be3423a248499180;hp=d60efd8d3a321236e2069199c6db2fb364505d69;hb=77d3a60869e7a780c6ae069e51530e1eacece5e2;hpb=cd7e80930437e18ac719f8e2c5d93c2ca0d23cd8

diff --git a/TWidget.java b/TWidget.java
index d60efd8..ce22330 100644
--- a/TWidget.java
+++ b/TWidget.java
@@ -1415,6 +1415,7 @@ public abstract class TWidget implements Comparable<TWidget> {
      * @return TRUE if the child was removed, FALSE if it was not found
      */
     public boolean removeChild(final TWidget child) {
+<<<<<<< HEAD:TWidget.java
         if (children.remove(child)) {
                 child.close();
                 child.parent = null;
@@ -1426,6 +1427,19 @@ public abstract class TWidget implements Comparable<TWidget> {
         }
         
         return false;
+=======
+    	if (children.remove(child)) {
+    		child.close();
+    		child.parent = null;
+    		child.window = null;
+    		
+    		resetTabOrder();
+    		
+    		return true;
+    	}
+    	
+    	return false;
+>>>>>>> upstream-sep2019-tcombo:src/jexer/TWidget.java
     }
 
     /**