mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-02 16:13:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Use new packing and 'name' in cnf dict

Browse source
This commit is contained in:
Guido van Rossum 1994-08-03 08:08:26 +00:00
parent e2ca9bd156
commit d7b19488d7
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/lib-tk/ScrolledText.py
View file

@ -17,14 +17,16 @@ class ScrolledText(Text):
def __init__(self, master=None, cnf={}): def __init__(self, master=None, cnf={}):
cnf = _cnfmerge(cnf) cnf = _cnfmerge(cnf)
fcnf = {} fcnf = {}
vcnf = {'name': 'vbar',
Pack: {'side': 'right', 'fill': 'y'},}
for k in cnf.keys(): for k in cnf.keys():
if type(k) == ClassType: if type(k) == ClassType or k == 'name':
fcnf[k] = cnf[k] fcnf[k] = cnf[k]
del cnf[k] del cnf[k]
self.frame = Frame(master, fcnf) self.frame = Frame(master, fcnf)
self.vbar = Scrollbar(self.frame, { self.vbar = Scrollbar(self.frame, vcnf)
Pack: {'side': 'right', 'fill': 'y'}})
cnf[Pack] = {'side': 'left', 'fill': 'both', 'expand': 'yes'} cnf[Pack] = {'side': 'left', 'fill': 'both', 'expand': 'yes'}
cnf['name'] = 'text'
Text.__init__(self, self.frame, cnf) Text.__init__(self, self.frame, cnf)
self['yscrollcommand'] = (self.vbar, 'set') self['yscrollcommand'] = (self.vbar, 'set')
self.vbar['command'] = (self, 'yview') self.vbar['command'] = (self, 'yview')

8
Lib/tkinter/ScrolledText.py
View file

@ -17,14 +17,16 @@ class ScrolledText(Text):
def __init__(self, master=None, cnf={}): def __init__(self, master=None, cnf={}):
cnf = _cnfmerge(cnf) cnf = _cnfmerge(cnf)
fcnf = {} fcnf = {}
vcnf = {'name': 'vbar',
Pack: {'side': 'right', 'fill': 'y'},}
for k in cnf.keys(): for k in cnf.keys():
if type(k) == ClassType: if type(k) == ClassType or k == 'name':
fcnf[k] = cnf[k] fcnf[k] = cnf[k]
del cnf[k] del cnf[k]
self.frame = Frame(master, fcnf) self.frame = Frame(master, fcnf)
self.vbar = Scrollbar(self.frame, { self.vbar = Scrollbar(self.frame, vcnf)
Pack: {'side': 'right', 'fill': 'y'}})
cnf[Pack] = {'side': 'left', 'fill': 'both', 'expand': 'yes'} cnf[Pack] = {'side': 'left', 'fill': 'both', 'expand': 'yes'}
cnf['name'] = 'text'
Text.__init__(self, self.frame, cnf) Text.__init__(self, self.frame, cnf)
self['yscrollcommand'] = (self.vbar, 'set') self['yscrollcommand'] = (self.vbar, 'set')
self.vbar['command'] = (self, 'yview') self.vbar['command'] = (self, 'yview')