upstream patches

apply some patches from [upstream](http://trac.wxwidgets.org/ticket/15976) to hopefully address some of the issues we're seeing

these shouldn't be needed for anything past wx 3.0.0 since they're already in the appropriate wx branches