Revert "fix some wx2.9 errors"

This reverts commit 291e217662a73ae22c240690a561ebff70f26523.