changes needed for wx-3.0, also tested with wx-2.8
Merge branch 'master' of https://github.com/OpenCPN/OpenCPN into wx-3.0
Merge pull request #106 from seandepagnier/wx-3.0

changes needed for wx-3.0, also tested with wx-2.8