Merge branch 'master' of https://github.com/haxeui/haxeui-core

Author: ianharrigan

haxe/ui/containers/ButtonBar.hx

@@ -151,19 +151,32 @@ class ButtonBarBuilder extends CompositeBuilder {
     }
 
     public override function addComponent(child:Component):Component {
-        if ((child is Button)) {
+        if (!child.hasClass("button-bar-divider")) {
             if (_bar.numComponents > 0) {
                 var divider = new Component();
                 divider.addClass("button-bar-divider");
                 _bar.addComponent(divider);
-
             }
+            child.registerEvent(UIEvent.SHOWN, onButtonShown);
+            child.registerEvent(UIEvent.HIDDEN, onButtonHidden);
+        }
+        if ((child is Button)) {
             if (_bar.selectedIndex == _bar.numComponents) {
                 cast(child, Button).selected = true;
             }
             cast(child, Button).toggle = _bar.toggle;
-            child.registerEvent(UIEvent.SHOWN, onButtonShown);
-            child.registerEvent(UIEvent.HIDDEN, onButtonHidden);
+        }
+        
+        return null;
+    }
+
+    public override function removeComponent(child:Component, dispose:Bool = true, invalidate:Bool = true):Component {
+        if (!child.hasClass("button-bar-divider")) {
+            var childIndex = _bar.getComponentIndex(child);
+            var followingChild = _bar.getComponentAt(childIndex + 1);
+            if (followingChild != null && followingChild.hasClass("button-bar-divider")) {
+                _bar.removeComponent(followingChild, true, invalidate);
+            }
         }
 
         return null;