summaryrefslogtreecommitdiff
path: root/Lib/idlelib/configDialog.py
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2012-10-22 15:18:46 -0700
committerNed Deily <nad@acm.org>2012-10-22 15:18:46 -0700
commitb6d24d97467d2b4b74017c4812f7173f8021ece3 (patch)
tree560d8aff8a9528d115f8a2e8a479d5f446ebc586 /Lib/idlelib/configDialog.py
parentabb0febd0a79bee2f1ec7787d430a5446771a71b (diff)
parentfdf0f274e63ab45de33e81c016e97dc8640265e9 (diff)
downloadcpython-git-b6d24d97467d2b4b74017c4812f7173f8021ece3.tar.gz
Issue #15853: merge 3.2 -> 3.3
Diffstat (limited to 'Lib/idlelib/configDialog.py')
-rw-r--r--Lib/idlelib/configDialog.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/Lib/idlelib/configDialog.py b/Lib/idlelib/configDialog.py
index 2701b42f43..434114e4d2 100644
--- a/Lib/idlelib/configDialog.py
+++ b/Lib/idlelib/configDialog.py
@@ -821,10 +821,9 @@ class ConfigDialog(Toplevel):
fontWeight=tkFont.BOLD
else:
fontWeight=tkFont.NORMAL
- size=self.fontSize.get()
- self.editFont.config(size=size,
- weight=fontWeight,family=fontName)
- self.textHighlightSample.configure(font=(fontName, size, fontWeight))
+ newFont = (fontName, self.fontSize.get(), fontWeight)
+ self.labelFontSample.config(font=newFont)
+ self.textHighlightSample.configure(font=newFont)
def SetHighlightTarget(self):
if self.highlightTarget.get()=='Cursor': #bg not possible