gnue-forms/src GFInstance.py uidrivers/wx/widge...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-forms
Branch:         
Changes by:     Jason Cater <address@hidden>    03/08/05 15:47:04

Modified files:
        src            : GFInstance.py 
        src/uidrivers/wx/widgets/form: wrappers.py 

Log message:
        fixed notebook-tab changing bug where focus wouldn't shift to a field 
on the new page

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/GFInstance.py.diff?tr1=1.114&tr2=1.115&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-forms/src/uidrivers/wx/widgets/form/wrappers.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text

Patches:
Index: gnue-forms/src/GFInstance.py
diff -c gnue-forms/src/GFInstance.py:1.114 gnue-forms/src/GFInstance.py:1.115
*** gnue-forms/src/GFInstance.py:1.114  Mon Jun 16 17:32:29 2003
--- gnue-forms/src/GFInstance.py        Tue Aug  5 15:47:04 2003
***************
*** 582,588 ****
    def gotoPage(self,event):
      if not event._form.endEditing():
        return
!     event._form.findAndChangeFocus(event._form._layout._pageList[event.data])
      self.dispatchEvent('gotoENTRY',object=event._form._currentEntry, 
_form=event._form)
      self.updateStatus(event._form)
  
--- 582,589 ----
    def gotoPage(self,event):
      if not event._form.endEditing():
        return
!     newpage = event._form._layout._pageList[event.data]
!     event._form.findAndChangeFocus(newpage)
      self.dispatchEvent('gotoENTRY',object=event._form._currentEntry, 
_form=event._form)
      self.updateStatus(event._form)
  
Index: gnue-forms/src/uidrivers/wx/widgets/form/wrappers.py
diff -c gnue-forms/src/uidrivers/wx/widgets/form/wrappers.py:1.11 
gnue-forms/src/uidrivers/wx/widgets/form/wrappers.py:1.12
*** gnue-forms/src/uidrivers/wx/widgets/form/wrappers.py:1.11   Thu Apr  3 
23:04:09 2003
--- gnue-forms/src/uidrivers/wx/widgets/form/wrappers.py        Tue Aug  5 
15:47:04 2003
***************
*** 146,162 ****
      self._fitted = 1
  
  
    def notebookTabHandler(self,event):
      if event.GetEventType() == wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING:
!       #object = _IdToGFObj[_eventObjTowxWindow(event).GetId()]
!       action = None
!       if self.__notebookLoopTrap == 0:
!         action = events.Event('requestPAGE',event.GetSelection(), 
_form=self.form)
!         self.__notebookLoopTrap = 1
!       else:
!         self.__notebookLoopTrap = 0
!     if action:
!       self.uiform._eventHandler(action)
  
    def setPage(self, page):
      pageId = self._pageList.index(page)
--- 146,155 ----
      self._fitted = 1
  
  
+   # Catch the tab changes
    def notebookTabHandler(self,event):
      if event.GetEventType() == wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING:
!       self.uiform._eventHandler('requestPAGE',event.GetSelection(), 
_form=self.form)
  
    def setPage(self, page):
      pageId = self._pageList.index(page)