Merge branch 'upstream-sep2019-tcombo' into subtree

diff --git a/TWidget.java b/TWidget.java
index d60efd8d3a321236e2069199c6db2fb364505d69..ce22330576309206861b8246be3423a248499180 100644 (file)
--- 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
     }
 
     /**