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

Small consistency updates.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@35227 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2012-06-23 15:09:08 +00:00
parent ecaa26fd4f
commit ed66e46ec1
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2012-06-23 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSFontDescriptor.m: Small consistency updates.
2012-06-15 German A. Arias <german@xelalug.org> 2012-06-15 German A. Arias <german@xelalug.org>
* Source/GSWindowDecorationView.m (-changeWindowHeight:): Revert * Source/GSWindowDecorationView.m (-changeWindowHeight:): Revert

12
Source/NSFontDescriptor.m
View file

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