Merge branch 'master' of git@github.com:280north/cappuccino

This commit is contained in:
Ross Boucher committed 2009-10-31 09:52:52 -07:00
commit 79fa65624d
2 files changed
+25 -3

No files matched your search

+8 -3
View File
@@ -1066,7 +1066,7 @@ var STICKY_TIME_INTERVAL = 500,
[_menuView setFont:aFont];
}
- (void)setBackgroundStyle:(_CPMenuWindowBackgroundStyle)aBackgroundStyle
+ (CPColor)backgroundColorForBackgroundStyle:(_CPMenuWindowBackgroundStyle)aBackgroundStyle
{
var color = _CPMenuWindowBackgroundColors[aBackgroundStyle];
@@ -1108,8 +1108,13 @@ var STICKY_TIME_INTERVAL = 500,
_CPMenuWindowBackgroundColors[aBackgroundStyle] = color;
}
[self setBackgroundColor:color];
return color;
}
- (void)setBackgroundStyle:(_CPMenuWindowBackgroundStyle)aBackgroundStyle
{
[self setBackgroundColor:[[self class] backgroundColorForBackgroundStyle:aBackgroundStyle]];
}
- (void)setMenu:(CPMenu)aMenu
+17
View File
@@ -602,6 +602,23 @@
objj_msgSend(self[index], aSelector, anObject);
}
- (void)makeObjectsPerformSelector:(SEL)aSelector withObjects:(CPArray)objects
{
if (!aSelector)
[CPException raise:CPInvalidArgumentException reason:"makeObjectsPerformSelector:withObjects: 'aSelector' can't be nil"];
var index = 0,
count = length,
argumentsArray = [nil, aSelector].concat(objects || []);
for(; index < count; ++index)
{
argumentsArray[0] = self[index];
objj_msgSend.apply(this, argumentsArray);
}
}
// Comparing arrays
/*!
Returns the first object found in the receiver (starting at index 0) which is present in the