Skip to content

Commit

Permalink
Merge pull request bulletphysics#240 from erwincoumans/master
Browse files Browse the repository at this point in the history
allow to compile using gcc-4.x on Mac OSX
  • Loading branch information
erwincoumans committed Sep 11, 2014
2 parents 46565f3 + 6406519 commit 02ca31b
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions btgui/OpenGLWindow/MacOpenGLWindow.mm
Original file line number Diff line number Diff line change
Expand Up @@ -374,8 +374,8 @@ -(void)windowWillClose:(NSNotification *)note

// [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];

Expand All @@ -386,10 +386,10 @@ -(void)windowWillClose:(NSNotification *)note


// 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;
Expand Down

0 comments on commit 02ca31b

Please sign in to comment.