From 7a11fbb993dd74d270f452507777595753458586 Mon Sep 17 00:00:00 2001 From: Grant Paul Date: Wed, 1 Dec 2010 21:45:16 -0800 Subject: One less private class: goodbye UIProgressView, hello UIActivityIndicatorView. --- UICaboodle/BrowserView.h | 3 +-- UICaboodle/BrowserView.mm | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/UICaboodle/BrowserView.h b/UICaboodle/BrowserView.h index 22a4f10..f5d5029 100644 --- a/UICaboodle/BrowserView.h +++ b/UICaboodle/BrowserView.h @@ -15,7 +15,6 @@ @class NSURL; @class NSURLRequest; -@class UIProgressIndicator; @class UIScroller; @class UIDocumentWebView; @@ -62,7 +61,7 @@ _transient CYWebView *webview_; _transient UIScrollView *scroller_; - UIProgressIndicator *indicator_; + UIActivityIndicatorView *indicator_; IndirectDelegate *indirect_; NSURLAuthenticationChallenge *challenge_; diff --git a/UICaboodle/BrowserView.mm b/UICaboodle/BrowserView.mm index 0e95fa8..bacc40b 100644 --- a/UICaboodle/BrowserView.mm +++ b/UICaboodle/BrowserView.mm @@ -1003,10 +1003,9 @@ static void $UIWebViewWebViewDelegate$webViewClose$(UIWebViewWebViewDelegate *se action:@selector(reloadButtonClicked) ]; - CGSize indsize = [UIProgressIndicator defaultSizeForStyle:UIProgressIndicatorStyleMediumWhite]; - indicator_ = [[UIProgressIndicator alloc] initWithFrame:CGRectMake(15, 5, indsize.width, indsize.height)]; - [indicator_ setStyle:UIProgressIndicatorStyleMediumWhite]; - [indicator_ startAnimation]; + indicator_ = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite]; + [indicator_ setFrame:CGRectMake(15, 5, [indicator_ frame].size.width, [indicator_ frame].size.height)]; + [indicator_ startAnimating]; [[loadingitem_ view] addSubview:indicator_]; [webview_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)]; -- cgit v1.2.3