diff options
author | Guilherme Polo <ggpolo@gmail.com> | 2009-08-18 15:35:57 (GMT) |
---|---|---|
committer | Guilherme Polo <ggpolo@gmail.com> | 2009-08-18 15:35:57 (GMT) |
commit | bcd03df1bd71a8fe272018072fc6ee145e83b425 (patch) | |
tree | 7cc35ce2326f4eee463ad68a2ec643269b2c8788 /Lib/tkinter/scrolledtext.py | |
parent | f290cb5b1dc22e91dbf0882a20fc22e5a87d896e (diff) | |
download | cpython-bcd03df1bd71a8fe272018072fc6ee145e83b425.zip cpython-bcd03df1bd71a8fe272018072fc6ee145e83b425.tar.gz cpython-bcd03df1bd71a8fe272018072fc6ee145e83b425.tar.bz2 |
Merged revisions 74507-74511,74517 via svnmerge from
svn+ssh://pythondev/python/trunk
........
r74507 | guilherme.polo | 2009-08-18 10:23:08 -0300 (Tue, 18 Aug 2009) | 1 line
Issue #1119673: Do not override Tkinter.Text methods when creating a ScrolledText.
........
r74508 | guilherme.polo | 2009-08-18 10:29:20 -0300 (Tue, 18 Aug 2009) | 1 line
Issue #1250469: Fix the return value of Tix.PanedWindow.panes.
........
r74509 | guilherme.polo | 2009-08-18 10:33:30 -0300 (Tue, 18 Aug 2009) | 1 line
Mark the "radio" option of Tix.CheckList as static.
........
r74510 | guilherme.polo | 2009-08-18 11:23:00 -0300 (Tue, 18 Aug 2009) | 1 line
Issue #1522587: New constants and methods for the Tix.Grid widget.
........
r74511 | guilherme.polo | 2009-08-18 11:34:44 -0300 (Tue, 18 Aug 2009) | 1 line
Fixes for Tix.Grid from issue #1522587.
........
r74517 | guilherme.polo | 2009-08-18 11:46:57 -0300 (Tue, 18 Aug 2009) | 1 line
Issue #1356969: Add missing info methods in Tix.HList.
........
Diffstat (limited to 'Lib/tkinter/scrolledtext.py')
-rw-r--r-- | Lib/tkinter/scrolledtext.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/tkinter/scrolledtext.py b/Lib/tkinter/scrolledtext.py index d2a9987..8173f5e 100644 --- a/Lib/tkinter/scrolledtext.py +++ b/Lib/tkinter/scrolledtext.py @@ -27,8 +27,11 @@ class ScrolledText(Text): self.pack(side=LEFT, fill=BOTH, expand=True) self.vbar['command'] = self.yview - # Copy geometry methods of self.frame -- hack! + # Copy geometry methods of self.frame without overriding Text + # methods -- hack! + text_meths = vars(Text).keys() methods = vars(Pack).keys() + vars(Grid).keys() + vars(Place).keys() + methods = set(methods).difference(text_meths) for m in methods: if m[0] != '_' and m != 'config' and m != 'configure': |