mirror of
https://github.com/bulletphysics/bullet3
synced 2024-12-15 22:20:12 +00:00
Merge pull request #240 from erwincoumans/master
allow to compile using gcc-4.x on Mac OSX
This commit is contained in:
commit
02ca31bc9d
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user