Fix up cocoa frontend.

- Convert to ARC
- Fix crash due to endless responder chain recursion
- Update makefile to find openssl installed via home-brew
- Fix most compiler warnings 

1 files changed, 14 insertions, 20 deletions

diff --git a/frontends/cocoa/HistoryView.m b/frontends/cocoa/HistoryView.m
index bead8dbed..00a7d4abc 100644
--- a/frontends/cocoa/HistoryView.m
+++ b/frontends/cocoa/HistoryView.m
@@ -30,14 +30,14 @@
 
 @synthesize browser = browserView;
 
-- (void) setBrowser: (BrowserView *) bw;
+- (void) setBrowser: (BrowserView *) bw
 {
 	browserView = bw;
 	browser = [bw browser];
 	[self updateHistory];
 }
 
-- (NSSize) size;
+- (NSSize) size
 {
 	int width, height;
 	browser_window_history_size( browser, &width, &height );
@@ -45,13 +45,13 @@
 	return cocoa_size( width, height );
 }
 
-- (void) updateHistory;
+- (void) updateHistory
 {
 	[self setFrameSize: [self size]];
 	[self setNeedsDisplay: YES];
 }
 
-- (void) drawRect: (NSRect)rect;
+- (void) drawRect: (NSRect)rect
 {
 	[[NSColor clearColor] set];
 	[NSBezierPath fillRect: rect];
@@ -67,10 +67,10 @@
 	browser_window_history_redraw( browser, &ctx );
 }
 
-- (void) mouseUp: (NSEvent *)theEvent;
+- (void) mouseUp: (NSEvent *)theEvent
 {
 	const NSPoint location = [self convertPoint: [theEvent locationInWindow] fromView: nil];
-	const bool newWindow = [theEvent modifierFlags] & NSCommandKeyMask;
+	const bool newWindow = [theEvent modifierFlags] & NSEventModifierFlagCommand;
 	if (browser_window_history_click( browser, 
 					   cocoa_pt_to_px( location.x ), cocoa_pt_to_px( location.y ),
 					   newWindow )) {
@@ -78,17 +78,17 @@
 	}
 }
 
-- (BOOL) isFlipped;
+- (BOOL) isFlipped
 {
 	return YES;
 }
 
-- (void) mouseEntered: (NSEvent *) event;
+- (void) mouseEntered: (NSEvent *) event
 {
 	[[NSCursor pointingHandCursor] set];
 }
 
-- (void) mouseExited: (NSEvent *) event;
+- (void) mouseExited: (NSEvent *) event
 {
 	[[NSCursor arrowCursor] set];
 }
@@ -96,7 +96,7 @@
 static bool cursor_rects_cb( const struct browser_window *bw, int x0, int y0, int x1, int y1, 
 							const struct history_entry *page, void *user_data )
 {
-	HistoryView *view = user_data;
+	HistoryView *view = (__bridge HistoryView *)user_data;
 	
 	NSRect rect = NSIntersectionRect( [view visibleRect], cocoa_rect( x0, y0, x1, y1 ) );
 	if (!NSIsEmptyRect( rect )) {
@@ -109,13 +109,12 @@ static bool cursor_rects_cb( const struct browser_window *bw, int x0, int y0, in
 															options: NSTrackingMouseEnteredAndExited | NSTrackingActiveInActiveApp
 															  owner: view userInfo: nil];
 		[view addTrackingArea: area];
-		[area release];
 	}
 	
 	return true;
 }
 
-- (NSToolTipTag)addToolTipRect: (NSRect) rect owner: (id) owner userData: (void *) userData;
+- (NSToolTipTag)addToolTipRect: (NSRect) rect owner: (id) owner userData: (void *) userData
 {
 	if (toolTips == nil) toolTips = [[NSMutableArray alloc] init];
 	[toolTips addObject: owner];
@@ -123,13 +122,13 @@ static bool cursor_rects_cb( const struct browser_window *bw, int x0, int y0, in
 	return [super addToolTipRect: rect owner: owner userData: userData];
 }
 
-- (void) removeAllToolTips;
+- (void) removeAllToolTips
 {
 	[super removeAllToolTips];
 	[toolTips removeAllObjects];
 }
 
-- (void) updateTrackingAreas;
+- (void) updateTrackingAreas
 {
 	[self removeAllToolTips];
 
@@ -137,15 +136,10 @@ static bool cursor_rects_cb( const struct browser_window *bw, int x0, int y0, in
 		[self removeTrackingArea: area];
 	}
 	
-	browser_window_history_enumerate( browser, cursor_rects_cb, self );
+	browser_window_history_enumerate( browser, cursor_rects_cb, (__bridge void *)self );
 	
 	[super updateTrackingAreas];
 }
 
-- (void) dealloc;
-{
-	[self removeAllToolTips];
-	[super dealloc];
-}
 
 @end