[Pythoncard-cvs] PythonCard event.py,1.54,1.55

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

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

Modified Files:
	event.py 
Log Message:
bye bye EventMap, I comment thee out


Index: event.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/event.py,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** event.py	27 Apr 2004 16:30:50 -0000	1.54
--- event.py	27 Apr 2004 17:22:28 -0000	1.55
***************
*** 157,162 ****
  
      def getName( self ) :
!         global eventMap
!         return eventMap.classToName( self.__class__ )
  
      def sendTo( self, aOwner, aHandler ) :
--- 157,163 ----
  
      def getName( self ) :
!         return self.name
! ##        global eventMap
! ##        return eventMap.classToName( self.__class__ )
  
      def sendTo( self, aOwner, aHandler ) :
***************
*** 551,662 ****
  
  
! class EventMap :
!     """
!     Maps Event classes to handler names for use in user code, and vice-versa.
!     """
!     def __init__( self ) :
!         
!         self._table = [
!             GainFocusEvent,
!             LoseFocusEvent,
!             MouseClickEvent,
!             MouseDownEvent,
!             MouseUpEvent,
!             MouseDoubleClickEvent,
!             MouseContextDownEvent,
!             MouseContextUpEvent,
!             MouseContextDoubleClickEvent,
!             MouseMiddleDownEvent,
!             MouseMiddleUpEvent,
!             MouseMiddleDoubleClickEvent,
!             MouseEnterEvent,
!             MouseLeaveEvent,
!             MouseMoveEvent,
!             MouseDragEvent,
!             CommandEvent,
!             KeyPressEvent,
!             KeyDownEvent,
!             KeyUpEvent,
!             TextUpdateEvent,
!             TextEnterEvent,
!             SelectEvent,
!             MoveEvent,
!             SizeEvent,
!             CloseEvent,
!             ActivateEvent,
!             DeactivateEvent,
!             MinimizeEvent,
!             MaximizeEvent,
!             IdleEvent, 
!             TimerEvent,
!                    
!             #System Events
!             CloseFieldEvent,
! 
!             #Background initialization
!             InitializationEvent,
!             
!             # KEA 2004-04-26
!             # should the event map be updated as a component
!             # module is loaded so that say a Button adds
!             # its component-specific events to the EventMap
!             # just like it registers itself with the registry?
!             # Button events?
!             ButtonMouseClickEvent,
! 
!             # Calendar events
!             CalendarMouseDoubleClickEvent,
!             CalendarChangedEvent,
!             CalendarDayEvent,
!             CalendarMonthEvent,
!             CalendarYearEvent,
!             CalendarWeekDayHeaderEvent,
! 
!             # Tree and MultiColumnList events
!             MouseContextClickEvent,
!             ItemFocusedEvent,
!             ItemActivatedEvent,
!             ItemExpandedEvent,
!             ItemExpandingEvent,
!             SelectionChangedEvent,
!             SelectionChangingEvent,
!             ListColumnClickEvent,
! 
!             IEHtmlTitleChangeEvent,
!             IEHtmlStatusTextChangeEvent,
!             IEHtmlDocumentCompleteEvent,
!         ]
!         
!         self._classToNameMap = {}   
!         self._nameToClassMap = {}
!         self._createClassToNameMap() 
!         self._createNameToClassMap()
!     
!     def _findEventClasses( self ) :
!         """
!         Find all of the subclasses of Event in 
!         this module and put them in an array.
!         """
!         for item in __dict__.itervalues():
!             if isinstance(item, types.ClassType):
!                 if issubclass(item, Event):
!                     self._table.append(item)
!             
!     def _createClassToNameMap( self ) :
!         for clazz in self._table :
!             self._classToNameMap[ clazz ] = clazz.name
!     
!     def _createNameToClassMap( self ) :
!         for clazz in self._table :
!             self._nameToClassMap[ clazz.name ] = clazz
!     
!     def classToName( self, aEventClass ) :
!         return self._classToNameMap[ aEventClass ]
!     
!     def nameToClass( self, aName ) :
!         return self._nameToClassMap[ aName ]
!     
!     def __repr__( self ) :
!         return str( self._classToNameMap ) + '\n\n' + str( self._nameToClassMap )
      
  queue = None
--- 552,663 ----
  
  
! ##class EventMap :
! ##    """
! ##    Maps Event classes to handler names for use in user code, and vice-versa.
! ##    """
! ##    def __init__( self ) :
! ##        
! ##        self._table = [
! ##            GainFocusEvent,
! ##            LoseFocusEvent,
! ##            MouseClickEvent,
! ##            MouseDownEvent,
! ##            MouseUpEvent,
! ##            MouseDoubleClickEvent,
! ##            MouseContextDownEvent,
! ##            MouseContextUpEvent,
! ##            MouseContextDoubleClickEvent,
! ##            MouseMiddleDownEvent,
! ##            MouseMiddleUpEvent,
! ##            MouseMiddleDoubleClickEvent,
! ##            MouseEnterEvent,
! ##            MouseLeaveEvent,
! ##            MouseMoveEvent,
! ##            MouseDragEvent,
! ##            CommandEvent,
! ##            KeyPressEvent,
! ##            KeyDownEvent,
! ##            KeyUpEvent,
! ##            TextUpdateEvent,
! ##            TextEnterEvent,
! ##            SelectEvent,
! ##            MoveEvent,
! ##            SizeEvent,
! ##            CloseEvent,
! ##            ActivateEvent,
! ##            DeactivateEvent,
! ##            MinimizeEvent,
! ##            MaximizeEvent,
! ##            IdleEvent, 
! ##            TimerEvent,
! ##                   
! ##            #System Events
! ##            CloseFieldEvent,
! ##
! ##            #Background initialization
! ##            InitializationEvent,
! ##            
! ##            # KEA 2004-04-26
! ##            # should the event map be updated as a component
! ##            # module is loaded so that say a Button adds
! ##            # its component-specific events to the EventMap
! ##            # just like it registers itself with the registry?
! ##            # Button events?
! ##            ButtonMouseClickEvent,
! ##
! ##            # Calendar events
! ##            CalendarMouseDoubleClickEvent,
! ##            CalendarChangedEvent,
! ##            CalendarDayEvent,
! ##            CalendarMonthEvent,
! ##            CalendarYearEvent,
! ##            CalendarWeekDayHeaderEvent,
! ##
! ##            # Tree and MultiColumnList events
! ##            MouseContextClickEvent,
! ##            ItemFocusedEvent,
! ##            ItemActivatedEvent,
! ##            ItemExpandedEvent,
! ##            ItemExpandingEvent,
! ##            SelectionChangedEvent,
! ##            SelectionChangingEvent,
! ##            ListColumnClickEvent,
! ##
! ##            IEHtmlTitleChangeEvent,
! ##            IEHtmlStatusTextChangeEvent,
! ##            IEHtmlDocumentCompleteEvent,
! ##        ]
! ##        
! ##        self._classToNameMap = {}   
! ##        self._nameToClassMap = {}
! ##        self._createClassToNameMap() 
! ##        self._createNameToClassMap()
! ##    
! ##    def _findEventClasses( self ) :
! ##        """
! ##        Find all of the subclasses of Event in 
! ##        this module and put them in an array.
! ##        """
! ##        for item in __dict__.itervalues():
! ##            if isinstance(item, types.ClassType):
! ##                if issubclass(item, Event):
! ##                    self._table.append(item)
! ##            
! ##    def _createClassToNameMap( self ) :
! ##        for clazz in self._table :
! ##            self._classToNameMap[ clazz ] = clazz.name
! ##    
! ##    def _createNameToClassMap( self ) :
! ##        for clazz in self._table :
! ##            self._nameToClassMap[ clazz.name ] = clazz
! ##    
! ##    def classToName( self, aEventClass ) :
! ##        return self._classToNameMap[ aEventClass ]
! ##    
! ##    def nameToClass( self, aName ) :
! ##        return self._nameToClassMap[ aName ]
! ##    
! ##    def __repr__( self ) :
! ##        return str( self._classToNameMap ) + '\n\n' + str( self._nameToClassMap )
      
  queue = None
***************
*** 697,703 ****
  # Module Initialization
  
! # RDS: A nasty global - I'm a BAD MONKEY! 
! 
! eventMap = EventMap()
  
  
--- 698,704 ----
  # Module Initialization
  
! ### RDS: A nasty global - I'm a BAD MONKEY! 
! ##
! ##eventMap = EventMap()