Correct wxWidgets 2.8  Bitmap define to ovoid compile warnings
Merge branch 'master' of https://github.com/Ptizef/OpenCPN