X icon position in edit form (osx)
Revert "Show combobox entries in two lines (osx), closes #333"

This reverts commit 8acd55f3708e62f4f596f33cdf4f5a0fb1685632.
Merge branch 'master' into builds
7.802