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

Implement copyWithZone and mutableCopyWithZone

Browse source
This commit is contained in:
Gregory John Casamento 2020-01-26 21:53:28 -05:00
parent b41444e4c4
commit 57d6be305b
2 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Headers/AppKit/NSFontCollection.h
View file

@ -56,7 +56,6 @@ typedef NSString* NSFontCollectionName;
@interface NSFontCollection : NSObject <NSCopying, NSMutableCopying, NSCoding>
{
NSMutableArray *_fonts;
NSMutableDictionary *_collectionDictionary;
NSMutableArray *_queryDescriptors;
NSMutableArray *_exclusionDescriptors;
}

26
Source/NSFontCollection.m
View file

@ -30,6 +30,20 @@
// NOTE: Some of this cannot be implemented currently since the backend does not support physically
// moving fonts on the filesystem... this is here for compatilibility for now.
@interface NSMutableFontCollection (Private)
- (void) _setFonts: (NSArray *)fonts;
@end
@implementation NSMutableFontCollection (Private)
- (void) _setFonts: (NSArray *)fonts
{
[_fonts addObjectsFromArray: fonts];
}
@end
@implementation NSFontCollection
@ -52,7 +66,6 @@ static NSMutableDictionary *__sharedFontCollectionsVisibility;
if (self != nil)
{
_fonts = [[NSMutableArray alloc] initWithCapacity: 50];
_collectionDictionary = [[NSMutableDictionary alloc] initWithCapacity: 10];
_queryDescriptors = [[NSMutableArray alloc] initWithCapacity: 10];
_exclusionDescriptors = [[NSMutableArray alloc] initWithCapacity: 10];
}
@ -62,7 +75,6 @@ static NSMutableDictionary *__sharedFontCollectionsVisibility;
- (void) dealloc
{
RELEASE(_fonts);
RELEASE(_collectionDictionary);
RELEASE(_queryDescriptors);
RELEASE(_exclusionDescriptors);
[super dealloc];
@ -207,12 +219,22 @@ static NSMutableDictionary *__sharedFontCollectionsVisibility;
- (instancetype) copyWithZone: (NSZone *)zone
{
NSFontCollection *fc = [[NSFontCollection allocWithZone: zone] init];
ASSIGNCOPY(fc->_fonts, _fonts);
ASSIGNCOPY(fc->_queryDescriptors, _queryDescriptors);
ASSIGNCOPY(fc->_fonts, _exclusionDescriptors);
return fc;
}
- (instancetype) mutableCopyWithZone: (NSZone *)zone
{
NSMutableFontCollection *fc = [[NSMutableFontCollection allocWithZone: zone] init];
[fc _setFonts: _fonts];
[fc setQueryDescriptors: _queryDescriptors];
[fc setExclusionDescriptors: _exclusionDescriptors];
return fc;
}