Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste

src/slic3r/GUI/GLCanvas3D.cpp

@@ -2222,9 +2222,12 @@ void GLCanvas3D::on_char(wxKeyEvent& evt)
 //#endif /* __APPLE__ */
     if ((evt.GetModifiers() & ctrlMask) != 0) {
         switch (keyCode) {
+#ifdef __APPLE__
         case 'a':
         case 'A':
+#else /* __APPLE__ */
         case WXK_CONTROL_A:
+#endif /* __APPLE__ */
                 post_event(SimpleEvent(EVT_GLCANVAS_SELECT_ALL));
         break;
 #ifdef __APPLE__

src/slic3r/GUI/Gizmos/GLGizmosManager.cpp

@@ -713,7 +713,12 @@ bool GLGizmosManager::on_char(wxKeyEvent& evt, GLCanvas3D& canvas)
     {
         switch (keyCode)
         {
+#ifdef __APPLE__
+        case 'a':
+        case 'A':
+#else /* __APPLE__ */
         case WXK_CONTROL_A:
+#endif /* __APPLE__ */
         {
             // Sla gizmo selects all support points
             if ((m_current == SlaSupports) && gizmo_event(SLAGizmoEventType::SelectAll))