Jiga228/glfw
0
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2026-09-18 14:45:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'utf8'

Browse Source
This commit is contained in:
Camilla Berglund
2012-02-04 02:17:19 +01:00
parent fcae55591e afcc5f9e1d
commit f582746aaa
9 changed files with 185 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cocoa_window.m
+2 -5
View File
@@ -476,9 +476,7 @@ static GLboolean createWindow(_GLFWwindow* window,
return GL_FALSE;
}
[window->NS.window setTitle:[NSString stringWithCString:wndconfig->title
encoding:NSISOLatin1StringEncoding]];
[window->NS.window setTitle:[NSString stringWithUTF8String:wndconfig->title]];
[window->NS.window setContentView:[[GLFWContentView alloc]
initWithGlfwWindow:window]];
[window->NS.window setDelegate:window->NS.delegate];
@@ -769,8 +767,7 @@ void _glfwPlatformCloseWindow(_GLFWwindow* window)
void _glfwPlatformSetWindowTitle(_GLFWwindow* window, const char *title)
{
[window->NS.window setTitle:[NSString stringWithCString:title
encoding:NSISOLatin1StringEncoding]];
[window->NS.window setTitle:[NSString stringWithUTF8String:title]];
}
//========================================================================