diff -r 3eb7be1dd7b6 -r d781b00f3ed4 Source/GGBTextLayer.h --- a/Source/GGBTextLayer.h Mon Mar 10 17:30:57 2008 -0700 +++ b/Source/GGBTextLayer.h Tue Mar 11 17:09:50 2008 -0700 @@ -13,13 +13,13 @@ @interface GGBTextLayer : GGBLayer { NSString *_string; - CGFloat _fontSize; + UIFont *_font; CGColorRef _foregroundColor; NSString *_alignmentMode; } @property(copy) id string; -@property CGFloat fontSize; +@property (retain) UIFont *font; @property CGColorRef foregroundColor; @property (copy) NSString *alignmentMode; @@ -31,7 +31,38 @@ withText: (NSString*)text fontSize: (float) fontSize alignment: (enum CAAutoresizingMask) align; ++ (GGBTextLayer*) textLayerInSuperlayer: (CALayer*)superlayer + withText: (NSString*)text + font: (id)inputFont + alignment: (enum CAAutoresizingMask) align; @end +#if TARGET_OS_ASPEN +/* Bit definitions for `autoresizingMask' property. */ + +enum CAAutoresizingMask +{ + kCALayerNotSizable = 0, + kCALayerMinXMargin = 1U << 0, + kCALayerWidthSizable = 1U << 1, + kCALayerMaxXMargin = 1U << 2, + kCALayerMinYMargin = 1U << 3, + kCALayerHeightSizable = 1U << 4, + kCALayerMaxYMargin = 1U << 5 +}; + +enum +{ + kCALayerBottomMargin = kCALayerMaxYMargin, + kCALayerTopMargin = kCALayerMinYMargin +}; + +#else +enum +{ + kCALayerBottomMargin = kCALayerMinYMargin, + kCALayerTopMargin = kCALayerMaxYMargin +}; +#endif