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

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 02/11/17 18:39:35

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

Log message:
        removed debug print statements
        wx UI fix for checkboxes

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

Patches:
Index: gnue/forms/src/GFDisplayHandler.py
diff -c gnue/forms/src/GFDisplayHandler.py:1.37 
gnue/forms/src/GFDisplayHandler.py:1.38
*** gnue/forms/src/GFDisplayHandler.py:1.37     Sun Nov 17 18:16:41 2002
--- gnue/forms/src/GFDisplayHandler.py  Sun Nov 17 18:39:35 2002
***************
*** 71,78 ****
      return self.value
  
  
!   def getDisplay(self):
!     return self.display
  
  
    def getDisplayFiller(self, value):
--- 71,78 ----
      return self.value
  
  
! ##   def getDisplay(self):
! ##     return self.display
  
  
    def getDisplayFiller(self, value):
***************
*** 87,94 ****
      # TODO: would be the corrected patch line commented out.
      # if (self.handleCR and type(self.display)=='str'):
      
-     print "Refreshing with %s" % self.display
- 
      if self.handleCR:
        self.dispatchEvent(events.Event('updateEntryEditor',
             object = self.entry,
--- 87,92 ----
***************
*** 134,141 ****
      if not self.editing:
        return
  
-     print "Ending edit!"
- 
      if not self._loadedAllowedValues:
        self.entry.allowedValues()
        self._loadedAllowedValues = 1
--- 132,137 ----
***************
*** 767,778 ****
    def _buildDisplayHelper(self, value, editing):
      return self._sanitizeValue(value)
  
!   def getDisplay(self):
!     return self.display
  
  
    def toggle(self, event):
-     print "Toggling from %s to %s" % (self.work, not self.work)
      if event.data == None:
        self.work = not self.work
      else:
--- 763,773 ----
    def _buildDisplayHelper(self, value, editing):
      return self._sanitizeValue(value)
  
! ##  def getDisplay(self):
! ##    return self.display
  
  
    def toggle(self, event):
      if event.data == None:
        self.work = not self.work
      else:
Index: gnue/forms/src/uidrivers/wx/UIdriver.py
diff -c gnue/forms/src/uidrivers/wx/UIdriver.py:1.212 
gnue/forms/src/uidrivers/wx/UIdriver.py:1.213
*** gnue/forms/src/uidrivers/wx/UIdriver.py:1.212       Sun Nov 17 16:54:48 2002
--- gnue/forms/src/uidrivers/wx/UIdriver.py     Sun Nov 17 18:39:35 2002
***************
*** 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:
--- 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:
***************
*** 958,985 ****
        
        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])):
!       #    if self._formToUI[key][count].GetId() == object.GetId():
!       #      self.dispatchEvent(events.Event('requestFOCUS',key))
!       #      eventdata = [key, object.GetValue()]
!       #      self.dispatchEvent(events.Event('requestJUMPRECORD',count - 
key._visibleIndex))
!       #      self.dispatchEvent(events.Event('requestTOGGLECHKBOX',eventdata))
!       #      break
! 
!       #if action:
!       #  self.dispatchEvent(action)
! 
! 
  
  #
  # UIForm
--- 958,965 ----
        
        gfObject     = _IdToGFObj[id]
        eventdata = [gfObject, event.GetString()]
!       action = events.Event('requestTOGGLECHKBOX')
!       self._eventHandler(action)
  
  #
  # UIForm
***************
*** 1148,1155 ****
        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):
--- 1128,1135 ----
        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):