Skip to content

C
cpython
Kaydet (Commit) 5c8c91bb authored tarafından Guido van Rossum's avatar Guido van Rossum
Dosyalara gözat
Seçenekler

Changes for Canvas by Fred

üst ad899788
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 86 deletions
Lib/lib-tk/Canvas.py
Dosyayı görüntüle @ 5c8c91bb
# This module exports classes for the various canvas item types # This module exports classes for the various canvas item types
from Tkinter import Canvas from Tkinter import Canvas, _flatten
from types import *
def _flatten(tuple):
res = ()
for item in tuple:
if type(item) in (TupleType, ListType):
res = res + _flatten(item)
elif item is not None:
res = res + (item,)
return res
class CanvasItem: class CanvasItem:
def __init__(self, canvas, itemType, *args, **kw): def __init__(self, canvas, itemType, *args, **kw):
...@@ -85,41 +75,41 @@ class CanvasItem: ...@@ -85,41 +75,41 @@ class CanvasItem:
return self.canvas.type(self.id) return self.canvas.type(self.id)
class Arc(CanvasItem): class Arc(CanvasItem):
def __init__(self, canvas, *args): def __init__(self, canvas, *args, **kw):
CanvasItem.__init__(self, canvas, 'arc', args) apply(CanvasItem.__init__, (self, canvas, 'arc') + args, kw)
class Bitmap(CanvasItem): class Bitmap(CanvasItem):
def __init__(self, canvas, *args): def __init__(self, canvas, *args, **kw):
CanvasItem.__init__(self, canvas, 'bitmap', args) apply(CanvasItem.__init__, (self, canvas, 'bitmap') + args, kw)
class ImageItem(CanvasItem): class ImageItem(CanvasItem):
def __init__(self, canvas, *args): def __init__(self, canvas, *args, **kw):
CanvasItem.__init__(self, canvas, 'image', args) apply(CanvasItem.__init__, (self, canvas, 'image') + args, kw)
class Line(CanvasItem): class Line(CanvasItem):
def __init__(self, canvas, *args): def __init__(self, canvas, *args, **kw):
CanvasItem.__init__(self, canvas, 'line', args) apply(CanvasItem.__init__, (self, canvas, 'line') + args, kw)
class Oval(CanvasItem): class Oval(CanvasItem):
def __init__(self, canvas, *args): def __init__(self, canvas, *args, **kw):
CanvasItem.__init__(self, canvas, 'oval', args) apply(CanvasItem.__init__, (self, canvas, 'oval') + args, kw)
class Polygon(CanvasItem): class Polygon(CanvasItem):
def __init__(self, canvas, *args): def __init__(self, canvas, *args, **kw):
CanvasItem.__init__(self, canvas, 'polygon', args) apply(CanvasItem.__init__, (self, canvas, 'polygon') + args, kw)
class Rectangle(CanvasItem): class Rectangle(CanvasItem):
def __init__(self, canvas, *args): def __init__(self, canvas, *args, **kw):
CanvasItem.__init__(self, canvas, 'rectangle', args) apply(CanvasItem.__init__, (self, canvas, 'rectangle') + args, kw)
# XXX "Text" is taken by the Text widget... # XXX "Text" is taken by the Text widget...
class CanvasText(CanvasItem): class CanvasText(CanvasItem):
def __init__(self, canvas, *args): def __init__(self, canvas, *args, **kw):
CanvasItem.__init__(self, canvas, 'text', args) apply(CanvasItem.__init__, (self, canvas, 'text') + args, kw)
class Window(CanvasItem): class Window(CanvasItem):
def __init__(self, canvas, *args): def __init__(self, canvas, *args, **kw):
CanvasItem.__init__(self, canvas, 'window', args) apply(CanvasItem.__init__, (self, canvas, 'window') + args, kw)
class Group: class Group:
def __init__(self, canvas, tag=None): def __init__(self, canvas, tag=None):
......
Lib/lib-tk/Tkinter.py
Dosyayı görüntüle @ 5c8c91bb
...@@ -935,20 +935,20 @@ class Canvas(Widget): ...@@ -935,20 +935,20 @@ class Canvas(Widget):
Widget.__init__(self, master, 'canvas', cnf, kw) Widget.__init__(self, master, 'canvas', cnf, kw)
def addtag(self, *args): def addtag(self, *args):
self._do('addtag', args) self._do('addtag', args)
def addtag_above(self, tagOrId): def addtag_above(self, newtag, tagOrId):
self.addtag('above', tagOrId) self.addtag(newtag, 'above', tagOrId)
def addtag_all(self): def addtag_all(self, newtag):
self.addtag('all') self.addtag(newtag, 'all')
def addtag_below(self, tagOrId): def addtag_below(self, newtag, tagOrId):
self.addtag('below', tagOrId) self.addtag(newtag, 'below', tagOrId)
def addtag_closest(self, x, y, halo=None, start=None): def addtag_closest(self, newtag, x, y, halo=None, start=None):
self.addtag('closest', x, y, halo, start) self.addtag(newtag, 'closest', x, y, halo, start)
def addtag_enclosed(self, x1, y1, x2, y2): def addtag_enclosed(self, newtag, x1, y1, x2, y2):
self.addtag('enclosed', x1, y1, x2, y2) self.addtag(newtag, 'enclosed', x1, y1, x2, y2)
def addtag_overlapping(self, x1, y1, x2, y2): def addtag_overlapping(self, newtag, x1, y1, x2, y2):
self.addtag('overlapping', x1, y1, x2, y2) self.addtag(newtag, 'overlapping', x1, y1, x2, y2)
def addtag_withtag(self, tagOrId): def addtag_withtag(self, newtag, tagOrId):
self.addtag('withtag', tagOrId) self.addtag(newtag, 'withtag', tagOrId)
def bbox(self, *args): def bbox(self, *args):
return self._getints(self._do('bbox', args)) or None return self._getints(self._do('bbox', args)) or None
def tag_unbind(self, tagOrId, sequence): def tag_unbind(self, tagOrId, sequence):
......
Lib/tkinter/Canvas.py
Dosyayı görüntüle @ 5c8c91bb
# This module exports classes for the various canvas item types # This module exports classes for the various canvas item types
from Tkinter import Canvas from Tkinter import Canvas, _flatten
from types import *
def _flatten(tuple):
res = ()
for item in tuple:
if type(item) in (TupleType, ListType):
res = res + _flatten(item)
elif item is not None:
res = res + (item,)
return res
class CanvasItem: class CanvasItem:
def __init__(self, canvas, itemType, *args, **kw): def __init__(self, canvas, itemType, *args, **kw):
...@@ -85,41 +75,41 @@ class CanvasItem: ...@@ -85,41 +75,41 @@ class CanvasItem:
return self.canvas.type(self.id) return self.canvas.type(self.id)
class Arc(CanvasItem): class Arc(CanvasItem):
def __init__(self, canvas, *args): def __init__(self, canvas, *args, **kw):
CanvasItem.__init__(self, canvas, 'arc', args) apply(CanvasItem.__init__, (self, canvas, 'arc') + args, kw)
class Bitmap(CanvasItem): class Bitmap(CanvasItem):
def __init__(self, canvas, *args): def __init__(self, canvas, *args, **kw):
CanvasItem.__init__(self, canvas, 'bitmap', args) apply(CanvasItem.__init__, (self, canvas, 'bitmap') + args, kw)
class ImageItem(CanvasItem): class ImageItem(CanvasItem):
def __init__(self, canvas, *args): def __init__(self, canvas, *args, **kw):
CanvasItem.__init__(self, canvas, 'image', args) apply(CanvasItem.__init__, (self, canvas, 'image') + args, kw)
class Line(CanvasItem): class Line(CanvasItem):
def __init__(self, canvas, *args): def __init__(self, canvas, *args, **kw):
CanvasItem.__init__(self, canvas, 'line', args) apply(CanvasItem.__init__, (self, canvas, 'line') + args, kw)
class Oval(CanvasItem): class Oval(CanvasItem):
def __init__(self, canvas, *args): def __init__(self, canvas, *args, **kw):
CanvasItem.__init__(self, canvas, 'oval', args) apply(CanvasItem.__init__, (self, canvas, 'oval') + args, kw)
class Polygon(CanvasItem): class Polygon(CanvasItem):
def __init__(self, canvas, *args): def __init__(self, canvas, *args, **kw):
CanvasItem.__init__(self, canvas, 'polygon', args) apply(CanvasItem.__init__, (self, canvas, 'polygon') + args, kw)
class Rectangle(CanvasItem): class Rectangle(CanvasItem):
def __init__(self, canvas, *args): def __init__(self, canvas, *args, **kw):
CanvasItem.__init__(self, canvas, 'rectangle', args) apply(CanvasItem.__init__, (self, canvas, 'rectangle') + args, kw)
# XXX "Text" is taken by the Text widget... # XXX "Text" is taken by the Text widget...
class CanvasText(CanvasItem): class CanvasText(CanvasItem):
def __init__(self, canvas, *args): def __init__(self, canvas, *args, **kw):
CanvasItem.__init__(self, canvas, 'text', args) apply(CanvasItem.__init__, (self, canvas, 'text') + args, kw)
class Window(CanvasItem): class Window(CanvasItem):
def __init__(self, canvas, *args): def __init__(self, canvas, *args, **kw):
CanvasItem.__init__(self, canvas, 'window', args) apply(CanvasItem.__init__, (self, canvas, 'window') + args, kw)
class Group: class Group:
def __init__(self, canvas, tag=None): def __init__(self, canvas, tag=None):
......
Lib/tkinter/Tkinter.py
Dosyayı görüntüle @ 5c8c91bb
...@@ -935,20 +935,20 @@ class Canvas(Widget): ...@@ -935,20 +935,20 @@ class Canvas(Widget):
Widget.__init__(self, master, 'canvas', cnf, kw) Widget.__init__(self, master, 'canvas', cnf, kw)
def addtag(self, *args): def addtag(self, *args):
self._do('addtag', args) self._do('addtag', args)
def addtag_above(self, tagOrId): def addtag_above(self, newtag, tagOrId):
self.addtag('above', tagOrId) self.addtag(newtag, 'above', tagOrId)
def addtag_all(self): def addtag_all(self, newtag):
self.addtag('all') self.addtag(newtag, 'all')
def addtag_below(self, tagOrId): def addtag_below(self, newtag, tagOrId):
self.addtag('below', tagOrId) self.addtag(newtag, 'below', tagOrId)
def addtag_closest(self, x, y, halo=None, start=None): def addtag_closest(self, newtag, x, y, halo=None, start=None):
self.addtag('closest', x, y, halo, start) self.addtag(newtag, 'closest', x, y, halo, start)
def addtag_enclosed(self, x1, y1, x2, y2): def addtag_enclosed(self, newtag, x1, y1, x2, y2):
self.addtag('enclosed', x1, y1, x2, y2) self.addtag(newtag, 'enclosed', x1, y1, x2, y2)
def addtag_overlapping(self, x1, y1, x2, y2): def addtag_overlapping(self, newtag, x1, y1, x2, y2):
self.addtag('overlapping', x1, y1, x2, y2) self.addtag(newtag, 'overlapping', x1, y1, x2, y2)
def addtag_withtag(self, tagOrId): def addtag_withtag(self, newtag, tagOrId):
self.addtag('withtag', tagOrId) self.addtag(newtag, 'withtag', tagOrId)
def bbox(self, *args): def bbox(self, *args):
return self._getints(self._do('bbox', args)) or None return self._getints(self._do('bbox', args)) or None
def tag_unbind(self, tagOrId, sequence): def tag_unbind(self, tagOrId, sequence):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment