X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/372bde9b72b67036482dcc170f6260846e7a3b64..86aafce32e5f471b0c84fa611ed51bdea85691df:/wxPython/demo/CustomDragAndDrop.py diff --git a/wxPython/demo/CustomDragAndDrop.py b/wxPython/demo/CustomDragAndDrop.py index fcb0947287..b1c1e5a890 100644 --- a/wxPython/demo/CustomDragAndDrop.py +++ b/wxPython/demo/CustomDragAndDrop.py @@ -1,11 +1,3 @@ -# 11/5/2003 - Modified by grimmtooth@softhome.net (Jeff Grimmett) -# -# o Updated for wx namespace -# -# 11/24/2003 - Modified by grimmtooth@softhome.net (Jeff Grimmett) -# -# o Issues around line 167. I'm stuck. -# import cPickle import wx @@ -46,7 +38,7 @@ class DoodlePad(wx.Window): dc.SetPen(wx.Pen(wx.BLUE, 3)) for line in self.lines: for coords in line: - dc.DrawLineXY(*coords) + dc.DrawLine(*coords) dc.EndDrawing() @@ -63,22 +55,23 @@ class DoodlePad(wx.Window): def OnLeftUp(self, event): - self.lines.append(self.curLine) - self.curLine = [] - self.ReleaseMouse() + if self.HasCapture(): + self.lines.append(self.curLine) + self.curLine = [] + self.ReleaseMouse() def OnRightUp(self, event): self.lines = [] self.Refresh() def OnMotion(self, event): - if event.Dragging() and not self.mode == "Drag": + if self.HasCapture() and event.Dragging() and not self.mode == "Drag": dc = wx.ClientDC(self) dc.BeginDrawing() dc.SetPen(wx.Pen(wx.BLUE, 3)) - coords = ((self.x, self.y), event.GetPosition()) + coords = ((self.x, self.y), event.GetPositionTuple()) self.curLine.append(coords) - dc.DrawLineXY(*coords) + dc.DrawLine(*coords) self.x, self.y = event.GetPositionTuple() dc.EndDrawing() @@ -171,7 +164,7 @@ class DoodleDropTarget(wx.PyDropTarget): if self.GetData(): # convert it back to a list of lines and give it to the viewer linesdata = self.data.GetData() - lines = wx.InputStream(cPickle.loads(linesdata)) + lines = cPickle.loads(linesdata) self.dv.SetLines(lines) # what is returned signals the source what to do @@ -207,7 +200,7 @@ class DoodleViewer(wx.Window): for line in self.lines: for coords in line: - dc.DrawLineXY(*coords) + dc.DrawLine(*coords) dc.EndDrawing() #----------------------------------------------------------------------