Revert "Merge remote-tracking branch 'wxWidgets/master' into aui-dynamic-notebook"

This reverts commit 3f29a9516f5556200400c11dbc5569ef93d21eba, reversing
changes made to e089d70614e6e497869a7c6b248e1206c108b124.