MoNTE48
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merging r6194 from trunk to ogl-es branch. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6195 dfc29bdd-3216-0410-991c-e03cc46cb475
master
cutealien 2021-02-21 19:09:14 +00:00 committed by MoNTE48
parent ae0da9c949
commit 0c9ba6f7fd
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
source/Irrlicht/CIrrDeviceOSX.mm
View File

@ -1109,28 +1109,28 @@ void CIrrDeviceMacOSX::sleep(u32 timeMs, bool pauseTimer=false)
void CIrrDeviceMacOSX::setWindowCaption(const wchar_t* text)
{
size_t size;
// char title[1024];
if (Window != NULL)
{
// size = wcstombs(title,text,1024);
size = wcslen(text) * sizeof(wchar_t);
// title[1023] = 0;
//#ifdef __MAC_10_6
// NSString* name = [NSString stringWithCString:title encoding:NSUTF8StringEncoding];
//#else
// NSString* name = [NSString stringWithCString:title length:size];
//#endif
if ( text )
{
size_t numBytes = wcslen(text) * sizeof(wchar_t);
#ifdef __BIG_ENDIAN__
NSStringEncoding encode = NSUTF32BigEndianStringEncoding;
NSStringEncoding encode = sizeof(wchar_t) == 4 ? NSUTF32BigEndianStringEncoding : NSUTF16BigEndianStringEncoding;
#else
NSStringEncoding encode = NSUTF32LittleEndianStringEncoding;
NSStringEncoding encode = sizeof(wchar_t) == 4 ? NSUTF32LittleEndianStringEncoding : NSUTF16LittleEndianStringEncoding;
#endif
NSString* name = [[NSString alloc] initWithBytes:text length:size encoding:encode];
[Window setTitle:name];
[name release];
NSString* name = [[NSString alloc] initWithBytes:text length:numBytes encoding:encode];
if ( name )
{
[Window setTitle:name];
[name release];
}
}
else
{
[Window setTitle:@""];
}
}
}