gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 07:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add binding constants

Browse source
This commit is contained in:
Gregory John Casamento 2020-10-06 00:52:22 -04:00
parent 48698fed36
commit baf72d21a0
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Source/NSDictionaryController.m
View file

@ -28,6 +28,8 @@
#import <Foundation/NSKeyValueObserving.h>
#import "AppKit/NSDictionaryController.h"
#import "AppKit/NSKeyValueBinding.h"
#import "GSBindingHelpers.h"
#import "AppKit/NSKeyValueBinding.h"
#import "GSBindingHelpers.h"
@ -48,12 +50,10 @@ NSUInteger __count = 0;
[self exposeBinding: NSContentDictionaryBinding];
[self exposeBinding: NSIncludedKeysBinding];
/*
[self setKeys: [NSArray arrayWithObjects: NSContentBinding,
NSContentObjectBinding,
NSContentArrayBinding,
nil]
triggerChangeNotificationsForDependentKey: @"arrangedObjects"]; */
triggerChangeNotificationsForDependentKey: @"arrangedObjects"];
}
}
@ -91,7 +91,11 @@ NSUInteger __count = 0;
{
ASSIGNCOPY(_localizedKeyTable, table);
}
<<<<<<< HEAD
=======
>>>>>>> 66d8ddcf5 (Add binding constants)
- (NSArray *) includedKeys
{
return _includedKeys;
@ -112,6 +116,10 @@ NSUInteger __count = 0;
ASSIGNCOPY(_excludedKeys, excludedKeys);
}
<<<<<<< HEAD
=======
- (NSString *) initialKey
>>>>>>> 66d8ddcf5 (Add binding constants)
{
return _initialKey;
}
@ -133,12 +141,20 @@ NSUInteger __count = 0;
- (NSDictionary *) contentDictionary
{
<<<<<<< HEAD
return nil; // (NSDictionary *)[self content];
=======
return (NSDictionary *)[self content];
>>>>>>> 66d8ddcf5 (Add binding constants)
}
- (void) setContentDictionary: (NSDictionary *)dict
{
<<<<<<< HEAD
// [super setContent: (id)dict];
=======
[self setContent: (id)dict];
>>>>>>> 66d8ddcf5 (Add binding constants)
}
@end
@ -184,6 +200,5 @@ NSUInteger __count = 0;
{
return [[self key] compare: [other key]];
}
@end