wx2.8 back-compat
Windows alignment fix
code cleanup