Merge remote-tracking branch 'origin/backspace_to_delete_on_osx'

This commit is contained in:
bubnikv
2018-07-27 09:55:13 +02:00
9 changed files with 3877 additions and 2186 deletions

View File

@@ -3061,7 +3061,13 @@ void GLCanvas3D::on_key_down(wxKeyEvent& evt)
if (key == WXK_DELETE)
m_on_remove_object_callback.call();
else
evt.Skip();
{
#ifdef __WXOSX__
if (key == WXK_BACK)
m_on_remove_object_callback.call();
#endif
evt.Skip();
}
}
}