Merge pull request #4955 from leoetlino/wat Fix the build on non-Windows platforms when not using WX from Externals
