From c8fa3a187ac4e61a523aa664f01c618746a290b9 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Sun, 11 Mar 2012 05:32:22 +0000 Subject: [PATCH] Replace the added WebTextAlignment with UITextAlignment. --- Library.mm | 8 ++++---- WBMarkup.h | 6 ------ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Library.mm b/Library.mm index 94f1075..72311b8 100644 --- a/Library.mm +++ b/Library.mm @@ -703,7 +703,7 @@ MSInstanceMessageHook6(CGSize, NSString, drawAtPoint,forWidth,withFont,lineBreak return CGSizeZero; } -MSInstanceMessageHook7(CGSize, NSString, _drawInRect,withFont,lineBreakMode,alignment,lineSpacing,includeEmoji,truncationRect, CGRect, rect, UIFont *, font, UILineBreakMode, mode, WebTextAlignment, alignment, float, spacing, BOOL, emoji, CGRect, truncation) { +MSInstanceMessageHook7(CGSize, NSString, _drawInRect,withFont,lineBreakMode,alignment,lineSpacing,includeEmoji,truncationRect, CGRect, rect, UIFont *, font, UILineBreakMode, mode, UITextAlignment, alignment, float, spacing, BOOL, emoji, CGRect, truncation) { WBStringDrawingState *state(stringDrawingState_); if (state == NULL) return MSOldCall(rect, font, mode, alignment, spacing, emoji, truncation); @@ -720,13 +720,13 @@ MSInstanceMessageHook7(CGSize, NSString, _drawInRect,withFont,lineBreakMode,alig NSString *textAlign; switch (alignment) { default: - case WebTextAlignmentLeft: + case UITextAlignmentLeft: textAlign = @"left"; break; - case WebTextAlignmentCenter: + case UITextAlignmentCenter: textAlign = @"center"; break; - case WebTextAlignmentRight: + case UITextAlignmentRight: textAlign = @"right"; break; } diff --git a/WBMarkup.h b/WBMarkup.h index d396a8e..24645e0 100644 --- a/WBMarkup.h +++ b/WBMarkup.h @@ -7,12 +7,6 @@ @class WAKWindow; @class WebView; -typedef enum { - WebTextAlignmentLeft = 0, - WebTextAlignmentCenter = 1, - WebTextAlignmentRight = 2, -} WebTextAlignment; - @interface WBMarkup : NSObject { /*04*/ WebView *view_; /*08*/ DOMDocument *document_; -- 2.50.0