Fix layout for Wx 3.
Merge branch 'wx3fix' into devel