Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-11 13:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r17711) -Codechange: [OSX] Don't use deprecated methods to construct a Cocoa string.

Browse Source
This commit is contained in:
michi_cc 2009-10-04 21:33:31 +00:00
parent dffd1be12d
commit 8484e08ee0
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/os/macosx/macos.mm
View File

@ -59,7 +59,7 @@ void GetMacOSVersion(int *return_major, int *return_minor, int *return_bugfix)
void ShowMacDialog(const char *title, const char *message, const char *buttonLabel) void ShowMacDialog(const char *title, const char *message, const char *buttonLabel)
{ {
NSRunAlertPanel([NSString stringWithCString: title], [NSString stringWithCString: message], [NSString stringWithCString: buttonLabel], nil, nil); NSRunAlertPanel([ NSString stringWithUTF8String:title ], [ NSString stringWithUTF8String:message ], [ NSString stringWithUTF8String:buttonLabel ], nil, nil);
} }
#elif defined WITH_COCOA #elif defined WITH_COCOA

2
src/video/cocoa/cocoa_v.mm
View File

@ -405,7 +405,7 @@ void CocoaDialog(const char *title, const char *message, const char *buttonLabel
} }
QZ_ShowMouse(); QZ_ShowMouse();
NSRunAlertPanel([NSString stringWithCString: title], [NSString stringWithCString: message], [NSString stringWithCString: buttonLabel], nil, nil); NSRunAlertPanel([ NSString stringWithUTF8String:title ], [ NSString stringWithUTF8String:message ], [ NSString stringWithUTF8String:buttonLabel ], nil, nil);
if (!wasstarted && _video_driver != NULL) _video_driver->Stop(); if (!wasstarted && _video_driver != NULL) _video_driver->Stop();

3
src/video/cocoa/wnd_quartz.mm
View File

@ -428,7 +428,6 @@ void WindowQuartzSubdriver::GetDeviceInfo()
bool WindowQuartzSubdriver::SetVideoMode(int width, int height) bool WindowQuartzSubdriver::SetVideoMode(int width, int height)
{ {
char caption[50]; char caption[50];
NSString *nsscaption;
unsigned int style; unsigned int style;
NSRect contentRect; NSRect contentRect;
BOOL isCustom = NO; BOOL isCustom = NO;
@ -470,7 +469,7 @@ bool WindowQuartzSubdriver::SetVideoMode(int width, int height)
[ window setDriver:this ]; [ window setDriver:this ];
snprintf(caption, sizeof(caption), "OpenTTD %s", _openttd_revision); snprintf(caption, sizeof(caption), "OpenTTD %s", _openttd_revision);
nsscaption = [ [ NSString alloc ] initWithCString:caption ]; NSString *nsscaption = [ [ NSString alloc ] initWithUTF8String:caption ];
[ window setTitle: nsscaption ]; [ window setTitle: nsscaption ];
[ window setMiniwindowTitle: nsscaption ]; [ window setMiniwindowTitle: nsscaption ];
[ nsscaption release ]; [ nsscaption release ];

2
src/video/cocoa/wnd_quickdraw.mm
View File

@ -402,7 +402,7 @@ bool WindowQuickdrawSubdriver::SetVideoMode(int width, int height)
[ window setDriver:this ]; [ window setDriver:this ];
snprintf(caption, sizeof(caption), "OpenTTD %s", _openttd_revision); snprintf(caption, sizeof(caption), "OpenTTD %s", _openttd_revision);
nsscaption = [ [ NSString alloc ] initWithCString:caption ]; nsscaption = [ [ NSString alloc ] initWithUTF8String:caption ];
[ window setTitle:nsscaption ]; [ window setTitle:nsscaption ];
[ window setMiniwindowTitle:nsscaption ]; [ window setMiniwindowTitle:nsscaption ];
[ nsscaption release ]; [ nsscaption release ];