diff options
| author | Max Horn | 2012-10-15 14:30:18 +0200 |
|---|---|---|
| committer | Thierry Crozat | 2012-11-18 01:29:08 +0000 |
| commit | a49f55878a152eb9bd206e874d54bdf8e9ec281d (patch) | |
| tree | 1eb9a20e746631f92e47b5f396e7df705f5142c8 /backends/platform/sdl/macosx | |
| parent | 93eb6ec64aa2ee2e276c7c2ddd57a269b539af28 (diff) | |
| download | scummvm-rg350-a49f55878a152eb9bd206e874d54bdf8e9ec281d.tar.gz scummvm-rg350-a49f55878a152eb9bd206e874d54bdf8e9ec281d.tar.bz2 scummvm-rg350-a49f55878a152eb9bd206e874d54bdf8e9ec281d.zip | |
OSX: Improve native OS X browser dialog
Signed-off-by: Thierry Crozat <criezy@scummvm.org>
Diffstat (limited to 'backends/platform/sdl/macosx')
| -rw-r--r-- | backends/platform/sdl/macosx/appmenu_osx.mm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/backends/platform/sdl/macosx/appmenu_osx.mm b/backends/platform/sdl/macosx/appmenu_osx.mm index 97c7edba3e..0d2a2ab7f2 100644 --- a/backends/platform/sdl/macosx/appmenu_osx.mm +++ b/backends/platform/sdl/macosx/appmenu_osx.mm @@ -35,9 +35,8 @@ - (void)setAppleMenu:(NSMenu *)menu; @end -NSString *constructNSStringFromCString(const char* rawCString, NSStringEncoding stringEncoding) { - NSData *nsData = [NSData dataWithBytes:rawCString length:strlen(rawCString)]; - return [[NSString alloc] initWithData:nsData encoding:stringEncoding]; +NSString *constructNSStringFromCString(const char *rawCString, CFStringEncoding stringEncoding) { + return (NSString *)CFStringCreateWithCString(NULL, rawCString, stringEncoding); } void replaceApplicationMenuItems() { @@ -59,11 +58,11 @@ void replaceApplicationMenuItems() { // Get current encoding #ifdef USE_TRANSLATION - nsString = constructNSStringFromCString((TransMan.getCurrentCharset()).c_str(), NSASCIIStringEncoding); - NSStringEncoding stringEncoding = CFStringConvertEncodingToNSStringEncoding(CFStringConvertIANACharSetNameToEncoding((CFStringRef)nsString)); + nsString = constructNSStringFromCString(TransMan.getCurrentCharset().c_str(), NSASCIIStringEncoding); + CFStringEncoding stringEncoding = CFStringConvertIANACharSetNameToEncoding((CFStringRef)nsString); [nsString release]; #else - NSStringEncoding stringEncoding = NSASCIIStringEncoding; + CFStringEncoding stringEncoding = kCFStringEncodingASCII; #endif // Add "About ScummVM" menu item |