Updated for Python 1.4
diff --git a/Demo/tkinter/matt/canvas-mult-item-sel.py b/Demo/tkinter/matt/canvas-mult-item-sel.py
index 1e49ba6..2368733 100644
--- a/Demo/tkinter/matt/canvas-mult-item-sel.py
+++ b/Demo/tkinter/matt/canvas-mult-item-sel.py
@@ -11,20 +11,20 @@
###################################################################
def mouseDown(self, event):
# see if we're inside a dot. If we are, it
- # gets tagged as "current" for free by tk.
+ # gets tagged as CURRENT for free by tk.
- if not event.widget.find_withtag("current"):
+ if not event.widget.find_withtag(CURRENT):
# we clicked outside of all dots on the canvas. unselect all.
# re-color everything back to an unselected color
- self.draw.itemconfig("selected", {"fill" : UNSELECTED_COLOR})
+ self.draw.itemconfig("selected", fill=UNSELECTED_COLOR)
# unselect everything
self.draw.dtag("selected")
else:
# mark as "selected" the thing the cursor is under
- self.draw.addtag("selected", "withtag", "current")
+ self.draw.addtag("selected", "withtag", CURRENT)
# color it as selected
- self.draw.itemconfig("selected", {"fill": SELECTED_COLOR})
+ self.draw.itemconfig("selected", fill=SELECTED_COLOR)
self.lastx = event.x
self.lasty = event.y
@@ -38,40 +38,36 @@
def makeNewDot(self):
# create a dot, and mark it as current
fred = self.draw.create_oval(0, 0, 20, 20,
- {"fill" : SELECTED_COLOR, "tag" : "current"})
+ fill=SELECTED_COLOR, tags=CURRENT)
# and make it selected
- self.draw.addtag("selected", "withtag", "current")
+ self.draw.addtag("selected", "withtag", CURRENT)
def createWidgets(self):
- self.QUIT = Button(self, {'text': 'QUIT',
- 'fg': 'red',
- 'command': self.quit})
+ self.QUIT = Button(self, text='QUIT', foreground='red',
+ command=self.quit)
################
# make the canvas and bind some behavior to it
################
- self.draw = Canvas(self, {"width" : "5i", "height" : "5i"})
+ self.draw = Canvas(self, width="5i", height="5i")
Widget.bind(self.draw, "<1>", self.mouseDown)
Widget.bind(self.draw, "<B1-Motion>", self.mouseMove)
-
# and other things.....
- self.button = Button(self, {"text" : "make a new dot",
- "command" : self.makeNewDot,
- "fg" : "blue"})
+ self.button = Button(self, text="make a new dot", foreground="blue",
+ command=self.makeNewDot)
- self.label = Message(self,
- {"width" : "5i",
- "text" : SELECTED_COLOR + " dots are selected and can be dragged.\n" +
- UNSELECTED_COLOR + " are not selected.\n" +
- "Click in a dot to select it.\n" +
- "Click on empty space to deselect all dots." })
+ message = ("%s dots are selected and can be dragged.\n"
+ "%s are not selected.\n"
+ "Click in a dot to select it.\n"
+ "Click on empty space to deselect all dots."
+ ) % (SELECTED_COLOR, UNSELECTED_COLOR)
+ self.label = Message(self, width="5i", text=message)
- self.QUIT.pack({'side': 'bottom', 'fill': 'both'})
- self.label.pack({"side" : "bottom", "fill" : "x", "expand" : 1})
- self.button.pack({"side" : "bottom", "fill" : "x"})
- self.draw.pack({'side': 'left'})
-
+ self.QUIT.pack(side=BOTTOM, fill=BOTH)
+ self.label.pack(side=BOTTOM, fill=X, expand=1)
+ self.button.pack(side=BOTTOM, fill=X)
+ self.draw.pack(side=LEFT)
def __init__(self, master=None):
Frame.__init__(self, master)