From 5fd870e094f91c77bdcca3d9cb0b3ca512eee634 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Tue, 14 Oct 2008 09:14:53 +0000 Subject: [PATCH 1/1] Support libraries for recent Cydia changes. --- UICaboodle/BrowserView.h | 3 +-- UICaboodle/RVBook.h | 2 +- UICaboodle/RVBook.mm | 9 +++++---- UICaboodle/RVPage.h | 1 - UICaboodle/RVPage.mm | 4 ---- 5 files changed, 7 insertions(+), 12 deletions(-) diff --git a/UICaboodle/BrowserView.h b/UICaboodle/BrowserView.h index 48dac915..0f35cb7b 100644 --- a/UICaboodle/BrowserView.h +++ b/UICaboodle/BrowserView.h @@ -15,7 +15,6 @@ @class IndirectDelegate; @interface BrowserView : RVPage { - _transient Database *database_; UIScroller *scroller_; UIWebDocumentView *webview_; NSMutableArray *urls_; @@ -37,7 +36,7 @@ - (WebView *) webView; -- (id) initWithBook:(RVBook *)book database:(Database *)database; +- (id) initWithBook:(RVBook *)book; - (void) webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame; - (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame; diff --git a/UICaboodle/RVBook.h b/UICaboodle/RVBook.h index 8b051851..d1037b2c 100644 --- a/UICaboodle/RVBook.h +++ b/UICaboodle/RVBook.h @@ -34,8 +34,8 @@ - (void) resetViewAnimated:(BOOL)animated; - (void) resetViewAnimated:(BOOL)animated toPage:(RVPage *)page; -- (void) setTitle:(NSString *)title forPage:(RVPage *)page; - (void) setBackButtonTitle:(NSString *)title forPage:(RVPage *)page; +- (void) reloadTitleForPage:(RVPage *)page; - (void) reloadButtonsForPage:(RVPage *)page; - (NSString *) getTitleForPage:(RVPage *)page; diff --git a/UICaboodle/RVBook.mm b/UICaboodle/RVBook.mm index cef1acee..708e66f3 100644 --- a/UICaboodle/RVBook.mm +++ b/UICaboodle/RVBook.mm @@ -157,18 +157,19 @@ [navbar_ setAccessoryView:[page accessoryView] animate:animated removeOnPop:NO]; } -- (void) setTitle:(NSString *)title forPage:(RVPage *)page { +- (void) setBackButtonTitle:(NSString *)title forPage:(RVPage *)page { if ([pages_ count] == 0 || page != [pages_ lastObject]) return; UINavigationItem *navitem = [navbar_ topItem]; - [navitem setTitle:title]; + [navitem setBackButtonTitle:title]; } -- (void) setBackButtonTitle:(NSString *)title forPage:(RVPage *)page { +- (void) reloadTitleForPage:(RVPage *)page { if ([pages_ count] == 0 || page != [pages_ lastObject]) return; UINavigationItem *navitem = [navbar_ topItem]; - [navitem setBackButtonTitle:title]; + NSString *title = [self getTitleForPage:page]; + [navitem setTitle:title]; } - (void) reloadButtonsForPage:(RVPage *)page { diff --git a/UICaboodle/RVPage.h b/UICaboodle/RVPage.h index 67b73d68..fa77df3a 100644 --- a/UICaboodle/RVPage.h +++ b/UICaboodle/RVPage.h @@ -25,7 +25,6 @@ - (void) setPageActive:(BOOL)active; - (void) resetViewAnimated:(BOOL)animated; -- (void) setTitle:(NSString *)title; - (void) setBackButtonTitle:(NSString *)title; - (void) reloadButtons; diff --git a/UICaboodle/RVPage.mm b/UICaboodle/RVPage.mm index 5d29a266..02135c13 100644 --- a/UICaboodle/RVPage.mm +++ b/UICaboodle/RVPage.mm @@ -51,10 +51,6 @@ [self doesNotRecognizeSelector:_cmd]; } -- (void) setTitle:(NSString *)title { - [book_ setTitle:title forPage:self]; -} - - (void) setBackButtonTitle:(NSString *)title { [book_ setBackButtonTitle:title forPage:self]; } -- 2.45.2