r20199 - in /branches/relax_disp: ./ gui/pipe_editor.py -- June 18, 2013 - 17:44

Author: bugman
Date: Tue Jun 18 17:44:47 2013
New Revision: 20199

URL: http://svn.gna.org/viewcvs/relax?rev=20199&view=rev
Log:
Merged revisions 20198 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r20198 | bugman | 2013-06-18 17:44:03 +0200 (Tue, 18 Jun 2013) | 10 lines
  
  Fix for bug #20918 (https://gna.org/bugs/?20918), the hanging of the data 
pipe editor.
  
  This was reported by Troels Linnet (https://gna.org/users/tlinnet) and is 
an MS Windows only
  problem.
  
  The problem is in the wxMSW part of wxPython, and it may be fixed in newer 
wxPython versions.  The
  issue is nevertheless now avoided by calling the GUI user function store 
objects with the arguments
  wx_wizard_sync=True and wx_wizard_modal=True.  This appears to solve the 
problem.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/gui/pipe_editor.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jun 18 17:44:47 2013
@@ -1,1 +1,1 @@
-/trunk:1-20196
+/trunk:1-20198

Modified: branches/relax_disp/gui/pipe_editor.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/pipe_editor.py?rev=20199&r1=20198&r2=20199&view=diff
==============================================================================
--- branches/relax_disp/gui/pipe_editor.py (original)
+++ branches/relax_disp/gui/pipe_editor.py Tue Jun 18 17:44:47 2013
@@ -249,17 +249,17 @@
 
         # Launch the respective user functions.
         if event.GetEventObject() == self.button_bundle:
-            uf_store['pipe.bundle'](event, wx_parent=self)
+            uf_store['pipe.bundle'](event, wx_parent=self, 
wx_wizard_sync=True, wx_wizard_modal=True)
         elif event.GetEventObject() == self.button_create:
-            uf_store['pipe.create'](event, wx_parent=self)
+            uf_store['pipe.create'](event, wx_parent=self, 
wx_wizard_sync=True, wx_wizard_modal=True)
         elif event.GetEventObject() == self.button_copy:
-            uf_store['pipe.copy'](event, wx_parent=self)
+            uf_store['pipe.copy'](event, wx_parent=self, 
wx_wizard_sync=True, wx_wizard_modal=True)
         elif event.GetEventObject() == self.button_delete:
-            uf_store['pipe.delete'](event, wx_parent=self)
+            uf_store['pipe.delete'](event, wx_parent=self, 
wx_wizard_sync=True, wx_wizard_modal=True)
         elif event.GetEventObject() == self.button_hybrid:
-            uf_store['pipe.hybridise'](event, wx_parent=self)
+            uf_store['pipe.hybridise'](event, wx_parent=self, 
wx_wizard_sync=True, wx_wizard_modal=True)
         elif event.GetEventObject() == self.button_switch:
-            uf_store['pipe.switch'](event, wx_parent=self)
+            uf_store['pipe.switch'](event, wx_parent=self, 
wx_wizard_sync=True, wx_wizard_modal=True)
 
 
     def add_logo(self, box):