From 449e447f1fad8b3d9ed03fa0819ef848d7a37f8c Mon Sep 17 00:00:00 2001 From: Bernhard Stegmaier Date: Sat, 9 Dec 2017 13:22:30 +0100 Subject: [PATCH 3/3] Fix macOS pinch-to-zoom for 3d-viewer. --- 3d-viewer/3d_canvas/eda_3d_canvas.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/3d-viewer/3d_canvas/eda_3d_canvas.cpp b/3d-viewer/3d_canvas/eda_3d_canvas.cpp index 92fdae73c..e1d54dc74 100644 --- a/3d-viewer/3d_canvas/eda_3d_canvas.cpp +++ b/3d-viewer/3d_canvas/eda_3d_canvas.cpp @@ -72,7 +72,7 @@ BEGIN_EVENT_TABLE( EDA_3D_CANVAS, wxGLCanvas ) EVT_MOUSEWHEEL( EDA_3D_CANVAS::OnMouseWheel ) EVT_MOTION( EDA_3D_CANVAS::OnMouseMove ) -#ifdef USE_OSX_MAGNIFY_EVENT +#if wxCHECK_VERSION( 3, 1, 0 ) || defined( USE_OSX_MAGNIFY_EVENT ) EVT_MAGNIFY( EDA_3D_CANVAS::OnMagnify ) #endif @@ -515,8 +515,6 @@ void EDA_3D_CANVAS::OnMagnify( wxMouseEvent& event ) DisplayStatus(); Request_refresh(); - - m_settings.CameraGet().SetCurMousePosition( event.GetPosition() ); } #endif -- 2.13.6 (Apple Git-96)