Changeset 4832

Show
Ignore:
Timestamp:
06/08/07 17:10:56 (1 year ago)
Author:
morris
Message:

Simplify a bit

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • WiredAdditions/trunk/NSFont-WIAdditions.m

    r4438 r4832  
    2828 
    2929#import <WiredAdditions/NSFont-WIAdditions.h> 
     30#import <WiredAdditions/NSString-WIAdditions.h> 
    3031 
    3132@implementation NSFont(WIFontAdditions) 
    …… 
    101102        NSAttributedString              *attributedString; 
    102103        NSDictionary                    *attributes; 
    103         NSRange                                 range; 
    104104 
    105105        if(!textStorage) { 
    …… 
    114114        } 
    115115 
    116         attributes = [[NSDictionary alloc] initWithObjectsAndKeys: 
    117                 self, NSFontAttributeName, 
    118                 NULL]; 
    119         attributedString = [[NSAttributedString alloc] initWithString:string attributes:attributes]; 
     116        attributes = [NSDictionary dictionaryWithObject:self forKey:NSFontAttributeName]; 
     117        attributedString = [NSAttributedString attributedStringWithString:string attributes:attributes]; 
    120118        [textStorage setAttributedString:attributedString]; 
    121         [attributedString release]; 
    122         [attributes release]; 
    123  
    124         range = [layoutManager glyphRangeForTextContainer:textContainer]; 
    125  
     119         
     120        (void) [layoutManager glyphRangeForTextContainer:textContainer]; 
     121         
    126122        return [layoutManager usedRectForTextContainer:textContainer].size; 
    127123}