Commit bb9b1f1d authored by Martin v. Löwis's avatar Martin v. Löwis

Issue #4116: Resolve member name conflict in ScrolledCanvas.__init__

parent 65e8fc7f
...@@ -359,7 +359,7 @@ class ScrolledCanvas(TK.Frame): ...@@ -359,7 +359,7 @@ class ScrolledCanvas(TK.Frame):
def __init__(self, master, width=500, height=350, def __init__(self, master, width=500, height=350,
canvwidth=600, canvheight=500): canvwidth=600, canvheight=500):
TK.Frame.__init__(self, master, width=width, height=height) 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.width, self.height = width, height
self.canvwidth, self.canvheight = canvwidth, canvheight self.canvwidth, self.canvheight = canvwidth, canvheight
self.bg = "white" self.bg = "white"
...@@ -379,7 +379,7 @@ class ScrolledCanvas(TK.Frame): ...@@ -379,7 +379,7 @@ class ScrolledCanvas(TK.Frame):
self.hscroll.grid(padx=1, in_ = self, pady=1, row=1, self.hscroll.grid(padx=1, in_ = self, pady=1, row=1,
column=0, rowspan=1, columnspan=1, sticky='news') column=0, rowspan=1, columnspan=1, sticky='news')
self.reset() self.reset()
self._root.bind('<Configure>', self.onResize) self._rootwindow.bind('<Configure>', self.onResize)
def reset(self, canvwidth=None, canvheight=None, bg = None): def reset(self, canvwidth=None, canvheight=None, bg = None):
"""Ajust canvas and scrollbars according to given canvas size.""" """Ajust canvas and scrollbars according to given canvas size."""
......
...@@ -42,6 +42,8 @@ Core and Builtins ...@@ -42,6 +42,8 @@ Core and Builtins
Library Library
------- -------
- Issue #4116: Resolve member name conflict in ScrolledCanvas.__init__.
- httplib.HTTPConnection.putheader() now accepts an arbitrary number of values - httplib.HTTPConnection.putheader() now accepts an arbitrary number of values
for any header, matching what the documentation has claimed for a while. for any header, matching what the documentation has claimed for a while.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment