From: Niki Roo <niki@nikiroo.be>
Date: Thu, 2 Jan 2020 17:20:14 +0000 (+0100)
Subject: Merge branch 'upstream-sep2019-tcombo' into subtree
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=77d3a60869e7a780c6ae069e51530e1eacece5e2;p=fanfix-jexer.git

Merge branch 'upstream-sep2019-tcombo' into subtree
---

77d3a60869e7a780c6ae069e51530e1eacece5e2
diff --cc TWidget.java
index d60efd8,f11cbf3..ce22330
--- a/TWidget.java
+++ b/TWidget.java
@@@ -1415,17 -1403,17 +1415,31 @@@ public abstract class TWidget implement
       * @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;
 +                child.window = null;
 +                
 +                resetTabOrder();
 +                
 +                return true;
 +        }
 +        
 +        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
      }
  
      /**