gnue/forms/src GFInstance.py

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 03/05/08 20:07:02

Modified files:
        forms/src      : GFInstance.py 

Log message:
        fix for multiple <dialog>s per gfd file

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFInstance.py.diff?tr1=1.108&tr2=1.109&r1=text&r2=text

Patches:
Index: gnue/forms/src/GFInstance.py
diff -c gnue/forms/src/GFInstance.py:1.108 gnue/forms/src/GFInstance.py:1.109
*** gnue/forms/src/GFInstance.py:1.108  Wed Apr  9 13:00:37 2003
--- gnue/forms/src/GFInstance.py        Thu May  8 20:07:02 2003
***************
*** 251,257 ****
      # Extract the child <dialog>s from the main form tree
      #
      self.reapSubforms(form)
! 
      #
      # Add the main form into the dictionary
      #
--- 251,257 ----
      # Extract the child <dialog>s from the main form tree
      #
      self.reapSubforms(form)
!     
      #
      # Add the main form into the dictionary
      #
***************
*** 259,272 ****
  
    #
    # removes the subforms from the main tree before
!   # any UI stuff is constructed
    #
    def reapSubforms(self,formTree):
      for child in formTree._children:
        if isinstance(child, GFForm):
          child._parent = None
          self._formsDictionary[child.name] = child
!         formTree._children.remove(child)
  
    #
    # activate
--- 259,279 ----
  
    #
    # removes the subforms from the main tree before
!   # any UI stuff is constructed.
!   #
!   # NOTE: using list.remove() will not work in a
!   #       for loop as it skips the very next item
!   #       in the list
    #
    def reapSubforms(self,formTree):
+     childList = []
      for child in formTree._children:
        if isinstance(child, GFForm):
          child._parent = None
          self._formsDictionary[child.name] = child
!       else:
!         childList.append(child)
!     formTree._children = childList              
  
    #
    # activate