[Pythoncard-cvs] PythonCard menu.py,1.30,1.31 debug.py,1.126,1.127 event.py,1.60,1.61

[Rowland S. <mon...@us...>]

Update of /cvsroot/pythoncard/PythonCard
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4329

Modified Files:
	menu.py debug.py event.py 
Log Message:
Made the event.EventSource interface public and changed
all references to EventSource methods.

Index: debug.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/debug.py,v
retrieving revision 1.126
retrieving revision 1.127
diff -C2 -d -r1.126 -r1.127
*** debug.py	1 May 2004 18:11:23 -0000	1.126
--- debug.py	1 May 2004 18:47:50 -0000	1.127
***************
*** 124,132 ****
  
          event.EventQueue().addListener( self )
!         event.EventLog.getInstance().addListener( self )
  
      def eventOccurred(self, eventAdapter):
          if isinstance(eventAdapter, tuple):
!             # new way hack to stay compatible with one arg _notifyEventListeners
              eventName, sourceName, used = eventAdapter
              if eventName == event.IdleEvent.name:
--- 124,132 ----
  
          event.EventQueue().addListener( self )
!         event.EventLog.getInstance().addEventListener( self )
  
      def eventOccurred(self, eventAdapter):
          if isinstance(eventAdapter, tuple):
!             # new way hack to stay compatible with one arg notifyEventListeners
              eventName, sourceName, used = eventAdapter
              if eventName == event.IdleEvent.name:

Index: event.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/event.py,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** event.py	1 May 2004 18:11:24 -0000	1.60
--- event.py	1 May 2004 18:47:50 -0000	1.61
***************
*** 257,261 ****
          self._listeners = []
          
!     def _addEventListener(self, listener):
          """
          Add an EventListener as an observer of this object.
--- 257,261 ----
          self._listeners = []
          
!     def addEventListener(self, listener):
          """
          Add an EventListener as an observer of this object.
***************
*** 268,275 ****
      # KEA 2004-04-24
      # need this to disconnect the Message Watcher
!     def _removeEventListener(self, listener):
          self._listeners.remove(listener)
  
!     def _notifyEventListeners( self, event ) :
          """
          Notify all of our EventListeners that an event has occured.
--- 268,275 ----
      # KEA 2004-04-24
      # need this to disconnect the Message Watcher
!     def removeEventListener(self, listener):
          self._listeners.remove(listener)
  
!     def notifyEventListeners( self, event ) :
          """
          Notify all of our EventListeners that an event has occured.
***************
*** 646,654 ****
          Broadcast the event to all listeners.
          """
!         self._notifyEventListeners( ( eventName, sourceName, used ) )
! 
!     def addListener( self, aEventListener ) :
!         self._addEventListener( aEventListener )
! 
  
  class EventQueue :
--- 646,651 ----
          Broadcast the event to all listeners.
          """
!         self.notifyEventListeners( ( eventName, sourceName, used ) )
!         
  
  class EventQueue :
***************
*** 667,674 ****
  
          def eventOccurred( self, aEvent ) :
!             self._notifyEventListeners( aEvent )
  
          def eventOccurred2(self, eventName, sourceName, used):
!             self._notifyEventListeners((eventName, sourceName, used))
  
      def __init__( self ) :
--- 664,671 ----
  
          def eventOccurred( self, aEvent ) :
!             self.notifyEventListeners( aEvent )
  
          def eventOccurred2(self, eventName, sourceName, used):
!             self.notifyEventListeners((eventName, sourceName, used))
  
      def __init__( self ) :
***************
*** 677,689 ****
  
      def listenTo( self, aEventSource ) :
!         aEventSource._addEventListener(self._impl)
  
      def addListener( self, aEventListener ) :
!         self._impl._addEventListener(aEventListener)
  
      # KEA 2004-04-24
      # need this to disconnect the Message Watcher
      def removeListener(self, aEventListener):
!         self._impl._removeEventListener(aEventListener)
  
      
--- 674,686 ----
  
      def listenTo( self, aEventSource ) :
!         aEventSource.addEventListener(self._impl)
  
      def addListener( self, aEventListener ) :
!         self._impl.addEventListener(aEventListener)
  
      # KEA 2004-04-24
      # need this to disconnect the Message Watcher
      def removeListener(self, aEventListener):
!         self._impl.removeEventListener(aEventListener)
  
      
***************
*** 732,736 ****
          EventSource.__init__(self)
          self._scriptable = aScriptable
!         aEventSource._addEventListener(self)
          EventQueue().listenTo(self)
  
--- 729,733 ----
          EventSource.__init__(self)
          self._scriptable = aScriptable
!         aEventSource.addEventListener(self)
          EventQueue().listenTo(self)
  
***************
*** 786,790 ****
          # indicating whether the Event was used or not.
          adapter = EventAdapter(self, aEvent, used)
!         self._notifyEventListeners(adapter)
          # KEA 2004-04-26
          # remove reference to event after notifying the listeners
--- 783,787 ----
          # indicating whether the Event was used or not.
          adapter = EventAdapter(self, aEvent, used)
!         self.notifyEventListeners(adapter)
          # KEA 2004-04-26
          # remove reference to event after notifying the listeners
***************
*** 987,991 ****
                      evt = MouseDragEvent(self._component)
              evt._nativeEvent = aWxEvent
!             self._component._notifyEventListeners(evt)
              aWxEvent.Skip()
              
--- 984,988 ----
                      evt = MouseDragEvent(self._component)
              evt._nativeEvent = aWxEvent
!             self._component.notifyEventListeners(evt)
              aWxEvent.Skip()
              

Index: menu.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/menu.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** menu.py	18 Apr 2004 00:34:50 -0000	1.30
--- menu.py	1 May 2004 18:47:50 -0000	1.31
***************
*** 233,237 ****
          # added missing setNativeEvent
          evt.setNativeEvent(aWxMenuEvent)
!         item._notifyEventListeners(evt)
         
  ##    def parseMenus(self, aParent, aResource):
--- 233,237 ----
          # added missing setNativeEvent
          evt.setNativeEvent(aWxMenuEvent)
!         item.notifyEventListeners(evt)
         
  ##    def parseMenus(self, aParent, aResource):