languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-09-19 14:31:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 67279 via svnmerge from

Browse source 
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__
........
This commit is contained in:
Martin v. Löwis 2008-11-19 09:14:30 +00:00
parent d6695ee12a
commit 22d297be51
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Lib/turtle.py
View file

@ -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 @@ def __init__(self, master, width=500, height=350,
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."""

2
Misc/NEWS
View file

@ -33,6 +33,8 @@ Core and Builtins
Library
-------
- Issue #4116: Resolve member name conflict in ScrolledCanvas.__init__.
- Issue #4307: The named tuple that ``inspect.getfullargspec()`` returns now
uses ``kwonlydefaults`` instead of ``kwdefaults``.