r27634 - in /branches/nmrglue: ./ gui/input_elements/sequence_2D.py -- February 12, 2015 - 18:42

Author: bugman
Date: Thu Feb 12 18:42:16 2015
New Revision: 27634

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

........
  r27631 | bugman | 2015-02-12 18:40:34 +0100 (Thu, 12 Feb 2015) | 7 lines
  
  Fix for bug #23265 (https://gna.org/bugs/?23265).
  
  This is the failure of the edit buttons in the user function GUI windows.  
The problem was that the
  column titles of the window opened by the edit button were being 
incorrectly handled if the
  dimensions of the window were not supplied.
........

Modified:
    branches/nmrglue/   (props changed)
    branches/nmrglue/gui/input_elements/sequence_2D.py

Propchange: branches/nmrglue/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Feb 12 18:42:16 2015
@@ -1 +1 @@
-/trunk:1-27606,27612-27629
+/trunk:1-27633

Modified: branches/nmrglue/gui/input_elements/sequence_2D.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/nmrglue/gui/input_elements/sequence_2D.py?rev=27634&r1=27633&r2=27634&view=diff
==============================================================================
--- branches/nmrglue/gui/input_elements/sequence_2D.py  (original)
+++ branches/nmrglue/gui/input_elements/sequence_2D.py  Thu Feb 12 18:42:16 
2015
@@ -161,7 +161,10 @@
         # Store the titles.
         self.titles = titles
         if titles == None:
-            self.titles = [wx.EmptyString] * dim[1]
+            if dim == None:
+                self.titles = [wx.EmptyString]
+            else:
+                self.titles = [wx.EmptyString] * dim[1]
 
         # Determine the dimensions if not given.
         if dim == None: