Updated for Python 1.4

1 files changed, 11 insertions, 13 deletions

diff --git a/Demo/tkinter/matt/window-creation-more.py b/Demo/tkinter/matt/window-creation-more.py
index e8d4a35..492027a 100644
--- a/Demo/tkinter/matt/window-creation-more.py
+++ b/Demo/tkinter/matt/window-creation-more.py
@@ -1,6 +1,7 @@
 from Tkinter import *
 
-# this shows how to create a new window with a button in it that can create new windows
+# this shows how to create a new window with a button in it
+# that can create new windows
 
 class Test(Frame):
     def printit(self):
@@ -8,24 +9,21 @@ class Test(Frame):
 
     def makeWindow(self):
 	fred = Toplevel()
-	fred.label = Button(fred, {'text': "This is window number " + `self.windownum` + "." , 
-				   'command' : self.makeWindow})
+	fred.label = Button(fred,
+			    text="This is window number %d." % self.windownum, 
+			    command=self.makeWindow)
 	fred.label.pack()
 	self.windownum = self.windownum + 1
 
     def createWidgets(self):
-	self.QUIT = Button(self, {'text': 'QUIT', 
-				  'fg': 'red', 
-				  'command': self.quit})
-	
-	self.QUIT.pack({'side': 'left', 'fill': 'both'})
-
+	self.QUIT = Button(self, text='QUIT', foreground='red', 
+			   command=self.quit)
+	self.QUIT.pack(side=LEFT, fill=BOTH)
 
 	# a hello button
-	self.hi_there = Button(self, {'text': 'Make a New Window', 
-				      'command' : self.makeWindow})
-	self.hi_there.pack({'side': 'left'})
-
+	self.hi_there = Button(self, text='Make a New Window', 
+			       command=self.makeWindow)
+	self.hi_there.pack(side=LEFT)
 
     def __init__(self, master=None):
 	Frame.__init__(self, master)