gnue/forms/src GFForm.py

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 02/10/23 22:11:54

Modified files:
        forms/src      : GFForm.py 

Log message:
        I thought cvs wouldn't let us commit conflicts

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

Patches:
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.186 gnue/forms/src/GFForm.py:1.187
*** gnue/forms/src/GFForm.py:1.186      Wed Oct 23 20:26:08 2002
--- gnue/forms/src/GFForm.py    Wed Oct 23 22:11:54 2002
***************
*** 535,568 ****
            keepNext = 1
            continue
  
- <<<<<<< GFForm.py
-   def _getFocusableEntries (self, children):
-     # I *hate* debug
-     # GDebug.printMesg (5, )
-     
-     entryNo= 0
-     result= children
-     for entry in children:
-       # shouldn't this be 'in containers'?
-       if entry._type == 'GFBox':
-         next= _getFocusableEntries (entry._children)
-         # replace the box with its children recursively
-         result= result[:entryNo]+next+result[entryNo+1:]
-         entryNo= entryNo+length (next)
-       entryNo= entryNo+1
-     return result
-   
- #        if keepNext == 1:
- #          nextEntry = object
- #          break
- #
- #    if nextEntry == firstEntry and self._currentBlock.transparentBlock:
- #      # Jump to the next block if block is tagged as transparent
- #      self.nextBlock()
- #    firstEntry= self._currentEntry
- #    else:
- #      self.changeFocus(nextEntry)
- =======
          if keepNext == 1:
            nextEntry = object
            break
--- 535,540 ----
***************
*** 572,578 ****
        self.nextBlock()
      else:
        self.changeFocus(nextEntry)
- >>>>>>> 1.183
  
    #
    # previousEntry
--- 544,549 ----