Using wx.OK in MessageDialog for compatibility with wx 2.9 on OSX.
fixing merge conflicts.