diff options
| author | Kurt B. Kaiser <kbk@shore.net> | 2009-04-04 20:38:52 (GMT) |
|---|---|---|
| committer | Kurt B. Kaiser <kbk@shore.net> | 2009-04-04 20:38:52 (GMT) |
| commit | 113f0e8926e010e078c4350139ad2aa6582546cf (patch) | |
| tree | 39f9192714e2ec0515bb3f7f19bc20182da774d0 | |
| parent | c6cac059e92c20d2128f17944ad487c02e0fa85e (diff) | |
| download | cpython-113f0e8926e010e078c4350139ad2aa6582546cf.zip cpython-113f0e8926e010e078c4350139ad2aa6582546cf.tar.gz cpython-113f0e8926e010e078c4350139ad2aa6582546cf.tar.bz2 | |
Merged revisions 70723 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70723 | kurt.kaiser | 2009-03-30 12:22:00 -0400 (Mon, 30 Mar 2009) | 1 line
Tk 8.5 Text widget requires 'wordprocessor' tabstyle attr to handle mixed space/tab properly. Issue 5120, patch by Guilherme Polo.
........
| -rw-r--r-- | Lib/idlelib/EditorWindow.py | 16 | ||||
| -rw-r--r-- | Lib/idlelib/NEWS.txt | 3 |
2 files changed, 15 insertions, 4 deletions
diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py index 38ae7b6..cee7767 100644 --- a/Lib/idlelib/EditorWindow.py +++ b/Lib/idlelib/EditorWindow.py @@ -107,10 +107,18 @@ class EditorWindow(object): self.text_frame = text_frame = Frame(top) self.vbar = vbar = Scrollbar(text_frame, name='vbar') self.width = idleConf.GetOption('main','EditorWindow','width') - self.text = text = MultiCallCreator(Text)( - text_frame, name='text', padx=5, wrap='none', - width=self.width, - height=idleConf.GetOption('main','EditorWindow','height') ) + text_options = { + 'name': 'text', + 'padx': 5, + 'wrap': 'none', + 'width': self.width, + 'height': idleConf.GetOption('main', 'EditorWindow', 'height')} + if TkVersion >= 8.5: + # Starting with tk 8.5 we have to set the new tabstyle option + # to 'wordprocessor' to achieve the same display of tabs as in + # older tk versions. + text_options['tabstyle'] = 'wordprocessor' + self.text = text = MultiCallCreator(Text)(text_frame, **text_options) self.top.focused_widget = self.text self.createmenubar() diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt index 87acd5f..c76174e 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -6,6 +6,9 @@ What's New in IDLE 3.1a1? - Remove port spec from run.py and fix bug where subprocess fails to extract port from command line when warnings are present. +- Tk 8.5 Text widget requires 'wordprocessor' tabstyle attr to handle + mixed space/tab properly. Issue 5120, patch by Guilherme Polo. + - Issue #4815: Offer conversion to UTF-8 if source files have no encoding declaration and are not encoded in UTF-8. |