summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorplanetmaker <planetmaker@openttd.org>2011-01-01 08:23:46 +0000
committerplanetmaker <planetmaker@openttd.org>2011-01-01 08:23:46 +0000
commit9ddcbaf9b7d51f137c7f0b137a316cdc370e59f0 (patch)
treeecaf898e313967e99906f1fe3fd7109c3a263115
parent675f1376e02983ac49d913487a3503be4868038d (diff)
downloadopenttd-9ddcbaf9b7d51f137c7f0b137a316cdc370e59f0.tar.xz
(svn r21684) -Fix [FS#4360] (r21573): Silence some compile warnings
-rw-r--r--src/video/cocoa/cocoa_v.mm2
-rw-r--r--src/video/cocoa/wnd_quartz.mm4
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 ];