diff options
| author | bjarni <bjarni@openttd.org> | 2005-12-10 23:03:59 +0000 |
|---|---|---|
| committer | bjarni <bjarni@openttd.org> | 2005-12-10 23:03:59 +0000 |
| commit | 42d8e8410b39c9f0ce2bf89df060fa5ece82e0c9 (patch) | |
| tree | 4799043dc3a50980134763ad405adda574693d1f /video | |
| parent | be65f908c8ffb2cf1e9787f302acd4fb6dfafd8d (diff) | |
| download | openttd-42d8e8410b39c9f0ce2bf89df060fa5ece82e0c9.tar.xz | |
(svn r3286) -Fix: [OSX] 10.2 works again and universal binaries got 10.2 as target by default
Diffstat (limited to 'video')
| -rw-r--r-- | video/cocoa_v.m | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/video/cocoa_v.m b/video/cocoa_v.m index 2dbc2c478..a0b7f50aa 100644 --- a/video/cocoa_v.m +++ b/video/cocoa_v.m @@ -27,9 +27,11 @@ extern void ShowMenuBar(void); extern void HideMenuBar(void); /* Disables a warning. This is needed since the method exists but has been dropped from the header, supposedly as of 10.4. */ +#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4) @interface NSApplication(NSAppleMenu) - (void)setAppleMenu:(NSMenu *)menu; @end +#endif /* Name conflict */ @@ -1180,7 +1182,7 @@ static const char *QZ_SetVideoWindowed (uint width, uint height) { return "Could not create the Cocoa window"; snprintf(caption, sizeof(caption), "OpenTTD %s", _openttd_revision); - nsscaption = [ [ NSString alloc ] initWithCString:caption encoding:NSASCIIStringEncoding ]; + nsscaption = [ [ NSString alloc ] initWithCString:caption ]; [ _cocoa_video_data.window setTitle:nsscaption ]; [ _cocoa_video_data.window setMiniwindowTitle:nsscaption ]; [ nsscaption release ]; |