gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 09:40:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge from revision 35723 from main branch plus NSCell allowsUndo flag extract from xib

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@35724 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2012-10-19 22:51:20 +00:00
parent b155bbdc2d
commit 36e77b95f7
40 changed files with 828 additions and 459 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Source/NSFontDescriptor.m
View file

@ -119,7 +119,7 @@
{
NSDictionary *traits;
traits = [_attributes objectForKey: NSFontTraitsAttribute];
traits = [self objectForKey: NSFontTraitsAttribute];
if (traits == nil)
{
traits = [NSDictionary dictionaryWithObject:
@ -219,7 +219,7 @@
return [[NSFontManager sharedFontManager] matchingFontDescriptorsFor: attributes];
}
- (NSFontDescriptor *) matchingFontDescriptorWithMandatoryKeys: (NSSet *)keys;
- (NSFontDescriptor *) matchingFontDescriptorWithMandatoryKeys: (NSSet *)keys
{
NSArray *found = [self matchingFontDescriptorsWithMandatoryKeys: keys];
@ -235,7 +235,7 @@
- (NSAffineTransform *) matrix
{
return [_attributes objectForKey: NSFontMatrixAttribute];
return [self objectForKey: NSFontMatrixAttribute];
}
- (id) objectForKey: (NSString *)attribute
@ -245,11 +245,11 @@
- (CGFloat) pointSize
{
id size = [_attributes objectForKey: NSFontSizeAttribute];
id size = [self objectForKey: NSFontSizeAttribute];
if (size)
{
return [size floatValue];
return [size doubleValue];
}
else
{
@ -277,7 +277,7 @@
{
NSDictionary *traits;
traits = [_attributes objectForKey: NSFontTraitsAttribute];
traits = [self objectForKey: NSFontTraitsAttribute];
if (traits == nil)
{
return 0;