Modified to work with wx 2.9, which is much nicer on a retina mac