diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2015-08-01 22:58:23 (GMT) |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2015-08-01 22:58:23 (GMT) |
| commit | 1b3c8f8eec8bab568362be80e1df624a591e69c4 (patch) | |
| tree | c9ed728b62e2efa7a0ff55ec8e531df1e38fdc47 /Lib/idlelib/EditorWindow.py | |
| parent | 75b5ab5770ea0604b50ab21852749dba199e4fab (diff) | |
| parent | d87d16826ac55f260b706cb63d8ee0a7d3c6d893 (diff) | |
| download | cpython-1b3c8f8eec8bab568362be80e1df624a591e69c4.zip cpython-1b3c8f8eec8bab568362be80e1df624a591e69c4.tar.gz cpython-1b3c8f8eec8bab568362be80e1df624a591e69c4.tar.bz2 | |
Issue 24745: Merge with 3.4
Diffstat (limited to 'Lib/idlelib/EditorWindow.py')
| -rw-r--r-- | Lib/idlelib/EditorWindow.py | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py index 7bc2aa7..6dbbe09 100644 --- a/Lib/idlelib/EditorWindow.py +++ b/Lib/idlelib/EditorWindow.py @@ -230,13 +230,7 @@ class EditorWindow(object): vbar['command'] = text.yview vbar.pack(side=RIGHT, fill=Y) text['yscrollcommand'] = vbar.set - fontWeight = 'normal' - if idleConf.GetOption('main', 'EditorWindow', 'font-bold', type='bool'): - fontWeight='bold' - text.config(font=(idleConf.GetOption('main', 'EditorWindow', 'font'), - idleConf.GetOption('main', 'EditorWindow', - 'font-size', type='int'), - fontWeight)) + text['font'] = idleConf.GetFont(self.root, 'main', 'EditorWindow') text_frame.pack(side=LEFT, fill=BOTH, expand=1) text.pack(side=TOP, fill=BOTH, expand=1) text.focus_set() @@ -797,13 +791,8 @@ class EditorWindow(object): def ResetFont(self): "Update the text widgets' font if it is changed" # Called from configDialog.py - fontWeight='normal' - if idleConf.GetOption('main','EditorWindow','font-bold',type='bool'): - fontWeight='bold' - self.text.config(font=(idleConf.GetOption('main','EditorWindow','font'), - idleConf.GetOption('main','EditorWindow','font-size', - type='int'), - fontWeight)) + + self.text['font'] = idleConf.GetFont(self.root, 'main','EditorWindow') def RemoveKeybindings(self): "Remove the keybindings before they are changed." |