summaryrefslogtreecommitdiff
path: root/Lib/idlelib
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2012-10-22 15:14:31 -0700
committerNed Deily <nad@acm.org>2012-10-22 15:14:31 -0700
commitfdf0f274e63ab45de33e81c016e97dc8640265e9 (patch)
treed4038a532520d9b4b6dfcd0779c0ba46b34da252 /Lib/idlelib
parentaf38774b5f373935b772b3be7d07b4cae3760d63 (diff)
downloadcpython-git-fdf0f274e63ab45de33e81c016e97dc8640265e9.tar.gz
Issue #15853: Prevent IDLE crash on OS X when opening Preferences menu
with certain versions of Tk 8.5. Initial patch by Kevin Walzer.
Diffstat (limited to 'Lib/idlelib')
-rw-r--r--Lib/idlelib/NEWS.txt3
-rw-r--r--Lib/idlelib/configDialog.py7
2 files changed, 6 insertions, 4 deletions
diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 3160c74561..f234b64b85 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -21,6 +21,9 @@ What's New in IDLE 3.2.4?
- Issue #14018: Update checks for unstable system Tcl/Tk versions on OS X
to include versions shipped with OS X 10.7 and 10.8 in addition to 10.6.
+- Issue #15853: Prevent IDLE crash on OS X when opening Preferences menu
+ with certain versions of Tk 8.5. Initial patch by Kevin Walzer.
+
What's New in IDLE 3.2.3?
=========================
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