Author: bugman Date: Mon Aug 22 14:56:32 2011 New Revision: 14404 URL: http://svn.gna.org/viewcvs/relax?rev=14404&view=rev Log: Merged r14394 from the gui_testing branch as this should have occurred in the main 1.3 line. The command used was: svn merge -r14394:14395 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/gui_testing . ..... r14395 | bugman | 2011-08-17 09:02:54 +0200 (Wed, 17 Aug 2011) | 6 lines Changed paths: M /branches/gui_testing/gui/controller.py Created Redirect_text.flush() for the relax controller for compatibility with the multi-processor code. The multi-processor code calls sys.stdout.flush() and sys.stderr.flush(), so these need to be mimicked in the Redirect_text pseudo file object class. ..... Modified: 1.3/gui/controller.py Modified: 1.3/gui/controller.py URL: http://svn.gna.org/viewcvs/relax/1.3/gui/controller.py?rev=14404&r1=14403&r2=14404&view=diff ============================================================================== --- 1.3/gui/controller.py (original) +++ 1.3/gui/controller.py Mon Aug 22 14:56:32 2011 @@ -231,6 +231,13 @@ def __init__(self,aWxTextCtrl): self.out=aWxTextCtrl + + + def flush(self): + """Simulate the file object flush method.""" + + # Call the log control write method one the GUI is responsive. + wx.CallAfter(self.control.write) def limit_entries(self):