Convert some more #defines to enums
(cherry picked from commit 70b0c105fd9697ac7d867eee0089e01325321d77)

Conflicts:
	src/gui/gtk.h
	src/gui/presets.h