      *  @playerversion AIR 1.5
      *  @productversion Flex 4
      */
-    public function get controlLayout():LayoutBase
-    {
-        return (controlGroup) 
-            ? controlGroup.layout 
-            : controlGroupProperties.layout;
-    }
-
-    public function set controlLayout(value:LayoutBase):void
-    {
-        if (controlGroup)
-        {
-            controlGroup.layout = value;
-            controlGroupProperties = BitFlagUtil.update(controlGroupProperties as uint, 
+    public function get controlBarLayout():LayoutBase
+    {
+        return (controlBarGroup) 
+            ? controlBarGroup.layout 
+            : controlBarGroupProperties.layout;
+    }
+
+    public function set controlBarLayout(value:LayoutBase):void
+    {
+        if (controlBarGroup)
+        {
+            controlBarGroup.layout = value;
+            controlBarGroupProperties = BitFlagUtil.update(controlBarGroupProperties as uint, 
                                                         LAYOUT_PROPERTY_FLAG, true);
         }
         else
-            controlGroupProperties.layout = value;
+            controlBarGroupProperties.layout = value;
     }
 
     //--------------------------------------------------------------------------

     *  @playerversion AIR 1.5
     *  @productversion Flex 4
     */
    public var controlGroup:Group;

    //----------------------------------
    //  controls
    //---------------------------------- 
    
    [ArrayElementType("mx.core.IVisualElement")]
    
    /**
     *  The set of items that become the content of
     *  the controlGroup
     *  
     *  @langversion 3.0
     *  @playerversion Flash 10
     *  @playerversion AIR 1.5
     *  @productversion Flex 4
     */
    public function set controls(value:Array):void
    {
        if (controlGroup)
        {
            controlGroup.mxmlContent = value;
            controlGroupProperties = BitFlagUtil.update(controlGroupProperties as uint, 
                                                        CONTROLS_PROPERTY_FLAG, true);
        }
        else
            controlGroupProperties.controls = value;
    }

    //----------------------------------
    //  controlLayout
    //---------------------------------- 
    
    /**

    {
        super.partAdded(partName, instance);
        
        if (instance == controlBarGroup)
        {
            // copy proxied values from controlBarGroupProperties (if set) to contentGroup
            var newControlBarGroupProperties:uint = 0;
            
            if (controlBarGroupProperties.controlBarContent !== undefined)
            {
                controlBarGroup.mxmlContent = controlBarGroupProperties.controlBarContent;
                newControlBarGroupProperties = BitFlagUtil.update(newControlBarGroupProperties, 
                                                               CONTROLBAR_PROPERTY_FLAG, true);
            }

            if (controlBarGroupProperties.layout !== undefined)
            {
                controlBarGroup.layout = controlBarGroupProperties.layout;
                newControlBarGroupProperties = BitFlagUtil.update(newControlBarGroupProperties, 
                                                               LAYOUT_PROPERTY_FLAG, true);
            }

            controlBarGroupProperties = newControlBarGroupProperties;
        }
    }

