Author: bugman Date: Fri Sep 30 17:22:33 2011 New Revision: 14767 URL: http://svn.gna.org/viewcvs/relax?rev=14767&view=rev Log: Bug fix for Mac OS X when using wxPython 2.9.2.4 whereby wx.SafeYield() is causing 'Bus errors'. The wx.SafeYield(None, True) calls have been replaced by wx.GetApp().Yield(True) calls, which should do the same thing but do not cause bus errors on this developmental version of wxPython. This fix is important as the future Mac OS X relax app will use this version of wxPython for 64-bit and Cocoa support. Modified: 1.3/gui/errors.py 1.3/gui/pipe_editor.py Modified: 1.3/gui/errors.py URL: http://svn.gna.org/viewcvs/relax/1.3/gui/errors.py?rev=14767&r1=14766&r2=14767&view=diff ============================================================================== --- 1.3/gui/errors.py (original) +++ 1.3/gui/errors.py Fri Sep 30 17:22:33 2011 @@ -53,7 +53,7 @@ # Show the relax controller (so that the window doesn't hide the dialog). app = wx.GetApp() app.gui.show_controller(None) - wx.SafeYield(None, True) + app.Yield(True) # Show a dialog explaining the error. dlg = wx.MessageDialog(None, relax_error.text, caption="RelaxError", style=wx.OK|wx.ICON_ERROR) Modified: 1.3/gui/pipe_editor.py URL: http://svn.gna.org/viewcvs/relax/1.3/gui/pipe_editor.py?rev=14767&r1=14766&r2=14767&view=diff ============================================================================== --- 1.3/gui/pipe_editor.py (original) +++ 1.3/gui/pipe_editor.py Fri Sep 30 17:22:33 2011 @@ -440,7 +440,7 @@ wx.CallAfter(self.update_grid_safe) # Flush the events. - wx.SafeYield(None, True) + wx.GetApp().Yield(True) def update_grid_safe(self):