Fixed issues found with static analysis.

This commit is contained in:
Camilla Berglund 2012-03-26 15:29:01 +02:00
parent d40a3d1617
commit 77c9baab35
2 changed files with 7 additions and 2 deletions

View File

@ -74,6 +74,7 @@ typedef struct _GLFWwindowNS
{ {
id object; id object;
id delegate; id delegate;
id view;
unsigned int modifierFlags; unsigned int modifierFlags;
double fracScrollX; double fracScrollX;
double fracScrollY; double fracScrollY;

View File

@ -687,9 +687,10 @@ static GLboolean createWindow(_GLFWwindow* window,
return GL_FALSE; return GL_FALSE;
} }
window->NS.view = [[GLFWContentView alloc] initWithGlfwWindow:window];
[window->NS.object setTitle:[NSString stringWithUTF8String:wndconfig->title]]; [window->NS.object setTitle:[NSString stringWithUTF8String:wndconfig->title]];
[window->NS.object setContentView:[[GLFWContentView alloc] [window->NS.object setContentView:window->NS.view];
initWithGlfwWindow:window]];
[window->NS.object setDelegate:window->NS.delegate]; [window->NS.object setDelegate:window->NS.delegate];
[window->NS.object setAcceptsMouseMovedEvents:YES]; [window->NS.object setAcceptsMouseMovedEvents:YES];
[window->NS.object center]; [window->NS.object center];
@ -963,6 +964,9 @@ void _glfwPlatformCloseWindow(_GLFWwindow* window)
[window->NS.delegate release]; [window->NS.delegate release];
window->NS.delegate = nil; window->NS.delegate = nil;
[window->NS.view release];
window->NS.view = nil;
[window->NS.object close]; [window->NS.object close];
window->NS.object = nil; window->NS.object = nil;