From f73d8a55de62810d61915b0ebdfe72c594c6a2f2 Mon Sep 17 00:00:00 2001 From: Klaas Pieter Annema Date: Tue, 29 Jun 2010 17:47:36 +0200 Subject: [PATCH] implemented isEditable nib2cib support for CPTableColumn --- AppKit/CPTableColumn.j | 10 ++++++---- Tools/nib2cib/NSTableColumn.j | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/AppKit/CPTableColumn.j b/AppKit/CPTableColumn.j index 91edc5d50..77967f816 100644 --- a/AppKit/CPTableColumn.j +++ b/AppKit/CPTableColumn.j @@ -468,9 +468,9 @@ var CPTableColumnIdentifierKey = @"CPTableColumnIdentifierKey", CPTableColumnMinWidthKey = @"CPTableColumnMinWidthKey", CPTableColumnMaxWidthKey = @"CPTableColumnMaxWidthKey", CPTableColumnResizingMaskKey = @"CPTableColumnResizingMaskKey", - CPTableColumnIsHiddenkey = @"CPTableColumnIsHiddenKey", + CPTableColumnIsHiddenKey = @"CPTableColumnIsHiddenKey", CPSortDescriptorPrototypeKey = @"CPSortDescriptorPrototypeKey"; - CPTableColumnIsHiddenkey = @"CPTableColumnIsHiddenKey"; + CPTableColumnIsEditableKey = @"CPTableColumnIsEditableKey"; @implementation CPTableColumn (CPCoding) @@ -492,7 +492,8 @@ var CPTableColumnIdentifierKey = @"CPTableColumnIdentifierKey", [self setHeaderView:[aCoder decodeObjectForKey:CPTableColumnHeaderViewKey]]; _resizingMask = [aCoder decodeBoolForKey:CPTableColumnResizingMaskKey]; - _isHidden = [aCoder decodeBoolForKey:CPTableColumnIsHiddenkey]; + _isHidden = [aCoder decodeBoolForKey:CPTableColumnIsHiddenKey]; + _isEditable = [aCoder decodeBoolForKey:CPTableColumnIsEditableKey]; _sortDescriptorPrototype = [aCoder decodeObjectForKey:CPSortDescriptorPrototypeKey]; } @@ -512,7 +513,8 @@ var CPTableColumnIdentifierKey = @"CPTableColumnIdentifierKey", [aCoder encodeObject:_dataView forKey:CPTableColumnDataViewKey]; [aCoder encodeObject:_resizingMask forKey:CPTableColumnResizingMaskKey]; - [aCoder encodeBool:_isHidden forKey:CPTableColumnIsHiddenkey]; + [aCoder encodeBool:_isHidden forKey:CPTableColumnIsHiddenKey]; + [aCoder encodeBool:_isEditable forKey:CPTableColumnIsEditableKey]; [aCoder encodeObject:_sortDescriptorPrototype forKey:CPSortDescriptorPrototypeKey]; } diff --git a/Tools/nib2cib/NSTableColumn.j b/Tools/nib2cib/NSTableColumn.j index 8af344031..d85cb70c5 100644 --- a/Tools/nib2cib/NSTableColumn.j +++ b/Tools/nib2cib/NSTableColumn.j @@ -60,6 +60,8 @@ _resizingMask = [aCoder decodeBoolForKey:@"NSIsResizeable"] ? CPTableColumnUserResizingMask : CPTableColumnAutoresizingMask; _isHidden = [aCoder decodeBoolForKey:@"NSHidden"]; + _isEditable = [aCoder decodeBoolForKey:@"NSIsEditable"]; + _sortDescriptorPrototype = [aCoder decodeObjectForKey:@"NSSortDescriptorPrototype"]; }