if self.GetNumberRows() > 0:
rect = self.CellToRect(0,col)
else:
- rect = wxRect()
+ rect = wx.Rect()
rect.height = self.GetColLabelSize()
rect.width = self.GetColSize(col)
if self.GetNumberCols() > 0:
rect = self.CellToRect(row,0)
else:
- rect = wxRect()
+ rect = wx.Rect()
rect.width = self.GetRowLabelSize()
rect.height = self.GetRowSize(row)
def OnPaint(self,evt):
dc = wx.PaintDC(self)
w,h = self.GetSize()
- dc.DrawBitmap(self.image, (0,0))
+ dc.DrawBitmap(self.image, 0,0)
dc.SetPen(wx.Pen(wx.BLACK,1,wx.SOLID))
dc.SetBrush(wx.TRANSPARENT_BRUSH)
- dc.DrawRectangle((0,0), (w,h))
+ dc.DrawRectangle(0,0, w,h)
iPos = self.GetInsertionPos()
- dc.DrawLine((iPos,h - 10), (iPos,h))
+ dc.DrawLine(iPos,h - 10, iPos,h)
def OnPaint(self,evt):
dc = wx.PaintDC(self)
w,h = self.GetSize()
- dc.DrawBitmap(self.image, (0,0))
+ dc.DrawBitmap(self.image, 0,0)
dc.SetPen(wx.Pen(wx.BLACK,1,wx.SOLID))
dc.SetBrush(wx.TRANSPARENT_BRUSH)
- dc.DrawRectangle((0,0), (w,h))
+ dc.DrawRectangle(0,0, w,h)
iPos = self.GetInsertionPos()
- dc.DrawLine((w - 10,iPos), (w,iPos))
+ dc.DrawLine(w - 10,iPos, w,iPos)
#----------------------------------------------------------------------------
def OnMouseMove(self,evt):
if self.isDragging:
- if abs(self.startX - evt.m_x) >= 3:
+ if abs(self.startX - evt.m_x) >= 3 \
+ and abs(evt.m_x - self.lastX) >= 3:
+ self.lastX = evt.m_x
self.didMove = True
sx,y = self.grid.GetViewStart()
w,h = self.lwin.GetClientSize()
self.colWin.DisplayAt(px,y)
return
- evt.Skip()
def OnPress(self,evt):
- self.startX = evt.m_x
+ self.startX = self.lastX = evt.m_x
sx = self.grid.GetViewStart()[0] * self.ux
sx -= self.grid._rlSize
px,py = self.lwin.ClientToScreenXY(evt.m_x,evt.m_y)
self.colWin = ColDragWindow(self.grid,colImg,col)
self.colWin.Show(False)
self.lwin.CaptureMouse()
+ evt.Skip()
def OnRelease(self,evt):
if self.isDragging:
memdc = wx.MemoryDC()
memdc.SelectObject(bmp)
dc = wx.WindowDC(self.lwin)
- memdc.Blit((0,0), rect.GetSize(), dc, rect.GetPosition())
+ memdc.Blit(0,0, rect.width, rect.height, dc, rect.x, rect.y)
memdc.SelectObject(wx.NullBitmap)
return bmp
def OnMouseMove(self,evt):
if self.isDragging:
- if abs(self.startY - evt.m_y) >= 3:
+ if abs(self.startY - evt.m_y) >= 3 \
+ and abs(evt.m_y - self.lastY) >= 3:
+ self.lastY = evt.m_y
self.didMove = True
x,sy = self.grid.GetViewStart()
w,h = self.lwin.GetClientSizeTuple()
self.rowWin.DisplayAt(x,py)
return
- evt.Skip()
def OnPress(self,evt):
- self.startY = evt.m_y
+ self.startY = self.lastY = evt.m_y
sy = self.grid.GetViewStart()[1] * self.uy
sy -= self.grid._clSize
px,py = self.lwin.ClientToScreenXY(evt.m_x,evt.m_y)
self.rowWin = RowDragWindow(self.grid,rowImg,row)
self.rowWin.Show(False)
self.lwin.CaptureMouse()
+ evt.Skip()
def OnRelease(self,evt):
if self.isDragging:
memdc = wx.MemoryDC()
memdc.SelectObject(bmp)
dc = wx.WindowDC(self.lwin)
- memdc.Blit((0,0), rect.GetSize(), dc, rect.GetPosition())
+ memdc.Blit(0,0, rect.width, rect.height, dc, rect.x, rect.y)
memdc.SelectObject(wx.NullBitmap)
return bmp