reverting r74098, applying John's version, see #15008, #15765, #13841 will be backported if no regressions are discovered

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775