From 7c5d94e0b1369b3c52f39d386a6367db6325603f Mon Sep 17 00:00:00 2001 From: bubnikv Date: Mon, 4 Feb 2019 09:37:49 +0100 Subject: [PATCH] Don't capture Cmd+A on OSX in Canvas, it works throug the menu accelerators. --- src/slic3r/GUI/GLCanvas3D.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index cca4b893f..12ff00dce 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -5102,12 +5102,15 @@ void GLCanvas3D::on_char(wxKeyEvent& evt) // see include/wx/defs.h enum wxKeyCode int keyCode = evt.GetKeyCode(); int ctrlMask = wxMOD_CONTROL; -#ifdef __APPLE__ - ctrlMask |= wxMOD_RAW_CONTROL; -#endif /* __APPLE__ */ +//#ifdef __APPLE__ +// ctrlMask |= wxMOD_RAW_CONTROL; +//#endif /* __APPLE__ */ if ((evt.GetModifiers() & ctrlMask) != 0) { switch (keyCode) { +#ifndef __APPLE__ + // Even though Control+A is captured by the accelerator on OSX/wxWidgets in Slic3r, it works in text edit lines. case WXK_CONTROL_A: post_event(SimpleEvent(EVT_GLCANVAS_SELECT_ALL)); break; +#endif /* __APPLE__ */ #ifdef __APPLE__ case WXK_BACK: // the low cost Apple solutions are not equipped with a Delete key, use Backspace instead. #endif /* __APPLE__ */