[Pythoncard-cvs] PythonCard/components grid.py,1.11,1.12

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

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

Modified Files:
	grid.py 
Log Message:
changed Right to Context, added row, column, position attributes


Index: grid.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/components/grid.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** grid.py	6 Sep 2004 01:16:30 -0000	1.11
--- grid.py	9 Sep 2004 20:04:23 -0000	1.12
***************
*** 14,18 ****
      def decorate(self, aWxEvent, source):
          aWxEvent = event.Event.decorate(self, aWxEvent, source)
!         # aWxEvent.item = aWxEvent.GetItem()
          return aWxEvent
          
--- 14,23 ----
      def decorate(self, aWxEvent, source):
          aWxEvent = event.Event.decorate(self, aWxEvent, source)
!         try:
!             aWxEvent.row = aWxEvent.GetRow()
!             aWxEvent.column = aWxEvent.GetCol()
!             aWxEvent.position = aWxEvent.GetPosition()
!         except:
!             pass
          return aWxEvent
          
***************
*** 22,27 ****
      id = wx.grid.wxEVT_GRID_CELL_LEFT_CLICK
  
! class GridMouseRightClickEvent(GridEvent):
!     name = 'mouseRightClick'
      binding = wx.grid.EVT_GRID_CELL_RIGHT_CLICK
      id =  wx.grid.wxEVT_GRID_CELL_RIGHT_CLICK
--- 27,32 ----
      id = wx.grid.wxEVT_GRID_CELL_LEFT_CLICK
  
! class GridMouseContextClickEvent(GridEvent):
!     name = 'mouseContextClick'
      binding = wx.grid.EVT_GRID_CELL_RIGHT_CLICK
      id =  wx.grid.wxEVT_GRID_CELL_RIGHT_CLICK
***************
*** 32,37 ****
      id =  wx.grid.wxEVT_GRID_CELL_LEFT_DCLICK
  
! class GridMouseRightDoubleClickEvent(GridEvent):
!     name = 'mouseRightDoubleClick'
      binding = wx.grid.EVT_GRID_CELL_RIGHT_DCLICK
      id =  wx.grid.wxEVT_GRID_CELL_RIGHT_DCLICK
--- 37,42 ----
      id =  wx.grid.wxEVT_GRID_CELL_LEFT_DCLICK
  
! class GridMouseContextDoubleClickEvent(GridEvent):
!     name = 'mouseContextDoubleClick'
      binding = wx.grid.EVT_GRID_CELL_RIGHT_DCLICK
      id =  wx.grid.wxEVT_GRID_CELL_RIGHT_DCLICK
***************
*** 42,47 ****
      id = wx.grid.wxEVT_GRID_LABEL_LEFT_CLICK
  
! class GridLabelRightClickEvent(GridEvent):
!     name = 'labelRightClick'
      binding = wx.grid.EVT_GRID_LABEL_RIGHT_CLICK
      id =  wx.grid.wxEVT_GRID_LABEL_RIGHT_CLICK
--- 47,52 ----
      id = wx.grid.wxEVT_GRID_LABEL_LEFT_CLICK
  
! class GridLabelContextClickEvent(GridEvent):
!     name = 'labelContextClick'
      binding = wx.grid.EVT_GRID_LABEL_RIGHT_CLICK
      id =  wx.grid.wxEVT_GRID_LABEL_RIGHT_CLICK
***************
*** 52,57 ****
      id =  wx.grid.wxEVT_GRID_LABEL_LEFT_DCLICK
  
! class GridLabelRightDoubleClickEvent(GridEvent):
!     name = 'labelRightDoubleClick'
      binding = wx.grid.EVT_GRID_LABEL_RIGHT_DCLICK
      id =  wx.grid.wxEVT_GRID_LABEL_RIGHT_DCLICK
--- 57,62 ----
      id =  wx.grid.wxEVT_GRID_LABEL_LEFT_DCLICK
  
! class GridLabelContextDoubleClickEvent(GridEvent):
!     name = 'labelContextDoubleClick'
      binding = wx.grid.EVT_GRID_LABEL_RIGHT_DCLICK
      id =  wx.grid.wxEVT_GRID_LABEL_RIGHT_DCLICK
***************
*** 100,110 ****
  GridEvents = (#GridSelectEvent, 
                  GridMouseClickEvent,
!                 GridMouseRightClickEvent,
                  GridMouseDoubleClickEvent,
!                 GridMouseRightDoubleClickEvent,
                  GridLabelClickEvent,
!                 GridLabelRightClickEvent,
                  GridLabelDoubleClickEvent,
!                 GridLabelRightDoubleClickEvent,
                  GridRowSizeEvent,
                  GridColSizeEvent,
--- 105,115 ----
  GridEvents = (#GridSelectEvent, 
                  GridMouseClickEvent,
!                 GridMouseContextClickEvent,
                  GridMouseDoubleClickEvent,
!                 GridMouseContextDoubleClickEvent,
                  GridLabelClickEvent,
!                 GridLabelContextClickEvent,
                  GridLabelDoubleClickEvent,
!                 GridLabelContextDoubleClickEvent,
                  GridRowSizeEvent,
                  GridColSizeEvent,
***************
*** 127,130 ****
--- 132,139 ----
          }
          widget.WidgetSpec.__init__( self, 'Grid', 'Widget', events, attributes )
+         # might need to remove these events, not sure yet
+         #self._events.remove(event.MouseDoubleClickEvent)
+         #self._events.remove(event.MouseContextClickEvent)
+         #self._events.remove(event.MouseContextDoubleClickEvent)