I can't believe I wasted an entire day on this.

diff --git a/UIKit/NSString-UIStringDrawing.h b/UIKit/NSString-UIStringDrawing.h
index 0bda043709e191b6981e1142285de2ad2b25ab52..01936703987b1b2835d921922b5a3eb0bdd3effa 100644 (file)
--- a/UIKit/NSString-UIStringDrawing.h
+++ b/UIKit/NSString-UIStringDrawing.h
@@ -8,17 +8,17 @@
 
 @interface NSString (UIStringDrawing)
 - (struct CGSize)sizeWithFont:(id)fp8;
 
 @interface NSString (UIStringDrawing)
 - (struct CGSize)sizeWithFont:(id)fp8;

-- (struct CGSize)sizeWithFont:(id)fp8 forWidth:(float)fp12 lineBreakMode:(int)fp16;
+- (struct CGSize)sizeWithFont:(id)fp8 forWidth:(CGFloat)fp12 lineBreakMode:(int)fp16;

 - (struct CGSize)drawAtPoint:(struct CGPoint)fp8 withFont:(id)fp16;
 - (struct CGSize)drawAtPoint:(struct CGPoint)fp8 withFont:(id)fp16;

-- (struct CGSize)drawAtPoint:(struct CGPoint)fp8 forWidth:(float)fp16 withFont:(id)fp20 lineBreakMode:(int)fp24;
+- (struct CGSize)drawAtPoint:(struct CGPoint)fp8 forWidth:(CGFloat)fp16 withFont:(id)fp20 lineBreakMode:(int)fp24;

 - (struct CGSize)sizeWithFont:(id)fp8 constrainedToSize:(struct CGSize)fp12;
 - (struct CGSize)sizeWithFont:(id)fp8 constrainedToSize:(struct CGSize)fp12 lineBreakMode:(int)fp20;
 - (struct CGSize)drawInRect:(struct CGRect)fp8 withFont:(id)fp24;
 - (struct CGSize)drawInRect:(struct CGRect)fp8 withFont:(id)fp24 lineBreakMode:(int)fp28;
 - (struct CGSize)drawInRect:(struct CGRect)fp8 withFont:(id)fp24 lineBreakMode:(int)fp28 alignment:(int)fp32;
 - (struct CGSize)sizeWithFont:(id)fp8 constrainedToSize:(struct CGSize)fp12;
 - (struct CGSize)sizeWithFont:(id)fp8 constrainedToSize:(struct CGSize)fp12 lineBreakMode:(int)fp20;
 - (struct CGSize)drawInRect:(struct CGRect)fp8 withFont:(id)fp24;
 - (struct CGSize)drawInRect:(struct CGRect)fp8 withFont:(id)fp24 lineBreakMode:(int)fp28;
 - (struct CGSize)drawInRect:(struct CGRect)fp8 withFont:(id)fp24 lineBreakMode:(int)fp28 alignment:(int)fp32;

-- (struct CGSize)sizeWithFont:(id)fp8 minFontSize:(float)fp12 actualFontSize:(float *)fp16 forWidth:(float)fp20 lineBreakMode:(int)fp24;
-- (struct CGSize)drawAtPoint:(struct CGPoint)fp8 forWidth:(float)fp16 withFont:(id)fp20 fontSize:(float)fp24 lineBreakMode:(int)fp28 baselineAdjustment:(int)fp32;
-- (struct CGSize)drawAtPoint:(struct CGPoint)fp8 forWidth:(float)fp16 withFont:(id)fp20 minFontSize:(float)fp24 actualFontSize:(float *)fp28 lineBreakMode:(int)fp32 baselineAdjustment:(int)fp36;
+- (struct CGSize)sizeWithFont:(id)fp8 minFontSize:(CGFloat)fp12 actualFontSize:(CGFloat *)fp16 forWidth:(CGFloat)fp20 lineBreakMode:(int)fp24;
+- (struct CGSize)drawAtPoint:(struct CGPoint)fp8 forWidth:(CGFloat)fp16 withFont:(id)fp20 fontSize:(CGFloat)fp24 lineBreakMode:(int)fp28 baselineAdjustment:(int)fp32;
+- (struct CGSize)drawAtPoint:(struct CGPoint)fp8 forWidth:(CGFloat)fp16 withFont:(id)fp20 minFontSize:(CGFloat)fp24 actualFontSize:(CGFloat *)fp28 lineBreakMode:(int)fp32 baselineAdjustment:(int)fp36;

 - (id)securedStringIncludingLastCharacter:(BOOL)fp8;
 @end
 
 - (id)securedStringIncludingLastCharacter:(BOOL)fp8;
 @end
 

diff --git a/UIKit/NSString-UIStringDrawingDeprecated.h b/UIKit/NSString-UIStringDrawingDeprecated.h
index e0d9c5c42575aaff3a8bd2d6e46ea05f35006162..8eee723b49795285371f2bc8774642e33cc75b6b 100644 (file)
--- a/UIKit/NSString-UIStringDrawingDeprecated.h
+++ b/UIKit/NSString-UIStringDrawingDeprecated.h
@@ -11,16 +11,16 @@
 - (void)drawInRect:(struct CGRect)fp8 withStyle:(id)fp24;
 - (void)drawMarkupAtPoint:(struct CGPoint)fp8;
 - (void)drawMarkupInRect:(struct CGRect)fp8;
 - (void)drawInRect:(struct CGRect)fp8 withStyle:(id)fp24;
 - (void)drawMarkupAtPoint:(struct CGPoint)fp8;
 - (void)drawMarkupInRect:(struct CGRect)fp8;

-- (struct CGSize)sizeWithStyle:(id)fp8 forWidth:(float)fp12;
-- (struct CGSize)sizeWithMarkupForWidth:(float)fp8;
+- (struct CGSize)sizeWithStyle:(id)fp8 forWidth:(CGFloat)fp12;
+- (struct CGSize)sizeWithMarkupForWidth:(CGFloat)fp8;

 - (void)setStringDrawingOrigin:(struct CGPoint)fp8;
 - (void)clearStringDrawingOrigin;
 - (struct CGSize)sizeWithFont:(id)fp8;
 - (void)setStringDrawingOrigin:(struct CGPoint)fp8;
 - (void)clearStringDrawingOrigin;
 - (struct CGSize)sizeWithFont:(id)fp8;

-- (struct CGSize)sizeWithFont:(id)fp8 forWidth:(float)fp12 ellipsis:(int)fp16;
-- (struct CGSize)drawAtPoint:(struct CGPoint)fp8 forWidth:(float)fp16 withFont:(id)fp20 ellipsis:(int)fp24;
-- (struct CGSize)sizeWithFont:(id)fp8 minFontSize:(float)fp12 actualFontSize:(float *)fp16 forWidth:(float)fp20 ellipsis:(int)fp24;
-- (struct CGSize)drawAtPoint:(struct CGPoint)fp8 forWidth:(float)fp16 withFont:(id)fp20 fontSize:(float)fp24 ellipsis:(int)fp28 baselineAdjustment:(int)fp32;
-- (struct CGSize)drawAtPoint:(struct CGPoint)fp8 forWidth:(float)fp16 withFont:(id)fp20 minFontSize:(float)fp24 actualFontSize:(float *)fp28 ellipsis:(int)fp32 baselineAdjustment:(int)fp36;
+- (struct CGSize)sizeWithFont:(id)fp8 forWidth:(CGFloat)fp12 ellipsis:(int)fp16;
+- (struct CGSize)drawAtPoint:(struct CGPoint)fp8 forWidth:(CGFloat)fp16 withFont:(id)fp20 ellipsis:(int)fp24;
+- (struct CGSize)sizeWithFont:(id)fp8 minFontSize:(CGFloat)fp12 actualFontSize:(CGFloat *)fp16 forWidth:(CGFloat)fp20 ellipsis:(int)fp24;
+- (struct CGSize)drawAtPoint:(struct CGPoint)fp8 forWidth:(CGFloat)fp16 withFont:(id)fp20 fontSize:(CGFloat)fp24 ellipsis:(int)fp28 baselineAdjustment:(int)fp32;
+- (struct CGSize)drawAtPoint:(struct CGPoint)fp8 forWidth:(CGFloat)fp16 withFont:(id)fp20 minFontSize:(CGFloat)fp24 actualFontSize:(CGFloat *)fp28 ellipsis:(int)fp32 baselineAdjustment:(int)fp36;

 - (struct CGSize)drawInRect:(struct CGRect)fp8 withFont:(id)fp24 ellipsis:(int)fp28;
 - (struct CGSize)drawInRect:(struct CGRect)fp8 withFont:(id)fp24 ellipsis:(int)fp28 alignment:(int)fp32;
 - (struct CGSize)drawInRect:(struct CGRect)fp8 withFont:(id)fp24;
 - (struct CGSize)drawInRect:(struct CGRect)fp8 withFont:(id)fp24 ellipsis:(int)fp28;
 - (struct CGSize)drawInRect:(struct CGRect)fp8 withFont:(id)fp24 ellipsis:(int)fp28 alignment:(int)fp32;
 - (struct CGSize)drawInRect:(struct CGRect)fp8 withFont:(id)fp24;