[Pythoncard-cvs] PythonCard debug.py,1.125,1.126 event.py,1.59,1.60 model.py,1.162,1.163

[Kevin A. <ka...@us...>]

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

Modified Files:
	debug.py event.py model.py 
Log Message:
switched to EventLog for logging events


Index: debug.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/debug.py,v
retrieving revision 1.125
retrieving revision 1.126
diff -C2 -d -r1.125 -r1.126
*** debug.py	29 Apr 2004 23:59:23 -0000	1.125
--- debug.py	1 May 2004 18:11:23 -0000	1.126
***************
*** 124,127 ****
--- 124,128 ----
  
          event.EventQueue().addListener( self )
+         event.EventLog.getInstance().addListener( self )
  
      def eventOccurred(self, eventAdapter):

Index: model.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/model.py,v
retrieving revision 1.162
retrieving revision 1.163
diff -C2 -d -r1.162 -r1.163
*** model.py	1 May 2004 16:26:00 -0000	1.162
--- model.py	1 May 2004 18:11:24 -0000	1.163
***************
*** 600,606 ****
          wx.PostEvent(self, wxLatentBackgroundBindEvent())
          # for some reason the Message Watcher isn't a listener yet
!         # so calling eventOccurred2 doesn't do anything
          #print event.EventQueue()._impl._listeners
!         #event.EventQueue()._impl.eventOccurred2('initialize', self.name)
  
          self._bindWindowEvents()
--- 600,606 ----
          wx.PostEvent(self, wxLatentBackgroundBindEvent())
          # for some reason the Message Watcher isn't a listener yet
!         # so calling EventLog doesn't do anything
          #print event.EventQueue()._impl._listeners
!         #event.EventLog.getInstance().log('initialize', self.name, True)
  
          self._bindWindowEvents()
***************
*** 761,765 ****
              # and will cause Python to crash.
              try:
!                 event.EventQueue().removeListener(self.stack.app.mw)
              except:
                  # already removed Message Watcher or it is not in use
--- 761,765 ----
              # and will cause Python to crash.
              try:
!                 event.EventLog.getInstance().removeListener(self.stack.app.mw)
              except:
                  # already removed Message Watcher or it is not in use
***************
*** 770,774 ****
          handler = self.eventIdToHandler.get(eventType, None)
          if handler:
!             event.EventQueue()._impl.eventOccurred2(eventName, self.name, True)
              if 0:
                  print "dispatching", handler._name
--- 770,774 ----
          handler = self.eventIdToHandler.get(eventType, None)
          if handler:
!             event.EventLog.getInstance().log(eventName, self.name, True)
              if 0:
                  print "dispatching", handler._name
***************
*** 788,792 ****
                  self._exiting = True
          else:
!             event.EventQueue()._impl.eventOccurred2(eventName, self.name, False)
              # hopefully this is all we need to do for "unused events"
              aWxEvent.Skip()
--- 788,792 ----
                  self._exiting = True
          else:
!             event.EventLog.getInstance().log(eventName, self.name, False)
              # hopefully this is all we need to do for "unused events"
              aWxEvent.Skip()

Index: event.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/event.py,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** event.py	1 May 2004 17:51:18 -0000	1.59
--- event.py	1 May 2004 18:11:24 -0000	1.60
***************
*** 6,9 ****
--- 6,10 ----
  import error
  import log
+ import singleton
  import sys, types
  import wx
***************
*** 632,636 ****
      id = wxEVT_CLOSE_FIELD
  
! class EventLog( Singleton, EventSource ) :
      """
      All events are reported to the EventLog.  Any interested
--- 633,637 ----
      id = wxEVT_CLOSE_FIELD
  
! class EventLog( singleton.Singleton, EventSource ) :
      """
      All events are reported to the EventLog.  Any interested
***************
*** 638,641 ****
--- 639,643 ----
      """
      def __init__( self ) :
+         singleton.Singleton.__init__( self )
          EventSource.__init__( self )
  
***************
*** 646,649 ****
--- 648,654 ----
          self._notifyEventListeners( ( eventName, sourceName, used ) )
  
+     def addListener( self, aEventListener ) :
+         self._addEventListener( aEventListener )
+ 
  
  class EventQueue :