diff options
| author | rubidium <rubidium@openttd.org> | 2009-03-29 19:55:08 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-03-29 19:55:08 +0000 |
| commit | 8293be426cc8e4c6b228f906d00838d02f6edd0a (patch) | |
| tree | 416d2b6997d90c7f46c4891e99e681d33b3de66a /src/video/cocoa | |
| parent | c2ced41c044946dbc3dbfe0471816fc9d63401f1 (diff) | |
| download | openttd-8293be426cc8e4c6b228f906d00838d02f6edd0a.tar.xz | |
(svn r15892) -Codechange: [OSX] some type fixes so OpenTTD likes more of the 3.1.x Xcodes.
Diffstat (limited to 'src/video/cocoa')
| -rw-r--r-- | src/video/cocoa/fullscreen.mm | 2 | ||||
| -rw-r--r-- | src/video/cocoa/wnd_quartz.mm | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/video/cocoa/fullscreen.mm b/src/video/cocoa/fullscreen.mm index 2b63e0d6e..b011834a4 100644 --- a/src/video/cocoa/fullscreen.mm +++ b/src/video/cocoa/fullscreen.mm @@ -299,7 +299,7 @@ class FullscreenSubdriver: public CocoaSubdriver { bool SetVideoMode(int w, int h) { - int exact_match; + boolean_t exact_match; CFNumberRef number; int bpp; int gamma_error; diff --git a/src/video/cocoa/wnd_quartz.mm b/src/video/cocoa/wnd_quartz.mm index 518668022..aa09db1b0 100644 --- a/src/video/cocoa/wnd_quartz.mm +++ b/src/video/cocoa/wnd_quartz.mm @@ -65,7 +65,7 @@ class WindowQuartzSubdriver; - (void)appDidHide:(NSNotification*)note; - (void)appWillUnhide:(NSNotification*)note; - (void)appDidUnhide:(NSNotification*)note; -- (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; @end /* Delegate for our NSWindow to send ask for quit on close */ @@ -264,7 +264,7 @@ static CGColorSpaceRef QZ_GetCorrectColorSpace() } -- (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 @@ -336,7 +336,7 @@ static CGColorSpaceRef QZ_GetCorrectColorSpace() CGImageRef clippedImage; NSRect rect; const NSRect *dirtyRects; - int dirtyRectCount; + NSInteger dirtyRectCount; int n; CGRect clipRect; CGRect blitRect; |