This is the same change as was done in the previous commit for wxGenericStaticBitmap, see that commit message for more details.