Issue #24745: merge from 3.5

This commit is contained in:
Ned Deily 2015-08-09 23:23:21 -04:00
commit 76ba13bf71
1 changed files with 11 additions and 7 deletions

View File

@ -22,6 +22,7 @@ import os
import sys
from configparser import ConfigParser
from tkinter import TkVersion
from tkinter.font import Font, nametofont
class InvalidConfigType(Exception): pass
@ -688,6 +689,9 @@ class IdleConf:
bold = self.GetOption(configType, section, 'font-bold', default=0,
type='bool')
if (family == 'TkFixedFont'):
if TkVersion < 8.5:
family = 'Courier'
else:
f = Font(name='TkFixedFont', exists=True, root=root)
actualFont = Font.actual(f)
family = actualFont['family']