Added button support for AWT and JavaFX