Updated for Python 1.4

1 files changed, 19 insertions, 34 deletions

diff --git a/Demo/tkinter/matt/menu-simple.py b/Demo/tkinter/matt/menu-simple.py
index 1f46e21..16172dd 100644
--- a/Demo/tkinter/matt/menu-simple.py
+++ b/Demo/tkinter/matt/menu-simple.py
@@ -43,33 +43,23 @@ def open_file():
 
 def makeFileMenu():
     # make menu button : "File"
-    File_button = Menubutton(mBar, {'text': 'File', 
-				    'underline': 0,
-				    Pack: {'side': 'left', 
-					   'padx': '1m'}})
-    
-    # make the pulldown part of the File menu. The parameter passed is the master.
-    # we attach it to the File button as a python attribute called "menu" by convention.
-    # hopefully this isn't too confusing...
+    File_button = Menubutton(mBar, text='File', underline=0)
+    File_button.pack(side=LEFT, padx="1m")
     File_button.menu = Menu(File_button)
     
     # add an item. The first param is a menu entry type, 
     # must be one of: "cascade", "checkbutton", "command", "radiobutton", "seperator"
     # see menu-demo-2.py for examples of use
-    File_button.menu.add('command', {'label': 'New...', 
-				     'underline': 0, 
-				     'command' : new_file})
-    
-    
-    File_button.menu.add('command', {'label': 'Open...', 
-				     'underline': 0, 
-				     'command' : open_file})
+    File_button.menu.add_command(label='New...', underline=0, 
+				 command=new_file)
     
-    File_button.menu.add('command', {'label': 'Quit', 
-				     'underline': 0, 
-				     'command': 'exit'})
     
+    File_button.menu.add_command(label='Open...', underline=0, 
+				 command=open_file)
     
+    File_button.menu.add_command(label='Quit', underline=0, 
+				 command='exit')
+
     # set up a pointer from the file menubutton back to the file menu
     File_button['menu'] = File_button.menu
 
@@ -78,22 +68,20 @@ def makeFileMenu():
 
 
 def makeEditMenu():
-    Edit_button = Menubutton(mBar, {'text': 'Edit', 
-				    'underline': 0,
-				    Pack: {'side': 'left', 
-					   'padx' : '1m'}})
+    Edit_button = Menubutton(mBar, text='Edit', underline=0)
+    Edit_button.pack(side=LEFT, padx="1m")
     Edit_button.menu = Menu(Edit_button)
 
     # just to be cute, let's disable the undo option:
-    Edit_button.menu.add('command', {"label" : "Undo"} )
+    Edit_button.menu.add('command', label="Undo")
     # undo is the 0th entry...
-    Edit_button.menu.entryconfig(0, {"state" : "disabled"})
+    Edit_button.menu.entryconfig(0, state=DISABLED)
 
     # and these are just for show. No "command" callbacks attached.
-    Edit_button.menu.add('command', {"label" : "Cut"} )
-    Edit_button.menu.add('command', {"label" : "Copy"} )
-    Edit_button.menu.add('command', {"label" : "Paste"} )
-					
+    Edit_button.menu.add_command(label="Cut")
+    Edit_button.menu.add_command(label="Copy")
+    Edit_button.menu.add_command(label="Paste")
+
     # set up a pointer from the file menubutton back to the file menu
     Edit_button['menu'] = Edit_button.menu
 
@@ -107,10 +95,8 @@ root = Tk()
 
 
 # make a menu bar
-mBar = Frame(root, {'relief': 'raised', 
-		    'bd': 2,
-		    Pack: {'side': 'top', 
-			   'fill': 'x'}})
+mBar = Frame(root, relief=RAISED, borderwidth=2)
+mBar.pack(fill=X)
 
 File_button = makeFileMenu()
 Edit_button = makeEditMenu()
@@ -119,7 +105,6 @@ Edit_button = makeEditMenu()
 # This allows for scanning from one menubutton to the next.
 mBar.tk_menuBar(File_button, Edit_button)
 
-
 root.title('menu demo')
 root.iconname('packer')