|
From: Kevin A. <ka...@us...> - 2004-04-30 23:29:53
|
Update of /cvsroot/pythoncard/PythonCard In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3533 Modified Files: event.py Log Message: updated event classes with binding and id, new classes to support Button... Index: event.py =================================================================== RCS file: /cvsroot/pythoncard/PythonCard/event.py,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** event.py 29 Apr 2004 23:59:23 -0000 1.56 --- event.py 30 Apr 2004 23:29:44 -0000 1.57 *************** *** 327,336 **** ! class GainFocusEvent( Event ) : name = 'gainFocus' ! class LoseFocusEvent( Event ) : name = 'loseFocus' --- 327,354 ---- ! # mixin for MouseClickEvent, SelectEvent ! # the classname can be changed, I just didn't want ! # to conflict with CommandEvent above ! class CommandTypeEvent: ! pass ! ! # mixin for RestoreEvent, DeactivateEvent, MouseDragEvent ! # CloseFieldEvent isn't virtual because ! # LoseFocus is still sent ! # probably need a better descriptor than "virtual" or "instead of" ! class InsteadOfTypeEvent: ! pass ! ! ! class GainFocusEvent(Event): name = 'gainFocus' + binding = wx.EVT_SET_FOCUS + id = wx.wxEVT_SET_FOCUS ! class LoseFocusEvent(Event): name = 'loseFocus' + binding = wx.EVT_KILL_FOCUS + id = wx.wxEVT_KILL_FOCUS *************** *** 355,359 **** ! class SelectEvent( Event ) : name = 'select' --- 373,377 ---- ! class SelectEvent(Event, CommandTypeEvent): name = 'select' *************** *** 395,403 **** class TimerEvent(Event): name = 'timer' ! class MouseClickEvent( Event ) : name = 'mouseClick' class ButtonMouseClickEvent( Event ) : name = 'mouseClick' --- 413,425 ---- class TimerEvent(Event): name = 'timer' + binding = wx.EVT_TIMER + id = wx.wxEVT_TIMER ! class MouseClickEvent(Event, CommandTypeEvent): name = 'mouseClick' + # obsolete transition test + # can be deleted later class ButtonMouseClickEvent( Event ) : name = 'mouseClick' *************** *** 406,462 **** command = True ! class MouseDoubleClickEvent( Event ) : name = 'mouseDoubleClick' ! class MouseDownEvent( Event ) : name = 'mouseDown' ! class MouseUpEvent( Event ) : name = 'mouseUp' ! class MouseMiddleDownEvent( Event ) : name = 'mouseMiddleDown' ! class MouseMiddleUpEvent( Event ) : name = 'mouseMiddleUp' ! class MouseMiddleDoubleClickEvent( Event ) : name = 'mouseMiddleDoubleClick' ! class MouseContextDownEvent( Event ) : name = 'mouseContextDown' ! class MouseContextUpEvent( Event ) : name = 'mouseContextUp' ! class MouseContextClickEvent( Event ) : ! name = 'mouseContextClick' ! class MouseContextDoubleClickEvent( Event ) : name = 'mouseContextDoubleClick' ! class MouseEnterEvent( Event ) : name = 'mouseEnter' ! class MouseLeaveEvent( Event ) : name = 'mouseLeave' ! class MouseMoveEvent( Event ) : name = 'mouseMove' ! class MouseDragEvent( Event ) : name = 'mouseDrag' ! class CalendarMouseDoubleClickEvent(Event): --- 428,509 ---- command = True ! class MouseDoubleClickEvent(Event): name = 'mouseDoubleClick' + binding = wx.EVT_LEFT_DCLICK + id = wx.wxEVT_LEFT_DCLICK ! class MouseDownEvent(Event): name = 'mouseDown' + binding = wx.EVT_LEFT_DOWN + id = wx.wxEVT_LEFT_DOWN ! class MouseUpEvent(Event): name = 'mouseUp' + binding = wx.EVT_LEFT_UP + id = wx.wxEVT_LEFT_UP ! class MouseMiddleDownEvent(Event): name = 'mouseMiddleDown' + binding = wx.EVT_MIDDLE_DOWN + id = wx.wxEVT_MIDDLE_DOWN ! class MouseMiddleUpEvent(Event): name = 'mouseMiddleUp' + binding = wx.EVT_MIDDLE_UP + id = wx.wxEVT_MIDDLE_UP ! class MouseMiddleDoubleClickEvent(Event): name = 'mouseMiddleDoubleClick' + binding = wx.EVT_MIDDLE_DCLICK + id = wx.wxEVT_MIDDLE_DCLICK ! class MouseContextDownEvent(Event): name = 'mouseContextDown' + binding = wx.EVT_RIGHT_DOWN + id = wx.wxEVT_RIGHT_DOWN ! class MouseContextUpEvent(Event): name = 'mouseContextUp' + binding = wx.EVT_RIGHT_UP + id = wx.wxEVT_RIGHT_UP ! ##class MouseContextClickEvent( Event ) : ! ## name = 'mouseContextClick' ! class MouseContextDoubleClickEvent(Event): name = 'mouseContextDoubleClick' + binding = wx.EVT_RIGHT_DCLICK + id = wx.wxEVT_RIGHT_DCLICK ! class MouseEnterEvent(Event): name = 'mouseEnter' + binding = wx.EVT_ENTER_WINDOW + id = wx.wxEVT_ENTER_WINDOW ! class MouseLeaveEvent(Event): name = 'mouseLeave' + binding = wx.EVT_LEAVE_WINDOW + id = wx.wxEVT_LEAVE_WINDOW ! class MouseMoveEvent(Event): name = 'mouseMove' + binding = wx.EVT_MOTION + id = wx.wxEVT_MOTION ! class MouseDragEvent(Event, InsteadOfTypeEvent): name = 'mouseDrag' ! binding = wx.EVT_MOTION ! id = wx.NewEventType() class CalendarMouseDoubleClickEvent(Event): *************** *** 541,544 **** --- 588,614 ---- ] + NEW_MOUSE_EVENTS = ( + MouseDoubleClickEvent, + MouseDownEvent, + MouseUpEvent, + MouseMiddleDownEvent, + MouseMiddleUpEvent, + MouseMiddleDoubleClickEvent, + MouseContextDownEvent, + MouseContextUpEvent, + MouseContextDoubleClickEvent, + MouseEnterEvent, + MouseLeaveEvent, + MouseMoveEvent, + MouseDragEvent, + ) + + FOCUS_EVENTS = ( + GainFocusEvent, + LoseFocusEvent, + ) + + WIDGET_EVENTS = NEW_MOUSE_EVENTS + FOCUS_EVENTS + (TimerEvent,) + # System Events *************** *** 553,668 **** class CloseFieldEvent(Event): name = 'closeField' - ##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 class EventQueue : --- 623,630 ---- class CloseFieldEvent(Event): name = 'closeField' + binding = EVT_CLOSE_FIELD + id = wxEVT_CLOSE_FIELD class EventQueue : |