gnue/forms/src GFDisplayHandler.py GFInstance.p...

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 02/11/17 16:54:48

Modified files:
        forms/src      : GFDisplayHandler.py GFInstance.py 
        forms/src/GFObjects: GFEntry.py 
        forms/src/uidrivers/_base: UIdriver.py 
        forms/src/uidrivers/wx: UIdriver.py 

Log message:
        partial fix for checkboxes, commiting in prep to feed code into our AI 
unit

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFDisplayHandler.py.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFInstance.py.diff?tr1=1.65&tr2=1.66&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFEntry.py.diff?tr1=1.76&tr2=1.77&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/_base/UIdriver.py.diff?tr1=1.76&tr2=1.77&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/UIdriver.py.diff?tr1=1.211&tr2=1.212&r1=text&r2=text

Patches:
Index: gnue/forms/src/GFDisplayHandler.py
diff -c gnue/forms/src/GFDisplayHandler.py:1.35 
gnue/forms/src/GFDisplayHandler.py:1.36
*** gnue/forms/src/GFDisplayHandler.py:1.35     Thu Oct 24 00:39:02 2002
--- gnue/forms/src/GFDisplayHandler.py  Sun Nov 17 16:54:48 2002
***************
*** 746,752 ****
      else:
        self.value = value and 1 or 0
  
!     self.modified = 0
      self._buildDisplay()
  
  
--- 746,752 ----
      else:
        self.value = value and 1 or 0
  
!     self.modified = 1
      self._buildDisplay()
  
  
Index: gnue/forms/src/GFInstance.py
diff -c gnue/forms/src/GFInstance.py:1.65 gnue/forms/src/GFInstance.py:1.66
*** gnue/forms/src/GFInstance.py:1.65   Fri Nov  8 10:55:03 2002
--- gnue/forms/src/GFInstance.py        Sun Nov 17 16:54:48 2002
***************
*** 158,163 ****
--- 158,164 ----
  
        # If the display will need to be refreshed,
        # then the proxied event should set this to 1
+       # TODO: Maybe this needs set to 0 and the handlers adjusted - jst
        event.refreshDisplay = 1
  
        # Pass off the event to the current entry's event handler
Index: gnue/forms/src/GFObjects/GFEntry.py
diff -c gnue/forms/src/GFObjects/GFEntry.py:1.76 
gnue/forms/src/GFObjects/GFEntry.py:1.77
*** gnue/forms/src/GFObjects/GFEntry.py:1.76    Mon Nov  4 01:02:00 2002
--- gnue/forms/src/GFObjects/GFEntry.py Sun Nov 17 16:54:48 2002
***************
*** 287,292 ****
--- 287,293 ----
      #if self.typecast == "number" and value != None:
      #  value = float(value)
  
+     print "set widget to ",value, type(value)
      if self._block.mode == 'query':
        self._block._queryValues[self] = value
  
Index: gnue/forms/src/uidrivers/_base/UIdriver.py
diff -c gnue/forms/src/uidrivers/_base/UIdriver.py:1.76 
gnue/forms/src/uidrivers/_base/UIdriver.py:1.77
*** gnue/forms/src/uidrivers/_base/UIdriver.py:1.76     Thu Oct 24 00:39:02 2002
--- gnue/forms/src/uidrivers/_base/UIdriver.py  Sun Nov 17 16:54:48 2002
***************
*** 311,316 ****
--- 311,317 ----
    def updateEntryEditor(self, event):
      index = event.object._visibleIndex
      widget = self._formToUIWidget[event.object]
+     print "base", event.display
      widget.setValue(event.display, index)
      widget.setCursorPosition(event.cursor, index)
  
Index: gnue/forms/src/uidrivers/wx/UIdriver.py
diff -c gnue/forms/src/uidrivers/wx/UIdriver.py:1.211 
gnue/forms/src/uidrivers/wx/UIdriver.py:1.212
*** gnue/forms/src/uidrivers/wx/UIdriver.py:1.211       Fri Nov 15 16:50:21 2002
--- gnue/forms/src/uidrivers/wx/UIdriver.py     Sun Nov 17 16:54:48 2002
***************
*** 920,925 ****
--- 920,926 ----
                               wxSize(2*event.textWidth,event.textHeight),
                               wxNO_BORDER)
        newWidget.SetValue(0)
+       #EVT_CHECKBOX(newWidget, newWidget.GetId(), self.checkboxHandler)
  
      else: # Normal text box
        if event.initialize:
***************
*** 952,960 ****
--- 953,971 ----
  
    def checkboxHandler(self,event):
      if event.GetEventType() == wxEVT_COMMAND_CHECKBOX_CLICKED:
+       object = _eventObjTowxWindow(event)
+       id = object.GetId()
+       
+       gfObject     = _IdToGFObj[id]
+       eventdata = [gfObject, event.GetString()]
+ #      action = events.Event('requestTOGGLECHKBOX',object=gfObject,
+ #                            index=selection, text=event.GetString())
+ #                            self._eventHandler(action)
+                             
        # hack for swig shortcomming
        eo = event.GetEventObject()
        object = wxPyTypeCast(eo, 'wxCheckBox')
+ 
        # TODO: this doesn't work yet :)
        #for key in self._formToUI.keys():
        #  for count in range(len(self._formToUI[key])):
***************
*** 1137,1142 ****
--- 1148,1156 ----
        cursorPosition = textObject.GetInsertionPoint()
        
self._eventProcessor(events.Event('requestCURSORMOVE',position=cursorPosition))
  
+     if isinstance(screenWidget,wxCheckBox):
+       self._eventProcessor(events.Event('requestTOGGLECHKBOX'))
+       
      event.Skip()
      #  if isinstance(screenWidget,wxTextCtrl):
      #    event.SetTimestamp(0)