From 095062e371115c864f7884da2ee927f43ee723f3 Mon Sep 17 00:00:00 2001
From: Enrico Turri <enricoturri@seznam.cz>
Date: Tue, 31 Mar 2020 14:16:53 +0200
Subject: [PATCH] 3DConnexion settings dialog (Ctrl+M) shown only on Mac

---
 src/slic3r/GUI/GLCanvas3D.cpp        | 14 ++++++--------
 src/slic3r/GUI/KBShortcutsDialog.cpp |  6 ++++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
index e422dc238b..6d9c6eb24d 100644
--- a/src/slic3r/GUI/GLCanvas3D.cpp
+++ b/src/slic3r/GUI/GLCanvas3D.cpp
@@ -3016,15 +3016,13 @@ void GLCanvas3D::on_char(wxKeyEvent& evt)
 #ifdef __APPLE__
         case 'm':
         case 'M':
-#else /* __APPLE__ */
-        case WXK_CONTROL_M:
+        {
+            Mouse3DController& controller = wxGetApp().plater()->get_mouse3d_controller();
+            controller.show_settings_dialog(!controller.is_settings_dialog_shown());
+            m_dirty = true;
+            break;
+        }
 #endif /* __APPLE__ */
-            {
-                Mouse3DController& controller = wxGetApp().plater()->get_mouse3d_controller();
-                controller.show_settings_dialog(!controller.is_settings_dialog_shown());
-                m_dirty = true;
-                break;
-            }
 
 #ifdef __APPLE__
         case 'v':
diff --git a/src/slic3r/GUI/KBShortcutsDialog.cpp b/src/slic3r/GUI/KBShortcutsDialog.cpp
index d05ecbcd82..d8a0792321 100644
--- a/src/slic3r/GUI/KBShortcutsDialog.cpp
+++ b/src/slic3r/GUI/KBShortcutsDialog.cpp
@@ -185,10 +185,12 @@ void KBShortcutsDialog::fill_shortcuts()
         { "Z", L("Zoom to selected object\nor all objects in scene, if none selected") },
         { "I", L("Zoom in") },
         { "O", L("Zoom out") },
-        { ctrl + "M", L("Show/Hide 3Dconnexion devices settings dialog") }
+#ifdef __APPLE__
+        { ctrl + "M", L("Show/Hide 3Dconnexion devices settings dialog") },
+#endif // __APPLE__
 #if ENABLE_RENDER_PICKING_PASS
         // Don't localize debugging texts.
-        , { "T", "Toggle picking pass texture rendering on/off" }
+        { "T", "Toggle picking pass texture rendering on/off" },
 #endif // ENABLE_RENDER_PICKING_PASS
     };