Merge branch 'master' of git@github.com:tolmasky/cappuccino into tolmasky

AppKit/AppKit.j

@@ -25,6 +25,7 @@
 @import "CPAnimation.j"
 @import "CPApplication.j"
 @import "CPButton.j"
+@import "CPButtonBar.j"
 @import "CPClipView.j"
 @import "CPCollectionView.j"
 @import "CPColor.j"

AppKit/Cib/CPCib.j

@@ -90,6 +90,7 @@ var CPCibObjectDataKey  = @"CPCibObjectDataKey";
 
     [objectData instantiateWithOwner:owner topLevelObjects:topLevelObjects]
     [objectData establishConnectionsWithOwner:owner topLevelObjects:topLevelObjects];
+    [objectData awakeWithOwner:owner topLevelObjects:topLevelObjects];
 
     var menu;
 

AppKit/Cib/_CPCibObjectData.j

@@ -223,4 +223,24 @@ var _CPCibObjectDataNamesKeysKey                = @"_CPCibObjectDataNamesKeysKey
     }
 }
 
+- (void)awakeWithOwner:(id)anOwner topLevelObjects:(CPMutableArray)topLevelObjects
+{
+    var count = [_objectsKeys count];
+
+    while (count--)
+    {
+        var object = _objectsKeys[count],
+            instantiatedObject = _replacementObjects[[object hash]];
+
+        if (instantiatedObject)
+            object = instantiatedObject;
+
+        if (object !== _fileOwner && [object respondsToSelector:@selector(awakeFromCib)])
+            [object awakeFromCib];
+    }
+
+    if ([anOwner respondsToSelector:@selector(awakeFromCib)])
+        [anOwner awakeFromCib];
+}
+
 @end