summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Freeman (saurik) <saurik@saurik.com>2008-10-14 09:14:53 +0000
committerJay Freeman (saurik) <saurik@saurik.com>2010-09-30 07:08:50 +0000
commit3160e5f04030dae0a43faf446d8ad663bccc00f0 (patch)
treeccc6ce836ea613edf03127a3b264fc3bb4a3deed
parent86316a91d38e6a538c28178636bc59f287a4e3a3 (diff)
Support libraries for recent Cydia changes.
-rw-r--r--UICaboodle/BrowserView.h3
-rw-r--r--UICaboodle/RVBook.h2
-rw-r--r--UICaboodle/RVBook.mm9
-rw-r--r--UICaboodle/RVPage.h1
-rw-r--r--UICaboodle/RVPage.mm4
5 files changed, 7 insertions, 12 deletions
diff --git a/UICaboodle/BrowserView.h b/UICaboodle/BrowserView.h
index 48dac91..0f35cb7 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 8b05185..d1037b2 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 cef1ace..708e66f 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 67b73d6..fa77df3 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 5d29a26..02135c1 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];
}