Updated for Python 1.4

1 files changed, 18 insertions, 25 deletions

diff --git a/Demo/tkinter/matt/canvas-with-scrollbars.py b/Demo/tkinter/matt/canvas-with-scrollbars.py
index d249822..60c7b13 100644
--- a/Demo/tkinter/matt/canvas-with-scrollbars.py
+++ b/Demo/tkinter/matt/canvas-with-scrollbars.py
@@ -10,27 +10,23 @@ class Test(Frame):
 	print "hi"
 
     def createWidgets(self):
-	self.question = Label(self, {"text":  "Can Find The BLUE Square??????", 
-				     Pack : {"side" : "top"}})
-	
-	self.QUIT = Button(self, {'text': 'QUIT', 
-				  'bg': 'red', 
-				  "height" : "3", 
-				  'command': self.quit})
-	self.QUIT.pack({'side': 'bottom', 'fill': 'both'})	
-	spacer = Frame(self, {"height" : "0.25i", 
-			      Pack : {"side" : "bottom"}})
+	self.question = Label(self, text="Can Find The BLUE Square??????")
+	self.question.pack()
+
+	self.QUIT = Button(self, text='QUIT', background='red', 
+			   height=3, command=self.quit)
+	self.QUIT.pack(side=BOTTOM, fill=BOTH)	
+	spacer = Frame(self, height="0.25i")
+	spacer.pack(side=BOTTOM)
 
 	# notice that the scroll region (20" x 20") is larger than 
 	# displayed size of the widget (5" x 5")
-	self.draw = Canvas(self, {"width" : "5i", 
-				  "height" : "5i", 
-				  "bg" : "white", 
-				  "scrollregion" : "0i 0i 20i 20i"})
+	self.draw = Canvas(self, width="5i", height="5i",
+			   background="white",
+			   scrollregion=(0, 0, "20i", "20i"))
 
-	
-	self.draw.scrollX = Scrollbar(self, {"orient" : "horizontal"}) 
-	self.draw.scrollY = Scrollbar(self, {"orient" : "vertical"}) 
+	self.draw.scrollX = Scrollbar(self, orient=HORIZONTAL)
+	self.draw.scrollY = Scrollbar(self, orient=VERTICAL)
 
 	# now tie the three together. This is standard boilerplate text
 	self.draw['xscrollcommand'] = self.draw.scrollX.set
@@ -40,16 +36,13 @@ class Test(Frame):
 
 	# draw something. Note that the first square 
 	# is visible, but you need to scroll to see the second one.
-	self.draw.create_polygon("0i", "0i", "3.5i", "0i", "3.5i", "3.5i", "0i" , "3.5i")
-	self.draw.create_polygon("10i", "10i", "13.5i", "10i", "13.5i", "13.5i", "10i" , "13.5i", "-fill", "blue")
+	self.draw.create_rectangle(0, 0, "3.5i", "3.5i", fill="black")
+	self.draw.create_rectangle("10i", "10i", "13.5i", "13.5i", fill="blue")
 
-	
 	# pack 'em up
-	self.draw.scrollX.pack({'side': 'bottom', 
-				"fill" : "x"})
-	self.draw.scrollY.pack({'side': 'right', 
-				"fill" : "y"})
-	self.draw.pack({'side': 'left'})
+	self.draw.scrollX.pack(side=BOTTOM, fill=X)
+	self.draw.scrollY.pack(side=RIGHT, fill=Y)
+	self.draw.pack(side=LEFT)
 
 
     def scrollCanvasX(self, *args):