gnue/forms/src GFForm.py uidrivers/_base/UIdriv...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/09/14 16:15:02

Modified files:
        forms/src      : GFForm.py 
        forms/src/uidrivers/_base: UIdriver.py 
        forms/src/uidrivers/wx: UIdriver.py 

Log message:
        applied Via Libre's GFBoxes-as-container's patch [untested]

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/GFForm.py.diff?cvsroot=OldCVS&tr1=1.171&tr2=1.172&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/uidrivers/_base/UIdriver.py.diff?cvsroot=OldCVS&tr1=1.73&tr2=1.74&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/uidrivers/wx/UIdriver.py.diff?cvsroot=OldCVS&tr1=1.184&tr2=1.185&r1=text&r2=text

Patches:
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.171 gnue/forms/src/GFForm.py:1.172
*** gnue/forms/src/GFForm.py:1.171      Tue Sep 10 11:30:50 2002
--- gnue/forms/src/GFForm.py    Sat Sep 14 16:15:02 2002
***************
*** 548,553 ****
--- 548,569 ----
            keepNext = 1
            continue
  
+   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
***************
*** 555,560 ****
--- 571,577 ----
      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)
  
***************
*** 570,576 ****
      nextEntry = None
      lastEntry = self._currentEntry
  
!     for object in self._currentEntry._block._children:
        if (object._type in TabStops and
            (not object.hidden) and ((not object.readonly) or
           (self._currentBlock.mode=='query' and object._queryable))):
--- 587,594 ----
      nextEntry = None
      lastEntry = self._currentEntry
  
!     entryList= self._getFocusableEntries (self._currentBlock._children)
!     for object in entryList:
        if (object._type in TabStops and
            (not object.hidden) and ((not object.readonly) or
           (self._currentBlock.mode=='query' and object._queryable))):
***************
*** 578,584 ****
          lastEntry = object
  
      keepNext = 0
!     for object in self._currentEntry._block._children:
        # Put the first field as the next to rollover
        if (object._type in TabStops and
            (not object.hidden) and ((not object.readonly) or
--- 596,603 ----
          lastEntry = object
  
      keepNext = 0
!     entryList= self._getFocusableEntries (self._currentBlock._children)
!     for object in entryList:
        # Put the first field as the next to rollover
        if (object._type in TabStops and
            (not object.hidden) and ((not object.readonly) or
Index: gnue/forms/src/uidrivers/_base/UIdriver.py
diff -c gnue/forms/src/uidrivers/_base/UIdriver.py:1.73 
gnue/forms/src/uidrivers/_base/UIdriver.py:1.74
*** gnue/forms/src/uidrivers/_base/UIdriver.py:1.73     Thu Aug  1 03:56:59 2002
--- gnue/forms/src/uidrivers/_base/UIdriver.py  Sat Sep 14 16:15:02 2002
***************
*** 104,110 ****
      self._formToUIWidget = {}             # dictionary of driver specific 
UIfoo
                                            # widgets with the GFObj used as 
the key
  
!     self.containerWidgets= ['GFPage']     # GFForm objects that contain others
  
      self._pageList = []                   # A list of page widgets created by 
the form
  
--- 104,110 ----
      self._formToUIWidget = {}             # dictionary of driver specific 
UIfoo
                                            # widgets with the GFObj used as 
the key
  
!     self.containerWidgets= ['GFPage', 'GFBox']     # GFForm objects that 
contain others
  
      self._pageList = []                   # A list of page widgets created by 
the form
  
Index: gnue/forms/src/uidrivers/wx/UIdriver.py
diff -c gnue/forms/src/uidrivers/wx/UIdriver.py:1.184 
gnue/forms/src/uidrivers/wx/UIdriver.py:1.185
*** gnue/forms/src/uidrivers/wx/UIdriver.py:1.184       Thu Aug  1 03:56:31 2002
--- gnue/forms/src/uidrivers/wx/UIdriver.py     Sat Sep 14 16:15:02 2002
***************
*** 675,686 ****
  class UIBox(UIHelper, UIWidget):
    def _createWidget(self, event, spacer):
      object = event.object
!     newWidget = wxStaticBox(event.container,-1,str(object.label),
!                             
wxPoint(object.x*event.widgetWidth+(event.widgetWidth/2),
!                                     
(object.y+spacer+(spacer*object._gap))*event.widgetHeight+(event.widgetHeight/2)),
!                             wxSize((object.width-1)*event.widgetWidth,
!                                    (object.height-1)*event.widgetHeight))
!     return newWidget
  
  #
  # UIScrollBar
--- 675,692 ----
  class UIBox(UIHelper, UIWidget):
    def _createWidget(self, event, spacer):
      object = event.object
! 
!     # this panel makes the GFBox be a container
!     newPanel = wxPanel(event.container,-1,
!                        
wxPoint(object.x*event.widgetWidth+(event.widgetWidth/2),
!                                
(object.y+spacer+(spacer*object._gap))*event.widgetHeight+(event.widgetHeight/2)),
!                        wxSize((object.width-1)*event.widgetWidth,
!                               (object.height-1)*event.widgetHeight))
!     newWidget = wxStaticBox(newPanel,-1,str(object.label),
!                             wxPoint(0, 0),
!                              wxSize((object.width-1)*event.widgetWidth,
!                                     (object.height-1)*event.widgetHeight))
!     return newPanel
  
  #
  # UIScrollBar