Merge branch 'jake' of git://github.com/280north/cappuccino into jake

Conflicts:
	AppKit/CPTableColumn.j
This commit is contained in:
Klaas Pieter Annema committed 2010-02-05 12:15:34 +01:00
commit 09b8a3394e
1 file changed
+2 -1
+2 -1
View File
@@ -74,7 +74,8 @@ CPTableColumnUserResizingMask = 2;
var header = [[_CPTableColumnHeaderView alloc] initWithFrame:CGRectMakeZero()];
[self setHeaderView:header];
var textDataView = [[CPTextField alloc] init];
var textDataView = [CPTextField new];
[textDataView setValue:[CPColor colorWithHexString:@"333333"] forThemeAttribute:@"text-color"];
[textDataView setValue:[CPColor whiteColor] forThemeAttribute:@"text-color" inState:CPThemeStateHighlighted];
[textDataView setValue:[CPFont boldSystemFontOfSize:12] forThemeAttribute:@"font" inState:CPThemeStateHighlighted];
[textDataView setValue:CPCenterVerticalTextAlignment forThemeAttribute:@"vertical-alignment"];