gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-25 08:10:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add proper encoding decoding for keyed objects

Browse source
This commit is contained in:
Gregory John Casamento 2023-03-28 19:47:42 -04:00
parent 3e4ef82f7c
commit f4cffd9f5e
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Source/NSTreeController.m
View file

@ -241,13 +241,8 @@
GSKeyValueBinding *theBinding; GSKeyValueBinding *theBinding;
[self setContent: obj]; [self setContent: obj];
<<<<<<< HEAD
theBinding = [GSKeyValueBinding getBinding: NSContentObjectBinding theBinding = [GSKeyValueBinding getBinding: NSContentObjectBinding
forObject: self]; forObject: self];
=======
theBinding = [GSKeyValueBinding getBinding: NSContentObjectBinding
forObject: self];
>>>>>>> e8ed44e86 (Update bindings)
if (theBinding != nil) if (theBinding != nil)
[theBinding reverseSetValueFor: @"content"]; [theBinding reverseSetValueFor: @"content"];
} }
@ -432,7 +427,11 @@
[self setChildrenKeyPath: [self setChildrenKeyPath:
[coder decodeObjectForKey: @"NSTreeContentLeafKey"]]; [coder decodeObjectForKey: @"NSTreeContentLeafKey"]];
} }
<<<<<<< HEAD
=======
>>>>>>> 476bad540 (Add proper encoding decoding for keyed objects)
// Since we don't inherit from NSArrayController these are decoded here // Since we don't inherit from NSArrayController these are decoded here
// as well. // as well.
if ([coder containsValueForKey: @"NSAvoidsEmptySelection"]) if ([coder containsValueForKey: @"NSAvoidsEmptySelection"])
@ -454,6 +453,7 @@
} }
else else
{ {
<<<<<<< HEAD
id obj = nil; id obj = nil;
BOOL f = NO; BOOL f = NO;
@ -473,6 +473,8 @@
[coder decodeValueOfObjCType: @encode(BOOL) [coder decodeValueOfObjCType: @encode(BOOL)
at: &f]; at: &f];
[self setSelectsInsertedObjects: f]; [self setSelectsInsertedObjects: f];
=======
>>>>>>> 476bad540 (Add proper encoding decoding for keyed objects)
} }
return self; return self;
@ -481,6 +483,10 @@
- (void) encodeWithCoder: (NSCoder*)coder - (void) encodeWithCoder: (NSCoder*)coder
{ {
[super encodeWithCoder: coder]; [super encodeWithCoder: coder];
<<<<<<< HEAD
=======
>>>>>>> 476bad540 (Add proper encoding decoding for keyed objects)
if ([coder allowsKeyedCoding]) if ([coder allowsKeyedCoding])
{ {
[coder encodeObject: _childrenKeyPath [coder encodeObject: _childrenKeyPath
@ -500,6 +506,7 @@
} }
else else
{ {
<<<<<<< HEAD
id obj = nil; id obj = nil;
BOOL f = NO; BOOL f = NO;
@ -519,6 +526,8 @@
f = [self selectsInsertedObjects]; f = [self selectsInsertedObjects];
[coder encodeValueOfObjCType: @encode(BOOL) [coder encodeValueOfObjCType: @encode(BOOL)
at: &f]; at: &f];
=======
>>>>>>> 476bad540 (Add proper encoding decoding for keyed objects)
} }
} }