From 73fea44aa29ea7683baecb2d2df2f427c3e0d824 Mon Sep 17 00:00:00 2001 From: Aparajita Fishman Date: Mon, 9 Jul 2012 21:30:09 -0700 Subject: [PATCH] CPControl now archives/unarchives its formatter This allows you to use a formatter with a table column's data view. --- AppKit/CPControl.j | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/AppKit/CPControl.j b/AppKit/CPControl.j index 8f5c7b6f8..b4140e6e5 100644 --- a/AppKit/CPControl.j +++ b/AppKit/CPControl.j @@ -867,15 +867,14 @@ var CPControlBlackColor = [CPColor blackColor]; @end -var CPControlValueKey = "CPControlValueKey", - CPControlControlStateKey = @"CPControlControlStateKey", - CPControlIsEnabledKey = "CPControlIsEnabledKey", - - CPControlTargetKey = "CPControlTargetKey", - CPControlActionKey = "CPControlActionKey", - CPControlSendActionOnKey = "CPControlSendActionOnKey", - - CPControlSendsActionOnEndEditingKey = "CPControlSendsActionOnEndEditingKey", +var CPControlValueKey = @"CPControlValueKey", + CPControlControlStateKey = @"CPControlControlStateKey", + CPControlIsEnabledKey = @"CPControlIsEnabledKey", + CPControlTargetKey = @"CPControlTargetKey", + CPControlActionKey = @"CPControlActionKey", + CPControlSendActionOnKey = @"CPControlSendActionOnKey", + CPControlFormatterKey = @"CPControlFormatterKey", + CPControlSendsActionOnEndEditingKey = @"CPControlSendsActionOnEndEditingKey", __Deprecated__CPImageViewImageKey = @"CPImageViewImageKey"; @@ -900,6 +899,8 @@ var CPControlValueKey = "CPControlValueKey", [self sendActionOn:[aCoder decodeIntForKey:CPControlSendActionOnKey]]; [self setSendsActionOnEndEditing:[aCoder decodeBoolForKey:CPControlSendsActionOnEndEditingKey]]; + + [self setFormatter:[aCoder decodeObjectForKey:CPControlFormatterKey]]; } return self; @@ -929,6 +930,9 @@ var CPControlValueKey = "CPControlValueKey", [aCoder encodeObject:_action forKey:CPControlActionKey]; [aCoder encodeInt:_sendActionOn forKey:CPControlSendActionOnKey]; + + if (_formatter !== nil) + [aCoder encodeObject:_formatter forKey:CPControlFormatterKey]; } @end