X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=OSX%2FXScreenSaverConfigSheet.m;h=b32e47612a15fe7e2ac36867b227044d114c351a;hp=1df862b2a33fb182ce63af45501f0774aa48d1db;hb=b81f521c5ad7022ac12db18ca8fcdd9fb063831e;hpb=c141c2b05e374757b6499d12bb8a6d4d943b1529 diff --git a/OSX/XScreenSaverConfigSheet.m b/OSX/XScreenSaverConfigSheet.m index 1df862b2..b32e4761 100644 --- a/OSX/XScreenSaverConfigSheet.m +++ b/OSX/XScreenSaverConfigSheet.m @@ -383,7 +383,7 @@ static char *anchorize (const char *url); s.height = 999999; s = [text sizeWithFont: font constrainedToSize: s - lineBreakMode: UILineBreakModeWordWrap]; + lineBreakMode:NSLineBreakByWordWrapping]; // GAAAH. Add one more line, or the UIWebView is still scrollable! // The text is sized right, but it lets you scroll it up anyway. @@ -1100,7 +1100,7 @@ hreffify (NSText *nstext) [lab setBackgroundColor:[UIColor clearColor]]; [lab setNumberOfLines:0]; // unlimited // [lab setLineBreakMode:UILineBreakModeWordWrap]; - [lab setLineBreakMode:UILineBreakModeHeadTruncation]; + [lab setLineBreakMode:NSLineBreakByTruncatingHead]; [lab setAutoresizingMask: (UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; # endif // USE_IPHONE @@ -1303,7 +1303,7 @@ hreffify (NSText *nstext) [lab setFrame:rect]; [self placeChild:lab on:parent]; # else // USE_IPHONE - [lab setTextAlignment: UITextAlignmentRight]; + [lab setTextAlignment: NSTextAlignmentRight]; [self placeChild:lab on:parent right:(label ? YES : NO)]; # endif // USE_IPHONE @@ -1673,7 +1673,7 @@ set_menu_item_object (NSMenuItem *item, NSObject *obj) for (NSArray *item in items) { RadioButton *b = [[RadioButton alloc] initWithIndex:i items:items]; - [b setLineBreakMode:UILineBreakModeHeadTruncation]; + [b setLineBreakMode:NSLineBreakByTruncatingHead]; [b setFont:[NSFont boldSystemFontOfSize: FONT_SIZE]]; [self placeChild:b on:parent]; i++; @@ -1795,7 +1795,7 @@ set_menu_item_object (NSMenuItem *item, NSObject *obj) txt.font = [UIFont systemFontOfSize: FONT_SIZE]; txt.placeholder = @""; txt.borderStyle = UITextBorderStyleRoundedRect; - txt.textAlignment = UITextAlignmentRight; + txt.textAlignment = NSTextAlignmentRight; txt.keyboardType = UIKeyboardTypeDefault; // Full kbd txt.autocorrectionType = UITextAutocorrectionTypeNo; txt.autocapitalizationType = UITextAutocapitalizationTypeNone;