Author: bugman Date: Wed Jul 2 09:43:20 2014 New Revision: 24393 URL: http://svn.gna.org/viewcvs/relax?rev=24393&view=rev Log: Merged revisions 24387 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r24387 | bugman | 2014-07-02 09:22:04 +0200 (Wed, 02 Jul 2014) | 11 lines Fix for bug #22257, the freezing of the GUI after using the free file format window on Mac OS X. This is reported at https://gna.org/bugs/?22257. This is a recurring problem in Mac OS X as it cannot be tested in the relax test suite. The problem is with wxPython. The modal dialogs, such as the free file format window, cannot be destroyed on Mac OS X using wx.Dialog.Destroy() - this kills wxPython and hence kills relax. The problem does not exist on any other operating system. To fix this, all wx.Dialog.Destroy() calls have been replaced with wx.Dialog.Close(). ........ Modified: branches/disp_spin_speed/ (props changed) branches/disp_spin_speed/gui/components/free_file_format.py Propchange: branches/disp_spin_speed/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Wed Jul 2 09:43:20 2014 @@ -1 +1 @@ -/trunk:1-24263,24354-24386 +/trunk:1-24263,24354-24387 Modified: branches/disp_spin_speed/gui/components/free_file_format.py URL: http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/gui/components/free_file_format.py?rev=24393&r1=24392&r2=24393&view=diff ============================================================================== --- branches/disp_spin_speed/gui/components/free_file_format.py (original) +++ branches/disp_spin_speed/gui/components/free_file_format.py Wed Jul 2 09:43:20 2014 @@ -675,8 +675,8 @@ @type event: wx event """ - # Destroy the window. - self.Destroy() + # Close the window. + self.Close() def reset(self, event): @@ -700,5 +700,5 @@ # Execute the base class method. self._element.save(event) - # Destroy the window. - self.Destroy() + # Close the window. + self.Close()