From: Kurt B. Kaiser <kbk@shore.net>
Date: Sat, 25 Apr 2009 23:23:34 +0000 (+0000)
Subject: Merged revisions 71189 via svnmerge from
X-Git-Tag: 3.0~172
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=628946eaaf9465bd57f1600e58a0b916fe914f9e;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 71189 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r71189 | kurt.kaiser | 2009-04-04 16:38:52 -0400 (Sat, 04 Apr 2009) | 9 lines

  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.
  ........
................
---

diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
index fe97df60aee1..00ff88169bc3 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 86827b4cd835..bdd7bb0c6ed6 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -18,6 +18,9 @@ What's New in IDLE 2.7? (UNRELEASED, but merged into 3.0 releases above.)
 
 *Release date: XX-XXX-2009*
 
+- Tk 8.5 Text widget requires 'wordprocessor' tabstyle attr to handle
+  mixed space/tab properly. Issue 5120, patch by Guilherme Polo.
+
 - Issue #3549: On MacOS the preferences menu was not present
 
 What's New in IDLE 3.0 final?