From 9ddcbaf9b7d51f137c7f0b137a316cdc370e59f0 Mon Sep 17 00:00:00 2001 From: planetmaker Date: Sat, 1 Jan 2011 08:23:46 +0000 Subject: (svn r21684) -Fix [FS#4360] (r21573): Silence some compile warnings --- src/video/cocoa/cocoa_v.mm | 2 +- src/video/cocoa/wnd_quartz.mm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/video/cocoa/cocoa_v.mm b/src/video/cocoa/cocoa_v.mm index aa7e5d3ad..8a063973e 100644 --- a/src/video/cocoa/cocoa_v.mm +++ b/src/video/cocoa/cocoa_v.mm @@ -511,7 +511,7 @@ void cocoaReleaseAutoreleasePool() /** * Initialize event system for the application rectangle */ -- (id)initWithContentRect:(NSRect)contentRect styleMask:(unsigned int)styleMask backing:(NSBackingStoreType)backingType defer:(BOOL)flag +- (id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)styleMask backing:(NSBackingStoreType)backingType defer:(BOOL)flag { /* Make our window subclass receive these application notifications */ [ [ NSNotificationCenter defaultCenter ] addObserver:self diff --git a/src/video/cocoa/wnd_quartz.mm b/src/video/cocoa/wnd_quartz.mm index 6a3f404b2..3370c560d 100644 --- a/src/video/cocoa/wnd_quartz.mm +++ b/src/video/cocoa/wnd_quartz.mm @@ -294,14 +294,14 @@ bool WindowQuartzSubdriver::SetVideoMode(int width, int height) if (this->cocoaview == nil) { this->cocoaview = [ [ OTTD_QuartzView alloc ] initWithFrame:contentRect ]; if (this->cocoaview == nil) { - DEBUG(driver, 0, "Could not create the Quickdraw view."); + DEBUG(driver, 0, "Could not create the Quartz view."); this->setup = false; return false; } [ this->cocoaview setDriver:this ]; - [ this->cocoaview setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable ]; + [ (NSView*)this->cocoaview setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable ]; [ this->window setContentView:cocoaview ]; [ this->cocoaview release ]; [ this->window makeKeyAndOrderFront:nil ]; -- cgit v1.2.3-70-g09d2