[Python-checkins] r64603 - sandbox/trunk/ttk-gsoc/samples/theming.py

Tue Jul 1 02:54:12 CEST 2008

Author: guilherme.polo
Date: Tue Jul 1 02:54:12 2008
New Revision: 64603
Log:
Updated/Fixed AutoScroll class (nothing that affects this sample app tho).
Modified:
 sandbox/trunk/ttk-gsoc/samples/theming.py
Modified: sandbox/trunk/ttk-gsoc/samples/theming.py
==============================================================================

--- sandbox/trunk/ttk-gsoc/samples/theming.py	(original)
+++ sandbox/trunk/ttk-gsoc/samples/theming.py	Tue Jul 1 02:54:12 2008
@@ -149,20 +149,19 @@
 
 self.configure(yscrollcommand=self._autoscroll(vsb),
 xscrollcommand=self._autoscroll(hsb))
- self.grid(column=0, row=0, sticky='nsew', in_=master)
- vsb.grid(column=1, row=0, sticky='ns', in_=master)
- hsb.grid(column=0, row=1, sticky='ew', in_=master)
+ self.grid(column=0, row=0, sticky='nsew')
+ vsb.grid(column=1, row=0, sticky='ns')
+ hsb.grid(column=0, row=1, sticky='ew')
 
 master.grid_columnconfigure(0, weight=1)
 master.grid_rowconfigure(0, weight=1)
 
 # Copy geometry methods of master -- hack! (took from ScrolledText.py)
- methods = Tkinter.Pack.__dict__.keys()
- methods = methods + Tkinter.Grid.__dict__.keys()
+ methods = Tkinter.Pack.__dict__.keys() + Tkinter.Grid.__dict__.keys()
 
- for m in methods:
- if m[0] != '_' and m != 'config' and m != 'configure':
- setattr(self, m, getattr(master, m))
+ for meth in methods:
+ if meth[0] != '_' and meth not in ('config', 'configure'):
+ setattr(self, meth, getattr(master, meth))
 
 @staticmethod
 def _autoscroll(sbar):
@@ -179,6 +178,9 @@
 
 return wrapped
 
+ def __str__(self):
+ return str(self.master)
+
 def _create_container(func):
 """Creates a ttk Frame with a given master, and use this new frame to
 place the scrollbars and the widget."""
@@ -644,7 +646,7 @@
 file_menu.add_command(label="Exit", underline=1, accelerator="Ctrl-X",
 command=self.master.destroy)
 
- menu.add('cascade', menu=file_menu, label="File", underline=0)
+ menu.add_cascade(menu=file_menu, label="File", underline=0)
 self.master.bind('<Control-x>', 'exit')
 
 def __setup_widgets(self):
