[Python-checkins] r71944 - in python/branches/release30-maint: Lib/idlelib/EditorWindow.py Lib/idlelib/NEWS.txt

[kurt.kaiser]

Author: kurt.kaiser
Date: Sun Apr 26 01:23:34 2009
New Revision: 71944

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


Modified:
   python/branches/release30-maint/   (props changed)
   python/branches/release30-maint/Lib/idlelib/EditorWindow.py
   python/branches/release30-maint/Lib/idlelib/NEWS.txt

Modified: python/branches/release30-maint/Lib/idlelib/EditorWindow.py
==============================================================================
--- python/branches/release30-maint/Lib/idlelib/EditorWindow.py	(original)
+++ python/branches/release30-maint/Lib/idlelib/EditorWindow.py	Sun Apr 26 01:23:34 2009
@@ -107,10 +107,18 @@
         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()

Modified: python/branches/release30-maint/Lib/idlelib/NEWS.txt
==============================================================================
--- python/branches/release30-maint/Lib/idlelib/NEWS.txt	(original)
+++ python/branches/release30-maint/Lib/idlelib/NEWS.txt	Sun Apr 26 01:23:34 2009
@@ -18,6 +18,9 @@
 
 *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?