Skip to content

Commit 7a1c2ef

Browse files
committed
Added explicit deprecation ignore flags for code that is only executed on pre-iOS 7 versions.
1 parent 4e2d375 commit 7a1c2ef

File tree

2 files changed

+20
-5
lines changed

2 files changed

+20
-5
lines changed

TOWebViewController/TOWebViewController.m

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,10 @@ - (void)loadView
269269
{
270270
//Create the all-encompassing container view
271271
UIView *view = [[UIView alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]];
272+
#pragma clang diagnostic push
273+
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
272274
view.backgroundColor = (self.hideWebViewBoundaries ? [UIColor whiteColor] : BACKGROUND_COLOR);
275+
#pragma clang diagnostic pop
273276
view.opaque = YES;
274277
view.clipsToBounds = YES;
275278
self.view = view;
@@ -840,10 +843,13 @@ - (void)actionButtonTapped:(id)sender
840843
}
841844

842845
//Add Twitter
846+
#pragma clang diagnostic push
847+
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
843848
if ([TWTweetComposeViewController canSendTweet]) {
844849
[actionSheet addButtonWithTitle:NSLocalizedStringFromTable(@"Twitter", @"TOWebViewControllerLocalizable", @"Send a Tweet")];
845850
numberOfButtons++;
846851
}
852+
#pragma clang diagnostic pop
847853

848854
//Add a cancel button if on iPhone
849855
if (IPAD == NO) {
@@ -873,16 +879,22 @@ - (void)actionSheet:(UIActionSheet *)actionSheet clickedButtonAtIndex:(NSInteger
873879
[self openMailDialog];
874880
else if ([MFMessageComposeViewController canSendText])
875881
[self openMessageDialog];
882+
#pragma clang diagnostic push
883+
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
876884
else if ([TWTweetComposeViewController canSendTweet])
877885
[self openTwitterDialog];
886+
#pragma clang diagnostic pop
878887
}
879888
break;
880889
case 3: //SMS or Twitter
881890
{
882891
if ([MFMessageComposeViewController canSendText])
883892
[self openMessageDialog];
893+
#pragma clang diagnostic push
894+
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
884895
else if ([TWTweetComposeViewController canSendTweet])
885896
[self openTwitterDialog];
897+
#pragma clang diagnostic pop
886898
}
887899
break;
888900
case 4: //Twitter (or Cancel)
@@ -950,7 +962,7 @@ - (void)openMailDialog
950962
MFMailComposeViewController *mailViewController = [[MFMailComposeViewController alloc] init];
951963
mailViewController.mailComposeDelegate = self;
952964
[mailViewController setMessageBody:[self.url absoluteString] isHTML:NO];
953-
[self presentModalViewController:mailViewController animated:YES];
965+
[self presentViewController:mailViewController animated:YES completion:nil];
954966
}
955967

956968
- (void)mailComposeController:(MFMailComposeViewController *)controller didFinishWithResult:(MFMailComposeResult)result error:(NSError *)error
@@ -963,7 +975,7 @@ - (void)openMessageDialog
963975
MFMessageComposeViewController *messageViewController = [[MFMessageComposeViewController alloc] init];
964976
messageViewController.messageComposeDelegate = self;
965977
[messageViewController setBody:[self.url absoluteString]];
966-
[self presentModalViewController:messageViewController animated:YES];
978+
[self presentViewController:messageViewController animated:YES completion:nil];
967979
}
968980

969981
- (void)messageComposeViewController:(MFMessageComposeViewController *)controller didFinishWithResult:(MessageComposeResult)result
@@ -973,9 +985,12 @@ - (void)messageComposeViewController:(MFMessageComposeViewController *)controlle
973985

974986
- (void)openTwitterDialog
975987
{
988+
#pragma clang diagnostic push
989+
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
976990
TWTweetComposeViewController *tweetComposer = [[TWTweetComposeViewController alloc] init];
977991
[tweetComposer addURL:self.url];
978-
[self presentModalViewController:tweetComposer animated:YES];
992+
[self presentViewController:tweetComposer animated:YES completion:nil];
993+
#pragma clang diagnostic pop
979994
}
980995

981996

TOWebViewControllerExample.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@
470470
GCC_PRECOMPILE_PREFIX_HEADER = YES;
471471
GCC_PREFIX_HEADER = "Example/TOWebViewControllerExample-Prefix.pch";
472472
INFOPLIST_FILE = "$(SRCROOT)/Example/TOWebViewControllerExample-Info.plist";
473-
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
473+
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
474474
"OTHER_LDFLAGS[arch=*]" = "";
475475
PRODUCT_NAME = "$(TARGET_NAME)";
476476
WRAPPER_EXTENSION = app;
@@ -487,7 +487,7 @@
487487
GCC_PRECOMPILE_PREFIX_HEADER = YES;
488488
GCC_PREFIX_HEADER = "Example/TOWebViewControllerExample-Prefix.pch";
489489
INFOPLIST_FILE = "$(SRCROOT)/Example/TOWebViewControllerExample-Info.plist";
490-
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
490+
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
491491
PRODUCT_NAME = "$(TARGET_NAME)";
492492
WRAPPER_EXTENSION = app;
493493
};

0 commit comments

Comments
 (0)