wxgui: dead code removal and formatting cleanup
Merge branch 'maint'
wxgui: implement persistence without using glAccum
Merge branch 'master' into next