gnue/forms/src/uidrivers/wx UIdriver.py

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/11/22 00:39:17

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

Log message:
        more work on switching focus traversal into new logic/layout

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/uidrivers/wx/UIdriver.py.diff?cvsroot=OldCVS&tr1=1.213&tr2=1.214&r1=text&r2=text

Patches:
Index: gnue/forms/src/uidrivers/wx/UIdriver.py
diff -c gnue/forms/src/uidrivers/wx/UIdriver.py:1.213 
gnue/forms/src/uidrivers/wx/UIdriver.py:1.214
*** gnue/forms/src/uidrivers/wx/UIdriver.py:1.213       Sun Nov 17 18:39:35 2002
--- gnue/forms/src/uidrivers/wx/UIdriver.py     Fri Nov 22 00:39:17 2002
***************
*** 688,702 ****
      object = _IdToGFObj[widget.GetId()]
      try:
        if object.style == "dropdown" and \
!           not object._allowedValues == widget._origAllowedValues:
          try:
            # Not in wx 2.2.x
            widget.Freeze()
          except AttributeError:
            pass
!         widget._origAllowedValues = object._allowedValues
          widget.Clear()
!         for value in object._allowedValuesDescr:
            widget.Append(value)
          try:
            # Not in wx 2.2.x
--- 688,702 ----
      object = _IdToGFObj[widget.GetId()]
      try:
        if object.style == "dropdown" and \
!           not object._field._allowedValues == widget._origAllowedValues:
          try:
            # Not in wx 2.2.x
            widget.Freeze()
          except AttributeError:
            pass
!         widget._origAllowedValues = object._field._allowedValues
          widget.Clear()
!         for value in object._field._allowedValuesDescr:
            widget.Append(value)
          try:
            # Not in wx 2.2.x
***************
*** 895,908 ****
  
      if style == 'dropdown':
        if event.initialize:
!         choices = object.allowedValues()[1]
        else:
          choices = [""]
  
        newWidget = wxComboBox(event.container, -1, "",defaultPoint,
                                wxSize(self.itemWidth,self.itemHeight),
                               choices, wxCB_DROPDOWN,) # |wxWANTS_CHARS,)
!       newWidget._origAllowedValues = object._allowedValues
  
        newWidget.SetValue("")
        EVT_COMBOBOX(newWidget, newWidget.GetId(), self.comboHandler)
--- 895,908 ----
  
      if style == 'dropdown':
        if event.initialize:
!         choices = object._field.allowedValues()[1]
        else:
          choices = [""]
  
        newWidget = wxComboBox(event.container, -1, "",defaultPoint,
                                wxSize(self.itemWidth,self.itemHeight),
                               choices, wxCB_DROPDOWN,) # |wxWANTS_CHARS,)
!       newWidget._origAllowedValues = object._field._allowedValues
  
        newWidget.SetValue("")
        EVT_COMBOBOX(newWidget, newWidget.GetId(), self.comboHandler)