Author: mlytwyn
Date: Thu Jul 2 01:31:10 2015
New Revision: 38733
URL: http://svn.gna.org/viewcvs/gnustep?rev=38733&view=rev
Log:
Merge Source/NSObjectController.m
Modified:
libs/gui/branches/gnustep_testplant_branch/Source/NSObjectController.m
Modified: libs/gui/branches/gnustep_testplant_branch/Source/NSObjectController.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/NSObjectController.m?rev=38733&r1=38732&r2=38733&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/NSObjectController.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/NSObjectController.m
Thu Jul 2 01:31:10 2015
@@ -104,8 +104,10 @@
triggerChangeNotificationsForDependentKey: @"canAdd"];
[self setKeys: [NSArray arrayWithObject: @"editable"]
triggerChangeNotificationsForDependentKey: @"canRemove"];
- [self setKeys: [NSArray arrayWithObject: @"content"]
+ [self setKeys: [NSArray arrayWithObjects: @"content",
NSContentObjectBinding, nil]
triggerChangeNotificationsForDependentKey: @"selectedObjects"];
+ [self setKeys: [NSArray arrayWithObjects: @"content",
NSContentObjectBinding, nil]
+ triggerChangeNotificationsForDependentKey: @"selection"];
}
}
@@ -353,7 +355,7 @@
- (id) selection
{
// TODO
- return nil;
+ return _content;
}
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
