Merge pull request #240 from erwincoumans/master

allow to compile using gcc-4.x on Mac OSX
This commit is contained in:
erwincoumans 2014-09-10 20:51:07 -07:00
commit 02ca31bc9d

View File

@ -374,8 +374,8 @@ void MacOpenGLWindow::createWindow(const b3gWindowConstructionInfo& ci)
// [NSEvent addGlobalMonitorForEventsMatchingMask:NSMouseMovedMask];
[NSEvent addGlobalMonitorForEventsMatchingMask:NSMouseMovedMask handler:^(NSEvent *event)
{
// [NSEvent addGlobalMonitorForEventsMatchingMask:NSMouseMovedMask handler:^(NSEvent *event)
// {
//[window setFrameOrigin:[NSEvent mouseLocation]];
// NSPoint eventLocation = [m_internalData->m_window mouseLocationOutsideOfEventStream];
@ -386,10 +386,10 @@ void MacOpenGLWindow::createWindow(const b3gWindowConstructionInfo& ci)
// printf("mouse coord = %f, %f\n",m_mouseX,m_mouseY);
if (m_mouseMoveCallback)
(*m_mouseMoveCallback)(m_mouseX,m_mouseY);
// if (m_mouseMoveCallback)
// (*m_mouseMoveCallback)(m_mouseX,m_mouseY);
}];
// }];
//see http://stackoverflow.com/questions/8238473/cant-get-nsmousemoved-events-from-nexteventmatchingmask-with-an-nsopenglview
ProcessSerialNumber psn;