Misc updates in line with update to wxWidgets v3.0 RC 1.