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: http://git.nikiroo.be/?p=nikiroo-utils.git;a=commitdiff_plain;h=77d3a60869e7a780c6ae069e51530e1eacece5e2;hp=-c

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

77d3a60869e7a780c6ae069e51530e1eacece5e2
diff --combined TWidget.java
index d60efd8,f11cbf3..ce22330
--- a/TWidget.java
+++ b/TWidget.java
@@@ -36,7 -36,6 +36,7 @@@ import java.util.ArrayList
  import jexer.backend.Screen;
  import jexer.bits.Cell;
  import jexer.bits.CellAttributes;
 +import jexer.bits.Clipboard;
  import jexer.bits.ColorTheme;
  import jexer.event.TCommandEvent;
  import jexer.event.TInputEvent;
@@@ -592,8 -591,9 +592,8 @@@ public abstract class TWidget implement
       * @param command command event
       */
      public void onCommand(final TCommandEvent command) {
 -        // Default: do nothing, pass to children instead
 -        for (TWidget widget: children) {
 -            widget.onCommand(command);
 +        if (activeChild != null) {
 +            activeChild.onCommand(command);
          }
      }
  
@@@ -1126,18 -1126,6 +1126,18 @@@
          return null;
      }
  
 +    /**
 +     * Get the Clipboard.
 +     *
 +     * @return the Clipboard, or null if not assigned
 +     */
 +    public Clipboard getClipboard() {
 +        if (window != null) {
 +            return window.getApplication().getClipboard();
 +        }
 +        return null;
 +    }
 +
      /**
       * Comparison operator.  For various subclasses it sorts on:
       * <ul>
@@@ -1151,7 -1139,7 +1151,7 @@@
       * difference between this.z and that.z, or String.compareTo(text)
       */
      @Override
 -    public final int compareTo(final TWidget that) {
 +    public int compareTo(final TWidget that) {
          if ((this instanceof TWindow)
              && (that instanceof TWindow)
          ) {
@@@ -1374,7 -1362,7 +1374,7 @@@
       *
       * @param child TWidget to add
       */
 -    private void addChild(final TWidget child) {
 +    public void addChild(final TWidget child) {
          children.add(child);
  
          if ((child.enabled)
@@@ -1415,17 -1403,17 +1415,31 @@@
       * @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
      }
  
      /**
@@@ -1451,9 -1439,9 +1465,9 @@@
                  if (activeChild != null) {
                      activeChild.active = false;
                  }
 -                child.active = true;
 -                activeChild = child;
              }
 +            child.active = true;
 +            activeChild = child;
          }
      }
  
@@@ -2180,21 -2168,6 +2194,21 @@@
          return new TRadioGroup(this, x, y, label);
      }
  
 +    /**
 +     * Convenience function to add a radio button group to this
 +     * container/window.
 +     *
 +     * @param x column relative to parent
 +     * @param y row relative to parent
 +     * @param width width of group
 +     * @param label label to display on the group box
 +     */
 +    public final TRadioGroup addRadioGroup(final int x, final int y,
 +        final int width, final String label) {
 +
 +        return new TRadioGroup(this, x, y, width, label);
 +    }
 +
      /**
       * Convenience function to add a text field to this container/window.
       *