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

diff --git a/Library.mm b/Library.mm
index 552639a723a5d7e34fa542a233b3ba093fe8bad6..3cd36f77d889e8fe848b072c7f39432c3d44617a 100644 (file)
--- a/Library.mm
+++ b/Library.mm
@@ -836,7 +836,7 @@ MSInstanceMessageHook7(CGSize, NSString, _drawInRect,withFont,lineBreakMode,alig
     return CGSizeZero;
 }
 
     return CGSizeZero;
 }
 

-MSInstanceMessageHook4(CGSize, NSString, sizeWithFont,forWidth,lineBreakMode,letterSpacing, UIFont *, font, float, width, UILineBreakMode, mode, float, spacing) {
+MSInstanceMessage4(CGSize, NSString, sizeWithFont,forWidth,lineBreakMode,letterSpacing, UIFont *, font, CGFloat, width, UILineBreakMode, mode, CGFloat, spacing) {

     //NSLog(@"XXX: #\"%@\" \"%@\" %g %u %g", self, font, width, mode, spacing);
 
     WBStringDrawingState *state(stringDrawingState_);
     //NSLog(@"XXX: #\"%@\" \"%@\" %g %u %g", self, font, width, mode, spacing);
 
     WBStringDrawingState *state(stringDrawingState_);


@@ -857,7 +857,7 @@ MSInstanceMessageHook4(CGSize, NSString, sizeWithFont,forWidth,lineBreakMode,let
     return [self sizeWithStyle:[NSString stringWithFormat:@"%@;%@;%@;%@;%@", [font markupDescription], WBColorMarkup(), extra, base, info] forWidth:width];
 }
 
     return [self sizeWithStyle:[NSString stringWithFormat:@"%@;%@;%@;%@;%@", [font markupDescription], WBColorMarkup(), extra, base, info] forWidth:width];
 }
 

-MSInstanceMessageHook1(CGSize, NSString, sizeWithFont, UIFont *, font) {
+MSInstanceMessage1(CGSize, NSString, sizeWithFont, UIFont *, font) {

     //NSLog(@"XXX: ?\"%@\"", self);
 
     WBStringDrawingState *state(stringDrawingState_);
     //NSLog(@"XXX: ?\"%@\"", self);
 
     WBStringDrawingState *state(stringDrawingState_);

diff --git a/iphone-api b/iphone-api
index cb6143b6220d5a21115208f85b7f2b897dc3e1e6..6119449ea3a01c069d6b37595d86a7daf9c72473 160000 (submodule)
--- a/iphone-api
+++ b/iphone-api
@@ -1 +1 @@
-Subproject commit cb6143b6220d5a21115208f85b7f2b897dc3e1e6
+Subproject commit 6119449ea3a01c069d6b37595d86a7daf9c72473