changeset 16948:0ccb304dd2e3 draft

(svn r21684) -Fix [FS#4360] (r21573): Silence some compile warnings
author planetmaker <planetmaker@openttd.org>
date Sat, 01 Jan 2011 08:23:46 +0000
parents a57f80c2d9e9
children c762ac4f057d
files src/video/cocoa/cocoa_v.mm src/video/cocoa/wnd_quartz.mm
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/video/cocoa/cocoa_v.mm
+++ b/src/video/cocoa/cocoa_v.mm
@@ -511,7 +511,7 @@
 /**
  * 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
--- a/src/video/cocoa/wnd_quartz.mm
+++ b/src/video/cocoa/wnd_quartz.mm
@@ -294,14 +294,14 @@
 	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 ];