Added bind and tag_config methods; minor lay-out change

diff --git a/Lib/lib-tk/ScrolledText.py b/Lib/lib-tk/ScrolledText.py
index ed1cc563408a69aa88dd0d1c69f5da5fc310f383..4092d4f695f3c2c2c18e75ff8df61d7f3a34f364 100644 (file)
--- a/Lib/lib-tk/ScrolledText.py
+++ b/Lib/lib-tk/ScrolledText.py
@@ -21,14 +21,14 @@ class ScrolledText(Pack, Place):
                        del cnf[Pack]
                self.vbar = Scrollbar(self.frame, {})
                self.vbar.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)
                self.text['yscrollcommand'] = (self.vbar, 'set')
                self.vbar['command'] = (self.text, 'yview')
                self.insert = self.text.insert
                # XXX should do all Text methods...
                self.pack = self.frame.pack
+               self.bind = self.text.bind
                self.forget = self.frame.forget
                self.delete = self.text.delete
                self.insert = self.text.insert
@@ -38,6 +38,7 @@ class ScrolledText(Pack, Place):
                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

diff --git a/Lib/tkinter/ScrolledText.py b/Lib/tkinter/ScrolledText.py
index ed1cc563408a69aa88dd0d1c69f5da5fc310f383..4092d4f695f3c2c2c18e75ff8df61d7f3a34f364 100755 (executable)
--- a/Lib/tkinter/ScrolledText.py
+++ b/Lib/tkinter/ScrolledText.py
@@ -21,14 +21,14 @@ class ScrolledText(Pack, Place):
                        del cnf[Pack]
                self.vbar = Scrollbar(self.frame, {})
                self.vbar.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)
                self.text['yscrollcommand'] = (self.vbar, 'set')
                self.vbar['command'] = (self.text, 'yview')
                self.insert = self.text.insert
                # XXX should do all Text methods...
                self.pack = self.frame.pack
+               self.bind = self.text.bind
                self.forget = self.frame.forget
                self.delete = self.text.delete
                self.insert = self.text.insert
@@ -38,6 +38,7 @@ class ScrolledText(Pack, Place):
                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