diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2015-08-01 18:58:42 -0400 |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2015-08-01 18:58:42 -0400 |
| commit | eb803c8f9eac1cf2ddf18be84aec689ad99c0f1b (patch) | |
| tree | 5a7bbba87357d8d14a75f9daee6ee7dfbcc75926 /Lib/idlelib/EditorWindow.py | |
| parent | 9344bd828cd391c25dc5ee6b4699b0025791a8f8 (diff) | |
| parent | 1b3c8f8eec8bab568362be80e1df624a591e69c4 (diff) | |
| download | cpython-git-eb803c8f9eac1cf2ddf18be84aec689ad99c0f1b.tar.gz | |
Issue 24745: Merge with 3.5
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 7bc2aa7e19..6dbbe09823 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." |