[Pythoncard-cvs] PythonCard/components bitmapcanvas.py,1.39,1.40 image.py,1.18,1.19 imagebutton.py,1.15,1.16

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

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

Modified Files:
	bitmapcanvas.py image.py imagebutton.py 
Log Message:
switched to new style event bindings, this fixes broken imagebutton events


Index: imagebutton.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/components/imagebutton.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** imagebutton.py	21 Apr 2004 03:45:00 -0000	1.15
--- imagebutton.py	2 May 2004 23:20:40 -0000	1.16
***************
*** 9,15 ****
  import button, image
  
  class ImageButtonSpec( widget.WidgetSpec ):
      def __init__(self):
!         events = [ event.MouseClickEvent ]
          attributes = {
              'file' : { 'presence' : 'mandatory' },
--- 9,19 ----
  import button, image
  
+ 
  class ImageButtonSpec( widget.WidgetSpec ):
      def __init__(self):
!         # KEA 2004-04-26
!         # test to use new event classes
!         events = [button.ButtonMouseClickEvent]
!         #events = [ event.MouseClickEvent ]
          attributes = {
              'file' : { 'presence' : 'mandatory' },
***************
*** 87,92 ****
              wx.EVT_ERASE_BACKGROUND( self, lambda evt: None)
  
!         adapter = button.ButtonEventBinding(self)
!         adapter.bindEvents()
  
      def _OnDestroy(self, event):
--- 91,97 ----
              wx.EVT_ERASE_BACKGROUND( self, lambda evt: None)
  
!         #adapter = button.ButtonEventBinding(self)
!         #adapter.bindEvents()
!         self._bindEvents(event.WIDGET_EVENTS + (button.ButtonMouseClickEvent,))
  
      def _OnDestroy(self, event):

Index: image.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/components/image.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** image.py	21 Apr 2004 03:45:00 -0000	1.18
--- image.py	2 May 2004 23:20:40 -0000	1.19
***************
*** 63,68 ****
          wx.EVT_WINDOW_DESTROY(self, self._OnDestroy)
          
!         adapter = event.DefaultEventBinding(self)
!         adapter.bindEvents()
  
      def _OnDestroy(self, event):
--- 63,69 ----
          wx.EVT_WINDOW_DESTROY(self, self._OnDestroy)
          
!         #adapter = event.DefaultEventBinding(self)
!         #adapter.bindEvents()
!         self._bindEvents(event.WIDGET_EVENTS)
  
      def _OnDestroy(self, event):

Index: bitmapcanvas.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/components/bitmapcanvas.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** bitmapcanvas.py	1 May 2004 16:26:01 -0000	1.39
--- bitmapcanvas.py	2 May 2004 23:20:40 -0000	1.40
***************
*** 117,122 ****
          self.clear()
          self._setForegroundColor((0,0,0))       # 'black'
!         adapter = event.DefaultEventBinding(self)
!         adapter.bindEvents()
  
      def _onDestroy(self, event):
--- 117,124 ----
          self.clear()
          self._setForegroundColor((0,0,0))       # 'black'
! 
!         #adapter = event.DefaultEventBinding(self)
!         #adapter.bindEvents()
!         self._bindEvents(event.WIDGET_EVENTS)
  
      def _onDestroy(self, event):