gnue/forms/src/uidrivers/win32/widgets _base.py...

[Bajusz Tamás]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Bajusz Tamás <address@hidden>   03/05/04 18:15:08

Modified files:
        forms/src/uidrivers/win32/widgets: _base.py entry.py 

Log message:
        refresh dropdown when foreign key changes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/widgets/_base.py.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/widgets/entry.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: gnue/forms/src/uidrivers/win32/widgets/_base.py
diff -c gnue/forms/src/uidrivers/win32/widgets/_base.py:1.14 
gnue/forms/src/uidrivers/win32/widgets/_base.py:1.15
*** gnue/forms/src/uidrivers/win32/widgets/_base.py:1.14        Fri May  2 
18:37:33 2003
--- gnue/forms/src/uidrivers/win32/widgets/_base.py     Sun May  4 18:15:07 2003
***************
*** 338,345 ****
  class Win32Entry(Win32Base):
      
    def SetValue(self, value):
-     gfObject = self._uiDriver._IdToGFObj[self._id]
      try:
        if gfObject.style == 'checkbox':
          if value:
            val = win32con.BST_CHECKED
--- 338,345 ----
  class Win32Entry(Win32Base):
      
    def SetValue(self, value):
      try:
+       gfObject = self._uiDriver._IdToGFObj[self._id]
        if gfObject.style == 'checkbox':
          if value:
            val = win32con.BST_CHECKED
***************
*** 453,478 ****
  #    widget.SetEvtHandlerEnabled(FALSE)
  
      # Check if foreign key changed
! #    gfObject = self._uiDriver._IdToGFObj[widget.GetId()]
! #    try:
! #      if gfObject.style == "dropdown" and \
! #          not gfObject._field._allowedValues == widget._origAllowedValues:
! #        try:
! #          # Not in wx 2.2.x
! #          widget.Freeze()
! #        except AttributeError:
! #          pass
! #        widget._origAllowedValues = gfObject._field._allowedValues
! #        widget.Clear()
  #        for value in gfObject._field._allowedValuesDescr:
! #          widget.Append(value)
! #        try:
! #          # Not in wx 2.2.x
! #          widget.Thaw()
! #        except AttributeError:
! #          pass
! #    except AttributeError:
! #      pass
  
      widget.SetValue(value)
      widget.Enable(enabled)
--- 453,470 ----
  #    widget.SetEvtHandlerEnabled(FALSE)
  
      # Check if foreign key changed
!     gfObject = self._uiDriver._IdToGFObj[widget.GetId()]
!     try:
!       if gfObject.style == "dropdown" and \
!           not gfObject._field._allowedValues == widget._origAllowedValues:
!         widget._origAllowedValues = gfObject._field._allowedValues
!         win32gui.SendMessage(widget.GetHwnd(), win32con.CB_RESETCONTENT, 0, 0)
  #        for value in gfObject._field._allowedValuesDescr:
!         for value in gfObject._field.allowedValues()[1]:
!           win32gui.SendMessage(widget.GetHwnd(), win32con.CB_ADDSTRING, 0, 
value)
!         widget.SetValue("")
!     except AttributeError:
!       pass
  
      widget.SetValue(value)
      widget.Enable(enabled)
Index: gnue/forms/src/uidrivers/win32/widgets/entry.py
diff -c gnue/forms/src/uidrivers/win32/widgets/entry.py:1.5 
gnue/forms/src/uidrivers/win32/widgets/entry.py:1.6
*** gnue/forms/src/uidrivers/win32/widgets/entry.py:1.5 Tue Apr 15 18:21:04 2003
--- gnue/forms/src/uidrivers/win32/widgets/entry.py     Sun May  4 18:15:07 2003
***************
*** 84,91 ****
                          event.container, getNextId())
  
      if ostyle == 'dropdown':
!       for item in object._field.allowedValues()[1]:
          win32gui.SendMessage(newWidget.GetHwnd(), win32con.CB_ADDSTRING, 0, 
item)
  
      self._eventHandler = event.eventHandler
      if event.initialize:
--- 84,98 ----
                          event.container, getNextId())
  
      if ostyle == 'dropdown':
!       if event.initialize:
!         choices = object._field.allowedValues()[1]
!       else:
!         choices = [""]
!       for item in choices:
          win32gui.SendMessage(newWidget.GetHwnd(), win32con.CB_ADDSTRING, 0, 
item)
+       if event.initialize:
+         newWidget._origAllowedValues = object._field._allowedValues
+         newWidget.SetValue("")
  
      self._eventHandler = event.eventHandler
      if event.initialize: