Make Aqua Tk build on OSX Leopard again; *I* still use it!
merge 8.5