diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-11-19 09:14:30 +0000 |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-11-19 09:14:30 +0000 |
| commit | 22d297be51567eb193e792a0da52b93e9a45b9a4 (patch) | |
| tree | de1edf99013f7eb052de1b0ea813f482440a5ea9 /Lib/turtle.py | |
| parent | d6695ee12a7fd258480d41fe5bd4199c4ee1afb7 (diff) | |
| download | cpython-git-22d297be51567eb193e792a0da52b93e9a45b9a4.tar.gz | |
Merged revisions 67279 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67279 | martin.v.loewis | 2008-11-19 10:09:41 +0100 (Mi, 19 Nov 2008) | 2 lines
Issue #4116: Resolve member name conflict in ScrolledCanvas.__init__
........
Diffstat (limited to 'Lib/turtle.py')
| -rw-r--r-- | Lib/turtle.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/turtle.py b/Lib/turtle.py index bcc53ce3dd..6f73374521 100644 --- a/Lib/turtle.py +++ b/Lib/turtle.py @@ -357,7 +357,7 @@ class ScrolledCanvas(TK.Frame): def __init__(self, master, width=500, height=350, canvwidth=600, canvheight=500): TK.Frame.__init__(self, master, width=width, height=height) - self._root = self.winfo_toplevel() + self._rootwindow = self.winfo_toplevel() self.width, self.height = width, height self.canvwidth, self.canvheight = canvwidth, canvheight self.bg = "white" @@ -377,7 +377,7 @@ class ScrolledCanvas(TK.Frame): self.hscroll.grid(padx=1, in_ = self, pady=1, row=1, column=0, rowspan=1, columnspan=1, sticky='news') self.reset() - self._root.bind('<Configure>', self.onResize) + self._rootwindow.bind('<Configure>', self.onResize) def reset(self, canvwidth=None, canvheight=None, bg = None): """Ajust canvas and scrollbars according to given canvas size.""" |