traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Totally changed, now it is actually derived from Text 

(This breaks something in MimeViewer.py, don't know what yet)
This commit is contained in:
Guido van Rossum 1994-07-06 21:54:39 +00:00
parent 72cb020b19
commit 460b6bb192
2 changed files with 40 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
Lib/lib-tk/ScrolledText.py
View File

@ -7,40 +7,29 @@
# Configuration options are passed to the Text widget. # Configuration options are passed to the Text widget.
# A Frame widget is inserted between the master and the text, to hold # A Frame widget is inserted between the master and the text, to hold
# the Scrollbar widget. # the Scrollbar widget.
# Most methods calls are passed to the Text widget; the pack command # Most methods calls are inherited from the Text widget; Pack methods
# is redirected to the Frame widget however. # are redirected to the Frame widget however.
from Tkinter import * from Tkinter import *
from Tkinter import _cnfmerge
class ScrolledText(Pack, Place): class ScrolledText(Text):
def __init__(self, master=None, cnf={}): def __init__(self, master=None, cnf={}):
cnf = _cnfmerge(cnf)
fcnf = {} fcnf = {}
self.frame = Frame(master, {}) for k in cnf.keys():
if cnf.has_key(Pack): if type(k) == ClassType:
self.frame.pack(cnf[Pack]) fcnf[k] = cnf[k]
del cnf[Pack] del cnf[k]
self.vbar = Scrollbar(self.frame, {}) self.frame = Frame(master, fcnf)
self.vbar.pack({'side': 'right', 'fill': 'y'}) self.vbar = Scrollbar(self.frame, {
Pack: {'side': 'right', 'fill': 'y'}})
cnf[Pack] = {'side': 'left', 'fill': 'both', 'expand': 'yes'} cnf[Pack] = {'side': 'left', 'fill': 'both', 'expand': 'yes'}
self.text = Text(self.frame, cnf) Text.__init__(self, self.frame, cnf)
self.text['yscrollcommand'] = (self.vbar, 'set') self['yscrollcommand'] = (self.vbar, 'set')
self.vbar['command'] = (self.text, 'yview') self.vbar['command'] = (self, 'yview')
self.insert = self.text.insert
# XXX should do all Text methods... # Copy Pack methods of self.frame -- hack!
self.pack = self.frame.pack for m in Pack.__dict__.keys():
self.bind = self.text.bind if m[0] != '_' and m != 'config':
self.forget = self.frame.forget setattr(self, m, getattr(self.frame, m))
self.delete = self.text.delete
self.insert = self.text.insert
self.index = self.text.index
self.get = self.text.get
self.mark_set = self.text.mark_set
self.tag_add = self.text.tag_add
self.tag_delete = self.text.tag_delete
self.tag_remove = self.text.tag_remove
self.tag_config = self.text.tag_config
self.yview = self.text.yview
self.yview_pickplace = self.text.yview_pickplace
self.tk = master.tk
def __str__(self):
return str(self.frame)

51
Lib/tkinter/ScrolledText.py
View File

@ -7,40 +7,29 @@
# Configuration options are passed to the Text widget. # Configuration options are passed to the Text widget.
# A Frame widget is inserted between the master and the text, to hold # A Frame widget is inserted between the master and the text, to hold
# the Scrollbar widget. # the Scrollbar widget.
# Most methods calls are passed to the Text widget; the pack command # Most methods calls are inherited from the Text widget; Pack methods
# is redirected to the Frame widget however. # are redirected to the Frame widget however.
from Tkinter import * from Tkinter import *
from Tkinter import _cnfmerge
class ScrolledText(Pack, Place): class ScrolledText(Text):
def __init__(self, master=None, cnf={}): def __init__(self, master=None, cnf={}):
cnf = _cnfmerge(cnf)
fcnf = {} fcnf = {}
self.frame = Frame(master, {}) for k in cnf.keys():
if cnf.has_key(Pack): if type(k) == ClassType:
self.frame.pack(cnf[Pack]) fcnf[k] = cnf[k]
del cnf[Pack] del cnf[k]
self.vbar = Scrollbar(self.frame, {}) self.frame = Frame(master, fcnf)
self.vbar.pack({'side': 'right', 'fill': 'y'}) self.vbar = Scrollbar(self.frame, {
Pack: {'side': 'right', 'fill': 'y'}})
cnf[Pack] = {'side': 'left', 'fill': 'both', 'expand': 'yes'} cnf[Pack] = {'side': 'left', 'fill': 'both', 'expand': 'yes'}
self.text = Text(self.frame, cnf) Text.__init__(self, self.frame, cnf)
self.text['yscrollcommand'] = (self.vbar, 'set') self['yscrollcommand'] = (self.vbar, 'set')
self.vbar['command'] = (self.text, 'yview') self.vbar['command'] = (self, 'yview')
self.insert = self.text.insert
# XXX should do all Text methods... # Copy Pack methods of self.frame -- hack!
self.pack = self.frame.pack for m in Pack.__dict__.keys():
self.bind = self.text.bind if m[0] != '_' and m != 'config':
self.forget = self.frame.forget setattr(self, m, getattr(self.frame, m))
self.delete = self.text.delete
self.insert = self.text.insert
self.index = self.text.index
self.get = self.text.get
self.mark_set = self.text.mark_set
self.tag_add = self.text.tag_add
self.tag_delete = self.text.tag_delete
self.tag_remove = self.text.tag_remove
self.tag_config = self.text.tag_config
self.yview = self.text.yview
self.yview_pickplace = self.text.yview_pickplace
self.tk = master.tk
def __str__(self):
return str(self.frame)