Using wx.OK in MessageDialog for compatibility with wx 2.9 on OSX.
Fixing icon size on wx2.9, OSX
fixing merge conflicts.