diff options
Diffstat (limited to 'cocoa/QuartzTextStyleAttribute.h')
| -rw-r--r-- | cocoa/QuartzTextStyleAttribute.h | 38 | 
1 files changed, 14 insertions, 24 deletions
| diff --git a/cocoa/QuartzTextStyleAttribute.h b/cocoa/QuartzTextStyleAttribute.h index b9698645e..b916c7a2f 100644 --- a/cocoa/QuartzTextStyleAttribute.h +++ b/cocoa/QuartzTextStyleAttribute.h @@ -12,20 +12,17 @@  #ifndef _QUARTZ_TEXT_STYLE_ATTRIBUTE_H  #define _QUARTZ_TEXT_STYLE_ATTRIBUTE_H -class QuartzFont -{ +class QuartzFont {  public: -    /** Create a font style from a name. */ -	QuartzFont( const char* name, size_t length, float size, int weight, bool italic ) -    { -        assert( name != NULL && length > 0 && name[length] == '\0' ); +	/** Create a font style from a name. */ +	QuartzFont(const char *name, size_t length, float size, int weight, bool italic) { +		assert(name != NULL && length > 0 && name[length] == '\0');  		CFStringRef fontName = CFStringCreateWithCString(kCFAllocatorDefault, name, kCFStringEncodingMacRoman);  		assert(fontName != NULL); -	        bool bold = weight > SC_WEIGHT_NORMAL; +		bool bold = weight > SC_WEIGHT_NORMAL; -		if (bold || italic) -		{ +		if (bold || italic) {  			CTFontSymbolicTraits desiredTrait = 0;  			CTFontSymbolicTraits traitMask = 0; @@ -44,35 +41,28 @@ public:  			// create a font and then a copy of it with the sym traits  			CTFontRef iFont = ::CTFontCreateWithName(fontName, size, NULL);  			fontid = ::CTFontCreateCopyWithSymbolicTraits(iFont, size, NULL, desiredTrait, traitMask); -			if (fontid) -			{ +			if (fontid) {  				CFRelease(iFont); -			} -			else -			{ +			} else {  				// Traits failed so use base font  				fontid = iFont;  			} -		} -		else -		{ +		} else {  			// create the font, no traits  			fontid = ::CTFontCreateWithName(fontName, size, NULL);  		} -		if (!fontid) -		{ +		if (!fontid) {  			// Failed to create requested font so use font always present  			fontid = ::CTFontCreateWithName((CFStringRef)@"Monaco", size, NULL);  		}  		CFRelease(fontName); -    } +	} -	CTFontRef getFontID() -    { -        return fontid; -    } +	CTFontRef getFontID() { +		return fontid; +	}  private:  	CTFontRef fontid; | 
