This still won't build new 2.5 packages yet, but it is changes that will happen anyway so I'm checkpointing the diff here. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775