Navy.gif/glfw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #152 from sjml/master

Browse Source 
Fixed minor Xcode 5 warnings.
This commit is contained in:
Camilla Berglund 2013-10-08 10:43:55 -07:00
commit e9694cca47
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cocoa_monitor.m
View File

@ -97,8 +97,8 @@ static GLboolean modeIsGood(CGDisplayModeRef mode)
static GLFWvidmode vidmodeFromCGDisplayMode(CGDisplayModeRef mode)
{
GLFWvidmode result;
result.width = CGDisplayModeGetWidth(mode);
result.height = CGDisplayModeGetHeight(mode);
result.width = (int) CGDisplayModeGetWidth(mode);
result.height = (int) CGDisplayModeGetHeight(mode);
result.refreshRate = (int) CGDisplayModeGetRefreshRate(mode);
CFStringRef format = CGDisplayModeCopyPixelEncoding(mode);

7
src/cocoa_window.m
View File

@ -519,7 +519,7 @@ static int translateKey(unsigned int key)
- (void)otherMouseDown:(NSEvent *)event
{
_glfwInputMouseClick(window,
[event buttonNumber],
(int) [event buttonNumber],
GLFW_PRESS,
translateFlags([event modifierFlags]));
}
@ -532,7 +532,7 @@ static int translateKey(unsigned int key)
- (void)otherMouseUp:(NSEvent *)event
{
_glfwInputMouseClick(window,
[event buttonNumber],
(int) [event buttonNumber],
GLFW_RELEASE,
translateFlags([event modifierFlags]));
}
@ -783,7 +783,8 @@ static void createMenuBar(void)
// Prior to Snow Leopard, we need to use this oddly-named semi-private API
// to get the application menu working properly.
[NSApp performSelector:@selector(setAppleMenu:) withObject:appMenu];
SEL setAppleMenuSelector = NSSelectorFromString(@"setAppleMenu:");
[NSApp performSelector:setAppleMenuSelector withObject:appMenu];
}
#endif /* _GLFW_USE_MENUBAR */